karaolidis/fbchat
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split ._parseMessage to reduce indentation

Browse Source
This commit is contained in:
Mads Marquart
2019-12-15 15:30:02 +01:00
parent a97ef67411
commit ffdf4222bf
1 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
fbchat/_client.py
View File

@@ -2751,27 +2751,8 @@ class Client(object):
else: else:
self.onUnknownMesssageType(msg=m) self.onUnknownMesssageType(msg=m)
def _parseMessage(self, content): def _parse_payload(self, m):
"""Get message and author name from content.
May contain multiple messages in the content.
"""
self._seq = content.get("seq", "0")
if "lb_info" in content:
self._sticky = content["lb_info"]["sticky"]
self._pool = content["lb_info"]["pool"]
if "batches" in content:
for batch in content["batches"]:
self._parseMessage(batch)
if "ms" not in content:
return
for m in content["ms"]:
mtype = m.get("type") mtype = m.get("type")
try:
# Things that directly change chat # Things that directly change chat
if mtype == "delta": if mtype == "delta":
self._parseDelta(m) self._parseDelta(m)
@@ -2842,9 +2823,7 @@ class Client(object):
if id_ in self._buddylist: if id_ in self._buddylist:
old_in_game = self._buddylist[id_].in_game old_in_game = self._buddylist[id_].in_game
statuses[id_] = ActiveStatus._from_buddylist_overlay( statuses[id_] = ActiveStatus._from_buddylist_overlay(data, old_in_game)
data, old_in_game
)
self._buddylist[id_] = statuses[id_] self._buddylist[id_] = statuses[id_]
self.onBuddylistOverlay(statuses=statuses, msg=m) self.onBuddylistOverlay(statuses=statuses, msg=m)
@@ -2853,6 +2832,27 @@ class Client(object):
else: else:
self.onUnknownMesssageType(msg=m) self.onUnknownMesssageType(msg=m)
def _parseMessage(self, content):
"""Get message and author name from content.
May contain multiple messages in the content.
"""
self._seq = content.get("seq", "0")
if "lb_info" in content:
self._sticky = content["lb_info"]["sticky"]
self._pool = content["lb_info"]["pool"]
if "batches" in content:
for batch in content["batches"]:
self._parseMessage(batch)
if "ms" not in content:
return
for m in content["ms"]:
try:
self._parse_payload(m)
except Exception as e: except Exception as e:
self.onMessageError(exception=e, msg=m) self.onMessageError(exception=e, msg=m)