houseassassin/remnawave-bedolaga-telegram-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style: format long lines in monitoring and subscription services

Browse Source
This commit is contained in:
Fringg
2026-03-21 09:06:01 +03:00
parent 79cfcbcece
commit 3b9568fcc1
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/services/monitoring_service.py
+3 -1
View File
@@ -379,7 +379,9 @@ class MonitoringService:
uuid=user.remnawave_uuid,
# RemnaWave API accepts only ACTIVE/DISABLED — EXPIRED/LIMITED are managed internally
status=RemnaWaveUserStatus.ACTIVE if is_active else RemnaWaveUserStatus.DISABLED,
expire_at=subscription.end_date if is_active else max(subscription.end_date, current_time + timedelta(minutes=1)),
expire_at=subscription.end_date
if is_active
else max(subscription.end_date, current_time + timedelta(minutes=1)),
traffic_limit_bytes=self._gb_to_bytes(subscription.traffic_limit_gb),
traffic_limit_strategy=TrafficLimitStrategy.MONTH,
description=settings.format_remnawave_user_description(
app/services/subscription_service.py
+10 -3
View File
@@ -353,7 +353,10 @@ class SubscriptionService:
)
# Логируем если статус и end_date не согласованы (для отладки)
if subscription.status in (SubscriptionStatus.ACTIVE.value, SubscriptionStatus.TRIAL.value) and subscription.end_date <= current_time:
if (
subscription.status in (SubscriptionStatus.ACTIVE.value, SubscriptionStatus.TRIAL.value)
and subscription.end_date <= current_time
):
logger.warning(
'⚠️ update_remnawave_user: подписка имеет статус ACTIVE, но end_date <= now. Отправляем в RemnaWave как DISABLED, но НЕ меняем статус в БД.',
subscription_id=subscription.id,
@@ -373,7 +376,9 @@ class SubscriptionService:
update_kwargs = dict(
uuid=user.remnawave_uuid,
status=UserStatus.ACTIVE if is_actually_active else UserStatus.DISABLED,
expire_at=subscription.end_date if is_actually_active else max(subscription.end_date, current_time + timedelta(minutes=1)),
expire_at=subscription.end_date
if is_actually_active
else max(subscription.end_date, current_time + timedelta(minutes=1)),
traffic_limit_bytes=self._gb_to_bytes(subscription.traffic_limit_gb),
traffic_limit_strategy=get_traffic_reset_strategy(subscription.tariff),
telegram_id=user.telegram_id,
@@ -857,7 +862,9 @@ class SubscriptionService:
update_kwargs = dict(
uuid=user.remnawave_uuid,
status=UserStatus.ACTIVE if is_actually_active else UserStatus.DISABLED,
expire_at=sub.end_date if is_actually_active else max(sub.end_date, current_time + timedelta(minutes=1)),
expire_at=sub.end_date
if is_actually_active
else max(sub.end_date, current_time + timedelta(minutes=1)),
traffic_limit_bytes=self._gb_to_bytes(sub.traffic_limit_gb),
traffic_limit_strategy=traffic_strategy,
telegram_id=user.telegram_id,