hiddifypanel 9.0.0.dev42__py3-none-any.whl → 9.0.0.dev44__py3-none-any.whl

hiddifypanel/VERSION

@@ -1 +1 @@
-9.0.0.dev42
+9.0.0.dev44

hiddifypanel/VERSION.py

@@ -1,3 +1,3 @@
-__version__='9.0.0.dev42'
+__version__='9.0.0.dev44'
 from datetime import datetime
-__release_date__= datetime.strptime('2024-01-09','%Y-%m-%d')
+__release_date__= datetime.strptime('2024-01-10','%Y-%m-%d')

hiddifypanel/panel/auth.py

@@ -19,6 +19,10 @@ def _get_user():
     return g.account
 
 
+def admin_session_is_exist():
+    return '_admin_id' in session
+
+
 def logout_user():
     g.account = None
     if '_user_id' in session:
@@ -28,9 +32,10 @@ def logout_user():
 
 
 def login_user(user: AdminUser | User, remember=False, duration=None, force=False, fresh=True):
+    # abort(400, f'logining user: {user} {user.is_active}')
     g.account = user
-    if not user.is_active:
-        return False
+    # if not user.is_active:
+    #     return False
 
     account_id = user.get_id()  # type: ignore
     # print('account_id', account_id)
@@ -107,8 +112,9 @@ def init_app(app):
         next_url = None
 
         if g.uuid:
-            # print("uuid", g.uuid)
+            print("uuid", g.uuid, is_admin_path)
             account = get_account_by_uuid(g.uuid, is_admin_path)
+            print(account)
             if not account:
                 return logout_redirect()
 

hiddifypanel/panel/commercial/restapi/v2/user/info_api.py

@@ -5,7 +5,8 @@ from apiflask.fields import Integer, String, Float, URL, Enum
 from flask import g, request
 from flask import current_app as app
 from hiddifypanel.panel.auth import login_required
-
+import hiddifypanel.panel.auth as auth
+from flask_babelex import gettext as _
 from hiddifypanel.models import Lang
 from hiddifypanel.models.role import Role
 from hiddifypanel.models.user import User
@@ -54,10 +55,12 @@ class InfoAPI(MethodView):
         dto.profile_reset_days = g.account.days_to_reset()
         dto.telegram_bot_url = f"https://t.me/{c['bot'].username}?start={g.account.uuid}" if c['bot'] else ""
         dto.telegram_id = c['user'].telegram_id or 0
-        dto.admin_message_html = hconfig(ConfigEnum.branding_freetext)
-        dto.admin_message_url = hconfig(ConfigEnum.branding_site)
-        dto.brand_title = hconfig(ConfigEnum.branding_title)
-        dto.brand_icon_url = ""
+        dto.admin_message_html = hconfig(ConfigEnum.branding_freetext) or _("Join our Hiddify Telegram channel to get the latest updates on Hiddify.")
+        if not hconfig(ConfigEnum.branding_freetext) and auth.admin_session_is_exist():
+            dto.admin_message_html += "<p style='font-style: italic;font-size:8px'>"+_("[Admin only visible message:] You can change this message from settings")+"</p>"
+        dto.admin_message_url = hconfig(ConfigEnum.branding_site) or "https://t.me/hiddify"
+        dto.brand_title = hconfig(ConfigEnum.branding_title) or _("Hiddify")
+        dto.brand_icon_url = "" if hconfig(ConfigEnum.branding_title) else static_url_for(filename="images/hiddify.png")
         dto.doh = f"https://{request.host}/{g.proxy_path}/dns/dns-query"
         dto.lang = c['user'].lang
         return dto

hiddifypanel/panel/common.py

@@ -28,7 +28,7 @@ def init_app(app: APIFlask):
                 'message': 'Not Found',
             }), 404
         # print(request.headers)
-        last_version = hiddify.get_latest_release_version('hiddifypanel')  # TODO: add dev update check
+        last_version = hiddify.get_latest_release_version('hiddify-panel')  # TODO: add dev update check
         if "T" in hiddifypanel.__version__:
             has_update = False
         else:
@@ -63,7 +63,7 @@ def init_app(app: APIFlask):
             # Create github issue link
             issue_link = generate_github_issue_link_for_500_error(e, trace)
 
-            last_version = hiddify.get_latest_release_version('hiddifypanel')  # TODO: add dev update check
+            last_version = hiddify.get_latest_release_version('hiddify-panel')  # TODO: add dev update check
             if "T" in hiddifypanel.__version__:
                 has_update = False
             else:

hiddifypanel/panel/user/templates/new.html

@@ -2,6 +2,7 @@
 <html>
   <head>
     <meta charset="UTF-8" />
+    
     <meta name="apple-itunes-app" content="app-id=6450534064, app-argument=streisand://import/{{profile_url}}">
     
     <link rel="icon" type="image/png" href="../static/new/assets/hiddify-logo-7617d937.png" />
@@ -10,13 +11,13 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
     <title>Hiddify | Panel</title>
-    <script type="module" crossorigin src="../static/new/assets/index-c4c80da4.js"></script>
+    <script type="module" crossorigin src="../static/new/assets/index-a180e42e.js"></script>
     <link rel="stylesheet" href="../static/new/assets/index-d9bbf489.css">
   </head>
   <body>
     <div id="root"></div>
     
-    <script src="node_modules/smartbanner.js/dist/smartbanner.min.js"></script>
+    <!--<script src="node_modules/smartbanner.js/dist/smartbanner.min.js"></script>-->
     <script>
       window.appVersion = '{{version}}';
       window.deepLink = "hiddify://import/{{profile_url}}"