summaryrefslogtreecommitdiff
path: root/src/xmpp
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2016-10-23 23:59:21 +0200
committerlouiz’ <louiz@louiz.org>2016-10-23 23:59:21 +0200
commitc3bb9fe2e2c2a0b2773e9b9824c4e675448b862f (patch)
treecd9d38b050c1c32c7faa33587fd487b451a60136 /src/xmpp
parent00eb18bae8cf62d49f4b5d42aed8507fcca3c03c (diff)
downloadbiboumi-c3bb9fe2e2c2a0b2773e9b9824c4e675448b862f.tar.gz
biboumi-c3bb9fe2e2c2a0b2773e9b9824c4e675448b862f.tar.bz2
biboumi-c3bb9fe2e2c2a0b2773e9b9824c4e675448b862f.tar.xz
biboumi-c3bb9fe2e2c2a0b2773e9b9824c4e675448b862f.zip
Handle forced-join by just sending an invitation
fix #3116
Diffstat (limited to 'src/xmpp')
-rw-r--r--src/xmpp/biboumi_component.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/xmpp/biboumi_component.cpp b/src/xmpp/biboumi_component.cpp
index 86bef2d..f3405df 100644
--- a/src/xmpp/biboumi_component.cpp
+++ b/src/xmpp/biboumi_component.cpp
@@ -855,7 +855,10 @@ void BiboumiComponent::send_invitation(const std::string& room_target,
XmlNode x("x");
x["xmlns"] = MUC_USER_NS;
XmlNode invite("invite");
- invite["from"] = room_target + "@" + this->served_hostname + "/" + author_nick;
+ if (author_nick.empty())
+ invite["from"] = room_target + "@" + this->served_hostname;
+ else
+ invite["from"] = room_target + "@" + this->served_hostname + "/" + author_nick;
x.add_child(std::move(invite));
message.add_child(std::move(x));
this->send_stanza(message);