matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

Add missing int casts in many different events in the state.

Browse Source 
Also remove redundant role parsing in Member._update_roles.
This commit is contained in:
Rapptz 2017-01-28 08:14:43 -05:00
parent 1c49374210
commit 554ae196d3
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
discord/member.py
View File

@ -180,11 +180,6 @@ class Member(discord.abc.Messageable):
def _update_roles(self, data): def _update_roles(self, data):
# update the roles # update the roles
self.roles = [self.guild.default_role]
for role in self.guild.roles:
if role.id in data['roles']:
self.roles.append(role)
self.roles = [self.guild.default_role] self.roles = [self.guild.default_role]
for roleid in map(int, data['roles']): for roleid in map(int, data['roles']):
role = utils.find(lambda r: r.id == roleid, self.guild.roles) role = utils.find(lambda r: r.id == roleid, self.guild.roles)

22
discord/state.py
View File

@ -317,7 +317,7 @@ class ConnectionState:
self.dispatch('reaction_add', reaction, user) self.dispatch('reaction_add', reaction, user)
def parse_message_reaction_remove_all(self, data): def parse_message_reaction_remove_all(self, data):
message = self._get_message(data['message_id']) message = self._get_message(int(data['message_id']))
if message is not None: if message is not None:
old_reactions = message.reactions.copy() old_reactions = message.reactions.copy()
message.reactions.clear() message.reactions.clear()
@ -341,7 +341,7 @@ class ConnectionState:
status = data.get('status') status = data.get('status')
user = data['user'] user = data['user']
member_id = user['id'] member_id = int(user['id'])
member = guild.get_member(member_id) member = guild.get_member(member_id)
if member is None: if member is None:
if 'username' not in user: if 'username' not in user:
@ -437,7 +437,7 @@ class ConnectionState:
def parse_guild_member_remove(self, data): def parse_guild_member_remove(self, data):
guild = self._get_guild(int(data['guild_id'])) guild = self._get_guild(int(data['guild_id']))
if guild is not None: if guild is not None:
user_id = data['user']['id'] user_id = int(data['user']['id'])
member = guild.get_member(user_id) member = guild.get_member(user_id)
if member is not None: if member is not None:
guild._remove_member(member) guild._remove_member(member)
@ -458,7 +458,7 @@ class ConnectionState:
def parse_guild_member_update(self, data): def parse_guild_member_update(self, data):
guild = self._get_guild(int(data['guild_id'])) guild = self._get_guild(int(data['guild_id']))
user = data['user'] user = data['user']
user_id = user['id'] user_id = int(user['id'])
member = guild.get_member(user_id) member = guild.get_member(user_id)
if member is not None: if member is not None:
old_member = copy.copy(member) old_member = copy.copy(member)
@ -476,7 +476,7 @@ class ConnectionState:
# GUILD_CREATE with unavailable in the response # GUILD_CREATE with unavailable in the response
# usually means that the guild has become available # usually means that the guild has become available
# and is therefore in the cache # and is therefore in the cache
guild = self._get_guild(data.get('id')) guild = self._get_guild(int(data['id']))
if guild is not None: if guild is not None:
guild.unavailable = False guild.unavailable = False
guild._from_data(data) guild._from_data(data)
@ -575,10 +575,14 @@ class ConnectionState:
# is mainly to dispatch to another event worth listening to for logging # is mainly to dispatch to another event worth listening to for logging
guild = self._get_guild(int(data['guild_id'])) guild = self._get_guild(int(data['guild_id']))
if guild is not None: if guild is not None:
user_id = data.get('user', {}).get('id') try:
member = utils.get(guild.members, id=user_id) user_id = int(data['user']['id'])
if member is not None: except KeyError:
self.dispatch('member_ban', member) pass
else:
member = guild.get_member(user_id)
if member is not None:
self.dispatch('member_ban', member)
def parse_guild_ban_remove(self, data): def parse_guild_ban_remove(self, data):
guild = self._get_guild(int(data['guild_id'])) guild = self._get_guild(int(data['guild_id']))