python/aiogram
1
0
Fork 0
mirror of https://github.com/aiogram/aiogram.git synced 2026-04-08 16:37:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix multiple issues

Browse source
This commit is contained in:
ResQNet 2020-01-12 20:11:35 +03:00
parent c891097bf0
commit faa8821c14
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
aiogram/dispatcher/handler.py
View file

@ -44,10 +44,6 @@ class Handler:
self.handlers: List[Handler.HandlerObj] = []
self.middleware_key = middleware_key
@property
def formatted_middleware_key(self):
return "pre_process_"+self.middleware_key
def register(self, handler, filters=None, index=None):
"""
Register callback
@ -102,7 +98,7 @@ class Handler:
if self.middleware_key:
try:
await self.dispatcher.middleware.trigger(self.formatted_middleware_key, args + (data,))
await self.dispatcher.middleware.trigger(f"pre_process_{self.middleware_key}", args + (data,))
except CancelHandler: # Allow to cancel current event
return results
@ -116,7 +112,7 @@ class Handler:
ctx_token = current_handler.set(handler_obj.handler)
try:
if self.middleware_key:
await self.dispatcher.middleware.trigger(self.formatted_middleware_key, args + (data,))
await self.dispatcher.middleware.trigger(f"process_{self.middleware_key}", args + (data,))
partial_data = _check_spec(handler_obj.spec, data)
response = await handler_obj.handler(*args, **partial_data)
if response is not None:

2
aiogram/dispatcher/middlewares.py
View file

@ -96,7 +96,7 @@ class BaseMiddleware:
:param args:
:return:
"""
handler_name = f"on_"+action
handler_name = 'on_' + action
handler = getattr(self, handler_name, None)
if not handler:
return None