change InteractionContext to ApplicationContext

Author: BobDotCom

discord/app/commands.py

@@ -34,7 +34,7 @@
 from ..member import Member
 from ..user import User
 from ..message import Message
-from .context import InteractionContext
+from .context import ApplicationContext
 from ..utils import find, get_or_fetch, async_all
 from ..errors import DiscordException, NotFound, ValidationError, ClientException
 from .errors import ApplicationCommandError, CheckFailure, ApplicationCommandInvokeError
@@ -104,7 +104,7 @@ def __repr__(self):
     def __eq__(self, other):
         return isinstance(other, self.__class__)
 
-    async def prepare(self, ctx: InteractionContext) -> None:
+    async def prepare(self, ctx: ApplicationContext) -> None:
         # This should be same across all 3 types
         ctx.command = self
 
@@ -116,13 +116,13 @@ async def prepare(self, ctx: InteractionContext) -> None:
         await self.call_before_hooks(ctx)
         pass
 
-    async def invoke(self, ctx: InteractionContext) -> None:
+    async def invoke(self, ctx: ApplicationContext) -> None:
         await self.prepare(ctx)
 
         injected = hooked_wrapped_callback(self, ctx, self._invoke)
         await injected(ctx)
 
-    async def can_run(self, ctx: InteractionContext) -> bool:
+    async def can_run(self, ctx: ApplicationContext) -> bool:
 
         if not await ctx.bot.can_run(ctx):
             raise CheckFailure(f'The global check functions for command {self.name} failed.')
@@ -134,7 +134,7 @@ async def can_run(self, ctx: InteractionContext) -> bool:
 
         return await async_all(predicate(ctx) for predicate in predicates) # type: ignore    
 
-    async def dispatch_error(self, ctx: InteractionContext, error: Exception) -> None:
+    async def dispatch_error(self, ctx: ApplicationContext, error: Exception) -> None:
         ctx.command_failed = True
         cog = self.cog
         try:
@@ -233,7 +233,7 @@ def after_invoke(self, coro):
         self._after_invoke = coro
         return coro
 
-    async def call_before_hooks(self, ctx: InteractionContext) -> None:
+    async def call_before_hooks(self, ctx: ApplicationContext) -> None:
         # now that we're done preparing we can call the pre-command hooks
         # first, call the command local hook:
         cog = self.cog
@@ -258,7 +258,7 @@ async def call_before_hooks(self, ctx: InteractionContext) -> None:
         if hook is not None:
             await hook(ctx)
 
-    async def call_after_hooks(self, ctx: InteractionContext) -> None:
+    async def call_after_hooks(self, ctx: ApplicationContext) -> None:
         cog = self.cog
         if self._after_invoke is not None:
             instance = getattr(self._after_invoke, '__self__', cog)
@@ -391,7 +391,7 @@ def __eq__(self, other) -> bool:
             and other.description == self.description
         )
 
-    async def _invoke(self, ctx: InteractionContext) -> None:
+    async def _invoke(self, ctx: ApplicationContext) -> None:
         # TODO: Parse the args better, apply custom converters etc.
         kwargs = {}
         for arg in ctx.interaction.data.get("options", []):
@@ -570,7 +570,7 @@ def command_group(self, name, description) -> SlashCommandGroup:
         self.subcommands.append(sub_command_group)
         return sub_command_group
 
-    async def _invoke(self, ctx: InteractionContext) -> None:
+    async def _invoke(self, ctx: ApplicationContext) -> None:
         option = ctx.interaction.data["options"][0]
         command = find(lambda x: x.name == option["name"], self.subcommands)
         ctx.interaction.data = option
@@ -661,7 +661,7 @@ def __new__(cls, *args, **kwargs) -> UserCommand:
         self.__original_kwargs__ = kwargs.copy()
         return self
 
