Skip to content

Commit 61a6f04

Browse files
authored
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: Libera-Chat/sable@93ab9af
1 parent d75e3fa commit 61a6f04

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

irctest/server_tests/who.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def _checkReply(self, reply, flags):
6060
"*", # no chan
6161
StrRe("~?" + self.username),
6262
StrRe(host_re),
63-
"My.Little.Server",
63+
StrRe(r"(My.Little.Server|\*)"),
6464
"coolNick",
6565
flags,
6666
StrRe(realname_regexp(self.realname)),
@@ -76,7 +76,7 @@ def _checkReply(self, reply, flags):
7676
"#chan",
7777
StrRe("~?" + self.username),
7878
StrRe(host_re),
79-
"My.Little.Server",
79+
StrRe(r"(My.Little.Server|\*)"),
8080
"coolNick",
8181
flags + "@",
8282
StrRe(realname_regexp(self.realname)),
@@ -336,7 +336,7 @@ def testWhoChan(self, mask):
336336
"#chan",
337337
StrRe("~?" + self.username),
338338
StrRe(host_re),
339-
"My.Little.Server",
339+
StrRe(r"(My.Little.Server|\*)"),
340340
"coolNick",
341341
"G@",
342342
StrRe(realname_regexp(self.realname)),
@@ -351,7 +351,7 @@ def testWhoChan(self, mask):
351351
"#chan",
352352
ANYSTR,
353353
ANYSTR,
354-
"My.Little.Server",
354+
StrRe(r"(My.Little.Server|\*)"),
355355
"otherNick",
356356
"H",
357357
StrRe("[0-9]+ .*"),
@@ -398,7 +398,7 @@ def testWhoMultiChan(self):
398398
chan,
399399
ANYSTR,
400400
ANYSTR,
401-
"My.Little.Server",
401+
StrRe(r"(My.Little.Server|\*)"),
402402
"coolNick",
403403
ANYSTR,
404404
ANYSTR,
@@ -413,7 +413,7 @@ def testWhoMultiChan(self):
413413
chan,
414414
ANYSTR,
415415
ANYSTR,
416-
"My.Little.Server",
416+
StrRe(r"(My.Little.Server|\*)"),
417417
"otherNick",
418418
ANYSTR,
419419
ANYSTR,
@@ -479,7 +479,7 @@ def _testWhoxFull(self, chars):
479479
StrRe("~?myusernam"),
480480
ANYSTR,
481481
ANYSTR,
482-
"My.Little.Server",
482+
StrRe(r"(My.Little.Server|\*)"),
483483
"coolNick",
484484
StrRe("H@?"),
485485
ANYSTR, # hopcount

0 commit comments

Comments
 (0)