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

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

Browse Source
This commit is contained in:
Sébastien Helleu
2021-10-16 11:51:54 +02:00
parent 741343e9aa
commit 5546b0af0e
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/irc/irc-protocol.c
+11 -4
View File
@@ -4865,12 +4865,16 @@ IRC_PROTOCOL_CALLBACK(341)
* Callback for the IRC command "344": channel reop.
*
* Command looks like:
* :server 344 mynick #channel nick!user@host
* 344 mynick #channel nick!user@host
*/
IRC_PROTOCOL_CALLBACK(344)
{
IRC_PROTOCOL_MIN_ARGS(5);
char *str_host;
IRC_PROTOCOL_MIN_PARAMS(3);
str_host = irc_protocol_string_params (params, 2, num_params - 1);
weechat_printf_date_tags (
irc_msgbuffer_get_target_buffer (server, NULL, command, "reop", NULL),
@@ -4879,10 +4883,13 @@ IRC_PROTOCOL_CALLBACK(344)
_("%sChannel reop %s%s%s: %s%s"),
weechat_prefix ("network"),
IRC_COLOR_CHAT_CHANNEL,
argv[3],
params[1],
IRC_COLOR_RESET,
IRC_COLOR_CHAT_HOST,
(argv_eol[4][0] == ':') ? argv_eol[4] + 1 : argv_eol[4]);
str_host);
if (str_host)
free (str_host);
return WEECHAT_RC_OK;
}
tests/unit/plugins/irc/test-irc-protocol.cpp
+8 -4
View File
@@ -2915,20 +2915,24 @@ TEST(IrcProtocolWithServer, 344)
{
SRV_INIT_JOIN;
/* not enough arguments */
/* not enough parameters */
RECV(":server 344");
CHECK_ERROR_ARGS("344", 2, 5);
CHECK_ERROR_PARAMS("344", 0, 3);
RECV(":server 344 alice");
CHECK_ERROR_ARGS("344", 3, 5);
CHECK_ERROR_PARAMS("344", 1, 3);
RECV(":server 344 alice #test");
CHECK_ERROR_ARGS("344", 4, 5);
CHECK_ERROR_PARAMS("344", 2, 3);
RECV(":server 344 alice #test nick!user@host");
CHECK_SRV("-- Channel reop #test: nick!user@host");
RECV(":server 344 alice #test :nick!user@host");
CHECK_SRV("-- Channel reop #test: nick!user@host");
/* channel not found */
RECV(":server 344 alice #xyz nick!user@host");
CHECK_SRV("-- Channel reop #xyz: nick!user@host");
RECV(":server 344 alice #xyz :nick!user@host");
CHECK_SRV("-- Channel reop #xyz: nick!user@host");
}
/*