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

avoid potential bug when creating new private msgs

Browse Source 
It probably isn't good to rely on an item that was added to a list to
still be the last item, especially if we could have other async
coroutines modify the list. This may not be an actual issue, but having
the function explicitly return the object that it just added to the list
should guarantee that we don't accidentally pull the wrong item from the
end of the list later.
This commit is contained in:
Steven Berler 2015-12-12 13:21:44 -08:00 committed by Rapptz
parent 0215345abb
commit 037da750dd
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
discord/client.py
View File

@ -183,9 +183,8 @@ class Client:
found = utils.find(lambda pm: pm.user == destination, self.private_channels)
if found is None:
# Couldn't find the user, so start a PM with them first.
yield from self.start_private_message(destination)
channel_id = self.private_channels[-1].id
return channel_id
channel = yield from self.start_private_message(destination)
return channel.id
else:
return found.id
elif isinstance(destination, Object):
@ -732,7 +731,9 @@ class Client:
yield from utils._verify_successful_response(r)
data = yield from r.json()
log.debug(request_success_log.format(response=r, json=payload, data=data))
self.private_channels.append(PrivateChannel(id=data['id'], user=user))
channel = PrivateChannel(id=data['id'], user=user)
self.private_channels.append(channel)
return channel
@asyncio.coroutine
def _rate_limit_helper(self, name, method, url, data):

5
discord/state.py
View File

@ -55,6 +55,7 @@ class ConnectionState:
def _add_server(self, guild):
server = Server(**guild)
self.servers.append(server)
return server
def parse_ready(self, data):
self.user = User(**data['user'])
@ -220,8 +221,8 @@ class ConnectionState:
# unavailable during the READY event and is now
# available, so it isn't in the cache...
self._add_server(data)
self.dispatch('server_join', self.servers[-1])
server = self._add_server(data)
self.dispatch('server_join', server)
def parse_guild_update(self, data):
server = self._get_server(data.get('id'))