mirror of
https://github.com/irssi/irssi.git
synced 2024-08-25 04:04:18 -04:00
Merge pull request #533 from dequis/statusmess
Set the default STATUSMSG to @ instead of @+ if it's missing
This commit is contained in:
parent
750e324903
commit
31c0a9d7e8
@ -41,7 +41,7 @@ int fe_channel_is_opchannel(IRC_SERVER_REC *server, const char *target)
|
||||
|
||||
statusmsg = g_hash_table_lookup(server->isupport, "statusmsg");
|
||||
if (statusmsg == NULL)
|
||||
statusmsg = "@+";
|
||||
statusmsg = "@";
|
||||
|
||||
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");
|
||||
|
||||
/* Hack: for bahamut 1.4 which sends neither STATUSMSG nor
|
||||
* WALLCHOPS in 005, accept @#chan and @+#chan (but not +#chan) */
|
||||
if (statusmsg == NULL && *target != '@')
|
||||
return target;
|
||||
|
||||
* WALLCHOPS in 005 */
|
||||
if (statusmsg == NULL)
|
||||
statusmsg = "@+";
|
||||
statusmsg = "@";
|
||||
|
||||
/* Strip the leading statusmsg prefixes */
|
||||
while (strchr(statusmsg, *target) != NULL) {
|
||||
|
@ -89,8 +89,10 @@ static int ischannel_func(SERVER_REC *server, const char *data)
|
||||
chantypes = "#&!+"; /* normal, local, secure, modeless */
|
||||
|
||||
statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg");
|
||||
if (statusmsg != NULL)
|
||||
data += strspn(data, statusmsg);
|
||||
if (statusmsg == NULL)
|
||||
statusmsg = "@";
|
||||
|
||||
data += strspn(data, statusmsg);
|
||||
|
||||
/* strchr(3) considers the trailing NUL as part of the string, make sure
|
||||
* we didn't advance too much. */
|
||||
|
Loading…
Reference in New Issue
Block a user