[Commands] Refactor command and group decorators

redbot/core/bot.py

@@ -8,8 +8,6 @@
 
 import discord
 import sys
-from discord.ext.commands.bot import BotBase
-from discord.ext.commands import GroupMixin
 from discord.ext.commands import when_mentioned_or
 
 # This supresses the PyNaCl warning that isn't relevant here
@@ -24,7 +22,7 @@
 from .sentry import SentryManager
 
 
-class RedBase(BotBase, RPCMixin):
+class RedBase(commands.GroupMixin, commands.bot.BotBase, RPCMixin):
     """Mixin for the main bot class.
 
     This exists because `Red` inherits from `discord.AutoShardedClient`, which
@@ -254,7 +252,7 @@ def unload_extension(self, name):
         # first remove all the commands from the module
         for cmd in self.all_commands.copy().values():
             if cmd.module.startswith(lib_name):
-                if isinstance(cmd, GroupMixin):
+                if isinstance(cmd, discord.ext.commands.GroupMixin):
                     cmd.recursively_remove_all_commands()
                 self.remove_command(cmd.name)
 

redbot/core/commands/commands.py

@@ -14,7 +14,7 @@
 if TYPE_CHECKING:
     from .context import Context
 
-__all__ = ["Command", "Group", "command", "group"]
+__all__ = ["Command", "GroupMixin", "Group", "command", "group"]
 
 _ = Translator("commands.commands", __file__)
 
@@ -102,11 +102,17 @@ async def do_conversion(self, ctx: "Context", converter, argument: str):
             # We should expose anything which might be a bug in the converter
             raise exc
 
-    def command(self, cls=None, *args, **kwargs):
+
+class GroupMixin(commands.GroupMixin):
+    """Mixin for `Group` and `Red` classes.
+
+    This class inherits from :class:`discord.ext.commands.GroupMixin`.
+    """
+
+    def command(self, *args, **kwargs):
         """A shortcut decorator that invokes :func:`.command` and adds it to
-        the internal command list via :meth:`~.GroupMixin.add_command`.
+        the internal command list.
         """
-        cls = cls or self.__class__
 
         def decorator(func):
             result = command(*args, **kwargs)(func)
@@ -115,11 +121,10 @@ def decorator(func):
 
         return decorator
 
-    def group(self, cls=None, *args, **kwargs):
+    def group(self, *args, **kwargs):
         """A shortcut decorator that invokes :func:`.group` and adds it to
-        the internal command list via :meth:`~.GroupMixin.add_command`.
+        the internal command list.
         """
-        cls = None or Group
 
         def decorator(func):
             result = group(*args, **kwargs)(func)
@@ -129,11 +134,11 @@ def decorator(func):
         return decorator
 
 
-class Group(Command, commands.Group):
+class Group(Command, GroupMixin, commands.Group):
     """Group command class for Red.
 
-    This class inherits from `discord.ext.commands.Group`, with `Command` mixed
-    in.
+    This class inherits from `Command`, with :class:`GroupMixin` and
+    `discord.ext.commands.Group` mixed in.
     """
 
     def __init__(self, *args, **kwargs):

tests/core/test_commands.py

@@ -0,0 +1,34 @@
+import pytest
+from redbot.core import commands
+
+
+@pytest.fixture(scope="session")
+def group():
+    @commands.group()
+    async def fixturegroup(*args, **kwargs):
+        return args, kwargs
+
+    return fixturegroup
+
+
+def is_Command(obj):
+    return isinstance(obj, commands.Command)
+
+
+def is_Group(obj):
+    return isinstance(obj, commands.Group)
+
+
+def test_command_decorators(coroutine):
+    assert is_Command(commands.command(name="cmd")(coroutine))
+    assert is_Group(commands.group(name="grp")(coroutine))
+
+
+def test_group_decorator_methods(group, coroutine):
+    assert is_Command(group.command(name="cmd")(coroutine))
+    assert is_Group(group.group(name="grp")(coroutine))
+
+
+def test_bot_decorator_methods(red, coroutine):
+    assert is_Command(red.command(name="cmd")(coroutine))
+    assert is_Group(red.group(name="grp")(coroutine))