Re-add cog inheritance removed by poor merge conflict resolution

22 files changed, 22 insertions, 22 deletions

diff --git a/bot/seasons/christmas/adventofcode.py b/bot/seasons/christmas/adventofcode.py
index f61f34b5..5d05dce6 100644
--- a/bot/seasons/christmas/adventofcode.py
+++ b/bot/seasons/christmas/adventofcode.py
@@ -103,7 +103,7 @@ async def day_countdown(bot: commands.Bot):
         await asyncio.sleep(120)
 
 
-class AdventOfCode:
+class AdventOfCode(commands.Cog):
     """Advent of Code festivities! Ho Ho Ho."""
 
     def __init__(self, bot: commands.Bot):
diff --git a/bot/seasons/evergreen/error_handler.py b/bot/seasons/evergreen/error_handler.py
index b0d05c41..26afe814 100644
--- a/bot/seasons/evergreen/error_handler.py
+++ b/bot/seasons/evergreen/error_handler.py
@@ -8,7 +8,7 @@ from discord.ext import commands
 log = logging.getLogger(__name__)

 

 

-class CommandErrorHandler:

+class CommandErrorHandler(commands.Cog):

     """A error handler for the PythonDiscord server."""

 

     def __init__(self, bot):

diff --git a/bot/seasons/evergreen/fun.py b/bot/seasons/evergreen/fun.py
index 286d8462..05cf504e 100644
--- a/bot/seasons/evergreen/fun.py
+++ b/bot/seasons/evergreen/fun.py
@@ -8,7 +8,7 @@ from bot.constants import Emojis
 log = logging.getLogger(__name__)
 
 
-class Fun:
+class Fun(commands.Cog):
     """A collection of general commands for fun."""
 
     def __init__(self, bot):
diff --git a/bot/seasons/evergreen/uptime.py b/bot/seasons/evergreen/uptime.py
index 4d5ac584..32c2b59d 100644
--- a/bot/seasons/evergreen/uptime.py
+++ b/bot/seasons/evergreen/uptime.py
@@ -9,7 +9,7 @@ from bot import start_time
 log = logging.getLogger(__name__)
 
 
-class Uptime:
+class Uptime(commands.Cog):
     """A cog for posting the bot's uptime."""
 
     def __init__(self, bot):
diff --git a/bot/seasons/halloween/candy_collection.py b/bot/seasons/halloween/candy_collection.py
index 2e010cbc..70648e64 100644
--- a/bot/seasons/halloween/candy_collection.py
+++ b/bot/seasons/halloween/candy_collection.py
@@ -20,7 +20,7 @@ ADD_SKULL_REACTION_CHANCE = 50  # 2%
 ADD_SKULL_EXISTING_REACTION_CHANCE = 20  # 5%
 
 
-class CandyCollection:
+class CandyCollection(commands.Cog):
     """Candy collection game Cog."""
 
     def __init__(self, bot):
diff --git a/bot/seasons/halloween/hacktoberstats.py b/bot/seasons/halloween/hacktoberstats.py
index ce32ad9f..42623669 100644
--- a/bot/seasons/halloween/hacktoberstats.py
+++ b/bot/seasons/halloween/hacktoberstats.py
@@ -13,7 +13,7 @@ from discord.ext import commands
 log = logging.getLogger(__name__)
 
 
-class HacktoberStats:
+class HacktoberStats(commands.Cog):
     """Hacktoberfest statistics Cog."""
 
     def __init__(self, bot):
diff --git a/bot/seasons/halloween/halloween_facts.py b/bot/seasons/halloween/halloween_facts.py
index 3ec65b87..ee90dbd3 100644
--- a/bot/seasons/halloween/halloween_facts.py
+++ b/bot/seasons/halloween/halloween_facts.py
@@ -25,7 +25,7 @@ PUMPKIN_ORANGE = discord.Color(0xFF7518)
 INTERVAL = timedelta(hours=6).total_seconds()
 
 
-class HalloweenFacts:
+class HalloweenFacts(commands.Cog):
     """A Cog for displaying interesting facts about Halloween."""
 
     def __init__(self, bot):
diff --git a/bot/seasons/halloween/halloweenify.py b/bot/seasons/halloween/halloweenify.py
index daf64ac0..ce057889 100644
--- a/bot/seasons/halloween/halloweenify.py
+++ b/bot/seasons/halloween/halloweenify.py
@@ -10,7 +10,7 @@ from discord.ext.commands.cooldowns import BucketType
 log = logging.getLogger(__name__)
 
 
