Merge branch 'master' into pypi-dpy

1 files changed, 5 insertions, 5 deletions

diff --git a/bot/seasons/halloween/candy_collection.py b/bot/seasons/halloween/candy_collection.py
index 70648e64..f8ab4c60 100644
--- a/bot/seasons/halloween/candy_collection.py
+++ b/bot/seasons/halloween/candy_collection.py
@@ -7,7 +7,7 @@ import random
 import discord
 from discord.ext import commands
 
-from bot.constants import Hacktoberfest
+from bot.constants import Channels
 
 log = logging.getLogger(__name__)
 
@@ -41,7 +41,7 @@ class CandyCollection(commands.Cog):
         if message.author.bot:
             return
         # ensure it's hacktober channel
-        if message.channel.id != Hacktoberfest.channel_id:
+        if message.channel.id != Channels.seasonalbot_chat:
             return
 
         # do random check for skull first as it has the lower chance
@@ -65,7 +65,7 @@ class CandyCollection(commands.Cog):
             return
 
         # check to ensure it is in correct channel
-        if message.channel.id != Hacktoberfest.channel_id:
+        if message.channel.id != Channels.seasonalbot_chat:
             return
 
         # if its not a candy or skull, and it is one of 10 most recent messages,
@@ -127,7 +127,7 @@ class CandyCollection(commands.Cog):
         ten_recent = []
         recent_msg = max(message.id for message
                          in self.bot._connection._messages
-                         if message.channel.id == Hacktoberfest.channel_id)
+                         if message.channel.id == Channels.seasonalbot_chat)
 
         channel = await self.hacktober_channel()
         ten_recent.append(recent_msg.id)
@@ -159,7 +159,7 @@ class CandyCollection(commands.Cog):
     async def hacktober_channel(self):
         """Get #hacktoberbot channel from its ID."""
 
-        return self.bot.get_channel(id=Hacktoberfest.channel_id)
+        return self.bot.get_channel(id=Channels.seasonalbot_chat)
 
     async def remove_reactions(self, reaction):
         """Remove all candy/skull reactions."""