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

degesch: fix adding user by RPL_NAMREPLY 

We didn't create a matching user_channel entry.
This commit is contained in:
Přemysl Eric Janouch 2015-06-06 00:27:29 +02:00
parent 2fe17ae79b
commit f9eddb8ee2
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
degesch.c
View File

@ -2767,6 +2767,21 @@ irc_get_or_make_user_buffer (struct server *s, const char *nickname)
return buffer; return buffer;
} }
// Note that this eats the user reference
static void
irc_channel_link_user (struct channel *channel, struct user *user,
const char *prefixes)
{
struct user_channel *user_channel = user_channel_new ();
user_channel->channel = channel;
LIST_PREPEND (user->channels, user_channel);
struct channel_user *channel_user = channel_user_new ();
channel_user->user = user;
str_append (&channel_user->prefixes, prefixes);
LIST_PREPEND (channel->users, channel_user);
}
static void static void
irc_channel_unlink_user irc_channel_unlink_user
(struct channel *channel, struct channel_user *channel_user) (struct channel *channel, struct channel_user *channel_user)
@ -3870,25 +3885,10 @@ irc_handle_join (struct server *s, const struct irc_message *msg)
if (!channel) if (!channel)
return; return;
// Get or make a user object // Add the user to the channel
char *nickname = irc_cut_nickname (msg->prefix); char *nickname = irc_cut_nickname (msg->prefix);
struct user *user = str_map_find (&s->irc_users, nickname); irc_channel_link_user (channel, irc_get_or_make_user (s, nickname), "");
if (!user)
user = irc_make_user (s, nickname);
else
{
user = user_ref (user);
free (nickname); free (nickname);
}
// Link the user with the channel
struct user_channel *user_channel = user_channel_new ();
user_channel->channel = channel;
LIST_PREPEND (user->channels, user_channel);
struct channel_user *channel_user = channel_user_new ();
channel_user->user = user;
LIST_PREPEND (channel->users, channel_user);
// Finally log the message // Finally log the message
if (buffer) if (buffer)
@ -4705,11 +4705,10 @@ irc_process_names (struct server *s, struct channel *channel)
irc_channel_get_user (channel, user); irc_channel_get_user (channel, user);
if (!channel_user) if (!channel_user)
{ {
channel_user = channel_user_new (); irc_channel_link_user (channel, user, prefixes);
channel_user->user = user; continue;
LIST_PREPEND (channel->users, channel_user);
} }
else
user_unref (user); user_unref (user);
// If our idea of the user's modes disagrees with what the server's // If our idea of the user's modes disagrees with what the server's