diff --git a/base/custom.conf b/base/custom.conf index de90780bb2924570fd11902e969a4718c1985a00..4e9df93a2a623c39a5d09d3db8b47c631e81c7b7 100644 --- a/base/custom.conf +++ b/base/custom.conf @@ -14,5 +14,6 @@ "quickSearch":1, "filterable":0 } - ] + ], + "lives":[{"group":"redirect","channels":[{"name":"我的直播","urls":["proxy://do=live&type=txt&ext=aHR0cHM6Ly9naXRjb2RlLm5ldC9xcV8yNjg5ODIzMS9UVkJveC8tL3Jhdy9tYWluL2xpdmUvemIudHh0"]}]}], } \ No newline at end of file diff --git a/js/version.txt b/js/version.txt index 0fa4ae4890372d16ea2933390c4ba9f8f28d3f8a..712bd5a680e584c8dd2e19e32ce73c0147311af7 100644 --- a/js/version.txt +++ b/js/version.txt @@ -1 +1 @@ -3.3.0 \ No newline at end of file +3.3.1 \ No newline at end of file diff --git a/utils/files.py b/utils/files.py index 2c19967e0e08f8c2f2ed255589bf4ad1802dc27c..73c6ac1bc3cbd058bfa7105e107f223168afd8a3 100644 --- a/utils/files.py +++ b/utils/files.py @@ -65,11 +65,11 @@ def custom_merge(original:dict,custom:dict): new_keys = custom.keys() updateObj = {} extend_obj = {} - for key in ['wallpaper','spider','homepage']: + for key in ['wallpaper','spider','homepage','lives']: if key in new_keys: updateObj[key] = custom[key] - for key in ['drives','sites','flags','lives','ads']: + for key in ['drives','sites','flags','ads']: if key in new_keys: extend_obj[key] = custom[key]