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

fix tests

Browse Source
This commit is contained in:
Luca Matei Pintilie
2025-11-28 20:30:12 +01:00
committed by mathieui
parent d13f66ab90
commit 7bc27b21e6
4 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bridge/bridge.cpp
+4 -2
View File
@@ -234,6 +234,8 @@ void Bridge::send_channel_message(const Iid& iid, const std::string& body, std::
#else #else
uuid = utils::gen_uuid(); uuid = utils::gen_uuid();
#endif #endif
if (id.empty())
id = utils::gen_uuid();
IrcChannel* channel = irc->get_channel(iid.get_local()); IrcChannel* channel = irc->get_channel(iid.get_local());
if (!channel->joined) if (!channel->joined)
@@ -264,12 +266,12 @@ void Bridge::send_channel_message(const Iid& iid, const std::string& body, std::
} }
} }
MessageCallback mirror_to_all_resources = [this, iid, uuid, nodes_to_reflect, body](const IrcClient* irc, const IrcMessage&) { MessageCallback mirror_to_all_resources = [this, iid, uuid, id, nodes_to_reflect, body](const IrcClient* irc, const IrcMessage&) {
for (const auto& resource: this->resources_in_chan[iid.to_tuple()]) for (const auto& resource: this->resources_in_chan[iid.to_tuple()])
{ {
auto stanza = this->xmpp.make_muc_message(std::to_string(iid), irc->get_own_nick(), this->make_xmpp_body(body), auto stanza = this->xmpp.make_muc_message(std::to_string(iid), irc->get_own_nick(), this->make_xmpp_body(body),
this->user_jid + "/" this->user_jid + "/"
+ resource, uuid, uuid); + resource, uuid, id);
for (const auto& node: nodes_to_reflect) for (const auto& node: nodes_to_reflect)
stanza.add_child(node); stanza.add_child(node);
this->xmpp.send_stanza(stanza); this->xmpp.send_stanza(stanza);
tests/end_to_end/scenarios/channel_messages.py
+1 -1
View File
@@ -29,7 +29,7 @@ scenario = (
"/message/stable_id:stanza-id[@by='#foo%{irc_server_one}'][@id]" "/message/stable_id:stanza-id[@by='#foo%{irc_server_one}'][@id]"
], ],
[ [
"/message[@id][@from='#foo%{irc_server_one}/{nick_one}'][@to='{jid_two}/{resource_one}'][@type='groupchat']/body[text()='coucou']", "/message[@id][@from='#foo%{irc_server_one}/{nick_one}'][@to='{jid_two}/{resource_one}'][@type='groupchat']/body[text()='\ncoucou']",
"/message/stable_id:stanza-id[@by='#foo%{irc_server_one}'][@id]" "/message/stable_id:stanza-id[@by='#foo%{irc_server_one}'][@id]"
] ]
), ),
tests/end_to_end/scenarios/multiline_message.py
+3 -9
View File
@@ -8,9 +8,7 @@ scenario = (
# Send a multi-line channel message # Send a multi-line channel message
send_stanza("<message id='the-message-id' from='{jid_one}/{resource_one}' to='#foo%{irc_server_one}' type='groupchat'><body>un\ndeux\ntrois</body></message>"), send_stanza("<message id='the-message-id' from='{jid_one}/{resource_one}' to='#foo%{irc_server_one}' type='groupchat'><body>un\ndeux\ntrois</body></message>"),
# Receive multiple messages, in order # Receive multiple messages, in order
expect_stanza("/message[@from='#foo%{irc_server_one}/{nick_one}'][@id='the-message-id'][@to='{jid_one}/{resource_one}'][@type='groupchat']/body[text()='un']"), expect_stanza("/message[@from='#foo%{irc_server_one}/{nick_one}'][@id='the-message-id'][@to='{jid_one}/{resource_one}'][@type='groupchat']/body[text()='un\ndeux\ntrois']"),
expect_stanza("/message[@from='#foo%{irc_server_one}/{nick_one}'][@id][@to='{jid_one}/{resource_one}'][@type='groupchat']/body[text()='deux']"),
expect_stanza("/message[@from='#foo%{irc_server_one}/{nick_one}'][@id][@to='{jid_one}/{resource_one}'][@type='groupchat']/body[text()='trois']"),
# Send a simple message, with no id # Send a simple message, with no id
send_stanza("<message from='{jid_one}/{resource_one}' to='#foo%{irc_server_one}' type='groupchat'><body>hello</body></message>"), send_stanza("<message from='{jid_one}/{resource_one}' to='#foo%{irc_server_one}' type='groupchat'><body>hello</body></message>"),
@@ -51,12 +49,8 @@ scenario = (
send_stanza("<message id='the-message-id' from='{jid_one}/{resource_one}' to='#foo%{irc_server_one}' type='groupchat'><body>a\nb\nc</body></message>"), send_stanza("<message id='the-message-id' from='{jid_one}/{resource_one}' to='#foo%{irc_server_one}' type='groupchat'><body>a\nb\nc</body></message>"),
# Receive multiple messages, for each user # Receive multiple messages, for each user
expect_unordered( expect_unordered(
["/message[@from='#foo%{irc_server_one}/{nick_one}'][@id='the-message-id'][@to='{jid_one}/{resource_one}'][@type='groupchat']/body[text()='a']"], ["/message[@from='#foo%{irc_server_one}/{nick_one}'][@id='the-message-id'][@to='{jid_one}/{resource_one}'][@type='groupchat']/body[text()='a\nb\nc']"],
["/message[@from='#foo%{irc_server_one}/{nick_one}'][@id][@to='{jid_one}/{resource_one}'][@type='groupchat']/body[text()='b']"],
["/message[@from='#foo%{irc_server_one}/{nick_one}'][@id][@to='{jid_one}/{resource_one}'][@type='groupchat']/body[text()='c']"],
["/message[@from='#foo%{irc_server_one}/{nick_one}'][@id][@to='{jid_two}/{resource_one}'][@type='groupchat']/body[text()='a']"], ["/message[@from='#foo%{irc_server_one}/{nick_one}'][@id][@to='{jid_two}/{resource_one}'][@type='groupchat']/body[text()='\na\nb\nc']"],
["/message[@from='#foo%{irc_server_one}/{nick_one}'][@id][@to='{jid_two}/{resource_one}'][@type='groupchat']/body[text()='b']"],
["/message[@from='#foo%{irc_server_one}/{nick_one}'][@id][@to='{jid_two}/{resource_one}'][@type='groupchat']/body[text()='c']"],
) )
) )
tests/end_to_end/scenarios/slash_me_channel_message.py
+1 -1
View File
@@ -11,7 +11,7 @@ scenario = (
"/message/stable_id:stanza-id[@by='#foo%{irc_server_one}'][@id]" "/message/stable_id:stanza-id[@by='#foo%{irc_server_one}'][@id]"
], ],
[ [
"/message[@from='#foo%{irc_server_one}/{nick_one}'][@to='{jid_two}/{resource_one}'][@type='groupchat']/body[text()='/me rit en IRC']", "/message[@from='#foo%{irc_server_one}/{nick_one}'][@to='{jid_two}/{resource_one}'][@type='groupchat']/body[text()='\n/me rit en IRC']",
"/message/stable_id:stanza-id[@by='#foo%{irc_server_one}'][@id]" "/message/stable_id:stanza-id[@by='#foo%{irc_server_one}'][@id]"
], ],
), ),