From 51423dedf07ccc3797199320832891b60499ff60 Mon Sep 17 00:00:00 2001
From: victormylle <victor.mylle@hotmail.com>
Date: Tue, 10 Nov 2020 16:01:07 +0100
Subject: [PATCH] Made big improvement to quiz

---
 cogs/quiz.py | 73 +++++++++++++++++++++-------------------------------
 1 file changed, 30 insertions(+), 43 deletions(-)

diff --git a/cogs/quiz.py b/cogs/quiz.py
index 40c4f14..10132d0 100644
--- a/cogs/quiz.py
+++ b/cogs/quiz.py
@@ -75,9 +75,8 @@ class QuizQuestions(commands.Cog):
 class Quiz(commands.Cog):
     def __init__(self, client):
         self.client = client
-        self.in_progress = False
-        #self.interval = (5, 10)
-        self.interval = (8*60, 30*60)
+        self.interval = (5, 10)
+        #self.interval = (8*60, 30*60)
         self.auto = False
 
     @commands.command(name="quiz")
@@ -97,64 +96,52 @@ class Quiz(commands.Cog):
     @commands.Cog.listener()
     async def on_ready(self):
         self.auto = True
-        casyncio.create_task(self.start_auto_quiz()
+        asyncio.create_task(self.start_auto_quiz())
 
     async def ask_question(self):
 
-        self.question = self.get_random_question()
+        question = self.get_random_question()
 
-        self.increment_asked_count(self.question[0])
+        self.increment_asked_count(question[0])
 
         channel = self.client.get_channel(constants.QuizChannelID)
-        self.in_progress = True
         answer_timer = Timer(1, 0)
 
         embed = discord.Embed()
         #embed.set_author(name="Quiz")
         embed.colour = discord.Colour.orange()
 
-        embed.add_field(name="Question:", value=f"{self.question[1]}", inline=False)
-        embed.add_field(name="Reward:", value=f"${self.question[3]}", inline=False)
-        self.embed = embed
+        embed.add_field(name="Question:", value=f"{question[1]}", inline=False)
+        embed.add_field(name="Reward:", value=f"${question[3]}", inline=False)
+
         await channel.send(embed=embed)
-        answer_timer.start()
-        while not answer_timer.ended and self.in_progress:
-            await asyncio.sleep(1)
-        if (not answer_timer.ended):
-            answer_timer.stop()
+        message = await self.client.wait_for("message", check=lambda message: message.content.lower() == question[2].lower())
+
+        embed.add_field(name="Answer:", value=f"{question[2]}", inline=False)
+
+        if (message):
+            self.give_reward(message.author.id, question[3])
+
+            playerdblinker = PlayerDBLinker()
+            embed.colour = discord.Colour.green()
+            if playerdblinker.discordidused(message.author.id):
+                embed.add_field(name="Winner:", value=f"{message.author.mention} 🎉🎉", inline=False)
+                #self.embed.add_field(name="Claim:", value=f"Claim your reward in Minecraft by using /redeem")
+                embed.add_field(name="Claim:", value=f"Claim your reward in Minecraft when the server is online")
+                await message.channel.send(embed=embed)
+            else:
+
+                embed.add_field(name="Winner:", value=f"{message.author.mention} 🎉🎉", inline=False)
+                #self.embed.add_field(name="Claim:", value=f"1. Link your account by using /link <MinecraftName> \n2. Claim your reward in Minecraft by using /redeem")
+                embed.add_field(name="Claim:", value=f"Claim your reward in Minecraft when the server is online")
+                await message.channel.send(embed=embed)
+            playerdblinker.close()
         else:
-            self.in_progress = False
             embed.colour = discord.Colour.red()
-            embed.add_field(name="Answer:", value=f"{self.question[2]}", inline=False)
+            embed.add_field(name="Answer:", value=f"{question[2]}", inline=False)
             await channel.send(embed=embed)
 
 
-    @commands.Cog.listener()
-    async def on_message(self, message):
-        if message.author == self.client.user:
-            return
-        if self.in_progress and message.channel.id == constants.QuizChannelID:
-            if message.content.lower() == self.question[2].lower():
-                self.in_progress = False
-
-                self.give_reward(message.author.id, self.question[3])
-
-                playerdblinker = PlayerDBLinker()
-                self.embed.colour = discord.Colour.green()
-                if playerdblinker.discordidused(message.author.id):
-                    self.embed.add_field(name="Answer:", value=f"{self.question[2]}", inline=False)
-                    self.embed.add_field(name="Winner:", value=f"{message.author.mention} 🎉🎉", inline=False)
-                    #self.embed.add_field(name="Claim:", value=f"Claim your reward in Minecraft by using /redeem")
-                    self.embed.add_field(name="Claim:", value=f"Claim your reward in Minecraft when the server is online")
-                    await message.channel.send(embed=self.embed)
-                else:
-                    self.embed.add_field(name="Answer:", value=f"{self.question[2]}", inline=False)
-                    self.embed.add_field(name="Winner:", value=f"{message.author.mention} 🎉🎉", inline=False)
-                    #self.embed.add_field(name="Claim:", value=f"1. Link your account by using /link <MinecraftName> \n2. Claim your reward in Minecraft by using /redeem")
-                    self.embed.add_field(name="Claim:", value=f"Claim your reward in Minecraft when the server is online")
-                    await message.channel.send(embed=self.embed)
-                playerdblinker.close()
-
     def increment_asked_count(self, q_id):
         quizdb = QuizDB()
         quizdb.question_asked_increment(q_id)