From 033fbf63b0a4c7a8e5fecc93cae29eb007c93fc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= <flashcode@flashtux.org>
Date: Fri, 15 Oct 2021 19:59:40 +0200
Subject: [PATCH] irc: use parsed command parameters in "008" command callback

---
 src/plugins/irc/irc-protocol.c               | 19 +++++++++++++------
 tests/unit/plugins/irc/test-irc-protocol.cpp |  8 ++++----
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c
index 487a95758..183d24719 100644
--- a/src/plugins/irc/irc-protocol.c
+++ b/src/plugins/irc/irc-protocol.c
@@ -3641,23 +3641,30 @@ IRC_PROTOCOL_CALLBACK(005)
  * Callback for the IRC command "008": server notice mask.
  *
  * Command looks like:
- *   :server 008 nick +Zbfkrsuy :Server notice mask
+ *   008 nick +Zbfkrsuy :Server notice mask
  */
 
 IRC_PROTOCOL_CALLBACK(008)
 {
-    IRC_PROTOCOL_MIN_ARGS(4);
+    char *str_params;
+
+    IRC_PROTOCOL_MIN_PARAMS(2);
+
+    str_params = irc_protocol_string_params (params, 1, num_params - 1);
 
     weechat_printf_date_tags (
-        irc_msgbuffer_get_target_buffer (server, argv[2], command, NULL, NULL),
+        irc_msgbuffer_get_target_buffer (server, params[0], command, NULL, NULL),
         date,
         irc_protocol_tags (command, "irc_numeric", NULL, address),
         _("%sServer notice mask for %s%s%s: %s"),
         weechat_prefix ("network"),
-        irc_nick_color_for_msg (server, 1, NULL, argv[2]),
-        argv[2],
+        irc_nick_color_for_msg (server, 1, NULL, params[0]),
+        params[0],
         IRC_COLOR_RESET,
-        (argv_eol[3][0] == ':') ? argv_eol[3] + 1 : argv_eol[3]);
+        str_params);
+
+    if (str_params)
+        free (str_params);
 
     return WEECHAT_RC_OK;
 }
diff --git a/tests/unit/plugins/irc/test-irc-protocol.cpp b/tests/unit/plugins/irc/test-irc-protocol.cpp
index 62ce5ada6..baa7575f0 100644
--- a/tests/unit/plugins/irc/test-irc-protocol.cpp
+++ b/tests/unit/plugins/irc/test-irc-protocol.cpp
@@ -2122,14 +2122,14 @@ TEST(IrcProtocolWithServer, 008)
 {
     SRV_INIT;
 
-    /* not enough arguments */
+    /* not enough parameters */
     RECV(":server 008");
-    CHECK_ERROR_ARGS("008", 2, 4);
+    CHECK_ERROR_PARAMS("008", 0, 2);
     RECV(":server 008 alice");
-    CHECK_ERROR_ARGS("008", 3, 4);
+    CHECK_ERROR_PARAMS("008", 1, 2);
 
     RECV(":server 008 alice +Zbfkrsuy :Server notice mask");
-    CHECK_SRV("-- Server notice mask for alice: +Zbfkrsuy :Server notice mask");
+    CHECK_SRV("-- Server notice mask for alice: +Zbfkrsuy Server notice mask");
 }
 
 /*