aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Clean up the ignore_find API to make it more powerful.

Browse Source 
This way we prevent the creation of duplicate ignores since the old code
skipped the ignore_find call when a pattern was specified.
It should also cover all the cases where the ignores would be wrongly
overwritten, such as the case outlined in #78.
This commit is contained in:
LemonBoy 2016-01-03 19:49:18 +01:00
parent 787956af3a
commit 609f3ba6c2
4 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/core/ignore.c
View File

@ -186,15 +186,8 @@ int ignore_check(SERVER_REC *server, const char *nick, const char *host,
return ignore_check_replies(chanrec, text, level); return ignore_check_replies(chanrec, text, level);
} }
IGNORE_REC *ignore_find(const char *servertag, const char *mask, IGNORE_REC *ignore_find(const char *servertag, const char *mask, const char *pattern,
char **channels) char **channels, const int flags)
{
return ignore_find_noact(servertag, mask, channels, 0);
}
IGNORE_REC *ignore_find_noact(const char *servertag, const char *mask,
char **channels, int noact)
{ {
GSList *tmp; GSList *tmp;
char **chan; char **chan;
@ -216,18 +209,29 @@ IGNORE_REC *ignore_find_noact(const char *servertag, const char *mask,
continue; continue;
} }
if (noact && (rec->level & MSGLEVEL_NO_ACT) == 0) if ((flags & IGNORE_FIND_NOACT) && (rec->level & MSGLEVEL_NO_ACT) == 0)
continue; continue;
if (!noact && (rec->level & MSGLEVEL_NO_ACT) != 0) if (!(flags & IGNORE_FIND_NOACT) && (rec->level & MSGLEVEL_NO_ACT) != 0)
continue; continue;
if ((rec->mask == NULL && mask != NULL) || if ((rec->mask == NULL && mask != NULL) ||
(rec->mask != NULL && mask == NULL)) continue; (rec->mask != NULL && mask == NULL))
continue;
if (rec->mask != NULL && g_ascii_strcasecmp(rec->mask, mask) != 0) if (rec->mask != NULL && g_ascii_strcasecmp(rec->mask, mask) != 0)
continue; continue;
/* match the pattern too if requested */
if (flags & IGNORE_FIND_PATTERN) {
if ((rec->pattern == NULL && pattern != NULL) ||
(rec->pattern != NULL && pattern == NULL))
continue;
if (rec->pattern != NULL && g_ascii_strcasecmp(rec->pattern, pattern) != 0)
continue;
}
if ((channels == NULL && rec->channels == NULL)) if ((channels == NULL && rec->channels == NULL))
return rec; /* no channels - ok */ return rec; /* no channels - ok */

9
src/core/ignore.h
View File

@ -31,8 +31,13 @@ extern GSList *ignores;
int ignore_check(SERVER_REC *server, const char *nick, const char *host, int ignore_check(SERVER_REC *server, const char *nick, const char *host,
const char *channel, const char *text, int level); const char *channel, const char *text, int level);
IGNORE_REC *ignore_find(const char *servertag, const char *mask, char **channels); enum {
IGNORE_REC *ignore_find_noact(const char *servertag, const char *mask, char **channels, int noact); IGNORE_FIND_PATTERN = 0x01, // Match the pattern
IGNORE_FIND_NOACT = 0x02, // Exclude the targets with NOACT level
};
IGNORE_REC *ignore_find(const char *servertag, const char *mask, const char *pattern,
char **channels, const int flags);
void ignore_add_rec(IGNORE_REC *rec); void ignore_add_rec(IGNORE_REC *rec);
void ignore_update_rec(IGNORE_REC *rec); void ignore_update_rec(IGNORE_REC *rec);

8
src/fe-common/core/fe-ignore.c
View File

@ -158,8 +158,8 @@ static void cmd_ignore(const char *data)
channels = (chanarg == NULL || *chanarg == '\0') ? NULL : channels = (chanarg == NULL || *chanarg == '\0') ? NULL :
g_strsplit(chanarg, ",", -1); g_strsplit(chanarg, ",", -1);
rec = patternarg != NULL ? NULL: ignore_find_noact(servertag, mask, channels, rec = ignore_find(servertag, mask, patternarg, channels,
(level & MSGLEVEL_NO_ACT)); IGNORE_FIND_PATTERN | ((level & MSGLEVEL_NO_ACT) ? IGNORE_FIND_NOACT : 0));
new_ignore = rec == NULL; new_ignore = rec == NULL;
if (rec == NULL) { if (rec == NULL) {
@ -237,9 +237,9 @@ static void cmd_unignore(const char *data)
chans[0] = mask; chans[0] = mask;
mask = NULL; mask = NULL;
} }
rec = ignore_find_noact("*", mask, (char **) chans, 0); rec = ignore_find("*", mask, NULL, (char **) chans, 0);
if (rec == NULL) { if (rec == NULL) {
rec = ignore_find_noact("*", mask, (char **) chans, 1); rec = ignore_find("*", mask, NULL, (char **) chans, IGNORE_FIND_NOACT);
} }
} }

2
src/irc/flood/autoignore.c
View File

@ -66,7 +66,7 @@ static void sig_flood(IRC_SERVER_REC *server, const char *nick, const char *host
mask = g_strdup_printf("%s!%s", nick, host); mask = g_strdup_printf("%s!%s", nick, host);
if (level & check_level) { if (level & check_level) {
rec = ignore_find(server->tag, mask, NULL); rec = ignore_find(server->tag, mask, NULL, NULL, 0);
if (rec == NULL) if (rec == NULL)
autoignore_add(server, mask, level); autoignore_add(server, mask, level);
else else