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

degesch: unindent some code

This commit is contained in:
Přemysl Eric Janouch 2015-05-16 09:40:02 +02:00
parent 25d3f6e44a
commit 634d960c8d
1 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
degesch.c
View File

@ -5117,21 +5117,18 @@ handle_command_join (struct app_context *ctx, char *arguments)
// TODO: check if the arguments are in the form of // TODO: check if the arguments are in the form of
// "channel(,channel)* key(,key)*" // "channel(,channel)* key(,key)*"
irc_send (s, "JOIN %s", arguments); irc_send (s, "JOIN %s", arguments);
else if (ctx->current_buffer->type != BUFFER_CHANNEL)
buffer_send_error (ctx, ctx->current_buffer,
"%s: %s", "Can't join",
"no argument given and this buffer is not a channel");
// TODO: have a better way of checking if we're on the channel
else if (ctx->current_buffer->channel->users)
buffer_send_error (ctx, ctx->current_buffer,
"%s: %s", "Can't join",
"you already are on the channel");
else else
{ // TODO: send the key if known
if (ctx->current_buffer->type != BUFFER_CHANNEL) irc_send (s, "JOIN %s", ctx->current_buffer->channel->name);
buffer_send_error (ctx, ctx->current_buffer,
"%s: %s", "Can't join",
"no argument given and this buffer is not a channel");
// TODO: have a better way of checking if we're on the channel
else if (ctx->current_buffer->channel->users)
buffer_send_error (ctx, ctx->current_buffer,
"%s: %s", "Can't join",
"you already are on the channel");
else
// TODO: send the key if known
irc_send (s, "JOIN %s", ctx->current_buffer->channel->name);
}
return true; return true;
} }
@ -5146,19 +5143,16 @@ handle_command_part (struct app_context *ctx, char *arguments)
// TODO: check if the arguments are in the form of "channel(,channel)*" // TODO: check if the arguments are in the form of "channel(,channel)*"
// TODO: make sure to send the reason as one argument // TODO: make sure to send the reason as one argument
irc_send (s, "PART %s", arguments); irc_send (s, "PART %s", arguments);
else if (ctx->current_buffer->type != BUFFER_CHANNEL)
buffer_send_error (ctx, ctx->current_buffer,
"%s: %s", "Can't part",
"no argument given and this buffer is not a channel");
// TODO: have a better way of checking if we're on the channel
else if (!ctx->current_buffer->channel->users)
buffer_send_error (ctx, ctx->current_buffer,
"%s: %s", "Can't join", "you're not on the channel");
else else
{ irc_send (s, "PART %s", ctx->current_buffer->channel->name);
if (ctx->current_buffer->type != BUFFER_CHANNEL)
buffer_send_error (ctx, ctx->current_buffer,
"%s: %s", "Can't part",
"no argument given and this buffer is not a channel");
// TODO: have a better way of checking if we're on the channel
else if (!ctx->current_buffer->channel->users)
buffer_send_error (ctx, ctx->current_buffer,
"%s: %s", "Can't join", "you're not on the channel");
else
irc_send (s, "PART %s", ctx->current_buffer->channel->name);
}
return true; return true;
} }