refactor

bot/services/panel_api_service.py

@@ -1,6 +1,7 @@
 import aiohttp
 import logging
 import json
+import re
 from typing import Optional, List, Dict, Any
 from datetime import datetime, timedelta, timezone
 import asyncio
@@ -345,18 +346,19 @@ class PanelApiService:
             status: str = "ACTIVE",
             log_response: bool = True) -> Optional[Dict[str, Any]]:
 
-        if not (6 <= len(username_on_panel) <= 34 and
-                username_on_panel.replace('_', '').replace('-', '').isalnum()):
-            if not (username_on_panel.startswith("tg_")
-                    and username_on_panel.split("tg_")[-1].isdigit()):
-                msg = f"Panel username '{username_on_panel}' does not meet panel requirements."
-                logging.error(msg)
-                return {
-                    "error": True,
-                    "status_code": 400,
-                    "message": msg,
-                    "errorCode": "VALIDATION_ERROR_USERNAME"
-                }
+        username_is_valid = (
+            3 <= len(username_on_panel) <= 36
+            and re.match(r"^[A-Za-z0-9_-]+$", username_on_panel) is not None
+        )
+        if not username_is_valid:
+            msg = f"Panel username '{username_on_panel}' does not meet panel requirements."
+            logging.error(msg)
+            return {
+                "error": True,
+                "status_code": 400,
+                "message": msg,
+                "errorCode": "VALIDATION_ERROR_USERNAME"
+            }
 
         now = datetime.now(timezone.utc)
         expire_at_dt = now + timedelta(days=default_expire_days)

bot/services/subscription_service.py

@@ -717,7 +717,8 @@ class SubscriptionService:
             update_payload_local = {}
             panel_status = panel_user_data.get("status", "UNKNOWN").upper()
             panel_expire_at_str = panel_user_data.get("expireAt")
-            panel_traffic_used = panel_user_data.get("usedTrafficBytes")
+            traffic_stats = panel_user_data.get("userTraffic") or {}
+            panel_traffic_used = traffic_stats.get("usedTrafficBytes")
             panel_traffic_limit = panel_user_data.get("trafficLimitBytes")
             panel_sub_uuid_from_panel = panel_user_data.get(
                 "subscriptionUuid"
@@ -781,7 +782,7 @@ class SubscriptionService:
             "status_from_panel": panel_user_data.get("status", "UNKNOWN").upper(),
             "config_link": panel_user_data.get("subscriptionUrl"),
             "traffic_limit_bytes": panel_user_data.get("trafficLimitBytes"),
-            "traffic_used_bytes": panel_user_data.get("usedTrafficBytes"),
+            "traffic_used_bytes": (panel_user_data.get("userTraffic") or {}).get("usedTrafficBytes"),
             "user_bot_username": db_user.username,
             "is_panel_data": True,
             "max_devices": hwid_limit,