From 4d86015d25b0dda6446fe77124b3807e2f4fb3db Mon Sep 17 00:00:00 2001 From: 3252a8 <3252a8@proton.me> Date: Tue, 2 Jun 2026 15:32:19 +0300 Subject: [PATCH] style: apply ruff formatting --- backend/bot/handlers/user/start.py | 6 ++---- backend/bot/services/promo_code_service.py | 2 +- backend/db/models.py | 4 +--- backend/scripts/__init__.py | 1 - backend/scripts/import_legacy.py | 3 +-- tests/test_install_script.py | 4 ++-- 6 files changed, 7 insertions(+), 13 deletions(-) diff --git a/backend/bot/handlers/user/start.py b/backend/bot/handlers/user/start.py index 8446546..5328a8c 100644 --- a/backend/bot/handlers/user/start.py +++ b/backend/bot/handlers/user/start.py @@ -473,12 +473,10 @@ async def ensure_required_channel_subscription( @router.message(CommandStart()) +@router.message(CommandStart(magic=F.args.regexp(r"^ref_([A-Za-z0-9_-]{1,64})$").as_("ref_match"))) @router.message( - CommandStart( - magic=F.args.regexp(r"^ref_([A-Za-z0-9_-]{1,64})$").as_("ref_match") - ) + CommandStart(magic=F.args.regexp(r"^promo_([A-Za-z0-9_-]{1,100})$").as_("promo_match")) ) -@router.message(CommandStart(magic=F.args.regexp(r"^promo_([A-Za-z0-9_-]{1,100})$").as_("promo_match"))) @router.message(CommandStart(magic=F.args.regexp(r"^admin_user_(\d+)$").as_("admin_user_match"))) @router.message(CommandStart(magic=F.args.regexp(r"^ticket_(\d+)$").as_("ticket_match"))) @router.message(CommandStart(magic=F.args.regexp(r"^notifications$").as_("notifications_match"))) diff --git a/backend/bot/services/promo_code_service.py b/backend/bot/services/promo_code_service.py index 6f6a63d..947550d 100644 --- a/backend/bot/services/promo_code_service.py +++ b/backend/bot/services/promo_code_service.py @@ -75,7 +75,7 @@ class PromoCodeService: "promo_code_too_many_attempts", seconds=throttle_result.retry_after or max(1, int(self.settings.BRUTE_FORCE_LOCK_SECONDS)), - ) + ) return False, _("promo_code_not_found", code=code_display) applied_code = str(promo_data.code or lookup_code) diff --git a/backend/db/models.py b/backend/db/models.py index e524d0d..585dcb4 100644 --- a/backend/db/models.py +++ b/backend/db/models.py @@ -409,9 +409,7 @@ class LegacyReferralCode(Base): user = relationship("User") - __table_args__ = ( - UniqueConstraint("source", "code", name="uq_legacy_referral_source_code"), - ) + __table_args__ = (UniqueConstraint("source", "code", name="uq_legacy_referral_source_code"),) class LegacyImportMapping(Base): diff --git a/backend/scripts/__init__.py b/backend/scripts/__init__.py index 7e7e6c0..51b3887 100644 --- a/backend/scripts/__init__.py +++ b/backend/scripts/__init__.py @@ -1,2 +1 @@ """Operational one-shot scripts shipped with the backend image.""" - diff --git a/backend/scripts/import_legacy.py b/backend/scripts/import_legacy.py index f3dbd0b..5936020 100644 --- a/backend/scripts/import_legacy.py +++ b/backend/scripts/import_legacy.py @@ -552,8 +552,7 @@ def remnashop_post_migration_actions( "new_url": _target_webhook_url(target_webhook_base_url, "/webhook/panel"), "where": "Remnawave Panel -> WEBHOOK_URL", "secret": ( - "Set the Remnawave webhook secret to the value stored in " - "PANEL_WEBHOOK_SECRET." + "Set the Remnawave webhook secret to the value stored in PANEL_WEBHOOK_SECRET." ), }, "payment_providers": payment_actions, diff --git a/tests/test_install_script.py b/tests/test_install_script.py index bc2477c..204db17 100644 --- a/tests/test_install_script.py +++ b/tests/test_install_script.py @@ -57,8 +57,8 @@ def test_shell_installer_only_prepares_data_mount_not_runtime_content(): script = INSTALL_SCRIPT.read_text(encoding="utf-8") assert 'data_dir="$TARGET_DIR/data"' in script - assert "mkdir -p \"$data_dir\"" in script - assert "chown \"$APP_UID:$APP_GID\" \"$data_dir\"" in script + assert 'mkdir -p "$data_dir"' in script + assert 'chown "$APP_UID:$APP_GID" "$data_dir"' in script assert "data_dir/themes" not in script assert "webapp-logo" not in script assert "webapp-emoji" not in script