feat: Move ctx.respond to Interaction and implement Interaction.edit (#2026)

Signed-off-by: Lala Sabathil <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Lala Sabathil <[email protected]>

Author: 3 people

CHANGELOG.md

@@ -37,6 +37,8 @@ These changes are available on the `master` branch, but have not yet been releas
 - Added the `data` attribute to all
   [Raw Event payloads](https://docs.pycord.dev/en/master/api/models.html#events).
   ([#2023](https://github.com/Pycord-Development/pycord/pull/2023))
+- Added `Interaction.respond` and `Interaction.edit` as shortcut responses.
+  ([#2026](https://github.com/Pycord-Development/pycord/pull/2026))
 
 ### Changed
 

discord/commands/context.py

@@ -266,26 +266,12 @@ def unselected_options(self) -> list[Option] | None:
     def send_modal(self) -> Callable[..., Awaitable[Interaction]]:
         return self.interaction.response.send_modal
 
-    async def respond(self, *args, **kwargs) -> Interaction | WebhookMessage:
-        """|coro|
-
-        Sends either a response or a message using the followup webhook determined by whether the interaction
-        has been responded to or not.
-
-        Returns
-        -------
-        Union[:class:`discord.Interaction`, :class:`discord.WebhookMessage`]:
-            The response, its type depending on whether it's an interaction response or a followup.
-        """
-        try:
-            if not self.interaction.response.is_done():
-                return await self.interaction.response.send_message(
-                    *args, **kwargs
-                )  # self.response
-            else:
-                return await self.followup.send(*args, **kwargs)  # self.send_followup
-        except discord.errors.InteractionResponded:
-            return await self.followup.send(*args, **kwargs)
+    @property
+    @discord.utils.copy_doc(Interaction.respond)
+    def respond(
+        self, *args, **kwargs
+    ) -> Callable[..., Awaitable[Interaction | WebhookMessage]]:
+        return self.interaction.respond
 
     @property
     @discord.utils.copy_doc(InteractionResponse.send_message)

discord/interactions.py

@@ -38,7 +38,12 @@
 from .object import Object
 from .permissions import Permissions
 from .user import User
-from .webhook.async_ import Webhook, async_context, handle_message_parameters
+from .webhook.async_ import (
+    Webhook,
+    WebhookMessage,
+    async_context,
+    handle_message_parameters,
+)
 
 __all__ = (
     "Interaction",
@@ -519,6 +524,44 @@ async def delete_original_message(self, **kwargs):
         """
         return await self.delete_original_response(**kwargs)
 
+    async def respond(self, *args, **kwargs) -> Interaction | WebhookMessage:
+        """|coro|
+
+        Sends either a response or a message using the followup webhook determined by whether the interaction
+        has been responded to or not.
+
+        Returns
+        -------
+        Union[:class:`discord.Interaction`, :class:`discord.WebhookMessage`]:
+            The response, its type depending on whether it's an interaction response or a followup.
+        """
+        try:
+            if not self.response.is_done():
+                return await self.response.send_message(*args, **kwargs)
+            else:
+                return await self.followup.send(*args, **kwargs)
+        except InteractionResponded:
+            return await self.followup.send(*args, **kwargs)
+
+    async def edit(self, *args, **kwargs) -> InteractionMessage | None:
+        """|coro|
+
+        Either respond to the interaction with an edit_message or edits the existing response, determined by
+        whether the interaction has been responded to or not.
+
+        Returns
+        -------
+        Union[:class:`discord.InteractionMessage`, :class:`discord.WebhookMessage`]:
+            The response, its type depending on whether it's an interaction response or a followup.
+        """
+        try:
+            if not self.response.is_done():
+                return await self.response.edit_message(*args, **kwargs)
+            else:
+                return await self.edit_original_response(*args, **kwargs)
+        except InteractionResponded:
+            return await self.edit_original_response(*args, **kwargs)
+
     def to_dict(self) -> dict[str, Any]:
         """
         Converts this interaction object into a dict.