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

Merge branch 'master' into dummy_chan

Browse Source
This commit is contained in:
Florent Le Coz
2014-04-15 04:45:59 +02:00
parent cfca16bbec 804b686f1c
commit 0d9c1ba313
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xmpp/xmpp_component.cpp
+13 -5
View File
@@ -577,13 +577,21 @@ void XmppComponent::send_muc_leave(std::string&& muc_name, std::string&& nick, X
presence["from"] = muc_name + "@" + this->served_hostname + "/" + nick; presence["from"] = muc_name + "@" + this->served_hostname + "/" + nick;
presence["type"] = "unavailable"; presence["type"] = "unavailable";
const std::string message_str = std::get<0>(message); const std::string message_str = std::get<0>(message);
if (!message_str.empty() || self) XmlNode x("x");
x["xmlns"] = MUC_USER_NS;
if (self)
{ {
XmlNode status("status"); XmlNode status("status");
if (!message_str.empty()) status["code"] = "110";
status.set_inner(message_str); status.close();
if (self) x.add_child(std::move(status));
status["code"] = "110"; }
x.close();
presence.add_child(std::move(x));
if (!message_str.empty())
{
XmlNode status("status");
status.set_inner(message_str);
status.close(); status.close();
presence.add_child(std::move(status)); presence.add_child(std::move(status));
} }