diff options
| author | Sébastien Helleu <flashcode@flashtux.org> | 2019-06-15 08:14:22 +0200 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2019-06-15 08:14:22 +0200 |
| commit | b6c304ac87f0d40ab2a4ac3fac49b078cb9d77ea (patch) | |
| tree | e3faa1447b95d7765d80a1cd8e44a1c8a0a256b6 /src/plugins/irc | |
| parent | 31d0742aed370dc77f143539c120bb403b8abd3f (diff) | |
| download | weechat-b6c304ac87f0d40ab2a4ac3fac49b078cb9d77ea.zip | |
irc: fix display of enabled/disabled client capabilities received in command CAP ACK (closes #151)
Diffstat (limited to 'src/plugins/irc')
| -rw-r--r-- | src/plugins/irc/irc-protocol.c | 61 |
1 files changed, 50 insertions, 11 deletions
diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index 4b13ac928..d9e160843 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -478,7 +478,7 @@ IRC_PROTOCOL_CALLBACK(cap) { char *ptr_caps, **caps_supported, **caps_added, **caps_removed; char **caps_enabled, *pos_value, *str_name, **str_caps; - char str_msg_auth[512]; + char str_msg_auth[512], **str_caps_enabled, **str_caps_disabled; int num_caps_supported, num_caps_added, num_caps_removed; int num_caps_enabled, sasl_to_do, sasl_mechanism; int i, timeout, last_reply; @@ -650,11 +650,11 @@ IRC_PROTOCOL_CALLBACK(cap) if (argc > 4) { ptr_caps = (argv_eol[4][0] == ':') ? argv_eol[4] + 1 : argv_eol[4]; - weechat_printf_date_tags ( - server->buffer, date, NULL, - _("%s%s: client capability, enabled: %s"), - weechat_prefix ("network"), IRC_PLUGIN_NAME, ptr_caps); + sasl_to_do = 0; + str_caps_enabled = weechat_string_dyn_alloc (128); + str_caps_disabled = weechat_string_dyn_alloc (128); + caps_supported = weechat_string_split ( ptr_caps, " ", @@ -667,17 +667,56 @@ IRC_PROTOCOL_CALLBACK(cap) { for (i = 0; i < num_caps_supported; i++) { - weechat_hashtable_set (server->cap_list, - caps_supported[i], NULL); - - if (strcmp (caps_supported[i], "sasl") == 0) + if (caps_supported[i][0] == '-') { - sasl_to_do = 1; - break; + if (*str_caps_disabled[0]) + weechat_string_dyn_concat (str_caps_disabled, " "); + weechat_string_dyn_concat (str_caps_disabled, + caps_supported[i] + 1); + } + else + { + if (*str_caps_enabled[0]) + weechat_string_dyn_concat (str_caps_enabled, " "); + weechat_string_dyn_concat (str_caps_enabled, + caps_supported[i]); + + weechat_hashtable_set (server->cap_list, + caps_supported[i], NULL); + + if (strcmp (caps_supported[i], "sasl") == 0) + sasl_to_do = 1; } } weechat_string_free_split (caps_supported); } + if (*str_caps_enabled[0] && *str_caps_disabled[0]) + { + weechat_printf_date_tags ( + server->buffer, date, NULL, + _("%s%s: client capability, enabled: %s, disabled: %s"), + weechat_prefix ("network"), IRC_PLUGIN_NAME, + *str_caps_enabled, *str_caps_disabled); + } + else if (*str_caps_enabled[0]) + { + weechat_printf_date_tags ( + server->buffer, date, NULL, + _("%s%s: client capability, enabled: %s"), + weechat_prefix ("network"), IRC_PLUGIN_NAME, + *str_caps_enabled); + } + else if (*str_caps_disabled[0]) + { + weechat_printf_date_tags ( + server->buffer, date, NULL, + _("%s%s: client capability, disabled: %s"), + weechat_prefix ("network"), IRC_PLUGIN_NAME, + *str_caps_disabled); + } + weechat_string_dyn_free (str_caps_enabled, 1); + weechat_string_dyn_free (str_caps_disabled, 1); + if (sasl_to_do) { sasl_mechanism = IRC_SERVER_OPTION_INTEGER( |