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

Merge pull request #533 from dequis/statusmess

Browse Source 
Set the default STATUSMSG to @ instead of @+ if it's missing
This commit is contained in:
LemonBoy 2016-09-04 12:11:02 +02:00 committed by ailin-nemui
parent 750e324903
commit 31c0a9d7e8
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/fe-common/irc/fe-irc-channels.c
View File

@ -41,7 +41,7 @@ int fe_channel_is_opchannel(IRC_SERVER_REC *server, const char *target)
statusmsg = g_hash_table_lookup(server->isupport, "statusmsg"); statusmsg = g_hash_table_lookup(server->isupport, "statusmsg");
if (statusmsg == NULL) if (statusmsg == NULL)
statusmsg = "@+"; statusmsg = "@";
return strchr(statusmsg, *target) != NULL; return strchr(statusmsg, *target) != NULL;
} }
@ -61,12 +61,9 @@ const char *fe_channel_skip_prefix(IRC_SERVER_REC *server, const char *target)
statusmsg = g_hash_table_lookup(server->isupport, "statusmsg"); statusmsg = g_hash_table_lookup(server->isupport, "statusmsg");
/* Hack: for bahamut 1.4 which sends neither STATUSMSG nor /* Hack: for bahamut 1.4 which sends neither STATUSMSG nor
* WALLCHOPS in 005, accept @#chan and @+#chan (but not +#chan) */ * WALLCHOPS in 005 */
if (statusmsg == NULL && *target != '@')
return target;
if (statusmsg == NULL) if (statusmsg == NULL)
statusmsg = "@+"; statusmsg = "@";
/* Strip the leading statusmsg prefixes */ /* Strip the leading statusmsg prefixes */
while (strchr(statusmsg, *target) != NULL) { while (strchr(statusmsg, *target) != NULL) {

6
src/irc/core/irc-servers.c
View File

@ -89,8 +89,10 @@ static int ischannel_func(SERVER_REC *server, const char *data)
chantypes = "#&!+"; /* normal, local, secure, modeless */ chantypes = "#&!+"; /* normal, local, secure, modeless */
statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg"); statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg");
if (statusmsg != NULL) if (statusmsg == NULL)
data += strspn(data, statusmsg); statusmsg = "@";
data += strspn(data, statusmsg);
/* strchr(3) considers the trailing NUL as part of the string, make sure /* strchr(3) considers the trailing NUL as part of the string, make sure
* we didn't advance too much. */ * we didn't advance too much. */