Commit 8ac8d2b2 authored by louiz’'s avatar louiz’

Correctly set status="110" in the presence for the target of a kick

parent 8cf292fa
......@@ -509,11 +509,8 @@ void XmppComponent::send_nick_change(const std::string& muc_name,
this->send_user_join(muc_name, new_nick, "", affiliation, role, jid_to, self);
}
void XmppComponent::kick_user(const std::string& muc_name,
const std::string& target,
const std::string& txt,
const std::string& author,
const std::string& jid_to)
void XmppComponent::kick_user(const std::string& muc_name, const std::string& target, const std::string& txt,
const std::string& author, const std::string& jid_to, const bool self)
{
Stanza presence("presence");
presence["from"] = muc_name + "@" + this->served_hostname + "/" + target;
......@@ -535,6 +532,12 @@ void XmppComponent::kick_user(const std::string& muc_name,
XmlNode status("status");
status["code"] = "307";
x.add_child(std::move(status));
if (self)
{
XmlNode status("status");
status["code"] = "110";
x.add_child(std::move(status));
}
presence.add_child(std::move(x));
this->send_stanza(presence);
}
......
......@@ -164,11 +164,8 @@ public:
/**
* An user is kicked from a room
*/
void kick_user(const std::string& muc_name,
const std::string& target,
const std::string& reason,
const std::string& author,
const std::string& jid_to);
void kick_user(const std::string& muc_name, const std::string& target, const std::string& reason,
const std::string& author, const std::string& jid_to, const bool self);
/**
* Send a generic presence error
*/
......
......@@ -916,10 +916,11 @@ size_t Bridge::active_clients() const
return this->irc_clients.size();
}
void Bridge::kick_muc_user(Iid&& iid, const std::string& target, const std::string& reason, const std::string& author)
void Bridge::kick_muc_user(Iid&& iid, const std::string& target, const std::string& reason, const std::string& author,
const bool self)
{
for (const auto& resource: this->resources_in_chan[iid.to_tuple()])
this->xmpp.kick_user(std::to_string(iid), target, reason, author, this->user_jid + "/" + resource);
this->xmpp.kick_user(std::to_string(iid), target, reason, author, this->user_jid + "/" + resource, self);
}
void Bridge::send_nickname_conflict_error(const Iid& iid, const std::string& nickname)
......
......@@ -181,7 +181,8 @@ public:
const std::string& new_nick,
const char user_mode,
const bool self);
void kick_muc_user(Iid&& iid, const std::string& target, const std::string& reason, const std::string& author);
void kick_muc_user(Iid&& iid, const std::string& target, const std::string& reason, const std::string& author,
const bool self);
void send_nickname_conflict_error(const Iid& iid, const std::string& nickname);
/**
* Send a role/affiliation change, matching the change of mode for that user
......
......@@ -964,14 +964,15 @@ void IrcClient::on_kick(const IrcMessage& message)
IrcChannel* channel = this->get_channel(chan_name);
if (!channel->joined)
return ;
if (channel->get_self()->nick == target)
const bool self = channel->get_self()->nick == target;
if (self)
channel->joined = false;
IrcUser author(message.prefix);
Iid iid;
iid.set_local(chan_name);
iid.set_server(this->hostname);
iid.type = Iid::Type::Channel;
this->bridge.kick_muc_user(std::move(iid), target, reason, author.nick);
this->bridge.kick_muc_user(std::move(iid), target, reason, author.nick, self);
}
void IrcClient::on_invite(const IrcMessage& message)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment