Commit 68d6b829 authored by louiz’'s avatar louiz’

Properly handle multiline topics

fix #3254
parent 79b24d7e
......@@ -11,6 +11,7 @@ Version 5.0
- Use the udns library instead of c-ares, for asynchronous DNS resolution.
It’s still fully optional.
- Update MAM implementation to version 6.0 (namespace mam:2)
- Multiline topics are now properly handled
Version 4.1 - 2017-03-21
========================
......
......@@ -371,6 +371,13 @@ Notices
Notices are received exactly like private messages. It is not possible to
send a notice.
Topic
-----
The topic can be set and retrieved seemlessly. The unique difference is that
if an XMPP user tries to set a multiline topic, every line return (\n) will
be replaced by a space, because the IRC wouldn’t accept it.
Invitations
-----------
......
......@@ -684,9 +684,12 @@ void Bridge::send_irc_kick(const Iid& iid, const std::string& target, const std:
this->add_waiting_irc(std::move(cb));
}
void Bridge::set_channel_topic(const Iid& iid, const std::string& subject)
void Bridge::set_channel_topic(const Iid& iid, std::string subject)
{
IrcClient* irc = this->get_irc_client(iid.get_server());
std::string::size_type pos{0};
while ((pos = subject.find('\n', pos)) != std::string::npos)
subject[pos] = ' ';
irc->send_topic_command(iid.get_local(), subject);
}
......
......@@ -83,7 +83,7 @@ public:
void send_irc_nick_change(const Iid& iid, const std::string& new_nick, const std::string& requesting_resource);
void send_irc_kick(const Iid& iid, const std::string& target, const std::string& reason,
const std::string& iq_id, const std::string& to_jid);
void set_channel_topic(const Iid& iid, const std::string& subject);
void set_channel_topic(const Iid& iid, std::string subject);
void send_xmpp_version_to_irc(const Iid& iid, const std::string& name, const std::string& version,
const std::string& os);
void send_irc_ping_result(const Iid& iid, const std::string& id);
......
......@@ -6,5 +6,3 @@
bool to_bool(const std::string& val);
std::vector<std::string> cut(const std::string& val, const std::size_t size);
......@@ -707,6 +707,23 @@ if __name__ == '__main__':
),
partial(expect_stanza, "/message[@from='#foo%{irc_server_one}/{nick_one}'][@type='groupchat']/subject[text()='TOPIC TEST']"),
]),
Scenario("multiline_topic",
[
handshake_sequence(),
# User joins
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/body"),
partial(expect_stanza, "/presence"),
partial(expect_stanza, "/message[@from='#foo%{irc_server_one}'][@type='groupchat']/subject[not(text())]"),
# User tries to set a multiline topic
partial(send_stanza,
"<message from='{jid_one}/{resource_one}' to='#foo%{irc_server_one}' type='groupchat'><subject>FIRST LINE\nSECOND LINE.</subject></message>"),
partial(expect_stanza, "/message[@from='#foo%{irc_server_one}/{nick_one}'][@type='groupchat'][@to='{jid_one}/{resource_one}']/subject[text()='FIRST LINE SECOND LINE.']"),
]),
Scenario("channel_basic_join_on_fixed_irc_server",
[
handshake_sequence(),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment