Merge pull request #18 from botlabs-gg/discord_forwards_updated

Discord forwards updated
botlabs-gg · Nov 5, 2024 · 495105e · 495105e
2 parents 602be6f + be423d2
commit 495105e
Show file tree

Hide file tree

Showing 5 changed files with 247 additions and 16 deletions.
diff --git a/discord/abc.py b/discord/abc.py
@@ -1489,8 +1489,8 @@ 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
+            A reference to the :class:`~discord.Message` you are replying to or forwarding, this can be created using
+            :meth:`~discord.Message.to_reference` or passed directly as a :class:`~discord.Message`. 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``.
@@ -1577,9 +1577,20 @@ 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"
@@ -1613,7 +1624,7 @@ async def send(
                     embed=embed,
                     embeds=embeds,
                     nonce=nonce,
-                    message_reference=reference,
+                    message_reference=_reference,
                     stickers=stickers,
                     components=components,
                     flags=flags,
@@ -1639,7 +1650,7 @@ async def send(
                     embeds=embeds,
                     nonce=nonce,
                     allowed_mentions=allowed_mentions,
-                    message_reference=reference,
+                    message_reference=_reference,
                     stickers=stickers,
                     components=components,
                     flags=flags,
@@ -1656,7 +1667,7 @@ async def send(
                 embeds=embeds,
                 nonce=nonce,
                 allowed_mentions=allowed_mentions,
-                message_reference=reference,
+                message_reference=_reference,
                 stickers=stickers,
                 components=components,
                 flags=flags,

diff --git a/discord/enums.py b/discord/enums.py
@@ -68,6 +68,7 @@
     "AutoModKeywordPresetType",
     "ApplicationRoleConnectionMetadataType",
     "ReactionType",
+    "MessageReferenceType",
 )
 
 
@@ -257,6 +258,7 @@ class MessageType(Enum):
     stage_raise_hand = 30
     stage_topic = 31
     guild_application_premium_subscription = 32
+    poll_result = 46
 
 
 class VoiceRegion(Enum):
@@ -952,6 +954,16 @@ class ReactionType(Enum):
     burst = 1
 
 
+
+class MessageReferenceType(Enum):
+    """The message reference's type"""
+
+    default = 0
+    forward = 1
+
+
+
+
 T = TypeVar("T")