hiddifypanel 10.30.8.dev1__py3-none-any.whl → 10.30.9.dev1__py3-none-any.whl

hiddifypanel/panel/admin/QuickSetup.py

@@ -4,6 +4,7 @@ import uuid
 # from flask_babelex import lazy_gettext as _
 from flask import render_template, g, request
 from flask_babel import gettext as _
+from markupsafe import Markup
 import wtforms as wtf
 from flask_wtf import FlaskForm
 from flask_bootstrap import SwitchField
@@ -22,67 +23,46 @@ from hiddifypanel.models import *
 class QuickSetup(FlaskView):
     decorators = [login_required({Role.super_admin})]
 
+    def current_form(self, step=None, empty=False, next=False):
+        step = int(step or request.form.get("step") or request.args.get('step', "1"))
+        if next:
+            step = step + 1
+        form = {1: get_lang_form,
+                2: get_quick_setup_form,
+                3: get_proxy_form}
+
+        return form[step](empty=empty or next)
+
     def index(self):
         return render_template(
-            'quick_setup.html', lang_form=get_lang_form(),
-            form=get_quick_setup_form(),
-            ipv4=hutils.network.get_ip_str(4),
-            ipv6=hutils.network.get_ip_str(6),
+            'quick_setup.html',
+            form=self.current_form(),
+            # ipv4=hutils.network.get_ip_str(4),
+            # ipv6=hutils.network.get_ip_str(6),
             admin_link=admin_link(),
             show_domain_info=True)
 
     def post(self):
         if request.args.get('changepw') == "true":
             AdminUser.current_admin_or_owner().uuid = str(uuid.uuid4())
-        set_hconfig(ConfigEnum.first_setup, False)
-        quick_form = get_quick_setup_form()
-        lang_form = get_lang_form()
-        if lang_form.lang_submit.data:
-            if lang_form.validate_on_submit():
-                set_hconfig(ConfigEnum.lang, lang_form.admin_lang.data)
-                set_hconfig(ConfigEnum.admin_lang, lang_form.admin_lang.data)
-                set_hconfig(ConfigEnum.country, lang_form.country.data)
-
-                flask_babel.refresh()
-                hutils.flask.flash((_('quicksetup.setlang.success')), 'success')
-            else:
-                hutils.flask.flash((_('quicksetup.setlang.error')), 'danger')
+            db.session.commit()
 
+        set_hconfig(ConfigEnum.first_setup, False)
+        form = self.current_form()
+        if not form.validate_on_submit() or form.step.data not in ["1", "2", "3"]:
+            hutils.flask.flash(_('config.validation-error'), 'danger')
             return render_template(
-                'quick_setup.html', form=get_quick_setup_form(True),
-                lang_form=get_lang_form(),
+                'quick_setup.html', form=form,
                 admin_link=admin_link(),
                 ipv4=hutils.network.get_ip_str(4),
                 ipv6=hutils.network.get_ip_str(6),
                 show_domain_info=False)
-
-        if quick_form.validate_on_submit():
-            Domain.query.filter(Domain.domain == f'{hutils.network.get_ip_str(4)}.sslip.io').delete()
-            db.session.add(Domain(domain=quick_form.domain.data.lower(), mode=DomainType.direct))
-            set_hconfig(ConfigEnum.block_iran_sites, quick_form.block_iran_sites.data)
-            set_hconfig(ConfigEnum.decoy_domain, quick_form.decoy_domain.data)
-            # hiddify.bulk_register_configs([
-            #     # {"key": ConfigEnum.telegram_enable, "value": quick_form.enable_telegram.data == True},
-            #     # {"key": ConfigEnum.vmess_enable, "value": quick_form.enable_vmess.data == True},
-            #     # {"key": ConfigEnum.firewall, "value": quick_form.enable_firewall.data == True},
-            #     {"key": ConfigEnum.block_iran_sites, "value": quick_form.block_iran_sites.data == True},
-            #     # {"key":ConfigEnum.decoy_domain,"value":quick_form.decoy_domain.data}
-            # ])
-
-            from .Actions import Actions
-            return Actions().reinstall(domain_changed=True)
-        else:
-            hutils.flask.flash(_('config.validation-error'), 'danger')
-        return render_template(
-            'quick_setup.html', form=quick_form, lang_form=get_lang_form(True),
-            ipv4=hutils.network.get_ip_str(4),
-            ipv6=hutils.network.get_ip_str(6),
-            admin_link=admin_link(),
-            show_domain_info=False)
+        return form.post(self)
 
 
 def get_lang_form(empty=False):
     class LangForm(FlaskForm):
