matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

Remove owner_id from Server and use owner instead.

Browse Source 
owner will be the actual Member who owns the server.
This commit is contained in:
Rapptz 2015-09-04 23:56:00 -04:00
parent e11aaa0566
commit 568c2a773b
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
discord/client.py
View File

@ -127,6 +127,7 @@ class Client(object):
def _add_server(self, guild): def _add_server(self, guild):
guild['roles'] = [Role(**role) for role in guild['roles']] guild['roles'] = [Role(**role) for role in guild['roles']]
members = guild['members'] members = guild['members']
owner = guild['owner_id']
for i, member in enumerate(members): for i, member in enumerate(members):
roles = member['roles'] roles = member['roles']
for j, roleid in enumerate(roles): for j, roleid in enumerate(roles):
@ -135,6 +136,10 @@ class Client(object):
roles[j] = role roles[j] = role
members[i] = Member(**member) members[i] = Member(**member)
# found the member that owns the server
if members[i].id == owner:
owner = members[i]
for presence in guild['presences']: for presence in guild['presences']:
user_id = presence['user']['id'] user_id = presence['user']['id']
member = next((m for m in members if m.id == user_id), None) member = next((m for m in members if m.id == user_id), None)
@ -143,7 +148,7 @@ class Client(object):
member.game_id = presence['game_id'] member.game_id = presence['game_id']
server = Server(**guild) server = Server(owner=owner, **guild)
# give all the members their proper server # give all the members their proper server
for member in server.members: for member in server.members:

6
discord/server.py
View File

@ -123,9 +123,9 @@ class Server(object):
.. attribute:: id .. attribute:: id
The server's ID. The server's ID.
.. attribute:: owner_id .. attribute:: owner
The ID of the server's owner. The :class:`Member` who owns the server.
""" """
def __init__(self, **kwargs): def __init__(self, **kwargs):
@ -137,4 +137,4 @@ class Server(object):
self.members = kwargs.get('members') self.members = kwargs.get('members')
self.icon = kwargs.get('icon') self.icon = kwargs.get('icon')
self.id = kwargs.get('id') self.id = kwargs.get('id')
self.owner_id = kwargs.get('owner_id') self.owner = kwargs.get('owner')