Merge branch 'master' into dependabot/pip/mypy-approx-eq-1.10.1

CHANGELOG.md

@@ -28,6 +28,8 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2408](https://github.com/Pycord-Development/pycord/pull/2408))
 - Added `stacklevel` param to `utils.warn_deprecated` and `utils.deprecated`.
   ([#2450](https://github.com/Pycord-Development/pycord/pull/2450))
+- Added support for user-installable applications.
+  ([#2409](https://github.com/Pycord-Development/pycord/pull/2409)
 
 ### Fixed
 
@@ -71,6 +73,11 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2417](https://github.com/Pycord-Development/pycord/pull/2417))
 - `Guild.query_members` now accepts `limit=None` to retrieve all members.
   ([#2419](https://github.com/Pycord-Development/pycord/pull/2419))
+- `ApplicationCommand.guild_only` is now deprecated in favor of
+  `ApplicationCommand.contexts`.
+  ([#2409](https://github.com/Pycord-Development/pycord/pull/2409))
+- `Message.interaction` is now deprecated in favor of `Message.interaction_metadata`.
+  ([#2409](https://github.com/Pycord-Development/pycord/pull/2409)
 
 ### Removed
 

discord/bot.py

@@ -48,7 +48,7 @@
     UserCommand,
     command,
 )
-from .enums import InteractionType
+from .enums import IntegrationType, InteractionContextType, InteractionType
 from .errors import CheckFailure, DiscordException
 from .interactions import Interaction
 from .shard import AutoShardedClient
@@ -125,6 +125,13 @@ def add_application_command(self, command: ApplicationCommand) -> None:
 
         if self._bot.debug_guilds and command.guild_ids is None:
             command.guild_ids = self._bot.debug_guilds
+        if self._bot.default_command_contexts and command.contexts is None:
+            command.contexts = self._bot.default_command_contexts
+        if (
+            self._bot.default_command_integration_types
+            and command.integration_types is None
+        ):
+            command.integration_types = self._bot.default_command_integration_types
 
         for cmd in self.pending_application_commands:
             if cmd == command:
@@ -271,7 +278,6 @@ def _check_command(cmd: ApplicationCommand, match: Mapping[str, Any]) -> bool:
             else:
                 as_dict = cmd.to_dict()
                 to_check = {
-                    "dm_permission": None,
                     "nsfw": None,
                     "default_member_permissions": None,
                     "name": None,
@@ -287,6 +293,8 @@ def _check_command(cmd: ApplicationCommand, match: Mapping[str, Any]) -> bool:
                         "name_localizations",
                         "description_localizations",
                     ],
+                    "contexts": None,
+                    "integration_types": None,
                 }
                 for check, value in to_check.items():
                     if type(to_check[check]) == list:
@@ -1157,6 +1165,21 @@ def __init__(self, description=None, *args, **options):
         self.auto_sync_commands = options.get("auto_sync_commands", True)
 
         self.debug_guilds = options.pop("debug_guilds", None)
+        self.default_command_contexts = options.pop(
+            "default_command_contexts",
+            {
+                InteractionContextType.guild,
+                InteractionContextType.bot_dm,
+                InteractionContextType.private_channel,
+            },
+        )
+
+        self.default_command_integration_types = options.pop(
+            "default_command_integration_types",
+            {
+                IntegrationType.guild_install,
+            },
+        )
 
         if self.owner_id and self.owner_ids:
             raise TypeError("Both owner_id and owner_ids are set.")
@@ -1167,6 +1190,20 @@ def __init__(self, description=None, *args, **options):
             raise TypeError(
                 f"owner_ids must be a collection not {self.owner_ids.__class__!r}"
             )
+        if not isinstance(self.default_command_contexts, collections.abc.Collection):
+            raise TypeError(
+                f"default_command_contexts must be a collection not {self.default_command_contexts.__class__!r}"
+            )
+        if not isinstance(
+            self.default_command_integration_types, collections.abc.Collection
+        ):
+            raise TypeError(
+                f"default_command_integration_types must be a collection not {self.default_command_integration_types.__class__!r}"
+            )
+        self.default_command_contexts = set(self.default_command_contexts)
+        self.default_command_integration_types = set(
+            self.default_command_integration_types
+        )
 
         self._checks = []
         self._check_once = []
@@ -1447,6 +1484,17 @@ class Bot(BotBase, Client):
         :attr:`.process_application_commands` if the command is not found. Defaults to ``True``.
 
         .. versionadded:: 2.0
+    default_command_contexts: Collection[:class:`InteractionContextType`]
+        The default context types that the bot will use for commands.
+        Defaults to a set containing :attr:`InteractionContextType.guild`, :attr:`InteractionContextType.bot_dm`, and
+        :attr:`InteractionContextType.private_channel`.
+
+        .. versionadded:: 2.6
+    default_command_integration_types: Collection[:class:`IntegrationType`]]
+        The default integration types that the bot will use for commands.
+        Defaults to a set containing :attr:`IntegrationType.guild_install`.
+
+        .. versionadded:: 2.6
     """
 
     @property