From 559a40c7ea4fc51ff8bca419a636368c47003323 Mon Sep 17 00:00:00 2001
From: Lonami Exo <totufals@hotmail.com>
Date: Wed, 13 Feb 2019 12:33:11 +0100
Subject: [PATCH] Fix get_input_media for InputFile

It was actually using FileLocation, which had the invalid expected
type for what was being returned. Instead it should have been this
other type.

In addition, more parameters are passed so that the method can have
all the information it needs to correctly cast the type.
---
 telethon/client/uploads.py | 16 ++++++++++++++--
 telethon/utils.py          | 28 ++++++++++++++++++++--------
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/telethon/client/uploads.py b/telethon/client/uploads.py
index 91ce0279..f3d8cfca 100644
--- a/telethon/client/uploads.py
+++ b/telethon/client/uploads.py
@@ -452,18 +452,30 @@ class UploadMethods(ButtonMethods, MessageParseMethods, UserMethods):
         if isinstance(file, pathlib.Path):
             file = str(file.absolute())
 
+        as_image = utils.is_image(file) and not force_document
+
         if not isinstance(file, (str, bytes, io.IOBase)):
             # The user may pass a Message containing media (or the media,
             # or anything similar) that should be treated as a file. Try
             # getting the input media for whatever they passed and send it.
+            #
+            # We pass all attributes since these will be used if the user
+            # passed :tl:`InputFile`, and all information may be relevant.
             try:
-                return None, utils.get_input_media(file)
+                return (None, utils.get_input_media(
+                    file,
+                    is_photo=as_image,
+                    attributes=attributes,
+                    force_document=force_document,
+                    voice_note=voice_note,
+                    video_note=video_note,
+                    supports_streaming=supports_streaming
+                ))
             except TypeError:
                 return None, None  # Can't turn whatever was given into media
 
         media = None
         file_handle = None
-        as_image = utils.is_image(file) and not force_document
         use_cache = types.InputPhoto if as_image else types.InputDocument
         if not isinstance(file, str) or os.path.isfile(file):
             file_handle = await self.upload_file(
diff --git a/telethon/utils.py b/telethon/utils.py
index b692cdf0..b0a5b1e5 100644
--- a/telethon/utils.py
+++ b/telethon/utils.py
@@ -355,12 +355,17 @@ def get_input_geo(geo):
     _raise_cast_fail(geo, 'InputGeoPoint')
 
 
-def get_input_media(media, is_photo=False):
+def get_input_media(
+        media, *,
+        is_photo=False, attributes=None, force_document=False,
+        voice_note=False, video_note=False, supports_streaming=False
+):
     """
     Similar to :meth:`get_input_peer`, but for media.
 
-    If the media is a file location and ``is_photo`` is known to be ``True``,
-    it will be treated as an :tl:`InputMediaUploadedPhoto`.
+    If the media is :tl:`InputFile` and ``is_photo`` is known to be ``True``,
+    it will be treated as an :tl:`InputMediaUploadedPhoto`. Else, the rest
+    of parameters will indicate how to treat it.
     """
     try:
         if media.SUBCLASS_OF_ID == 0xfaf846f4:  # crc32(b'InputMedia')
@@ -394,15 +399,20 @@ def get_input_media(media, is_photo=False):
             id=get_input_document(media)
         )
 
-    if isinstance(media, types.FileLocation):
+    if isinstance(media, (types.InputFile, types.InputFileBig)):
         if is_photo:
             return types.InputMediaUploadedPhoto(file=media)
         else:
-            return types.InputMediaUploadedDocument(
-                file=media,
-                mime_type='application/octet-stream',  # unknown, assume bytes
-                attributes=[types.DocumentAttributeFilename('unnamed')]
+            attrs, mime = get_attributes(
+                media,
+                attributes=attributes,
+                force_document=force_document,
+                voice_note=voice_note,
+                video_note=video_note,
+                supports_streaming=supports_streaming
             )
+            return types.InputMediaUploadedDocument(
+                file=media, mime_type=mime, attributes=attrs)
 
     if isinstance(media, types.MessageMediaGame):
         return types.InputMediaGame(id=media.game.id)
@@ -487,6 +497,7 @@ def get_attributes(file, *, attributes=None, mime_type=None,
     Get a list of attributes for the given file and
     the mime type as a tuple ([attribute], mime_type).
     """
+    # Note: ``file.name`` works for :tl:`InputFile` and some `IOBase` streams
     name = file if isinstance(file, str) else getattr(file, 'name', 'unnamed')
     if mime_type is None:
         mime_type = mimetypes.guess_type(name)[0]
@@ -641,6 +652,7 @@ def _get_extension(file):
         kind = imghdr.what(file) is not None
         return ('.' + kind) if kind else ''
     elif getattr(file, 'name', None):
+        # Note: ``file.name`` works for :tl:`InputFile` and some `IOBase`
         return _get_extension(file.name)
     else:
         return ''