From 489212d0c81d1fa75375b90d5ff52dd7d0bff367 Mon Sep 17 00:00:00 2001 From: gently Date: Wed, 4 Mar 2020 22:10:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AD=A3=E5=88=99=E8=A1=A8?= =?UTF-8?q?=E8=BE=BE=E5=BC=8F=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anti-ad-easylist.txt | 48 +++++++++------------------------------ tools/easylist-extend.php | 18 +++++++-------- 2 files changed, 20 insertions(+), 46 deletions(-) diff --git a/anti-ad-easylist.txt b/anti-ad-easylist.txt index 97ef012d..3f94cc46 100644 --- a/anti-ad-easylist.txt +++ b/anti-ad-easylist.txt @@ -1,7 +1,7 @@ !TITLE=anti-AD -!VER=20200303145747 +!VER=20200304140951 !URL=https://github.com/privacy-protection-tools/anti-AD -!TOTAL_LINES=31623 +!TOTAL_LINES=31597 ||201*.myhard.com^ ||8*.tianya.cn^ ||a*.chajiaotong.com^ @@ -360,7 +360,7 @@ ||165a7c15380874ef3.com^ ||168.it168.com^ ||adshow.it168.com^ -/^(web)?stats?\./ +/^(\S+\.)?(web)?stats?\./ ||1680go.com^ ||168logger.com^ ||168xiazai.com^ @@ -1409,7 +1409,7 @@ ||a.thn21.com^ ||a.tiyuxiu.com^ ||a.tovarro.com^ -/^counter(\-|\.)/ +/^(\S+\.)?counter(\-|\.)/ ||a.tvsou.com^ ||c.tvsou.com^ ||b.tvsou.com^ @@ -1616,7 +1616,7 @@ ||abnad.net^ ||abodealley.com^ ||aboutads.quantcast.com^ -/^widgets?\./ +/^(\S+\.)?widgets?\./ ||abrsamar.com^ ||abs.proxistore.com^ ||abserv123.com^ @@ -1640,7 +1640,7 @@ ||ac.berlinonline.de^ ||boss.berlinonline.de^ ||ac.express.de^ -/^track(ing)?\./ +/^(\S+\.)?track(ing)?\./ ||ac.mz-web.de^ ||ac1.786ip.com^ ||ac1.faxingchina.com^ @@ -1986,7 +1986,7 @@ ||adgeiros.pw^ ||adgent007.com^ ||adgeo.163.com^ -/^analytics(\-|\.)/ +/^(\S+\.)?analytics(\-|\.)/ ||bobo.163.com^ ||count.mail.163.com^ ||crashlytics.163.com^ @@ -3836,7 +3836,7 @@ ||shadu.baidu.com^ ||sobar.baidu.com^ ||tk.baidu.com^ -/^toolbar\./ +/^(\S+\.)?toolbar\./ ||tracker.baidu.com^ ||tuijian.baidu.com^ ||ucstat.baidu.com^ @@ -4882,22 +4882,12 @@ ||beacon.shazam.com^ ||beacon.sina.com.cn^ ||count.video.sina.com.cn^ -||d1.sina.com.cn^ -||d2.sina.com.cn^ -||d3.sina.com.cn^ -||d4.sina.com.cn^ -||d5.sina.com.cn^ +/^(\S+\.)?d[0-9]+\.sina\.com\.cn/ ||interest.mix.sina.com.cn^ ||matwbp.iask.sina.com.cn^ ||p4p.sina.com.cn^ ||pfp.sina.com.cn^ ||cre.mix.sina.com.cn^ -||d0.sina.com.cn^ -||d00.sina.com.cn^ -||d6.sina.com.cn^ -||d7.sina.com.cn^ -||d8.sina.com.cn^ -||d9.sina.com.cn^ ||dcads.sina.com.cn^ ||img.adbox.sina.com.cn^ ||int.dpool.sina.com.cn^ @@ -6866,7 +6856,7 @@ ||cod.bitrec.com^ ||cod.southmoney.com^ ||icn.southmoney.com^ -/^tongji\./ +/^(\S+\.)?tongji\./ ||codata.ru^ ||code.ditiezu.net^ ||ts166.net^ @@ -11203,7 +11193,6 @@ ||install.kugou.com^ ||install2.kugou.com^ ||kgmobilestat.kugou.com^ -||log.stat.kugou.com^ ||log.web.kugou.com^ ||mobilelog.kugou.com^ ||mvads.kugou.com^ @@ -11494,7 +11483,7 @@ ||mail-ads.google.com^ ||plusone.google.com^ ||video-stats.video.google.com^ -/^adservice\.google\./ +/^(\S+\.)?adservice\.google\./ ||afd.l.google.com^ ||mobileads.google.com^ ||pagead-tpc.l.google.com^ @@ -12926,7 +12915,6 @@ ||yt-adp.ws.126.net^ ||android.push.126.net^ ||iadmusicmat.music.126.net^ -||m.analytics.126.net^ ||news.push.126.net^ ||pg-ad-b1.ws.126.net^ ||pg-ad-b2.ws.126.net^ @@ -20705,7 +20693,6 @@ ||agd2.p.360.cn^ ||api.shuaji.360.cn^ ||api.so.lianmeng.360.cn^ -||click.stat.hao.360.cn^ ||cm.dmp.360.cn^ ||cm.lianmeng.360.cn^ ||cpull.360.cn^ @@ -23436,7 +23423,6 @@ ||tracker.secretescapes.com^ ||tracker.shopclues.com^ ||tracker.softcube.com^ -||tracker.stats.in.th^ ||tracker.stileo.it^ ||tracker.thinkindot.com^ ||tracker.timesgroup.com^ @@ -28177,7 +28163,6 @@ ||migcreport.g.mi.com^ ||mis.g.mi.com^ ||mivideo.g.mi.com^ -||sg.a.stat.mi.com^ ||staging.admin.e.mi.com^ ||youmi.net^ ||irs01.com^ @@ -28206,7 +28191,6 @@ ||a.qiao024.com^ ||a.shangz99991.com^ ||a.slsbc.cn^ -||a.stat.xiaomi.com^ ||bss.pandora.xiaomi.com^ ||de.pandora.xiaomi.com^ ||dvb.pandora.xiaomi.com^ @@ -28370,17 +28354,12 @@ ||susapi.lenovomm.com^ ||adcount.yoka.com^ ||addata.ku6.com^ -||pq.stat.ku6.com^ ||pvdata.ku6.com^ ||stat0.888.ku6.com^ ||stat1.888.ku6.com^ ||stat2.888.ku6.com^ ||stat3.888.ku6.com^ ||static.ku6.com^ -||v0.stat.ku6.com^ -||v1.stat.ku6.com^ -||v2.stat.ku6.com^ -||v3.stat.ku6.com^ ||addl.easetuner.com^ ||adeaz.com^ ||adeq.hiidc.com.cn^ @@ -28612,7 +28591,6 @@ ||api.adxpand.com^ ||api.ahjinshu.com^ ||api.aixifan.com^ -||api.analytics.omgpop.com^ ||dianru.com^ ||api.anti.wauee.com^ ||static.wauee.com^ @@ -28652,7 +28630,6 @@ ||shuzilm.cn^ ||api.ssp.adoceans.com^ ||api.ssp.zxrtb.com^ -||api.tongji.today^ ||api.touchxd.com^ ||api.ts.feedback.qy.net^ ||msg.qy.net^ @@ -29216,7 +29193,6 @@ ||promote.biz.weibo.cn^ ||dps.499.cn^ ||dps.shouji56.com^ -||xz.tongji.shouji56.com^ ||dps.wtdtjs.com^ ||dpvc1.qqyy.com^ ||dpvc2.qqyy.com^ @@ -29541,8 +29517,6 @@ ||zx.docin.com^ ||fpbbdx1.51240.com^ ||fs.uc.nearme.com.cn^ -||i.stat.nearme.com.cn^ -||kv.stat.nearme.com.cn^ ||fsjsp.com^ ||moad.cn^ ||ftpcontent.worldnow.com^ diff --git a/tools/easylist-extend.php b/tools/easylist-extend.php index 7366e9b3..98070d8c 100644 --- a/tools/easylist-extend.php +++ b/tools/easylist-extend.php @@ -67,21 +67,21 @@ $ARR_MERGED_WILD_LIST = array( ); $ARR_REGEX_LIST = array( - '/01daa\.[a-z]+\.com$/' => null, '/9377[a-z]{2}\.com$/' => null, '/^(\S+\.)?ad([0-9]|m|s)?\./' => null, '/^(\S+\.)?affiliat(es|ion|e)\./' => null, '/afgr[0-9]{1,2}\.com$/' => null, - '/^analytics(\-|\.)/' => null, - '/^counter(\-|\.)/' => null, + '/^(\S+\.)?analytics(\-|\.)/' => null, + '/^(\S+\.)?counter(\-|\.)/' => null, '/^(\S+\.)?pixels?\./' => null, '/syma[a-z]\.cn$/' => null, - '/^widgets?\./' => null, - '/^(web)?stats?\./' => null, - '/^track(ing)?\./' => null, - '/^tongji\./' => null, - '/^toolbar\./' => null, - '/^adservice\.google\./' => null, + '/^(\S+\.)?widgets?\./' => null, + '/^(\S+\.)?(web)?stats?\./' => null, + '/^(\S+\.)?track(ing)?\./' => null, + '/^(\S+\.)?tongji\./' => null, + '/^(\S+\.)?toolbar\./' => null, + '/^(\S+\.)?adservice\.google\./' => null, + '/^(\S+\.)?d[0-9]+\.sina\.com\.cn/' => null, ); //对通配符匹配或正则匹配增加的额外赦免规则