LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2024-11-26 19:33:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add missing caption when sending Message with media

Browse Source
This commit is contained in:
Lonami Exo 2018-04-20 09:44:33 +02:00
parent 1c2e9d2f27
commit 5dc43276bb
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
telethon/telegram_client.py
View File

@ -780,7 +780,9 @@ class TelegramClient(TelegramBareClient):
if isinstance(message, Message): if isinstance(message, Message):
if (message.media if (message.media
and not isinstance(message.media, MessageMediaWebPage)): and not isinstance(message.media, MessageMediaWebPage)):
return self.send_file(entity, message.media) return self.send_file(entity, message.media,
caption=message.message,
entities=message.entities)
if reply_to is not None: if reply_to is not None:
reply_id = self._get_message_id(reply_to) reply_id = self._get_message_id(reply_to)
@ -1495,7 +1497,14 @@ class TelegramClient(TelegramBareClient):
entity = self.get_input_entity(entity) entity = self.get_input_entity(entity)
reply_to = self._get_message_id(reply_to) reply_to = self._get_message_id(reply_to)
caption, msg_entities = self._parse_message_text(caption, parse_mode)
# Not document since it's subject to change.
# Needed when a Message is passed to send_message and it has media.
if 'entities' in kwargs:
msg_entities = kwargs['entities']
else:
caption, msg_entities =\
self._parse_message_text(caption, parse_mode)
if not isinstance(file, (str, bytes, io.IOBase)): if not isinstance(file, (str, bytes, io.IOBase)):
# The user may pass a Message containing media (or the media, # The user may pass a Message containing media (or the media,