diff options
| author |  Shom770 <[email protected]> | 2021-12-21 15:59:08 -0500 |
|---|---|---|
| committer | Shom770 <[email protected]> | 2022-02-09 18:13:37 -0500 |
| commit | a50739aac6144022a481d78c637b5d5fd7769913 (patch) | |
| tree | b004b757ddf8116bbddb3b04755c773f9e431492 | |
| parent | refactor (diff) | |
full refactor complete
structure overhauled, changed stop logic
| -rw-r--r-- | bot/exts/events/trivianight/trivianight.py | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/bot/exts/events/trivianight/trivianight.py b/bot/exts/events/trivianight/trivianight.py index f158ec0c..18e0dce1 100644 --- a/bot/exts/events/trivianight/trivianight.py +++ b/bot/exts/events/trivianight/trivianight.py @@ -144,7 +144,15 @@ class TriviaNightCog(commands.Cog): percentage *= 0.5 duration = next_question.time * percentage - await asyncio.sleep(duration) + await asyncio.wait([self.question_closed.wait()], timeout=duration) + + if self.question_closed.is_set(): + await ctx.send(embed=question_view.end_question(self.scoreboard)) + await message.edit(embed=question_embed, view=None) + + self.game.end_question() + self.question_closed.clear() + return if int(duration) > 1: # It is quite ugly to display decimals, the delay for requests to reach Discord @@ -153,7 +161,14 @@ class TriviaNightCog(commands.Cog): else: # Since each time we divide the percentage by 2 and sleep one half of the halves (then sleep a # half, of that half) we must sleep both halves at the end. - await asyncio.sleep(duration) + await asyncio.wait([self.question_closed.wait()], timeout=duration) + if self.question_closed.is_set(): + await ctx.send(embed=question_view.end_question(self.scoreboard)) + await message.edit(embed=question_embed, view=None) + + self.game.end_question() + self.question_closed.clear() + return break await ctx.send(embed=question_view.end_question(self.scoreboard)) @@ -210,7 +225,7 @@ class TriviaNightCog(commands.Cog): await ctx.send(embed=error_embed) return - self.ongoing_question = False + self.question_closed.set() @trivianight.command() @commands.has_any_role(*TRIVIA_NIGHT_ROLES) |