Merge remote-tracking branch 'pycord/master' into fix/flags-3.11+

Author: Paillat-dev

.pre-commit-config.yaml

@@ -21,7 +21,7 @@ repos:
   #          - --remove-duplicate-keys
   #          - --remove-unused-variables
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.1
+    rev: v3.20.0
     hooks:
       - id: pyupgrade
         exclude: \.(po|pot|yml|yaml)$

CHANGELOG.md

@@ -49,10 +49,14 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2579](https://github.com/Pycord-Development/pycord/pull/2579))
 - Added new `Subscription` object and related methods/events.
   ([#2564](https://github.com/Pycord-Development/pycord/pull/2564))
+- Added `Message.forward_to`, `Message.snapshots`, and other related attributes.
+  ([#2598](https://github.com/Pycord-Development/pycord/pull/2598))
 - Added the ability to change the API's base URL with `Route.API_BASE_URL`.
   ([#2714](https://github.com/Pycord-Development/pycord/pull/2714))
-- Added the ability to pass a `datetime.time` object to `format_dt`
+- Added the ability to pass a `datetime.time` object to `format_dt`.
   ([#2747](https://github.com/Pycord-Development/pycord/pull/2747))
+- Added `discord.Interaction.created_at`.
+  ([#2801](https://github.com/Pycord-Development/pycord/pull/2801))
 
 ### Fixed
 
@@ -99,14 +103,22 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2564](https://github.com/Pycord-Development/pycord/pull/2564))
 - Fixed `Subscription.renewal_sku_ids` not accepting `None` from the received payload.
   ([#2709](https://github.com/Pycord-Development/pycord/pull/2709))
-- Fixed `ForumChannel.edit` allowing `default_reaction_emoji` to be `None`
+- Fixed `ForumChannel.edit` allowing `default_reaction_emoji` to be `None`.
   ([#2739](https://github.com/Pycord-Development/pycord/pull/2739))
 - Fixed missing `None` type hints in `Select.__init__`.
   ([#2746])(https://github.com/Pycord-Development/pycord/pull/2746)
-- Updated `valid_locales` to support `in` and `es-419`.
-  ([#2767])(https://github.com/Pycord-Development/pycord/pull/2767)
 - Fixed `TypeError` when using `Flag` with Python 3.11+.
   ([#2759])(https://github.com/Pycord-Development/pycord/pull/2759)
+- Fixed `TypeError` when specifying `thread_name` in `Webhook.send`.
+  ([#2761])(https://github.com/Pycord-Development/pycord/pull/2761)
+- Updated `valid_locales` to support `in` and `es-419`.
+  ([#2767](https://github.com/Pycord-Development/pycord/pull/2767))
+- Fixed `Webhook.edit` not working with `attachments=[]`.
+  ([#2779](https://github.com/Pycord-Development/pycord/pull/2779))
+- Fixed GIF-based `Sticker` returning the wrong `url`.
+  ([#2781](https://github.com/Pycord-Development/pycord/pull/2781))
+- Fixed `VoiceClient` crashing randomly while receiving audio
+  ([#2800](https://github.com/Pycord-Development/pycord/pull/2800))
 
 ### Changed
 
@@ -124,6 +136,8 @@ These changes are available on the `master` branch, but have not yet been releas
   changes. ([#2671](https://github.com/Pycord-Development/pycord/pull/2671))
 - `Entitlement.ends_at` can now be `None`.
   ([#2564](https://github.com/Pycord-Development/pycord/pull/2564))
+- Changed the default value of `ApplicationCommand.nsfw` to `False`.
+  ([#2797](https://github.com/Pycord-Development/pycord/pull/2797))
 
 ### Deprecated
 
@@ -134,6 +148,11 @@ These changes are available on the `master` branch, but have not yet been releas
 - Deprecated `Interaction.cached_channel` in favor of `Interaction.channel`.
   ([#2658](https://github.com/Pycord-Development/pycord/pull/2658))
 
+### Removed
+
+- Removed deprecated support for `Option` in `BridgeCommand`. Use `BridgeOption`
+  instead. ([#2731])(https://github.com/Pycord-Development/pycord/pull/2731))
+
 ## [2.6.1] - 2024-09-15
 
 ### Fixed

discord/abc.py

@@ -1497,9 +1497,9 @@ async def send(
             .. versionadded:: 1.4
 
         reference: Union[:class:`~discord.Message`, :class:`~discord.MessageReference`, :class:`~discord.PartialMessage`]
-            A reference to the :class:`~discord.Message` to which you are replying, this can be created using
-            :meth:`~discord.Message.to_reference` or passed directly as a :class:`~discord.Message`. You can control
-            whether this mentions the author of the referenced message using the
+            A reference to the :class:`~discord.Message` being replied to or forwarded. This can be created using
+            :meth:`~discord.Message.to_reference`.
+            When replying, you can control whether this mentions the author of the referenced message using the
             :attr:`~discord.AllowedMentions.replied_user` attribute of ``allowed_mentions`` or by
             setting ``mention_author``.
 
@@ -1589,9 +1589,19 @@ async def send(
             allowed_mentions = allowed_mentions or AllowedMentions().to_dict()
             allowed_mentions["replied_user"] = bool(mention_author)
 
+        _reference = None
         if reference is not None:
             try:
-                reference = reference.to_message_reference_dict()
+                _reference = reference.to_message_reference_dict()
+                from .message import MessageReference
+
+                if not isinstance(reference, MessageReference):
+                    utils.warn_deprecated(
+                        f"Passing {type(reference).__name__} to reference",
+                        "MessageReference",
+                        "2.7",
+                        "3.0",
+                    )
             except AttributeError:
                 raise InvalidArgument(
                     "reference parameter must be Message, MessageReference, or"
@@ -1641,7 +1651,7 @@ async def send(
                     nonce=nonce,
                     enforce_nonce=enforce_nonce,
                     allowed_mentions=allowed_mentions,
-                    message_reference=reference,
+                    message_reference=_reference,
                     stickers=stickers,
                     components=components,
                     flags=flags.value,
@@ -1660,7 +1670,7 @@ async def send(
                 nonce=nonce,
                 enforce_nonce=enforce_nonce,
                 allowed_mentions=allowed_mentions,
-                message_reference=reference,
+                message_reference=_reference,
                 stickers=stickers,
                 components=components,
                 flags=flags.value,

discord/bot.py

@@ -328,12 +328,17 @@ def _check_command(cmd: ApplicationCommand, match: Mapping[str, Any]) -> bool:
                             ]:
                                 # We have a difference
                                 return True
-                    elif getattr(cmd, check, None) != match.get(check):
-                        # We have a difference
-                        if (
+                    elif (attr := getattr(cmd, check, None)) != (
+                        found := match.get(check)
+                    ):
+                        # We might have a difference
+                        if "localizations" in check and bool(attr) == bool(found):
+                            # unlike other attrs, localizations are MISSING by default
+                            continue
+                        elif (
                             check == "default_permission"
-                            and getattr(cmd, check) is True
-                            and match.get(check) is None
+                            and attr is True
+                            and found is None
                         ):
                             # This is a special case
                             # TODO: Remove for perms v2

discord/channel.py

@@ -3412,6 +3412,9 @@ def get_partial_message(self, message_id: int, /) -> PartialMessage:
 
         return PartialMessage(channel=self, id=message_id)
 
+    def __repr__(self) -> str:
+        return f"<PartialMessageable id={self.id} type={self.type!r}>"
+
 
 def _guild_channel_factory(channel_type: int):
     value = try_enum(ChannelType, channel_type)

discord/commands/core.py

@@ -233,7 +233,7 @@ def __init__(self, func: Callable, **kwargs) -> None:
             "__default_member_permissions__",
             kwargs.get("default_member_permissions", None),
         )
-        self.nsfw: bool | None = getattr(func, "__nsfw__", kwargs.get("nsfw", None))
+        self.nsfw: bool | None = getattr(func, "__nsfw__", kwargs.get("nsfw", False))
 
         integration_types = getattr(
             func, "__integration_types__", kwargs.get("integration_types", None)
@@ -1255,7 +1255,7 @@ def __init__(
         self.default_member_permissions: Permissions | None = kwargs.get(
             "default_member_permissions", None
         )
-        self.nsfw: bool | None = kwargs.get("nsfw", None)
+        self.nsfw: bool | None = kwargs.get("nsfw", False)
 
         integration_types = kwargs.get("integration_types", None)
         contexts = kwargs.get("contexts", None)

discord/enums.py

@@ -76,6 +76,8 @@
     "EntitlementOwnerType",
     "IntegrationType",
     "InteractionContextType",
+    "PollLayoutType",
+    "MessageReferenceType",
 )
 
 
@@ -266,6 +268,12 @@ class MessageType(Enum):
     stage_raise_hand = 30
     stage_topic = 31
     guild_application_premium_subscription = 32
+    guild_incident_alert_mode_enabled = 36
+    guild_incident_alert_mode_disabled = 37
+    guild_incident_report_raid = 38
+    guild_incident_report_false_alarm = 39
+    purchase_notification = 44
+    poll_result = 46
 
 
 class VoiceRegion(Enum):
@@ -1055,6 +1063,13 @@ class PollLayoutType(Enum):
     default = 1
 
 
+class MessageReferenceType(Enum):
+    """The type of the message reference object"""
+
+    default = 0
+    forward = 1
+
+
 class SubscriptionStatus(Enum):
     """The status of a subscription."""
 

discord/ext/bridge/core.py

@@ -98,26 +98,12 @@ class BridgeExtCommand(Command):
     def __init__(self, func, **kwargs):
         super().__init__(func, **kwargs)
 
-        # TODO: v2.7: Remove backwards support for Option in bridge commands.
-        for name, option in self.params.items():
+        for option in self.params.values():
             if isinstance(option.annotation, Option) and not isinstance(
                 option.annotation, BridgeOption
             ):
-                # Warn not to do this
-                warn_deprecated(
-                    "Using Option for bridge commands",
-                    "BridgeOption",
-                    "2.5",
-                    "2.7",
-                    reference="https://github.com/Pycord-Development/pycord/pull/2417",
-                    stacklevel=6,
-                )
-                # Override the convert method of the parameter's annotated Option.
-                # We can use the convert method from BridgeOption, and bind "self"
-                # using a manual invocation of the descriptor protocol.
-                # Definitely not a good approach, but gets the job done until removal.
-                self.params[name].annotation.convert = BridgeOption.convert.__get__(
-                    self.params[name].annotation
+                raise TypeError(
+                    f"{option.annotation.__class__.__name__} is not supported in bridge commands. Use BridgeOption instead."
                 )
 
     async def dispatch_error(self, ctx: BridgeExtContext, error: Exception) -> None:

discord/ext/commands/context.py

@@ -403,3 +403,9 @@ async def send_help(self, *args: Any) -> Any:
     @discord.utils.copy_doc(Message.reply)
     async def reply(self, content: str | None = None, **kwargs: Any) -> Message:
         return await self.message.reply(content, **kwargs)
+
+    @discord.utils.copy_doc(Message.forward_to)
+    async def forward_to(
+        self, channel: discord.abc.Messageable, **kwargs: Any
+    ) -> Message:
+        return await self.message.forward_to(channel, **kwargs)

discord/flags.py

@@ -411,6 +411,14 @@ def is_voice_message(self):
         """
         return 8192
 
+    @flag_value
+    def has_snapshot(self):
+        """:class:`bool`: Returns ``True`` if this message has a snapshot from message forwarding.
+
+        .. versionadded:: 2.7
+        """
+        return 1 << 14
+
 
 @fill_with_flags()
 class PublicUserFlags(BaseFlags):