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

Do not change the affiliation/role to "none"/"participant" when changing nick

Browse Source 
fixes #2436
This commit is contained in:
Florent Le Coz
2014-01-13 20:14:12 +01:00
parent af2d232059
commit feb77bbdad
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xmpp/xmpp_component.cpp
+5 -4
View File
@@ -312,10 +312,11 @@ void XmppComponent::send_user_join(const std::string& from,
XmlNode x("x"); XmlNode x("x");
x["xmlns"] = MUC_USER_NS; x["xmlns"] = MUC_USER_NS;
// TODO: put real values here
XmlNode item("item"); XmlNode item("item");
item["affiliation"] = affiliation; if (!affiliation.empty())
item["role"] = role; item["affiliation"] = affiliation;
if (!role.empty())
item["role"] = role;
if (!realjid.empty()) if (!realjid.empty())
{ {
const std::string preped_jid = jidprep(realjid); 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(); presence.close();
this->send_stanza(presence); 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, void XmppComponent::kick_user(const std::string& muc_name,