Skip to content

feat(filters): allow the use of filters.{private,group,channel} in callback queries #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alissonlauffer merged 2 commits into from
Jun 10, 2024
Merged

feat(filters): allow the use of filters.{private,group,channel} in callback queries #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f8193d
chore(sqlite-storage): remove unused import
alissonlauffer Jun 9, 2024
f1f817f
feat(filters): allow the use of filters.{private,group,channel} in ca…
alissonlauffer Jun 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions hydrogram/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,8 +455,14 @@ def media_spoiler_filter(_, __, m: Message):


# region private_filter
def private_filter(_, __, m: Message):
return bool(m.chat and m.chat.type in {enums.ChatType.PRIVATE, enums.ChatType.BOT})
def private_filter(_, __, m: CallbackQuery | Message):
if isinstance(m, Message):
value = m.chat
elif isinstance(m, CallbackQuery):
value = m.message.chat
else:
raise ValueError(f"Private filter doesn't work with {type(m)}")
return bool(value and value.type in {enums.ChatType.PRIVATE, enums.ChatType.BOT})


private = create(private_filter)
Expand All @@ -467,8 +473,14 @@ def private_filter(_, __, m: Message):


# region group_filter
def group_filter(_, __, m: Message):
return bool(m.chat and m.chat.type in {enums.ChatType.GROUP, enums.ChatType.SUPERGROUP})
def group_filter(_, __, m: CallbackQuery | Message):
if isinstance(m, Message):
value = m.chat
elif isinstance(m, CallbackQuery):
value = m.message.chat
else:
raise ValueError(f"Group filter doesn't work with {type(m)}")
return bool(value and value.type in {enums.ChatType.GROUP, enums.ChatType.SUPERGROUP})


group = create(group_filter)
Expand All @@ -479,8 +491,14 @@ def group_filter(_, __, m: Message):


# region channel_filter
def channel_filter(_, __, m: Message):
return bool(m.chat and m.chat.type == enums.ChatType.CHANNEL)
def channel_filter(_, __, m: CallbackQuery | Message):
if isinstance(m, Message):
value = m.chat
elif isinstance(m, CallbackQuery):
value = m.message.chat
else:
raise ValueError(f"Channel filter doesn't work with {type(m)}")
return bool(value and value.type == enums.ChatType.CHANNEL)


channel = create(channel_filter)
Expand Down
1 change: 0 additions & 1 deletion hydrogram/storage/sqlite_storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import aiosqlite

from hydrogram import raw, utils
from hydrogram.enums import ChatType

from .base import BaseStorage, InputPeer

Expand Down