+        step = wtf.HiddenField(default="1")
         admin_lang = wtf.SelectField(
             _("config.admin_lang.label"), choices=[("en", _("lang.en")), ("fa", _("lang.fa")), ("pt", _("lang.pt")), ("zh", _("lang.zh")), ("ru", _("lang.ru"))],
             description=_("config.admin_lang.description"),
@@ -94,7 +74,61 @@ def get_lang_form(empty=False):
             default=hconfig(ConfigEnum.country))
         lang_submit = wtf.SubmitField(_('Submit'))
 
-    return LangForm(None)if empty else LangForm()
+        def post(self, view):
+            set_hconfig(ConfigEnum.lang, self.admin_lang.data)
+            set_hconfig(ConfigEnum.admin_lang, self.admin_lang.data)
+            set_hconfig(ConfigEnum.country, self.country.data)
+
+            flask_babel.refresh()
+            hutils.flask.flash((_('quicksetup.setlang.success')), 'success')
+
+            return render_template(
+                'quick_setup.html', form=view.current_form(next=True),
+                admin_link=admin_link(),
+                ipv4=hutils.network.get_ip_str(4),
+                ipv6=hutils.network.get_ip_str(6),
+                show_domain_info=False)
+
+    form = LangForm(None)if empty else LangForm()
+    form.step.data = "1"
+    return form
+
+
+def get_proxy_form(empty=False):
+    class ProxyForm(FlaskForm):
+        step = wtf.HiddenField(default="3")
+        description_for_fieldset = wtf.TextAreaField("", description=_(f'quicksetup.proxy_cat.description'), render_kw={"class": "d-none"})
+
+        def post(self, view):
+
+            for k, vs in self.data.items():
+                ek = ConfigEnum[k]
+                if ek != ConfigEnum.not_found:
+                    set_hconfig(ek, vs, commit=False)
+
+            db.session.commit()
+            # print(cat,vs)
+            hutils.proxy.get_proxies.invalidate_all()
+            if hutils.node.is_child():
+                hutils.node.run_node_op_in_bg(hutils.node.child.sync_with_parent, *[hutils.node.child.SyncFields.hconfigs])
+
+            from .Actions import Actions
+            return Actions().reinstall(domain_changed=True)
+    boolconfigs = BoolConfig.query.filter(BoolConfig.child_id == Child.current().id).all()
+
+    for cf in boolconfigs:
+        if cf.key.category == 'hidden':
+            continue
+        if cf.key.startswith("sub_") or cf.key.startswith("mux_"):
+            continue
+        if not cf.key.endswith("_enable") or cf.key in [ConfigEnum.hysteria_obfs_enable, ConfigEnum.tls_padding_enable]:
+            continue
+        field = SwitchField(_(f'config.{cf.key}.label'), default=cf.value, description=_(f'config.{cf.key}.description'))
+        setattr(ProxyForm, f'{cf.key}', field)
+    setattr(ProxyForm, "submit_global", wtf.fields.SubmitField(_('Submit')))
+    form = ProxyForm(None) if empty else ProxyForm()
+    form.step.data = "3"
+    return form
 
 
 def get_quick_setup_form(empty=False):
@@ -108,14 +142,22 @@ def get_quick_setup_form(empty=False):
             domains.append(d.domain)
         return domains
 
