mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don’t forget to remove the user from the channel, when kicked

Browse Source 
fix #3291
This commit is contained in:
louiz’
2017-08-24 23:55:32 +02:00
parent fe4ceb72d0
commit c23c99dac1
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/irc/irc_client.cpp
+10 -3
View File
@@ -1073,12 +1073,18 @@ void IrcClient::on_nick(const IrcMessage& message)
void IrcClient::on_kick(const IrcMessage& message) void IrcClient::on_kick(const IrcMessage& message)
{ {
const std::string chan_name = utils::tolower(message.arguments[0]); const std::string chan_name = utils::tolower(message.arguments[0]);
const std::string target = message.arguments[1]; const std::string target_nick = message.arguments[1];
const std::string reason = message.arguments[2]; const std::string reason = message.arguments[2];
IrcChannel* channel = this->get_channel(chan_name); IrcChannel* channel = this->get_channel(chan_name);
if (!channel->joined) if (!channel->joined)
return ; return ;
const bool self = channel->get_self()->nick == target; const IrcUser* target = channel->find_user(target_nick);
if (!target)
{
log_warning("Received a KICK command from a nick absent from the channel.");
return;
}
const bool self = channel->get_self() == target;
if (self) if (self)
channel->joined = false; channel->joined = false;
IrcUser author(message.prefix); IrcUser author(message.prefix);
@@ -1086,7 +1092,8 @@ void IrcClient::on_kick(const IrcMessage& message)
iid.set_local(chan_name); iid.set_local(chan_name);
iid.set_server(this->hostname); iid.set_server(this->hostname);
iid.type = Iid::Type::Channel; iid.type = Iid::Type::Channel;
this->bridge.kick_muc_user(std::move(iid), target, reason, author.nick, self); this->bridge.kick_muc_user(std::move(iid), target_nick, reason, author.nick, self);
channel->remove_user(target);
} }
void IrcClient::on_invite(const IrcMessage& message) void IrcClient::on_invite(const IrcMessage& message)