Merge pull request #967 from Middledot/master

fix cog.walk_commands() and SlashCommandGroup

Author: BobDotCom

discord/cog.py

@@ -32,7 +32,7 @@
 
 import discord.utils
 from . import errors
-from .commands import _BaseCommand, ApplicationCommand, ApplicationContext
+from .commands import _BaseCommand, ApplicationCommand, ApplicationContext, SlashCommandGroup
 
 __all__ = (
     'CogMeta',
@@ -275,8 +275,8 @@ def walk_commands(self) -> Generator[ApplicationCommand, None, None]:
             A command or group from the cog.
         """
         for command in self.__cog_commands__:
-            if command.parent is None:
-                yield command
+            if isinstance(command, SlashCommandGroup):
+                yield from command.walk_commands()
 
     def get_listeners(self) -> List[Tuple[str, Callable[..., Any]]]:
         """Returns a :class:`list` of (name, function) listener pairs that are defined in this cog.

discord/commands/core.py

@@ -495,6 +495,9 @@ def qualified_name(self) -> str:
         else:
             return self.name
 
+    def __str__(self) -> str:
+        return self.qualified_name
+
     def _set_cog(self, cog):
         self.cog = cog
 

discord/ext/commands/cog.py

@@ -29,7 +29,7 @@
 
 from typing import Any, Callable, Generator, TYPE_CHECKING, List, TypeVar, Type, Union
 
-from ...commands import ApplicationCommand
+from ...commands import ApplicationCommand, SlashCommandGroup
 
 if TYPE_CHECKING:
     from .core import Command
@@ -60,13 +60,15 @@ def walk_commands(self) -> Generator[Command, None, None]:
         """
         from .core import GroupMixin
         for command in self.__cog_commands__:
-            if isinstance(command, ApplicationCommand):
-                yield command
-            else:
+            if not isinstance(command, ApplicationCommand):
                 if command.parent is None:
                     yield command
                     if isinstance(command, GroupMixin):
                         yield from command.walk_commands()
+            elif isinstance(command, SlashCommandGroup):
+                yield from command.walk_commands()
+            else:
+                yield command
 
     def get_commands(self) -> List[Union[ApplicationCommand, Command]]:
         r"""