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

This commit is contained in:
louiz’
2016-10-07 23:28:40 +02:00
parent 8cf292fa44
commit 8ac8d2b242
5 changed files with 18 additions and 15 deletions
+3 -2
View File
@@ -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)
+2 -1
View File
@@ -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