From 86883a3b915c9cbf8ba0950976ed1e2b9d7d7a3a Mon Sep 17 00:00:00 2001 From: wulan17 Date: Wed, 14 Dec 2022 12:35:47 +0700 Subject: [PATCH] Pyrogram: Cleanup Signed-off-by: wulan17 --- pyrogram/types/messages_and_media/message.py | 7 ++++--- pyrogram/utils.py | 8 ++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pyrogram/types/messages_and_media/message.py b/pyrogram/types/messages_and_media/message.py index b5cebb22..06dd9a24 100644 --- a/pyrogram/types/messages_and_media/message.py +++ b/pyrogram/types/messages_and_media/message.py @@ -891,9 +891,6 @@ class Message(Object, Update): ) if message.reply_to: - parsed_message.reply_to_message_id = message.reply_to.reply_to_msg_id - parsed_message.reply_to_top_message_id = message.reply_to.reply_to_top_id - if message.reply_to.forum_topic: if message.reply_to.reply_to_top_id: thread_id = message.reply_to.reply_to_top_id @@ -903,6 +900,10 @@ class Message(Object, Update): parsed_message.message_thread_id = thread_id if topics: parsed_message.topics = types.ForumTopic._parse(topics[thread_id]) + else: + msg = await client.get_messages(parsed_message.chat.id,message.id) + if getattr(msg, "topics"): + parsed_message.topics = msg.topics else: parsed_message.reply_to_message_id = message.reply_to.reply_to_msg_id parsed_message.reply_to_top_message_id = message.reply_to.reply_to_top_id diff --git a/pyrogram/utils.py b/pyrogram/utils.py index 272e6b7e..c4000b7c 100644 --- a/pyrogram/utils.py +++ b/pyrogram/utils.py @@ -130,8 +130,12 @@ async def parse_messages( reply_id = messages_with_replies.get(message.id, None) for reply in reply_messages: - if reply.id == reply_id and not reply.forum_topic_created: - message.reply_to_message = reply + if reply.id == reply_id: + #if reply.forum_topic_created: + # message.reply_to_message_id = None + #else: + if not reply.forum_topic_created: + message.reply_to_message = reply return types.List(parsed_messages)