Xtao-Labs/MTPyroger
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into asyncio

Browse Source
This commit is contained in:
Dan 2018-07-02 09:51:01 +02:00
commit 3711437dbd
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pyrogram/client/client.py
View File

@ -712,7 +712,9 @@ class Client(Methods, BaseClient):
file_name = "{}_{}_{}{}".format(
media_type_str,
datetime.fromtimestamp(media.date or time.time()).strftime("%Y-%m-%d_%H-%M-%S"),
datetime.fromtimestamp(
getattr(media, "date", None) or time.time()
).strftime("%Y-%m-%d_%H-%M-%S"),
self.rnd_id(),
extension
)

18
pyrogram/client/methods/download_media.py
View File

@ -77,7 +77,12 @@ class DownloadMedia(BaseClient):
"""
if isinstance(message, pyrogram_types.Message):
if message.photo:
media = message.photo.sizes[-1]
media = pyrogram_types.Document(
file_id=message.photo.sizes[-1].file_id,
file_size=message.photo.sizes[-1].file_size,
mime_type="",
date=message.photo.date
)
elif message.audio:
media = message.audio
elif message.document:
@ -96,6 +101,7 @@ class DownloadMedia(BaseClient):
return
elif isinstance(message, (
pyrogram_types.Photo,
pyrogram_types.PhotoSize,
pyrogram_types.Audio,
pyrogram_types.Document,
pyrogram_types.Video,
@ -104,7 +110,15 @@ class DownloadMedia(BaseClient):
pyrogram_types.Sticker,
pyrogram_types.GIF
)):
media = message
if isinstance(message, pyrogram_types.Photo):
media = pyrogram_types.Document(
file_id=message.sizes[-1].file_id,
file_size=message.sizes[-1].file_size,
mime_type="",
date=message.date
)
else:
media = message
elif isinstance(message, str):
media = pyrogram_types.Document(
file_id=message,