From 9d572f407c047103eb5c2a6bfdd414cf18188bd6 Mon Sep 17 00:00:00 2001
From: ElonJunior <ElonWang2@outlook.com>
Date: Mon, 20 Jan 2025 02:15:37 +0800
Subject: [PATCH] BanAD merge adblockclashlite

---
 resouces/cn_adblockfilters.sh  | 36 ++++------------------------------
 resouces/kr_builtin_ruleset.py |  2 +-
 2 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/resouces/cn_adblockfilters.sh b/resouces/cn_adblockfilters.sh
index e43400f9..ca4536e5 100644
--- a/resouces/cn_adblockfilters.sh
+++ b/resouces/cn_adblockfilters.sh
@@ -22,39 +22,11 @@ sing_exe="${work_dir}/sing-box"
 
 # ———————————————————————————————————————————————————————————————————————————————————————————————
 
-AD_KEYWORDS="# 广告关键词
-DOMAIN-KEYWORD,admarvel
-DOMAIN-KEYWORD,admaster
-DOMAIN-KEYWORD,adsage
-DOMAIN-KEYWORD,adsensor
-DOMAIN-KEYWORD,adsmogo
-DOMAIN-KEYWORD,adsrvmedia
-DOMAIN-KEYWORD,adsserving
-DOMAIN-KEYWORD,adsystem
-DOMAIN-KEYWORD,adwords
-DOMAIN-KEYWORD,applovin
-DOMAIN-KEYWORD,appsflyer
-DOMAIN-KEYWORD,domob
-DOMAIN-KEYWORD,duomeng
-DOMAIN-KEYWORD,dwtrack
-DOMAIN-KEYWORD,guanggao
-DOMAIN-KEYWORD,omgmta
-DOMAIN-KEYWORD,omniture
-DOMAIN-KEYWORD,openx
-DOMAIN-KEYWORD,partnerad
-DOMAIN-KEYWORD,pingfore
-DOMAIN-KEYWORD,socdm
-DOMAIN-KEYWORD,supersonicads
-DOMAIN-KEYWORD,wlmonitor
-DOMAIN-KEYWORD,zjtoolbar
-"
-
-# ———————————————————————————————————————————————————————————————————————————————————————————————
-
 
 function download_adblockfilters() {
     mkdir -p $target_dir/adblockfilters
     cd $target_dir/adblockfilters/
+    aclssr_dir=$(dirname $work_dir)/ACL4SSR
 
     file_array=("AdGuard_Base_filter.txt" "AdGuard_Chinese_filter.txt" "AdGuard_DNS_filter.txt" "AdGuard_Mobile_Ads_filter.txt" "adblockclashlite.list" "adblockclash.list")
     for file in "${file_array[@]}"; do
@@ -67,9 +39,9 @@ function download_adblockfilters() {
 
             # ad keys
             if [[ "$file" == "adblockclashlite.list" ]]; then
-                echo "$AD_KEYWORDS" > temp_file && cat "$file" >> temp_file
-                mv temp_file "$file"
-                # echo "$AD_KEYWORDS" >> $file
+                # 合并文件
+                cat "${aclssr_dir}/Clash/BanAD.list" > temp_file && cat "$file" >> temp_file
+                sort -u temp_file > "$file"
             fi
 
             #convert to json
diff --git a/resouces/kr_builtin_ruleset.py b/resouces/kr_builtin_ruleset.py
index f8463404..960d22a1 100644
--- a/resouces/kr_builtin_ruleset.py
+++ b/resouces/kr_builtin_ruleset.py
@@ -120,7 +120,7 @@ OPT_RULESET_GROUPS['cn'] = {
         'default': 'off',
         'outbound': 'block_out',
         'rules': [
-            'acl:BanAD',  # 135K = adblockclashlite
+            'acl:BanAD',  # 49K = adblockclashlite + BanAD
             'geosite:category-ads',  # 6.0K
         ],
     },