iartamonov/mautrix-telegram
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix handling file captions. Fixes #475

Browse Source
This commit is contained in:
Tulir Asokan
2020-06-24 22:32:13 +03:00
parent a29d9cf4ff
commit f487853954
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/portal/telegram.py
+8 -2
View File
@@ -126,7 +126,7 @@ class PortalTelegram(BasePortal, ABC):
def _parse_telegram_document_meta(evt: Message, file: DBTelegramFile, attrs: DocAttrs, def _parse_telegram_document_meta(evt: Message, file: DBTelegramFile, attrs: DocAttrs,
thumb_size: TypePhotoSize) -> Tuple[ImageInfo, str]: thumb_size: TypePhotoSize) -> Tuple[ImageInfo, str]:
document = evt.media.document document = evt.media.document
name = evt.message or attrs.name name = attrs.name
if attrs.is_sticker: if attrs.is_sticker:
alt = attrs.sticker_alt alt = attrs.sticker_alt
if len(alt) > 0: if len(alt) > 0:
@@ -217,7 +217,13 @@ class PortalTelegram(BasePortal, ABC):
content.file = file.decryption_info content.file = file.decryption_info
else: else:
content.url = file.mxc content.url = file.mxc
return await self._send_message(intent, content, event_type=event_type, timestamp=evt.date) res = await self._send_message(intent, content, event_type=event_type, timestamp=evt.date)
if evt.message:
caption_content = await formatter.telegram_to_matrix(evt, source, self.main_intent,
no_reply_fallback=True)
caption_content.external_url = content.external_url
res = await self._send_message(intent, caption_content, timestamp=evt.date)
return res
def handle_telegram_location(self, source: 'AbstractUser', intent: IntentAPI, evt: Message, def handle_telegram_location(self, source: 'AbstractUser', intent: IntentAPI, evt: Message,
relates_to: RelatesTo = None) -> Awaitable[EventID]: relates_to: RelatesTo = None) -> Awaitable[EventID]: