hiddifypanel 9.0.0.dev90__py3-none-any.whl → 10.5.0.dev0__py3-none-any.whl

hiddifypanel/panel/admin/SettingAdmin.py

@@ -3,7 +3,9 @@ import flask_babel
 import flask_babel
 from flask_babel import lazy_gettext as _
 # from flask_babelex import gettext as _
-from flask import render_template, Markup, g  # type: ignore
+from flask import render_template, g  # type: ignore
+from markupsafe import Markup
+
 from hiddifypanel.hutils.flask import hurl_for
 from flask import current_app as app
 from hiddifypanel import hutils
@@ -13,7 +15,6 @@ from flask_bootstrap import SwitchField
 
 # from gettext import gettext as _
 from flask_classful import FlaskView
-from wtforms.fields import *
 from flask_wtf import FlaskForm
 
 
@@ -21,6 +22,7 @@ from hiddifypanel.models import BoolConfig, StrConfig, ConfigEnum, hconfig, Conf
 from hiddifypanel.models import *
 from hiddifypanel.database import db
 from hiddifypanel.panel import hiddify, custom_widgets
+from hiddifypanel import __version__
 
 
 class SettingAdmin(FlaskView):
@@ -37,26 +39,26 @@ class SettingAdmin(FlaskView):
         reset_action = None
         if form.validate_on_submit():
 
-            boolconfigs = BoolConfig.query.filter(BoolConfig.child_id == Child.current.id).all()
+            boolconfigs = BoolConfig.query.filter(BoolConfig.child_id == Child.current().id).all()
             bool_types = {c.key: 'bool' for c in boolconfigs}
 
             old_configs = get_hconfigs()
             changed_configs = {}
 
-            for cat, vs in form.data.items():  # [c for c in ConfigEnum]:
+            for category, c_items in form.data.items():  # [c for c in ConfigEnum]:
 
-                if isinstance(vs, dict):
+                if isinstance(c_items, dict):
                     for k in ConfigEnum:
-                        if k.name not in vs:
+                        if k.name not in c_items:
                             continue
-                        v = vs[k.name]
+                        v = c_items[k.name]
                         if k.type == str:
                             if "_domain" in k or "_fakedomain" in k:
                                 v = v.lower()
 
                             if "port" in k:
                                 for p in v.split(","):
-                                    for k2, v2 in vs.items():
+                                    for k2, v2 in c_items.items():
                                         if "port" in k2 and k.name != k2 and p in v2:
                                             hutils.flask.flash(_("Port is already used! in") + f" {k2} {k}", 'error')
                                             return render_template('config.html', form=form)
@@ -74,32 +76,63 @@ class SettingAdmin(FlaskView):
                 hutils.flask.flash(_("ProxyPath is already used! use different proxy path"), 'error')  # type: ignore
                 return render_template('config.html', form=form)
 
+            # validate parent_panel value
+            parent_apikey = ''
+            if p_p := changed_configs.get(ConfigEnum.parent_panel):
+                domain, proxy_path, uuid = hutils.flask.extract_parent_info_from_url(p_p)
+                if not domain or not proxy_path or not uuid or not hutils.node.is_panel_active(domain, proxy_path, uuid):
+                    hutils.flask.flash(_('parent.invalid-parent-url'), 'danger')  # type: ignore
+                    return render_template('config.html', form=form)
+                else:
+                    set_hconfig(ConfigEnum.parent_domain, domain)
+                    set_hconfig(ConfigEnum.parent_admin_proxy_path, proxy_path)
+                    parent_apikey = uuid
+
             for k, v in changed_configs.items():
                 set_hconfig(k, v, commit=False)
 
             db.session.commit()
             flask_babel.refresh()
 
+            # set panel mode
+            p_mode = hconfig(ConfigEnum.panel_mode)
+            if p_mode != PanelMode.parent:
+                if hconfig(ConfigEnum.parent_panel):
+                    if p_mode == PanelMode.standalone:
+                        set_hconfig(ConfigEnum.panel_mode, PanelMode.child)
+                else:
+                    if p_mode != PanelMode.standalone:
+                        set_hconfig(ConfigEnum.panel_mode, PanelMode.standalone)
+
             from hiddifypanel.panel.commercial.telegrambot import register_bot
