summaryrefslogtreecommitdiff
path: root/src/fe-common/irc
diff options
context:
space:
mode:
Diffstat (limited to 'src/fe-common/irc')
-rw-r--r--src/fe-common/irc/dcc/fe-dcc-chat-messages.c12
-rw-r--r--src/fe-common/irc/fe-irc-messages.c9
2 files changed, 21 insertions, 0 deletions
diff --git a/src/fe-common/irc/dcc/fe-dcc-chat-messages.c b/src/fe-common/irc/dcc/fe-dcc-chat-messages.c
index 45791f56..3a45a36b 100644
--- a/src/fe-common/irc/dcc/fe-dcc-chat-messages.c
+++ b/src/fe-common/irc/dcc/fe-dcc-chat-messages.c
@@ -96,6 +96,10 @@ static void sig_message_dcc(CHAT_DCC_REC *dcc, const char *msg)
level | MSGLEVEL_NO_ACT))
level |= MSGLEVEL_NO_ACT;
+ if (ignore_check(SERVER(dcc->server), tag, dcc->addrstr, NULL, msg,
+ level | MSGLEVEL_HIDDEN))
+ level |= MSGLEVEL_HIDDEN;
+
format_create_dest_tag(&dest, dcc->server, dcc->servertag, tag,
level, NULL);
@@ -118,6 +122,10 @@ static void sig_message_dcc_action(CHAT_DCC_REC *dcc, const char *msg)
level | MSGLEVEL_NO_ACT))
level |= MSGLEVEL_NO_ACT;
+ if (ignore_check(SERVER(dcc->server), tag, dcc->addrstr, NULL, msg,
+ level | MSGLEVEL_HIDDEN))
+ level |= MSGLEVEL_HIDDEN;
+
format_create_dest_tag(&dest, dcc->server, dcc->servertag, tag,
level, NULL);
@@ -139,6 +147,10 @@ static void sig_message_dcc_ctcp(CHAT_DCC_REC *dcc, const char *cmd,
level | MSGLEVEL_NO_ACT))
level |= MSGLEVEL_NO_ACT;
+ if (ignore_check(SERVER(dcc->server), tag, dcc->addrstr, NULL, cmd,
+ level | MSGLEVEL_HIDDEN))
+ level |= MSGLEVEL_HIDDEN;
+
format_create_dest_tag(&dest, dcc->server, dcc->servertag, tag,
level, NULL);
diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index 40ca306d..e8558a17 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -162,6 +162,10 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
level | MSGLEVEL_NO_ACT))
level |= MSGLEVEL_NO_ACT;
+ if (ignore_check(SERVER(server), nick, address, target, msg,
+ level | MSGLEVEL_HIDDEN))
+ level |= MSGLEVEL_HIDDEN;
+
if (server_ischannel(SERVER(server), target)) {
item = irc_channel_find(server, target);
} else {
@@ -241,6 +245,11 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
msg, level | MSGLEVEL_NO_ACT))
level |= MSGLEVEL_NO_ACT;
+ if (ignore_check(server, nick, address,
+ server_ischannel(SERVER(server), target) ? target : NULL,
+ msg, level | MSGLEVEL_HIDDEN))
+ level |= MSGLEVEL_HIDDEN;
+
if (server_ischannel(SERVER(server), target)) {
/* notice in some channel */
printformat(server, target, level,