yasirarism/pyrofork
1
0
Fork 0
mirror of https://github.com/Mayuri-Chan/pyrofork.git synced 2025-12-29 12:04:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pyrofork: types: message: Fix cross chat reply parsing

Browse source 
Signed-off-by: wulan17 <wulan17@nusantararom.org>
This commit is contained in:
Aliwoto 2023-11-04 15:51:34 +03:00 committed by wulan17
parent 0560949ed8
commit b4cb8ff17c
No known key found for this signature in database
GPG key ID: 318CD6CD3A6AC0A5
2 changed files with 55 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pyrogram/types/messages_and_media/message.py
View file

@ -1048,15 +1048,22 @@ class Message(Object, Update):
if replies: if replies:
if parsed_message.reply_to_message_id: if parsed_message.reply_to_message_id:
try: is_cross_chat = getattr(message.reply_to, "reply_to_peer_id", None) and getattr(message.reply_to.reply_to_peer_id, "channel_id", None)
if is_cross_chat:
key = (utils.get_channel_id(message.reply_to.reply_to_peer_id.channel_id), message.reply_to.reply_to_msg_id)
reply_to_params = {"chat_id": key[0], 'message_ids': key[1]}
else:
key = (parsed_message.chat.id, parsed_message.reply_to_message_id) key = (parsed_message.chat.id, parsed_message.reply_to_message_id)
reply_to_params = {'chat_id': key[0], 'reply_to_message_ids': message.id}
try:
reply_to_message = client.message_cache[key] reply_to_message = client.message_cache[key]
if not reply_to_message: if not reply_to_message:
reply_to_message = await client.get_messages( reply_to_message = await client.get_messages(
parsed_message.chat.id, replies=replies - 1,
reply_to_message_ids=message.id, **reply_to_params
replies=replies - 1
) )
if reply_to_message and not reply_to_message.forum_topic_created: if reply_to_message and not reply_to_message.forum_topic_created:
parsed_message.reply_to_message = reply_to_message parsed_message.reply_to_message = reply_to_message

54
pyrogram/utils.py
View file

@ -116,7 +116,7 @@ async def parse_messages(
if replies: if replies:
messages_with_replies = { messages_with_replies = {
i.id: i.reply_to.reply_to_msg_id i.id: i.reply_to
for i in messages.messages for i in messages.messages
if not isinstance(i, raw.types.MessageEmpty) and i.reply_to and isinstance(i.reply_to, raw.types.MessageReplyHeader) if not isinstance(i, raw.types.MessageEmpty) and i.reply_to and isinstance(i.reply_to, raw.types.MessageReplyHeader)
} }
@ -131,27 +131,61 @@ async def parse_messages(
# We need a chat id, but some messages might be empty (no chat attribute available) # We need a chat id, but some messages might be empty (no chat attribute available)
# Scan until we find a message with a chat available (there must be one, because we are fetching replies) # Scan until we find a message with a chat available (there must be one, because we are fetching replies)
for m in parsed_messages: for m in parsed_messages:
if not isinstance(m, types.Message):
continue
if m.chat: if m.chat:
chat_id = m.chat.id chat_id = m.chat.id
break break
else: else:
chat_id = 0 chat_id = 0
reply_messages = await client.get_messages( is_all_within_chat = not any(
chat_id, value.reply_to_peer_id
reply_to_message_ids=messages_with_replies.keys(), for value in messages_with_replies.values()
replies=replies - 1
) )
reply_messages: List[pyrogram.types.Message] = []
if is_all_within_chat:
# fast path: fetch all messages within the same chat
reply_messages = await client.get_messages(
chat_id,
reply_to_message_ids=messages_with_replies.keys(),
replies=replies - 1
)
else:
# slow path: fetch all messages individually
for target_reply_to in messages_with_replies.values():
to_be_added_msg = None
the_chat_id = chat_id
if target_reply_to.reply_to_peer_id:
the_chat_id = get_channel_id(target_reply_to.reply_to_peer_id.channel_id)
to_be_added_msg = await client.get_messages(
chat_id=the_chat_id,
message_ids=target_reply_to.reply_to_msg_id,
replies=replies - 1
)
if isinstance(to_be_added_msg, list):
for current_to_be_added in to_be_added_msg:
reply_messages.append(current_to_be_added)
elif to_be_added_msg:
reply_messages.append(to_be_added_msg)
for message in parsed_messages: for message in parsed_messages:
reply_id = messages_with_replies.get(message.id, None) reply_to = messages_with_replies.get(message.id, None)
if not reply_to:
continue
reply_id = reply_to.reply_to_msg_id
for reply in reply_messages: for reply in reply_messages:
if reply.id == reply_id: if reply.id == reply_id and not reply.forum_topic_created:
if not reply.forum_topic_created: message.reply_to_message = reply
message.reply_to_message = reply
if message_reply_to_story: if message_reply_to_story:
for m in parsed_messages: for m in parsed_messages:
if not isinstance(m, types.Message):
continue
if m.chat: if m.chat:
chat_id = m.chat.id chat_id = m.chat.id
break break
@ -159,7 +193,7 @@ async def parse_messages(
chat_id = 0 chat_id = 0
reply_messages = {} reply_messages = {}
for msg_id in message_reply_to_story.keys(): for msg_id in message_reply_to_story:
reply_messages[msg_id] = await client.get_stories( reply_messages[msg_id] = await client.get_stories(
message_reply_to_story[msg_id]['user_id'], message_reply_to_story[msg_id]['user_id'],
message_reply_to_story[msg_id]['story_id'] message_reply_to_story[msg_id]['story_id']