Pass a message to add_message instead of messed up kwargs everywhere

Changes LOTS of things

1 files changed, 56 insertions, 44 deletions

diff --git a/poezio/tabs/privatetab.py b/poezio/tabs/privatetab.py
index 7206240f..b43294a1 100644
--- a/poezio/tabs/privatetab.py
+++ b/poezio/tabs/privatetab.py
@@ -27,6 +27,7 @@ from poezio.decorators import refresh_wrapper
 from poezio.logger import logger
 from poezio.theming import get_theme, dump_tuple
 from poezio.decorators import command_args_parser
+from poezio.ui.types import BaseMessage, Message, InfoMessage
 
 log = logging.getLogger(__name__)
 
@@ -106,12 +107,14 @@ class PrivateTab(OneToOneTab):
     def remove_information_element(plugin_name):
         del PrivateTab.additional_information[plugin_name]
 
-    def log_message(self, txt, nickname, time=None, typ=1):
+    def log_message(self, msg: BaseMessage, typ=1):
         """
         Log the messages in the archives.
         """
+        if not isinstance(msg, Message):
+            return
         if not logger.log_message(
-                self.jid.full, nickname, txt, date=time, typ=typ):
+                self.jid.full, msg.nickname, msg.txt, date=msg.time, typ=typ):
             self.core.information('Unable to write in the log file', 'Error')
 
     def on_close(self):
@@ -163,8 +166,6 @@ class PrivateTab(OneToOneTab):
         self.core.events.trigger('private_say', msg, self)
         if not msg['body']:
             return
-        user = self.parent_muc.get_user_by_name(self.own_nick)
-        replaced = False
         if correct or msg['replace']['id']:
             msg['replace']['id'] = self.last_sent_message['id']
         else:
@@ -311,13 +312,15 @@ class PrivateTab(OneToOneTab):
         display a message.
         """
         self.add_message(
-            '\x19%(nick_col)s}%(old)s\x19%(info_col)s} is now '
-            'known as \x19%(nick_col)s}%(new)s' % {
-                'old': old_nick,
-                'new': user.nick,
-                'nick_col': dump_tuple(user.color),
-                'info_col': dump_tuple(get_theme().COLOR_INFORMATION_TEXT)
-            },
+            InfoMessage(
+                '\x19%(nick_col)s}%(old)s\x19%(info_col)s} is now '
+                'known as \x19%(nick_col)s}%(new)s' % {
+                    'old': old_nick,
+                    'new': user.nick,
+                    'nick_col': dump_tuple(user.color),
+                    'info_col': dump_tuple(get_theme().COLOR_INFORMATION_TEXT)
+                },
+            ),
             typ=2)
         new_jid = self.jid.bare + '/' + user.nick
         self.name = new_jid
@@ -338,27 +341,31 @@ class PrivateTab(OneToOneTab):
 
         if not status_message:
             self.add_message(
-                '\x19%(quit_col)s}%(spec)s \x19%(nick_col)s}'
-                '%(nick)s\x19%(info_col)s} has left the room' % {
-                    'nick': user.nick,
-                    'spec': theme.CHAR_QUIT,
-                    'nick_col': color,
-                    'quit_col': dump_tuple(theme.COLOR_QUIT_CHAR),
-                    'info_col': dump_tuple(theme.COLOR_INFORMATION_TEXT)
-                },
+                InfoMessage(
+                    '\x19%(quit_col)s}%(spec)s \x19%(nick_col)s}'
+                    '%(nick)s\x19%(info_col)s} has left the room' % {
+                        'nick': user.nick,
+                        'spec': theme.CHAR_QUIT,
+                        'nick_col': color,
+                        'quit_col': dump_tuple(theme.COLOR_QUIT_CHAR),
+                        'info_col': dump_tuple(theme.COLOR_INFORMATION_TEXT)
+                    },
+                ),
                 typ=2)
         else:
             self.add_message(
-                '\x19%(quit_col)s}%(spec)s \x19%(nick_col)s}'
-                '%(nick)s\x19%(info_col)s} has left the room'
-                ' (%(status)s)' % {
-                    'status': status_message,
-                    'nick': user.nick,
-                    'spec': theme.CHAR_QUIT,
-                    'nick_col': color,
-                    'quit_col': dump_tuple(theme.COLOR_QUIT_CHAR),
-                    'info_col': dump_tuple(theme.COLOR_INFORMATION_TEXT)
-                },
+                InfoMessage(
+                    '\x19%(quit_col)s}%(spec)s \x19%(nick_col)s}'
+                    '%(nick)s\x19%(info_col)s} has left the room'
+                    ' (%(status)s)' % {
+                        'status': status_message,
+                        'nick': user.nick,
+                        'spec': theme.CHAR_QUIT,
+                        'nick_col': color,
+                        'quit_col': dump_tuple(theme.COLOR_QUIT_CHAR),
+                        'info_col': dump_tuple(theme.COLOR_INFORMATION_TEXT)
+                    },
+                ),
                 typ=2)
         return self.core.tabs.current_tab is self
 
@@ -378,26 +385,28 @@ class PrivateTab(OneToOneTab):
             if user:
                 color = dump_tuple(user.color)
         self.add_message(
-            '\x19%(join_col)s}%(spec)s \x19%(color)s}%(nick)s\x19'
-            '%(info_col)s} joined the room' % {
-                'nick': nick,
-                'color': color,
-                'spec': theme.CHAR_JOIN,
-                'join_col': dump_tuple(theme.COLOR_JOIN_CHAR),
-                'info_col': dump_tuple(theme.COLOR_INFORMATION_TEXT)
-            },
+            InfoMessage(
+                '\x19%(join_col)s}%(spec)s \x19%(color)s}%(nick)s\x19'
+                '%(info_col)s} joined the room' % {
+                    'nick': nick,
+                    'color': color,
+                    'spec': theme.CHAR_JOIN,
+                    'join_col': dump_tuple(theme.COLOR_JOIN_CHAR),
+                    'info_col': dump_tuple(theme.COLOR_INFORMATION_TEXT)
+                },
+            ),
             typ=2)
         return self.core.tabs.current_tab is self
 
     def activate(self, reason=None):
         self.on = True
         if reason:
-            self.add_message(txt=reason, typ=2)
+            self.add_message(InfoMessage(reason), typ=2)
 
     def deactivate(self, reason=None):
         self.on = False
         if reason:
-            self.add_message(txt=reason, typ=2)
+            self.add_message(InfoMessage(reason), typ=2)
 
     def matching_names(self):
         return [(3, self.jid.resource), (4, self.name)]
@@ -407,9 +416,12 @@ class PrivateTab(OneToOneTab):
         error = '\x19%s}%s\x19o' % (dump_tuple(theme.COLOR_CHAR_NACK),
                                     error_message)
         self.add_message(
-            error,
-            highlight=True,
-            nickname='Error',
-            nick_color=theme.COLOR_ERROR_MSG,
-            typ=2)
+            Message(
+                error,
+                highlight=True,
+                nickname='Error',
+                nick_color=theme.COLOR_ERROR_MSG,
+            ),
+            typ=2,
+        )
         self.core.refresh_window()