-            register_bot()
-            # if hconfig(ConfigEnum.parent_panel):
-            #     hiddify_api.sync_child_to_parent()
+            register_bot(set_hook=True)
+
+            # sync with parent if needed
+            if hutils.node.is_child():
+                if hutils.node.child.is_registered():
+                    if not hutils.node.child.sync_with_parent():
+                        hutils.flask.flash(_('child.sync-failed'), 'danger')  # type: ignore
+                    else:  # TODO: it's just for debuging
+                        hutils.flask.flash(_('child.sync-success'))  # type: ignore
+                else:
+                    name = hconfig(ConfigEnum.unique_id)
+                    parent_info = hutils.node.get_panel_info(hconfig(ConfigEnum.parent_domain), hconfig(ConfigEnum.parent_admin_proxy_path), parent_apikey)
+                    if parent_info.get('version') != __version__:
+                        hutils.flask.flash(_('node.diff-version'), 'danger')  # type: ignore
+                    if not hutils.node.child.register_to_parent(name, parent_apikey, mode=ChildMode.remote):
+                        hutils.flask.flash(_('child.register-failed'), 'danger')  # type: ignore
+                    else:  # TODO: it's just for debuging
+                        hutils.flask.flash(_('child.register-success'))  # type: ignore
+
             reset_action = hiddify.check_need_reset(old_configs)
 
             if old_configs[ConfigEnum.admin_lang] != hconfig(ConfigEnum.admin_lang):
-
                 form = get_config_form()
         else:
             hutils.flask.flash(_('config.validation-error'), 'danger')  # type: ignore
 
         return reset_action or render_template('config.html', form=form)
 
-        # # form=HelloForm()
-        # # # return render('config.html',form=form)
-        # # return render_template('config.html',form=HelloForm())
-        # form=get_config_form()
-        # return render_template('config.html',form=form)
-
     def get_babel_string(self):
         res = ""
         strconfigs = StrConfig.query.all()
@@ -123,9 +156,8 @@ class SettingAdmin(FlaskView):
 
 
 def get_config_form():
-
-    strconfigs = StrConfig.query.filter(StrConfig.child_id == Child.current.id).all()
-    boolconfigs = BoolConfig.query.filter(BoolConfig.child_id == Child.current.id).all()
+    strconfigs = StrConfig.query.filter(StrConfig.child_id == Child.current().id).all()
+    boolconfigs = BoolConfig.query.filter(BoolConfig.child_id == Child.current().id).all()
     bool_types = {c.key: 'bool' for c in boolconfigs}
 
     configs = [*boolconfigs, *strconfigs]
@@ -135,7 +167,7 @@ def get_config_form():
 
     class DynamicForm(FlaskForm):
         pass
-    is_parent = hconfig(ConfigEnum.is_parent)
+    is_parent = hutils.node.is_parent()
 
     for cat in ConfigCategory:
         if cat == 'hidden':
@@ -146,71 +178,78 @@ def get_config_form():
             continue
 
         class CategoryForm(FlaskForm):
-            description_for_fieldset = wtf.fields.TextAreaField("", description=_(f'config.{cat}.description'), render_kw={"class": "d-none"})
+            description_for_fieldset = wtf.TextAreaField("", description=_(f'config.{cat}.description'), render_kw={"class": "d-none"})
         for c2 in cat_configs:
             if not (c2 in configs_key):
                 continue
             c = configs_key[c2]
