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

Fixed errors on unknown genders

Browse Source
This commit is contained in:
Mads Marquart
2017-12-15 23:46:47 +01:00
parent 32c72c2f35
commit 4f1f9bf1ce
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fbchat/__init__.py
View File

@@ -17,7 +17,7 @@ from .client import *
__copyright__ = 'Copyright 2015 - {} by Taehoon Kim'.format(datetime.now().year) __copyright__ = 'Copyright 2015 - {} by Taehoon Kim'.format(datetime.now().year)
__version__ = '1.1.2' __version__ = '1.1.3'
__license__ = 'BSD' __license__ = 'BSD'
__author__ = 'Taehoon Kim; Moreels Pieter-Jan; Mads Marquart' __author__ = 'Taehoon Kim; Moreels Pieter-Jan; Mads Marquart'
__email__ = 'carpedm20@gmail.com' __email__ = 'carpedm20@gmail.com'

4
fbchat/client.py
View File

@@ -479,7 +479,7 @@ class Client(object):
if k['id'] in ['0', 0]: if k['id'] in ['0', 0]:
# Skip invalid users # Skip invalid users
pass pass
users.append(User(k['id'], first_name=k.get('firstName'), url=k.get('uri'), photo=k.get('thumbSrc'), name=k.get('name'), is_friend=k.get('is_friend'), gender=GENDERS[k.get('gender')])) users.append(User(k['id'], first_name=k.get('firstName'), url=k.get('uri'), photo=k.get('thumbSrc'), name=k.get('name'), is_friend=k.get('is_friend'), gender=GENDERS.get(k.get('gender'))))
return users return users
@@ -791,7 +791,7 @@ class Client(object):
if p['type'] == 'page': if p['type'] == 'page':
participants[p['fbid']] = Page(p['fbid'], url=p['href'], photo=p['image_src'], name=p['name']) participants[p['fbid']] = Page(p['fbid'], url=p['href'], photo=p['image_src'], name=p['name'])
elif p['type'] == 'user': elif p['type'] == 'user':
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']) participants[p['fbid']] = User(p['fbid'], url=p['href'], first_name=p['short_name'], is_friend=p['is_friend'], gender=GENDERS.get(p['gender']), photo=p['image_src'], name=p['name'])
else: else:
raise FBchatException('A participant had an unknown type {}: {}'.format(p['type'], p)) raise FBchatException('A participant had an unknown type {}: {}'.format(p['type'], p))

2
fbchat/graphql.py
View File

@@ -154,7 +154,7 @@ def graphql_to_user(user):
first_name=user.get('first_name'), first_name=user.get('first_name'),
last_name=user.get('last_name'), last_name=user.get('last_name'),
is_friend=user.get('is_viewer_friend'), is_friend=user.get('is_viewer_friend'),
gender=GENDERS[user.get('gender')], gender=GENDERS.get(user.get('gender')),
affinity=user.get('affinity'), affinity=user.get('affinity'),
nickname=c_info.get('nickname'), nickname=c_info.get('nickname'),
color=c_info.get('color'), color=c_info.get('color'),

3
fbchat/utils.py
View File

@@ -74,13 +74,12 @@ GENDERS = {
#'': 'female_singular_guess', #'': 'female_singular_guess',
#'': 'male_singular_guess', #'': 'male_singular_guess',
#'': 'mixed', #'': 'mixed',
#'': 'neuter_singular', 'NEUTER': 'neuter_singular',
#'': 'unknown_singular', #'': 'unknown_singular',
#'': 'female_plural', #'': 'female_plural',
#'': 'male_plural', #'': 'male_plural',
#'': 'neuter_plural', #'': 'neuter_plural',
#'': 'unknown_plural', #'': 'unknown_plural',
None: None
} }
class ReqUrl(object): class ReqUrl(object):