aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-10-27 05:20:20 -04:00
Code

Added -ircnet option to /IGNORE. Patch by Valentin Batz

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3259 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2004-07-08 23:31:31 +00:00 committed by cras
parent d12202f79e
commit 1d6ed93102
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/help/in/ignore.in
View File

@ -9,6 +9,7 @@
from Finland, but also anyone sending message from Finland, but also anyone sending message
"tofinnishnick: blahblah". "tofinnishnick: blahblah".
-except: *DON'T* ignore - overrides an existing ignore. -except: *DON'T* ignore - overrides an existing ignore.
-ircnet: Ignore only on this ircnet.
-channels: Ignore only in channels -channels: Ignore only in channels
<mask>: Either a nick mask or list of channels <mask>: Either a nick mask or list of channels
<levels>: List of levels to ignore. You can use -<level> to remove levels <levels>: List of levels to ignore. You can use -<level> to remove levels

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

@ -63,6 +63,8 @@ static void ignore_print(int index, IGNORE_REC *rec)
} }
if (rec->fullword) g_string_append(options, "-full "); if (rec->fullword) g_string_append(options, "-full ");
if (rec->replies) g_string_append(options, "-replies "); if (rec->replies) g_string_append(options, "-replies ");
if (rec->servertag != NULL)
g_string_sprintfa(options, "-ircnet %s ", rec->servertag);
if (rec->pattern != NULL) if (rec->pattern != NULL)
g_string_sprintfa(options, "-pattern %s ", rec->pattern); g_string_sprintfa(options, "-pattern %s ", rec->pattern);
@ -105,14 +107,14 @@ static void cmd_ignore_show(void)
} }
/* SYNTAX: IGNORE [-regexp | -full] [-pattern <pattern>] [-except] [-replies] /* SYNTAX: IGNORE [-regexp | -full] [-pattern <pattern>] [-except] [-replies]
[-channels <channel>] [-time <secs>] <mask> [<levels>] [-ircnet <ircnet>] [-channels <channel>] [-time <secs>] <mask> [<levels>]
IGNORE [-regexp | -full] [-pattern <pattern>] [-except] [-replies] IGNORE [-regexp | -full] [-pattern <pattern>] [-except] [-replies]
[-time <secs>] <channels> [<levels>] */ [-ircnet <ircnet>] [-time <secs>] <channels> [<levels>] */
static void cmd_ignore(const char *data) static void cmd_ignore(const char *data)
{ {
GHashTable *optlist; GHashTable *optlist;
IGNORE_REC *rec; IGNORE_REC *rec;
char *patternarg, *chanarg, *mask, *levels, *timestr; char *patternarg, *chanarg, *mask, *levels, *timestr, *servertag;
char **channels; char **channels;
void *free_arg; void *free_arg;
int new_ignore, msecs; int new_ignore, msecs;
@ -128,6 +130,7 @@ static void cmd_ignore(const char *data)
patternarg = g_hash_table_lookup(optlist, "pattern"); patternarg = g_hash_table_lookup(optlist, "pattern");
chanarg = g_hash_table_lookup(optlist, "channels"); chanarg = g_hash_table_lookup(optlist, "channels");
servertag = g_hash_table_lookup(optlist, "ircnet");
if (*mask == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); if (*mask == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
if (*levels == '\0') levels = "ALL"; if (*levels == '\0') levels = "ALL";
@ -173,7 +176,8 @@ static void cmd_ignore(const char *data)
cmd_params_free(free_arg); cmd_params_free(free_arg);
return; return;
} }
rec->servertag = (servertag == NULL || *servertag == '\0') ?
NULL : g_strdup(servertag);
rec->pattern = (patternarg == NULL || *patternarg == '\0') ? rec->pattern = (patternarg == NULL || *patternarg == '\0') ?
NULL : g_strdup(patternarg); NULL : g_strdup(patternarg);
rec->exception = g_hash_table_lookup(optlist, "except") != NULL; rec->exception = g_hash_table_lookup(optlist, "except") != NULL;
@ -254,7 +258,7 @@ void fe_ignore_init(void)
signal_add("ignore created", (SIGNAL_FUNC) sig_ignore_created); signal_add("ignore created", (SIGNAL_FUNC) sig_ignore_created);
signal_add("ignore changed", (SIGNAL_FUNC) sig_ignore_created); signal_add("ignore changed", (SIGNAL_FUNC) sig_ignore_created);
command_set_options("ignore", "regexp full except replies -time -pattern -channels"); command_set_options("ignore", "regexp full except replies -ircnet -time -pattern -channels");
} }
void fe_ignore_deinit(void) void fe_ignore_deinit(void)