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

Optimization

Browse Source 
Optimized code, added filters support
This commit is contained in:
_run 2021-09-25 18:22:54 +05:00
parent beb4f8df44
commit 2df6f00ba5
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
telebot/__init__.py
View File

@ -2468,6 +2468,11 @@ class TeleBot:
if user_state: if user_state:
for handler in self.state_handlers: for handler in self.state_handlers:
if handler['filters']['state'] == user_state: if handler['filters']['state'] == user_state:
for message_filter, filter_value in handler['filters'].items():
if filter_value is None:
continue
if not self._test_filter(message_filter, filter_value, message):
return False
need_pop = True need_pop = True
state = State(self.current_states) state = State(self.current_states)
self._exec_task(handler["function"], message, state) self._exec_task(handler["function"], message, state)
@ -2711,12 +2716,21 @@ class TeleBot:
self.add_edited_message_handler(handler_dict) self.add_edited_message_handler(handler_dict)
def state_handler(self, state=None, content_types=None, func=None,**kwargs): def state_handler(self, state, content_types=None, regexp=None, func=None, chat_types=None, **kwargs):
"""
State handler for getting input from a user.
:param state: state of a user
:param content_types:
:param regexp:
:param func:
:param chat_types:
"""
def decorator(handler): def decorator(handler):
handler_dict = self._build_handler_dict(handler, handler_dict = self._build_handler_dict(handler,
state=state, state=state,
content_types=content_types, content_types=content_types,
regexp=regexp,
chat_types=chat_types,
func=func, func=func,
**kwargs) **kwargs)
self.add_state_handler(handler_dict) self.add_state_handler(handler_dict)
@ -2732,7 +2746,7 @@ class TeleBot:
""" """
self.state_handlers.append(handler_dict) self.state_handlers.append(handler_dict)
def register_state_handler(self, callback, state=None, content_types=None, func=None, **kwargs): def register_state_handler(self, state, content_types=None, regexp=None, func=None, chat_types=None, **kwargs):
""" """
Register a state handler. Register a state handler.
:param callback: function to be called :param callback: function to be called
@ -2740,9 +2754,11 @@ class TeleBot:
:param content_types: :param content_types:
:param func: :param func:
""" """
handler_dict = self._build_handler_dict(callback, handler_dict = self._build_handler_dict(handler,
state=state, state=state,
content_types=content_types, content_types=content_types,
regexp=regexp,
chat_types=chat_types,
func=func, func=func,
**kwargs) **kwargs)
self.add_state_handler(handler_dict) self.add_state_handler(handler_dict)
@ -3226,6 +3242,8 @@ class TeleBot:
return message.content_type == 'text' and util.extract_command(message.text) in filter_value return message.content_type == 'text' and util.extract_command(message.text) in filter_value
elif message_filter == 'chat_types': elif message_filter == 'chat_types':
return message.chat.type in filter_value return message.chat.type in filter_value
elif message_filter == 'state':
return True
elif message_filter == 'func': elif message_filter == 'func':
return filter_value(message) return filter_value(message)
elif self.custom_filters and message_filter in self.custom_filters: elif self.custom_filters and message_filter in self.custom_filters:

5
telebot/handler_backends.py
View File

@ -167,6 +167,9 @@ class StateMachine:
"""Delete a state""" """Delete a state"""
return self._states.pop(chat_id) return self._states.pop(chat_id)
def _get_data(self, chat_id):
return self._states[chat_id]['data']
class State: class State:
""" """
@ -210,7 +213,7 @@ class StateContext:
def __init__(self , obj: StateMachine, chat_id) -> None: def __init__(self , obj: StateMachine, chat_id) -> None:
self.obj = obj self.obj = obj
self.chat_id = chat_id self.chat_id = chat_id
self.data = obj._states[chat_id]['data'] self.data = obj._get_data(chat_id)
def __enter__(self): def __enter__(self):
return self.data return self.data