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

Merge pull request #1631 from coder2020official/newfeatures

Browse Source 
update_sensitive field for middlewares
This commit is contained in:
Badiboy
2022-07-16 12:46:12 +03:00
committed by GitHub
parent bf415e4bd7 0c6f84c79a
commit 5dbe1b3523
4 changed files with 107 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
telebot/__init__.py
View File

@@ -2977,8 +2977,17 @@ class TeleBot:
:return: None
"""
if not self.use_class_middlewares:
logger.warning('Middleware is not enabled. Pass use_class_middlewares=True to enable it.')
logger.error('Middleware is not enabled. Pass use_class_middlewares=True to enable it.')
return
if not hasattr(middleware, 'update_types'):
logger.error('Middleware has no update_types parameter. Please add list of updates to handle.')
return
if not hasattr(middleware, 'update_sensitive'):
logger.warning('Middleware has no update_sensitive parameter. Parameter was set to False.')
middleware.update_sensitive = False
self.middlewares.append(middleware)
def set_state(self, user_id: int, state: Union[int, str, State], chat_id: int=None) -> None:
@@ -4038,7 +4047,7 @@ class TeleBot:
middlewares = [i for i in self.middlewares if update_type in i.update_types]
return middlewares
def _run_middlewares_and_handler(self, message, handlers, middlewares):
def _run_middlewares_and_handler(self, message, handlers, middlewares, update_type):
"""
This class is made to run handler and middleware in queue.
@@ -4052,7 +4061,14 @@ class TeleBot:
skip_handler = False
if middlewares:
for middleware in middlewares:
result = middleware.pre_process(message, data)
if middleware.update_sensitive:
if hasattr(middleware, f'pre_process_{update_type}'):
result = getattr(middleware, f'pre_process_{update_type}')(message, data)
else:
logger.error('Middleware {} does not have pre_process_{} method. pre_process function execution was skipped.'.format(middleware.__class__.__name__, update_type))
result = None
else:
result = middleware.pre_process(message, data)
# We will break this loop if CancelUpdate is returned
# Also, we will not run other middlewares
if isinstance(result, CancelUpdate):
@@ -4102,7 +4118,13 @@ class TeleBot:
if middlewares:
for middleware in middlewares:
middleware.post_process(message, data, handler_error)
if middleware.update_sensitive:
if hasattr(middleware, f'post_process_{update_type}'):
result = getattr(middleware, f'post_process_{update_type}')(message, data, handler_error)
else:
logger.error("Middleware: {} does not have post_process_{} method. Post process function was not executed.".format(middleware.__class__.__name__, update_type))
else:
result = middleware.post_process(message, data, handler_error)
def _notify_command_handlers(self, handlers, new_messages, update_type):
"""
@@ -4118,7 +4140,7 @@ class TeleBot:
for message in new_messages:
if self.use_class_middlewares:
middleware = self._check_middleware(update_type)
self._exec_task(self._run_middlewares_and_handler, message, handlers=handlers, middlewares=middleware)
self._exec_task(self._run_middlewares_and_handler, message, handlers=handlers, middlewares=middleware, update_type=update_type)
return
else:
for message_handler in handlers: