Interaction and view error convenience

Author: NeloBlivion

discord/bot.py

@@ -879,15 +879,15 @@ async def process_application_commands(
 
         ctx = await self.get_application_context(interaction)
         if command:
-            ctx.command = command
+            interaction.command = command
         await self.invoke_application_command(ctx)
 
     async def on_application_command_auto_complete(
         self, interaction: Interaction, command: ApplicationCommand
     ) -> None:
         async def callback() -> None:
             ctx = await self.get_autocomplete_context(interaction)
-            ctx.command = command
+            interaction.command = command
             return await command.invoke_autocomplete_callback(ctx)
 
         autocomplete_task = self._bot.loop.create_task(callback())

discord/client.py

@@ -68,9 +68,11 @@
 if TYPE_CHECKING:
     from .abc import GuildChannel, PrivateChannel, Snowflake, SnowflakeTime
     from .channel import DMChannel
+    from .interaction import Interaction
     from .member import Member
     from .message import Message
     from .poll import Poll
+    from .ui.item import Item
     from .voice_client import VoiceProtocol
 
 __all__ = ("Client",)
@@ -541,6 +543,37 @@ async def on_error(self, event_method: str, *args: Any, **kwargs: Any) -> None:
         print(f"Ignoring exception in {event_method}", file=sys.stderr)
         traceback.print_exc()
 
+    async def on_view_error(
+        self, error: Exception, item: Item, interaction: Interaction
+    ) -> None:
+        """|coro|
+
+        The default view error handler provided by the client.
+
+        This only fires for a view if you did not define its :func:`~discord.ui.View.on_error`.
+        """
+
+        print(f"Ignoring exception in view {self} for item {item}:", file=sys.stderr)
+        traceback.print_exception(
+            error.__class__, error, error.__traceback__, file=sys.stderr
+        )
+
+    async def on_modal_error(
+        self, error: Exception, interaction: Interaction
+    ) -> None:
+        """|coro|
+
+        The default modal error handler provided by the client.
+        The default implementation prints the traceback to stderr.
+
+        This only fires for a modal if you did not define its :func:`~discord.ui.Modal.on_error`.
+        """
+
+        print(f"Ignoring exception in modal {self}:", file=sys.stderr)
+        traceback.print_exception(
+            error.__class__, error, error.__traceback__, file=sys.stderr
+        )
+
     # hooks
 
     async def _call_before_identify_hook(

discord/commands/context.py

@@ -80,16 +80,13 @@ class ApplicationContext(discord.abc.Messageable):
         The bot that the command belongs to.
     interaction: :class:`.Interaction`
         The interaction object that invoked the command.
-    command: :class:`.ApplicationCommand`
-        The command that this context belongs to.
     """
 
     def __init__(self, bot: Bot, interaction: Interaction):
         self.bot = bot
         self.interaction = interaction
 
         # below attributes will be set after initialization
-        self.command: ApplicationCommand = None  # type: ignore
         self.focused: Option = None  # type: ignore
         self.value: str = None  # type: ignore
         self.options: dict = None  # type: ignore
@@ -136,6 +133,15 @@ async def invoke(
         """
         return await command(self, *args, **kwargs)
 
+    @property
+    def command(self) -> ApplicationCommand | None:
+        """The command that this context belongs to."""
+        return self.interaction.command
+
+    @command.setter
+    def command(self, value: ApplicationCommand | None) -> None:
+        self.interaction.command = value
+
     @cached_property
     def channel(self) -> InteractionChannel | None:
         """Union[:class:`abc.GuildChannel`, :class:`PartialMessageable`, :class:`Thread`]:
@@ -393,8 +399,6 @@ class AutocompleteContext:
         The bot that the command belongs to.
     interaction: :class:`.Interaction`
         The interaction object that invoked the autocomplete.
-    command: :class:`.ApplicationCommand`
-        The command that this context belongs to.
     focused: :class:`.Option`
         The option the user is currently typing.
     value: :class:`.str`
@@ -409,7 +413,6 @@ def __init__(self, bot: Bot, interaction: Interaction):
         self.bot = bot
         self.interaction = interaction
 
-        self.command: ApplicationCommand = None  # type: ignore
         self.focused: Option = None  # type: ignore
         self.value: str = None  # type: ignore
         self.options: dict = None  # type: ignore
@@ -423,3 +426,12 @@ def cog(self) -> Cog | None:
             return None
 
         return self.command.cog
+
+    @property
+    def command(self) -> ApplicationCommand | None:
+        """The command that this context belongs to."""
+        return self.interaction.command
+
+    @command.setter
+    def command(self, value: ApplicationCommand | None) -> None:
+        self.interaction.command = value

discord/interactions.py

@@ -75,7 +75,7 @@
         VoiceChannel,
     )
     from .client import Client
-    from .commands import OptionChoice
+    from .commands import OptionChoice, ApplicationCommand
     from .embeds import Embed
     from .mentions import AllowedMentions
     from .poll import Poll
@@ -152,6 +152,18 @@ class Interaction:
         The context in which this command was executed.
 
         .. versionadded:: 2.6
+    command: Optional[:class:`ApplicationCommand`]
+        The command that this interaction belongs to.
+
+        .. versionadded:: 2.7
+    view: Optional[:class:`View`]
+        The view that this interaction belongs to.
+
+        .. versionadded:: 2.7
+    modal: Optional[:class:`Modal`]
+        The modal that this interaction belongs to.
+
+        .. versionadded:: 2.7
     """
 
     __slots__: tuple[str, ...] = (
@@ -224,6 +236,10 @@ def _from_data(self, data: InteractionPayload):
             else None
         )
 
+        self.command: ApplicationCommand | None = None
+        self.view: View | None = None
+        self.modal: Modal | None = None
+
         self.message: Message | None = None
         self.channel = None
 

discord/ui/modal.py

@@ -255,10 +255,7 @@ async def on_error(self, error: Exception, interaction: Interaction) -> None:
         interaction: :class:`~discord.Interaction`
             The interaction that led to the failure.
         """
-        print(f"Ignoring exception in modal {self}:", file=sys.stderr)
-        traceback.print_exception(
-            error.__class__, error, error.__traceback__, file=sys.stderr
-        )
+        interaction.client.dispatch("modal_error", error, interaction)
 
     async def on_timeout(self) -> None:
         """|coro|
@@ -328,6 +325,7 @@ async def dispatch(self, user_id: int, custom_id: str, interaction: Interaction)
         value = self._modals.get(key)
         if value is None:
             return
+        interaction.modal = value
 
         try:
             components = [

discord/ui/view.py

@@ -486,10 +486,7 @@ async def on_error(
         interaction: :class:`~discord.Interaction`
             The interaction that led to the failure.
         """
-        print(f"Ignoring exception in view {self} for item {item}:", file=sys.stderr)
-        traceback.print_exception(
-            error.__class__, error, error.__traceback__, file=sys.stderr
-        )
+        interaction.client.dispatch("view_error", error, item, interaction)
 
     async def _scheduled_task(self, item: Item, interaction: Interaction):
         try:
@@ -753,6 +750,7 @@ def dispatch(self, component_type: int, custom_id: str, interaction: Interaction
             return
 
         view, item = value
+        interaction.view = view
         item.refresh_state(interaction)
         view._dispatch_item(item, interaction)