From 61a6f047d2293329fc3a453d1b34a74d5277277b Mon Sep 17 00:00:00 2001 From: Val Lorentz Date: Wed, 7 Feb 2024 19:35:02 +0100 Subject: [PATCH] Add support for '*' in place of server name in RPL_WHOREPLY/RPL_WHOSPCRPL (#252) Sable users are no longer associated with a server, so it now returns a blank where their server name used to be: https://github.com/Libera-Chat/sable/commit/93ab9afa5c2eff1ccef195ddbe2692a959c7cf04 --- irctest/server_tests/who.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/irctest/server_tests/who.py b/irctest/server_tests/who.py index 0e4b280..5ee4ac3 100644 --- a/irctest/server_tests/who.py +++ b/irctest/server_tests/who.py @@ -60,7 +60,7 @@ class BaseWhoTestCase: "*", # no chan StrRe("~?" + self.username), StrRe(host_re), - "My.Little.Server", + StrRe(r"(My.Little.Server|\*)"), "coolNick", flags, StrRe(realname_regexp(self.realname)), @@ -76,7 +76,7 @@ class BaseWhoTestCase: "#chan", StrRe("~?" + self.username), StrRe(host_re), - "My.Little.Server", + StrRe(r"(My.Little.Server|\*)"), "coolNick", flags + "@", StrRe(realname_regexp(self.realname)), @@ -336,7 +336,7 @@ class WhoTestCase(BaseWhoTestCase, cases.BaseServerTestCase): "#chan", StrRe("~?" + self.username), StrRe(host_re), - "My.Little.Server", + StrRe(r"(My.Little.Server|\*)"), "coolNick", "G@", StrRe(realname_regexp(self.realname)), @@ -351,7 +351,7 @@ class WhoTestCase(BaseWhoTestCase, cases.BaseServerTestCase): "#chan", ANYSTR, ANYSTR, - "My.Little.Server", + StrRe(r"(My.Little.Server|\*)"), "otherNick", "H", StrRe("[0-9]+ .*"), @@ -398,7 +398,7 @@ class WhoTestCase(BaseWhoTestCase, cases.BaseServerTestCase): chan, ANYSTR, ANYSTR, - "My.Little.Server", + StrRe(r"(My.Little.Server|\*)"), "coolNick", ANYSTR, ANYSTR, @@ -413,7 +413,7 @@ class WhoTestCase(BaseWhoTestCase, cases.BaseServerTestCase): chan, ANYSTR, ANYSTR, - "My.Little.Server", + StrRe(r"(My.Little.Server|\*)"), "otherNick", ANYSTR, ANYSTR, @@ -479,7 +479,7 @@ class WhoTestCase(BaseWhoTestCase, cases.BaseServerTestCase): StrRe("~?myusernam"), ANYSTR, ANYSTR, - "My.Little.Server", + StrRe(r"(My.Little.Server|\*)"), "coolNick", StrRe("H@?"), ANYSTR, # hopcount