feat(subscribe): ignore hash from url

we use it to mark subscription name
immortalwrt · Aug 8, 2024 · 64f284b · 64f284b
1 parent e2c166c
commit 64f284b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/htdocs/luci-static/resources/view/homeproxy/node.js b/htdocs/luci-static/resources/view/homeproxy/node.js
@@ -1252,7 +1252,7 @@ return view.extend({
 		/* Subscription nodes start */
 		for (var suburl of uci.get(data[0], 'subscription', 'subscription_url')) {
 			const url = new URL(suburl);
-			const urlhash = hp.calcStringMD5(suburl);
+			const urlhash = hp.calcStringMD5(suburl.replace(/#.*$/, ''));
 			const title = url.hash ? decodeURIComponent(url.hash.slice(1)) : url.hostname;
 
 			s.tab('sub_' + urlhash, _('Sub (%s)').format(title));

diff --git a/root/etc/homeproxy/scripts/update_subscriptions.uc b/root/etc/homeproxy/scripts/update_subscriptions.uc
@@ -453,6 +453,7 @@ function main() {
 	}
 
 	for (let url in subscription_urls) {
+		url = replace(url, /#.*$/, '');
 		const groupHash = calcStringMD5(url);
 		node_cache[groupHash] = {};