-class Halloweenify:
+class Halloweenify(commands.Cog):
     """A cog to change a invokers nickname to a spooky one!"""
 
     def __init__(self, bot):
diff --git a/bot/seasons/halloween/scarymovie.py b/bot/seasons/halloween/scarymovie.py
index 5651c9bb..3878ef7f 100644
--- a/bot/seasons/halloween/scarymovie.py
+++ b/bot/seasons/halloween/scarymovie.py
@@ -13,7 +13,7 @@ TMDB_API_KEY = environ.get('TMDB_API_KEY')
 TMDB_TOKEN = environ.get('TMDB_TOKEN')
 
 
-class ScaryMovie:
+class ScaryMovie(commands.Cog):
     """Selects a random scary movie and embeds info into Discord chat."""
 
     def __init__(self, bot):
diff --git a/bot/seasons/halloween/spookyavatar.py b/bot/seasons/halloween/spookyavatar.py
index 042df701..15c7c431 100644
--- a/bot/seasons/halloween/spookyavatar.py
+++ b/bot/seasons/halloween/spookyavatar.py
@@ -12,7 +12,7 @@ from bot.utils.halloween import spookifications
 log = logging.getLogger(__name__)
 
 
-class SpookyAvatar:
+class SpookyAvatar(commands.Cog):
     """A cog that spookifies an avatar."""
 
     def __init__(self, bot):
diff --git a/bot/seasons/halloween/spookygif.py b/bot/seasons/halloween/spookygif.py
index ce8aef06..37d46c01 100644
--- a/bot/seasons/halloween/spookygif.py
+++ b/bot/seasons/halloween/spookygif.py
@@ -9,7 +9,7 @@ from bot.constants import Tokens
 log = logging.getLogger(__name__)
 
 
-class SpookyGif:
+class SpookyGif(commands.Cog):
     """A cog to fetch a random spooky gif from the web!"""
 
     def __init__(self, bot):
diff --git a/bot/seasons/halloween/spookyreact.py b/bot/seasons/halloween/spookyreact.py
index f1dbb905..9b14507a 100644
--- a/bot/seasons/halloween/spookyreact.py
+++ b/bot/seasons/halloween/spookyreact.py
@@ -17,7 +17,7 @@ SPOOKY_TRIGGERS = {
 }
 
 
-class SpookyReact:
+class SpookyReact(Cog):
     """A cog that makes the bot react to message triggers."""
 
     def __init__(self, bot):
diff --git a/bot/seasons/halloween/spookysound.py b/bot/seasons/halloween/spookysound.py
index b62a9893..7c4d8113 100644
--- a/bot/seasons/halloween/spookysound.py
+++ b/bot/seasons/halloween/spookysound.py
@@ -10,7 +10,7 @@ from bot.constants import Hacktoberfest
 log = logging.getLogger(__name__)
 
 
-class SpookySound:
+class SpookySound(commands.Cog):
     """A cog that plays a spooky sound in a voice channel on command."""
 
     def __init__(self, bot):
diff --git a/bot/seasons/halloween/timeleft.py b/bot/seasons/halloween/timeleft.py
index 56a3eaed..3ea2d9ad 100644
--- a/bot/seasons/halloween/timeleft.py
+++ b/bot/seasons/halloween/timeleft.py
@@ -6,7 +6,7 @@ from discord.ext import commands
 log = logging.getLogger(__name__)
 
 
-class TimeLeft:
+class TimeLeft(commands.Cog):
     """A Cog that tells you how long left until Hacktober is over!"""
 
     def __init__(self, bot):
diff --git a/bot/seasons/season.py b/bot/seasons/season.py
index a64f6ca6..89ca3ca7 100644
--- a/bot/seasons/season.py
+++ b/bot/seasons/season.py
@@ -349,7 +349,7 @@ class SeasonBase:
         await bot.send_log("SeasonalBot Loaded!", f"Active Season: **{self.name_clean}**")
 
 
-class SeasonManager:
+class SeasonManager(commands.Cog):
     """A cog for managing seasons."""
 
     def __init__(self, bot):
