philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix /KB so that it kicks-then-bans as documented

Browse Source 
This also fixes a few others - eg /KBI now kicks-then-bans, and
/BKI bans-then-kicks (previously these were the wrong way around).

Reported by profiler.
This commit is contained in:
Kevin Easton
2015-09-20 21:54:54 +10:00
parent e0bdc609c1
commit 857a5fa524
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@@ -1,5 +1,7 @@
[Changes 1.2.2] [Changes 1.2.2]
* Fix /KB so that it kicks-then-bans as intended (reported by profiler). (caf)
* Fix $functioncall() scripting function (reported by |Rain|). (caf) * Fix $functioncall() scripting function (reported by |Rain|). (caf)
* Ensure close_server() clears the internal command queues for the right * Ensure close_server() clears the internal command queues for the right

4
source/banlist.c
View File

@@ -1002,9 +1002,9 @@ BUILT_IN_COMMAND(kickban)
set_display_target(chan->channel, LOG_KICK); set_display_target(chan->channel, LOG_KICK);
if (command) if (command)
{ {
if (!strstr(command, "KB")) if (strstr(command, "KB"))
kick_first = 1; kick_first = 1;
set_ignore = (command[strlen(command)-1] == 'I') ? 1 : 0; set_ignore = (command[strlen(command)-1] == 'I');
} }
if (!spec && !(spec = new_next_arg(args, &args))) if (!spec && !(spec = new_next_arg(args, &args)))
{ {

2
source/commands.c
View File

@@ -248,7 +248,7 @@ IrcCommand irc_command[] =
{ "BHELP", "BHELP", chelp, 0, "%Y<%nhelp%W|%nindex%W|%nother%Y>%n\n - BitchX help command" }, { "BHELP", "BHELP", chelp, 0, "%Y<%nhelp%W|%nindex%W|%nother%Y>%n\n - BitchX help command" },
#endif #endif
{ "BIND", NULL, bindcmd, 0, "- Command to bind a key to a function" }, { "BIND", NULL, bindcmd, 0, "- Command to bind a key to a function" },
{ "BK", NULL, kickban, SERVERREQ, "%Y<%Cnick%Y>%n %R[%nreason%R]%n\n- Deops, bans and kicks %Y<%Cnick%Y>%n for %R[%nreason%R]%n" }, { "BK", "BK", kickban, SERVERREQ, "%Y<%Cnick%Y>%n %R[%nreason%R]%n\n- Deops, bans and kicks %Y<%Cnick%Y>%n for %R[%nreason%R]%n" },
{ "BKI", "BKI", kickban, SERVERREQ, "%Y<%Cnick%Y>%n %R[%nreason%R]%n\n- Deops, bans, kicks and ignores %Y<%Cnick%Y>%n for %R[%nreason%R]%n" }, { "BKI", "BKI", kickban, SERVERREQ, "%Y<%Cnick%Y>%n %R[%nreason%R]%n\n- Deops, bans, kicks and ignores %Y<%Cnick%Y>%n for %R[%nreason%R]%n" },
{ "BLESS", NULL, blesscmd, 0, scripting_command }, { "BLESS", NULL, blesscmd, 0, scripting_command },
{ "BREAK", NULL, breakcmd, 0, NULL }, { "BREAK", NULL, breakcmd, 0, NULL },