xenofem/python-zulip-api
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

mypy: Remove explicit typing & add assertions in jabber backend.

Browse source 
Usage indicates set_jabber_client must be called before using
JabberToZulipBot, so assertions express intent & satisfy mypy.
This commit is contained in:
neiljp (Neil Pilgrim) 2018-01-08 07:15:55 -08:00 committed by showell
parent afee6d706f
commit b5c3442b57
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
zulip/integrations/jabber/jabber_mirror_backend.py
View file

@ -94,7 +94,7 @@ class JabberToZulipBot(ClientXMPP):
self.rooms_to_join = rooms self.rooms_to_join = rooms
self.add_event_handler("session_start", self.session_start) self.add_event_handler("session_start", self.session_start)
self.add_event_handler("message", self.message) self.add_event_handler("message", self.message)
self.zulip = None # type: Client self.zulip = None
self.use_ipv6 = False self.use_ipv6 = False
self.register_plugin('xep_0045') # Jabber chatrooms self.register_plugin('xep_0045') # Jabber chatrooms
@ -216,7 +216,7 @@ class ZulipToJabberBot(object):
def __init__(self, zulip_client): def __init__(self, zulip_client):
# type: (Client) -> None # type: (Client) -> None
self.client = zulip_client self.client = zulip_client
self.jabber = None # type: JabberToZulipBot self.jabber = None
def set_jabber_client(self, client): def set_jabber_client(self, client):
# type: (JabberToZulipBot) -> None # type: (JabberToZulipBot) -> None
@ -243,6 +243,7 @@ class ZulipToJabberBot(object):
def stream_message(self, msg): def stream_message(self, msg):
# type: (Dict[str, str]) -> None # type: (Dict[str, str]) -> None
assert(self.jabber is not None)
stream = msg['display_recipient'] stream = msg['display_recipient']
if not stream.endswith("/xmpp"): if not stream.endswith("/xmpp"):
return return
@ -258,6 +259,7 @@ class ZulipToJabberBot(object):
def private_message(self, msg): def private_message(self, msg):
# type: (Dict[str, Any]) -> None # type: (Dict[str, Any]) -> None
assert(self.jabber is not None)
for recipient in msg['display_recipient']: for recipient in msg['display_recipient']:
if recipient["email"] == self.client.email: if recipient["email"] == self.client.email:
continue continue
@ -274,6 +276,7 @@ class ZulipToJabberBot(object):
def process_subscription(self, event): def process_subscription(self, event):
# type: (Dict[str, Any]) -> None # type: (Dict[str, Any]) -> None
assert(self.jabber is not None)
if event['op'] == 'add': if event['op'] == 'add':
streams = [s['name'].lower() for s in event['subscriptions']] streams = [s['name'].lower() for s in event['subscriptions']]
streams = [s for s in streams if s.endswith("/xmpp")] streams = [s for s in streams if s.endswith("/xmpp")]
@ -287,6 +290,7 @@ class ZulipToJabberBot(object):
def process_stream(self, event): def process_stream(self, event):
# type: (Dict[str, Any]) -> None # type: (Dict[str, Any]) -> None
assert(self.jabber is not None)
if event['op'] == 'occupy': if event['op'] == 'occupy':
streams = [s['name'].lower() for s in event['streams']] streams = [s['name'].lower() for s in event['streams']]
streams = [s for s in streams if s.endswith("/xmpp")] streams = [s for s in streams if s.endswith("/xmpp")]