diff options
author | mathieui <mathieui@mathieui.net> | 2020-05-31 23:14:39 +0200 |
---|---|---|
committer | mathieui <mathieui@mathieui.net> | 2021-04-02 22:22:30 +0200 |
commit | f56811d5466d4b23f6bfc71b88cb6cdbc4090e29 (patch) | |
tree | 506778c58581b0f37b690fcd4b98fc0e94d3c3c3 /poezio/tabs/muctab.py | |
parent | bbc22fc8bc99be8c84272efa591487a33ef12fc4 (diff) | |
download | poezio-f56811d5466d4b23f6bfc71b88cb6cdbc4090e29.tar.gz poezio-f56811d5466d4b23f6bfc71b88cb6cdbc4090e29.tar.bz2 poezio-f56811d5466d4b23f6bfc71b88cb6cdbc4090e29.tar.xz poezio-f56811d5466d4b23f6bfc71b88cb6cdbc4090e29.zip |
logging: Remove the "typ" passing when adding or logging messages
Diffstat (limited to 'poezio/tabs/muctab.py')
-rw-r--r-- | poezio/tabs/muctab.py | 65 |
1 files changed, 27 insertions, 38 deletions
diff --git a/poezio/tabs/muctab.py b/poezio/tabs/muctab.py index 4fbde32e..606506b6 100644 --- a/poezio/tabs/muctab.py +++ b/poezio/tabs/muctab.py @@ -29,6 +29,7 @@ from typing import ( Tuple, Union, Set, + Type, Pattern, TYPE_CHECKING, ) @@ -58,6 +59,8 @@ from poezio.ui.types import ( Message, MucOwnJoinMessage, MucOwnLeaveMessage, + StatusMessage, + PersistentInfoMessage, ) if TYPE_CHECKING: @@ -220,7 +223,7 @@ class MucTab(ChatTab): 'color_spec': spec_col, 'nick': self.own_nick, } - self.add_message(MucOwnLeaveMessage(msg), typ=2) + self.add_message(MucOwnLeaveMessage(msg)) self.disconnect() muc.leave_groupchat(self.core.xmpp, self.jid.bare, self.own_nick, message) @@ -343,7 +346,7 @@ class MucTab(ChatTab): 'role': user.role or 'None', 'status': '\n%s' % user.status if user.status else '' } - self.add_message(InfoMessage(info), typ=0) + self.add_message(InfoMessage(info)) return True def change_topic(self, topic: str) -> None: @@ -374,7 +377,6 @@ class MucTab(ChatTab): "The subject of the room is: \x19%s}%s %s" % (norm_text, self.topic, user_string), ), - typ=0, ) @refresh_wrapper.always @@ -576,12 +578,11 @@ class MucTab(ChatTab): 'nick_col': color, 'info_col': info_col, } - self.add_message(MucOwnJoinMessage(enable_message), typ=2) + self.add_message(MucOwnJoinMessage(enable_message)) self.core.enable_private_tabs(self.jid.bare, enable_message) if 201 in status_codes: self.add_message( - InfoMessage('Info: The room has been created'), - typ=0 + PersistentInfoMessage('Info: The room has been created'), ) if 170 in status_codes: self.add_message( @@ -590,9 +591,9 @@ class MucTab(ChatTab): ' This room is publicly logged' % { 'info_col': info_col, 'warn_col': warn_col - }, + } ), - typ=0) + ) if 100 in status_codes: self.add_message( InfoMessage( @@ -602,7 +603,7 @@ class MucTab(ChatTab): 'warn_col': warn_col }, ), - typ=0) + ) mam.schedule_tab_open(self) def handle_presence_joined(self, presence: Presence, status_codes: Set[int]) -> None: @@ -664,8 +665,8 @@ class MucTab(ChatTab): MucOwnLeaveMessage( 'You have been kicked because you ' 'are not a member and the room is now members-only.' - ), - typ=2) + ) + ) self.disconnect() def on_muc_shutdown(self) -> None: @@ -674,8 +675,8 @@ class MucTab(ChatTab): MucOwnLeaveMessage( 'You have been kicked because the' ' MUC service is shutting down.' - ), - typ=2) + ) + ) self.disconnect() def on_user_join(self, from_nick: str, affiliation: str, show: str, status: str, role: str, jid: JID, @@ -719,7 +720,7 @@ class MucTab(ChatTab): 'jid_color': dump_tuple(theme.COLOR_MUC_JID), 'color_spec': spec_col, } - self.add_message(InfoMessage(msg), typ=2) + self.add_message(PersistentInfoMessage(msg)) self.core.on_user_rejoined_private_conversation(self.jid.bare, from_nick) def on_user_nick_change(self, presence: Presence, user: User, from_nick: str) -> None: @@ -747,7 +748,7 @@ class MucTab(ChatTab): old_color = color = "3" info_col = dump_tuple(get_theme().COLOR_INFORMATION_TEXT) self.add_message( - InfoMessage( + PersistentInfoMessage( '\x19%(old_color)s}%(old)s\x19%(info_col)s} is' ' now known as \x19%(color)s}%(new)s' % { 'old': from_nick, @@ -756,8 +757,8 @@ class MucTab(ChatTab): 'old_color': old_color, 'info_col': info_col }, - ), - typ=2) + ) + ) # rename the private tabs if needed self.core.rename_private_tabs(self.jid.bare, from_nick, user) @@ -765,7 +766,7 @@ class MucTab(ChatTab): """ When someone is banned from a muc """ - cls = InfoMessage + cls: Type[InfoMessage] = PersistentInfoMessage self.users.remove(user) by = presence.xml.find('{%s}x/{%s}item/{%s}actor' % (NS_MUC_USER, NS_MUC_USER, NS_MUC_USER)) @@ -842,13 +843,13 @@ class MucTab(ChatTab): 'reason': reason.text, 'info_col': info_col } - self.add_message(cls(kick_msg), typ=2) + self.add_message(cls(kick_msg)) def on_user_kicked(self, presence: Presence, user: User, from_nick: str) -> None: """ When someone is kicked from a muc """ - cls = InfoMessage + cls: Type[InfoMessage] = PersistentInfoMessage self.users.remove(user) actor_elem = presence.xml.find('{%s}x/{%s}item/{%s}actor' % (NS_MUC_USER, NS_MUC_USER, NS_MUC_USER)) @@ -922,7 +923,7 @@ class MucTab(ChatTab): 'reason': reason.text, 'info_col': info_col } - self.add_message(cls(kick_msg), typ=2) + self.add_message(cls(kick_msg)) def on_user_leave_groupchat(self, user: User, @@ -987,7 +988,7 @@ class MucTab(ChatTab): } if status: leave_msg += ' (\x19o%s\x19%s})' % (status, info_col) - self.add_message(InfoMessage(leave_msg), typ=2) + self.add_message(PersistentInfoMessage(leave_msg)) self.core.on_user_left_private_conversation(from_room, user, status) def on_user_change_status(self, user: User, from_nick: str, from_room: str, affiliation: str, @@ -1072,18 +1073,6 @@ class MucTab(ChatTab): """ return self.topic.replace('\n', '|') - def log_message(self, msg: BaseMessage, typ: int = 1) -> None: - """ - Log the messages in the archives, if it needs - to be - """ - if not isinstance(msg, Message): - return - if not msg.history and self.joined and msg.nickname and msg.txt: # don't log the history messages - if not logger.log_message(self.jid.bare, msg.nickname, msg.txt, typ=typ): - self.core.information('Unable to write in the log file', - 'Error') - def get_user_by_name(self, nick: str) -> Optional[User]: """ Gets the user associated with the given nick, or None if not found @@ -1093,12 +1082,12 @@ class MucTab(ChatTab): return user return None - def add_message(self, msg: BaseMessage, typ: int = 1) -> None: + def add_message(self, msg: BaseMessage) -> None: """Add a message to the text buffer and set various tab status""" # reset self-ping interval if self.self_ping_event: self.enable_self_ping_event() - super().add_message(msg, typ=typ) + super().add_message(msg) if not isinstance(msg, Message): return if msg.user: @@ -1130,7 +1119,7 @@ class MucTab(ChatTab): user=user, jid=jid) if message: - self.log_message(message, typ=1) + self.log_message(message) self.text_win.modify_message(message.identifier, message) return highlight return False @@ -1585,7 +1574,7 @@ class MucTab(ChatTab): buff.append('\n') message = ' '.join(buff) - self.add_message(InfoMessage(message), typ=0) + self.add_message(InfoMessage(message)) self.text_win.refresh() self.input.refresh() |