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

Such draft. Very wow.

Browse Source
This commit is contained in:
LemonBoy 2016-06-26 21:44:40 +02:00
parent 8f5e200551
commit c0f66c95ff
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/fe-common/irc/fe-netjoin.c
View File

@ -248,16 +248,10 @@ static void sig_print_starting(TEXT_DEST_REC *dest)
if (printing_joins) if (printing_joins)
return; return;
/* Do not dump the netsplit stats unless:
* a) This is an IRC server
* b) The message level is high enough
* b) The message belongs to a channel
* c) There's a NETJOIN record for this server
*/
if (!IS_IRC_SERVER(dest->server)) if (!IS_IRC_SERVER(dest->server))
return; return;
if (dest->level != MSGLEVEL_MSGS) if (dest->level != MSGLEVEL_PUBLIC)
return; return;
if (!server_ischannel(dest->server, dest->target)) if (!server_ischannel(dest->server, dest->target))

31
src/fe-common/irc/fe-netsplit.c
View File

@ -142,7 +142,7 @@ static void get_server_splits(void *key, NETSPLIT_REC *split,
} }
} }
static void print_server_splits(IRC_SERVER_REC *server, TEMP_SPLIT_REC *rec) static void print_server_splits(IRC_SERVER_REC *server, TEMP_SPLIT_REC *rec, const char *channel)
{ {
GString *destservers; GString *destservers;
char *sourceserver; char *sourceserver;
@ -168,6 +168,9 @@ static void print_server_splits(IRC_SERVER_REC *server, TEMP_SPLIT_REC *rec)
for (tmp = rec->channels; tmp != NULL; tmp = tmp->next) { for (tmp = rec->channels; tmp != NULL; tmp = tmp->next) {
TEMP_SPLIT_CHAN_REC *chan = tmp->data; TEMP_SPLIT_CHAN_REC *chan = tmp->data;
if (channel != NULL && strcasecmp(channel, chan->name) != 0)
continue;
g_string_truncate(chan->nicks, chan->nicks->len-2); g_string_truncate(chan->nicks, chan->nicks->len-2);
if (netsplit_max_nicks > 0 && if (netsplit_max_nicks > 0 &&
@ -193,7 +196,7 @@ static void temp_split_chan_free(TEMP_SPLIT_CHAN_REC *rec)
g_free(rec); g_free(rec);
} }
static void print_splits(IRC_SERVER_REC *server) static void print_splits(IRC_SERVER_REC *server, const char *channel)
{ {
TEMP_SPLIT_REC temp; TEMP_SPLIT_REC temp;
GSList *servers; GSList *servers;
@ -212,7 +215,7 @@ static void print_splits(IRC_SERVER_REC *server)
g_hash_table_foreach(server->splits, g_hash_table_foreach(server->splits,
(GHFunc) get_server_splits, &temp); (GHFunc) get_server_splits, &temp);
print_server_splits(server, &temp); print_server_splits(server, &temp, channel);
g_slist_foreach(temp.channels, g_slist_foreach(temp.channels,
(GFunc) temp_split_chan_free, NULL); (GFunc) temp_split_chan_free, NULL);
@ -233,25 +236,31 @@ static int check_server_splits(IRC_SERVER_REC *server)
if (time(NULL)-last < SPLIT_WAIT_TIME) if (time(NULL)-last < SPLIT_WAIT_TIME)
return FALSE; return FALSE;
print_splits(server); print_splits(server, NULL);
return TRUE; return TRUE;
} }
/* something is going to be printed to screen, print our current netsplit /* something is going to be printed to screen, print our current netsplit
message before it. */ message before it. */
static void sig_print_starting(void) static void sig_print_starting(TEXT_DEST_REC *dest)
{ {
GSList *tmp; IRC_SERVER_REC *rec;
if (printing_splits) if (printing_splits)
return; return;
for (tmp = servers; tmp != NULL; tmp = tmp->next) { if (IS_IRC_SERVER(dest->server) == FALSE)
IRC_SERVER_REC *rec = tmp->data; return;
if (IS_IRC_SERVER(rec) && rec->split_servers != NULL) if (dest->level != MSGLEVEL_PUBLIC)
print_splits(rec); return;
}
if (server_ischannel(dest->server, dest->target) == FALSE)
return;
rec = IRC_SERVER(dest->server);
if (rec->split_servers != NULL)
print_splits(rec, dest->target);
} }
static int sig_check_splits(void) static int sig_check_splits(void)