Merge pull request #385 from Pycord-Development/autocomplete

Merge autocomplete into master

Author: Lulalaby

discord/commands/commands.py

@@ -36,7 +36,7 @@
 from ..member import Member
 from ..user import User
 from ..message import Message
-from .context import ApplicationContext
+from .context import ApplicationContext, AutocompleteContext
 from ..utils import find, get_or_fetch, async_all
 from ..errors import ValidationError, ClientException
 from .errors import ApplicationCommandError, CheckFailure, ApplicationCommandInvokeError
@@ -492,15 +492,22 @@ async def _invoke(self, ctx: ApplicationContext) -> None:
             await self.callback(ctx, **kwargs)
 
     async def invoke_autocomplete_callback(self, interaction: Interaction):
+        values = { i.name: i.default for i in self.options }
+        
         for op in interaction.data.get("options", []):
             if op.get("focused", False):
                 option = find(lambda o: o.name == op["name"], self.options)
-                result = await option.autocomplete(interaction, op.get("value", None))
+                values.update({
+                    i["name"]:i["value"] 
+                    for i in interaction.data["options"]
+                })
+                ctx = AutocompleteContext(interaction, command=self, focused=option, value=op.get("value"), options=values)
+                result = await option.autocomplete(ctx)
                 choices = [
                     o if isinstance(o, OptionChoice) else OptionChoice(o)
                     for o in result
                 ]
-                await interaction.response.send_autocomplete_result(choices=choices)
+                return await interaction.response.send_autocomplete_result(choices=choices)
 
     def qualified_name(self):
         return self.name

discord/commands/context.py

@@ -32,7 +32,7 @@
     import discord
     from discord.state import ConnectionState
 
-    from .commands import ApplicationCommand
+    from .commands import ApplicationCommand, Option
     from ..cog import Cog
 
 from ..guild import Guild
@@ -142,3 +142,34 @@ def cog(self) -> Optional[Cog]:
             return None
 
         return self.command.cog
+
+
+class AutocompleteContext:
+    """Represents context for a slash command's option autocomplete.
+
+    This class is not created manually and is instead passed to an Option's autocomplete callback.
+
+    .. versionadded:: 2.0
+
+    Attributes
+    -----------
+    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`
+        The content of the focused option.
+    options :class:`.dict`
+        A name to value mapping of the options that the user has selected before this option.
+    """
+
+    __slots__ = ("interaction", "command", "focused", "value", "options")
+    
+    def __init__(self, interaction: Interaction, *, command: ApplicationCommand, focused: Option, value: str, options: dict) -> None:
+        self.interaction = interaction
+        self.command = command
+        self.focused = focused
+        self.value = value
+        self.options = options

discord/utils.py

@@ -74,18 +74,19 @@
 
 
 __all__ = (
-    "oauth_url",
-    "snowflake_time",
-    "time_snowflake",
-    "find",
-    "get",
-    "sleep_until",
-    "utcnow",
-    "remove_markdown",
-    "escape_markdown",
-    "escape_mentions",
-    "as_chunks",
-    "format_dt",
+    'oauth_url',
+    'snowflake_time',
+    'time_snowflake',
+    'find',
+    'get',
+    'sleep_until',
+    'utcnow',
+    'remove_markdown',
+    'escape_markdown',
+    'escape_mentions',
+    'as_chunks',
+    'format_dt',
+    'basic_autocomplete',
     "generate_snowflake",
 )
 
@@ -130,6 +131,7 @@ def __get__(self, instance, owner):
     from .abc import Snowflake
     from .invite import Invite
     from .template import Template
+    from .commands.context import AutocompleteContext
     from .interactions import Interaction
 
     class _RequestLike(Protocol):
@@ -1034,7 +1036,7 @@ def format_dt(dt: datetime.datetime, /, style: Optional[TimestampStyle] = None)
         return f'<t:{int(dt.timestamp())}>'
     return f'<t:{int(dt.timestamp())}:{style}>'
 
-
+    
 def generate_snowflake(dt: Optional[datetime.datetime] = None) -> int:
     """Returns a numeric snowflake pretending to be created at the given date but more accurate and random than time_snowflake.
     If dt is not passed, it makes one from the current time using utcnow.
@@ -1092,14 +1094,13 @@ async def autocomplete(interaction):
     Callable[[:class:`Interaction`, :class:`str`], Coroutine[List[:class:`str`]]]
         A wrapped callback for the autocomplete.
     """
-    async def autocomplete_callback(interaction: Interaction,
-                                    value: str) -> List[str]:
+    async def autocomplete_callback(ctx: AutocompleteContext) -> List[str]:
         _values = values  # since we reassign later, python considers it local if we don't do this
 
         if callable(_values):
             _values = _values(interaction)
         if asyncio.iscoroutine(_values):
             _values = await _values
-        return ([x for x in _values if x.lower().startswith(value.lower())])[:25]
+        return ([x for x in _values if x.lower().startswith(ctx.value.lower())])[:25]
 
     return autocomplete_callback