Improve nickname display in prompt, privmsg logs.

diff --git a/ircplom/client.py b/ircplom/client.py
index 5e1b3e4512cd6d9fba46195f59ac5b5b7168c623..ddb4cbed0fbf34ff66718a4e03c7f40ab2b7a4be 100644 (file)
--- 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 cebabeb0849c476b02e0e8fb67421493bc9b3f32..294ea47017c09dd8918eff1ec509798cc12491ed 100644 (file)
--- 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