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

Make sure that the chunker task only runs once.

Browse Source
This commit is contained in:
Rapptz 2017-05-01 22:34:24 -04:00
parent ba2dad2093
commit c9565e57d3
1 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
discord/state.py
View File

@ -61,6 +61,7 @@ class ConnectionState:
self.syncer = syncer self.syncer = syncer
self.is_bot = None self.is_bot = None
self.shard_count = None self.shard_count = None
self._ready_task = None
self._fetch_offline = options.get('fetch_offline_members', True) self._fetch_offline = options.get('fetch_offline_members', True)
self._listeners = [] self._listeners = []
self.clear() self.clear()
@ -225,6 +226,7 @@ class ConnectionState:
@asyncio.coroutine @asyncio.coroutine
def _delay_ready(self): def _delay_ready(self):
try:
launch = self._ready_state.launch launch = self._ready_state.launch
# only real bots wait for GUILD_CREATE streaming # only real bots wait for GUILD_CREATE streaming
@ -249,11 +251,18 @@ class ConnectionState:
if not self.is_bot: if not self.is_bot:
log.info('Requesting GUILD_SYNC for %s guilds' % len(self.guilds)) log.info('Requesting GUILD_SYNC for %s guilds' % len(self.guilds))
yield from self.syncer([s.id for s in self.guilds]) yield from self.syncer([s.id for s in self.guilds])
except asyncio.CancelledError:
pass
else:
# dispatch the event # dispatch the event
self.dispatch('ready') self.dispatch('ready')
finally:
self._ready_task = None
def parse_ready(self, data): def parse_ready(self, data):
if self._ready_task is not None:
self._ready_task.cancel()
self._ready_state = ReadyState(launch=asyncio.Event(), guilds=[]) self._ready_state = ReadyState(launch=asyncio.Event(), guilds=[])
self.clear() self.clear()
self.user = ClientUser(state=self, data=data['user']) self.user = ClientUser(state=self, data=data['user'])
@ -277,7 +286,7 @@ class ConnectionState:
self._add_private_channel(factory(me=self.user, data=pm, state=self)) self._add_private_channel(factory(me=self.user, data=pm, state=self))
self.dispatch('connect') self.dispatch('connect')
compat.create_task(self._delay_ready(), loop=self.loop) self._ready_task = compat.create_task(self._delay_ready(), loop=self.loop)
def parse_resumed(self, data): def parse_resumed(self, data):
self.dispatch('resumed') self.dispatch('resumed')