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

Introduce get_kick_reason() and switch all kick commands to use it

Browse Source 
get_reason() is then used only for the implementation of get_kick_reason()
and for the $getreason() scripting function.  Add current nick as an
explicit argument for get_reason(), which pushes all use of from_server
out of the ransom reason functions.

Also switch a few instances of send_to_server() to my_send_to_server() where
the current server has been returned by prepare_command().
This commit is contained in:
Kevin Easton
2015-06-28 00:35:50 +10:00
parent ff251080da
commit 498631e74a
5 changed files with 51 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/commands.c
View File

@@ -3669,25 +3669,22 @@ BUILT_IN_COMMAND(send_kill)
BUILT_IN_COMMAND(send_kick)
{
char *kickee,
*comment,
*channel = NULL;
ChannelList *chan;
int server = from_server;
const char *kickee, *comment;
char *channel;
ChannelList *chan;
int server = from_server;
if (!(channel = next_arg(args, &args)))
if (!(channel = next_arg(args, &args)))
return;
if (!(kickee = next_arg(args, &args)))
if (!(kickee = next_arg(args, &args)))
return;
comment = args?args:get_reason(kickee, NULL);
reset_display_target();
if (!(chan = prepare_command(&server, (channel && !strcmp(channel, "*"))?NULL:channel, NEED_OP)))
if (!(chan = prepare_command(&server, !strcmp(channel, "*") ? NULL : channel, NEED_OP)))
return;
comment = args ? args : get_kick_reason(kickee, get_server_nickname(server));
my_send_to_server(server, "%s %s %s :%s", command, chan->channel, kickee, comment);
}