-    async def _invoke(self, ctx: InteractionContext) -> None:
+    async def _invoke(self, ctx: ApplicationContext) -> None:
         if "members" not in ctx.interaction.data["resolved"]:
             _data = ctx.interaction.data["resolved"]["users"]
             for i, v in _data.items():
@@ -736,7 +736,7 @@ def __new__(cls, *args, **kwargs) -> MessageCommand:
         self.__original_kwargs__ = kwargs.copy()
         return self
 
-    async def _invoke(self, ctx: InteractionContext):
+    async def _invoke(self, ctx: ApplicationContext):
         _data = ctx.interaction.data["resolved"]["messages"]
         for i, v in _data.items():
             v["id"] = int(i)

discord/app/context.py

@@ -36,7 +36,7 @@
 from ..context_managers import Typing
 
 
-class InteractionContext:
+class ApplicationContext:
     """Represents a Discord interaction context.
 
     This class is not created manually and is instead passed to application
@@ -102,7 +102,7 @@ def respond(self):
 
     @property
     def send(self):
-        """Behaves like :attr:`~discord.abc.Messagable.send` if the response is done, else behaves like :attr:`~discord.app.InteractionContext.respond`"""
+        """Behaves like :attr:`~discord.abc.Messagable.send` if the response is done, else behaves like :attr:`~discord.app.ApplicationContext.respond`"""
         return self.channel.send if self.response.is_done() else self.respond
 
     @property
@@ -114,8 +114,8 @@ def followup(self):
         return self.interaction.followup
 
     async def delete(self):
-        """Calls :attr:`~discord.app.InteractionContext.respond`.
-        If the response is done, then calls :attr:`~discord.app.InteractionContext.respond` first."""
+        """Calls :attr:`~discord.app.ApplicationContext.respond`.
+        If the response is done, then calls :attr:`~discord.app.ApplicationContext.respond` first."""
         if not self.response.is_done():
             await self.defer()
 

discord/bot.py

@@ -40,7 +40,7 @@
     MessageCommand,
     UserCommand,
     ApplicationCommand,
-    InteractionContext,
+    ApplicationContext,
     command,
 )
 from .cog import CogMixin
@@ -323,7 +323,7 @@ def command_group(self, name: str, description: str, guild_ids=None) -> SlashCom
 
     async def get_application_context(
         self, interaction: Interaction, cls=None
-    ) -> InteractionContext:
+    ) -> ApplicationContext:
         r"""|coro|
 
         Returns the invocation context from the interaction.
@@ -337,18 +337,18 @@ async def get_application_context(
             The interaction to get the invocation context from.
         cls
             The factory class that will be used to create the context.
-            By default, this is :class:`.InteractionContext`. Should a custom
+            By default, this is :class:`.ApplicationContext`. Should a custom
             class be provided, it must be similar enough to
-            :class:`.InteractionContext`\'s interface.
+            :class:`.ApplicationContext`\'s interface.
 
         Returns
         --------
-        :class:`.InteractionContext`
+        :class:`.ApplicationContext`
             The invocation context. Tye type of this can change via the
             ``cls`` parameter.
         """
         if cls is None:
-            cls = InteractionContext
+            cls = ApplicationContext
         return cls(self, interaction)
 
 
@@ -378,7 +378,7 @@ async def on_connect(self):
     async def on_interaction(self, interaction):
         await self.process_application_commands(interaction)
 
-    async def on_application_command_error(self, context: InteractionContext, exception: DiscordException) -> None:
+    async def on_application_command_error(self, context: ApplicationContext, exception: DiscordException) -> None:
         """|coro|
 
         The default command error handler provided by the bot.
@@ -492,7 +492,7 @@ def whitelist(ctx):
         self.add_check(func, call_once=True)
         return func
 
-    async def can_run(self, ctx: InteractionContext, *, call_once: bool = False) -> bool:
+    async def can_run(self, ctx: ApplicationContext, *, call_once: bool = False) -> bool:
         data = self._check_once if call_once else self._checks
 
         if len(data) == 0: