mirror of
https://github.com/irssi/irssi.git
synced 2024-09-08 04:26:01 -04:00
Correct handling of /NOTICE @#channel, patch by dg
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2948 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
fae3ae2bfc
commit
4ed5e9adf6
@ -114,7 +114,6 @@ static void cmd_notice(const char *data, IRC_SERVER_REC *server,
|
|||||||
if (*target == '\0' || *msg == '\0')
|
if (*target == '\0' || *msg == '\0')
|
||||||
cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
|
cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
|
||||||
|
|
||||||
target = skip_target(target);
|
|
||||||
signal_emit("message irc own_notice", 3, server, msg, target);
|
signal_emit("message irc own_notice", 3, server, msg, target);
|
||||||
cmd_params_free(free_arg);
|
cmd_params_free(free_arg);
|
||||||
}
|
}
|
||||||
|
@ -179,7 +179,7 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
|
|||||||
static void sig_message_own_notice(IRC_SERVER_REC *server, const char *msg,
|
static void sig_message_own_notice(IRC_SERVER_REC *server, const char *msg,
|
||||||
const char *target)
|
const char *target)
|
||||||
{
|
{
|
||||||
printformat(server, target, MSGLEVEL_NOTICES |
|
printformat(server, skip_target(target), MSGLEVEL_NOTICES |
|
||||||
MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT,
|
MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT,
|
||||||
IRCTXT_OWN_NOTICE, target, msg);
|
IRCTXT_OWN_NOTICE, target, msg);
|
||||||
}
|
}
|
||||||
@ -190,6 +190,9 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
|
|||||||
{
|
{
|
||||||
const char *oldtarget;
|
const char *oldtarget;
|
||||||
|
|
||||||
|
oldtarget = target;
|
||||||
|
target = skip_target(target);
|
||||||
|
|
||||||
if (address == NULL || *address == '\0') {
|
if (address == NULL || *address == '\0') {
|
||||||
/* notice from server */
|
/* notice from server */
|
||||||
if (!ignore_check(server, nick, "",
|
if (!ignore_check(server, nick, "",
|
||||||
@ -200,9 +203,6 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
oldtarget = target;
|
|
||||||
target = skip_target(target);
|
|
||||||
|
|
||||||
if (ignore_check(server, nick, address,
|
if (ignore_check(server, nick, address,
|
||||||
ischannel(*target) ? target : NULL,
|
ischannel(*target) ? target : NULL,
|
||||||
msg, MSGLEVEL_NOTICES))
|
msg, MSGLEVEL_NOTICES))
|
||||||
|
Loading…
Reference in New Issue
Block a user