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

degesch: implement PART and KICK handlers

This commit is contained in:
Přemysl Eric Janouch 2015-04-21 21:36:16 +02:00
parent 69582c9e14
commit 883e777bac
1 changed files with 65 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
degesch.c
View File

@ -1309,6 +1309,25 @@ irc_make_channel (struct app_context *ctx, char *name)
return channel; return channel;
} }
static void
irc_unlink_user_from_channel
(struct app_context *ctx, struct user *user, struct channel *channel)
{
// The order is important here as the channel can hold the last reference
LIST_FOR_EACH (struct user_channel, iter, user->channels)
if (iter->channel == channel)
{
LIST_UNLINK (user->channels, iter);
user_channel_destroy (iter);
}
LIST_FOR_EACH (struct channel_user, iter, channel->users)
if (iter->user == user)
{
LIST_UNLINK (channel->users, iter);
channel_user_destroy (iter);
}
}
// --- Supporting code --------------------------------------------------------- // --- Supporting code ---------------------------------------------------------
static char * static char *
@ -1896,15 +1915,41 @@ irc_handle_join (struct app_context *ctx, const struct irc_message *msg)
if (buffer) if (buffer)
{ {
buffer_send (ctx, buffer, BUFFER_LINE_JOIN, 0, buffer_send (ctx, buffer, BUFFER_LINE_JOIN, 0,
msg->prefix, NULL, "%s", target); msg->prefix, NULL, "%s", channel_name);
} }
} }
static void static void
irc_handle_kick (struct app_context *ctx, const struct irc_message *msg) irc_handle_kick (struct app_context *ctx, const struct irc_message *msg)
{ {
// TODO: remove user from the channel if (!msg->prefix || msg->params.len < 2)
// TODO: log a message return;
const char *channel_name = msg->params.vector[0];
const char *target = msg->params.vector[1];
if (!irc_is_channel (ctx, channel_name)
|| irc_is_channel (ctx, target))
return;
const char *message = NULL;
if (msg->params.len > 2)
message = msg->params.vector[2];
struct user *user = str_map_find (&ctx->irc_users, target);
struct channel *channel = str_map_find (&ctx->irc_channels, channel_name);
struct buffer *buffer = str_map_find (&ctx->irc_buffer_map, channel_name);
hard_assert ((channel && buffer) ||
(channel && !buffer) || (!channel && !buffer));
// It would be is weird for this to be false
if (user && channel)
irc_unlink_user_from_channel (ctx, user, channel);
if (buffer)
{
buffer_send (ctx, buffer, BUFFER_LINE_KICK, 0,
msg->prefix, message, "%s", target);
}
} }
static void static void
@ -2000,27 +2045,32 @@ irc_handle_part (struct app_context *ctx, const struct irc_message *msg)
if (!msg->prefix || msg->params.len < 1) if (!msg->prefix || msg->params.len < 1)
return; return;
char *nickname = irc_cut_nickname (msg->prefix); const char *channel_name = msg->params.vector[0];
struct user *user = str_map_find (&ctx->irc_users, nickname); if (!irc_is_channel (ctx, channel_name))
free (nickname);
if (!user)
return;
const char *target = msg->params.vector[0];
if (!irc_is_channel (ctx, target))
return; return;
const char *message = NULL; const char *message = NULL;
if (msg->params.len > 1) if (msg->params.len > 1)
message = msg->params.vector[1]; message = msg->params.vector[1];
struct channel *channel = str_map_find (&ctx->irc_channels, target); char *nickname = irc_cut_nickname (msg->prefix);
struct buffer *buffer = str_map_find (&ctx->irc_buffer_map, target); struct user *user = str_map_find (&ctx->irc_users, nickname);
free (nickname);
struct channel *channel = str_map_find (&ctx->irc_channels, channel_name);
struct buffer *buffer = str_map_find (&ctx->irc_buffer_map, channel_name);
hard_assert ((channel && buffer) || hard_assert ((channel && buffer) ||
(channel && !buffer) || (!channel && !buffer)); (channel && !buffer) || (!channel && !buffer));
// TODO: remove user from the channel // It would be is weird for this to be false
// TODO: log a message if (user && channel)
irc_unlink_user_from_channel (ctx, user, channel);
if (buffer)
{
buffer_send (ctx, buffer, BUFFER_LINE_PART, 0,
msg->prefix, message, "%s", channel_name);
}
} }
static void static void