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

irc: use parsed command parameters in "305" and "306" command callbacks

Browse Source
This commit is contained in:
Sébastien Helleu
2021-10-15 21:10:00 +02:00
parent efecdf5d45
commit f51f3dbe29
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/irc/irc-protocol.c
+18 -8
View File
@@ -3799,15 +3799,18 @@ IRC_PROTOCOL_CALLBACK(303)
* Callback for the IRC command "305": unaway.
*
* Command looks like:
* :server 305 mynick :Does this mean you're really back?
* 305 mynick :Does this mean you're really back?
*/
IRC_PROTOCOL_CALLBACK(305)
{
IRC_PROTOCOL_MIN_ARGS(3);
char *str_params;
if (argc > 3)
IRC_PROTOCOL_MIN_PARAMS(1);
if (num_params > 1)
{
str_params = irc_protocol_string_params (params, 1, num_params - 1);
weechat_printf_date_tags (
irc_msgbuffer_get_target_buffer (
server, NULL, command, "unaway", NULL),
@@ -3815,7 +3818,9 @@ IRC_PROTOCOL_CALLBACK(305)
irc_protocol_tags (command, "irc_numeric", NULL, NULL),
"%s%s",
weechat_prefix ("network"),
(argv_eol[3][0] == ':') ? argv_eol[3] + 1 : argv_eol[3]);
str_params);
if (str_params)
free (str_params);
}
server->is_away = 0;
@@ -3830,15 +3835,18 @@ IRC_PROTOCOL_CALLBACK(305)
* Callback for the IRC command "306": now away.
*
* Command looks like:
* :server 306 mynick :We'll miss you
* 306 mynick :We'll miss you
*/
IRC_PROTOCOL_CALLBACK(306)
{
IRC_PROTOCOL_MIN_ARGS(3);
char *str_params;
if (argc > 3)
IRC_PROTOCOL_MIN_PARAMS(1);
if (num_params > 1)
{
str_params = irc_protocol_string_params (params, 1, num_params - 1);
weechat_printf_date_tags (
irc_msgbuffer_get_target_buffer (
server, NULL, command, "away", NULL),
@@ -3846,7 +3854,9 @@ IRC_PROTOCOL_CALLBACK(306)
irc_protocol_tags (command, "irc_numeric", NULL, NULL),
"%s%s",
weechat_prefix ("network"),
(argv_eol[3][0] == ':') ? argv_eol[3] + 1 : argv_eol[3]);
str_params);
if (str_params)
free (str_params);
}
server->is_away = 1;
tests/unit/plugins/irc/test-irc-protocol.cpp
+3 -2
View File
@@ -2311,10 +2311,11 @@ TEST(IrcProtocolWithServer, 305_306)
RECV(":bob!user@host PRIVMSG alice :hi Alice!");
CHECK_PV("bob", "bob hi Alice!");
/* not enough arguments */
/* not enough parameters */
RECV(":server 305");
CHECK_ERROR_ARGS("305", 2, 3);
CHECK_ERROR_PARAMS("305", 0, 1);
RECV(":server 306");
CHECK_ERROR_PARAMS("306", 0, 1);
POINTERS_EQUAL(NULL, ptr_server->channels->away_message);