From feb77bbdadf6658e9dfdd7c7eac05850ea5fa7b8 Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Mon, 13 Jan 2014 20:14:12 +0100 Subject: Do not change the affiliation/role to "none"/"participant" when changing nick fixes #2436 --- src/xmpp/xmpp_component.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/xmpp/xmpp_component.cpp b/src/xmpp/xmpp_component.cpp index 1ef2f37..6fec72c 100644 --- a/src/xmpp/xmpp_component.cpp +++ b/src/xmpp/xmpp_component.cpp @@ -312,10 +312,11 @@ void XmppComponent::send_user_join(const std::string& from, XmlNode x("x"); x["xmlns"] = MUC_USER_NS; - // TODO: put real values here XmlNode item("item"); - item["affiliation"] = affiliation; - item["role"] = role; + if (!affiliation.empty()) + item["affiliation"] = affiliation; + if (!role.empty()) + item["role"] = role; if (!realjid.empty()) { const std::string preped_jid = jidprep(realjid); @@ -427,7 +428,7 @@ void XmppComponent::send_nick_change(const std::string& muc_name, const std::str presence.close(); this->send_stanza(presence); - this->send_user_join(muc_name, new_nick, "", "participant", "none", jid_to, self); + this->send_user_join(muc_name, new_nick, "", "", "", jid_to, self); } void XmppComponent::kick_user(const std::string& muc_name, -- cgit v1.2.3