-    class QuickSetupForm(FlaskForm):
+    class BasicConfigs(FlaskForm):
+        step = wtf.HiddenField(default="2")
+        description_for_fieldset = wtf.TextAreaField("", description=_(f'quicksetup.proxy_cat.description'), render_kw={"class": "d-none"})
         domain_regex = "^([A-Za-z0-9\\-\\.]+\\.[a-zA-Z]{2,})$"
 
         domain_validators = [
-            wtf.validators.Regexp(domain_regex, re.IGNORECASE, _("config.Invalid domain")),
+            wtf.validators.Regexp(domain_regex, re.IGNORECASE, _("config.Invalid_domain")),
             validate_domain,
-            wtf.validators.NoneOf([d.domain.lower() for d in Domain.query.all()], _("config.Domain already used")),
-            wtf.validators.NoneOf([c.value.lower() for c in StrConfig.query.all() if "fakedomain" in c.key and c.key != ConfigEnum.decoy_domain], _("config.Domain already used"))]
+            wtf.validators.NoneOf([d.domain.lower() for d in Domain.query.all()], _("config.Domain_already_used")),
+            wtf.validators.NoneOf([c.value.lower() for c in StrConfig.query.all() if "fakedomain" in c.key and c.key != ConfigEnum.decoy_domain], _("config.Domain_already_used"))]
+
+        cdn_domain_validators = [
+            wtf.validators.Regexp(f'({domain_regex})|(^$)', re.IGNORECASE, _("config.Invalid_domain")),
+            validate_domain_cdn,
+            wtf.validators.NoneOf([d.domain.lower() for d in Domain.query.all()], _("config.Domain_already_used")),
+            wtf.validators.NoneOf([c.value.lower() for c in StrConfig.query.all() if "fakedomain" in c.key and c.key != ConfigEnum.decoy_domain], _("config.Domain_already_used"))]
         domain = wtf.StringField(
             _("domain.domain"),
             domain_validators,
@@ -126,16 +168,50 @@ def get_quick_setup_form(empty=False):
                 "title": domain_validators[0].message,
                 "required": "",
                 "placeholder": "sub.domain.com"})
+
+        cdn_domain = wtf.StringField(
+            _("quicksetup.cdn_domain.label"),
+            cdn_domain_validators,
+            description=_("quicksetup.cdn_domain.description"),
+            render_kw={
+                "class": "ltr",
+                "pattern": domain_validators[0].regex.pattern,
+                "title": domain_validators[0].message,
+                "placeholder": "sub.domain.com"})
         # enable_telegram = SwitchField(_("config.telegram_enable.label"), description=_("config.telegram_enable.description"), default=hconfig(ConfigEnum.telegram_enable))
         # enable_firewall = SwitchField(_("config.firewall.label"), description=_("config.firewall.description"), default=hconfig(ConfigEnum.firewall))
         block_iran_sites = SwitchField(_("config.block_iran_sites.label"), description=_(
             "config.block_iran_sites.description"), default=hconfig(ConfigEnum.block_iran_sites))
         # enable_vmess = SwitchField(_("config.vmess_enable.label"), description=_("config.vmess_enable.description"), default=hconfig(ConfigEnum.vmess_enable))
         decoy_domain = wtf.StringField(_("config.decoy_domain.label"), description=_("config.decoy_domain.description"), default=hconfig(
-            ConfigEnum.decoy_domain), validators=[wtf.validators.Regexp(domain_regex, re.IGNORECASE, _("config.Invalid domain")), hutils.flask.validate_domain_exist])
+            ConfigEnum.decoy_domain), validators=[wtf.validators.Regexp(domain_regex, re.IGNORECASE, _("config.Invalid_domain")), hutils.flask.validate_domain_exist])
         submit = wtf.SubmitField(_('Submit'))
 
-    return QuickSetupForm(None) if empty else QuickSetupForm()
+        def post(self, view):
+            Domain.query.filter(Domain.domain == f'{hutils.network.get_ip_str(4)}.sslip.io').delete()
+            db.session.add(Domain(domain=self.domain.data.lower(), mode=DomainType.direct))
+            if self.cdn_domain.data:
+                db.session.add(Domain(domain=self.cdn_domain.data.lower(), mode=DomainType.cdn))
+            set_hconfig(ConfigEnum.block_iran_sites, self.block_iran_sites.data)
+            set_hconfig(ConfigEnum.decoy_domain, self.decoy_domain.data)
+            # hiddify.bulk_register_configs([
+            #     # {"key": ConfigEnum.telegram_enable, "value": quick_form.enable_telegram.data == True},
+            #     # {"key": ConfigEnum.vmess_enable, "value": quick_form.enable_vmess.data == True},
+            #     # {"key": ConfigEnum.firewall, "value": quick_form.enable_firewall.data == True},
+            #     {"key": ConfigEnum.block_iran_sites, "value": quick_form.block_iran_sites.data == True},
+            #     # {"key":ConfigEnum.decoy_domain,"value":quick_form.decoy_domain.data}
+            # ])
+
+            return render_template(
+                'quick_setup.html', form=view.current_form(next=True),
+                # ipv4=hutils.network.get_ip_str(4),
+                # ipv6=hutils.network.get_ip_str(6),
+                admin_link=admin_link(),
+                show_domain_info=False)
+
+    form = BasicConfigs(None) if empty else BasicConfigs()
+    form.step.data = "2"
+    return form
 
 
 def validate_domain(form, field):
