LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-03-03 19:00:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Stop copying reply when resending Message, fix file replies

Browse Source
This commit is contained in:
Lonami Exo 2018-08-19 11:49:36 +02:00
parent f4b9c9d6d4
commit dda1f0b1dd
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
telethon/client/messages.py
View File

@ -447,26 +447,6 @@ class MessageMethods(UploadMethods, ButtonMethods, MessageParseMethods):
entity = await self.get_input_entity(entity) entity = await self.get_input_entity(entity)
if isinstance(message, types.Message): if isinstance(message, types.Message):
if (message.media and not isinstance(
message.media, types.MessageMediaWebPage)):
return await self.send_file(
entity, message.media, caption=message.message,
entities=message.entities
)
if reply_to is not None:
reply_id = utils.get_message_id(reply_to)
else:
if isinstance(entity, types.InputPeerSelf):
eid = utils.get_peer_id(await self.get_me(input_peer=True))
else:
eid = utils.get_peer_id(entity)
if eid == utils.get_peer_id(message.to_id):
reply_id = message.reply_to_msg_id
else:
reply_id = None
if buttons is None: if buttons is None:
markup = message.reply_markup markup = message.reply_markup
else: else:
@ -475,11 +455,23 @@ class MessageMethods(UploadMethods, ButtonMethods, MessageParseMethods):
if silent is None: if silent is None:
silent = message.silent silent = message.silent
if (message.media and not isinstance(
message.media, types.MessageMediaWebPage)):
return await self.send_file(
entity,
message.media,
caption=message.message,
silent=silent,
reply_to=reply_to,
buttons=markup,
entities=message.entities
)
request = functions.messages.SendMessageRequest( request = functions.messages.SendMessageRequest(
peer=entity, peer=entity,
message=message.message or '', message=message.message or '',
silent=silent, silent=silent,
reply_to_msg_id=reply_id, reply_to_msg_id=utils.get_message_id(reply_to),
reply_markup=markup, reply_markup=markup,
entities=message.entities, entities=message.entities,
clear_draft=clear_draft, clear_draft=clear_draft,