Fix .get_input_media using None caption and missing venue type

This commit is contained in:
Lonami Exo 2018-01-16 14:01:14 +01:00
parent 2ccb6063e0
commit 49f204c955

View File

@ -248,15 +248,17 @@ def get_input_media(media, user_caption=None, is_photo=False):
if isinstance(media, MessageMediaPhoto): if isinstance(media, MessageMediaPhoto):
return InputMediaPhoto( return InputMediaPhoto(
id=get_input_photo(media.photo), id=get_input_photo(media.photo),
caption=media.caption if user_caption is None else user_caption, ttl_seconds=media.ttl_seconds,
ttl_seconds=media.ttl_seconds caption=((media.caption if user_caption is None else user_caption)
or '')
) )
if isinstance(media, MessageMediaDocument): if isinstance(media, MessageMediaDocument):
return InputMediaDocument( return InputMediaDocument(
id=get_input_document(media.document), id=get_input_document(media.document),
caption=media.caption if user_caption is None else user_caption, ttl_seconds=media.ttl_seconds,
ttl_seconds=media.ttl_seconds caption=((media.caption if user_caption is None else user_caption)
or '')
) )
if isinstance(media, FileLocation): if isinstance(media, FileLocation):
@ -298,7 +300,8 @@ def get_input_media(media, user_caption=None, is_photo=False):
title=media.title, title=media.title,
address=media.address, address=media.address,
provider=media.provider, provider=media.provider,
venue_id=media.venue_id venue_id=media.venue_id,
venue_type=''
) )
if isinstance(media, ( if isinstance(media, (