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

Enable fetching pending/archived threads

Browse Source 
Add "type" parameter to fetchThreadList().
type can be 'inbox', 'pending' or 'archived'

If set to 'pending', it can fetch messages from unknown users.
It is quite useful to build a service accepting requests from anyone.

For example, in doOneListen(), fetch pending messages once for a while
to handle the messages from strangers.
This commit is contained in:
Tang
2017-10-03 01:14:00 +08:00
parent 9d5f06b810
commit 2d027af71a
1 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
fbchat/client.py
View File

@@ -748,11 +748,12 @@ class Client(object):
return list(reversed([graphql_to_message(message) for message in j['message_thread']['messages']['nodes']])) return list(reversed([graphql_to_message(message) for message in j['message_thread']['messages']['nodes']]))
def fetchThreadList(self, offset=0, limit=20): def fetchThreadList(self, offset=0, limit=20, type='inbox'):
"""Get thread list of your facebook account """Get thread list of your facebook account
:param offset: The offset, from where in the list to recieve threads from :param offset: The offset, from where in the list to recieve threads from
:param limit: Max. number of threads to retrieve. Capped at 20 :param limit: Max. number of threads to retrieve. Capped at 20
:param type: (optional) "inbox", "pending", "archived"
:type offset: int :type offset: int
:type limit: int :type limit: int
:return: :class:`models.Thread` objects :return: :class:`models.Thread` objects
@@ -763,10 +764,16 @@ class Client(object):
if limit > 20 or limit < 1: if limit > 20 or limit < 1:
raise FBchatUserError('`limit` should be between 1 and 20') raise FBchatUserError('`limit` should be between 1 and 20')
if type in ['inbox', 'pending', 'archived']:
if type == 'archived':
type = 'action:archived'
else:
raise ValueError('thread_type must be "inbox", "pending" or "archived"')
data = { data = {
'client' : self.client, 'client' : self.client,
'inbox[offset]' : offset, type + '[offset]' : offset,
'inbox[limit]' : limit, type + '[limit]' : limit,
} }
j = self._post(self.req_url.THREADS, data, fix_request=True, as_json=True) j = self._post(self.req_url.THREADS, data, fix_request=True, as_json=True)
@@ -774,25 +781,27 @@ class Client(object):
raise FBchatException('Missing payload: {}, with data: {}'.format(j, data)) raise FBchatException('Missing payload: {}, with data: {}'.format(j, data))
participants = {} participants = {}
for p in j['payload']['participants']: if 'participants' in j['payload']:
if p['type'] == 'page': for p in j['payload']['participants']:
participants[p['fbid']] = Page(p['fbid'], url=p['href'], photo=p['image_src'], name=p['name']) if p['type'] == 'page':
elif p['type'] == 'user': participants[p['fbid']] = Page(p['fbid'], url=p['href'], photo=p['image_src'], name=p['name'])
participants[p['fbid']] = User(p['fbid'], url=p['href'], first_name=p['short_name'], is_friend=p['is_friend'], gender=GENDERS[p['gender']], photo=p['image_src'], name=p['name']) elif p['type'] == 'user':
else: participants[p['fbid']] = User(p['fbid'], url=p['href'], first_name=p['short_name'], is_friend=p['is_friend'], gender=GENDERS[p['gender']], photo=p['image_src'], name=p['name'])
raise FBchatException('A participant had an unknown type {}: {}'.format(p['type'], p)) else:
raise FBchatException('A participant had an unknown type {}: {}'.format(p['type'], p))
entries = [] entries = []
for k in j['payload']['threads']: if 'threads' in j['payload']:
if k['thread_type'] == 1: for k in j['payload']['threads']:
if k['other_user_fbid'] not in participants: if k['thread_type'] == 1:
raise FBchatException('The thread {} was not in participants: {}'.format(k, j['payload'])) if k['other_user_fbid'] not in participants:
participants[k['other_user_fbid']].message_count = k['message_count'] raise FBchatException('The thread {} was not in participants: {}'.format(k, j['payload']))
entries.append(participants[k['other_user_fbid']]) participants[k['other_user_fbid']].message_count = k['message_count']
elif k['thread_type'] == 2: entries.append(participants[k['other_user_fbid']])
entries.append(Group(k['thread_fbid'], participants=set([p.strip('fbid:') for p in k['participants']]), photo=k['image_src'], name=k['name'], message_count=k['message_count'])) elif k['thread_type'] == 2:
else: entries.append(Group(k['thread_fbid'], participants=set([p.strip('fbid:') for p in k['participants']]), photo=k['image_src'], name=k['name'], message_count=k['message_count']))
raise FBchatException('A thread had an unknown thread type: {}'.format(k)) else:
raise FBchatException('A thread had an unknown thread type: {}'.format(k))
return entries return entries