zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-10 04:13:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Added HIDDEN level to ignores

Browse source
This commit is contained in:
vague666 2018-06-05 14:43:37 +02:00
commit db3b671328
7 changed files with 73 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/fe-common/core/fe-ignore.c
View file

@ -157,7 +157,8 @@ static void cmd_ignore(const char *data)
g_strsplit(chanarg, ",", -1);
rec = ignore_find_full(servertag, mask, patternarg, channels,
IGNORE_FIND_PATTERN | ((level & MSGLEVEL_NO_ACT) ? IGNORE_FIND_NOACT : 0));
IGNORE_FIND_PATTERN | ((level & MSGLEVEL_NO_ACT) ? IGNORE_FIND_NOACT : 0) |
((level & MSGLEVEL_HIDDEN) ? IGNORE_FIND_HIDDEN : 0));
new_ignore = rec == NULL;
if (rec == NULL) {
@ -179,6 +180,12 @@ static void cmd_ignore(const char *data)
rec->level |= MSGLEVEL_ALL;
}
if (rec->level == MSGLEVEL_HIDDEN) {
/* If only HIDDEN was specified add all levels; it makes no
* sense on its own. */
rec->level |= MSGLEVEL_ALL;
}
if (new_ignore && rec->level == 0) {
/* tried to unignore levels from nonexisting ignore */
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,

27
src/fe-common/core/fe-messages.c
View file

@ -204,6 +204,9 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
if (ignore_check(server, nick, address, target, msg, level | MSGLEVEL_NO_ACT))
level |= MSGLEVEL_NO_ACT;
if (ignore_check(server, nick, address, target, msg, level | MSGLEVEL_HIDDEN))
level |= MSGLEVEL_HIDDEN;
if (settings_get_bool("emphasis"))
msg = freemsg = expand_emphasis((WI_ITEM_REC *) chanrec, msg);
@ -263,6 +266,9 @@ static void sig_message_private(SERVER_REC *server, const char *msg,
if (ignore_check(server, nick, address, NULL, msg, level | MSGLEVEL_NO_ACT))
level |= MSGLEVEL_NO_ACT;
if (ignore_check(server, nick, address, NULL, msg, level | MSGLEVEL_HIDDEN))
level |= MSGLEVEL_HIDDEN;
if (own) {
printformat(server, target, level,
query == NULL ? TXT_OWN_MSG_PRIVATE :
@ -358,6 +364,9 @@ static void sig_message_join(SERVER_REC *server, const char *channel,
if (ignore_check(server, nick, address, channel, NULL, level | MSGLEVEL_NO_ACT))
level |= MSGLEVEL_NO_ACT;
if (ignore_check(server, nick, address, channel, NULL, level | MSGLEVEL_HIDDEN))
level |= MSGLEVEL_HIDDEN;
printformat(server, channel, level,
TXT_JOIN, nick, address, channel);
}
@ -371,6 +380,9 @@ static void sig_message_part(SERVER_REC *server, const char *channel,
if (ignore_check(server, nick, address, channel, NULL, level | MSGLEVEL_NO_ACT))
level |= MSGLEVEL_NO_ACT;
if (ignore_check(server, nick, address, channel, NULL, level | MSGLEVEL_HIDDEN))
level |= MSGLEVEL_HIDDEN;
printformat(server, channel, level,
TXT_PART, nick, address, channel, reason);
}
@ -390,6 +402,9 @@ static void sig_message_quit(SERVER_REC *server, const char *nick,
if (ignore_check(server, nick, address, NULL, reason, level | MSGLEVEL_NO_ACT))
level |= MSGLEVEL_NO_ACT;
if (ignore_check(server, nick, address, NULL, reason, level | MSGLEVEL_HIDDEN))
level |= MSGLEVEL_HIDDEN;
print_channel = NULL;
once = settings_get_bool("show_quit_once");
@ -412,6 +427,9 @@ static void sig_message_quit(SERVER_REC *server, const char *nick,
if (ignore_check(server, nick, address, rec->visible_name, reason, MSGLEVEL_NO_ACT))
level |= MSGLEVEL_NO_ACT;
if (ignore_check(server, nick, address, rec->visible_name, reason, MSGLEVEL_HIDDEN))
level |= MSGLEVEL_HIDDEN;
if (print_channel == NULL ||
active_win->active == (WI_ITEM_REC *) rec)
print_channel = rec->visible_name;
@ -461,6 +479,9 @@ static void sig_message_kick(SERVER_REC *server, const char *channel,
if (ignore_check(server, kicker, address, channel, reason, level | MSGLEVEL_NO_ACT))
level |= MSGLEVEL_NO_ACT;
if (ignore_check(server, kicker, address, channel, reason, level | MSGLEVEL_HIDDEN))
level |= MSGLEVEL_HIDDEN;
printformat(server, channel, level,
TXT_KICK, nick, channel, kicker, reason, address);
}
@ -482,6 +503,9 @@ static void print_nick_change_channel(SERVER_REC *server, const char *channel,
if (!(level & MSGLEVEL_NO_ACT) && ignore_check(server, oldnick, address, channel, newnick, level | MSGLEVEL_NO_ACT))
level |= MSGLEVEL_NO_ACT;
if (!(level & MSGLEVEL_HIDDEN) && ignore_check(server, oldnick, address, channel, newnick, level | MSGLEVEL_HIDDEN))
level |= MSGLEVEL_HIDDEN;
printformat(server, channel, level,
ownnick ? TXT_YOUR_NICK_CHANGED : TXT_NICK_CHANGED,
oldnick, newnick, channel, address);
@ -561,6 +585,9 @@ static void sig_message_topic(SERVER_REC *server, const char *channel,
if (ignore_check(server, nick, address, channel, topic, level | MSGLEVEL_NO_ACT))
level |= MSGLEVEL_NO_ACT;
if (ignore_check(server, nick, address, channel, topic, level | MSGLEVEL_HIDDEN))
level |= MSGLEVEL_HIDDEN;
printformat(server, channel, level,
*topic != '\0' ? TXT_NEW_TOPIC : TXT_TOPIC_UNSET,
nick, channel, topic, address);

2
src/fe-common/core/window-activity.c
View file

@ -125,7 +125,7 @@ static void read_settings(void)
hide_targets = *targets == '\0' ? NULL :
g_strsplit(targets, " ", -1);
hide_level = MSGLEVEL_NEVER | MSGLEVEL_NO_ACT |
hide_level = MSGLEVEL_NEVER | MSGLEVEL_NO_ACT | MSGLEVEL_HIDDEN |
settings_get_level("activity_hide_level");
msg_level = settings_get_level("activity_msg_level");
hilight_level = MSGLEVEL_HILIGHT |