Merge pull request #130 from Pycord-Development/context

Make InteractionContext an abc.Messageable

Author: BobDotCom

discord/abc.py

@@ -62,6 +62,7 @@
     'GuildChannel',
     'Messageable',
     'Connectable',
+    'Mentionable'
 )
 
 T = TypeVar('T', bound=VoiceProtocol)
@@ -1141,6 +1142,7 @@ class Messageable:
     - :class:`~discord.Member`
     - :class:`~discord.ext.commands.Context`
     - :class:`~discord.Thread`
+    - :class:`~discord.ApplicationContext`
     """
 
     __slots__ = ()
@@ -1690,4 +1692,4 @@ async def connect(
 
 class Mentionable:
     # TODO: documentation, methods if needed
-    pass
+    pass

discord/app/context.py

@@ -24,19 +24,21 @@
 
 from typing import TYPE_CHECKING, Optional, Union
 
+import discord.abc
+
 if TYPE_CHECKING:
     import discord
+    from discord.state import ConnectionState
 
 from ..guild import Guild
 from ..interactions import Interaction, InteractionResponse
 from ..member import Member
 from ..message import Message
 from ..user import User
 from ..utils import cached_property
-from ..context_managers import Typing
 
 
-class ApplicationContext:
+class ApplicationContext(discord.abc.Messageable):
     """Represents a Discord interaction context.
 
     This class is not created manually and is instead passed to application
@@ -58,6 +60,10 @@ def __init__(self, bot: "discord.Bot", interaction: Interaction):
         self.bot = bot
         self.interaction = interaction
         self.command = None
+        self._state: ConnectionState = self.interaction._state
+
+    async def _get_channel(self) -> discord.abc.Messageable:
+        return self.channel
 
     @cached_property
     def channel(self):
@@ -87,9 +93,6 @@ def user(self) -> Optional[Union[Member, User]]:
     def voice_client(self):
         return self.guild.voice_client
 
-    def typing(self):
-        return Typing(self.channel)
-
     @cached_property
     def response(self) -> InteractionResponse:
         return self.interaction.response
@@ -100,11 +103,6 @@ def response(self) -> InteractionResponse:
     def respond(self):
         return self.followup.send if self.response.is_done() else self.interaction.response.send_message
 
-    @property
-    def send(self):
-        """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
     def defer(self):
         return self.interaction.response.defer