@@ -145,8 +221,24 @@ def validate_domain(form, field):
         raise ValidationError(_("Domain can not be resolved! there is a problem in your domain"))
 
     myip = hutils.network.get_ip(4)
-    if dip and myip != dip:
-        raise ValidationError(_("Domain (%(domain)s)-> IP=%(domain_ip)s is not matched with your ip=%(server_ip)s which is required in direct mode", server_ip=myip, domain_ip=dip, domain=domain))
+    myip6 = hutils.network.get_ip(4)
+    if dip and myip != dip and (not myip6 or myip6 != dip):
+        raise ValidationError(_("Domain (%(domain)s)-> IP=%(domain_ip)s is not matched with your ip=%(server_ip)s which is required in direct mode",
+                              server_ip=myip, domain_ip=dip, domain=domain))
+
+
+def validate_domain_cdn(form, field):
+    domain = field.data
+    if not domain:
+        return
+    dip = hutils.network.get_domain_ip(domain)
+    if dip is None:
+        raise ValidationError(_("Domain can not be resolved! there is a problem in your domain"))
+
+    myip = hutils.network.get_ip(4)
+    if myip == dip:
+        raise ValidationError(_("In CDN mode, Domain IP=%(domain_ip)s should be different to your ip=%(server_ip)s",
+                              server_ip=myip, domain_ip=dip, domain=domain))
 
 
 def admin_link():

hiddifypanel/panel/admin/SettingAdmin.py

@@ -24,6 +24,7 @@ from hiddifypanel.models import *
 from hiddifypanel.database import db
 from hiddifypanel.panel import hiddify, custom_widgets
 from hiddifypanel import __version__
+from hiddifypanel.cache import cache
 
 
 class SettingAdmin(FlaskView):
@@ -111,6 +112,8 @@ class SettingAdmin(FlaskView):
                     if p_mode != PanelMode.standalone:
                         set_hconfig(ConfigEnum.panel_mode, PanelMode.standalone)
 
+            cache.invalidate_all_cached_functions()
+            # hutils.proxy.get_proxies.invalidate_all()
             from hiddifypanel.panel.commercial.telegrambot import register_bot
             register_bot(set_hook=True)
 
@@ -194,13 +197,15 @@ def get_config_form():
             if c.key in bool_types:
                 field = SwitchField(_(f'config.{c.key}.label'), default=c.value, description=_(f'config.{c.key}.description'))
             elif c.key == ConfigEnum.core_type:
-                field = wtf.SelectField(_(f"config.{c.key}.label"), choices=[("xray", _("Xray")), ("singbox", _(
-                    "SingBox"))], description=_(f"config.{c.key}.description"), default=hconfig(c.key))
+                field = wtf.SelectField(_(f"config.{c.key}.label"),
+                                        choices=[("xray", _("Xray")), ("singbox", _("SingBox"))],
+                                        description=_(f"config.{c.key}.description"),
+                                        default=hconfig(c.key))
             elif c.key == ConfigEnum.warp_mode:
