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

Fix GUILD_ROLE_DELETE triggering ValueError.

Browse Source
This commit is contained in:
Rapptz 2015-12-14 23:26:22 -05:00
parent 6d26d73e24
commit 7f0a048299
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
discord/state.py
View File

@ -137,9 +137,10 @@ class ConnectionState:
channel = utils.find(lambda c: c.id == channel_id, server.channels) channel = utils.find(lambda c: c.id == channel_id, server.channels)
try: try:
server.channels.remove(channel) server.channels.remove(channel)
self.dispatch('channel_delete', channel)
except ValueError: except ValueError:
return return
else:
self.dispatch('channel_delete', channel)
def parse_channel_update(self, data): def parse_channel_update(self, data):
server = self._get_server(data.get('guild_id')) server = self._get_server(data.get('guild_id'))
@ -179,9 +180,10 @@ class ConnectionState:
member = utils.find(lambda m: m.id == user_id, server.members) member = utils.find(lambda m: m.id == user_id, server.members)
try: try:
server.members.remove(member) server.members.remove(member)
self.dispatch('member_remove', member)
except ValueError: except ValueError:
return return
else:
self.dispatch('member_remove', member)
def parse_guild_member_update(self, data): def parse_guild_member_update(self, data):
server = self._get_server(data.get('guild_id')) server = self._get_server(data.get('guild_id'))
@ -242,9 +244,10 @@ class ConnectionState:
try: try:
self.servers.remove(server) self.servers.remove(server)
self.dispatch('server_remove', server)
except ValueError: except ValueError:
return return
else:
self.dispatch('server_remove', server)
def parse_guild_role_create(self, data): def parse_guild_role_create(self, data):
server = self._get_server(data.get('guild_id')) server = self._get_server(data.get('guild_id'))
@ -259,8 +262,12 @@ class ConnectionState:
if server is not None: if server is not None:
role_id = data.get('role_id') role_id = data.get('role_id')
role = utils.find(lambda r: r.id == role_id, server.roles) role = utils.find(lambda r: r.id == role_id, server.roles)
server.roles.remove(role) try:
self.dispatch('server_role_delete', server, role) server.roles.remove(role)
except ValueError:
return
else:
self.dispatch('server_role_delete', server, role)
def parse_guild_role_update(self, data): def parse_guild_role_update(self, data):
server = self._get_server(data.get('guild_id')) server = self._get_server(data.get('guild_id'))