Mark NOTICE with different nick brackets rather than '***' prefix.

diff --git a/src/ircplom/client_tui.py b/src/ircplom/client_tui.py
index 7c0a4c4c3a22c4d5c11594ed9d5c81efef88f445..726eeaf3ddf64fece354927654b64582ce242814 100644 (file)
--- a/src/ircplom/client_tui.py
+++ b/src/ircplom/client_tui.py
@@ -356,11 +356,11 @@ class _TuiClientDb(_UpdatingNode, SharedClientDbFields):
         elif update.key == 'message' and update.value:
             assert isinstance(update.value, ChatMessage)
             is_server_msg = not (update.value.sender or update.value.target)
-            toks = [':*** '] if update.value.is_notice else []
-            toks += [':[']
+            brackets = '()' if update.value.is_notice else '[]'
+            toks = [f':{brackets[0]}']
             toks += [f':{update.value.sender}' if update.value.sender
                      else (':server' if is_server_msg else 'NICK:me')]
-            toks += [f':] {update.value.content}']
+            toks += [f':{brackets[1]} {update.value.content}']
             update.results += [
                 (_LogScope.SERVER if is_server_msg else _LogScope.CHAT, toks)]
 

diff --git a/src/tests/pingpong.test b/src/tests/pingpong.test
index 065ec78ede56439240ffc607f0ffae5a1364f580..d29ec750db716bbfa2861356b67ccddf2d7e93c9 100644 (file)
--- a/src/tests/pingpong.test
+++ b/src/tests/pingpong.test
@@ -39,7 +39,7 @@
 | trigger-ping-out
 :0:1 ..< :*.?.net PONG *.?.net :what's up?
 :0:1 ..< :*.?.net NOTICE * :*** Looking up your ident...
-2 ..< *** [server] *** Looking up your ident...
+2 ..< (server) *** Looking up your ident...
 
 # another timeout instead of pong? disconnect
 repeat trigger-ping-in trigger-ping-out

diff --git a/src/tests/test.test b/src/tests/test.test
index ac08ebd5d442661c682298b4d44a25fa8f7897a5..c9c898b20b06df8cccac9749d477de43ab44682c 100644 (file)
--- a/src/tests/test.test
+++ b/src/tests/test.test
@@ -33,11 +33,11 @@
 
 # expect some NOTICE and PING to process/reply during initiation
 :0:1 ..< :*.?.net NOTICE * :*** Looking up your ident...
-2 ..< *** [server] *** Looking up your ident...
+2 ..< (server) *** Looking up your ident...
 :0:1 ..< :*.?.net NOTICE * :*** Looking up your hostname...
-2 ..< *** [server] *** Looking up your hostname...
-:0:1 ..< :*.?.net NOTICE * :*** Found your hostname (bar.baz.foo)
-2 ..< *** [server] *** Found your hostname (baz.bar.foo)
+2 ..< (server) *** Looking up your hostname...
+:0:1 ..< :*.?.net NOTICE * :*** Found your hostname (baz.bar.foo)
+2 ..< (server) *** Found your hostname (baz.bar.foo)
 :0:1 ..< PING :?
 1 ..> PONG :?
 
@@ -120,7 +120,7 @@
 
 # handle bot query NOTICE
 :0:1 ..< :SaslServ!SaslServ@services.bar.baz NOTICE foo1 :Last login from ~foobarbaz@foo.bar.baz on Jan 1 22:00:00 2021 +0000.
-3 ..< *** [SaslServ] Last login from ~foobarbaz@foo.bar.baz on Jan 1 22:00:00 2021 +0000.
+3 ..< (SaslServ) Last login from ~foobarbaz@foo.bar.baz on Jan 1 22:00:00 2021 +0000.
 | conn4
 
 # check difference in available commands when switching to client window