zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-23 10:32:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 1bfa44524d into 49bdd179b2

Browse source
This commit is contained in:
ailin-nemui 2016-03-17 15:17:49 +00:00
commit a35ee9e7e7
1 changed files with 35 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/irc/core/irc-servers.c
View file

@ -78,17 +78,47 @@ static int ischannel_func(SERVER_REC *server, const char *data)
IRC_SERVER_REC *irc_server = (IRC_SERVER_REC *) server; IRC_SERVER_REC *irc_server = (IRC_SERVER_REC *) server;
char *chantypes, *statusmsg; char *chantypes, *statusmsg;
/* empty string is no channel */
if (*data == '\0')
return FALSE;
chantypes = g_hash_table_lookup(irc_server->isupport, "chantypes"); chantypes = g_hash_table_lookup(irc_server->isupport, "chantypes");
if (chantypes == NULL) if (chantypes == NULL)
chantypes = "#&!+"; /* normal, local, secure, modeless */ chantypes = "#&!+"; /* normal, local, secure, modeless */
if (strchr(chantypes, *data) != NULL)
return TRUE;
statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg"); statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg");
if (statusmsg == NULL) if (statusmsg == NULL) {
statusmsg = "@+"; gboolean wallchops = g_hash_table_lookup(irc_server->isupport,
"wallchops") != NULL;
gboolean wallvoices = g_hash_table_lookup(irc_server->isupport,
"wallvoices") != NULL;
if (wallchops && wallvoices)
statusmsg = "@+";
else if (wallchops)
statusmsg = "@";
else if (wallvoices)
statusmsg = "+";
else
return FALSE;
}
while (strchr(statusmsg, *data) != NULL) /* No statusmsg announced, so there is no statusmsg prefix to skip */
data++; if (*statusmsg == '\0')
return FALSE;
return strchr(chantypes, *data) != NULL; while (*data != '\0') {
if (strchr(chantypes, *data) != NULL)
return TRUE;
else if (strchr(statusmsg, *data) != NULL)
data++;
else
return FALSE;
}
return FALSE;
} }
static char **split_line(const SERVER_REC *server, const char *line, static char **split_line(const SERVER_REC *server, const char *line,