summaryrefslogtreecommitdiff
path: root/src/xmpp/biboumi_component.cpp
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2017-08-27 14:32:29 +0200
committerlouiz’ <louiz@louiz.org>2017-08-27 14:32:29 +0200
commit25243f53c2479e2fda0f1a05d1589c8214b70b4b (patch)
tree32f90dc7293661f2bb33d5e709f856ed707cb19b /src/xmpp/biboumi_component.cpp
parent2c717d347d796a2b007331c42d78146e156eaea0 (diff)
downloadbiboumi-25243f53c2479e2fda0f1a05d1589c8214b70b4b.tar.gz
biboumi-25243f53c2479e2fda0f1a05d1589c8214b70b4b.tar.bz2
biboumi-25243f53c2479e2fda0f1a05d1589c8214b70b4b.tar.xz
biboumi-25243f53c2479e2fda0f1a05d1589c8214b70b4b.zip
In fixed mode, server messages come from biboumi’s hostname directly
Instead of irc.example.com@biboumi, because that’s actually user named “irc.example.com”, in that case. And that fixes the raw messages in fixed mode. fix #3286
Diffstat (limited to 'src/xmpp/biboumi_component.cpp')
-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 0e1d270..6cddeb4 100644
--- a/src/xmpp/biboumi_component.cpp
+++ b/src/xmpp/biboumi_component.cpp
@@ -281,6 +281,7 @@ void BiboumiComponent::handle_message(const Stanza& stanza)
{
if (body && !body->get_inner().empty())
{
+ const auto fixed_irc_server = Config::get("fixed_irc_server", "");
// a message for nick!server
if (iid.type == Iid::Type::User && !iid.get_local().empty())
{
@@ -296,9 +297,11 @@ void BiboumiComponent::handle_message(const Stanza& stanza)
bridge->set_preferred_from_jid(user_iid.get_local(), to_str);
}
else if (iid.type == Iid::Type::Server)
+ bridge->send_raw_message(iid.get_server(), body->get_inner());
+ else if (iid.type == Iid::Type::None && !fixed_irc_server.empty())
{ // Message sent to the server JID
// Convert the message body into a raw IRC message
- bridge->send_raw_message(iid.get_server(), body->get_inner());
+ bridge->send_raw_message(fixed_irc_server, body->get_inner());
}
}
}