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

Mark messages from the IRC server as private and no-copy

Browse Source 
fix #3284
This commit is contained in:
louiz’
2017-08-30 16:14:35 +02:00
parent 98227db6ad
commit dabc48b79b
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bridge/bridge.cpp
+2 -2
View File
@@ -934,9 +934,9 @@ void Bridge::send_xmpp_message(const std::string& from, const std::string& autho
for (const auto& resource: this->resources_in_server[from]) for (const auto& resource: this->resources_in_server[from])
{ {
if (Config::get("fixed_irc_server", "").empty()) if (Config::get("fixed_irc_server", "").empty())
this->xmpp.send_message(from, this->make_xmpp_body(body, encoding), this->user_jid + "/" + resource, "chat", false, false); this->xmpp.send_message(from, this->make_xmpp_body(body, encoding), this->user_jid + "/" + resource, "chat", false, true);
else else
this->xmpp.send_message("", this->make_xmpp_body(body, encoding), this->user_jid + "/" + resource, "chat", false, false); this->xmpp.send_message("", this->make_xmpp_body(body, encoding), this->user_jid + "/" + resource, "chat", false, true);
} }
} }
tests/end_to_end/__main__.py
+10 -2
View File
@@ -413,7 +413,11 @@ def connection_begin_sequence(irc_host, jid, expected_irc_presence=False, fixed_
xpath_re = "/message[@to='" + jid + "'][@from='" + irc_host + "@biboumi.localhost']/body[re:test(text(), '%s')]" xpath_re = "/message[@to='" + jid + "'][@from='" + irc_host + "@biboumi.localhost']/body[re:test(text(), '%s')]"
result = ( result = (
partial(expect_stanza, partial(expect_stanza,
xpath % ('Connecting to %s:6697 (encrypted)' % irc_host)), (xpath % ('Connecting to %s:6697 (encrypted)' % irc_host),
"/message/hints:no-copy",
"/message/carbon:private"
)
),
partial(expect_stanza, partial(expect_stanza,
xpath % 'Connection failed: Connection refused'), xpath % 'Connection failed: Connection refused'),
partial(expect_stanza, partial(expect_stanza,
@@ -455,7 +459,11 @@ def connection_tls_begin_sequence(irc_host, jid, fixed_irc_server):
irc_host = 'irc.localhost' irc_host = 'irc.localhost'
return ( return (
partial(expect_stanza, partial(expect_stanza,
xpath % ('Connecting to %s:7778 (encrypted)' % irc_host)), (xpath % ('Connecting to %s:7778 (encrypted)' % irc_host),
"/message/hints:no-copy",
"/message/carbon:private",
)
),
partial(expect_stanza, partial(expect_stanza,
xpath % 'Connected to IRC server (encrypted).'), xpath % 'Connected to IRC server (encrypted).'),
# These five messages can be receive in any order # These five messages can be receive in any order