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

made appropriate changes to default args of rooms

Browse Source
This commit is contained in:
ekohilas
2017-10-07 15:03:59 +11:00
parent 1f37277a8d
commit d52dac233e
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fbchat/graphql.py
View File

@@ -119,21 +119,11 @@ def graphql_to_group(group):
) )
def graphql_to_room(room): def graphql_to_room(room):
if room.get('image') is None:
room['image'] = {}
c_info = get_customization_info(room)
return Room( return Room(
room['thread_key']['thread_fbid'], **vars(graphql_to_group(room)),
participants=set([node['messaging_actor']['id'] for node in room['all_participants']['nodes']]),
nicknames=c_info.get('nicknames'),
color=c_info.get('color'),
emoji=c_info.get('emoji'),
photo=room['image'].get('uri'),
name=room.get('name'),
message_count=room.get('messages_count'),
admins = set([node.get('id') for node in room.get('thread_admins')]), admins = set([node.get('id') for node in room.get('thread_admins')]),
approval_mode = bool(room.get('approval_mode')), approval_mode = bool(room.get('approval_mode')),
approval_requests = set([node.get('id') for node in room['thread_queue_metatdata'].get('approval_requests')), approval_requests = set(node.get('id') for node in room['thread_queue_metatdata'].get('approval_requests')),
join_link = room['joinable_mode'].get('link'), join_link = room['joinable_mode'].get('link'),
privacy_mode = bool(room.get('privacy_mode')), privacy_mode = bool(room.get('privacy_mode')),
) )

6
fbchat/models.py
View File

@@ -121,11 +121,15 @@ class Room(Group):
# True is room is not discoverable # True is room is not discoverable
privacy_mode = bool privacy_mode = bool
def __init__(self, uid, admins=set(), approval_mode=None, approval_requests=set(), join_link=None, privacy_mode=None, **kwargs): def __init__(self, uid, admins=None, approval_mode=None, approval_requests=None, join_link=None, privacy_mode=None, **kwargs):
"""Represents a Facebook room. Inherits `Group`""" """Represents a Facebook room. Inherits `Group`"""
super(Room, self).__init__(ThreadType.ROOM, uid, **kwargs) super(Room, self).__init__(ThreadType.ROOM, uid, **kwargs)
if admins is None:
admins = set()
self.admins = admins self.admins = admins
self.approval_mode = approval_mode self.approval_mode = approval_mode
if approval_requests is None:
approval_requests = set()
self.approval_requests = approval_requests self.approval_requests = approval_requests
self.join_link = join_link self.join_link = join_link
self.privacy_mode = privacy_mode self.privacy_mode = privacy_mode