From 6a434d595d50874ff3a984af4e69f2ebbc5a3cd6 Mon Sep 17 00:00:00 2001
From: Mohammad20000 <imMohammad20000@ProtonMail.com>
Date: Wed, 3 Jul 2024 13:36:28 +0330
Subject: [PATCH] Fix: subscription display in Hiddify

---
 app/views/subscription.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/views/subscription.py b/app/views/subscription.py
index d587d706..e304311a 100644
--- a/app/views/subscription.py
+++ b/app/views/subscription.py
@@ -8,19 +8,19 @@
 from app import app
 from app.db import Session, crud, get_db
 from app.models.user import UserResponse
+from app.subscription.share import encode_title, generate_subscription
 from app.templates import render_template
 from app.utils.jwt import get_subscription_payload
-from app.subscription.share import encode_title, generate_subscription
 from config import (
     SUB_PROFILE_TITLE,
     SUB_SUPPORT_URL,
     SUB_UPDATE_INTERVAL,
     SUBSCRIPTION_PAGE_TEMPLATE,
-    XRAY_SUBSCRIPTION_PATH,
     USE_CUSTOM_JSON_DEFAULT,
+    USE_CUSTOM_JSON_FOR_STREISAND,
     USE_CUSTOM_JSON_FOR_V2RAYN,
     USE_CUSTOM_JSON_FOR_V2RAYNG,
-    USE_CUSTOM_JSON_FOR_STREISAND
+    XRAY_SUBSCRIPTION_PATH
 )
 
 
@@ -192,8 +192,8 @@ def get_subscription_user_info(user: UserResponse) -> dict:
         return {
             "upload": 0,
             "download": user.used_traffic,
-            "total": user.data_limit,
-            "expire": user.expire,
+            "total": user.data_limit if user.data_limit is not None else 0,
+            "expire": user.expire if user.expire is not None else 0,
         }
 
     sub = get_subscription_payload(token)
@@ -218,7 +218,6 @@ def get_subscription_user_info(user: UserResponse) -> dict:
         "subscription-userinfo": "; ".join(
             f"{key}={val}"
             for key, val in get_subscription_user_info(user).items()
-            if val is not None
         )
     }