Fixed args invoke attempt error

Author: eunwoo1104

discord_slash/client.py

@@ -869,21 +869,7 @@ async def invoke_command(self, func, ctx, args):
         :param args: Args. Can be list or dict.
         """
         try:
-            not_kwargs = False
-            if isinstance(args, dict):
-                ctx.kwargs = args
-                ctx.args = list(args.values())
-                try:
-                    coro = func.invoke(ctx, **args)
-                except TypeError:
-                    args = list(args.values())
-                    not_kwargs = True
-            else:
-                ctx.args = args
-                not_kwargs = True
-            if not_kwargs:
-                coro = func.invoke(ctx, *args)
-            await coro
+            await func.invoke(ctx, args)
         except Exception as ex:
             await self.on_slash_command_error(ctx, ex)
 

discord_slash/model.py

@@ -131,18 +131,38 @@ def __init__(self, name, cmd):  # Let's reuse old command formatting.
         if hasattr(self.func, '__commands_checks__'):
             self.__commands_checks__ = self.func.__commands_checks__
 
-    async def invoke(self, *args, **kwargs):
+    async def invoke(self, *args):
         """
         Invokes the command.
 
         :param args: Args for the command.
         :raises: .error.CheckFailure
         """
-        can_run = await self.can_run(args[0])
+        args = list(args)
+        ctx = args.pop(0)
+        can_run = await self.can_run(ctx)
         if not can_run:
             raise error.CheckFailure
 
-        return await self.func(*args, **kwargs)
+        coro = None  # Get rid of annoying IDE complainings.
+
+        not_kwargs = False
+        if args and isinstance(args[0], dict):
+            kwargs = args[0]
+            ctx.kwargs = kwargs
+            ctx.args = list(kwargs.values())
+            try:
+                coro = self.func(ctx, **kwargs)
+            except TypeError:
+                args = list(kwargs.values())
+                not_kwargs = True
+        else:
+            ctx.args = args
+            not_kwargs = True
+        if not_kwargs:
+            coro = self.func(ctx, *args)
+
+        return await coro
 
     def add_check(self, func):
         """
@@ -268,11 +288,31 @@ async def invoke(self, *args, **kwargs):
         :param args: Args for the command.
         :raises: .error.CheckFailure
         """
-        can_run = await self.can_run(args[0])
+        args = list(args)
+        ctx = args.pop(0)
+        can_run = await self.can_run(ctx)
         if not can_run:
             raise error.CheckFailure
 
-        return await self.func(self.cog, *args, **kwargs)
+        coro = None  # Get rid of annoying IDE complainings.
+
+        not_kwargs = False
+        if args and isinstance(args[0], dict):
+            kwargs = args[0]
+            ctx.kwargs = kwargs
+            ctx.args = list(kwargs.values())
+            try:
+                coro = self.func(self.cog, ctx, **kwargs)
+            except TypeError:
+                args = list(kwargs.values())
+                not_kwargs = True
+        else:
+            ctx.args = args
+            not_kwargs = True
+        if not_kwargs:
+            coro = self.func(self.cog, ctx, *args)
+
+        return await coro
 
 
 class SlashCommandOptionType(IntEnum):