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

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

Browse Source
This commit is contained in:
Sébastien Helleu
2021-10-14 23:28:44 +02:00
parent 8d12187f3d
commit 03e0122155
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/irc/irc-protocol.c
+11 -6
View File
@@ -2968,7 +2968,7 @@ IRC_PROTOCOL_CALLBACK(quit)
* (received when capability "setname" is enabled).
*
* Command looks like:
* :nick!user@host SETNAME :the realname
* SETNAME :the realname
*/
IRC_PROTOCOL_CALLBACK(setname)
@@ -2976,13 +2976,16 @@ IRC_PROTOCOL_CALLBACK(setname)
int local_setname;
struct t_irc_channel *ptr_channel;
struct t_irc_nick *ptr_nick;
char *pos_realname, *realname_color;
char *str_params, *realname_color;
IRC_PROTOCOL_MIN_ARGS(3);
IRC_PROTOCOL_MIN_PARAMS(1);
IRC_PROTOCOL_CHECK_NICK;
local_setname = (irc_server_strcasecmp (server, nick, server->nick) == 0);
pos_realname = (argv_eol[2][0] == ':') ? argv_eol[2] + 1 : argv_eol[2];
str_params = irc_protocol_string_params (params, 0, num_params - 1);
if (!str_params)
return WEECHAT_RC_ERROR;
if (weechat_hashtable_has_key (server->cap_list, "setname"))
{
@@ -2994,7 +2997,7 @@ IRC_PROTOCOL_CALLBACK(setname)
{
if (ptr_nick->realname)
free (ptr_nick->realname);
ptr_nick->realname = strdup (pos_realname);
ptr_nick->realname = strdup (str_params);
}
}
}
@@ -3002,7 +3005,7 @@ IRC_PROTOCOL_CALLBACK(setname)
if (!ignored)
{
realname_color = irc_color_decode (
pos_realname,
str_params,
weechat_config_boolean (irc_config_network_colors_receive));
if (local_setname)
{
@@ -3031,6 +3034,8 @@ IRC_PROTOCOL_CALLBACK(setname)
free (realname_color);
}
free (str_params);
return WEECHAT_RC_OK;
}
tests/unit/plugins/irc/test-irc-protocol.cpp
+6 -2
View File
@@ -1764,9 +1764,13 @@ TEST(IrcProtocolWithServer, setname_without_setname_cap)
POINTERS_EQUAL(NULL, ptr_nick->realname);
/* not enough arguments */
/* not enough parameters */
RECV(":alice!user@host SETNAME");
CHECK_ERROR_ARGS("setname", 2, 3);
CHECK_ERROR_PARAMS("setname", 0, 1);
/* missing nick */
RECV("SETNAME :new bob realname");
CHECK_ERROR_NICK("setname");
POINTERS_EQUAL(NULL, ptr_nick->realname);