Merge branch 'master' into tic-tac-toe

2 files changed, 7 insertions, 7 deletions

diff --git a/bot/exts/easter/easter_riddle.py b/bot/exts/easter/easter_riddle.py
index 8977534f..3c612eb1 100644
--- a/bot/exts/easter/easter_riddle.py
+++ b/bot/exts/easter/easter_riddle.py
@@ -22,7 +22,7 @@ class EasterRiddle(commands.Cog):
 
     def __init__(self, bot: commands.Bot):
         self.bot = bot
-        self.winners = []
+        self.winners = set()
         self.correct = ""
         self.current_channel = None
 
@@ -79,7 +79,7 @@ class EasterRiddle(commands.Cog):
 
         await ctx.send(content, embed=answer_embed)
 
-        self.winners = []
+        self.winners.clear()
         self.current_channel = None
 
     @commands.Cog.listener()
@@ -92,7 +92,7 @@ class EasterRiddle(commands.Cog):
             return
 
         if message.content.lower() == self.correct.lower():
-            self.winners.append(message.author.mention)
+            self.winners.add(message.author.mention)
 
 
 def setup(bot: commands.Bot) -> None:
diff --git a/bot/exts/easter/egg_facts.py b/bot/exts/easter/egg_facts.py
index 0051aa50..761e9059 100644
--- a/bot/exts/easter/egg_facts.py
+++ b/bot/exts/easter/egg_facts.py
@@ -6,7 +6,7 @@ from pathlib import Path
 import discord
 from discord.ext import commands
 
-from bot.bot import SeasonalBot
+from bot.bot import Bot
 from bot.constants import Channels, Colours, Month
 from bot.utils.decorators import seasonal_task
 
@@ -20,7 +20,7 @@ class EasterFacts(commands.Cog):
     It also contains a background task which sends an easter egg fact in the event channel everyday.
     """
 
-    def __init__(self, bot: SeasonalBot):
+    def __init__(self, bot: Bot):
         self.bot = bot
         self.facts = self.load_json()
 
@@ -38,7 +38,7 @@ class EasterFacts(commands.Cog):
         """A background task that sends an easter egg fact in the event channel everyday."""
         await self.bot.wait_until_guild_available()
 
-        channel = self.bot.get_channel(Channels.seasonalbot_commands)
+        channel = self.bot.get_channel(Channels.community_bot_commands)
         await channel.send(embed=self.make_embed())
 
     @commands.command(name='eggfact', aliases=['fact'])
@@ -56,6 +56,6 @@ class EasterFacts(commands.Cog):
         )
 
 
-def setup(bot: SeasonalBot) -> None:
+def setup(bot: Bot) -> None:
     """Easter Egg facts cog load."""
     bot.add_cog(EasterFacts(bot))