Merge branch 'master' into with-response

Signed-off-by: Ice Wolfy <[email protected]>

Author: Icebluewolf

.github/workflows/docs-localization-download.yml

@@ -40,7 +40,7 @@ jobs:
         working-directory: ./docs
       - name: "Crowdin"
         id: crowdin
-        uses: crowdin/github-action@v2.6.0
+        uses: crowdin/github-action@v2.7.0
         with:
           upload_sources: false
           upload_translations: false

.github/workflows/docs-localization-upload.yml

@@ -44,7 +44,7 @@ jobs:
           sphinx-intl update -p ./build/locales ${{ vars.SPHINX_LANGUAGES }}
         working-directory: ./docs
       - name: "Crowdin"
-        uses: crowdin/github-action@v2.6.0
+        uses: crowdin/github-action@v2.7.0
         with:
           upload_sources: true
           upload_translations: false

.pre-commit-config.yaml

@@ -26,7 +26,7 @@ repos:
       - id: pyupgrade
         exclude: \.(po|pot|yml|yaml)$
   - repo: https://github.com/PyCQA/isort
-    rev: 6.0.0
+    rev: 6.0.1
     hooks:
       - id: isort
         exclude: \.(po|pot|yml|yaml)$

CHANGELOG.md

@@ -49,8 +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))
-- Implemented `with_response` for interaction callbacks, adding
-  `Interaction.is_loading()` and `Interaction.is_ephemeral()`.
+- 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`
+  ([#2747](https://github.com/Pycord-Development/pycord/pull/2747))
+ - Implemented `with_response` for interaction callbacks, adding
+  `Interaction.callback.is_loading()` and `Interaction.callback.is_ephemeral()`.
   ([#2711](https://github.com/Pycord-Development/pycord/pull/2711))
 
 ### Fixed
@@ -98,6 +104,16 @@ 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`.
+  ([#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 `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))
 
 ### Changed
 

discord/abc.py

@@ -521,13 +521,17 @@ async def _edit(
                 )
             elif isinstance(default_reaction_emoji, str):
                 default_reaction_emoji = PartialEmoji.from_str(default_reaction_emoji)
+            elif default_reaction_emoji is None:
+                pass
             else:
                 raise InvalidArgument(
-                    "default_reaction_emoji must be of type: GuildEmoji | int | str"
+                    "default_reaction_emoji must be of type: GuildEmoji | int | str | None"
                 )
 
             options["default_reaction_emoji"] = (
                 default_reaction_emoji._to_forum_reaction_payload()
+                if default_reaction_emoji
+                else None
             )
 
         if options:
@@ -1493,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``.
 
@@ -1585,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"
@@ -1637,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,
@@ -1656,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/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/cog.py

@@ -151,17 +151,6 @@ def __new__(cls: type[CogMeta], *args: Any, **kwargs: Any) -> CogMeta:
 
         new_cls = super().__new__(cls, name, bases, attrs, **kwargs)
 
-        valid_commands = [
-            (c for i, c in j.__dict__.items() if isinstance(c, _BaseCommand))
-            for j in reversed(new_cls.__mro__)
-        ]
-        if any(isinstance(i, ApplicationCommand) for i in valid_commands) and any(
-            not isinstance(i, _BaseCommand) for i in valid_commands
-        ):
-            _filter = ApplicationCommand
-        else:
-            _filter = _BaseCommand
-
         for base in reversed(new_cls.__mro__):
             for elem, value in base.__dict__.items():
                 if elem in commands:
@@ -178,7 +167,7 @@ def __new__(cls: type[CogMeta], *args: Any, **kwargs: Any) -> CogMeta:
                 is_static_method = isinstance(value, staticmethod)
                 if is_static_method:
                     value = value.__func__
-                if isinstance(value, _filter):
+                if isinstance(value, _BaseCommand):
                     if is_static_method:
                         raise TypeError(
                             f"Command in method {base}.{elem!r} must not be"

discord/commands/core.py

@@ -2042,11 +2042,13 @@ def command(**kwargs):
 
 docs = "https://discord.com/developers/docs"
 valid_locales = [
+    "id",
     "da",
     "de",
     "en-GB",
     "en-US",
     "es-ES",
+    "es-419",
     "fr",
     "hr",
     "it",

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

@@ -232,7 +232,7 @@ def __getattribute__(self, name):
         except AttributeError as e:
             # if it doesn't exist, check this list, if the name of
             # the parameter is here
-            if name is self.__special_attrs__:
+            if name in self.__special_attrs__:
                 raise e
 
             # looks up the result in the variants.