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 "368" command callback

Browse Source
This commit is contained in:
Sébastien Helleu
2021-10-16 18:30:13 +02:00
parent 96288d69e2
commit c7cb025582
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/irc/irc-protocol.c
+16 -10
View File
@@ -6073,25 +6073,27 @@ IRC_PROTOCOL_CALLBACK(367)
* Callback for the IRC command "368": end of banlist.
*
* Command looks like:
* :server 368 mynick #channel :End of Channel Ban List
* 368 mynick #channel :End of Channel Ban List
*/
IRC_PROTOCOL_CALLBACK(368)
{
char *pos_args;
char *str_params;
struct t_irc_channel *ptr_channel;
struct t_gui_buffer *ptr_buffer;
struct t_irc_modelist *ptr_modelist;
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 = (num_params > 2) ?
irc_protocol_string_params (params, 2, num_params - 1) : NULL;
ptr_channel = irc_channel_search (server, argv[3]);
ptr_channel = irc_channel_search (server, params[1]);
ptr_buffer = (ptr_channel && ptr_channel->nicks) ?
ptr_channel->buffer : server->buffer;
ptr_modelist = irc_modelist_search (ptr_channel, 'b');
ptr_modelist = (ptr_channel) ?
irc_modelist_search (ptr_channel, 'b') : NULL;
if (ptr_modelist)
{
if (ptr_modelist->state != IRC_MODELIST_STATE_RECEIVING)
@@ -6104,6 +6106,7 @@ IRC_PROTOCOL_CALLBACK(368)
}
ptr_modelist->state = IRC_MODELIST_STATE_RECEIVED;
}
weechat_printf_date_tags (
irc_msgbuffer_get_target_buffer (
server, NULL, command, "banlist", ptr_buffer),
@@ -6113,11 +6116,14 @@ IRC_PROTOCOL_CALLBACK(368)
weechat_prefix ("network"),
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_CHANNEL,
argv[3],
params[1],
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_RESET,
(pos_args) ? " " : "",
(pos_args) ? pos_args : "");
(str_params) ? " " : "",
(str_params) ? str_params : "");
if (str_params)
free (str_params);
return WEECHAT_RC_OK;
}
tests/unit/plugins/irc/test-irc-protocol.cpp
+3 -3
View File
@@ -3611,11 +3611,11 @@ TEST(IrcProtocolWithServer, 368)
{
SRV_INIT_JOIN;
/* not enough arguments */
/* not enough parameters */
RECV(":server 368");
CHECK_ERROR_ARGS("368", 2, 4);
CHECK_ERROR_PARAMS("368", 0, 2);
RECV(":server 368 alice");
CHECK_ERROR_ARGS("368", 3, 4);
CHECK_ERROR_PARAMS("368", 1, 2);
RECV(":server 368 alice #test");
CHECK_CHAN("-- [#test]");