-                field = wtf.SelectField(
-                    _(f"config.{c.key}.label"), choices=[("disable", _("Disable")), ("all", _("All")), ("custom", _("Only Blocked and Local websites"))],
-                    description=_(f"config.{c.key}.description"),
-                    default=hconfig(c.key))
+                field = wtf.SelectField(_(f"config.{c.key}.label"),
+                                        choices=[("disable", _("Disable")), ("all", _("All")), ("custom", _("Only Blocked and Local websites"))],
+                                        description=_(f"config.{c.key}.description"),
+                                        default=hconfig(c.key))
 
             elif c.key == ConfigEnum.lang or c.key == ConfigEnum.admin_lang:
                 field = wtf.SelectField(
@@ -267,16 +272,16 @@ def get_config_form():
                 render_kw = {'class': "ltr"}
                 validators = []
                 if c.key == ConfigEnum.domain_fronting_domain:
-                    validators.append(wtf.validators.Regexp("^([A-Za-z0-9\\-\\.]+\\.[a-zA-Z]{2,})|$", re.IGNORECASE, _("config.Invalid domain")))
+                    validators.append(wtf.validators.Regexp("^([A-Za-z0-9\\-\\.]+\\.[a-zA-Z]{2,})|$", re.IGNORECASE, _("config.Invalid_domain")))
                     validators.append(hutils.flask.validate_domain_exist)
                 elif '_domain' in c.key or "_fakedomain" in c.key:
-                    validators.append(wtf.validators.Regexp("^([A-Za-z0-9\\-\\.]+\\.[a-zA-Z]{2,})$", re.IGNORECASE, _("config.Invalid domain")))
+                    validators.append(wtf.validators.Regexp("^([A-Za-z0-9\\-\\.]+\\.[a-zA-Z]{2,})$", re.IGNORECASE, _("config.Invalid_domain")))
                     validators.append(hutils.flask.validate_domain_exist)
 
                     if c.key != ConfigEnum.decoy_domain:
-                        validators.append(wtf.validators.NoneOf([d.domain.lower() for d in Domain.query.all()], _("config.Domain already used")))
+                        validators.append(wtf.validators.NoneOf([d.domain.lower() for d in Domain.query.all()], _("config.Domain_already_used")))
                         validators.append(wtf.validators.NoneOf(
-                            [cc.value.lower() for cc in StrConfig.query.filter(StrConfig.child_id == Child.current().id).all() if cc.key != c.key and "fakedomain" in cc.key and cc.key != ConfigEnum.decoy_domain], _("config.Domain already used")))
+                            [cc.value.lower() for cc in StrConfig.query.filter(StrConfig.child_id == Child.current().id).all() if cc.key != c.key and "fakedomain" in cc.key and cc.key != ConfigEnum.decoy_domain], _("config.Domain_already_used")))
 
                     render_kw['required'] = ""
                     if len(c.value) < 3:
@@ -292,36 +297,36 @@ def get_config_form():
                 if c.key == ConfigEnum.parent_panel:
                     validators.append(wtf.validators.Regexp("()|(http(s|)://([A-Za-z0-9\\-\\.]+\\.[a-zA-Z]{2,})/.*)", re.IGNORECASE, _("Invalid admin link")))
                 if c.key == ConfigEnum.telegram_bot_token:
-                    validators.append(wtf.validators.Regexp("()|^([0-9]{8,12}:[a-zA-Z0-9_-]{30,40})|$", re.IGNORECASE, _("config.Invalid telegram bot token")))
+                    validators.append(wtf.validators.Regexp("()|^([0-9]{8,12}:[a-zA-Z0-9_-]{30,40})|$", re.IGNORECASE, _("config.Invalid_telegram_bot_token")))
                 if c.key == ConfigEnum.branding_site:
                     validators.append(wtf.validators.Regexp(
-                        "()|(http(s|)://([A-Za-z0-9\\-\\.]+\\.[a-zA-Z]{2,})/?.*)", re.IGNORECASE, _("config.Invalid brand link")))
+                        "()|(http(s|)://([A-Za-z0-9\\-\\.]+\\.[a-zA-Z]{2,})/?.*)", re.IGNORECASE, _("config.Invalid_brand_link")))
                     # render_kw['required']=""
 
                 if 'secret' in c.key:
                     validators.append(wtf.validators.Regexp(
-                        "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$", re.IGNORECASE, _('config.invalid uuid')))
+                        "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$", re.IGNORECASE, _('config.invalid_uuid')))
                     render_kw['required'] = ""
 
                 if c.key == ConfigEnum.proxy_path:
-                    validators.append(wtf.validators.Regexp("^[a-zA-Z0-9]*$", re.IGNORECASE, _("config.Invalid proxy path")))
+                    validators.append(wtf.validators.Regexp("^[a-zA-Z0-9]*$", re.IGNORECASE, _("config.Invalid_proxy_path")))
                     render_kw['required'] = ""
 
                 if 'port' in c.key:
                     if c.key in [ConfigEnum.http_ports, ConfigEnum.tls_ports]:
-                        validators.append(wtf.validators.Regexp("^(\\d+)(,\\d+)*$", re.IGNORECASE, _("config.Invalid port")))
+                        validators.append(wtf.validators.Regexp("^(\\d+)(,\\d+)*$", re.IGNORECASE, _("config.Invalid_port")))
                         render_kw['required'] = ""
                     else:
