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

degesch: remove people from channels when leaving

This commit is contained in:
Přemysl Eric Janouch 2015-05-09 23:50:44 +02:00
parent c52f353894
commit d05b610636
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
degesch.c
View File

@ -2462,6 +2462,14 @@ irc_remove_user_from_channel (struct user *user, struct channel *channel)
irc_channel_unlink_user (channel, iter); irc_channel_unlink_user (channel, iter);
} }
static void
irc_left_channel (struct channel *channel)
{
// TODO: shouldn't we decrease reference count on the channel?
LIST_FOR_EACH (struct channel_user, iter, channel->users)
irc_channel_unlink_user (channel, iter);
}
// --- Core functionality ------------------------------------------------------ // --- Core functionality ------------------------------------------------------
// Most of the core IRC code comes from ZyklonB which is mostly blocking. // Most of the core IRC code comes from ZyklonB which is mostly blocking.
@ -2755,6 +2763,12 @@ on_irc_disconnected (struct server *s)
s->socket = -1; s->socket = -1;
s->state = IRC_DISCONNECTED; s->state = IRC_DISCONNECTED;
struct str_map_iter iter;
str_map_iter_init (&iter, &s->irc_channels);
struct channel *channel;
while ((channel = str_map_iter_next (&iter)))
irc_left_channel (channel);
user_unref (s->irc_user); user_unref (s->irc_user);
s->irc_user = NULL; s->irc_user = NULL;
@ -3388,7 +3402,12 @@ irc_handle_kick (struct server *s, const struct irc_message *msg)
// It would be is weird for this to be false // It would be is weird for this to be false
if (user && channel) if (user && channel)
{
if (irc_is_this_us (s, target))
irc_left_channel (channel);
else
irc_remove_user_from_channel (user, channel); irc_remove_user_from_channel (user, channel);
}
if (buffer) if (buffer)
{ {
@ -3563,7 +3582,12 @@ irc_handle_part (struct server *s, const struct irc_message *msg)
// It would be is weird for this to be false // It would be is weird for this to be false
if (user && channel) if (user && channel)
{
if (irc_is_this_us (s, msg->prefix))
irc_left_channel (channel);
else
irc_remove_user_from_channel (user, channel); irc_remove_user_from_channel (user, channel);
}
if (buffer) if (buffer)
{ {