Merge branch 'master' into master

Author: Lulalaby

discord/bot.py

@@ -64,6 +64,12 @@
 CoroFunc = Callable[..., Coroutine[Any, Any, Any]]
 CFT = TypeVar('CFT', bound=CoroFunc)
 
+__all__ = (
+    'ApplicationCommandMixin',
+    'Bot',
+    'AutoShardedBot',
+)
+
 class ApplicationCommandMixin:
     """A mixin that implements common functionality for classes that need
     application command compatibility.

discord/commands/commands.py

@@ -543,11 +543,15 @@ async def invoke_autocomplete_callback(self, interaction: Interaction):
                     for i in interaction.data["options"]
                 })
                 ctx = AutocompleteContext(interaction, command=self, focused=option, value=op.get("value"), options=values)
-                result = await option.autocomplete(ctx)
+                if asyncio.iscoroutinefunction(option.autocomplete):
+                    result = await option.autocomplete(ctx)
+                else:
+                    result = option.autocomplete(ctx)
+
                 choices = [
                     o if isinstance(o, OptionChoice) else OptionChoice(o)
                     for o in result
-                ]
+                ][:25]
                 return await interaction.response.send_autocomplete_result(choices=choices)
 
 
@@ -648,7 +652,7 @@ def __init__(
             not asyncio.iscoroutinefunction(self.autocomplete)
         ):
             raise TypeError("Autocomplete callback must be a coroutine.")
-
+            
     def to_dict(self) -> Dict:
         as_dict = {
             "name": self.name,

discord/commands/context.py

@@ -30,6 +30,7 @@
 
 if TYPE_CHECKING:
     import discord
+    from discord import Bot
     from discord.state import ConnectionState
 
     from .commands import ApplicationCommand, Option
@@ -65,7 +66,7 @@ class ApplicationContext(discord.abc.Messageable):
         The command that this context belongs to.
     """
 
-    def __init__(self, bot: "discord.Bot", interaction: Interaction):
+    def __init__(self, bot: Bot, interaction: Interaction):
         self.bot = bot
         self.interaction = interaction
         self.command: ApplicationCommand = None  # type: ignore
@@ -174,3 +175,11 @@ def __init__(self, interaction: Interaction, *, command: ApplicationCommand, foc
         self.focused = focused
         self.value = value
         self.options = options
+
+    @property
+    def cog(self) -> Optional[Cog]:
+        """Optional[:class:`.Cog`]: Returns the cog associated with this context's command. None if it does not exist."""
+        if self.command is None:
+            return None
+       
+        return self.command.cog