-                        validators.append(wtf.validators.Regexp("^(\\d+)(,\\d+)*$|^$", re.IGNORECASE, _("config.Invalid port")))
+                        validators.append(wtf.validators.Regexp("^(\\d+)(,\\d+)*$|^$", re.IGNORECASE, _("config.Invalid_port")))
                     # validators.append(wtf.validators.Regexp("^(\d+)(,\d+)*$",re.IGNORECASE,_("config.port is required")))
 
                 # tls tricks validations
                 if c.key in [ConfigEnum.tls_fragment_size, ConfigEnum.tls_fragment_sleep, ConfigEnum.tls_padding_length, ConfigEnum.wireguard_noise_trick]:
-                    validators.append(wtf.validators.Regexp("^\\d+-\\d+$", re.IGNORECASE, _("config.Invalid! The pattern is number-number") + f' {c.key}'))
+                    validators.append(wtf.validators.Regexp("^\\d+-\\d+$", re.IGNORECASE, _("config.Invalid_The_pattern_is_number-number") + f' {c.key}'))
                 # mux and hysteria validations
                 if c.key in [ConfigEnum.hysteria_up_mbps, ConfigEnum.hysteria_down_mbps, ConfigEnum.mux_max_connections, ConfigEnum.mux_min_streams, ConfigEnum.mux_max_streams,
                              ConfigEnum.mux_brutal_down_mbps, ConfigEnum.mux_brutal_up_mbps]:
-                    validators.append(wtf.validators.Regexp("^\\d+$", re.IGNORECASE, _("config.Invalid! it should be a number only") + f' {c.key}'))
+                    validators.append(wtf.validators.Regexp("^\\d+$", re.IGNORECASE, _("config.Invalid_it_should_be_a_number_only") + f' {c.key}'))
 
                 for val in validators:
                     if hasattr(val, "regex"):

hiddifypanel/panel/admin/UserAdmin.py

@@ -10,7 +10,7 @@ from wtforms.validators import NumberRange
 from flask_babel import lazy_gettext as _
 from flask import g, request  # type: ignore
 from markupsafe import Markup
-from sqlalchemy import desc
+from sqlalchemy import desc, func
 
 from hiddifypanel.hutils.flask import hurl_for
 from wtforms.validators import Regexp, ValidationError
@@ -25,6 +25,7 @@ from hiddifypanel import hutils
 
 
 class UserAdmin(AdminLTEModelView):
+    column_default_sort = ('id', False)  # Sort by username in ascending order
 
     column_sortable_list = ["is_active", "name", "current_usage", 'mode', "remaining_days", "comment", 'last_online', "uuid", 'remaining_days']
     column_searchable_list = ["uuid", "name"]
@@ -112,7 +113,7 @@ class UserAdmin(AdminLTEModelView):
         # usage_limit_GB="in GB",
         # current_usage_GB="in GB"
         comment=_("Add some text that is only visible to you."),
-        mode=_("Define the user mode. Should the usage reset every month?"),
+        mode=_("user.define_mode"),
         last_reset_time=_("If monthly is enabled, the usage will be reset after 30 days from this date."),
         start_date=_("From when the user package will be started? Empty for start from first connection"),
         package_days=_("How many days this package should be available?")
@@ -376,15 +377,17 @@ class UserAdmin(AdminLTEModelView):
             abort(403)
 
         query = query.filter(User.added_by.in_(admin.recursive_sub_admins_ids()))
-        query = query.order_by(desc(User.id))
+
         return query
 
     # Override get_count_query() to include the filter condition in the count query
     def get_count_query(self):
         # Get the base count query
 
-        # query = query.session.query(func.count(User.id))
+        # query = self.session.query(func.count(User.id)).
+
         query = super().get_count_query()
+
         admin_id = int(request.args.get("admin_id") or g.account.id)
         if admin_id not in g.account.recursive_sub_admins_ids():
             abort(403)

hiddifypanel/panel/admin/templates/model/domain_list.html

@@ -1,19 +1,20 @@
 {% extends 'hiddify-flask-admin/list.html' %}
 
 {% block body %}
-    {{super()}}
+{{super()}}
 
-    <div class="callout callout-info">
-        {{_('In this section, you can add your domain. You need to add at least one domain in direct mode.')}}
-    </div>
+<div class="callout callout-info">
+    {{_('domain.intro')}}
+</div>
 
 
-    <style>
-        .table td{
-            vertical-align: middle;
-        }
-        td.col-domain{
-            /* direction:ltr; */
-        }
-    </style>
+<style>
+    .table td {
+        vertical-align: middle;
+    }
+
+    td.col-domain {
+        /* direction:ltr; */
+    }
+</style>
 {% endblock %}

