CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-22 02:37:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Commands] Refactor command and group decorators (#1818)

Browse Source 
* [V3 Commands] Refactor command and group decorators

* Add some tests

* Fix docs reference

* Tweak Group's MRO
This commit is contained in:
Toby Harradine
2018-08-26 23:25:25 +10:00
committed by GitHub
parent f595afab18
commit 48a7a21aca
3 changed files with 51 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
redbot/core/commands/commands.py
View File

@@ -14,7 +14,7 @@ from ..i18n import Translator
if TYPE_CHECKING:
from .context import Context
__all__ = ["Command", "Group", "command", "group"]
__all__ = ["Command", "GroupMixin", "Group", "command", "group"]
_ = Translator("commands.commands", __file__)
@@ -104,11 +104,17 @@ class Command(commands.Command):
# 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)
@@ -117,11 +123,10 @@ class Command(commands.Command):
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)
@@ -131,11 +136,11 @@ class Command(commands.Command):
return decorator
class Group(Command, commands.Group):
class Group(GroupMixin, Command, 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):