From 964708dee6d0ab1f4ac48c63eb7d907fa53e16d3 Mon Sep 17 00:00:00 2001 From: Capybara-z Date: Thu, 20 Feb 2025 20:06:27 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=BF=D1=82=D0=B8=D0=BC=D0=B8=D0=B7?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D1=82=D1=80=D0=B0=D1=84=D0=B8=D0=BA?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Оптимизирован траифик, спасибо @hteppl - Исправлен баг с логами в хедере хидифая. --- handlers/keys/subscriptions.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/handlers/keys/subscriptions.py b/handlers/keys/subscriptions.py index fbd458ac..18185a32 100644 --- a/handlers/keys/subscriptions.py +++ b/handlers/keys/subscriptions.py @@ -16,6 +16,7 @@ from config import ( ) from database import get_key_details, get_servers from logger import logger +from handlers.utils import convert_to_bytes db_pool = None @@ -121,16 +122,7 @@ def calculate_traffic(cleaned_subscriptions, expiry_time_ms): if m_total: value = float(m_total.group(1)) unit = m_total.group(2).upper() - if unit == "GB": - remaining_bytes = int(value * 1073741824) - elif unit == "MB": - remaining_bytes = int(value * 1048576) - elif unit == "KB": - remaining_bytes = int(value * 1024) - elif unit == "TB": - remaining_bytes = int(value * 1099511627776) - else: - remaining_bytes = int(value) + remaining_bytes = convert_to_bytes(value, unit) country_remaining[country] = remaining_bytes num_countries = len(country_remaining) issued_per_country = TOTAL_GB @@ -222,8 +214,8 @@ async def handle_subscription(request, old_subscription=False): subscription_info = f"📄 Подписка: {email} - {time_left}" user_agent = request.headers.get("User-Agent", "") + subscription_userinfo = calculate_traffic(cleaned_subscriptions, expiry_time_ms) if "Happ" in user_agent: - subscription_userinfo = calculate_traffic(cleaned_subscriptions, expiry_time_ms) encoded_project_name = f"{PROJECT_NAME}" support_username = SUPPORT_CHAT_URL.split("https://t.me/")[-1] announce_str = f"↖️Бот | {subscription_info} | Поддержка↗️"