From 4071757c4083d22a876195e9c0bea1602d1bdce0 Mon Sep 17 00:00:00 2001 From: Khazhismel Date: Tue, 12 Jan 2016 11:29:28 -0500 Subject: [PATCH] Use unordered kwargs when constructing member, don't provide duplicate value for member mute/deafen --- discord/client.py | 2 +- discord/member.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/discord/client.py b/discord/client.py index 1a76f9d93..094db2d14 100644 --- a/discord/client.py +++ b/discord/client.py @@ -264,7 +264,7 @@ class ConnectionState(object): def handle_guild_member_add(self, data): server = self._get_server(data.get('guild_id')) - member = Member(server=server, deaf=False, mute=False, **data) + member = Member(server=server, **data) server.members.append(member) self.dispatch('member_join', member) diff --git a/discord/member.py b/discord/member.py index 1bb7b130c..cc193fa60 100644 --- a/discord/member.py +++ b/discord/member.py @@ -74,17 +74,17 @@ class Member(User): The :class:`Server` that the member belongs to. """ - def __init__(self, deaf, joined_at, user, roles, mute, **kwargs): - super(Member, self).__init__(**user) - self.deaf = deaf - self.mute = mute - self.joined_at = parse_time(joined_at) - self.roles = roles + def __init__(self, **kwargs): + super(Member, self).__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 = 'offline' game = kwargs.get('game', None) self.game = game and Game(**game) 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)