Remove MessageStory type

KurimuzonAkuma · Dec 6, 2023 · da3e2c6 · da3e2c6
1 parent 7b199bd
commit da3e2c6
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 65 deletions.
diff --git a/compiler/docs/compiler.py b/compiler/docs/compiler.py
@@ -457,7 +457,6 @@ def get_title_list(s: str) -> list:
             WebAppData
             MessageReactions
             ChatReactions
-            MessageStory
             Story
             StoryViews
             MyBoost

diff --git a/pyrogram/types/messages_and_media/__init__.py b/pyrogram/types/messages_and_media/__init__.py
@@ -51,7 +51,6 @@
 from .web_app_data import WebAppData
 from .web_page import WebPage
 from .message_reactions import MessageReactions
-from .message_story import MessageStory
 from .my_boost import MyBoost
 
 __all__ = [
@@ -60,5 +59,5 @@
     "GeneralTopicUnhidden", "Game", "GiftCode", "Giveaway", "Location", "Message", "MessageEntity",
     "Photo", "Thumbnail", "StrippedThumbnail", "Story", "StoryViews", "Poll", "PollOption",
     "Sticker", "Venue", "Video", "VideoNote", "Voice", "WebPage", "Dice", "Reaction",
-    "WebAppData", "MessageReactions", "MessageStory", "MyBoost"
+    "WebAppData", "MessageReactions", "MyBoost"
 ]
diff --git a/pyrogram/types/messages_and_media/message.py b/pyrogram/types/messages_and_media/message.py
@@ -201,7 +201,7 @@ class Message(Object, Update):
         giveaway (:obj:`~pyrogram.types.Giveaway`, *optional*):
             Message is a giveaway, information about the giveaway.
 
-        story (:obj:`~pyrogram.types.MessageStory`, *optional*):
+        story (:obj:`~pyrogram.types.Story`, *optional*):
             Message is a story, information about the story.
 
         video (:obj:`~pyrogram.types.Video`, *optional*):
@@ -415,7 +415,7 @@ def __init__(
         animation: "types.Animation" = None,
         game: "types.Game" = None,
         giveaway: "types.Giveaway" = None,
-        story: "types.MessageStory" = None,
+        story: "types.Story" = None,
         video: "types.Video" = None,
         voice: "types.Voice" = None,
         video_note: "types.VideoNote" = None,
@@ -867,7 +867,28 @@ async def _parse(
                     giveaway = types.Giveaway._parse(client, media, chats)
                     media_type = enums.MessageMediaType.GIVEAWAY
                 elif isinstance(media, raw.types.MessageMediaStory):
-                    story = types.MessageStory._parse(client, media, users, chats)
+                    if not media.story:
+                        peer_id = utils.get_raw_peer_id(media.peer)
+
+                        if isinstance(media.peer, raw.types.PeerUser):
+                            forward_from_chat = types.Chat._parse_user_chat(client, users[peer_id])
+                        else:
+                            forward_from_chat = types.Chat._parse_channel_chat(client, chats[peer_id])
+
+                        forward_from_user = types.User._parse(client, users[peer_id])
+                        forward_sender_chat = types.Chat._parse_channel_chat(client, chats[peer_id]) if not forward_from_user else None
+                        forward_from_chat = forward_sender_chat if not forward_from_user else types.Chat._parse_user_chat(client, users[peer_id])
+
+                        story = types.Story(
+                            client=client,
+                            id=media.id,
+                            from_user=forward_from_user,
+                            sender_chat=forward_sender_chat,
+                            chat=forward_from_chat
+                        )
+                    else:
+                        await types.Story._parse(client, media.story, users, chats, media.peer)
+
                     media_type = enums.MessageMediaType.STORY
                 elif isinstance(media, raw.types.MessageMediaDocument):
                     doc = media.document

diff --git a/pyrogram/types/messages_and_media/message_story.py b/pyrogram/types/messages_and_media/message_story.py