diff --git a/anti-ad-easylist.txt b/anti-ad-easylist.txt index 77be50d5..e51f583f 100644 --- a/anti-ad-easylist.txt +++ b/anti-ad-easylist.txt @@ -1,4 +1,4 @@ -!TIME=20200130021142 +!TIME=20200130031348 !URL=https://github.com/privacy-protection-tools/anti-AD ||201*.myhard.com^ ||8*.tianya.cn^ @@ -8,6 +8,7 @@ ||adi*.cnool.net^ ||adr-*.vindicosuite.com^ ||ads-*.hulu.com^ +||aff*.kolektiva.net^ ||anet*.tradedoubler.com^ ||ap*.jj20.com^ ||ap*.pl520.com^ @@ -210,80 +211,15 @@ ||0xxd.com^ ||0z5jn.cn^ ||1-cl0ud.com^ -||1.1010pic.com^ -||2.1010pic.com^ -||1.11467.com^ -||1.15lu.com^ -||1.201980.com^ -||1.32xp.com^ -||1.51sxue.cn^ -||1.5646.cn^ -||1.66law.cn^ +/^[1-3]\.[0-9a-z\.\-]+\.(com|cn|net|org|cc|me)$/ ||92caijing.com^ -||1.ajiyuming.com^ -||1.arpun.com^ -||1.bangdan5.com^ -||1.bh5.com.cn^ -||1.cjcp.cn^ -||1.cn716.com^ -||1.codesdq.com^ -||1.codezh.com^ -||1.dwx365.com^ -||1.feihua.com^ -||1.feihua.net.cn^ -||1.glook.cn^ -||1.guyaheng.com^ -||1.hao123.com^ ||as1.m.hao123.com^ ||mini.hao123.com^ -||1.hnyouneng.com^ -||1.huilv.cc^ -||1.huobiwang.cc^ -||1.hysou.com^ -||1.i1766.com^ -||1.ideng.com^ -||1.jeasyui.net^ -||1.jiqie.cn^ -||1.kuaidiwo.cn^ -||1.lvshi567.com^ -||1.mgff.com^ ||mm100.com^ -||1.pncdn.cn^ ||100.pncdn.cn^ -||1.proewildfire.cn^ -||1.qjhm.net^ -||1.qt86.com^ -||1.rr95.com^ -||1.sj33.net^ -||1.snzfj.net^ -||1.soufy.cn^ -||1.tongquee.com^ -||1.ttxs123.net^ -||1.tulaoshi.com^ -||1.tuxi.com.cn^ -||2.tuxi.com.cn^ -||1.uc129.com^ -||1.ufc123.com^ -||1.v-x.com.cn^ -||1.vsimg.com^ -||1.wenzhangba.cn^ -||1.win7china.com^ -||2.win7china.com^ -||1.wosoni.com^ -||1.xiaopin5.com^ -||1.xilu.com^ ||tongj.xilu.com^ ||newspage.xilu.com^ -||1.xspic.com^ ||1.xuexi.la^ -||1.yac8.net^ -||1.yuexw.com^ -||1.yxzw.com.cn^ -||1.zhev.com.cn^ -||1.zhuangxiu567.com^ -||1.zou114.com^ -||1.zuowenjun.com^ -||1.zw3e.com^ ||100.admin5.com^ ||1000dy.com^ ||100669.com^ @@ -469,9 +405,6 @@ ||1x26q3.cn^ ||1x3x.com^ ||1yk851od.com^ -||2.haoxue360.com^ -||2.heiyange.com^ -||2.rengshu.com^ ||200218.com^ ||2005net.net^ ||200summit.com^ @@ -616,10 +549,7 @@ ||2xbpub.com^ ||2zfzly.com^ ||2zm4.cn^ -||3.chuanyi5.com^ -||3.guidaye.com^ ||ff.guidaye.com^ -||3.ssqzj.com^ ||301848.com^ ||303marketplace.com^ ||304c40d20085e.com^ @@ -10525,8 +10455,6 @@ ||foxypp.com^ ||fp.jj59.com^ ||fp.nanrenwo.net^ -||1.nanrenwo.net^ -||2.nanrenwo.net^ ||kuhou.com^ ||fpb1.apple886.com^ ||fpb1.gxfin.com^ @@ -29116,12 +29044,6 @@ ||0aqpqdju.me^ ||0x5.me^ ||allyes.com.cn^ -||1.bashenghuo.com^ -||2.bashenghuo.com^ -||1.chcx.cn^ -||1.letvlive.com^ -||2.letvlive.com^ -||1.wps.cn^ ||android-lrcresource.wps.cn^ ||api.mini.wps.cn^ ||crashes.mo.wps.cn^ @@ -29137,7 +29059,6 @@ ||push.wps.cn^ ||spinfo.wps.cn^ ||teinfo.wps.cn^ -||1.xiaozhizhijia.com^ ||114so.cn^ ||1178.shucong.com^ ||123.ydylwang.net^ diff --git a/tools/easylist-extend.php b/tools/easylist-extend.php index 6bb355a0..2fbba2fb 100644 --- a/tools/easylist-extend.php +++ b/tools/easylist-extend.php @@ -67,7 +67,7 @@ $ARR_MERGED_WILD_LIST = array( $ARR_REGEX_LIST = array( '/^01daa\.[a-z]+\.com$/' => null, '/^9377[a-z]{2}\.com$/' => null, -// '/^[1-3]\.[0-9a-z\.\-]+\.(com|cn|net|org)$/' => null, + '/^[1-3]\.[0-9a-z\.\-]+\.(com|cn|net|org|cc|me)$/' => null, // '/^a1\.[0-9a-z\.]+\.(com|cn|org|net|me)$/' => null, '/^ad([0-9]|m|s)?\./' => null, '/^affiliat(es|ion|e)\./' => null, @@ -97,7 +97,6 @@ $ARR_WHITE_RULE_BLK_LIST = array( //针对上游通配符规则中anti-AD不予采信的规则,即通配符黑名单 $ARR_WILD_BLK_LIST = array( - 'aff*.kolektiva.net' => null, 'cnt*rambler.ru' => null, );