Fix the presences sent, when multiple resources join the virtual channel

fix #3216

2 files changed, 67 insertions, 7 deletions

diff --git a/src/bridge/bridge.cpp b/src/bridge/bridge.cpp
index 67eb805..a0ecc6e 100644
--- a/src/bridge/bridge.cpp
+++ b/src/bridge/bridge.cpp
@@ -177,16 +177,23 @@ bool Bridge::join_irc_channel(const Iid& iid, const std::string& nickname, const
     { // Join the dummy channel
       if (irc->is_welcomed())
         {
-          if (irc->get_dummy_channel().joined)
+          if (res_in_chan)
             return false;
           // Immediately simulate a message coming from the IRC server saying that we
           // joined the channel
-          const IrcMessage join_message(irc->get_nick(), "JOIN", {""});
-          irc->on_channel_join(join_message);
-          const IrcMessage end_join_message(std::string(iid.get_server()), "366",
-                                            {irc->get_nick(),
-                                                "", "End of NAMES list"});
-          irc->on_channel_completely_joined(end_join_message);
+          if (irc->get_dummy_channel().joined)
+            {
+              this->generate_channel_join_for_resource(iid, resource);
+            }
+          else
+            {
+              const IrcMessage join_message(irc->get_nick(), "JOIN", {""});
+              irc->on_channel_join(join_message);
+              const IrcMessage end_join_message(std::string(iid.get_server()), "366",
+                                                {irc->get_nick(),
+                                                 "", "End of NAMES list"});
+              irc->on_channel_completely_joined(end_join_message);
+            }
         }
       else
         {
diff --git a/tests/end_to_end/__main__.py b/tests/end_to_end/__main__.py
index e2a497d..26e7b05 100644
--- a/tests/end_to_end/__main__.py
+++ b/tests/end_to_end/__main__.py
@@ -1656,6 +1656,59 @@ if __name__ == '__main__':
                      partial(expect_stanza, "/message/body[text()='{nick_two} has been invited to #foo']"),
                      partial(expect_stanza, "/message[@to='{jid_two}/{resource_two}'][@from='#foo%{irc_server_one}']/muc_user:x/muc_user:invite[@from='#foo%{irc_server_one}/{nick_one}']"),
                 ]),
+                Scenario("virtual_channel_multisession",
+                 [
+                     handshake_sequence(),
+                     partial(send_stanza,
+                             "<presence from='{jid_one}/{resource_one}' to='%{irc_server_one}/{nick_one}' />"),
+                     connection_begin_sequence("irc.localhost", '{jid_one}/{resource_one}'),
+                     partial(expect_stanza,
+                             ("/presence[@to='{jid_one}/{resource_one}'][@from='%{irc_server_one}/{nick_one}']/muc_user:x/muc_user:item[@affiliation='none'][@role='participant']",
+                              "/presence/muc_user:x/muc_user:status[@code='110']")
+                             ),
+                     partial(expect_stanza, "/message[@from='%{irc_server_one}'][@type='groupchat']/subject[re:test(text(), '^This is a virtual channel.*$')]"),
+                     connection_end_sequence("irc.localhost", '{jid_one}/{resource_one}'),
+
+                     partial(send_stanza,
+                             "<presence from='{jid_one}/{resource_two}' to='%{irc_server_one}/{nick_one}' />"),
+
+                     partial(expect_stanza,
+                             ("/presence[@to='{jid_one}/{resource_two}'][@from='%{irc_server_one}/{nick_one}']/muc_user:x/muc_user:item[@affiliation='none'][@role='participant']",
+                              "/presence/muc_user:x/muc_user:status[@code='110']")
+                         ),
+                     partial(expect_stanza, "/message[@to='{jid_one}/{resource_two}'][@from='%{irc_server_one}'][@type='groupchat']/subject[re:test(text(), '^This is a virtual channel.*$')]"),
+
+
+                     partial(log_message, "Nick change"),
+                     partial(send_stanza, "<presence from='{jid_one}/{resource_one}' to='%{irc_server_one}/{nick_two}' />"),
+
+                     partial(expect_unordered, [
+                         ("/presence[@from='%{irc_server_one}/{nick_one}'][@to='{jid_one}/{resource_two}'][@type='unavailable']/muc_user:x/muc_user:item[@nick='Bobby']",
+                          "/presence/muc_user:x/muc_user:status[@code='303']",
+                          "/presence/muc_user:x/muc_user:status[@code='110']"),
+                         ("/presence[@from='%{irc_server_one}/{nick_two}'][@to='{jid_one}/{resource_two}']",
+                          "/presence/muc_user:x/muc_user:status[@code='110']"),
+
+                         ("/presence[@from='%{irc_server_one}/{nick_one}'][@to='{jid_one}/{resource_one}'][@type='unavailable']/muc_user:x/muc_user:item[@nick='Bobby']",
+                          "/presence/muc_user:x/muc_user:status[@code='303']",
+                          "/presence/muc_user:x/muc_user:status[@code='110']"),
+                         ("/presence[@from='%{irc_server_one}/{nick_two}'][@to='{jid_one}/{resource_one}']",
+                          "/presence/muc_user:x/muc_user:status[@code='110']"),
+                     ]),
+
+
+                     partial(log_message, "First resource leaves."),
+                     partial(send_stanza, "<presence type='unavailable' from='{jid_one}/{resource_one}' to='%{irc_server_one}/{nick_two}' />"),
+                     partial(expect_stanza, ("/presence[@type='unavailable'][@from='%{irc_server_one}/{nick_two}'][@to='{jid_one}/{resource_one}']/muc_user:x/muc_user:status[@code='110']",
+                                             "/presence/status[text()='Biboumi note: 1 resources are still in this channel.']",)
+                             ),
+
+                     partial(log_message, "Second resource leaves."),
+                     partial(send_stanza, "<presence type='unavailable' from='{jid_one}/{resource_two}' to='%{irc_server_one}/{nick_two}' />"),
+                     partial(expect_stanza, "/presence[@type='unavailable'][@from='%{irc_server_one}/{nick_two}']"),
+                     partial(expect_stanza, "/message[@from='{irc_server_one}']/body[text()='ERROR: Closing Link: localhost (Client Quit)']"),
+                     partial(expect_stanza, "/message[@from='{irc_server_one}']/body[text()='ERROR: Connection closed.']"),
+                 ]),
     )
 
     failures = 0