Skip to content

fix(user): prevent NoneType error when additional_configs_urls is empty #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aliwwwmo wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(user): prevent NoneType error when additional_configs_urls is empty #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions hiddifypanel/panel/user/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def xray(self):
all_configs = hutils.proxy.xrayjson.configs_as_json(c['domains'], c['user'], c['expire_days'], c['profile_title'])


link_res=get_and_merge_urls(hconfig(ConfigEnum.additional_configs_urls).split("\n"))
link_res = get_and_merge_urls(hconfig(ConfigEnum.additional_configs_urls).split("\n") if hconfig(ConfigEnum.additional_configs_urls) else [])
for item in [hconfig(ConfigEnum.additional_configs_xrayjson),*link_res]:
if jsitem:=parse_json(item):
if isinstance(jsitem,list):
Expand Down Expand Up @@ -261,7 +261,7 @@ def full_singbox_imp(self):
resp = ""
else:
base_config = hutils.proxy.singbox.configs_as_json(**c)
link_res=get_and_merge_urls(hconfig(ConfigEnum.additional_configs_urls).split("\n"))
link_res = get_and_merge_urls(hconfig(ConfigEnum.additional_configs_urls).split("\n") if hconfig(ConfigEnum.additional_configs_urls) else [])
for item in [hconfig(ConfigEnum.additional_configs_singbox),*link_res]:
if jsitem:=parse_json(item):
if outbounds:=jsitem.get("outbounds"):
Expand Down Expand Up @@ -311,7 +311,7 @@ def links_imp(self, base64=False):
else:
# render_template('all_configs.txt', **c, base64=hutils.encode.do_base_64)
resp = hutils.proxy.xray.make_v2ray_configs(c['domains'], c['user'], c['expire_days'], c['ip_debug'])
link_res=get_and_merge_urls(hconfig(ConfigEnum.additional_configs_urls).split("\n"))
link_res = get_and_merge_urls(hconfig(ConfigEnum.additional_configs_urls).split("\n") if hconfig(ConfigEnum.additional_configs_urls) else [])
resp+="\n"+"\n\n".join(link_res)

if base64:
Expand Down
Loading