Added on_addon_command_error and more

on_addon_command_error
addon_check
Command.on_error

Author: eunwoo1104

dico_command/addon.py

@@ -8,6 +8,7 @@
 
 if typing.TYPE_CHECKING:
     from .bot import Bot
+    from .context import Context
 
 
 class Listener:
@@ -57,3 +58,9 @@ def on_load(self):
 
     def on_unload(self):
         pass
+
+    async def addon_check(self, ctx):  # noqa
+        return True
+
+    async def on_addon_command_error(self, ctx, ex):  # noqa
+        return False

dico_command/bot.py

@@ -67,7 +67,7 @@ async def execute_handler(self, message: dico.Message):
             self.logger.debug(f"Command {name} executed.")
             await cmd.invoke(context, *args, **kwargs)
         except Exception as ex:
-            self.handle_command_error(context, ex)
+            await self.handle_command_error(context, ex)
 
     def add_command(self, command: Command):
         if command.name in self.commands:
@@ -94,7 +94,11 @@ def wrap(func):
             return cmd
         return wrap
 
-    def handle_command_error(self, context, ex):
+    async def handle_command_error(self, context, ex):
+        if await context.command.execute_error_handler(context, ex):
+            return
+        if context.command.addon and await context.command.addon.on_addon_command_error(context, ex):
+            return
         if not self.events.get("COMMAND_ERROR"):
             self.logger.error(f"Error while executing command '{context.command.name}':\n"+''.join(traceback.format_exception(type(ex), ex, ex.__traceback__)))
         else:

dico_command/command.py

@@ -15,6 +15,7 @@ def __init__(self,
         self.checks = checks or []
         self.aliases = aliases or []
         self.subcommands = {}
+        self.error_handler = None
 
         self.args_data = read_function(self.func)
         if hasattr(func, "_checks"):
@@ -31,7 +32,19 @@ def wrap(coro):
     def register_addon(self, addon):
         self.addon = addon
 
+    async def execute_error_handler(self, ctx, ex):
+        if not self.error_handler:
+            return False
+        args = (self.addon, ctx, ex) if self.addon else (ctx, ex)
+        return await self.error_handler(*args)
+
+    def on_error(self, coro):
+        self.error_handler = coro
+        return coro
+
     async def evaluate_checks(self, ctx: Context):
+        if self.addon and not await self.addon.addon_check(ctx):
+            return False
         resp = [n for n in [(await x(ctx)) if is_coro(x) else x(ctx) for x in self.checks] if not n]
         return not resp