From 5f44c80cd5d58221347599b11a493d2ff96a50e9 Mon Sep 17 00:00:00 2001 From: mmrabbani <56675802+mmrabbani@users.noreply.github.com> Date: Thu, 18 May 2023 00:48:37 +0330 Subject: [PATCH 1/3] Simplifying ad blocking syntax I simplified the ad blocking syntax. "category-ads-all" includes "category-ads". Also "category-ads" includes "google-ads" and "spotify-ads". So if "category-ads-all" is blocked, there is no need to block 3 other lists (category-ads,google-ads,spotify-ads) References: https://github.com/v2fly/domain-list-community/blob/master/data/category-ads https://github.com/v2fly/domain-list-community/blob/master/data/category-ads-all --- web/html/xui/settings.html | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/web/html/xui/settings.html b/web/html/xui/settings.html index 09cf61ae..3dd1f57b 100644 --- a/web/html/xui/settings.html +++ b/web/html/xui/settings.html @@ -371,9 +371,6 @@ domains: { ads: [ "geosite:category-ads-all", - "geosite:category-ads", - "geosite:google-ads", - "geosite:spotify-ads", "ext:iran.dat:ads" ], speedtest: ["geosite:speedtest"], @@ -1026,4 +1023,4 @@ }); - \ No newline at end of file + From 49f60f7775beb9e2c6cbb5ecaa0dc07ee63895a4 Mon Sep 17 00:00:00 2001 From: mmrabbani <56675802+mmrabbani@users.noreply.github.com> Date: Thu, 18 May 2023 00:50:57 +0330 Subject: [PATCH 2/3] Update traffic+block-ads+ipv4-google.json --- media/configs/traffic+block-ads+ipv4-google.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/media/configs/traffic+block-ads+ipv4-google.json b/media/configs/traffic+block-ads+ipv4-google.json index d2ca2d45..980c8e85 100644 --- a/media/configs/traffic+block-ads+ipv4-google.json +++ b/media/configs/traffic+block-ads+ipv4-google.json @@ -71,10 +71,7 @@ "type": "field", "outboundTag": "blocked", "domain": [ - "geosite:category-ads-all", - "geosite:category-ads", - "geosite:google-ads", - "geosite:spotify-ads" + "geosite:category-ads-all" ] }, { From 30042bc0475f6b99411741492440b0d62e3d5c3b Mon Sep 17 00:00:00 2001 From: mmrabbani <56675802+mmrabbani@users.noreply.github.com> Date: Thu, 18 May 2023 00:51:36 +0330 Subject: [PATCH 3/3] Update traffic+block-ads+warp.json --- media/configs/traffic+block-ads+warp.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/media/configs/traffic+block-ads+warp.json b/media/configs/traffic+block-ads+warp.json index 504a8481..ec28056c 100644 --- a/media/configs/traffic+block-ads+warp.json +++ b/media/configs/traffic+block-ads+warp.json @@ -76,10 +76,7 @@ "type": "field", "outboundTag": "blocked", "domain": [ - "geosite:category-ads-all", - "geosite:category-ads", - "geosite:google-ads", - "geosite:spotify-ads" + "geosite:category-ads-all" ] }, {