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

Add the possibility to invite any external JID to a room

Browse Source 
fix #3285
This commit is contained in:
louiz’
2017-07-20 23:09:37 +02:00
parent 407f95a108
commit f125de4833
5 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xmpp/biboumi_component.cpp
+16 -5
View File
@@ -310,7 +310,11 @@ void BiboumiComponent::handle_message(const Stanza& stanza)
const auto invite_to = invite->get_tag("to");
if (!invite_to.empty())
{
bridge->send_irc_invitation(iid, invite_to);
Jid invited_jid{invite_to};
if (invited_jid.domain == this->get_served_hostname() || invited_jid.local.empty())
bridge->send_irc_invitation(iid, invite_to);
else
this->send_invitation_from_fulljid(std::to_string(iid), invite_to, from_str);
}
}
@@ -986,6 +990,16 @@ void BiboumiComponent::send_iq_room_list_result(const std::string& id, const std
void BiboumiComponent::send_invitation(const std::string& room_target,
const std::string& jid_to,
const std::string& author_nick)
{
if (author_nick.empty())
this->send_invitation_from_fulljid(room_target, jid_to, room_target + "@" + this->served_hostname);
else
this->send_invitation_from_fulljid(room_target, jid_to, room_target + "@" + this->served_hostname + "/" + author_nick);
}
void BiboumiComponent::send_invitation_from_fulljid(const std::string& room_target,
const std::string& jid_to,
const std::string& from)
{
Stanza message("message");
{
@@ -994,10 +1008,7 @@ void BiboumiComponent::send_invitation(const std::string& room_target,
XmlSubNode x(message, "x");
x["xmlns"] = MUC_USER_NS;
XmlSubNode invite(x, "invite");
if (author_nick.empty())
invite["from"] = room_target + "@" + this->served_hostname;
else
invite["from"] = room_target + "@" + this->served_hostname + "/" + author_nick;
invite["from"] = from;
}
this->send_stanza(message);
}