Fix self-destruct media if file_id and ttl_seconds are passed (#971)

ShivangKakkar · web-flow · commit 32b3452e76f8 · 2022-04-27T09:17:14.000+02:00
diff --git a/pyrogram/methods/messages/send_photo.py b/pyrogram/methods/messages/send_photo.py
@@ -155,7 +155,7 @@ async def send_photo(
                         ttl_seconds=ttl_seconds
                     )
                 else:
-                    media = utils.get_input_media_from_file_id(photo, FileType.PHOTO)
+                    media = utils.get_input_media_from_file_id(photo, FileType.PHOTO, ttl_seconds=ttl_seconds)
             else:
                 file = await self.save_file(photo, progress=progress, progress_args=progress_args)
                 media = raw.types.InputMediaUploadedPhoto(
diff --git a/pyrogram/methods/messages/send_video.py b/pyrogram/methods/messages/send_video.py
@@ -200,7 +200,7 @@ async def progress(current, total):
                         ttl_seconds=ttl_seconds
                     )
                 else:
-                    media = utils.get_input_media_from_file_id(video, FileType.VIDEO)
+                    media = utils.get_input_media_from_file_id(video, FileType.VIDEO, ttl_seconds=ttl_seconds)
             else:
                 thumb = await self.save_file(thumb)
                 file = await self.save_file(video, progress=progress, progress_args=progress_args)
diff --git a/pyrogram/utils.py b/pyrogram/utils.py
@@ -42,7 +42,8 @@ async def ainput(prompt: str = "", *, hide: bool = False):
 
 def get_input_media_from_file_id(
     file_id: str,
-    expected_file_type: FileType = None
+    expected_file_type: FileType = None,
+    ttl_seconds: int = None
 ) -> Union["raw.types.InputMediaPhoto", "raw.types.InputMediaDocument"]:
     try:
         decoded = FileId.decode(file_id)
@@ -64,7 +65,8 @@ def get_input_media_from_file_id(
                 id=decoded.media_id,
                 access_hash=decoded.access_hash,
                 file_reference=decoded.file_reference
-            )
+            ),
+            ttl_seconds=ttl_seconds
         )
 
     if file_type in DOCUMENT_TYPES:
@@ -73,7 +75,8 @@ def get_input_media_from_file_id(
                 id=decoded.media_id,
                 access_hash=decoded.access_hash,
                 file_reference=decoded.file_reference
-            )
+            ),
+            ttl_seconds=ttl_seconds
         )
 
     raise ValueError(f"Unknown file id: {file_id}")

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ async def send_photo(`
`155`	`155`	`ttl_seconds=ttl_seconds`
`156`	`156`	`)`
`157`	`157`	`else:`
`158`		`- media = utils.get_input_media_from_file_id(photo, FileType.PHOTO)`
	`158`	`+ media = utils.get_input_media_from_file_id(photo, FileType.PHOTO, ttl_seconds=ttl_seconds)`
`159`	`159`	`else:`
`160`	`160`	`file = await self.save_file(photo, progress=progress, progress_args=progress_args)`
`161`	`161`	`media = raw.types.InputMediaUploadedPhoto(`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ async def progress(current, total):`
`200`	`200`	`ttl_seconds=ttl_seconds`
`201`	`201`	`)`
`202`	`202`	`else:`
`203`		`- media = utils.get_input_media_from_file_id(video, FileType.VIDEO)`
	`203`	`+ media = utils.get_input_media_from_file_id(video, FileType.VIDEO, ttl_seconds=ttl_seconds)`
`204`	`204`	`else:`
`205`	`205`	`thumb = await self.save_file(thumb)`
`206`	`206`	`file = await self.save_file(video, progress=progress, progress_args=progress_args)`