fix(application_commands): Fixed command checks not working

feat(application_commands): Added the ability to pass the values directly for slash command choices

Author: mccoderpy

discord/application_commands.py

@@ -358,21 +358,24 @@ def _fill_data(self, data) -> ApplicationCommand:
         return self
 
     async def can_run(self, *args, **kwargs) -> bool:
+        #if self.cog:
+        #    args = (self.cog, *args)
         check_func = kwargs.pop('__func', self)
         checks = getattr(check_func, '__commands_checks__', getattr(self.func, '__commands_checks__', None))
         if not checks:
             return True
-
         return await async_all(check(*args) for check in checks)
 
     async def invoke(self, interaction, *args, **kwargs):
-        if self.cog is not None:
-            args = (self.cog, interaction, *args)
-        else:
-            args = (interaction, *args)
+        if not self.func:
+            return
+        args = (interaction, *args)
         try:
             if await self.can_run(*args):
-                await self.func(*args, **kwargs)
+                if self.cog:
+                    await self.func(self.cog, *args, **kwargs)
+                else:
+                    await self.func(*args, **kwargs)
         except Exception as exc:
             if hasattr(self, 'on_error'):
                 if self.cog is not None:
@@ -840,8 +843,8 @@ def to_dict(self):
         return base
 
     async def can_run(self, *args, **kwargs):
-        if self.cog is not None:
-            args = (self.cog, *args)
+        # if self.cog is not None:
+        #    args = (self.cog, *args)
         check_func = kwargs.pop('__func', self)
         checks = getattr(check_func, '__commands_checks__', getattr(self.func, '__commands_checks__', None))
         if not checks:
@@ -850,13 +853,15 @@ async def can_run(self, *args, **kwargs):
         return await async_all(check(*args, **kwargs) for check in checks)
 
     async def invoke(self, interaction, *args, **kwargs):
-        if self.cog is not None:
-            args = (self.cog, interaction, *args)
-        else:
-            args = (interaction, *args)
+        if not self.func:
+            return
+        args = (interaction, *args)
         try:
             if await self.can_run(*args):
-                await self.func(*args, **kwargs)
+                if self.cog:
+                    await self.func(self.cog, *args, **kwargs)
+                else:
+                    await self.func(*args, **kwargs)
         except Exception as exc:
             if hasattr(self, 'on_error'):
                 if self.cog is not None:
@@ -886,10 +891,7 @@ async def invoke_autocomplete(self, interaction, *args, **kwargs):
             warnings.warn(f'Sub-Command {self.name} of {self.parent} has options with autocomplete enabled but no autocomplete function.')
             return
 
-        if self.cog is not None:
-            args = (self.cog, interaction, *args)
-        else:
-            args = (interaction, *args)
+        args = (interaction, *args)
         try:
             if await self.can_run(*args, __func=self.autocomplete_func):
                 await self.autocomplete_func(*args, **kwargs)
@@ -1096,10 +1098,7 @@ async def invoke_autocomplete(self, interaction, *args, **kwargs):
         if self.autocomplete_func is None:
             warnings.warn(f'Application Command {self.name} has options with autocomplete enabled but no autocomplete function.')
             return
-        if self.cog is not None:
-            args = (self.cog, interaction, *args)
-        else:
-            args = (interaction, *args)
+        args = (interaction, *args)
 
         try:
             if await self.can_run(*args, __func=self.autocomplete_func):
@@ -1154,14 +1153,13 @@ def _filter_id_out(argument):
     async def invoke(self, interaction, *args, **kwargs):
         if not self.func:
             return
-        if self.cog is not None:
-            args = (self.cog, interaction, *args)
-        else:
-            args = (interaction, *args)
-
+        args = (interaction, *args)
         try:
             if await self.can_run(*args):
-                await self.func(*args, **kwargs)
+                if self.cog:
+                    await self.func(self.cog, *args, **kwargs)
+                else:
+                    await self.func(*args, **kwargs)
         except Exception as exc:
             if hasattr(self, 'on_error'):
                 if self.cog is not None: