Merge branch 'Pycord-Development:master' into master

Author: plun1331

.pre-commit-config.yaml

@@ -24,11 +24,11 @@ repos:
       - id: pyupgrade
         args: [--py38-plus]
   - repo: https://github.com/PyCQA/isort
-    rev: 5.13.0
+    rev: 5.13.2
     hooks:
       - id: isort
   - repo: https://github.com/psf/black
-    rev: 23.11.0
+    rev: 23.12.1
     hooks:
       - id: black
         args: [--safe, --quiet]
@@ -77,7 +77,7 @@ repos:
   #      - id: mypy
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v4.0.0-alpha.4
+    rev: v4.0.0-alpha.8
     hooks:
       - id: prettier
         args: [--prose-wrap=always, --print-width=88]

CHANGELOG.md

@@ -82,6 +82,8 @@ These changes are available on the `master` branch, but have not yet been releas
 - Added `default_reaction_emoji` parameter to `Guild.create_forum_channel()` and
   `ForumChannel.edit()` methods.
   ([#2178](https://github.com/Pycord-Development/pycord/pull/2178))
+- Added `applied_tags` parameter to `Webhook.send()` method.
+  ([#2322](https://github.com/Pycord-Development/pycord/pull/2322))
 
 ### Changed
 
@@ -113,6 +115,8 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2099](https://github.com/Pycord-Development/pycord/pull/2099))
 - Changed the support from `orjson` to `msgspec` in the codebase.
   ([#2170](https://github.com/Pycord-Development/pycord/pull/2170))
+- `BridgeOption` must now be used for arguments in bridge commands.
+  ([#2252](https://github.com/Pycord-Development/pycord/pull/2252))
 
 ### Removed
 
@@ -207,6 +211,12 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2301](https://github.com/Pycord-Development/pycord/pull/2301))
 - Fixed `AttributeError` caused by `command.cog` being `MISSING`.
   ([#2303](https://github.com/Pycord-Development/pycord/issues/2303))
+- Fixed `self.use_default_buttons` being assumed truthy by `Paginator.update`.
+  ([#2319](https://github.com/Pycord-Development/pycord/pull/2319))
+- Fixed `AttributeError` when comparing application commands with non-command objects.
+  ([#2299](https://github.com/Pycord-Development/pycord/issues/2299))
+- Fixed `AttributeError` when copying groups on startup.
+  ([#2331](https://github.com/Pycord-Development/pycord/issues/2331))
 
 ## [2.4.1] - 2023-03-20
 

discord/bot.py

@@ -123,9 +123,6 @@ def add_application_command(self, command: ApplicationCommand) -> None:
         if isinstance(command, SlashCommand) and command.is_subcommand:
             raise TypeError("The provided command is a sub-command of group")
 
-        if command.cog is MISSING:
-            command._set_cog(None)
-
         if self._bot.debug_guilds and command.guild_ids is None:
             command.guild_ids = self._bot.debug_guilds
 

discord/commands/core.py

@@ -235,15 +235,10 @@ def __repr__(self) -> str:
         return f"<discord.commands.{self.__class__.__name__} name={self.name}>"
 
     def __eq__(self, other) -> bool:
-        if (
-            getattr(self, "id", None) is not None
-            and getattr(other, "id", None) is not None
-        ):
-            check = self.id == other.id
-        else:
-            check = self.name == other.name and self.guild_ids == other.guild_ids
         return (
-            isinstance(other, self.__class__) and self.parent == other.parent and check
+            isinstance(other, self.__class__)
+            and self.qualified_name == other.qualified_name
+            and self.guild_ids == other.guild_ids
         )
 
     async def __call__(self, ctx, *args, **kwargs):
@@ -694,6 +689,7 @@ def __init__(self, func: Callable, *args, **kwargs) -> None:
         self.attached_to_group: bool = False
 
         self.options: list[Option] = kwargs.get("options", [])
+        self._validate_parameters()
 
         try:
             checks = func.__commands_checks__
@@ -709,9 +705,9 @@ def __init__(self, func: Callable, *args, **kwargs) -> None:
     def _validate_parameters(self):
         params = self._get_signature_parameters()
         if kwop := self.options:
-            self.options: list[Option] = self._match_option_param_names(params, kwop)
+            self.options = self._match_option_param_names(params, kwop)
         else:
-            self.options: list[Option] = self._parse_options(params)
+            self.options = self._parse_options(params)
 
     def _check_required_params(self, params):
         params = iter(params.items())
@@ -849,9 +845,18 @@ def cog(self):
         return getattr(self, "_cog", None)
 
     @cog.setter
-    def cog(self, val):
-        self._cog = val
-        self._validate_parameters()
+    def cog(self, value):
+        old_cog = self.cog
+        self._cog = value
+
+        if (
+            old_cog is None
+            and value is not None
+            or value is None
+            and old_cog is not None
+        ):
+            params = self._get_signature_parameters()
+            self.options = self._parse_options(params)
 
     @property
     def is_subcommand(self) -> bool:
@@ -1439,7 +1444,7 @@ def _update_copy(self, kwargs: dict[str, Any]):
         if kwargs:
             kw = kwargs.copy()
             kw.update(self.__original_kwargs__)
-            copy = self.__class__(self.callback, **kw)
+            copy = self.__class__(**kw)
             return self._ensure_assignment_on_copy(copy)
         else:
             return self.copy()

discord/ext/bridge/core.py

@@ -66,6 +66,7 @@
     "BridgeSlashCommand",
     "BridgeExtGroup",
     "BridgeSlashGroup",
+    "BridgeOption",
     "map_to",
     "guild_only",
     "has_permissions",
@@ -591,6 +592,10 @@ async def convert(self, ctx, arg: bool):
 
 
 class BridgeOption(Option, Converter):
+    """A subclass of :class:`discord.Option` which represents a selectable slash
+    command option and a prefixed command argument for bridge commands.
+    """
+
     async def convert(self, ctx, argument: str) -> Any:
         try:
             if self.converter is not None:
@@ -621,7 +626,3 @@ async def convert(self, ctx, argument: str) -> Any:
             return converted
         except ValueError as exc:
             raise BadArgument() from exc
-
-
-discord.commands.options.Option = BridgeOption
-discord.Option = BridgeOption

discord/ext/pages/pagination.py

@@ -560,18 +560,20 @@ async def update(
         self.loop_pages = loop_pages if loop_pages is not None else self.loop_pages
         self.custom_view: discord.ui.View = None if custom_view is None else custom_view
         self.timeout: float = timeout if timeout is not None else self.timeout
+        self.custom_buttons = (
+            custom_buttons if custom_buttons is not None else self.custom_buttons
+        )
         self.trigger_on_display = (
             trigger_on_display
             if trigger_on_display is not None
             else self.trigger_on_display
         )
-        if custom_buttons and not self.use_default_buttons:
-            self.buttons = {}
-            for button in custom_buttons:
-                self.add_button(button)
-        else:
-            self.buttons = {}
+        self.buttons = {}
+        if self.use_default_buttons:
             self.add_default_buttons()
+        elif self.custom_buttons:
+            for button in self.custom_buttons:
+                self.add_button(button)
 
         await self.goto_page(self.current_page, interaction=interaction)
 
@@ -679,9 +681,12 @@ async def goto_page(
         self.update_buttons()
         self.current_page = page_number
         if self.show_indicator:
-            self.buttons["page_indicator"][
-                "object"
-            ].label = f"{self.current_page + 1}/{self.page_count + 1}"
+            try:
+                self.buttons["page_indicator"][
+                    "object"
+                ].label = f"{self.current_page + 1}/{self.page_count + 1}"
+            except KeyError:
+                pass
 
         page = self.pages[page_number]
         page = self.get_page_content(page)
@@ -843,9 +848,12 @@ def update_buttons(self) -> dict:
                     button["object"].label = button["label"]
         self.clear_items()
         if self.show_indicator:
-            self.buttons["page_indicator"][
-                "object"
-            ].label = f"{self.current_page + 1}/{self.page_count + 1}"
+            try:
+                self.buttons["page_indicator"][
+                    "object"
+                ].label = f"{self.current_page + 1}/{self.page_count + 1}"
+            except KeyError:
+                pass
         for key, button in self.buttons.items():
             if key != "page_indicator":
                 if button["hidden"]:

discord/webhook/async_.py

@@ -621,6 +621,7 @@ def handle_message_parameters(
     embed: Embed | None = MISSING,
     embeds: list[Embed] = MISSING,
     view: View | None = MISSING,
+    applied_tags: list[Snowflake] = MISSING,
     allowed_mentions: AllowedMentions | None = MISSING,
     previous_allowed_mentions: AllowedMentions | None = None,
     suppress: bool = False,
@@ -654,6 +655,9 @@ def handle_message_parameters(
     flags = MessageFlags(suppress_embeds=suppress, ephemeral=ephemeral)
     payload["flags"] = flags.value
 
+    if applied_tags is not MISSING:
+        payload["applied_tags"] = applied_tags
+
     if allowed_mentions:
         if previous_allowed_mentions is not None:
             payload["allowed_mentions"] = previous_allowed_mentions.merge(
@@ -1566,6 +1570,7 @@ async def send(
         view: View = MISSING,
         thread: Snowflake = MISSING,
         thread_name: str | None = None,
+        applied_tags: list[Snowflake] = MISSING,
         wait: Literal[True],
         delete_after: float = None,
     ) -> WebhookMessage:
@@ -1588,6 +1593,7 @@ async def send(
         view: View = MISSING,
         thread: Snowflake = MISSING,
         thread_name: str | None = None,
+        applied_tags: list[Snowflake] = MISSING,
         wait: Literal[False] = ...,
         delete_after: float = None,
     ) -> None:
@@ -1609,6 +1615,7 @@ async def send(
         view: View = MISSING,
         thread: Snowflake = MISSING,
         thread_name: str | None = None,
+        applied_tags: list[Snowflake] = MISSING,
         wait: bool = False,
         delete_after: float = None,
     ) -> WebhookMessage | None:
@@ -1680,6 +1687,10 @@ async def send(
             The name of the thread to create. Only works for forum channels.
 
             .. versionadded:: 2.0
+        applied_tags: List[:class:`Snowflake`]
+            A list of tags to apply to the message. Only works for threads.
+
+            .. versionadded:: 2.5
         delete_after: :class:`float`
             If provided, the number of seconds to wait in the background
             before deleting the message we just sent.
@@ -1704,7 +1715,8 @@ async def send(
         InvalidArgument
             Either there was no token associated with this webhook, ``ephemeral`` was passed
             with the improper webhook type, there was no state attached with this webhook when
-            giving it a view, or you specified both ``thread_name`` and ``thread``.
+            giving it a view, you specified both ``thread_name`` and ``thread``, or ``applied_tags``
+            was passed with neither ``thread_name`` nor ``thread`` specified.
         """
 
         if self.token is None:
@@ -1721,6 +1733,9 @@ async def send(
         if thread and thread_name:
             raise InvalidArgument("You cannot specify both a thread and thread_name")
 
+        if applied_tags and not (thread or thread_name):
+            raise InvalidArgument("You cannot specify applied_tags without a thread")
+
         application_webhook = self.type is WebhookType.application
         if ephemeral and not application_webhook:
             raise InvalidArgument(
@@ -1749,6 +1764,7 @@ async def send(
             embeds=embeds,
             ephemeral=ephemeral,
             view=view,
+            applied_tags=applied_tags,
             allowed_mentions=allowed_mentions,
             previous_allowed_mentions=previous_mentions,
         )

docs/ext/bridge/api.rst

@@ -157,3 +157,14 @@ BridgeContext Subclasses
 .. data:: discord.ext.bridge.Context
 
     Alias of :data:`typing.Union` [ :class:`.BridgeExtContext`, :class:`.BridgeApplicationContext` ] for typing convenience.
+
+Option
+------
+
+BridgeOption
+~~~~~~~~~~~~
+
+.. attributetable:: discord.ext.bridge.BridgeOption
+
+.. autoclass:: discord.ext.bridge.BridgeOption
+    :members:

requirements/_.txt

@@ -1,2 +1,2 @@
-aiohttp>=3.6.0,<3.10.0
+aiohttp>=3.6.0,<4.0
 typing_extensions>=4,<5; python_version < "3.11"

requirements/dev.txt

@@ -7,5 +7,5 @@ mypy~=1.8.0
 coverage~=7.4
 pre-commit==3.5.0
 codespell==2.2.6
-bandit==1.7.6
+bandit==1.7.7
 flake8==7.0.0