From f10c77b6f4995b65bb71ad2d442de1616effece4 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Tue, 19 Aug 2025 18:29:16 +0200 Subject: [PATCH] Handle 353, 366, 372, 376 in new pattern. --- ircplom/client.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/ircplom/client.py b/ircplom/client.py index 85a66ee..639ce14 100644 --- a/ircplom/client.py +++ b/ircplom/client.py @@ -61,12 +61,16 @@ class _MsgParseExpectation(NamedTuple): _EXPECTATIONS: tuple[_MsgParseExpectation, ...] = ( _MsgParseExpectation(_MsgTok.SERVER, '005', 3, 15), - _MsgParseExpectation(_MsgTok.SERVER, '353', params=(_MsgTok.NICKNAME_ME, - '=', _MsgTok.CHANNEL, - _MsgTok.LIST,)), - _MsgParseExpectation(_MsgTok.SERVER, '366', 3), - _MsgParseExpectation(_MsgTok.SERVER, '372', 2), - _MsgParseExpectation(_MsgTok.SERVER, '376', 2), + _MsgParseExpectation(_MsgTok.SERVER, '353', + params=(_MsgTok.NICKNAME_ME, '=', _MsgTok.CHANNEL, + _MsgTok.LIST,)), + _MsgParseExpectation(_MsgTok.SERVER, '366', + params=(_MsgTok.NICKNAME_ME, _MsgTok.CHANNEL, + _MsgTok.ANY)), + _MsgParseExpectation(_MsgTok.SERVER, '372', + params=(_MsgTok.NICKNAME_ME, _MsgTok.ANY)), + _MsgParseExpectation(_MsgTok.SERVER, '376', + params=(_MsgTok.NICKNAME_ME, _MsgTok.ANY)), _MsgParseExpectation(_MsgTok.SERVER, '396', 3), _MsgParseExpectation(_MsgTok.SERVER, '401', 3), _MsgParseExpectation(_MsgTok.SERVER, '432', 3), @@ -649,8 +653,8 @@ class Client(ABC, ClientQueueMixin): ret['channel'].append_completable('users', usr.lstrip('~&@%+')) elif self._match_msg(msg, '366'): # RPL_ENDOFNAMES self._db.chan(msg.params[1]).declare_complete('users') - elif self._match_msg(msg, '372'): # RPL_MOTD - self._db.append_completable('motd', msg.params[1]) + elif (ret := self._match_msg(msg, '372')): # RPL_MOTD + self._db.append_completable('motd', ret['any']) elif self._match_msg(msg, '376'): # RPL_ENDOFMOTD self._db.declare_complete('motd') elif self._match_msg(msg, '396'): # RPL_VISIBLEHOST -- 2.30.2