mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-04-19 15:36:02 +00:00
Code Issues Projects Releases Wiki Activity

Use unordered kwargs when constructing member, don't provide duplicate value for member mute/deafen

Browse Source
This commit is contained in:
Khazhismel 2016-01-12 11:29:28 -05:00
parent 7cd2be2edc
commit 4071757c40
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
discord/client.py
View File

@ -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)

14
discord/member.py
View File

@ -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)