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

Fixed branching logic in _file_to_media

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

19
telethon/client/uploads.py
View File

@ -394,6 +394,7 @@ class UploadMethods(ButtonMethods, MessageParseMethods, UserMethods):
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 isinstance(file, str):
if re.match('https?://', file): if re.match('https?://', file):
if as_image: if as_image:
media = types.InputMediaPhotoExternal(file) media = types.InputMediaPhotoExternal(file)
@ -401,19 +402,21 @@ class UploadMethods(ButtonMethods, MessageParseMethods, UserMethods):
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:
media = utils.get_input_media(bot_file) media = utils.get_input_media(bot_file)
# Return if media is resolved
if media: if media:
pass # Already have media, don't check the rest return None, media
elif isinstance(file_handle, use_cache):
# Proceed with local file handle
file_handle = await self.upload_file(
file, progress_callback=progress_callback,
use_cache=use_cache if allow_cache else None
)
if isinstance(file_handle, use_cache):
# File was cached, so an instance of use_cache was returned # File was cached, so an instance of use_cache was returned
if as_image: if as_image:
media = types.InputMediaPhoto(file_handle) media = types.InputMediaPhoto(file_handle)