p
/
xK
1
1
Fork 0
Code Issues 1 Pull Requests Releases 9 Wiki Activity

degesch: fix /mode to work for user modes

This commit is contained in:
Přemysl Eric Janouch 2015-06-18 07:54:46 +02:00
parent a0b98720b9
commit 2261db4caa
1 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
degesch.c
View File

@ -6316,25 +6316,52 @@ handle_command_mode (struct app_context *ctx, char *arguments)
if (!server_command_check (ctx, "mode", true)) if (!server_command_check (ctx, "mode", true))
return true; return true;
// FIXME: allow usernames as well, not only channels
struct server *s = ctx->current_buffer->server; struct server *s = ctx->current_buffer->server;
// Channel names prefixed by "+" collide with mode strings, // Channel names prefixed by "+" collide with mode strings,
// so we just disallow specifying these channels // so we just disallow specifying these channels
char *channel_name = NULL; char *channel_name = NULL;
char *nickname = NULL;
if (*arguments != '+') if (*arguments != '+')
channel_name = maybe_cut_word (&arguments, validate_channel_name, s); channel_name = maybe_cut_word (&arguments, validate_channel_name, s);
if (!channel_name && ctx->current_buffer->type == BUFFER_CHANNEL) if (!channel_name
channel_name = ctx->current_buffer->channel->name; && !strchr ("+-\0", *arguments))
nickname = cut_word (&arguments);
if (!channel_name) if (!channel_name
buffer_send_error (ctx, ctx->current_buffer, && !nickname)
"%s: %s", "Can't set mode", {
"no channel name given and this buffer is not a channel"); if (ctx->current_buffer->type == BUFFER_CHANNEL)
else if (*arguments) channel_name = ctx->current_buffer->channel->name;
irc_send (s, "MODE %s %s", channel_name, arguments); if (ctx->current_buffer->type == BUFFER_PM)
else nickname = ctx->current_buffer->user->nickname;
irc_send (s, "MODE %s", channel_name); if (ctx->current_buffer->type == BUFFER_SERVER)
nickname = ctx->current_buffer->server->irc_user->nickname;
}
if (channel_name)
{
if (*arguments)
// XXX: split as necessary using irc_max_modes?
irc_send (s, "MODE %s %s", channel_name, arguments);
else
irc_send (s, "MODE %s", channel_name);
return true;
}
if (nickname)
{
if (*arguments)
irc_send (s, "MODE %s %s", nickname, arguments);
else
irc_send (s, "MODE %s", nickname);
return true;
}
buffer_send_error (ctx, ctx->current_buffer,
"%s: %s", "Can't change mode",
"no target given and this buffer is neither a PM nor a channel");
return true; return true;
} }