hiddifypanel/panel/admin/templates/model/user_list.html

@@ -11,7 +11,8 @@
             <button onclick="show_send_message('all')" type="button" class="btn hbtn bg-h-green">
                 {{_("All Users")}}
             </button>
-            <button onclick="show_send_message('active')" type="button" class="btn hbtn bg-h-green" style="margin-left: 5px;margin-right: 5px;">
+            <button onclick="show_send_message('active')" type="button" class="btn hbtn bg-h-green"
+                style="margin-left: 5px;margin-right: 5px;">
                 {{_("Active Users")}}
             </button>
             <button onclick="show_send_message('selected')" type="button" class="btn hbtn bg-h-green">
@@ -22,9 +23,11 @@
         <div style="margin-top: 10px;">
             <button onclick="show_send_message('offline 1h')" type="button" class="btn  hbtn bg-h-red">
                 {{_("Offline more than 1 hour")}}</button>
-            <button onclick="show_send_message('offline 1d')" type="button" class="btn  hbtn bg-h-red" style="margin-left: 5px;">
+            <button onclick="show_send_message('offline 1d')" type="button" class="btn  hbtn bg-h-red"
+                style="margin-left: 5px;">
                 {{_("Offline more than 1 day")}}</button>
-            <button onclick="show_send_message('offline 1w')" type="button" class="btn hbtn bg-h-red" style="margin-left: 5px;margin-right: 5px;">
+            <button onclick="show_send_message('offline 1w')" type="button" class="btn hbtn bg-h-red"
+                style="margin-left: 5px;margin-right: 5px;">
                 {{_("Offline more than 1 week")}}
             </button>
             <button onclick="show_send_message('expired')" type="button" class="btn hbtn bg-h-red">
@@ -37,7 +40,7 @@
 {{super()}}
 
 <div class="callout callout-success">
-    {{_('User usage will be updated every 6 minutes. To update it now click <a href="%(link)s" class="btn btn-info">here</a>',link=hurl_for("admin.Actions:update_usage"))}}
+    {{_('adminuser.force_update_usage',link=hurl_for("admin.Actions:update_usage"))}}
 
 </div>
 <style>
@@ -155,4 +158,4 @@
     }
 
 </script>
-{% endblock %}
+{% endblock %}

hiddifypanel/panel/admin/templates/quick_setup.html

@@ -5,7 +5,7 @@
 {% block tail %}
 {{super()}}
 
-{{modal('quicksetup',_('Save Link'),_('Please note that your panel can be accessed only via <a href="%(adminlink)s" class="btn btn-primary copy-link">%(adminlink)s</a>. Please save this link.',adminlink=admin_link),show=Fales)}}
+{{modal('quicksetup',_('Save Link'),_('admin.save_panel_link',adminlink=admin_link),show=Fales)}}
 
 <script>
     disable_notif = false
@@ -43,26 +43,17 @@
 
 
 <div class="row">
-    <div class="card col-12">
-        <div class="card-header">{{_("config.lang.label")}}</div>
-        <div class="card-body">
 
-            <div class="row">
-                <div class="col-12">
 
-                    {{render_form(lang_form)}}
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="card">
+    <div class="card col-12">
         <div class="card-header">{{_("admin.quicksetup.title")}}</div>
         <div class="card-body">
 
             <div class="row">
                 <div class="card-columns">
+                    {% if ipv4 or ipv6 %}
                     {{_('admin.quicksetup_intro',ipv4=ip_btn(ipv4),ipv6=ip_btn(ipv6))}}
+                    {%endif%}
                     {{render_form(form,form_type="",extra_classes="card-columns1")}}
                 </div>
             </div>
@@ -71,9 +62,24 @@
 </div>
 
 <style>
+    .form-group {
+        display: inline-block;
+        width: 100%;
+    }
+
+    fieldset {
+        margin: 20px 0;
+    }
+
+    legend {
+        background: transparent;
+        margin-bottom: 20px;
+
+    }
+
     @media (min-width: 576px) {
         .card-columns {
-            column-count: 1;
+            column-count: 2;
         }
     }
 

hiddifypanel/panel/admin/templates/result.html

@@ -40,7 +40,8 @@ page."),temp_link(),show=False)}}
     <label class="col-6" id="process-title"></label> <label class="col-6" id="process-details"></label>
   </div>
   <div class="progress">
