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

Fix .photo()/.document() inline results excluding media from msg

Browse Source
This commit is contained in:
Lonami Exo 2020-10-15 09:27:37 +02:00
parent 7de1c0e237
commit 15f7c27bce
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
telethon/tl/custom/inlinebuilder.py
View File

@ -144,6 +144,7 @@ class InlineBuilder:
text=text or '', text=text or '',
parse_mode=parse_mode, parse_mode=parse_mode,
link_preview=link_preview, link_preview=link_preview,
media=True,
geo=geo, geo=geo,
period=period, period=period,
contact=contact, contact=contact,
@ -225,6 +226,7 @@ class InlineBuilder:
text=text or '', text=text or '',
parse_mode=parse_mode, parse_mode=parse_mode,
link_preview=link_preview, link_preview=link_preview,
media=True,
geo=geo, geo=geo,
period=period, period=period,
contact=contact, contact=contact,
@ -270,7 +272,7 @@ class InlineBuilder:
async def _message( async def _message(
self, *, self, *,
text=None, parse_mode=(), link_preview=True, text=None, parse_mode=(), link_preview=True, media=False,
geo=None, period=60, contact=None, game=False, buttons=None geo=None, period=60, contact=None, game=False, buttons=None
): ):
# Empty strings are valid but false-y; if they're empty use dummy '\0' # Empty strings are valid but false-y; if they're empty use dummy '\0'
@ -284,18 +286,25 @@ class InlineBuilder:
markup = self._client.build_reply_markup(buttons, inline_only=True) markup = self._client.build_reply_markup(buttons, inline_only=True)
if text is not None: if text is not None:
if not text: # Automatic media on empty string, like stickers
return types.InputBotInlineMessageMediaAuto('')
text, msg_entities = await self._client._parse_message_text( text, msg_entities = await self._client._parse_message_text(
text, parse_mode text, parse_mode
) )
return types.InputBotInlineMessageText( if media:
message=text, # "MediaAuto" means it will use whatever media the inline
no_webpage=not link_preview, # result itself has (stickers, photos, or documents), while
entities=msg_entities, # respecting the user's text (caption) and formatting.
reply_markup=markup return types.InputBotInlineMessageMediaAuto(
) message=text,
entities=msg_entities,
reply_markup=markup
)
else:
return types.InputBotInlineMessageText(
message=text,
no_webpage=not link_preview,
entities=msg_entities,
reply_markup=markup
)
elif isinstance(geo, (types.InputGeoPoint, types.GeoPoint)): elif isinstance(geo, (types.InputGeoPoint, types.GeoPoint)):
return types.InputBotInlineMessageMediaGeo( return types.InputBotInlineMessageMediaGeo(
geo_point=utils.get_input_geo(geo), geo_point=utils.get_input_geo(geo),