From 14a8357626a82f689b788b6b3cd4a06fb29245b9 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Thu, 7 Aug 2025 01:17:56 +0200 Subject: [PATCH] Improve nickname display in prompt, privmsg logs. --- ircplom/client.py | 2 +- ircplom/client_tui.py | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ircplom/client.py b/ircplom/client.py index 5e1b3e4..ddb4cbe 100644 --- a/ircplom/client.py +++ b/ircplom/client.py @@ -276,7 +276,7 @@ class Client(ABC, ClientQueueMixin): self.update_login(nickname=msg.params[0], nick_confirmed=True) case 'PRIVMSG': nickname = msg.source.split('!')[0] - self.log.add(f'<[{nickname}] {msg.params[-1]}', + self.log.add(f'< [{nickname}] {msg.params[-1]}', stream=nickname, prefix=_LOG_PREFIX_PRIVMSG) case 'CAP': diff --git a/ircplom/client_tui.py b/ircplom/client_tui.py index cebabeb..294ea47 100644 --- a/ircplom/client_tui.py +++ b/ircplom/client_tui.py @@ -46,19 +46,21 @@ class _ClientWindow(Window, ClientQueueMixin): def cmd__privmsg(self, target: str, msg: str) -> None: 'Send chat message msg to target.' self._send_msg('PRIVMSG', (target, msg), - stream=target, to_log=f'>[MYSELF] {msg}') + stream=target, to_log=f'>{self.prompt.prefix}{msg}') class _PrivmsgPromptWidget(PromptWidget): - _prefix: str = '' + _nickname: str = '' + _nick_confirmed: bool = False @property def prefix(self) -> str: - return self._prefix + super().prefix + return (' ' if self._nick_confirmed else '?') + f'[{self._nickname}] ' def update_prefix(self, nick_confirmed: bool, nickname: str) -> None: 'Update prompt prefix with nickname data.' - self._prefix = (' ' if nick_confirmed else '?') + nickname + self._nickname = nickname + self._nick_confirmed = nick_confirmed self.tainted = True @classmethod -- 2.30.2