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

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

Browse Source
This commit is contained in:
Sébastien Helleu
2021-10-16 09:25:59 +02:00
parent 3360cadd55
commit 572bcc2c59
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/irc/irc-protocol.c
+15 -8
View File
@@ -3941,30 +3941,37 @@ IRC_PROTOCOL_CALLBACK(whowas_nick_msg)
* Callback for the IRC command "311": whois, user.
*
* Command looks like:
* :server 311 mynick nick user host * :realname here
* 311 mynick nick user host * :realname here
*/
IRC_PROTOCOL_CALLBACK(311)
{
IRC_PROTOCOL_MIN_ARGS(8);
char *str_params;
IRC_PROTOCOL_MIN_PARAMS(6);
str_params = irc_protocol_string_params (params, 5, num_params - 1);
weechat_printf_date_tags (
irc_msgbuffer_get_target_buffer (
server, argv[3], command, "whois", NULL),
server, params[1], command, "whois", NULL),
date,
irc_protocol_tags (command, "irc_numeric", NULL, NULL),
"%s%s[%s%s%s] (%s%s@%s%s)%s: %s",
weechat_prefix ("network"),
IRC_COLOR_CHAT_DELIMITERS,
irc_nick_color_for_msg (server, 1, NULL, argv[3]),
argv[3],
irc_nick_color_for_msg (server, 1, NULL, params[1]),
params[1],
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_HOST,
argv[4],
argv[5],
params[2],
params[3],
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_RESET,
(argv_eol[7][0] == ':') ? argv_eol[7] + 1 : argv_eol[7]);
str_params);
if (str_params)
free (str_params);
return WEECHAT_RC_OK;
}
tests/unit/plugins/irc/test-irc-protocol.cpp
+7 -7
View File
@@ -2429,19 +2429,19 @@ TEST(IrcProtocolWithServer, 311)
{
SRV_INIT;
/* not enough arguments */
/* not enough parameters */
RECV(":server 311");
CHECK_ERROR_ARGS("311", 2, 8);
CHECK_ERROR_PARAMS("311", 0, 6);
RECV(":server 311 alice");
CHECK_ERROR_ARGS("311", 3, 8);
CHECK_ERROR_PARAMS("311", 1, 6);
RECV(":server 311 alice bob");
CHECK_ERROR_ARGS("311", 4, 8);
CHECK_ERROR_PARAMS("311", 2, 6);
RECV(":server 311 alice bob user");
CHECK_ERROR_ARGS("311", 5, 8);
CHECK_ERROR_PARAMS("311", 3, 6);
RECV(":server 311 alice bob user host");
CHECK_ERROR_ARGS("311", 6, 8);
CHECK_ERROR_PARAMS("311", 4, 6);
RECV(":server 311 alice bob user host *");
CHECK_ERROR_ARGS("311", 7, 8);
CHECK_ERROR_PARAMS("311", 5, 6);
RECV(":server 311 alice bob user host * :real name");
CHECK_SRV("-- [bob] (user@host): real name");