mirror of
				https://github.com/Rapptz/discord.py.git
				synced 2025-11-04 07:22:50 +00:00 
			
		
		
		
	Use unordered kwargs when constructing member, don't provide duplicate value for member mute/deafen
This commit is contained in:
		@@ -264,7 +264,7 @@ class ConnectionState(object):
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    def handle_guild_member_add(self, data):
 | 
					    def handle_guild_member_add(self, data):
 | 
				
			||||||
        server = self._get_server(data.get('guild_id'))
 | 
					        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)
 | 
					        server.members.append(member)
 | 
				
			||||||
        self.dispatch('member_join', member)
 | 
					        self.dispatch('member_join', member)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -74,17 +74,17 @@ class Member(User):
 | 
				
			|||||||
        The :class:`Server` that the member belongs to.
 | 
					        The :class:`Server` that the member belongs to.
 | 
				
			||||||
    """
 | 
					    """
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def __init__(self, deaf, joined_at, user, roles, mute, **kwargs):
 | 
					    def __init__(self, **kwargs):
 | 
				
			||||||
        super(Member, self).__init__(**user)
 | 
					        super(Member, self).__init__(**kwargs.get('user'))
 | 
				
			||||||
        self.deaf = deaf
 | 
					        self.deaf = kwargs.get('deaf')
 | 
				
			||||||
        self.mute = mute
 | 
					        self.mute = kwargs.get('mute')
 | 
				
			||||||
        self.joined_at = parse_time(joined_at)
 | 
					        self.joined_at = parse_time(kwargs.get('joined_at'))
 | 
				
			||||||
        self.roles = roles
 | 
					        self.roles = kwargs.get('roles')
 | 
				
			||||||
        self.status = 'offline'
 | 
					        self.status = 'offline'
 | 
				
			||||||
        game = kwargs.get('game', None)
 | 
					        game = kwargs.get('game', None)
 | 
				
			||||||
        self.game = game and Game(**game)
 | 
					        self.game = game and Game(**game)
 | 
				
			||||||
        self.server = kwargs.get('server', 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):
 | 
					    def update_voice_state(self, **kwargs):
 | 
				
			||||||
        self.self_mute = kwargs.get('self_mute', False)
 | 
					        self.self_mute = kwargs.get('self_mute', False)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user