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

Moved ignore to core.

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@725 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-10-09 23:40:18 +00:00 committed by cras
parent 77fcb9de52
commit 3c78d95614
9 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/Makefile.am
View File

@ -22,6 +22,7 @@ libcore_a_SOURCES = \
chat-protocols.c \ chat-protocols.c \
chatnets.c \ chatnets.c \
core.c \ core.c \
ignore.c \
levels.c \ levels.c \
line-split.c \ line-split.c \
log.c \ log.c \
@ -62,6 +63,7 @@ noinst_HEADERS = \
chat-protocols.h \ chat-protocols.h \
chatnets.h \ chatnets.h \
core.h \ core.h \
ignore.h \
levels.h \ levels.h \
line-split.h \ line-split.h \
log.h \ log.h \

3
src/core/core.c
View File

@ -33,6 +33,7 @@
#include "commands.h" #include "commands.h"
#include "log.h" #include "log.h"
#include "rawlog.h" #include "rawlog.h"
#include "ignore.h"
#include "special-vars.h" #include "special-vars.h"
#include "channels.h" #include "channels.h"
@ -57,6 +58,7 @@ void core_init(void)
chat_protocols_init(); chat_protocols_init();
chatnets_init(); chatnets_init();
ignore_init();
servers_init(); servers_init();
log_init(); log_init();
rawlog_init(); rawlog_init();
@ -84,6 +86,7 @@ void core_deinit(void)
rawlog_deinit(); rawlog_deinit();
log_deinit(); log_deinit();
servers_deinit(); servers_deinit();
ignore_deinit();
chatnets_deinit(); chatnets_deinit();
chat_protocols_deinit(); chat_protocols_deinit();

30
src/irc/core/ignore.c → src/core/ignore.c
View File

