From 20bfe4c1bab4cfbc3e67d6c513924fbd4c964b5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sun, 21 May 2023 22:18:01 +0200 Subject: irc: add missing tags "irc_cap" and "log3" in cap messages (client capability) --- ChangeLog.adoc | 1 + src/plugins/irc/irc-protocol.c | 16 ++++++++-------- tests/unit/plugins/irc/test-irc-protocol.cpp | 24 ++++++++++++------------ 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 0892851bc..06b937eec 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -87,6 +87,7 @@ Bug fixes:: * irc: display command 437 on server buffer when nickname cannot change while banned on channel (issue #88) * irc: add messages 415 (cannot send message to channel) and 742 (mode cannot be set) * irc: add missing tag "log3" in notify messages + * irc: add missing tags "irc_cap" and "log3" in cap messages (client capability) * lua: fix crash with print when the value to print is not a string (issue #1904, issue #1905) * ruby: fix crash on quit when a child process is still running (issue #1889, issue #1915) * script: remove trailing "J" (line feed char) in source of scripts displayed diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index e495eecb2..db3f6e040 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -1041,7 +1041,7 @@ IRC_PROTOCOL_CALLBACK(cap) irc_protocol_cap_print_cb, str_caps); weechat_printf_date_tags ( - server->buffer, date, NULL, + server->buffer, date, "irc_cap,log3", _("%s%s: client capability, server supports: %s"), weechat_prefix ("network"), IRC_PLUGIN_NAME, @@ -1127,7 +1127,7 @@ IRC_PROTOCOL_CALLBACK(cap) irc_protocol_cap_print_cb, str_caps); weechat_printf_date_tags ( - server->buffer, date, NULL, + server->buffer, date, "irc_cap,log3", _("%s%s: client capability, currently enabled: %s"), weechat_prefix ("network"), IRC_PLUGIN_NAME, @@ -1192,7 +1192,7 @@ IRC_PROTOCOL_CALLBACK(cap) if (*str_caps_enabled[0] && *str_caps_disabled[0]) { weechat_printf_date_tags ( - server->buffer, date, NULL, + server->buffer, date, "irc_cap,log3", _("%s%s: client capability, enabled: %s, disabled: %s"), weechat_prefix ("network"), IRC_PLUGIN_NAME, *str_caps_enabled, *str_caps_disabled); @@ -1200,7 +1200,7 @@ IRC_PROTOCOL_CALLBACK(cap) else if (*str_caps_enabled[0]) { weechat_printf_date_tags ( - server->buffer, date, NULL, + server->buffer, date, "irc_cap,log3", _("%s%s: client capability, enabled: %s"), weechat_prefix ("network"), IRC_PLUGIN_NAME, *str_caps_enabled); @@ -1208,7 +1208,7 @@ IRC_PROTOCOL_CALLBACK(cap) else if (*str_caps_disabled[0]) { weechat_printf_date_tags ( - server->buffer, date, NULL, + server->buffer, date, "irc_cap,log3", _("%s%s: client capability, disabled: %s"), weechat_prefix ("network"), IRC_PLUGIN_NAME, *str_caps_disabled); @@ -1252,7 +1252,7 @@ IRC_PROTOCOL_CALLBACK(cap) str_params = irc_protocol_string_params (params, 2, num_params - 1); weechat_printf_date_tags ( - server->buffer, date, NULL, + server->buffer, date, "irc_cap,log3", _("%s%s: client capability, refused: %s"), weechat_prefix ("error"), IRC_PLUGIN_NAME, str_params); if (str_params) @@ -1268,7 +1268,7 @@ IRC_PROTOCOL_CALLBACK(cap) str_params = irc_protocol_string_params (params, 2, num_params - 1); weechat_printf_date_tags ( - server->buffer, date, NULL, + server->buffer, date, "irc_cap,log3", _("%s%s: client capability, now available: %s"), weechat_prefix ("network"), IRC_PLUGIN_NAME, str_params); if (str_params) @@ -1320,7 +1320,7 @@ IRC_PROTOCOL_CALLBACK(cap) str_params = irc_protocol_string_params (params, 2, num_params - 1); weechat_printf_date_tags ( - server->buffer, date, NULL, + server->buffer, date, "irc_cap,log3", _("%s%s: client capability, removed: %s"), weechat_prefix ("network"), IRC_PLUGIN_NAME, str_params); if (str_params) diff --git a/tests/unit/plugins/irc/test-irc-protocol.cpp b/tests/unit/plugins/irc/test-irc-protocol.cpp index 1b6eafdd8..4d1b8e726 100644 --- a/tests/unit/plugins/irc/test-irc-protocol.cpp +++ b/tests/unit/plugins/irc/test-irc-protocol.cpp @@ -1284,54 +1284,54 @@ TEST(IrcProtocolWithServer, cap) /* CAP LS */ RECV("CAP * LS :multi-prefix sasl"); CHECK_SRV("--", "irc: client capability, server supports: multi-prefix sasl", - ""); + "irc_cap,log3"); RECV("CAP * LS * :multi-prefix sasl"); CHECK_NO_MSG; RECV(":server CAP * LS :multi-prefix sasl"); CHECK_SRV("--", "irc: client capability, server supports: multi-prefix sasl", - ""); + "irc_cap,log3"); RECV(":server CAP * LS * :multi-prefix sasl"); CHECK_NO_MSG; /* CAP LIST */ RECV("CAP * LIST :multi-prefix sasl"); CHECK_SRV("--", "irc: client capability, currently enabled: multi-prefix sasl", - ""); + "irc_cap,log3"); RECV("CAP * LIST * :multi-prefix sasl"); CHECK_NO_MSG; RECV(":server CAP * LIST :multi-prefix sasl"); CHECK_SRV("--", "irc: client capability, currently enabled: multi-prefix sasl", - ""); + "irc_cap,log3"); RECV(":server CAP * LIST * :multi-prefix sasl"); CHECK_NO_MSG; /* CAP NEW */ RECV("CAP * NEW :multi-prefix sasl"); CHECK_SRV("--", "irc: client capability, now available: multi-prefix sasl", - ""); + "irc_cap,log3"); RECV(":server CAP * NEW :multi-prefix sasl"); CHECK_SRV("--", "irc: client capability, now available: multi-prefix sasl", - ""); + "irc_cap,log3"); /* CAP DEL */ RECV("CAP * DEL :multi-prefix sasl"); CHECK_SRV("--", "irc: client capability, removed: multi-prefix sasl", - ""); + "irc_cap,log3"); RECV(":server CAP * DEL :multi-prefix sasl"); CHECK_SRV("--", "irc: client capability, removed: multi-prefix sasl", - ""); + "irc_cap,log3"); /* CAP ACK */ RECV("CAP * ACK :sasl"); - CHECK_SRV("--", "irc: client capability, enabled: sasl", ""); + CHECK_SRV("--", "irc: client capability, enabled: sasl", "irc_cap,log3"); RECV(":server CAP * ACK :sasl"); - CHECK_SRV("--", "irc: client capability, enabled: sasl", ""); + CHECK_SRV("--", "irc: client capability, enabled: sasl", "irc_cap,log3"); /* CAP NAK */ RECV("CAP * NAK :sasl"); - CHECK_SRV("=!=", "irc: client capability, refused: sasl", ""); + CHECK_SRV("=!=", "irc: client capability, refused: sasl", "irc_cap,log3"); RECV(":server CAP * NAK :sasl"); - CHECK_SRV("=!=", "irc: client capability, refused: sasl", ""); + CHECK_SRV("=!=", "irc: client capability, refused: sasl", "irc_cap,log3"); } /* -- cgit v1.2.3