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

Pass only the necessary data

Browse Source
This commit is contained in:
_run 2022-06-28 19:51:51 +05:00
parent a2893945b2
commit 6e8abc709e
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
telebot/__init__.py
View File

@ -4022,12 +4022,19 @@ class TeleBot:
return return
else: else:
if handler.get('pass_bot'): data["bot"] = self
if len(data) > len(params) - 1: # remove the message parameter data_copy = data.copy()
for key in list(data_copy):
# remove data from data_copy if handler does not accept it
if key not in params:
del data_copy[key]
if handler.get('pass_bot'): data_copy["bot"] = self
if len(data_copy) > len(params) - 1: # remove the message parameter
logger.error("You are passing more data than the handler needs. Check your handler: {}".format(handler['function'])) logger.error("You are passing more data than the handler needs. Check your handler: {}".format(handler['function']))
return return
handler["function"](message, **data) handler["function"](message, **data_copy)
except Exception as e: except Exception as e:
handler_error = e handler_error = e
@ -4038,8 +4045,6 @@ class TeleBot:
logging.error(str(e)) logging.error(str(e))
return return
# remove the bot from data # remove the bot from data
if "bot" in data:
del data["bot"]
if middlewares: if middlewares:
for middleware in middlewares: for middleware in middlewares:
middleware.post_process(message, data, handler_error) middleware.post_process(message, data, handler_error)

20
telebot/async_telebot.py
View File

@ -309,13 +309,20 @@ class AsyncTeleBot:
logger.error("It is not allowed to pass data and values inside data to the handler. Check your handler: {}".format(handler['function'])) logger.error("It is not allowed to pass data and values inside data to the handler. Check your handler: {}".format(handler['function']))
return return
else: else:
if handler.get('pass_bot'): data["bot"] = self data_copy = data.copy()
if len(data) > len(params) - 1:
for key in list(data_copy):
# remove data from data_copy if handler does not accept it
if key not in params:
del data_copy[key]
if handler.get('pass_bot'): data_copy["bot"] = self
if len(data_copy) > len(params) - 1: # remove the message parameter
logger.error("You are passing more data than the handler needs. Check your handler: {}".format(handler['function'])) logger.error("You are passing more data than the handler needs. Check your handler: {}".format(handler['function']))
return return
await handler["function"](message, **data)
handler["function"](message, **data_copy)
except Exception as e: except Exception as e:
handler_error = e handler_error = e
@ -324,9 +331,6 @@ class AsyncTeleBot:
return self.exception_handler.handle(e) return self.exception_handler.handle(e)
logging.error(str(e)) logging.error(str(e))
return return
# remove the bot from data
if "bot" in data:
del data["bot"]
if middlewares: if middlewares:
for middleware in middlewares: for middleware in middlewares: