inputfile fix #2320

telebot/__init__.py

@@ -2598,6 +2598,10 @@ def send_document(
             logger.warning('The parameter "thumb" is deprecated. Use "thumbnail" instead.')
             thumbnail = thumb
 
+        if isinstance(document, types.InputFile) and visible_file_name:
+            # inputfile name ignored, warn
+            logger.warning('Cannot use both InputFile and visible_file_name. InputFile name will be ignored.')
+
         return types.Message.de_json(
             apihelper.send_data(
                 self.token, chat_id, document, 'document',

telebot/apihelper.py

@@ -94,7 +94,7 @@ def _make_request(token, method_name, method='get', params=None, files=None):
         # process types.InputFile
         for key, value in files_copy.items():
             if isinstance(value, types.InputFile):
-                files[key] = value.file
+                files[key] = (value.file_name, value.file)
             elif isinstance(value, tuple) and (len(value) == 2) and isinstance(value[1], types.InputFile):
                 files[key] = (value[0], value[1].file)
 

telebot/async_telebot.py

@@ -4023,6 +4023,10 @@ async def send_document(
         if reply_parameters and (reply_parameters.allow_sending_without_reply is None):
             reply_parameters.allow_sending_without_reply = self.allow_sending_without_reply
 
+        if isinstance(document, types.InputFile) and visible_file_name:
+            # inputfile name ignored, warn
+            logger.warning('Cannot use both InputFile and visible_file_name. InputFile name will be ignored.')
+
         return types.Message.de_json(
             await asyncio_helper.send_data(
                 self.token, chat_id, document, 'document',

telebot/asyncio_helper.py

@@ -130,6 +130,8 @@ def _prepare_data(params=None, files=None):
             if isinstance(f, tuple):
                 if len(f) == 2:
                     file_name, file = f
+                    if isinstance(file, types.InputFile):
+                        file = file.file
                 else:
                     raise ValueError('Tuple must have exactly 2 elements: filename, fileobj')
             elif isinstance(f, types.InputFile):

telebot/types.py

@@ -7735,8 +7735,11 @@ class InputFile:
             InputFile(pathlib.Path('/path/to/file/file.txt'))
         )
     """
-    def __init__(self, file) -> None:
-        self._file, self.file_name = self._resolve_file(file)
+    def __init__(self, file: Union[str, IOBase, Path], file_name: Optional[str] = None):
+        self._file, self._file_name = self._resolve_file(file)
+        if file_name:
+            self._file_name = file_name
+
 
     @staticmethod
     def _resolve_file(file):
@@ -7757,6 +7760,13 @@ def file(self):
         File object.
         """
         return self._file
+
+    @property
+    def file_name(self):
+        """
+        File name.
+        """
+        return self._file_name
 
 
 class ForumTopicCreated(JsonDeserializable):