From a0b98720b9bd9b57f5042650030f4129e955a538 Mon Sep 17 00:00:00 2001 From: Přemysl Janouch Date: Wed, 17 Jun 2015 23:16:44 +0200 Subject: degesch: fix /mode on servers with +channels --- degesch.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/degesch.c b/degesch.c index 560cd37..80a0512 100644 --- a/degesch.c +++ b/degesch.c @@ -6317,9 +6317,16 @@ handle_command_mode (struct app_context *ctx, char *arguments) return true; // FIXME: allow usernames as well, not only channels - // FIXME: +channels collide with setting modes struct server *s = ctx->current_buffer->server; - char *channel_name = try_get_channel (ctx, &arguments); + + // Channel names prefixed by "+" collide with mode strings, + // so we just disallow specifying these channels + char *channel_name = NULL; + if (*arguments != '+') + channel_name = maybe_cut_word (&arguments, validate_channel_name, s); + if (!channel_name && ctx->current_buffer->type == BUFFER_CHANNEL) + channel_name = ctx->current_buffer->channel->name; + if (!channel_name) buffer_send_error (ctx, ctx->current_buffer, "%s: %s", "Can't set mode", -- cgit v1.2.3-70-g09d2