mirror of
https://github.com/eternnoir/pyTelegramBotAPI.git
synced 2023-08-10 21:12:57 +03:00
Merge pull request #1212 from Badiboy/master
Update file_name to visible_file_name in send_document
This commit is contained in:
commit
983d626d87
@ -1124,7 +1124,7 @@ class TeleBot:
|
||||
thumb: Optional[Union[Any, str]]=None,
|
||||
caption_entities: Optional[List[types.MessageEntity]]=None,
|
||||
allow_sending_without_reply: Optional[bool]=None,
|
||||
file_name: Optional[str]=None) -> types.Message:
|
||||
visible_file_name: Optional[str]=None) -> types.Message:
|
||||
"""
|
||||
Use this method to send general files.
|
||||
:param chat_id:
|
||||
@ -1138,7 +1138,7 @@ class TeleBot:
|
||||
:param thumb: InputFile or String : Thumbnail of the file sent
|
||||
:param caption_entities:
|
||||
:param allow_sending_without_reply:
|
||||
:param file_name:
|
||||
:param visible_file_name: allows to define file name that will be visible in the Telegram instead of original file name
|
||||
:return: API reply.
|
||||
"""
|
||||
parse_mode = self.parse_mode if (parse_mode is None) else parse_mode
|
||||
@ -1147,7 +1147,7 @@ class TeleBot:
|
||||
apihelper.send_data(
|
||||
self.token, chat_id, data, 'document', reply_to_message_id, reply_markup,
|
||||
parse_mode, disable_notification, timeout, caption, thumb, caption_entities,
|
||||
allow_sending_without_reply, file_name))
|
||||
allow_sending_without_reply, visible_file_name))
|
||||
|
||||
def send_sticker(
|
||||
self, chat_id: Union[int, str], data: Union[Any, str],
|
||||
|
@ -806,14 +806,14 @@ def send_audio(token, chat_id, audio, caption=None, duration=None, performer=Non
|
||||
|
||||
def send_data(token, chat_id, data, data_type, reply_to_message_id=None, reply_markup=None, parse_mode=None,
|
||||
disable_notification=None, timeout=None, caption=None, thumb=None, caption_entities=None,
|
||||
allow_sending_without_reply=None, disable_content_type_detection=None, file_name=None):
|
||||
allow_sending_without_reply=None, disable_content_type_detection=None, visible_file_name=None):
|
||||
method_url = get_method_by_type(data_type)
|
||||
payload = {'chat_id': chat_id}
|
||||
files = None
|
||||
if not util.is_string(data):
|
||||
file_data = data
|
||||
if file_name is not None:
|
||||
file_data = (file_name, data)
|
||||
if visible_file_name:
|
||||
file_data = (visible_file_name, data)
|
||||
files = {data_type: file_data}
|
||||
else:
|
||||
payload[data_type] = data
|
||||
|
@ -133,7 +133,7 @@ class TestTeleBot:
|
||||
ret_msg = tb.send_document(CHAT_ID, file_data)
|
||||
assert ret_msg.message_id
|
||||
|
||||
ret_msg = tb.send_document(CHAT_ID, file_data, file_name="test.jpg")
|
||||
ret_msg = tb.send_document(CHAT_ID, file_data, visible_file_name="test.jpg")
|
||||
assert ret_msg.message_id
|
||||
|
||||
def test_send_file_dis_noti(self):
|
||||
|
Loading…
Reference in New Issue
Block a user