love_apples/maxapi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Изменен фильтр на State. Вместо == теперь in. Работает если в хендлере указано несколько фильтров на State

Browse Source
This commit is contained in:
Денис Семёнов 2025-07-28 15:13:52 +03:00
parent 103535d3ba
commit a653ed6792
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maxapi/dispatcher.py
View File

@ -240,9 +240,10 @@ class Dispatcher:
if handler.filters: if handler.filters:
if not filter_attrs(event_object, *handler.filters): if not filter_attrs(event_object, *handler.filters):
continue continue
if not handler.state == current_state and handler.state: if handler.states:
continue if current_state not in handler.states:
continue
func_args = handler.func_event.__annotations__.keys() func_args = handler.func_event.__annotations__.keys()

4
maxapi/filters/handler.py
View File

@ -44,14 +44,14 @@ class Handler:
self.func_event: Callable = func_event self.func_event: Callable = func_event
self.update_type: UpdateType = update_type self.update_type: UpdateType = update_type
self.filters = [] self.filters = []
self.state: Optional[State] = None self.states: Optional[List[State]] = []
self.middlewares: List[BaseMiddleware] = [] self.middlewares: List[BaseMiddleware] = []
for arg in args: for arg in args:
if isinstance(arg, MagicFilter): if isinstance(arg, MagicFilter):
self.filters.append(arg) self.filters.append(arg)
elif isinstance(arg, State): elif isinstance(arg, State):
self.state = arg self.states.append(arg)
elif isinstance(arg, (Command, CommandStart)): elif isinstance(arg, (Command, CommandStart)):
self.filters.insert(0, F.message.body.text.split()[0] == arg.command) self.filters.insert(0, F.message.body.text.split()[0] == arg.command)
elif isinstance(arg, BaseMiddleware): elif isinstance(arg, BaseMiddleware):