summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2017-05-17 00:30:07 +0200
committerlouiz’ <louiz@louiz.org>2017-05-17 00:31:21 +0200
commitbb150d587f080af38a74f2420457f1e0b2606a62 (patch)
treed4c4f48f1abf63020ebebdc653097dc2b4cb75b3
parent0180ea7e404a90dd36f771eee2538a17daa590d1 (diff)
downloadbiboumi-bb150d587f080af38a74f2420457f1e0b2606a62.tar.gz
biboumi-bb150d587f080af38a74f2420457f1e0b2606a62.tar.bz2
biboumi-bb150d587f080af38a74f2420457f1e0b2606a62.tar.xz
biboumi-bb150d587f080af38a74f2420457f1e0b2606a62.zip
Redirect welcome NOTICE to their channel, instead of sending a global one
fix #3236
-rw-r--r--CHANGELOG.rst2
-rw-r--r--src/irc/irc_client.cpp11
-rw-r--r--tests/end_to_end/__main__.py13
3 files changed, 25 insertions, 1 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d48650a..a9f46ec 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -20,6 +20,8 @@ Version 5.0
IRC server, with simple text files.
- The IRC channel configuration form is now also available using the MUC
configuration, in addition to the ad-hoc command.
+ - Notices starting with [#channel] are considered as welcome messages coming
+ from that channel, instead of private messages.
Version 4.3 - 2017-05-02
========================
diff --git a/src/irc/irc_client.cpp b/src/irc/irc_client.cpp
index 31d6278..caebb83 100644
--- a/src/irc/irc_client.cpp
+++ b/src/irc/irc_client.cpp
@@ -544,9 +544,18 @@ void IrcClient::forward_server_message(const IrcMessage& message)
void IrcClient::on_notice(const IrcMessage& message)
{
std::string from = message.prefix;
- const std::string to = message.arguments[0];
+ std::string to = message.arguments[0];
const std::string body = message.arguments[1];
+ // Handle notices starting with [#channame] as if they were sent to that channel
+ if (body.size() > 3 && body[0] == '[')
+ {
+ const auto chan_prefix = body[1];
+ auto end = body.find(']');
+ if (this->chantypes.find(chan_prefix) != this->chantypes.end() && end != std::string::npos)
+ to = body.substr(1, end - 1);
+ }
+
if (!body.empty() && body[0] == '\01' && body[body.size() - 1] == '\01')
// Do not forward the notice to the user if it's a CTCP command
return ;
diff --git a/tests/end_to_end/__main__.py b/tests/end_to_end/__main__.py
index 53860d7..3fddedf 100644
--- a/tests/end_to_end/__main__.py
+++ b/tests/end_to_end/__main__.py
@@ -1114,6 +1114,19 @@ if __name__ == '__main__':
),
partial(expect_stanza, "/message[@from='#bar%{irc_server_one}'][@type='groupchat'][@to='{jid_one}/{resource_one}']/subject[not(text())]"),
]),
+ Scenario("notices",
+ [
+ handshake_sequence(),
+ partial(send_stanza,
+ "<presence from='{jid_one}/{resource_one}' to='#foo%{irc_server_one}/{nick_one}' />"),
+ connection_sequence("irc.localhost", '{jid_one}/{resource_one}'),
+ partial(expect_stanza, "/message"),
+ partial(expect_stanza, "/presence"),
+ partial(expect_stanza, "/message"),
+
+ partial(send_stanza, "<message from='{jid_one}/{resource_one}' to='{irc_server_one}' type='chat'><body>NOTICE {nick_one} :[#foo] Hello in a notice.</body></message>"),
+ partial(expect_stanza, "/message[@from='#foo%{irc_server_one}/{nick_one}'][@type='groupchat']/body[text()='[notice] [#foo] Hello in a notice.']"),
+ ]),
Scenario("channel_messages",
[
handshake_sequence(),