jrd/irssi
1
0
Fork 0
forked from PsychoticNinja/irssi
Code Issues Pull Requests Projects Releases Wiki Activity

Make /ignore -replies work with NO_ACT

Browse Source
This commit is contained in:
David Leadbeater 2014-06-30 09:35:31 +01:00
parent 3698ddfc3b
commit a9d9756d4d
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/core/ignore.c
View File

@ -58,30 +58,6 @@ static int ignore_check_replies_rec(IGNORE_REC *rec, CHANNEL_REC *channel,
return FALSE; return FALSE;
} }
#define ignore_match_channel(rec, channel) \
((rec)->channels == NULL || ((channel) != NULL && \
strarray_find((rec)->channels, (channel)) != -1))
static int ignore_check_replies(CHANNEL_REC *chanrec, const char *text)
{
GSList *tmp;
if (text == NULL || chanrec == NULL)
return FALSE;
/* check reply ignores */
for (tmp = ignores; tmp != NULL; tmp = tmp->next) {
IGNORE_REC *rec = tmp->data;
if (rec->mask != NULL && rec->replies &&
ignore_match_channel(rec, chanrec->name) &&
ignore_check_replies_rec(rec, chanrec, text))
return TRUE;
}
return FALSE;
}
static int ignore_match_pattern(IGNORE_REC *rec, const char *text) static int ignore_match_pattern(IGNORE_REC *rec, const char *text)
{ {
if (rec->pattern == NULL) if (rec->pattern == NULL)
@ -124,6 +100,31 @@ static int ignore_match_pattern(IGNORE_REC *rec, const char *text)
((rec)->servertag == NULL || \ ((rec)->servertag == NULL || \
g_ascii_strcasecmp((server)->tag, (rec)->servertag) == 0) g_ascii_strcasecmp((server)->tag, (rec)->servertag) == 0)
#define ignore_match_channel(rec, channel) \
((rec)->channels == NULL || ((channel) != NULL && \
strarray_find((rec)->channels, (channel)) != -1))
static int ignore_check_replies(CHANNEL_REC *chanrec, const char *text, int level)
{
GSList *tmp;
if (text == NULL || chanrec == NULL)
return FALSE;
/* check reply ignores */
for (tmp = ignores; tmp != NULL; tmp = tmp->next) {
IGNORE_REC *rec = tmp->data;
if (rec->mask != NULL && rec->replies &&
ignore_match_level(rec, level) &&
ignore_match_channel(rec, chanrec->name) &&
ignore_check_replies_rec(rec, chanrec, text))
return TRUE;
}
return FALSE;
}
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)
{ {
@ -183,7 +184,7 @@ int ignore_check(SERVER_REC *server, const char *nick, const char *host,
if (best_match || (level & MSGLEVEL_PUBLIC) == 0) if (best_match || (level & MSGLEVEL_PUBLIC) == 0)
return best_match; return best_match;
return ignore_check_replies(chanrec, text); 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,