From d374f1e8ab3a99466d3d552a4ecb134922e9ffc4 Mon Sep 17 00:00:00 2001
From: stijndcl <declercq.stijn@outlook.com>
Date: Wed, 2 Nov 2022 01:23:01 +0100
Subject: [PATCH] Update the error handler for hybrid commands

---
 didier/didier.py | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/didier/didier.py b/didier/didier.py
index cd82ec8..ff581f4 100644
--- a/didier/didier.py
+++ b/didier/didier.py
@@ -252,11 +252,22 @@ class Didier(commands.Bot):
         if hasattr(interaction.command, "on_error"):
             return
 
-        if isinstance(exception, (NoMatch, discord.app_commands.CommandInvokeError)):
+        # Unwrap exception
+        if isinstance(exception, discord.app_commands.CommandInvokeError):
+            exception = exception.original
+
+        if isinstance(exception, (NoMatch, HTTPException)):
             if interaction.response.is_done():
-                return await interaction.response.send_message(str(exception.original), ephemeral=True)
+                return await interaction.response.send_message(str(exception), ephemeral=True)
             else:
-                return await interaction.followup.send(str(exception.original), ephemeral=True)
+                return await interaction.followup.send(str(exception), ephemeral=True)
+
+        await interaction.response.send_message("Something went wrong processing this command.", ephemeral=True)
+
+        if settings.ERRORS_CHANNEL is not None:
+            embed = create_error_embed(await commands.Context.from_interaction(interaction), exception)
+            channel = self.get_channel(settings.ERRORS_CHANNEL)
+            await channel.send(embed=embed)
 
     async def on_command_completion(self, ctx: commands.Context):
         """Event triggered when a message command completes successfully"""
@@ -279,6 +290,10 @@ class Didier(commands.Bot):
         if hasattr(ctx.command, "on_error"):
             return
 
+        # Hybrid command errors are wrapped in an additional error, so wrap it back out
+        if isinstance(exception, commands.HybridCommandError):
+            exception = exception.original
+
         # Ignore exceptions that aren't important
         if isinstance(
             exception,
@@ -291,7 +306,10 @@ class Didier(commands.Bot):
             return
 
         # Responses to things that go wrong during processing of commands
-        if isinstance(exception, commands.CommandInvokeError) and isinstance(
+        if isinstance(
+            exception,
+            (discord.app_commands.CommandInvokeError, commands.CommandInvokeError),
+        ) and isinstance(
             exception.original,
             (
                 NoMatch,