feat: implement Invokable & BaseContext

.github/workflows/check.yml

@@ -20,7 +20,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install -r requirements/dev.txt
       - run:
-          codespell --ignore-words-list="groupt,nd,ot,ro,falsy,BU" \
+          codespell --ignore-words-list="groupt,nd,ot,ro,falsy,BU,invokable" \
           --exclude-file=".github/workflows/codespell.yml"
   bandit:
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -71,6 +71,25 @@ These changes are available on the `master` branch, but have not yet been releas
 - Added `suppress` and `allowed_mentions` parameters to `Webhook` and
   `InteractionResponse` edit methods.
   ([#2138](https://github.com/Pycord-Development/pycord/pull/2138))
+- Added `_parse_arguments` function to slash commands to parse arguments instead of in
+  `prepare`. ([#1606](https://github.com/Pycord-Development/pycord/pull/1606))
+- Added the `parents`, `root_parent`, and `cog_name` attribute to slash commands.
+  ([#1606](https://github.com/Pycord-Development/pycord/pull/1606))
+- Added the `error` decorator to slash commands.
+  ([#1606](https://github.com/Pycord-Development/pycord/pull/1606))
+- Added the `cooldown_after_parsing` parameter & attribute to slash commands.
+  ([#1606](https://github.com/Pycord-Development/pycord/pull/1606))
+- Added the `reinvoke` function to `ApplicationContext`.
+  ([#1606](https://github.com/Pycord-Development/pycord/pull/1606))
+- Added the `invoked_with`, `invoked_parents`, `invoked_subcommand`,
+  `subcommand_passed`, and `command_failed` parameters & attributes to
+  `ApplicationContext`.
+  ([#1606](https://github.com/Pycord-Development/pycord/pull/1606))
+- Added the `source` attribute to `ext.commands.Context` & `ApplicationContext` for a
+  common way to either retrieve the message or the interaction that triggered the
+  command. ([#1606](https://github.com/Pycord-Development/pycord/pull/1606))
+- Documented `ContextMenuCommand`.
+  ([#1606](https://github.com/Pycord-Development/pycord/pull/1606))
 
 ### Changed
 
@@ -93,6 +112,13 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2087](https://github.com/Pycord-Development/pycord/pull/2087))
 - Typehinted `command_prefix` and `help_command` arguments properly.
   ([#2099](https://github.com/Pycord-Development/pycord/pull/2099))
+- Renamed `_invoke` in application commands to `invoke`.
+  ([#1606](https://github.com/Pycord-Development/pycord/pull/1606))
+- Deprecated `ext/commands/cooldowns` in favour of `commands/cooldowns`.
+  ([#1606](https://github.com/Pycord-Development/pycord/pull/1606))
+- Deprecated `ApplicationCommandError` & `ApplicationCommandInvokeError` in favour of
+  `CommandError` & `CommandInvokeError` respectively.
+  ([#1606](https://github.com/Pycord-Development/pycord/pull/1606))
 
 ### Removed
 

discord/bot.py

@@ -42,6 +42,7 @@
     ApplicationCommand,
     ApplicationContext,
     AutocompleteContext,
+    BaseContext,
     MessageCommand,
     SlashCommand,
     SlashCommandGroup,
@@ -862,8 +863,9 @@ async def process_application_commands(
             )
 
         ctx = await self.get_application_context(interaction)
-        if command:
+        if command and not ctx.command:
             ctx.command = command
+
         await self.invoke_application_command(ctx)
 
     async def on_application_command_auto_complete(
@@ -1212,7 +1214,6 @@ async def on_application_command_error(
         )
 
     # global check registration
-    # TODO: Remove these from commands.Bot
 
     def check(self, func):
         """A decorator that adds a global check to the bot. A global check is similar to a :func:`.check` that is
@@ -1222,8 +1223,8 @@ def check(self, func):
         .. note::
 
            This function can either be a regular function or a coroutine. Similar to a command :func:`.check`, this
-           takes a single parameter of type :class:`.Context` and can only raise exceptions inherited from
-           :exc:`.ApplicationCommandError`.
+           takes a single parameter of type :class:`.BaseContext` and can only raise exceptions inherited from
+           :exc:`.CommandError`.
 
         Example
         -------
@@ -1282,14 +1283,14 @@ def check_once(self, func):
 
         .. note::
 
-           When using this function the :class:`.Context` sent to a group subcommand may only parse the parent command
+           When using this function the :class:`.BaseContext` sent to a group subcommand may only parse the parent command
            and not the subcommands due to it being invoked once per :meth:`.Bot.invoke` call.
 
         .. note::
 
            This function can either be a regular function or a coroutine. Similar to a command :func:`.check`,
-           this takes a single parameter of type :class:`.Context` and can only raise exceptions inherited from
-           :exc:`.ApplicationCommandError`.
+           this takes a single parameter of type :class:`.BaseContext` and can only raise exceptions inherited from
+           :exc:`.CommandError`.
 
         Example
         -------
@@ -1318,7 +1319,7 @@ def before_invoke(self, coro):
         A pre-invoke hook is called directly before the command is
         called. This makes it a useful function to set up database
         connections or any type of set up required.
-        This pre-invoke hook takes a sole parameter, a :class:`.Context`.
+        This pre-invoke hook takes a sole parameter, a :class:`.BaseContext`.
 
         .. note::
 
@@ -1348,7 +1349,7 @@ def after_invoke(self, coro):
         A post-invoke hook is called directly after the command is
         called. This makes it a useful function to clean-up database
         connections or any type of clean up required.
-        This post-invoke hook takes a sole parameter, a :class:`.Context`.
+        This post-invoke hook takes a sole parameter, a :class:`.BaseContext`.
 
         .. note::
 

discord/cog.py

@@ -37,7 +37,8 @@
 from . import errors
 from .commands import (
     ApplicationCommand,
-    ApplicationContext,
+    BaseContext,
+    Invokable,
     SlashCommandGroup,
     _BaseCommand,
 )
@@ -230,7 +231,7 @@ def __new__(cls: type[CogMeta], *args: Any, **kwargs: Any) -> CogMeta:
 
         # Either update the command with the cog provided defaults or copy it.
         # r.e type ignore, type-checker complains about overriding a ClassVar
-        new_cls.__cog_commands__ = tuple(c._update_copy(cmd_attrs) if not hasattr(c, "add_to") else c for c in new_cls.__cog_commands__)  # type: ignore
+        new_cls.__cog_commands__ = tuple(c.copy(cmd_attrs) if not hasattr(c, "add_to") else c for c in new_cls.__cog_commands__)  # type: ignore
 
         name_filter = lambda c: (
             "app"
@@ -313,7 +314,7 @@ def __new__(cls: type[CogT], *args: Any, **kwargs: Any) -> CogT:
         # To do this, we need to interfere with the Cog creation process.
         return super().__new__(cls)
 
-    def get_commands(self) -> list[ApplicationCommand]:
+    def get_commands(self) -> list[Invokable]:
         r"""
         Returns
         --------
@@ -345,12 +346,12 @@ def description(self) -> str:
     def description(self, description: str) -> None:
         self.__cog_description__ = description
 
-    def walk_commands(self) -> Generator[ApplicationCommand, None, None]:
+    def walk_commands(self) -> Generator[Invokable, None, None]:
         """An iterator that recursively walks through this cog's commands and subcommands.
 
         Yields
         ------
-        Union[:class:`.Command`, :class:`.Group`]
+        Union[:class:`.Invokable`]
             A command or group from the cog.
         """
         for command in self.__cog_commands__:
@@ -440,7 +441,7 @@ def cog_unload(self) -> None:
         """
 
     @_cog_special_method
-    def bot_check_once(self, ctx: ApplicationContext) -> bool:
+    def bot_check_once(self, ctx: BaseContext) -> bool:
         """A special method that registers as a :meth:`.Bot.check_once`
         check.
 
@@ -449,45 +450,45 @@ def bot_check_once(self, ctx: ApplicationContext) -> bool:
 
         Parameters
         ----------
-        ctx: :class:`.Context`
+        ctx: :class:`.BaseContext`
             The invocation context.
         """
         return True
 
     @_cog_special_method
-    def bot_check(self, ctx: ApplicationContext) -> bool:
+    def bot_check(self, ctx: BaseContext) -> bool:
         """A special method that registers as a :meth:`.Bot.check`
         check.
 
         This function **can** be a coroutine and must take a sole parameter,
-        ``ctx``, to represent the :class:`.Context` or :class:`.ApplicationContext`.
+        ``ctx``, to represent a subclass of :class:`BaseContext` (either :class:`.Context`
+        or :class:`.ApplicationContext`).
 
         Parameters
         ----------
-        ctx: :class:`.Context`
+        ctx: :class:`.BaseContext`
             The invocation context.
         """
         return True
 
     @_cog_special_method
-    def cog_check(self, ctx: ApplicationContext) -> bool:
+    def cog_check(self, ctx: BaseContext) -> bool:
         """A special method that registers as a :func:`~discord.ext.commands.check`
         for every command and subcommand in this cog.
 
         This function **can** be a coroutine and must take a sole parameter,
-        ``ctx``, to represent the :class:`.Context` or :class:`.ApplicationContext`.
+        ``ctx``, to represent a subclass of :class:`BaseContext` (either :class:`.Context`
+        or :class:`.ApplicationContext`).
 
         Parameters
         ----------
-        ctx: :class:`.Context`
+        ctx: :class:`.BaseContext`
             The invocation context.
         """
         return True
 
     @_cog_special_method
-    async def cog_command_error(
-        self, ctx: ApplicationContext, error: Exception
-    ) -> None:
+    async def cog_command_error(self, ctx: BaseContext, error: Exception) -> None:
         """A special method that is called whenever an error
         is dispatched inside this cog.
 
@@ -498,37 +499,37 @@ async def cog_command_error(
 
         Parameters
         ----------
-        ctx: :class:`.ApplicationContext`
+        ctx: :class:`.BaseContext`
             The invocation context where the error happened.
         error: :class:`ApplicationCommandError`
             The error that happened.
         """
 
     @_cog_special_method
-    async def cog_before_invoke(self, ctx: ApplicationContext) -> None:
+    async def cog_before_invoke(self, ctx: BaseContext) -> None:
         """A special method that acts as a cog local pre-invoke hook.
 
-        This is similar to :meth:`.ApplicationCommand.before_invoke`.
+        This is similar to :meth:`.Invokable.before_invoke`.
 
         This **must** be a coroutine.
 
         Parameters
         ----------
-        ctx: :class:`.ApplicationContext`
+        ctx: :class:`.BaseContext`
             The invocation context.
         """
 
     @_cog_special_method
-    async def cog_after_invoke(self, ctx: ApplicationContext) -> None:
+    async def cog_after_invoke(self, ctx: BaseContext) -> None:
         """A special method that acts as a cog local post-invoke hook.
 
-        This is similar to :meth:`.ApplicationCommand.after_invoke`.
+        This is similar to :meth:`.BaseContext.after_invoke`.
 
         This **must** be a coroutine.
 
         Parameters
         ----------
-        ctx: :class:`.ApplicationContext`
+        ctx: :class:`.BaseContext`
             The invocation context.
         """
 

discord/commands/__init__.py

@@ -25,5 +25,6 @@
 
 from .context import *
 from .core import *
+from .mixins import *
 from .options import *
 from .permissions import *