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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
louloulibs/xmpp/xmpp_component.cpp
+8 -5
View File
@@ -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);
}
louloulibs/xmpp/xmpp_component.hpp
+2 -5
View File
@@ -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
*/