~singpolyma/biboumi: Send a 110 status code on a QUIT received for ourself

2 files changed, 24 insertions(+), 1 deletions(-)

M src/irc/irc_client.cpp
M tests/end_to_end/__main__.py

M src/irc/irc_client.cpp => src/irc/irc_client.cpp +4 -1

@@ 1015,6 1015,9 @@ void IrcClient::on_quit(const IrcMessage& message)
       const std::string& chan_name = pair.first;
       IrcChannel* channel = pair.second.get();
       const IrcUser* user = channel->find_user(message.prefix);
+      bool self = false;
+      if (user == channel->get_self())
+        self = true;
       if (user)
         {
           std::string nick = user->nick;


@@ 1023,7 1026,7 @@ void IrcClient::on_quit(const IrcMessage& message)
           iid.set_local(chan_name);
           iid.set_server(this->hostname);
           iid.type = Iid::Type::Channel;
-          this->bridge.send_muc_leave(iid, std::move(nick), txt, false);
+          this->bridge.send_muc_leave(iid, std::move(nick), txt, self);
         }
     }
 }

M tests/end_to_end/__main__.py => tests/end_to_end/__main__.py +20 -0

@@ 565,6 565,26 @@ if __name__ == '__main__':
                              ),
                      partial(expect_stanza, "/message[@from='#foo%{irc_server_one}'][@type='groupchat']/subject[not(text())]"),
                  ]),
+        Scenario("quit_message",
+                 [
+                     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/body[text()='Mode #foo [+nt] by {irc_host_one}']"),
+                     partial(expect_stanza,
+                             ("/presence[@to='{jid_one}/{resource_one}'][@from='#foo%{irc_server_one}/{nick_one}']/muc_user:x/muc_user:item[@affiliation='admin'][@role='moderator']",
+                             "/presence/muc_user:x/muc_user:status[@code='110']")
+                             ),
+                     partial(expect_stanza, "/message[@from='#foo%{irc_server_one}'][@type='groupchat']/subject[not(text())]"),
+
+                     # Send a raw QUIT message
+                     partial(send_stanza, "<message from='{jid_one}/{resource_one}' to='{irc_server_one}' type='chat'><body>QUIT bye bye</body></message>"),
+                     partial(expect_stanza, "/presence[@from='#foo%{irc_server_one}/{nick_one}'][@type='unavailable']/muc_user:x/muc_user:status[@code='110']"),
+                     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.']"),
+                 ]),
         Scenario("multiple_channels_join",
                  [
                      handshake_sequence(),