pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-26 12:56:37 +02:00
Code Activity

irc: use parsed command parameters in "321" command callback

Browse Source
This commit is contained in:
Sébastien Helleu
2021-10-16 09:39:00 +02:00
parent 4e1d40034e
commit c577da0375
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/irc/irc-protocol.c
+10 -8
View File
@@ -4192,17 +4192,16 @@ IRC_PROTOCOL_CALLBACK(317)
* Callback for the IRC command "321": /list start.
*
* Command looks like:
* :server 321 mynick Channel :Users Name
* 321 mynick Channel :Users Name
*/
IRC_PROTOCOL_CALLBACK(321)
{
char *pos_args;
char *str_params;
IRC_PROTOCOL_MIN_ARGS(4);
IRC_PROTOCOL_MIN_PARAMS(2);
pos_args = (argc > 4) ?
((argv_eol[4][0] == ':') ? argv_eol[4] + 1 : argv_eol[4]) : NULL;
str_params = irc_protocol_string_params (params, 2, num_params - 1);
weechat_printf_date_tags (
irc_msgbuffer_get_target_buffer (
@@ -4211,9 +4210,12 @@ IRC_PROTOCOL_CALLBACK(321)
irc_protocol_tags (command, "irc_numeric", NULL, NULL),
"%s%s%s%s",
weechat_prefix ("network"),
argv[3],
(pos_args) ? " " : "",
(pos_args) ? pos_args : "");
params[1],
(str_params && str_params[0]) ? " " : "",
(str_params && str_params[0]) ? str_params : "");
if (str_params)
free (str_params);
return WEECHAT_RC_OK;
}
tests/unit/plugins/irc/test-irc-protocol.cpp
+3 -3
View File
@@ -2566,11 +2566,11 @@ TEST(IrcProtocolWithServer, 321)
{
SRV_INIT;
/* not enough arguments */
/* not enough parameters */
RECV(":server 321");
CHECK_ERROR_ARGS("321", 2, 4);
CHECK_ERROR_PARAMS("321", 0, 2);
RECV(":server 321 alice");
CHECK_ERROR_ARGS("321", 3, 4);
CHECK_ERROR_PARAMS("321", 1, 2);
RECV(":server 321 alice #test");
CHECK_SRV("-- #test");