Croc/croccybot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(sessions): Account for rounding error in expiry.

Browse Source 
Also make `_expiry_task` properly cancellable.
Fixes an issue where `schedule_expiry` would always reschedule itself.
This commit is contained in:
Conatum
2022-01-14 19:38:21 +02:00
parent beb7a737d4
commit 50da6b18d2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bot/modules/study/tracking/session_tracker.py
View File

@@ -61,7 +61,7 @@ class Session:
raise ValueError("A session for this member already exists!") raise ValueError("A session for this member already exists!")
# If the user is study capped, schedule the session start for the next day # If the user is study capped, schedule the session start for the next day
if (lion := Lion.fetch(guildid, userid)).remaining_study_today <= 0: if (lion := Lion.fetch(guildid, userid)).remaining_study_today <= 10:
if pending := cls.members_pending[guildid].pop(userid, None): if pending := cls.members_pending[guildid].pop(userid, None):
pending.cancel() pending.cancel()
task = asyncio.create_task(cls._delayed_start(guildid, userid, member, state)) task = asyncio.create_task(cls._delayed_start(guildid, userid, member, state))
@@ -181,12 +181,13 @@ class Session:
self._expiry_task.cancel() self._expiry_task.cancel()
# Wait for the maximum session length # Wait for the maximum session length
self._expiry_task = asyncio.create_task(asyncio.sleep(self.lion.remaining_study_today))
try: try:
self._expiry_task = await asyncio.sleep(self.lion.remaining_study_today) await self._expiry_task
except asyncio.CancelledError: except asyncio.CancelledError:
pass pass
else: else:
if self.lion.remaining_study_today <= 0: if self.lion.remaining_study_today <= 10:
# End the session # End the session
# Note that the user will not automatically start a new session when the day starts # Note that the user will not automatically start a new session when the day starts
# TODO: Notify user? Disconnect them? # TODO: Notify user? Disconnect them?