aboutsummaryrefslogtreecommitdiff
path: root/discord/client.py
diff options
context:
space:
mode:
authorRapptz <[email protected]>2015-08-26 07:43:05 -0400
committerRapptz <[email protected]>2015-08-26 07:43:05 -0400
commit108f0a6c45599d783fdb1d991fc1b5af87ca0f47 (patch)
tree5a23a2041bfd9e39e486e330a43ac93dec6d654e /discord/client.py
parentPreliminary work on permission parsing. (diff)
downloaddiscord.py-108f0a6c45599d783fdb1d991fc1b5af87ca0f47.tar.xz
discord.py-108f0a6c45599d783fdb1d991fc1b5af87ca0f47.zip
Server members are now their own class that subclass Users.
Roles are also now properly parsed.
Diffstat (limited to 'discord/client.py')
-rw-r--r--discord/client.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/discord/client.py b/discord/client.py
index 77e43a66..d2a1abe1 100644
--- a/discord/client.py
+++ b/discord/client.py
@@ -34,7 +34,7 @@ from sys import platform as sys_platform
from errors import InvalidEventName, InvalidDestination
from user import User
from channel import Channel, PrivateChannel
-from server import Server
+from server import Server, Member, Permissions, Role
from message import Message
def _null_event(*args, **kwargs):
@@ -148,8 +148,8 @@ class Client(object):
guilds = data.get('guilds')
for guild in guilds:
- guild['roles'] = [role.get('name') for role in guild['roles']]
- guild['members'] = [User(**member['user']) for member in guild['members']]
+ guild['roles'] = [Role(**role) for role in guild['roles']]
+ guild['members'] = [Member(**member) for member in guild['members']]
self.servers.append(Server(**guild))
channels = [Channel(server=self.servers[-1], **channel) for channel in guild['channels']]