LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-08-07 13:34:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conditional branch in _file_to_media

Browse Source
This commit is contained in:
YeeChanKo 2018-08-06 11:17:03 +09:00 committed by GitHub
parent 8ce001318e
commit e6e33bb434
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
telethon/client/uploads.py
View File

@ -393,18 +393,19 @@ class UploadMethods(ButtonMethods, MessageParseMethods, UserMethods):
file_handle = None file_handle = None
as_image = utils.is_image(file) and not force_document as_image = utils.is_image(file) and not force_document
use_cache = types.InputPhoto if as_image else types.InputDocument use_cache = types.InputPhoto if as_image else types.InputDocument
if not isinstance(file, str):
file_handle = await self.upload_file( if re.match('https?://', file):
file, progress_callback=progress_callback,
use_cache=use_cache if allow_cache else None
)
elif re.match('https?://', file):
if as_image: if as_image:
media = types.InputMediaPhotoExternal(file) media = types.InputMediaPhotoExternal(file)
elif not force_document and utils.is_gif(file): elif not force_document and utils.is_gif(file):
media = types.InputMediaGifExternal(file, '') media = types.InputMediaGifExternal(file, '')
else: else:
media = types.InputMediaDocumentExternal(file) media = types.InputMediaDocumentExternal(file)
elif isinstance(file, str):
file_handle = await self.upload_file(
file, progress_callback=progress_callback,
use_cache=use_cache if allow_cache else None
)
else: else:
bot_file = utils.resolve_bot_file_id(file) bot_file = utils.resolve_bot_file_id(file)
if bot_file: if bot_file: