Merge branch 'master' into channel

Signed-off-by: Lumouille <[email protected]>

Author: Lumabots

CHANGELOG.md

@@ -49,6 +49,8 @@ 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`
@@ -99,16 +101,19 @@ 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)
 - Fixed parameters for channels And allow creating channels with None as default
-  reaction ([#2754])(https://github.com/Pycord-Development/pycord/pull/2754)
+  reaction 
+  ([#2754])(https://github.com/Pycord-Development/pycord/pull/2754)
 - Updated `valid_locales` to support `in` and `es-419`.
-  ([#2767])(https://github.com/Pycord-Development/pycord/pull/2767)
+  ([#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)
+  ([#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

@@ -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/channel.py

@@ -3443,6 +3443,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/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/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):