From 967a35c54cc39754e48a949186e090447972e646 Mon Sep 17 00:00:00 2001
From: gently <1243610+gentlyxu@users.noreply.github.com>
Date: Mon, 27 Jul 2020 23:49:18 +0800
Subject: [PATCH] reduce number of lines
---
adblock-for-dnsmasq.conf | 9 ++---
anti-ad-domains.txt | 6 ++-
anti-ad-easylist.txt | 65 +++++++------------------------
anti-ad-smartdns.conf | 9 ++---
anti-ad-surge.txt | 9 ++---
scripts/lib/black_domain_list.php | 5 +++
scripts/tools/easylist-extend.php | 11 ++++++
7 files changed, 45 insertions(+), 69 deletions(-)
diff --git a/adblock-for-dnsmasq.conf b/adblock-for-dnsmasq.conf
index c836c6d4..370326e1 100644
--- a/adblock-for-dnsmasq.conf
+++ b/adblock-for-dnsmasq.conf
@@ -1,7 +1,7 @@
#TITLE=anti-AD
-#VER=20200726170955
+#VER=20200727234659
#URL=https://github.com/privacy-protection-tools/anti-AD
-#TOTAL_LINES=36685
+#TOTAL_LINES=36684
address=/00-gov.cn/
address=/kwcdn.000dn.com/
address=/kwcscdn.000dn.com/
@@ -15986,12 +15986,11 @@ address=/ijfchpiptvvzko.com/
address=/ijhpzjzjaujpov.com/
address=/ijieo.com/
address=/stat.ijinshan.com/
-address=/andmlbf.tj.ijinshan.com/
+address=/tj.ijinshan.com/
address=/apns.ios.ijinshan.com/
address=/bp.mobad.ijinshan.com/
address=/cdnimg.liehu.ijinshan.com/
-address=/d.union.ijinshan.com/
-address=/dl.union.ijinshan.com/
+address=/union.ijinshan.com/
address=/mlb.did.ijinshan.com/
address=/rcmd.pop.ijinshan.com/
address=/rcv.mobad.ijinshan.com/
diff --git a/anti-ad-domains.txt b/anti-ad-domains.txt
index 33d78761..2af29805 100644
--- a/anti-ad-domains.txt
+++ b/anti-ad-domains.txt
@@ -1,7 +1,7 @@
#TITLE=anti-AD
-#VER=20200726170955
+#VER=20200727234659
#URL=https://github.com/privacy-protection-tools/anti-AD
-#TOTAL_LINES=42097
+#TOTAL_LINES=42099
00-gov.cn
kwcdn.000dn.com
kwcscdn.000dn.com
@@ -18719,10 +18719,12 @@ ijfchpiptvvzko.com
ijhpzjzjaujpov.com
ijieo.com
stat.ijinshan.com
+tj.ijinshan.com
andmlbf.tj.ijinshan.com
apns.ios.ijinshan.com
bp.mobad.ijinshan.com
cdnimg.liehu.ijinshan.com
+union.ijinshan.com
d.union.ijinshan.com
dl.union.ijinshan.com
js.stat.ijinshan.com
diff --git a/anti-ad-easylist.txt b/anti-ad-easylist.txt
index e814f87b..7317f2ff 100644
--- a/anti-ad-easylist.txt
+++ b/anti-ad-easylist.txt
@@ -1,7 +1,7 @@
!TITLE=anti-AD
-!VER=20200726232322
+!VER=20200727234659
!URL=https://github.com/privacy-protection-tools/anti-AD
-!TOTAL_LINES=34879
+!TOTAL_LINES=34840
||*.wap.xsbiquge.com^
||*serror*.wo.com.cn^
||201*.myhard.com^
@@ -125,6 +125,15 @@
||thepiratebay.*^
||adserver.*^
||advert*.*^
+||clientlog*.music.163.com^
+||brucelead*.com^
+||gostats.*^
+||gralfusnzpo*.top^
+||oiwjcsh*.top^
+||*-analytics*.huami.com^
+||count*.pconline.com.cn^
+||qchannel*.cn^
+||sda*.xyz^
||00-gov.cn^
||kwcdn.000dn.com^
||kwcscdn.000dn.com^
@@ -474,8 +483,6 @@
||adgeo.163.com^
||api.iplay.163.com^
||channel.m.163.com^
-||clientlog.music.163.com^
-||clientlog3.music.163.com^
||e-p4p.163.com^
||g.163.com^
||ipservice.163.com^
@@ -6322,12 +6329,6 @@
||brrqeprqsrvrt.com^
||brsrvr.com^
||brtsumthree.com^
-||brucelead.com^
-||bruceleadx.com^
-||bruceleadx1.com^
-||bruceleadx2.com^
-||bruceleadx3.com^
-||bruceleadx4.com^
||brysj.vip^
||m.bs641.cn^
||bs777.net^
@@ -13147,14 +13148,6 @@
||gosquared.com^
||gosrjadsh.com^
||adtools.gossipkings.com^
-||gostats.cn^
-||gostats.com^
-||gostats.de^
-||gostats.org^
-||gostats.pl^
-||gostats.ro^
-||gostats.ru^
-||gostats.vn^
||gotagy.com^
||gotchosen.com^
||gotjobbs.com^
@@ -13224,11 +13217,6 @@
||graidsee.net^
||graivaik.com^
||graizoah.com^
-||gralfusnzpo003.top^
-||gralfusnzpo004.top^
-||gralfusnzpo006.top^
-||gralfusnzpo007.top^
-||gralfusnzpo008.top^
||gnar.grammarly.com^
||gramombird.com^
||grampouz.net^
@@ -14551,10 +14539,6 @@
||huafangzhou.com^
||huahuaka.com^
||s1.hualaoye.com^
-||api-analytics-cn.huami.com^
-||api-analytics.huami.com^
-||app-analytics-cn.huami.com^
-||app-analytics.huami.com^
||huanbao110.com.cn^
||huanbaoxiangmu.xyz^
||huangdao.info^
@@ -15097,12 +15081,11 @@
||ijfchpiptvvzko.com^
||ijhpzjzjaujpov.com^
||ijieo.com^
-||andmlbf.tj.ijinshan.com^
+||tj.ijinshan.com^
||apns.ios.ijinshan.com^
||bp.mobad.ijinshan.com^
||cdnimg.liehu.ijinshan.com^
-||d.union.ijinshan.com^
-||dl.union.ijinshan.com^
+||union.ijinshan.com^
||mlb.did.ijinshan.com^
||rcmd.pop.ijinshan.com^
||rcv.mobad.ijinshan.com^
@@ -21582,12 +21565,6 @@
||oipcqenejq.com^
||oir85.cn^
||oiurtedh.com^
-||oiwjcsh001.top^
-||oiwjcsh010.top^
-||oiwjcsh011.top^
-||oiwjcsh012.top^
-||oiwjcsh013.top^
-||oiwjcsh015.top^
||ojaulrop.com^
||ojj258.com^
||ojktwzisvpb.com^
@@ -22443,9 +22420,7 @@
||pcmzn.com^
||pcommaging.site^
||bestpush.pconline.com.cn^
-||count5.pconline.com.cn^
||ivy.pconline.com.cn^
-||count6.pconline.com.cn^
||imgad0.pconline.com.cn^
||33.pcpop.com^
||ashow.pcpop.com^
@@ -23848,11 +23823,6 @@
||qbyy010.com^
||qcgg.net^
||qcgkd322.vip^
-||qchannel01.cn^
-||qchannel02.cn^
-||qchannel03.cn^
-||qchannel04.cn^
-||qchannel0d.cn^
||qcjslm.com^
||qclcdn.cn^
||report.qcloud.com^
@@ -25897,18 +25867,9 @@
||sczcxmaizy.com^
||sczhilong.cn^
||sd5doozry8.com^
-||sdaaxz.xyz^
||sdabfw.cn^
-||sdadxz.xyz^
-||sdaexz.xyz^
-||sdagxz.xyz^
-||sdahxz.xyz^
||m.sdaih.com^
||sdaiv.com^
-||sdaixz.xyz^
-||sdajxz.xyz^
-||sdakxz.xyz^
-||sdalxz.xyz^
||sdasasyydd.com^
||sddan.com^
||sddddjsjf.net^
diff --git a/anti-ad-smartdns.conf b/anti-ad-smartdns.conf
index 2553446c..40bd2e7b 100644
--- a/anti-ad-smartdns.conf
+++ b/anti-ad-smartdns.conf
@@ -1,7 +1,7 @@
#TITLE=anti-AD for SmartDNS
-#VER=20200726170955
+#VER=20200727234659
#URL=https://github.com/privacy-protection-tools/anti-AD
-#TOTAL_LINES=36685
+#TOTAL_LINES=36684
address /00-gov.cn/#
address /kwcdn.000dn.com/#
address /kwcscdn.000dn.com/#
@@ -15986,12 +15986,11 @@ address /ijfchpiptvvzko.com/#
address /ijhpzjzjaujpov.com/#
address /ijieo.com/#
address /stat.ijinshan.com/#
-address /andmlbf.tj.ijinshan.com/#
+address /tj.ijinshan.com/#
address /apns.ios.ijinshan.com/#
address /bp.mobad.ijinshan.com/#
address /cdnimg.liehu.ijinshan.com/#
-address /d.union.ijinshan.com/#
-address /dl.union.ijinshan.com/#
+address /union.ijinshan.com/#
address /mlb.did.ijinshan.com/#
address /rcmd.pop.ijinshan.com/#
address /rcv.mobad.ijinshan.com/#
diff --git a/anti-ad-surge.txt b/anti-ad-surge.txt
index 5eda226d..527f6e22 100644
--- a/anti-ad-surge.txt
+++ b/anti-ad-surge.txt
@@ -1,7 +1,7 @@
#TITLE=anti-AD
-#VER=20200726170955
+#VER=20200727234659
#URL=https://github.com/privacy-protection-tools/anti-AD
-#TOTAL_LINES=36685
+#TOTAL_LINES=36684
DOMAIN-SUFFIX,00-gov.cn
DOMAIN-SUFFIX,kwcdn.000dn.com
DOMAIN-SUFFIX,kwcscdn.000dn.com
@@ -15986,12 +15986,11 @@ DOMAIN-SUFFIX,ijfchpiptvvzko.com
DOMAIN-SUFFIX,ijhpzjzjaujpov.com
DOMAIN-SUFFIX,ijieo.com
DOMAIN-SUFFIX,stat.ijinshan.com
-DOMAIN-SUFFIX,andmlbf.tj.ijinshan.com
+DOMAIN-SUFFIX,tj.ijinshan.com
DOMAIN-SUFFIX,apns.ios.ijinshan.com
DOMAIN-SUFFIX,bp.mobad.ijinshan.com
DOMAIN-SUFFIX,cdnimg.liehu.ijinshan.com
-DOMAIN-SUFFIX,d.union.ijinshan.com
-DOMAIN-SUFFIX,dl.union.ijinshan.com
+DOMAIN-SUFFIX,union.ijinshan.com
DOMAIN-SUFFIX,mlb.did.ijinshan.com
DOMAIN-SUFFIX,rcmd.pop.ijinshan.com
DOMAIN-SUFFIX,rcv.mobad.ijinshan.com
diff --git a/scripts/lib/black_domain_list.php b/scripts/lib/black_domain_list.php
index 672f425b..79c33baf 100644
--- a/scripts/lib/black_domain_list.php
+++ b/scripts/lib/black_domain_list.php
@@ -676,6 +676,11 @@ return array(
'zbwowo.com',
'cdn-7n-pt.zbwowo.com', // https://cdn-7n-pt.zbwowo.com/pjs/as/apias0.js?c=12
),
+ 'ijinshan.com' => array(
+ 'mobad.ijinshan.com',
+ 'union.ijinshan.com',
+ 'tj.ijinshan.com',
+ ),
diff --git a/scripts/tools/easylist-extend.php b/scripts/tools/easylist-extend.php
index c56e8589..7742c6df 100644
--- a/scripts/tools/easylist-extend.php
+++ b/scripts/tools/easylist-extend.php
@@ -71,6 +71,17 @@ $ARR_MERGED_WILD_LIST = array(
'thepiratebay.*' => null,
'adserver.*' => null,
'advert*.*' => null,
+ 'clientlog*.music.163.com' => null,
+ 'brucelead*.com' => null,
+ 'gostats.*' => null,
+ 'gralfusnzpo*.top' => null,
+ 'oiwjcsh*.top' => null,
+ '*-analytics*.huami.com' => null,
+ 'count*.pconline.com.cn' => null,
+ 'qchannel*.cn' => null,
+ 'sda*.xyz' => null,
+// 'ad-*.com' => null,
+// 'ad-*.net' => null,
);
$ARR_REGEX_LIST = array(