pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'muctab-presence-types' into 'master'

Browse source 
MucTab: add some typing to presence handlers

See merge request poezio/poezio!104
This commit is contained in:
mathieui 2020-05-22 18:46:17 +02:00
commit f5b407e9b2
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
poezio/tabs/muctab.py
View file

@ -18,9 +18,9 @@ import re
import functools import functools
from copy import copy from copy import copy
from datetime import datetime from datetime import datetime
from typing import Dict, Callable, List, Optional, Union, Set from typing import Dict, Callable, List, Optional, Tuple, Union, Set
from slixmpp import InvalidJID, JID from slixmpp import InvalidJID, JID, Presence
from slixmpp.exceptions import IqError, IqTimeout from slixmpp.exceptions import IqError, IqTimeout
from poezio.tabs import ChatTab, Tab, SHOW_NAME from poezio.tabs import ChatTab, Tab, SHOW_NAME
@ -509,15 +509,15 @@ class MucTab(ChatTab):
self.core.tabs.current_tab.refresh_input() self.core.tabs.current_tab.refresh_input()
self.core.doupdate() self.core.doupdate()
def handle_presence_unjoined(self, presence, deterministic, own=False): def handle_presence_unjoined(self, presence: Presence, deterministic, own=False) -> None:
""" """
Presence received while we are not in the room (before code=110) Presence received while we are not in the room (before code=110)
""" """
# If presence is coming from MUC barejid, ignore. # If presence is coming from MUC barejid, ignore.
if not presence['from'].resource: if not presence['from'].resource:
return None return None
from_nick, _, affiliation, show, status, role, jid, typ = dissect_presence( dissected_presence = dissect_presence(presence)
presence) from_nick, _, affiliation, show, status, role, jid, typ = dissected_presence
if typ == 'unavailable': if typ == 'unavailable':
return return
user_color = self.search_for_color(from_nick) user_color = self.search_for_color(from_nick)
@ -595,15 +595,15 @@ class MucTab(ChatTab):
), ),
typ=0) typ=0)
def handle_presence_joined(self, presence, status_codes): def handle_presence_joined(self, presence: Presence, status_codes) -> None:
""" """
Handle new presences when we are already in the room Handle new presences when we are already in the room
""" """
# If presence is coming from MUC barejid, ignore. # If presence is coming from MUC barejid, ignore.
if not presence['from'].resource: if not presence['from'].resource:
return None return None
from_nick, from_room, affiliation, show, status, role, jid, typ = dissect_presence( dissected_presence = dissect_presence(presence)
presence) from_nick, from_room, affiliation, show, status, role, jid, typ = dissected_presence
change_nick = '303' in status_codes change_nick = '303' in status_codes
kick = '307' in status_codes and typ == 'unavailable' kick = '307' in status_codes and typ == 'unavailable'
ban = '301' in status_codes and typ == 'unavailable' ban = '301' in status_codes and typ == 'unavailable'
@ -2195,7 +2195,7 @@ class PresenceError(Exception):
pass pass
def dissect_presence(presence): def dissect_presence(presence: Presence) -> Tuple[str, str, str, str, str, str, JID, str]:
""" """
Extract relevant information from a presence Extract relevant information from a presence
""" """