From 3dd78962aa3b7d5d2c4b1d143c70586b1a069ab6 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Mon, 22 Sep 2025 04:26:54 +0200 Subject: [PATCH] Differentiate expansive usage of same variable name "target". --- ircplom/client.py | 7 ++++--- ircplom/client_tui.py | 24 +++++++++++++----------- ircplom/msg_parse_expectations.py | 2 +- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/ircplom/client.py b/ircplom/client.py index f759981..75e375f 100644 --- a/ircplom/client.py +++ b/ircplom/client.py @@ -881,8 +881,8 @@ class Client(ABC, ClientQueueMixin): elif ret['_verb'] == '372': # RPL_MOTD self.db.motd.append(ret['line']) elif ret['_verb'] == '401': # ERR_NOSUCHNICK - self._log(f'{ret["target"]} not online', scope=LogScope.CHAT, - target=ret['target'], alert=True) + self._log(f'{ret["missing"]} not online', scope=LogScope.CHAT, + log_target=ret['missing'], alert=True) elif ret['_verb'] == '432': # ERR_ERRONEOUSNICKNAME alert = 'nickname refused for bad format' if 'nick' not in ret: @@ -921,7 +921,8 @@ class Client(ABC, ClientQueueMixin): kw: dict[str, str | bool] = {'as_notice': ret['_verb'] == 'NOTICE'} if (scope := LogScope.CHAT if 'sender' in ret else None): kw['them'] = ret['sender'].nick - kw['target'] = kw['them'] if 'nick' in ret else ret['channel'] + kw['log_target'] = (kw['them'] if 'nick' in ret + else ret['channel']) self._log(ret['message'], out=False, scope=scope, **kw) elif ret['_verb'] == 'PART': ret['parter'].part(ret['channel'], ret.get('message', '')) diff --git a/ircplom/client_tui.py b/ircplom/client_tui.py index ec4d0c2..4e72f68 100644 --- a/ircplom/client_tui.py +++ b/ircplom/client_tui.py @@ -55,7 +55,7 @@ class _ClientWindow(Window, ClientQueueMixin): def cmd__privmsg(self, target: str, msg: str) -> None: 'Send chat message msg to target.' - self._client_trigger('privmsg', target=target, msg=msg) + self._client_trigger('privmsg', chat_target=target, msg=msg) def cmd__raw(self, verb: str, params_str: str = '') -> None: 'Send raw command, with direct input of params string.' @@ -360,7 +360,7 @@ class _ClientWindowsManager: log_kwargs: dict[str, Any] = {'scope': scope} if scope in {LogScope.CHAT, LogScope.USER, LogScope.USER_NO_CHANNELS}: - log_kwargs |= {'target': update.full_path[1]} + log_kwargs |= {'log_target': update.full_path[1]} if isinstance(result, list): msg = '' for item in result: @@ -404,14 +404,15 @@ class ClientTui(BaseTui): if scope == LogScope.DEBUG: return [m.window(LogScope.DEBUG), m.window(LogScope.RAW)] if scope == LogScope.CHAT: - chatname = (kwargs['target'] - if kwargs['target'] != m.db.users['me'].nick + chatname = (kwargs['log_target'] + if kwargs['log_target'] != m.db.users['me'].nick else kwargs['them']) return [m.window(LogScope.CHAT, chatname=chatname)] if scope == LogScope.USER: - return m.windows_for_userid(kwargs['target']) + return m.windows_for_userid(kwargs['log_target']) if scope == LogScope.USER_NO_CHANNELS: - return m.windows_for_userid(kwargs['target'], w_channels=False) + return m.windows_for_userid(kwargs['log_target'], + w_channels=False) return [m.window(scope)] return super()._log_target_wins(**kwargs) @@ -473,17 +474,18 @@ class ClientKnowingTui(Client): 'Helper for ClientWindow to trigger .send, for it can only do kwargs.' self.send(verb, *params) - def privmsg(self, target: str, msg: str) -> None: + def privmsg(self, chat_target: str, msg: str) -> None: 'Catch /privmsg, only allow for channel if in channel, else complain.' try: - if self.db.is_chan_name(target)\ - and target not in self.db.channels.keys(): + if self.db.is_chan_name(chat_target)\ + and chat_target not in self.db.channels.keys(): raise SendFail('not sending, since not in channel') - self.send('PRIVMSG', target, msg) + self.send('PRIVMSG', chat_target, msg) except SendFail as e: self._log(f'{e}', scope=LogScope.SAME, alert=True) else: - self._log(msg, scope=LogScope.CHAT, target=target, out=True) + self._log(msg, scope=LogScope.CHAT, log_target=chat_target, + out=True) def reconnect(self) -> None: 'Catch /reconnect, only initiate if not connected, else complain back.' diff --git a/ircplom/msg_parse_expectations.py b/ircplom/msg_parse_expectations.py index 9141836..bf8c3f6 100644 --- a/ircplom/msg_parse_expectations.py +++ b/ircplom/msg_parse_expectations.py @@ -484,7 +484,7 @@ MSG_EXPECTATIONS: list[_MsgParseExpectation] = [ '401', # ERR_NOSUCKNICK _MsgTok.SERVER, ((_MsgTok.NICKNAME, 'setattr_db.users.me:nick'), - (_MsgTok.NICKNAME, ':target'), + (_MsgTok.NICKNAME, ':missing'), _MsgTok.ANY)), # comment _MsgParseExpectation( -- 2.30.2