diff --git a/bot/seasons/valentines/be_my_valentine.py b/bot/seasons/valentines/be_my_valentine.py
index d90e73aa..55c4adb1 100644
--- a/bot/seasons/valentines/be_my_valentine.py
+++ b/bot/seasons/valentines/be_my_valentine.py
@@ -15,7 +15,7 @@ log = logging.getLogger(__name__)
 HEART_EMOJIS = [":heart:", ":gift_heart:", ":revolving_hearts:", ":sparkling_heart:", ":two_hearts:"]
 
 
-class BeMyValentine:
+class BeMyValentine(commands.Cog):
     """A cog that sends Valentines to other users!"""
 
     def __init__(self, bot):
diff --git a/bot/seasons/valentines/movie_generator.py b/bot/seasons/valentines/movie_generator.py
index 1b1a4a2d..a09a563f 100644
--- a/bot/seasons/valentines/movie_generator.py
+++ b/bot/seasons/valentines/movie_generator.py
@@ -11,7 +11,7 @@ TMDB_API_KEY = environ.get("TMDB_API_KEY")
 log = logging.getLogger(__name__)
 
 
-class RomanceMovieFinder:
+class RomanceMovieFinder(commands.Cog):
     """A cog that returns a random romance movie suggestion to a user."""
 
     def __init__(self, bot):
diff --git a/bot/seasons/valentines/myvalenstate.py b/bot/seasons/valentines/myvalenstate.py
index 0ea8fbab..344f52f6 100644
--- a/bot/seasons/valentines/myvalenstate.py
+++ b/bot/seasons/valentines/myvalenstate.py
@@ -15,7 +15,7 @@ with open(Path('bot', 'resources', 'valentines', 'valenstates.json'), 'r') as fi
     STATES = json.load(file)
 
 
-class MyValenstate:
+class MyValenstate(commands.Cog):
     """A Cog to find your most likely Valentine's vacation destination."""
 
     def __init__(self, bot):
diff --git a/bot/seasons/valentines/pickuplines.py b/bot/seasons/valentines/pickuplines.py
index 193eb788..ad75c93f 100644
--- a/bot/seasons/valentines/pickuplines.py
+++ b/bot/seasons/valentines/pickuplines.py
@@ -14,7 +14,7 @@ with open(Path('bot', 'resources', 'valentines', 'pickup_lines.json'), 'r', enco
     pickup_lines = load(f)
 
 
-class PickupLine:
+class PickupLine(commands.Cog):
     """A cog that gives random cheesy pickup lines."""
 
     def __init__(self, bot):
diff --git a/bot/seasons/valentines/savethedate.py b/bot/seasons/valentines/savethedate.py
index 76f418a2..281625a4 100644
--- a/bot/seasons/valentines/savethedate.py
+++ b/bot/seasons/valentines/savethedate.py
@@ -16,7 +16,7 @@ with open(Path('bot', 'resources', 'valentines', 'date_ideas.json'), 'r', encodi
     VALENTINES_DATES = load(f)
 
 
-class SaveTheDate:
+class SaveTheDate(commands.Cog):
     """A cog that gives random suggestion for a Valentine's date."""
 
     def __init__(self, bot):
diff --git a/bot/seasons/valentines/valentine_zodiac.py b/bot/seasons/valentines/valentine_zodiac.py
index 764c8ccc..1700260e 100644
--- a/bot/seasons/valentines/valentine_zodiac.py
+++ b/bot/seasons/valentines/valentine_zodiac.py
@@ -14,7 +14,7 @@ LETTER_EMOJI = ':love_letter:'
 HEART_EMOJIS = [":heart:", ":gift_heart:", ":revolving_hearts:", ":sparkling_heart:", ":two_hearts:"]
 
 
-class ValentineZodiac:
+class ValentineZodiac(commands.Cog):
     """A cog that returns a counter compatible zodiac sign to the given user's zodiac sign."""
 
     def __init__(self, bot):
diff --git a/bot/seasons/valentines/whoisvalentine.py b/bot/seasons/valentines/whoisvalentine.py
index b7c47121..96d97e22 100644
--- a/bot/seasons/valentines/whoisvalentine.py
+++ b/bot/seasons/valentines/whoisvalentine.py
@@ -14,7 +14,7 @@ with open(Path("bot", "resources", "valentines", "valentine_facts.json"), "r") a
     FACTS = json.load(file)
 
 
-class ValentineFacts:
+class ValentineFacts(commands.Cog):
     """A Cog for displaying facts about Saint Valentine."""
 
     def __init__(self, bot):