aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhazhismel <[email protected]>2016-01-12 11:45:59 -0500
committerKhazhismel <[email protected]>2016-01-12 11:45:59 -0500
commit000e7e57eaf43eb0810d140d38e1344cd3b3dad2 (patch)
tree9edadac59e8629c9656819b905beb75f4605d56d
parentBasic bot example now shows documenting for the built-in help command. (diff)
downloaddiscord.py-000e7e57eaf43eb0810d140d38e1344cd3b3dad2.tar.xz
discord.py-000e7e57eaf43eb0810d140d38e1344cd3b3dad2.zip
Change member constructor to not rely on order of json data object
-rw-r--r--discord/member.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/discord/member.py b/discord/member.py
index cc6392b6..f5cd2038 100644
--- a/discord/member.py
+++ b/discord/member.py
@@ -69,17 +69,17 @@ class Member(User):
'voice_channel', 'roles', 'joined_at', 'status', 'game',
'server' ]
- def __init__(self, deaf, joined_at, user, roles, mute, **kwargs):
- super().__init__(**user)
- self.deaf = deaf
- self.mute = mute
- self.joined_at = parse_time(joined_at)
- self.roles = roles
+ def __init__(self, **kwargs):
+ super().__init__(**kwargs.get('user'))
+ self.deaf = kwargs.get('deaf')
+ self.mute = kwargs.get('mute')
+ self.joined_at = parse_time(kwargs.get('joined_at'))
+ self.roles = kwargs.get('roles')
self.status = Status.offline
game = kwargs.get('game', {})
self.game = Game(**game) if game else None
self.server = kwargs.get('server', None)
- self._update_voice_state(mute=mute, deaf=deaf)
+ self._update_voice_state(mute=self.mute, deaf=self.deaf)
def _update_voice_state(self, **kwargs):
self.self_mute = kwargs.get('self_mute', False)