-    <div id="progress" class="progress-bar" role="progressbar" style="width: 0%" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
+    <div id="progress" class="progress-bar" role="progressbar" style="width: 0%" aria-valuenow="0" aria-valuemin="0"
+      aria-valuemax="100"></div>
   </div>
 </div>
 {% endif %}
@@ -153,7 +154,7 @@ page."),temp_link(),show=False)}}
             $("#process-title").html("")
             bootbox.alert({
               title: '{{_("Success")}}',
-              message: '{{_("The action done successfully. You can now leave this page.")}}',
+              message: '{{_("admin.action_done_sucess")}}',
               locale: '{{get_locale()}}',
             });
           }

hiddifypanel/panel/commercial/ParentDomainAdmin.py

@@ -25,7 +25,7 @@
 #     column_descriptions = dict(
 #         domain=_("domain.description"),
 #         alias=_('The name shown in the configs for this domain.'),
-#         show_domains=_('You can select the configs with which domains show be shown in the user area. If you select all, automatically, all the new domains will be added for each users.')
+#         show_domains=_('domain.show_domains_description')
 #         # current_usage_GB="in GB"
 #     )
 

hiddifypanel/panel/commercial/restapi/v2/admin/schema.py

@@ -129,6 +129,7 @@ class UserSchema(Schema):
     lang = Enum(Lang, required=False, allow_none=True, description="The language of the user")
     enable = Boolean(required=False, description="Whether the user is enabled or not")
     is_active = Boolean(required=False, description="Whether the user is active for using hiddify")
+    id = Integer(required=False, description="never use it, only for better presentation")
 
 
 class PostUserSchema(UserSchema):
@@ -137,6 +138,7 @@ class PostUserSchema(UserSchema):
         # the uuid is sent in the url path
         self.fields['uuid'].required = False
         self.fields['uuid'].allow_none = True
+        del self.fields['id']
 
 
 class PatchUserSchema(UserSchema):
@@ -146,6 +148,7 @@ class PatchUserSchema(UserSchema):
         self.fields['uuid'].allow_none = True,
         self.fields['name'].required = False
         self.fields['name'].allow_none = True,
+        del self.fields['id']
 
 
 # endregion

hiddifypanel/panel/commercial/telegrambot/Usage.py

@@ -30,10 +30,7 @@ def send_welcome(message):
         with force_locale(user.lang or hconfig(ConfigEnum.lang)):
             bot.reply_to(message, get_usage_msg(user.uuid), reply_markup=user_keyboard(user.uuid))
     else:
-        bot.reply_to(message,
-                     _("Hooray \U0001F389 \U0001F389 \U0001F389 \n"
-                       "Welcome to hiddifybot.\n"
-                       "Start by clicking the link on the panel or entering your UUID."))
+        bot.reply_to(message, _("bot.welcome"))
 
 
 def user_keyboard(uuid):

hiddifypanel/panel/commercial/telegrambot/admin.py

@@ -32,7 +32,7 @@ def send_welcome(message):
 
 def start_admin(message):
 
-    bot.reply_to(message, _("Welcome to admin bot. Choose your action"), reply_markup=admin_keyboard_main())
+    bot.reply_to(message, _("bot.admin_welcome"), reply_markup=admin_keyboard_main())
 
 
 def get_admin_by_tgid(message):
@@ -136,14 +136,14 @@ def create_package(call):  # <- passes a CallbackQuery type object to your funct
                 days = int(splt[2])
                 count = int(splt[3])
                 domain = int(splt[4])
-                new_text = _("Please Wait...")
+                new_text = _("Please Wait")
                 bot.edit_message_text(new_text, call.message.chat.id, call.message.message_id, reply_markup=None)
                 domain = Domain.query.filter(Domain.id == domain).first()
                 from . import Usage
                 admin_id = admin.id
                 admin_name = admin.name
                 for i in range(1, count + 1):
-                    new_text = _("Please Wait...") + f' {i}/{count}'
+                    new_text = _("Please Wait") + f' {i}/{count}'
                     bot.edit_message_text(new_text, call.message.chat.id, call.message.message_id, reply_markup=None)
                     user = User(package_days=days, usage_limit_GB=gig, name=f"{admin_name} auto {i}  {datetime.date.today()}", added_by=admin_id)
                     db.session.add(user)