diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | degesch.c | 23 |
2 files changed, 19 insertions, 6 deletions
@@ -2,7 +2,7 @@ * degesch: added a /squery command for IRCnet - * degesch: now supporting IRCv3.2 capability negotiation + * degesch: now supporting IRCv3.2 capability negotiation, including CAP DEL 1.1.0 (2020-10-31) "What Do You Mean By 'This Isn't Germany'?" @@ -2340,7 +2340,7 @@ static struct config_schema g_config_server[] = .type = CONFIG_ITEM_STRING_ARRAY, .validate = config_validate_nonjunk_string, .default_ = "\"multi-prefix,invite-notify,server-time,echo-message," - "message-tags,away-notify\"" }, + "message-tags,away-notify,cap-notify\"" }, { .name = "tls", .comment = "Whether to use TLS", @@ -6577,6 +6577,15 @@ irc_process_cap_ls (struct server *s) } static void +irc_toggle_cap (struct server *s, const char *cap, bool active) +{ + if (!strcasecmp_ascii (cap, "echo-message")) + s->cap_echo_message = active; + if (!strcasecmp_ascii (cap, "away-notify")) + s->cap_away_notify = active; +} + +static void irc_handle_cap (struct server *s, const struct irc_message *msg) { if (msg->params.len < 2) @@ -6601,10 +6610,7 @@ irc_handle_cap (struct server *s, const struct irc_message *msg) active = false; cap++; } - if (!strcasecmp_ascii (cap, "echo-message")) - s->cap_echo_message = active; - if (!strcasecmp_ascii (cap, "away-notify")) - s->cap_away_notify = active; + irc_toggle_cap (s, cap, active); } irc_send (s, "CAP END"); } @@ -6614,6 +6620,13 @@ irc_handle_cap (struct server *s, const struct irc_message *msg) "#s: #S", "Capabilities not acknowledged", args); irc_send (s, "CAP END"); } + else if (!strcasecmp_ascii (subcommand, "DEL")) + { + log_server_error (s, s->buffer, + "#s: #S", "Capabilities deleted", args); + for (size_t i = 0; i < v.len; i++) + irc_toggle_cap (s, v.vector[i], false); + } else if (!strcasecmp_ascii (subcommand, "LS")) { |