+            if hutils.node.is_parent():
+                if c.key == ConfigEnum.parent_panel:
+                    continue
             extra_info = ''
             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.fields.SelectField(_(f"config.{c.key}.label"), choices=[("xray", _("Xray")), ("singbox", _(
+                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.fields.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.fields.SelectField(_(f"config.{c.key}.label"), choices=[("en", _("lang.en")), ("fa", Markup(_("lang.fa"))), ("zh", _(
-                    "lang.zh")), ("pt", _("lang.pt")), ("ru", _("lang.ru"))], description=_(f"config.{c.key}.description"), default=hconfig(c.key))
+                field = wtf.SelectField(
+                    _(f"config.{c.key}.label"),
+                    choices=[("en", _("lang.en")), ("fa", Markup(_("lang.fa"))), ("zh", _("lang.zh")), ("pt", _("lang.pt")), ("ru", _("lang.ru"))],
+                    description=_(f"config.{c.key}.description"),
+                    default=hconfig(c.key))
             elif c.key == ConfigEnum.country:
-                field = wtf.fields.SelectField(_(f"config.{c.key}.label"), choices=[("ir", _("Iran")), ("zh", _(
+                field = wtf.SelectField(_(f"config.{c.key}.label"), choices=[("ir", _("Iran")), ("zh", _(
                     "China")), ("other", _("Others"))], description=_(f"config.{c.key}.description"), default=hconfig(c.key))
             elif c.key == ConfigEnum.package_mode:
                 package_modes = [("release", _("Release")), ("beta", _("Beta"))]
                 if hconfig(c.key) == "develop":
                     package_modes.append(("develop", _("Develop")))
-                field = wtf.fields.SelectField(_(f"config.{c.key}.label"), choices=package_modes,
-                                               description=_(f"config.{c.key}.description"), default=hconfig(c.key))
+                field = wtf.SelectField(_(f"config.{c.key}.label"), choices=package_modes, description=_(f"config.{c.key}.description"), default=hconfig(c.key))
 
             elif c.key == ConfigEnum.shadowsocks2022_method:
-                field = wtf.fields.SelectField(_(f"config.{c.key}.label"), choices=[
-                    ("2022-blake3-aes-256-gcm", "2022-blake3-aes-256-gcm"),
-                    ("2022-blake3-chacha20-poly1305", "2022-blake3-chacha20-poly1305"),
-                ], description=_(f"config.{c.key}.description"), default=hconfig(c.key))
+                field = wtf.SelectField(
+                    _(f"config.{c.key}.label"),
+                    choices=[("2022-blake3-aes-256-gcm", "2022-blake3-aes-256-gcm"), ("2022-blake3-chacha20-poly1305", "2022-blake3-chacha20-poly1305"),],
+                    description=_(f"config.{c.key}.description"), default=hconfig(c.key))
 
             elif c.key == ConfigEnum.utls:
-                field = wtf.fields.SelectField(
+                field = wtf.SelectField(
                     _(f"config.{c.key}.label"),
-                    choices=[("none", "None"),
-                             ("chrome", "Chrome"),
-                             ("edge", "Edge"),
-                             ("ios", "iOS"),
-                             ("android", "Android"),
-                             ("safari", "Safari"),
-                             ("firefox", "Firefox"),
-                             ('random', 'random'),
-                             ('randomized', 'randomized')],
+                    choices=[
+                        ("none", "None"), ("chrome", "Chrome"), ("edge", "Edge"), ("ios", "iOS"), ("android", "Android"),
+                        ("safari", "Safari"), ("firefox", "Firefox"), ('random', 'random'), ('randomized', 'randomized')],
                     description=_(f"config.{c.key}.description"),
-                    default=hconfig(c.key))
+                    default=hconfig(c.key)
+                )
             elif c.key == ConfigEnum.telegram_lib:
                 # if hconfig(ConfigEnum.telegram_lib)=='python':
                 #     continue6
-                libs = [("python", _("lib.telegram.python")), ("tgo", _("lib.telegram.go")),
-                        ("orig", _("lib.telegram.orignal")), ("erlang", _("lib.telegram.erlang"))]
-                field = wtf.fields.SelectField(_("config.telegram_lib.label"), choices=libs, description=_(
+                libs = [
+                    ("erlang", _("lib.telegram.erlang")),
+                    ("python", _("lib.telegram.python")),
+                    ("tgo", _("lib.telegram.go")),
+                    # ("orig", _("lib.telegram.orignal")),
+                ]
+                field = wtf.SelectField(_("config.telegram_lib.label"), choices=libs, description=_(
                     "config.telegram_lib.description"), default=hconfig(ConfigEnum.telegram_lib))
             elif c.key == ConfigEnum.mux_protocol:
                 choices = [("smux", 'smux'), ("yamux", "yamux"), ("h2mux", "h2mux")]
-                field = wtf.fields.SelectField(_(f"config.{c.key}.label"), choices=choices,
-                                               description=_(f"config.{c.key}.description"), default=hconfig(c.key))
+                field = wtf.SelectField(_(f"config.{c.key}.label"), choices=choices, description=_(f"config.{c.key}.description"), default=hconfig(c.key))
 
             elif c.key == ConfigEnum.warp_sites:
-                validators = [wtf.validators.Length(max=2048)]
+                validators = [wtf.validators.Length(max=2048),
+                              wtf.validators.Regexp(r'^([\w.-]+)?(?:\n[\w.-]+)*$', re.IGNORECASE, _("config.invalid-pattern-for-warp-sites") + f' {c.key}')
+                              ]
                 render_kw = {'class': "ltr", 'maxlength': 2048}
-                field = wtf.fields.TextAreaField(_(f'config.{c.key}.label'), validators, default=c.value,
-                                                 description=_(f'config.{c.key}.description'), render_kw=render_kw)
+                field = wtf.TextAreaField(_(f'config.{c.key}.label'), validators, default=c.value,
+                                          description=_(f'config.{c.key}.description'), render_kw=render_kw)
             elif c.key == ConfigEnum.branding_freetext:
                 validators = [wtf.validators.Length(max=2048)]
                 render_kw = {'class': "ltr", 'maxlength': 2048}
@@ -221,24 +260,27 @@ def get_config_form():
                 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(hiddify.validate_domain_exist)
+                    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(hiddify.validate_domain_exist)
+                    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([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")))
+                        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")))
+
                     render_kw['required'] = ""
                     if len(c.value) < 3:
                         c.value = hutils.network.get_random_domains(1)[0]
+
                 # if c.key ==ConfigEnum.reality_short_ids:
                 #     extra_info=f" <a target='_blank' href='{hurl_for('admin.Actions:get_some_random_reality_friendly_domain',test_domain=c.value)}'>"+_('Example Domains')+"</a>"
                 # if c.key ==ConfigEnum.reality_server_names:
                 #     validators.append(wtf.validators.Regexp("^([\w-]+\.)+[\w-]+(,\s*([\w-]+\.)+[\w-]+)*$",re.IGNORECASE,_("Invalid REALITY hostnames")))
                     # gauge width gate lamp weasel jaguar minute enough few attitude endorse situate usdt trc20 doge bep20 trx doge ltc bnb eth btc bnb
                     # enjoy control list debris chronic few door broken way negative daring life season recipe profit switch bitter casual frame aunt plate brush aerobic display
+
                 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:
@@ -272,20 +314,23 @@ def get_config_form():
                 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}'))
+
                 for val in validators:
                     if hasattr(val, "regex"):
                         render_kw['pattern'] = val.regex.pattern
                         render_kw['title'] = val.message
+
                 if c.key == ConfigEnum.reality_public_key and g.account.mode in [AdminMode.super_admin]:
                     extra_info = f" <a href='{hurl_for('admin.Actions:change_reality_keys')}'>{_('Change')}</a>"
-                field = wtf.fields.StringField(_(f'config.{c.key}.label'), validators, default=c.value,
-                                               description=_(f'config.{c.key}.description') + extra_info, render_kw=render_kw)
+
+                field = wtf.StringField(_(f'config.{c.key}.label'), validators, default=c.value,
+                                        description=_(f'config.{c.key}.description') + extra_info, render_kw=render_kw)
             setattr(CategoryForm, f'{c.key}', field)
 
-        multifield = wtf.fields.FormField(CategoryForm, Markup('<i class="fa-solid fa-plus"></i>&nbsp' + _(f'config.{cat}.label')))
+        multifield = wtf.FormField(CategoryForm, Markup('<i class="fa-solid fa-plus"></i>&nbsp' + _(f'config.{cat}.label')))
 
         setattr(DynamicForm, cat, multifield)
 
-    setattr(DynamicForm, "submit", wtf.fields.SubmitField(_('Submit')))
+    setattr(DynamicForm, "submit", wtf.SubmitField(_('Submit')))
 
     return DynamicForm()

hiddifypanel/panel/admin/UserAdmin.py

@@ -8,7 +8,9 @@ from flask_babel import gettext as __
 from .adminlte import AdminLTEModelView
 from wtforms.validators import NumberRange
 from flask_babel import lazy_gettext as _
-from flask import Markup, g, request  # type: ignore
+from flask import g, request  # type: ignore
+from markupsafe import Markup
+
 from hiddifypanel.hutils.flask import hurl_for
 from wtforms.validators import Regexp, ValidationError
 from flask import current_app
@@ -26,7 +28,7 @@ class UserAdmin(AdminLTEModelView):
     column_sortable_list = ["is_active", "name", "current_usage", 'mode', "remaining_days", "comment", 'last_online', "uuid", 'remaining_days']
     column_searchable_list = ["uuid", "name"]
     column_list = ["is_active", "name", "UserLinks", "current_usage", "remaining_days", "comment", 'last_online', 'mode', 'admin', "uuid"]
-    column_editable_list = ["comment", "name"]
+    column_editable_list = ["comment", "name", "uuid"]
     form_extra_fields = {
         'reset_days': SwitchField(_("Reset package days")),
         'reset_usage': SwitchField(_("Reset package usage")),
@@ -126,7 +128,7 @@ class UserAdmin(AdminLTEModelView):
     def _enable_formatter(view, context, model, name):
         if model.is_active:
             link = '<i class="fa-solid fa-circle-check text-success"></i> '
-        elif len(model.ips):
+        elif len(model.devices):
             link = '<i class="fa-solid fa-users-slash text-danger" title="{_("Too many Connected IPs")}"></i>'
         else:
             link = '<i class="fa-solid fa-circle-xmark text-danger"></i> '
@@ -152,8 +154,6 @@ class UserAdmin(AdminLTEModelView):
         domains = [d for d in get_panel_domains() if d.domain != request.host]
         return Markup(link + " ".join([hiddify.get_html_user_link(model, d) for d in domains]))
 
-    def _uuid_formatter(view, context, model, name):
-        return Markup(f"<span>{model.uuid}</span>")
     # def _usage_formatter(view, context, model, name):
     #     return round(model.current_usage_GB,3)
 
@@ -201,7 +201,7 @@ class UserAdmin(AdminLTEModelView):
     column_formatters = {
         # 'name': _name_formatter,
         'UserLinks': _ul_formatter,
-        'uuid': _uuid_formatter,
+        # 'uuid': _uuid_formatter,
         'current_usage': _usage_formatter,
         "remaining_days": _expire_formatter,
         'last_online': _online_formatter,
@@ -273,14 +273,16 @@ class UserAdmin(AdminLTEModelView):
                                   active=g.account.max_active_users, total=g.account.max_users))
         if old_user and old_user.uuid != model.uuid:
             user_driver.remove_client(old_user)
-        if not model.ed25519_private_key:
-            priv, publ = hiddify.get_ed25519_private_public_pair()
-            model.ed25519_private_key = priv
-            model.ed25519_public_key = publ
-        if not model.wg_pk:
-            model.wg_pk, model.wg_pub, model.wg_psk = hiddify.get_wg_private_public_psk_pair()
-        # model.expiry_time=datetime.date.today()+datetime.timedelta(days=model.expiry_time)
 
+        # generated automatically
+        # if not model.ed25519_private_key:
+        #     priv, publ = hutils.crypto.get_ed25519_private_public_pair()
+        #     model.ed25519_private_key = priv
+        #     model.ed25519_public_key = publ
+        # if not model.wg_pk:
+        #     model.wg_pk, model.wg_pub, model.wg_psk = hutils.crypto.get_wg_private_public_psk_pair()
+
+        # model.expiry_time=datetime.date.today()+datetime.timedelta(days=model.expiry_time)
         # if model.current_usage_GB < model.usage_limit_GB:
         #     xray_api.add_client(model.uuid)
         # else:
@@ -297,10 +299,16 @@ class UserAdmin(AdminLTEModelView):
             user_driver.remove_client(model)
         hiddify.quick_apply_users()
 
+        if hutils.node.is_parent():
+            hutils.node.parent.request_childs_to_sync()
+
     def after_model_delete(self, model):
         user_driver.remove_client(model)
         hiddify.quick_apply_users()
 
+        if hutils.node.is_parent():
+            hutils.node.parent.request_childs_to_sync()
+
     def get_list(self, page, sort_column, sort_desc, search, filters, page_size=50, *args, **kwargs):
         res = None
         # print('aaa',args, kwargs)
@@ -309,26 +317,19 @@ class UserAdmin(AdminLTEModelView):
 
             if search:
                 from sqlalchemy import or_
-
-                # Assume 'name' is a field in your model you want to search in.
-                search_conditions = or_(self.model.name.contains(search), self.model.uuid.contains(search))
-
+                search_conditions = or_(self.model.name.contains(search), self.model.uuid == search)
                 query = query.filter(search_conditions)
 
             data = query.all()
             count = len(data)
-
-            # Sorting the data
             data = sorted(data, key=lambda p: getattr(p, sort_column), reverse=sort_desc)
 
             # Applying pagination
             start = page * page_size
             end = start + page_size
             data = data[start: end]
-
             res = count, data
         else:
-
             res = super().get_list(page, sort_column, sort_desc, search=search, filters=filters, page_size=page_size, *args, **kwargs)
         return res
 

hiddifypanel/panel/admin/templates/index.html

@@ -148,7 +148,7 @@
 </div>
 
 </div>
-{% if hconfig(ConfigEnum.is_parent) %}
+{% if hutils.node.is_parent() %}
 {% include 'parent_dash.html' %}
 {% endif %}
 {% endblock %}

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

@@ -7,26 +7,37 @@
         <summary>
             {{_("Send Message to User's Telegram")}}
         </summary>
-        <button onclick="show_send_message('all')" type="button" class="btn hbtn bg-h-blue">{{_("All Users")}}</button>
-        <button onclick="show_send_message('expired')" type="button" class="btn hbtn bg-h-red">
-            {{_("Expired Users")}}</button>
-        <button onclick="show_send_message('active')" type="button" class="btn hbtn bg-h-green">
-            {{_("Active Users")}}</button>
-        <br>
-        <button onclick="show_send_message('offline 1h')" type="button" class="btn  hbtn bg-h-orange">
-            {{_("Offline more than 1 hour")}}</button>
-        <button onclick="show_send_message('offline 1d')" type="button" class="btn  hbtn bg-h-red">
-            {{_("Offline more than 1 day")}}</button>
-        <button onclick="show_send_message('offline 1w')" type="button" class="btn hbtn bg-h-grey">
-            {{_("Offline more than 1 week")}}</button>
+        <div style="margin-top: 10px;">
+            <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;">
+                {{_("Active Users")}}
+            </button>
+            <button onclick="show_send_message('selected')" type="button" class="btn hbtn bg-h-green">
+                {{_("Seleted Users")}}
+            </button>
+        </div>
+
+        <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;">
+                {{_("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;">
+                {{_("Offline more than 1 week")}}
+            </button>
+            <button onclick="show_send_message('expired')" type="button" class="btn hbtn bg-h-red">
+                {{_("Expired Users")}}
+            </button>
+        </div>
     </details>
 </div>
 {% endif %}
 {{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"))}}
+    {{_('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"))}}
 
 </div>
 <style>
@@ -69,23 +80,36 @@
 {% block tail_js%}
 {{super()}}
 <script>
+    function get_selected_users_id() {
+        let ids = [];
+        $('input[type="checkbox"][name="rowid"]:checked[value][class="action-checkbox"]').each(function () {
+            ids.push($(this).val());
+        });
+        return ids
+    }
     function show_send_message(id) {
+        if (id == 'selected') {
+            id = get_selected_users_id();
+            if (id.length == 0) {
+                alert(`{{_("Please select at least one user")}}`);
+                return
+            }
+        }
         bootbox.prompt({
             title: '{{_("Please type your message to send to the telegram:")}}',
             inputType: 'textarea',
             locale: '{{get_locale()}}',
-            callback: function (result) {
-                console.log(result);
-                if (!result) return
+            callback: function (msg) {
+                console.log(msg);
+                if (!msg) return
                 // let dialog = bootbox.dialog({           
                 //     message: '<p><i class="fas fa-spin fa-spinner"></i> {{_("Sending")}}</p>'
                 // });
-
                 $.ajax({
                     type: "POST",
                     url: '{{hurl_for("api_v1.sendmsgresource")}}',
 
-                    data: JSON.stringify({ 'text': result, 'id': id }),
+                    data: JSON.stringify({ 'text': msg, 'id': id }),
                     contentType: "application/json",
                     dataType: "json",
                     error: function (jqx, status, error) {
@@ -131,4 +155,4 @@
     }
 
 </script>
-{% endblock %}
+{% endblock %}

hiddifypanel/panel/admin/templates/parent_dash.html

@@ -1,6 +1,6 @@
 {% macro admin_btn(child,domain) -%}
 <div class="btn-group">
-    <a href="{hiddify.get_account_panel_link(g.account,domain,child_id=child.id)}" class="btn btn-xs btn-{{" success" if child.is_active else "warning" }} orig-link ltr" target="_blank">{{domain}}</a>
+    <a href="{{hiddify.get_account_panel_link(g.account,domain,child_id=child.id)}}" class="btn btn-xs btn-{{" success" if child.is_active else "warning" }} orig-link ltr" target="_blank">{{domain}}</a>
 </div>
 {%- endmacro -%}
 
@@ -28,7 +28,6 @@
                 <td>
                     {% if not child.is_active %}
                     <form method="post" action="remove_child">
-                        <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
                         <input type="hidden" name="child_id" value="{{child.id}}" />
                         <button type="submit" class="btn btn-xs btn-danger"><i class="fa fa-trash"></i></a>
                     </form>
@@ -37,9 +36,8 @@
                 <td class="text-center"><span class="btn btn-xs badge-{{" success" if child.is_active else "warning" }}">&nbsp{{icon('solid','check') if child.is_active else icon('solid','triangle-exclamation')}}</span>
                 </td>
                 <td>
-
                     {% for d in child.domains %}
-                    {% if d.mode !="fake" %}
+                    {% if d.mode !="fake" and d.mode != "reality"%}
                     {{admin_btn(child,d)}}
                     {% endif %}
                     {% endfor %}

hiddifypanel/panel/admin/templates/result.html

@@ -40,8 +40,7 @@ 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 %}
@@ -50,7 +49,7 @@ page."),temp_link(),show=False)}}
 {% if log_file_url %}
 <div>
 
-  <details {% if log_file=="status.log" %}open="" {% endif %}>
+  <details {% if log_file=="status.log" or log_file=="restart.log" %}open="" {% endif %}>
 
     <summary>
       <div class="btn ">

hiddifypanel/panel/cf_api.py

@@ -1,6 +1,5 @@
 import CloudFlare
-
-from hiddifypanel.models import *
+from hiddifypanel.models import hconfig, ConfigEnum
 
 
 def add_or_update_domain(domain, ip, dns_type="A", proxied=True):