VPN/remnawave-bedolaga-telegram-bot
1
0
Fork 0
mirror of https://github.com/BEDOLAGA-DEV/remnawave-bedolaga-telegram-bot.git synced 2026-03-01 15:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev5' into bedolaga-0l8zql

Browse Source
This commit is contained in:
Egor
2025-09-23 03:31:28 +03:00
committed by GitHub
parent 2a7728a76c d266997720
commit 7abafbeaa1
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/handlers/admin/messages.py
View File

@@ -861,6 +861,7 @@ async def get_target_users(db: AsyncSession, target: str) -> list:
return [sub.user for sub in expiring_subs if sub.user]
if target == "expired":
now = datetime.utcnow()
expired_statuses = {
SubscriptionStatus.EXPIRED.value,
SubscriptionStatus.DISABLED.value,
@@ -888,6 +889,8 @@ async def get_target_users(db: AsyncSession, target: str) -> list:
and user.subscription.status == SubscriptionStatus.ACTIVE.value
and user.subscription.end_date > now
and (user.subscription.traffic_used_gb or 0) <= zero_threshold
and user.subscription.is_active
and (user.subscription.traffic_used_gb or 0) <= 0
]
if target == "trial_zero":
@@ -899,6 +902,8 @@ async def get_target_users(db: AsyncSession, target: str) -> list:
and user.subscription.status == SubscriptionStatus.TRIAL.value
and user.subscription.end_date > now
and (user.subscription.traffic_used_gb or 0) <= zero_threshold
and user.subscription.is_active
and (user.subscription.traffic_used_gb or 0) <= 0
]
return []