From 68c9026fd64c7cc1faface6421608df597eceb13 Mon Sep 17 00:00:00 2001 From: Zzqqbs Date: Thu, 16 Jan 2020 16:03:14 +0800 Subject: [PATCH 1/4] Add firefox sub-list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加 mozilla 下属站点 firefox --- data/firefox | 2 ++ data/mozilla | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 data/firefox diff --git a/data/firefox b/data/firefox new file mode 100644 index 00000000..18523d75 --- /dev/null +++ b/data/firefox @@ -0,0 +1,2 @@ +firefox.com +firefox.com.cn diff --git a/data/mozilla b/data/mozilla index 3b1328dd..d66d13c5 100644 --- a/data/mozilla +++ b/data/mozilla @@ -7,3 +7,5 @@ bugzilla.org getpocket.com seamonkey-project.org rust-lang.org + +include:firefox From 42faa8b8829a3372e41e1c36dbcc6f4352a53fa0 Mon Sep 17 00:00:00 2001 From: Zzqqbs Date: Thu, 16 Jan 2020 16:04:08 +0800 Subject: [PATCH 2/4] Update gitlab --- data/gitlab | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/gitlab b/data/gitlab index 04eddbf8..5b740461 100644 --- a/data/gitlab +++ b/data/gitlab @@ -1,3 +1,5 @@ gitlab.com gitlab.net gitlab-static.net + +full:gitlab-assets.oss-cn-hongkong.aliyuncs.com From ba8ef9cc83adf743fb577707411bc170af40baa8 Mon Sep 17 00:00:00 2001 From: Zzqqbs Date: Fri, 17 Jan 2020 13:35:30 +0800 Subject: [PATCH 3/4] Add ookla-speedtest-ads sub-list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加正则匹配式用于匹配以下广告域： speed.coe.ad.jp.prod.hosts.ooklaserver.net speed.open.ad.jp.prod.hosts.ooklaserver.net --- data/category-ads | 1 + data/ookla-speedtest | 2 ++ data/ookla-speedtest-ads | 1 + 3 files changed, 4 insertions(+) create mode 100644 data/ookla-speedtest-ads diff --git a/data/category-ads b/data/category-ads index 72dd118e..144dec9c 100644 --- a/data/category-ads +++ b/data/category-ads @@ -13,6 +13,7 @@ include:kuaishou-ads include:letv-ads include:mxplayer-ads include:netease-ads +include:ookla-speedtest-ads include:sina-ads include:sohu-ads include:tappx-ads diff --git a/data/ookla-speedtest b/data/ookla-speedtest index 140c60dd..c9c4cbbf 100644 --- a/data/ookla-speedtest +++ b/data/ookla-speedtest @@ -9321,3 +9321,5 @@ full:zgb-speedtest-1.tele2.net full:zhukov.netspeed.net.nz full:zion.m3x.org full:zrh.speedtest.gtt.net + +include:ookla-speedtest-ads diff --git a/data/ookla-speedtest-ads b/data/ookla-speedtest-ads new file mode 100644 index 00000000..d99b611a --- /dev/null +++ b/data/ookla-speedtest-ads @@ -0,0 +1 @@ +regexp:^speed\.(coe|open)\.ad\.[a-z]{2,6}\.prod\.hosts\.ooklaserver\.net$ @ads From a5d3433f3910733491a934c22c2ac5021e107439 Mon Sep 17 00:00:00 2001 From: Zzqqbs Date: Fri, 17 Jan 2020 13:48:57 +0800 Subject: [PATCH 4/4] Correct mistakes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更正几处书写错误： regexp -> regex regext -> regex --- README.md | 2 +- data/ookla-speedtest-ads | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4341af83..ab1405ea 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Syntax: * Keyword begins with `keyword:`, followed by a string. * Regular expression begins with `regex:`, followed by a valid regular expression (per Golang's standard). * Full domain begins with `full:`, followed by a domain. -* Domains (including `domain`, `keyword`, `regext` and `full`) may have one or more attributes. Each attribute begins with `@` and followed by the name of the attribute. +* Domains (including `domain`, `keyword`, `regex` and `full`) may have one or more attributes. Each attribute begins with `@` and followed by the name of the attribute. ## How it works diff --git a/data/ookla-speedtest-ads b/data/ookla-speedtest-ads index d99b611a..7a081a00 100644 --- a/data/ookla-speedtest-ads +++ b/data/ookla-speedtest-ads @@ -1 +1 @@ -regexp:^speed\.(coe|open)\.ad\.[a-z]{2,6}\.prod\.hosts\.ooklaserver\.net$ @ads +regex:^speed\.(coe|open)\.ad\.[a-z]{2,6}\.prod\.hosts\.ooklaserver\.net$ @ads