mirror/pyTelegramBotAPI
1
0
Fork 0
mirror of https://github.com/eternnoir/pyTelegramBotAPI.git synced 2023-08-10 21:12:57 +03:00
Code Releases Activity

Bugfix in send_data

Browse Source 
Bugfix in send_data
Protected methods renamed
Some hints added
This commit is contained in:
Badiboy 2022-01-10 14:38:28 +03:00
parent ae2dbd00fa
commit 8d8aa5a380
5 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
telebot/__init__.py
View File

@ -252,7 +252,7 @@ class TeleBot:
""" """
self.current_states = StateFile(filename=filename) self.current_states = StateFile(filename=filename)
self.current_states._create_dir() self.current_states.create_dir()
def enable_save_reply_handlers(self, delay=120, filename="./.handler-saves/reply.save"): def enable_save_reply_handlers(self, delay=120, filename="./.handler-saves/reply.save"):
""" """
@ -1221,11 +1221,13 @@ class TeleBot:
reply_to_message_id = reply_to_message_id, reply_markup = reply_markup, parse_mode = parse_mode, reply_to_message_id = reply_to_message_id, reply_markup = reply_markup, parse_mode = parse_mode,
disable_notification = disable_notification, timeout = timeout, caption = caption, thumb = thumb, disable_notification = disable_notification, timeout = timeout, caption = caption, thumb = thumb,
caption_entities = caption_entities, allow_sending_without_reply = allow_sending_without_reply, caption_entities = caption_entities, allow_sending_without_reply = allow_sending_without_reply,
disable_content_type_detection = disable_content_type_detection, visible_file_name = visible_file_name, protect_content = protect_content)) disable_content_type_detection = disable_content_type_detection, visible_file_name = visible_file_name,
protect_content = protect_content))
# TODO: Rewrite this method like in API. # TODO: Rewrite this method like in API.
def send_sticker( def send_sticker(
self, chat_id: Union[int, str], sticker: Union[Any, str], self, chat_id: Union[int, str],
sticker: Union[Any, str],
reply_to_message_id: Optional[int]=None, reply_to_message_id: Optional[int]=None,
reply_markup: Optional[REPLY_MARKUP_TYPES]=None, reply_markup: Optional[REPLY_MARKUP_TYPES]=None,
disable_notification: Optional[bool]=None, disable_notification: Optional[bool]=None,
@ -1236,6 +1238,7 @@ class TeleBot:
""" """
Use this method to send .webp stickers. Use this method to send .webp stickers.
:param chat_id: :param chat_id:
:param sticker:
:param data: :param data:
:param reply_to_message_id: :param reply_to_message_id:
:param reply_markup: :param reply_markup:
@ -1254,7 +1257,8 @@ class TeleBot:
self.token, chat_id, sticker, 'sticker', self.token, chat_id, sticker, 'sticker',
reply_to_message_id=reply_to_message_id, reply_markup=reply_markup, reply_to_message_id=reply_to_message_id, reply_markup=reply_markup,
disable_notification=disable_notification, timeout=timeout, disable_notification=disable_notification, timeout=timeout,
allow_sending_without_reply=allow_sending_without_reply, protect_content=protect_content)) allow_sending_without_reply=allow_sending_without_reply,
protect_content=protect_content))
def send_video( def send_video(
self, chat_id: Union[int, str], video: Union[Any, str], self, chat_id: Union[int, str], video: Union[Any, str],
@ -1330,6 +1334,7 @@ class TeleBot:
:param thumb: InputFile or String : Thumbnail of the file sent :param thumb: InputFile or String : Thumbnail of the file sent
:param caption: String : Animation caption (may also be used when resending animation by file_id). :param caption: String : Animation caption (may also be used when resending animation by file_id).
:param parse_mode: :param parse_mode:
:param protect_content:
:param reply_to_message_id: :param reply_to_message_id:
:param reply_markup: :param reply_markup:
:param disable_notification: :param disable_notification:
@ -2559,7 +2564,7 @@ class TeleBot:
:param chat_id: :param chat_id:
""" """
for key, value in kwargs.items(): for key, value in kwargs.items():
self.current_states._add_data(chat_id, key, value) self.current_states.add_data(chat_id, key, value)
def register_next_step_handler_by_chat_id( def register_next_step_handler_by_chat_id(
self, chat_id: Union[int, str], callback: Callable, *args, **kwargs) -> None: self, chat_id: Union[int, str], callback: Callable, *args, **kwargs) -> None:

8
telebot/apihelper.py
View File

@ -144,6 +144,7 @@ def _make_request(token, method_name, method='get', params=None, files=None):
method, request_url, params=params, files=files, method, request_url, params=params, files=files,
timeout=(connect_timeout, read_timeout), proxies=proxy) timeout=(connect_timeout, read_timeout), proxies=proxy)
elif CUSTOM_REQUEST_SENDER: elif CUSTOM_REQUEST_SENDER:
# noinspection PyCallingNonCallable
result = CUSTOM_REQUEST_SENDER( result = CUSTOM_REQUEST_SENDER(
method, request_url, params=params, files=files, method, request_url, params=params, files=files,
timeout=(connect_timeout, read_timeout), proxies=proxy) timeout=(connect_timeout, read_timeout), proxies=proxy)
@ -246,6 +247,7 @@ def send_message(
:param timeout: :param timeout:
:param entities: :param entities:
:param allow_sending_without_reply: :param allow_sending_without_reply:
:param protect_content:
:return: :return:
""" """
method_url = r'sendMessage' method_url = r'sendMessage'
@ -861,7 +863,8 @@ 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, 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, disable_notification=None, timeout=None, caption=None, thumb=None, caption_entities=None,
allow_sending_without_reply=None, disable_content_type_detection=None, visible_file_name=None): allow_sending_without_reply=None, disable_content_type_detection=None, visible_file_name=None,
protect_content = None):
method_url = get_method_by_type(data_type) method_url = get_method_by_type(data_type)
payload = {'chat_id': chat_id} payload = {'chat_id': chat_id}
files = None files = None
@ -896,6 +899,8 @@ def send_data(token, chat_id, data, data_type, reply_to_message_id=None, reply_m
payload['caption_entities'] = json.dumps(types.MessageEntity.to_list_of_dicts(caption_entities)) payload['caption_entities'] = json.dumps(types.MessageEntity.to_list_of_dicts(caption_entities))
if allow_sending_without_reply is not None: if allow_sending_without_reply is not None:
payload['allow_sending_without_reply'] = allow_sending_without_reply payload['allow_sending_without_reply'] = allow_sending_without_reply
if protect_content is not None:
payload['protect_content'] = protect_content
if method_url == 'sendDocument' and disable_content_type_detection is not None: if method_url == 'sendDocument' and disable_content_type_detection is not None:
payload['disable_content_type_detection'] = disable_content_type_detection payload['disable_content_type_detection'] = disable_content_type_detection
return _make_request(token, method_url, params=payload, files=files, method='post') return _make_request(token, method_url, params=payload, files=files, method='post')
@ -1382,6 +1387,7 @@ def send_invoice(
:param max_tip_amount: The maximum accepted amount for tips in the smallest units of the currency :param max_tip_amount: The maximum accepted amount for tips in the smallest units of the currency
:param suggested_tip_amounts: A JSON-serialized array of suggested amounts of tips in the smallest units of the currency. :param suggested_tip_amounts: A JSON-serialized array of suggested amounts of tips in the smallest units of the currency.
At most 4 suggested tip amounts can be specified. The suggested tip amounts must be positive, passed in a strictly increased order and must not exceed max_tip_amount. At most 4 suggested tip amounts can be specified. The suggested tip amounts must be positive, passed in a strictly increased order and must not exceed max_tip_amount.
:param protect_content:
:return: :return:
""" """
method_url = r'sendInvoice' method_url = r'sendInvoice'

45
telebot/handler_backends.py
View File

@ -168,7 +168,7 @@ class StateMemory:
"""Delete a state""" """Delete a state"""
self._states.pop(chat_id) self._states.pop(chat_id)
def _get_data(self, chat_id): def get_data(self, chat_id):
return self._states[chat_id]['data'] return self._states[chat_id]['data']
def set(self, chat_id, new_state): def set(self, chat_id, new_state):
@ -179,7 +179,7 @@ class StateMemory:
""" """
self.add_state(chat_id,new_state) self.add_state(chat_id,new_state)
def _add_data(self, chat_id, key, value): def add_data(self, chat_id, key, value):
result = self._states[chat_id]['data'][key] = value result = self._states[chat_id]['data'][key] = value
return result return result
@ -217,28 +217,27 @@ class StateFile:
:param chat_id: :param chat_id:
:param state: new state :param state: new state
""" """
states_data = self._read_data() states_data = self.read_data()
if chat_id in states_data: if chat_id in states_data:
states_data[chat_id]['state'] = state states_data[chat_id]['state'] = state
return self._save_data(states_data) return self.save_data(states_data)
else: else:
new_data = states_data[chat_id] = {'state': state,'data': {}} states_data[chat_id] = {'state': state,'data': {}}
return self._save_data(states_data) return self.save_data(states_data)
def current_state(self, chat_id): def current_state(self, chat_id):
"""Current state.""" """Current state."""
states_data = self._read_data() states_data = self.read_data()
if chat_id in states_data: return states_data[chat_id]['state'] if chat_id in states_data: return states_data[chat_id]['state']
else: return False else: return False
def delete_state(self, chat_id): def delete_state(self, chat_id):
"""Delete a state""" """Delete a state"""
states_data = self._read_data() states_data = self.read_data()
states_data.pop(chat_id) states_data.pop(chat_id)
self._save_data(states_data) self.save_data(states_data)
def _read_data(self): def read_data(self):
""" """
Read the data from file. Read the data from file.
""" """
@ -247,7 +246,7 @@ class StateFile:
file.close() file.close()
return states_data return states_data
def _create_dir(self): def create_dir(self):
""" """
Create directory .save-handlers. Create directory .save-handlers.
""" """
@ -257,7 +256,7 @@ class StateFile:
with open(self.file_path,'wb') as file: with open(self.file_path,'wb') as file:
pickle.dump({}, file) pickle.dump({}, file)
def _save_data(self, new_data): def save_data(self, new_data):
""" """
Save data after editing. Save data after editing.
:param new_data: :param new_data:
@ -266,23 +265,21 @@ class StateFile:
pickle.dump(new_data, state_file, protocol=pickle.HIGHEST_PROTOCOL) pickle.dump(new_data, state_file, protocol=pickle.HIGHEST_PROTOCOL)
return True return True
def _get_data(self, chat_id): def get_data(self, chat_id):
return self._read_data()[chat_id]['data'] return self.read_data()[chat_id]['data']
def set(self, chat_id, new_state): def set(self, chat_id, new_state):
""" """
Set a new state for a user. Set a new state for a user.
:param chat_id: :param chat_id:
:param new_state: new_state of a user :param new_state: new_state of a user
""" """
self.add_state(chat_id,new_state) self.add_state(chat_id,new_state)
def _add_data(self, chat_id, key, value): def _add_data(self, chat_id, key, value):
states_data = self._read_data() states_data = self.read_data()
result = states_data[chat_id]['data'][key] = value result = states_data[chat_id]['data'][key] = value
self._save_data(result) self.save_data(result)
return result return result
def finish(self, chat_id): def finish(self, chat_id):
@ -313,7 +310,7 @@ class StateContext:
def __init__(self , obj: StateMemory, chat_id) -> None: def __init__(self , obj: StateMemory, chat_id) -> None:
self.obj = obj self.obj = obj
self.chat_id = chat_id self.chat_id = chat_id
self.data = obj._get_data(chat_id) self.data = obj.get_data(chat_id)
def __enter__(self): def __enter__(self):
return self.data return self.data
@ -321,6 +318,7 @@ class StateContext:
def __exit__(self, exc_type, exc_val, exc_tb): def __exit__(self, exc_type, exc_val, exc_tb):
return return
class StateFileContext: class StateFileContext:
""" """
Class for data. Class for data.
@ -328,15 +326,14 @@ class StateFileContext:
def __init__(self , obj: StateFile, chat_id) -> None: def __init__(self , obj: StateFile, chat_id) -> None:
self.obj = obj self.obj = obj
self.chat_id = chat_id self.chat_id = chat_id
self.data = self.obj._get_data(self.chat_id) self.data = self.obj.get_data(self.chat_id)
def __enter__(self): def __enter__(self):
return self.data return self.data
def __exit__(self, exc_type, exc_val, exc_tb): def __exit__(self, exc_type, exc_val, exc_tb):
old_data = self.obj._read_data() old_data = self.obj.read_data()
for i in self.data: for i in self.data:
old_data[self.chat_id]['data'][i] = self.data.get(i) old_data[self.chat_id]['data'][i] = self.data.get(i)
self.obj._save_data(old_data) self.obj.save_data(old_data)
return return

3
telebot/util.py
View File

@ -449,7 +449,7 @@ def deprecated(warn: bool=False, alternative: Optional[Callable]=None):
logger.info(f"`{function.__name__}` is deprecated." logger.info(f"`{function.__name__}` is deprecated."
+ (f" Use `{alternative.__name__}` instead" if alternative else "")) + (f" Use `{alternative.__name__}` instead" if alternative else ""))
else: else:
logger.warn(f"`{function.__name__}` is deprecated." logger.warning(f"`{function.__name__}` is deprecated."
+ (f" Use `{alternative.__name__}` instead" if alternative else "")) + (f" Use `{alternative.__name__}` instead" if alternative else ""))
return function(*args, **kwargs) return function(*args, **kwargs)
return wrapper return wrapper
@ -484,6 +484,7 @@ def antiflood(function, *args, **kwargs):
""" """
from telebot.apihelper import ApiTelegramException from telebot.apihelper import ApiTelegramException
from time import sleep from time import sleep
msg = None
try: try:
msg = function(*args, **kwargs) msg = function(*args, **kwargs)
except ApiTelegramException as ex: except ApiTelegramException as ex:

2
telebot/version.py
View File

@ -1,3 +1,3 @@
# Versions should comply with PEP440. # Versions should comply with PEP440.
# This line is parsed in setup.py: # This line is parsed in setup.py:
__version__ = '4.3.0' __version__ = '4.3.1'