Move error handling to more descriptive `ErrorHandler` cog.

2 files changed, 14 insertions, 18 deletions

diff --git a/bot/__main__.py b/bot/__main__.py
index 9bfd99098..4bc7d1202 100644
--- a/bot/__main__.py
+++ b/bot/__main__.py
@@ -31,7 +31,7 @@ bot.http_session = ClientSession(
 bot.api_client = APIClient(loop=asyncio.get_event_loop())
 
 # Internal/debug
-bot.load_extension("bot.cogs.events")
+bot.load_extension("bot.cogs.error_handler")
 bot.load_extension("bot.cogs.filtering")
 bot.load_extension("bot.cogs.logging")
 bot.load_extension("bot.cogs.modlog")
diff --git a/bot/cogs/events.py b/bot/cogs/error_handler.py
index d69af365b..2db133372 100644
--- a/bot/cogs/events.py
+++ b/bot/cogs/error_handler.py
@@ -1,28 +1,23 @@
 import logging
 
 from aiohttp import ClientResponseError
-from discord import Colour, Embed, Member, Object
+from discord.ext.commands import Bot, Context
 from discord.ext.commands import (
-    BadArgument, Bot, BotMissingPermissions,
-    CommandError, CommandInvokeError, CommandNotFound,
-    Context, NoPrivateMessage, UserInputError
+    BadArgument,
+    BotMissingPermissions,
+    CommandError,
+    CommandInvokeError,
+    CommandNotFound,
+    NoPrivateMessage,
+    UserInputError,
 )
 
-from bot.cogs.modlog import ModLog
-from bot.constants import (
-    Channels, Colours, DEBUG_MODE,
-    Guild, Icons, Keys,
-    Roles, URLs
-)
-from bot.utils import chunks
 
 log = logging.getLogger(__name__)
 
-RESTORE_ROLES = (str(Roles.muted), str(Roles.announcements))
-
 
-class Events:
-    """No commands, just event handlers."""
+class ErrorHandler:
+    """Handles errors emttted from commands."""
 
     def __init__(self, bot: Bot):
         self.bot = bot
@@ -77,6 +72,7 @@ class Events:
                 raise e.original
         raise e
 
-def setup(bot):
-    bot.add_cog(Events(bot))
+
+def setup(bot: Bot):
+    bot.add_cog(ErrorHandler(bot))
     log.info("Cog loaded: Events")