Skip to content
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

Jump to bottom

Add/user_status_check_in_decorated_handler #559

Merged
merged 4 commits into from
Aug 30, 2024
Merged

Add/user_status_check_in_decorated_handler #559

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2290584
Add/user_status_check_in_decorated_handler
Genek91 Jun 13, 2024
4d27faa
Merge branch 'develop' into add/user_status_check_in_decorated_handler
gorskyolga Aug 1, 2024
36c077b
Merge branch 'develop' into add/user_status_check_in_decorated_handler
gorskyolga Aug 27, 2024
92e7cb3
Merge branch 'develop' into add/user_status_check_in_decorated_handler
gorskyolga Aug 30, 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
8 changes: 6 additions & 2 deletions src/bot/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from src.bot.keyboards import get_unregistered_user_keyboard
from src.bot.services import ExternalSiteUserService
from src.core.depends import Container
from src.core.enums import UserRoles
from src.core.enums import UserRoles, UserStatus

ReturnType = TypeVar("ReturnType")
ParameterTypes = ParamSpec("ParameterTypes")
Expand Down Expand Up @@ -64,7 +64,11 @@ async def decorated_handler(
if id_hash
else await ext_site_user_service.get_by_telegram_id(telegram_user.id)
)
if ext_site_user and ext_site_user.role in list(UserRoles):
if (
ext_site_user
and ext_site_user.role in set(UserRoles)
and ext_site_user.moderation_status in set(UserStatus)
):
await handler(update, context, ext_site_user, *args, **kwargs)
else:
keyboard = await get_unregistered_user_keyboard()
Expand Down