Respect file_name if file passed is a file object (pyrogram#912)

the-blank-x · web-flow · commit e0eccfa8fbc4 · 2022-02-26T11:13:08.000+01:00
Fixes #911
diff --git a/pyrogram/methods/messages/send_animation.py b/pyrogram/methods/messages/send_animation.py
@@ -201,7 +201,7 @@ def progress(current, total):
                 thumb = await self.save_file(thumb)
                 file = await self.save_file(animation, progress=progress, progress_args=progress_args)
                 media = raw.types.InputMediaUploadedDocument(
-                    mime_type=self.guess_mime_type(animation.name) or "video/mp4",
+                    mime_type=self.guess_mime_type(file_name or animation.name) or "video/mp4",
                     file=file,
                     thumb=thumb,
                     attributes=[
@@ -211,7 +211,7 @@ def progress(current, total):
                             w=width,
                             h=height
                         ),
-                        raw.types.DocumentAttributeFilename(file_name=animation.name),
+                        raw.types.DocumentAttributeFilename(file_name=file_name or animation.name),
                         raw.types.DocumentAttributeAnimated()
                     ]
                 )
diff --git a/pyrogram/methods/messages/send_audio.py b/pyrogram/methods/messages/send_audio.py
@@ -197,7 +197,7 @@ def progress(current, total):
                 thumb = await self.save_file(thumb)
                 file = await self.save_file(audio, progress=progress, progress_args=progress_args)
                 media = raw.types.InputMediaUploadedDocument(
-                    mime_type=self.guess_mime_type(audio.name) or "audio/mpeg",
+                    mime_type=self.guess_mime_type(file_name or audio.name) or "audio/mpeg",
                     file=file,
                     thumb=thumb,
                     attributes=[
@@ -206,7 +206,7 @@ def progress(current, total):
                             performer=performer,
                             title=title
                         ),
-                        raw.types.DocumentAttributeFilename(file_name=audio.name)
+                        raw.types.DocumentAttributeFilename(file_name=file_name or audio.name)
                     ]
                 )
 
diff --git a/pyrogram/methods/messages/send_document.py b/pyrogram/methods/messages/send_document.py
@@ -180,11 +180,11 @@ def progress(current, total):
                 thumb = await self.save_file(thumb)
                 file = await self.save_file(document, progress=progress, progress_args=progress_args)
                 media = raw.types.InputMediaUploadedDocument(
-                    mime_type=self.guess_mime_type(document.name) or "application/zip",
+                    mime_type=self.guess_mime_type(file_name or document.name) or "application/zip",
                     file=file,
                     thumb=thumb,
                     attributes=[
-                        raw.types.DocumentAttributeFilename(file_name=document.name)
+                        raw.types.DocumentAttributeFilename(file_name=file_name or document.name)
                     ]
                 )
 
diff --git a/pyrogram/methods/messages/send_video.py b/pyrogram/methods/messages/send_video.py
@@ -207,7 +207,7 @@ def progress(current, total):
                 thumb = await self.save_file(thumb)
                 file = await self.save_file(video, progress=progress, progress_args=progress_args)
                 media = raw.types.InputMediaUploadedDocument(
-                    mime_type=self.guess_mime_type(video.name) or "video/mp4",
+                    mime_type=self.guess_mime_type(file_name or video.name) or "video/mp4",
                     file=file,
                     ttl_seconds=ttl_seconds,
                     thumb=thumb,
@@ -218,7 +218,7 @@ def progress(current, total):
                             w=width,
                             h=height
                         ),
-                        raw.types.DocumentAttributeFilename(file_name=video.name)
+                        raw.types.DocumentAttributeFilename(file_name=file_name or video.name)
                     ]
                 )
 

Original file line number	Diff line number	Diff line change
`@@ -180,11 +180,11 @@ def progress(current, total):`
`180`	`180`	`thumb = await self.save_file(thumb)`
`181`	`181`	`file = await self.save_file(document, progress=progress, progress_args=progress_args)`
`182`	`182`	`media = raw.types.InputMediaUploadedDocument(`
`183`		`- mime_type=self.guess_mime_type(document.name) or "application/zip",`
	`183`	`+ mime_type=self.guess_mime_type(file_name or document.name) or "application/zip",`
`184`	`184`	`file=file,`
`185`	`185`	`thumb=thumb,`
`186`	`186`	`attributes=[`
`187`		`- raw.types.DocumentAttributeFilename(file_name=document.name)`
	`187`	`+ raw.types.DocumentAttributeFilename(file_name=file_name or document.name)`
`188`	`188`	`]`
`189`	`189`	`)`
`190`	`190`