@ -25,21 +25,20 @@
#include "lib-config/iconfig.h" #include "lib-config/iconfig.h"
#include "settings.h" #include "settings.h"
#include "irc.h" #include "masks.h"
#include "irc-masks.h" #include "servers.h"
#include "irc-servers.h" #include "channels.h"
#include "irc-channels.h" #include "nicklist.h"
#include "irc-nicklist.h"
#include "ignore.h" #include "ignore.h"
GSList *ignores; GSList *ignores;
/* check if `text' contains ignored nick at the start of the line. */ /* check if `text' contains ignored nick at the start of the line. */
static int ignore_check_replies(IGNORE_REC *rec, IRC_SERVER_REC *server, static int ignore_check_replies(IGNORE_REC *rec, SERVER_REC *server,
const char *channel, const char *text) const char *channel, const char *text)
{ {
IRC_CHANNEL_REC *chanrec; CHANNEL_REC *chanrec;
GSList *nicks, *tmp; GSList *nicks, *tmp;
g_return_val_if_fail(rec != NULL, FALSE); g_return_val_if_fail(rec != NULL, FALSE);
@ -47,16 +46,16 @@ static int ignore_check_replies(IGNORE_REC *rec, IRC_SERVER_REC *server,
g_return_val_if_fail(channel != NULL, FALSE); g_return_val_if_fail(channel != NULL, FALSE);
g_return_val_if_fail(text != NULL, FALSE); g_return_val_if_fail(text != NULL, FALSE);
chanrec = irc_channel_find(server, channel); chanrec = channel_find(server, channel);
if (chanrec == NULL) return FALSE; if (chanrec == NULL) return FALSE;
nicks = nicklist_find_multiple(CHANNEL(chanrec), rec->mask); nicks = nicklist_find_multiple(chanrec, rec->mask);
if (nicks == NULL) return FALSE; if (nicks == NULL) return FALSE;
for (tmp = nicks; tmp != NULL; tmp = tmp->next) { for (tmp = nicks; tmp != NULL; tmp = tmp->next) {
NICK_REC *nick = tmp->data; NICK_REC *nick = tmp->data;
if (nick_match_msg(SERVER(server), text, nick->nick)) if (nick_match_msg(server, text, nick->nick))
return TRUE; return TRUE;
} }
g_slist_free(nicks); g_slist_free(nicks);
@ -64,7 +63,7 @@ static int ignore_check_replies(IGNORE_REC *rec, IRC_SERVER_REC *server,
return FALSE; return FALSE;
} }
int ignore_check(IRC_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)
{ {
GSList *tmp; GSList *tmp;
@ -86,7 +85,7 @@ int ignore_check(IRC_SERVER_REC *server, const char *nick, const char *host,
/* channel list */ /* channel list */
if (rec->channels != NULL) { if (rec->channels != NULL) {
if (channel == NULL || !ischannel(*channel)) if (channel == NULL || !server->ischannel(*channel))
continue; continue;
if (strarray_find(rec->channels, channel) == -1) if (strarray_find(rec->channels, channel) == -1)
continue; continue;
@ -103,7 +102,7 @@ int ignore_check(IRC_SERVER_REC *server, const char *nick, const char *host,
ok = ((host == NULL || *host == '\0')) ? ok = ((host == NULL || *host == '\0')) ?
match_wildcards(rec->mask, nick) : match_wildcards(rec->mask, nick) :
mask_match_address(SERVER(server), rec->mask, nick, host); mask_match_address(server, rec->mask, nick, host);
if (!ok) { if (!ok) {
/* nick didn't match, but maybe this is a reply to nick? */ /* nick didn't match, but maybe this is a reply to nick? */
if (!rec->replies || channel == NULL || text == NULL || if (!rec->replies || channel == NULL || text == NULL ||
@ -114,7 +113,10 @@ int ignore_check(IRC_SERVER_REC *server, const char *nick, const char *host,
/* pattern */ /* pattern */
patt_len = 0; patt_len = 0;
if (rec->pattern != NULL && text != NULL) { if (rec->pattern != NULL) {
if (text == NULL)
continue;
if (!mask_len && !best_mask) { if (!mask_len && !best_mask) {
patt_len = strlen(rec->pattern); patt_len = strlen(rec->pattern);
if (patt_len <= best_patt) continue; if (patt_len <= best_patt) continue;

2
src/irc/core/ignore.h → src/core/ignore.h
View File

@ -20,7 +20,7 @@ typedef struct {
extern GSList *ignores; extern GSList *ignores;
int ignore_check(IRC_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); IGNORE_REC *ignore_find(const char *servertag, const char *mask, char **channels);

2
src/irc/core/Makefile.am
View File

@ -11,7 +11,6 @@ libirc_core_a_SOURCES = \
channels-query.c \ channels-query.c \
channel-events.c \ channel-events.c \
channel-rejoin.c \ channel-rejoin.c \
ignore.c \
irc.c \ irc.c \
irc-core.c \ irc-core.c \
irc-channels.c \ irc-channels.c \
@ -37,7 +36,6 @@ libirc_core_a_SOURCES = \
noinst_HEADERS = \ noinst_HEADERS = \
bans.h \ bans.h \
ctcp.h \ ctcp.h \
ignore.h \
irc.h \ irc.h \
irc-channels.h \ irc-channels.h \
irc-chatnets.h \ irc-chatnets.h \

3
src/irc/core/channels-query.c
View File

@ -128,7 +128,8 @@ static void sig_channel_destroyed(IRC_CHANNEL_REC *channel)
{ {
g_return_if_fail(channel != NULL); g_return_if_fail(channel != NULL);
if (channel->server != NULL && !channel->synced) if (IS_IRC_CHANNEL(channel) && channel->server != NULL &&
!channel->synced)
channel_query_remove_all(channel); channel_query_remove_all(channel);
} }

4
src/irc/core/ctcp.c
View File

@ -120,7 +120,7 @@ static void ctcp_msg(const char *data, IRC_SERVER_REC *server,
{ {
char *args, *str; char *args, *str;
if (ignore_check(server, nick, addr, target, data, MSGLEVEL_CTCPS)) if (ignore_check(SERVER(server), nick, addr, target, data, MSGLEVEL_CTCPS))
return; return;
str = g_strconcat("ctcp msg ", data, NULL); str = g_strconcat("ctcp msg ", data, NULL);
@ -140,7 +140,7 @@ static void ctcp_reply(const char *data, IRC_SERVER_REC *server,
{ {
char *args, *str; char *args, *str;
if (ignore_check(server, nick, addr, target, data, MSGLEVEL_CTCPS)) if (ignore_check(SERVER(server), nick, addr, target, data, MSGLEVEL_CTCPS))
return; return;
str = g_strconcat("ctcp reply ", data, NULL); str = g_strconcat("ctcp reply ", data, NULL);

3
src/irc/core/irc-core.c
View File

@ -27,7 +27,6 @@
#include "irc-queries.h" #include "irc-queries.h"
#include "ctcp.h" #include "ctcp.h"
#include "ignore.h"
#include "irc.h" #include "irc.h"
#include "netsplit.h" #include "netsplit.h"
@ -71,7 +70,6 @@ void irc_core_init(void)
irc_irc_init(); irc_irc_init();
lag_init(); lag_init();
netsplit_init(); netsplit_init();
ignore_init();
irc_rawlog_init(); irc_rawlog_init();
irc_special_vars_init(); irc_special_vars_init();
irc_log_init(); irc_log_init();
@ -82,7 +80,6 @@ void irc_core_deinit(void)
irc_log_deinit(); irc_log_deinit();
irc_special_vars_deinit(); irc_special_vars_deinit();
irc_rawlog_deinit(); irc_rawlog_deinit();
ignore_deinit();
netsplit_deinit(); netsplit_deinit();
lag_deinit(); lag_deinit();
irc_commands_deinit(); irc_commands_deinit();

6
src/irc/flood/flood.c
View File

@ -211,7 +211,7 @@ static void flood_privmsg(const char *data, IRC_SERVER_REC *server, const char *
params = event_get_params(data, 2, &target, &text); params = event_get_params(data, 2, &target, &text);
level = ischannel(*target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS; level = ischannel(*target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS;
if (addr != NULL && !ignore_check(server, nick, addr, target, text, level)) if (addr != NULL && !ignore_check(SERVER(server), nick, addr, target, text, level))
flood_newmsg(server, level, nick, addr, target); flood_newmsg(server, level, nick, addr, target);
g_free(params); g_free(params);
@ -228,7 +228,7 @@ static void flood_notice(const char *data, IRC_SERVER_REC *server, const char *n
return; return;
params = event_get_params(data, 2, &target, &text); params = event_get_params(data, 2, &target, &text);
if (!ignore_check(server, nick, addr, target, text, MSGLEVEL_NOTICES)) if (!ignore_check(SERVER(server), nick, addr, target, text, MSGLEVEL_NOTICES))
flood_newmsg(server, MSGLEVEL_NOTICES, nick, addr, target); flood_newmsg(server, MSGLEVEL_NOTICES, nick, addr, target);
g_free(params); g_free(params);
@ -246,7 +246,7 @@ static void flood_ctcp(const char *data, IRC_SERVER_REC *server, const char *nic
level = g_strncasecmp(data, "ACTION ", 7) != 0 ? MSGLEVEL_CTCPS : level = g_strncasecmp(data, "ACTION ", 7) != 0 ? MSGLEVEL_CTCPS :
(ischannel(*target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS); (ischannel(*target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS);
if (!ignore_check(server, nick, addr, target, data, level)) if (!ignore_check(SERVER(server), nick, addr, target, data, level))
flood_newmsg(server, level, nick, addr, target); flood_newmsg(server, level, nick, addr, target);
} }