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

Added native support of MagicFilter

Browse source
This commit is contained in:
Alex Root Junior 2022-11-06 01:10:32 +02:00
parent 27dea25c52
commit 93a425f528
No known key found for this signature in database
GPG key ID: 074C1D455EBEA4AC
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
aiogram/dispatcher/filters/filters.py
View file

@ -2,6 +2,8 @@ import abc
import inspect import inspect
import typing import typing
from magic_filter import MagicFilter
from ..handler import Handler, FilterObj from ..handler import Handler, FilterObj
@ -25,6 +27,9 @@ def get_filter_spec(dispatcher, filter_: callable):
if not callable(filter_): if not callable(filter_):
raise TypeError('Filter must be callable and/or awaitable!') raise TypeError('Filter must be callable and/or awaitable!')
if isinstance(filter_, MagicFilter):
filter_ = filter_.resolve
spec = inspect.getfullargspec(filter_) spec = inspect.getfullargspec(filter_)
if 'dispatcher' in spec: if 'dispatcher' in spec:
kwargs['dispatcher'] = dispatcher kwargs['dispatcher'] = dispatcher

2
aiogram/types/message.py
View file

@ -324,6 +324,8 @@ class Message(base.TelegramObject):
url += f"c/{self.chat.shifted_id}/" url += f"c/{self.chat.shifted_id}/"
url += f"{self.message_id}" url += f"{self.message_id}"
if self.is_topic_message and self.message_thread_id:
url += f"?topic={self.message_thread_id}"
return url return url
def link(self, text, as_html=True) -> str: def link(self, text, as_html=True) -> str:

1
requirements.txt
View file

@ -1,3 +1,4 @@
aiohttp>=3.8.0,<3.9.0 aiohttp>=3.8.0,<3.9.0
Babel>=2.9.1,<2.10.0 Babel>=2.9.1,<2.10.0
certifi>=2021.10.8 certifi>=2021.10.8
magic-filter>=1.0.9