Update attrs and inclusions for some !cn domains from Chinese entities (#3263)

* update the inclusion relationship of webnovel

* update the inclusion relationship of bytedance-ai-!cn

* alibabacloud: add !cn attr to some domains

they resolve to singapore and alibabacloud is serving for global area

.github/workflows/build.yml

@@ -33,15 +33,17 @@ jobs:
           echo "TAG_NAME=$(date +%Y%m%d%H%M%S)" >> $GITHUB_ENV
         shell: bash
 
-      - name: Build dlc.dat file
+      - name: Build dlc.dat and plain lists
         run: |
           cd code || exit 1
           go run ./ --outputdir=../ --exportlists=category-ads-all,tld-cn,cn,tld-\!cn,geolocation-\!cn,apple,icloud
+          go run ./cmd/datdump/main.go --inputdata=../dlc.dat --outputdir=../ --exportlists=_all_
           cd ../ && rm -rf code
 
       - name: Generate dlc.dat sha256 hash
         run: |
           sha256sum dlc.dat > dlc.dat.sha256sum
+          sha256sum dlc.dat_plain.yml > dlc.dat_plain.yml.sha256sum
 
       - name: Generate Zip
         run: |
@@ -66,6 +68,6 @@ jobs:
 
       - name: Release and upload assets
         run: |
-          gh release create ${{ env.TAG_NAME }} --generate-notes --latest --title ${{ env.RELEASE_NAME }} ./dlc.dat ./dlc.dat.*
+          gh release create ${{ env.TAG_NAME }} --generate-notes --latest --title ${{ env.RELEASE_NAME }} ./dlc.dat ./dlc.dat.* ./dlc.dat_plain.yml ./dlc.dat_plain.yml.*
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -8,4 +8,5 @@
 dlc.dat
 
 # Exported plaintext lists.
+/*.yml
 /*.txt

README.md

@@ -10,12 +10,13 @@ This project is not opinionated. In other words, it does NOT endorse, claim or i
 
 - **dlc.dat**：[https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat](https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat)
 - **dlc.dat.sha256sum**：[https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat.sha256sum](https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat.sha256sum)
+- **dlc.dat_plain.yml**：[https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat_plain.yml](https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat_plain.yml)
+- **dlc.dat_plain.yml.sha256sum**：[https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat_plain.yml.sha256sum](https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat_plain.yml.sha256sum)
 
 ## Notice
 
-Rules with `@!cn` attribute has been cast out from cn lists. `geosite:geolocation-cn@!cn` is no longer available.
-
-Check [#390](https://github.com/v2fly/domain-list-community/issues/390), [#3119](https://github.com/v2fly/domain-list-community/pull/3119) and [#3198](https://github.com/v2fly/domain-list-community/pull/3198) for more information.
+- Rules with `@!cn` attribute has been cast out from cn lists. `geosite:geolocation-cn@!cn` is no longer available. Check [#390](https://github.com/v2fly/domain-list-community/issues/390), [#3119](https://github.com/v2fly/domain-list-community/pull/3119) and [#3198](https://github.com/v2fly/domain-list-community/pull/3198) for more information.
+- Dedicated non-category ad lists like `geosite:xxx-ads` has been removed. Use `geosite:xxx@ads` instead. `geosite:category-ads[-xx]` is not affected.
 
 Please report if you have any problems or questions.
 
@@ -93,38 +94,45 @@ All data are under `data` directory. Each file in the directory represents a sub
 # comments
 include:another-file
 domain:google.com @attr1 @attr2
+full:analytics.google.com @ads
 keyword:google
-regexp:www\.google\.com$
-full:www.google.com
+regexp:^odd[1-7]\.example\.org(\.[a-z]{2})?$
 ```
 
 **Syntax:**
 
+> [!NOTE]
+> Adding new `regexp` and `keyword` rules is discouraged because it is easy to use them incorrectly, and proxy software cannot efficiently match these types of rules.
+
+> [!NOTE]
 > The following types of rules are **NOT** fully compatible with the ones that defined by user in V2Ray config file. Do **Not** copy and paste directly.
 
 - Comment begins with `#`. It may begin anywhere in the file. The content in the line after `#` is treated as comment and ignored in production.
-- Inclusion begins with `include:`, followed by the file name of an existing file in the same directory.
 - Subdomain begins with `domain:`, followed by a valid domain name. The prefix `domain:` may be omitted.
-- Keyword begins with `keyword:`, followed by a string.
-- Regular expression begins with `regexp:`, followed by a valid regular expression (per Golang's standard).
 - Full domain begins with `full:`, followed by a complete and valid domain name.
-- Domains (including `domain`, `keyword`, `regexp` and `full`) may have one or more attributes. Each attribute begins with `@` and followed by the name of the attribute.
-
-> **Note:** Adding new `regexp` and `keyword` rules is discouraged because it is easy to use them incorrectly, and proxy software cannot efficiently match these types of rules.
+- Keyword begins with `keyword:`, followed by a substring of a valid domain name.
+- Regular expression begins with `regexp:`, followed by a valid regular expression (per Golang's standard).
+- Domain rules (including `domain`, `full`, `keyword`, and `regexp`) may have none, one or more attributes. Each attribute begins with `@` and followed by the name of the attribute. Attributes will remain available in final lists and `dlc.dat`.
+- Domain rules may have none, one or more affiliations, which additionally adds the domain rule into the affiliated target list. Each affiliation begins with `&` and followed by the name of the target list (nomatter whether the target has a dedicated file in data path). This is a method for data management, and will not remain in the final lists or `dlc.dat`.
+- Inclusion begins with `include:`, followed by the name of another valid domain list. A simple `include:listb` in file `lista` means adding all domain rules of `listb` into `lista`. Inclusions with attributes stands for selective inclusion. `include:listb @attr1 @-attr2` means only adding those domain rules *with* `@attr1` **and** *without* `@attr2`. This is a special type for data management, and will not remain in the final lists or `dlc.dat`.
 
 ## How it works
 
 The entire `data` directory will be built into an external `geosite` file for Project V. Each file in the directory represents a section in the generated file.
 
-To generate a section:
+**General steps:**
 
-1. Remove all the comments in the file.
-2. Replace `include:` lines with the actual content of the file.
-3. Omit all empty lines.
-4. Generate each `domain:` line into a [sub-domain routing rule](https://github.com/v2fly/v2ray-core/blob/master/app/router/routercommon/common.proto#L21).
-5. Generate each `full:` line into a [full domain routing rule](https://github.com/v2fly/v2ray-core/blob/master/app/router/routercommon/common.proto#L23).
-6. Generate each `keyword:` line into a [plain domain routing rule](https://github.com/v2fly/v2ray-core/blob/master/app/router/routercommon/common.proto#L17).
-7. Generate each `regexp:` line into a [regex domain routing rule](https://github.com/v2fly/v2ray-core/blob/master/app/router/routercommon/common.proto#L19).
+1. Read files in the data path (ignore all comments and empty lines).
+2. Parse and resolve source data, turn affiliations and inclusions into actual domain rules in proper lists.
+3. Deduplicate and sort rules in every list.
+4. Export desired plain text lists.
+5. Generate `dlc.dat`:
+   - turn each `domain:` line into a [sub-domain routing rule](https://github.com/v2fly/v2ray-core/blob/master/app/router/routercommon/common.proto#L21).
+   - turn each `full:` line into a [full domain routing rule](https://github.com/v2fly/v2ray-core/blob/master/app/router/routercommon/common.proto#L23).
+   - turn each `keyword:` line into a [plain domain routing rule](https://github.com/v2fly/v2ray-core/blob/master/app/router/routercommon/common.proto#L17).
+   - turn each `regexp:` line into a [regex domain routing rule](https://github.com/v2fly/v2ray-core/blob/master/app/router/routercommon/common.proto#L19).
+
+Read [main.go](./main.go) for details.
 
 ## How to organize domains
 
@@ -134,7 +142,7 @@ Theoretically any string can be used as the name, as long as it is a valid file
 
 ### Attributes
 
-Attribute is useful for sub-group of domains, especially for filtering purpose. For example, the list of `google` domains may contains its main domains, as well as domains that serve ads. The ads domains may be marked by attribute `@ads`, and can be used as `geosite:google@ads` in V2Ray routing.
+Attribute is useful for sub-group of domains, especially for filtering purpose. For example, the list of `google` may contains its main domains, as well as domains that serve ads. The ads domains may be marked by attribute `@ads`, and can be used as `geosite:google@ads` in V2Ray routing. Domains and services that originate from outside China mainland but have access point in China mainland, may be marked by attribute `@cn`.
 
 ## Contribution guideline
 

cmd/datdump/main.go

@@ -0,0 +1,177 @@
+package main
+
+import (
+	"bufio"
+	"flag"
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/v2fly/domain-list-community/internal/dlc"
+	router "github.com/v2fly/v2ray-core/v5/app/router/routercommon"
+	"google.golang.org/protobuf/proto"
+)
+
+var (
+	inputData   = flag.String("inputdata", "dlc.dat", "Name of the geosite dat file")
+	outputDir   = flag.String("outputdir", "./", "Directory to place all generated files")
+	exportLists = flag.String("exportlists", "", "Lists to be exported, separated by ',' (empty for _all_)")
+)
+
+type DomainRule struct {
+	Type  string
+	Value string
+	Attrs []string
+}
+
+type DomainList struct {
+	Name  string
+	Rules []DomainRule
+}
+
+func (d *DomainRule) domain2String() string {
+	var dstr strings.Builder
+	dstr.Grow(len(d.Type) + len(d.Value) + 10)
+	dstr.WriteString(d.Type)
+	dstr.WriteByte(':')
+	dstr.WriteString(d.Value)
+	for i, attr := range d.Attrs {
+		if i == 0 {
+			dstr.WriteByte(':')
+		} else {
+			dstr.WriteByte(',')
+		}
+		dstr.WriteByte('@')
+		dstr.WriteString(attr)
+	}
+	return dstr.String()
+}
+
+func loadGeosite(path string) ([]DomainList, map[string]*DomainList, error) {
+	data, err := os.ReadFile(path)
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed to read geosite file: %w", err)
+	}
+	vgeositeList := new(router.GeoSiteList)
+	if err := proto.Unmarshal(data, vgeositeList); err != nil {
+		return nil, nil, fmt.Errorf("failed to unmarshal: %w", err)
+	}
+	domainLists := make([]DomainList, len(vgeositeList.Entry))
+	domainListByName := make(map[string]*DomainList, len(vgeositeList.Entry))
+	for i, vsite := range vgeositeList.Entry {
+		rules := make([]DomainRule, 0, len(vsite.Domain))
+		for _, vdomain := range vsite.Domain {
+			rule := DomainRule{Value: vdomain.Value}
+			switch vdomain.Type {
+			case router.Domain_RootDomain:
+				rule.Type = dlc.RuleTypeDomain
+			case router.Domain_Regex:
+				rule.Type = dlc.RuleTypeRegexp
+			case router.Domain_Plain:
+				rule.Type = dlc.RuleTypeKeyword
+			case router.Domain_Full:
+				rule.Type = dlc.RuleTypeFullDomain
+			default:
+				return nil, nil, fmt.Errorf("invalid rule type: %+v", vdomain.Type)
+			}
+			for _, vattr := range vdomain.Attribute {
+				rule.Attrs = append(rule.Attrs, vattr.Key)
+			}
+			rules = append(rules, rule)
+		}
+		domainLists[i] = DomainList{
+			Name:  strings.ToUpper(vsite.CountryCode),
+			Rules: rules,
+		}
+		domainListByName[domainLists[i].Name] = &domainLists[i]
+	}
+	return domainLists, domainListByName, nil
+}
+
+func exportSite(name string, domainListByName map[string]*DomainList) error {
+	domainList, ok := domainListByName[strings.ToUpper(name)]
+	if !ok {
+		return fmt.Errorf("list %q does not exist", name)
+	}
+	if len(domainList.Rules) == 0 {
+		return fmt.Errorf("list %q is empty", name)
+	}
+	file, err := os.Create(filepath.Join(*outputDir, name+".yml"))
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+	w := bufio.NewWriter(file)
+	fmt.Fprintf(w, "%s:\n", name)
+	for _, domain := range domainList.Rules {
+		fmt.Fprintf(w, "  - %q\n", domain.domain2String())
+	}
+	return w.Flush()
+}
+
+func exportAll(filename string, domainLists []DomainList) error {
+	file, err := os.Create(filepath.Join(*outputDir, filename))
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+	w := bufio.NewWriter(file)
+	w.WriteString("lists:\n")
+	for _, domainList := range domainLists {
+		fmt.Fprintf(w, "  - name: %s\n", strings.ToLower(domainList.Name))
+		fmt.Fprintf(w, "    length: %d\n", len(domainList.Rules))
+		w.WriteString("    rules:\n")
+		for _, domain := range domainList.Rules {
+			fmt.Fprintf(w, "      - %q\n", domain.domain2String())
+		}
+	}
+	return w.Flush()
+}
+
+func run() error {
+	// Make sure output directory exists
+	if err := os.MkdirAll(*outputDir, 0755); err != nil {
+		return fmt.Errorf("failed to create output directory: %w", err)
+	}
+
+	fmt.Printf("loading source data %q...\n", *inputData)
+	domainLists, domainListByName, err := loadGeosite(*inputData)
+	if err != nil {
+		return fmt.Errorf("failed to loadGeosite: %w", err)
+	}
+
+	var exportListSlice []string
+	for raw := range strings.SplitSeq(*exportLists, ",") {
+		if trimmed := strings.TrimSpace(raw); trimmed != "" {
+			exportListSlice = append(exportListSlice, trimmed)
+		}
+	}
+	if len(exportListSlice) == 0 {
+		exportListSlice = []string{"_all_"}
+	}
+
+	for _, eplistname := range exportListSlice {
+		if strings.EqualFold(eplistname, "_all_") {
+			if err := exportAll(filepath.Base(*inputData)+"_plain.yml", domainLists); err != nil {
+				fmt.Printf("failed to exportAll: %v\n", err)
+				continue
+			}
+		} else {
+			if err := exportSite(eplistname, domainListByName); err != nil {
+				fmt.Printf("failed to exportSite: %v\n", err)
+				continue
+			}
+		}
+		fmt.Printf("list: %q has been exported successfully.\n", eplistname)
+	}
+	return nil
+}
+
+func main() {
+	flag.Parse()
+	if err := run(); err != nil {
+		fmt.Printf("Fatal error: %v\n", err)
+		os.Exit(1)
+	}
+}

data/2kgames

@@ -1,4 +1,6 @@
 2k.com
 2kcoretech.online
+2kct.onl
 2kgames.com
-take2games.com
+2ksports.com
+2kweb.online

data/acfun

@@ -8,4 +8,5 @@ acfunchina.com
 acfunchina.net
 aixifan.com
 
-include:acfun-ads
+# Ads/tracking
+full:apilog-web.acfun.cn @ads

data/acfun-ads

@@ -1 +0,0 @@
-full:apilog-web.acfun.cn @ads

data/adcolony-ads

@@ -1 +0,0 @@
-adcolony.com @ads

data/adjust

@@ -1,4 +1,4 @@
 adjust.com @ads
-adjust.net.in @ads
 adjust.io @ads
+adjust.net.in @ads
 adjust.world @ads

data/adobe

@@ -1,5 +1,4 @@
 include:adobe-activation
-include:adobe-ads
 include:typekit
 
 10xfotolia.com
@@ -142,3 +141,7 @@ scene7.com
 
 # Adobe Stats IO
 adobestats.io
+
+# Ads/tracking
+advertising.adobe.com @ads
+tubemogul.com @ads

data/adobe-ads

@@ -1,2 +0,0 @@
-advertising.adobe.com @ads
-tubemogul.com @ads

data/alibaba

@@ -11,10 +11,10 @@ taobao
 tmall
 
 include:9game
-include:alibaba-ads
 include:alibabacloud
 include:aliyun
 include:aliyun-drive
+include:amap
 include:cainiao
 include:dingtalk
 include:eleme
@@ -196,9 +196,6 @@ fliggy.com
 fliggy.hk @!cn
 iuynfg.com
 
-# 高德地图
-include:amap
-
 # 虾米音乐
 xiami.com
 xiami.fm
@@ -228,3 +225,29 @@ lydaas.net
 lydass.cn
 lydass.com.cn
 lydass.net
+
+# Ads/tracking
+a.alimama.cn @ads
+adash-c.m.taobao.com @ads
+adash-c.ut.taobao.com @ads
+adash.m.taobao.com @ads
+adashbc.m.taobao.com @ads
+adashbc.ut.taobao.com @ads
+adashx.m.taobao.com @ads
+adashx4ae.ut.taobao.com @ads
+adashx4yt.m.taobao.com @ads
+adashxgc.ut.taobao.com @ads
+adsh.m.taobao.com @ads
+adtrack.quark.cn @ads
+c-adash.m.taobao.com @ads
+fourier.taobao.com @ads
+g.click.taobao.com @ads
+h-adashx.ut.taobao.com @ads
+h-adashx4yt.ut.taobao.com @ads
+m-adash.m.taobao.com @ads
+marketing.alibaba.com @ads
+nbsdk-baichuan.taobao.com @ads
+retcode.taobao.com @ads
+tns.simba.taobao.com @ads
+track.lc.quark.cn @ads
+v6-adashx.ut.taobao.com @ads

data/alibaba-ads

@@ -1,43 +0,0 @@
-include:amap-ads
-include:youku-ads
-
-a.alimama.cn @ads
-acjs.aliyun.com @ads
-adash-c.m.taobao.com @ads
-adash-c.ut.taobao.com @ads
-adash-emas.cn-hangzhou.aliyuncs.com @ads
-adash.m.taobao.com @ads
-adash.man.aliyuncs.com @ads
-adashbc.m.taobao.com @ads
-adashbc.ut.taobao.com @ads
-adashx.m.taobao.com @ads
-adashx.ut.ele.me @ads
-adashx4ae.ut.taobao.com @ads
-adashx4yt.m.taobao.com @ads
-adashxgc.ut.taobao.com @ads
-ads.uc.cn @ads
-adsh.m.taobao.com @ads
-adslot.uc.cn @ads
-adtrack.quark.cn @ads
-alimama.alicdn.com @ads
-atanx.alicdn.com @ads
-atanx2.alicdn.com @ads
-baichuan-sdk.alicdn.com @ads
-c-adash.m.taobao.com @ads
-fourier.taobao.com @ads
-g.click.taobao.com @ads
-h-adashx.ut.ele.me @ads
-h-adashx.ut.taobao.com @ads
-h-adashx4yt.ut.taobao.com @ads
-log.umtrack.com @ads
-m-adash.m.taobao.com @ads
-marketing.alibaba.com @ads
-nbsdk-baichuan.alicdn.com @ads
-nbsdk-baichuan.taobao.com @ads
-retcode.taobao.com @ads
-tce.alicdn.com @ads
-tns.simba.taobao.com @ads
-track.lc.quark.cn @ads
-v6-adashx.ut.cainiao.com @ads
-v6-adashx.ut.ele.me @ads
-v6-adashx.ut.taobao.com @ads

data/alibabacloud

@@ -1,8 +1,8 @@
 alibabacloud.co.in @!cn
-alibabacloud.com
+alibabacloud.com @!cn
 alibabacloud.com.au @!cn
 alibabacloud.com.hk @!cn
 alibabacloud.com.my @!cn
 alibabacloud.com.sg @!cn
 alibabacloud.com.tw @!cn
-alicloud.com
+alicloud.com @!cn

data/aliyun

@@ -67,3 +67,14 @@ oss-eu-west-1.aliyuncs.com @!cn
 oss-me-east-1.aliyuncs.com @!cn
 oss-us-east-1.aliyuncs.com @!cn
 oss-us-west-1.aliyuncs.com @!cn
+
+# Ads/tracking
+acjs.aliyun.com @ads
+adash-emas.cn-hangzhou.aliyuncs.com @ads
+adash.man.aliyuncs.com @ads
+alimama.alicdn.com @ads
+atanx.alicdn.com @ads
+atanx2.alicdn.com @ads
+baichuan-sdk.alicdn.com @ads
+nbsdk-baichuan.alicdn.com @ads
+tce.alicdn.com @ads

data/amap

@@ -1,5 +1,3 @@
-include:amap-ads
-
 a-map.cn
 a-map.co
 a-map.link
@@ -10,3 +8,10 @@ amapauto.com
 anav.com
 autonavi.com
 gaode.com
+
+# Ads/tracking
+adashx.ut.amap.com @ads
+dualstack-logs.amap.com @ads
+logs.amap.com @ads
+optimus-ads.amap.com @ads
+v6-adashx.ut.amap.com @ads

data/amap-ads

@@ -1,5 +0,0 @@
-adashx.ut.amap.com @ads
-dualstack-logs.amap.com @ads
-logs.amap.com @ads
-optimus-ads.amap.com @ads
-v6-adashx.ut.amap.com @ads

data/amazon

@@ -1,4 +1,3 @@
-include:amazon-ads
 include:amazontrust
 include:aws
 include:imdb
@@ -122,3 +121,7 @@ createspace.com
 
 full:images-cn.ssl-images-amazon.com @cn
 full:images-cn-8.ssl-images-amazon.com @cn
+
+# Ads/tracking
+amazon-adsystem.com @ads
+serving-sys.com @ads

data/amazon-ads

@@ -1,2 +0,0 @@
-amazon-adsystem.com @ads
-serving-sys.com @ads

data/apple

@@ -1,4 +1,3 @@
-include:apple-ads
 include:apple-dev # swift inside
 # Not include:apple-intelligence
 include:apple-pki
@@ -756,6 +755,7 @@ full:amp-api-edge.apps.apple.com @cn
 full:amp-api-search-edge.apps.apple.com @cn
 full:amp-api.apps.apple.com @cn
 full:amp-api.music.apple.com @cn
+full:aod-ssl.itunes.apple.com @cn
 full:aod.itunes.apple.com @cn
 full:api-edge.apps.apple.com @cn
 full:apptrailers.itunes.apple.com @cn
@@ -982,3 +982,10 @@ full:weatherkit.apple.com @cn
 full:www.apple.com @cn
 full:www.apple.com.edgekey.net.globalredir.akadns.net @cn
 full:xp.apple.com @cn
+
+# Ads/tracking
+advertising.apple.com @ads
+api-adservices.apple.com @ads
+iadsdk.apple.com @ads
+iad.apple.com @ads
+qwapi.com @ads

data/apple-ads

@@ -1,5 +0,0 @@
-advertising.apple.com @ads
-api-adservices.apple.com @ads
-iadsdk.apple.com @ads
-iad.apple.com @ads
-qwapi.com @ads

data/applovin-ads

@@ -1,2 +0,0 @@
-applovin.com @ads
-applvn.com @ads

data/atlassian

@@ -1,7 +1,11 @@
+include:trello
+
+atl-paas.net
+atlassian-dev.net
 atlassian.com
 atlassian.net
 bitbucket.io
 bitbucket.org
+jira.com
+ss-inf.net
 statuspage.io
-
-include:trello

data/atom-data-ads

@@ -1,3 +0,0 @@
-atom-data.io @ads
-analytics-data.io @ads
-ironbeast.io @ads

data/aviasales

@@ -0,0 +1,3 @@
+avs.io
+aviasales.ru
+aviasales.com

data/baidu

@@ -1,4 +1,3 @@
-include:baidu-ads
 include:zuoyebang
 
 # All .baidu domains
@@ -83,3 +82,57 @@ dxmpay.com
 dxmstatic.com
 dxmyqh.com
 paydxm.com
+
+# Ads/tracking
+adscdn.baidu.com @ads
+adx.xiaodutv.com @ads
+afd.baidu.com @ads
+afdconf.baidu.com @ads
+baifen.music.baidu.com @ads
+bzclk.baidu.com @ads
+cb.baidu.com @ads
+cbjs.baidu.com @ads
+cm.baidu.com @ads
+cpro.baidu.com @ads
+cpro.baidustatic.com @ads
+cpu.baidu.com @ads
+cstm.baidu.com @ads
+dlswbr.baidu.com @ads
+drmcmm.baidu.com @ads
+duiwai.baidu.com @ads
+dup.baidustatic.com @ads
+eclick.baidu.com @ads
+ecma.bdimg.com @ads
+ecmb.bdimg.com @ads
+ecmc.bdimg.com @ads
+eduad.baidu.com @ads
+eiv.baidu.com @ads
+fclick.baidu.com @ads
+fclog.baidu.com @ads
+h2tcbox.baidu.com @ads
+hao123union.baidu.com @ads
+hm.baidu.com @ads
+hmma.baidu.com @ads
+imgstat.baidu.com @ads
+iwanad.baidu.com @ads
+miao.baidu.com @ads
+miaowu.baidu.com @ads
+mipcache.bdstatic.com @ads
+mobads.baidu.com @ads
+mobads-logs.baidu.com @ads
+mobads-pre-config.cdn.bcebos.com @ads
+mountain.zhidao.baidu.com @ads
+nsclick.baidu.com @ads
+nsclickvideo.baidu.com @ads
+pimlog.baidu.com @ads
+pos.baidu.com @ads
+sclick.baidu.com @ads
+spcode.baidu.com @ads
+tcbox.baidu.com @ads
+ubmcvideo.baidustatic.com @ads
+union.baidu.com @ads
+unionimage.baidu.com @ads
+wangmeng.baidu.com @ads
+wkctj.baidu.com @ads
+wm.baidu.com @ads
+zz.bdstatic.com @ads

data/baidu-ads

@@ -1,54 +0,0 @@
-include:zuoyebang-ads
-
-adscdn.baidu.com @ads
-adx.xiaodutv.com @ads
-afd.baidu.com @ads
-afdconf.baidu.com @ads
-baifen.music.baidu.com @ads
-bzclk.baidu.com @ads
-cb.baidu.com @ads
-cbjs.baidu.com @ads
-cm.baidu.com @ads
-cpro.baidu.com @ads
-cpro.baidustatic.com @ads
-cpu.baidu.com @ads
-cstm.baidu.com @ads
-dlswbr.baidu.com @ads
-drmcmm.baidu.com @ads
-duiwai.baidu.com @ads
-dup.baidustatic.com @ads
-eclick.baidu.com @ads
-ecma.bdimg.com @ads
-ecmb.bdimg.com @ads
-ecmc.bdimg.com @ads
-eduad.baidu.com @ads
-eiv.baidu.com @ads
-fclick.baidu.com @ads
-fclog.baidu.com @ads
-h2tcbox.baidu.com @ads
-hao123union.baidu.com @ads
-hm.baidu.com @ads
-hmma.baidu.com @ads
-imgstat.baidu.com @ads
-iwanad.baidu.com @ads
-miao.baidu.com @ads
-miaowu.baidu.com @ads
-mipcache.bdstatic.com @ads
-mobads.baidu.com @ads
-mobads-logs.baidu.com @ads
-mobads-pre-config.cdn.bcebos.com @ads
-mountain.zhidao.baidu.com @ads
-nsclick.baidu.com @ads
-nsclickvideo.baidu.com @ads
-pimlog.baidu.com @ads
-pos.baidu.com @ads
-sclick.baidu.com @ads
-spcode.baidu.com @ads
-tcbox.baidu.com @ads
-ubmcvideo.baidustatic.com @ads
-union.baidu.com @ads
-unionimage.baidu.com @ads
-wangmeng.baidu.com @ads
-wkctj.baidu.com @ads
-wm.baidu.com @ads
-zz.bdstatic.com @ads

data/binance

@@ -28,8 +28,10 @@ binancezh.top
 
 # API
 binanceapi.com
+binanceru.net
 bnbstatic.com
 bntrace.com
+bsappapi.com
 nftstatic.com
 
 # saas

data/bohemia

@@ -0,0 +1,9 @@
+arma3.com
+armaplatform.com
+bistudio.com
+bohemia.net
+dayz.com
+makearmanotwar.com
+silicagame.com
+vigorgame.com
+ylands.com

data/bytedance

@@ -1,12 +1,10 @@
-include:bytedance-ads
-
-#include:bytedance-ai-!cn # not serving for cn
+include:bytedance-ai-!cn # not serving for cn
 include:doubao
 include:douyin # douyin, huoshan and qishuimusic inside
 include:fqnovel
 include:juejin
 include:lark # feishu is included in lark
-include:tiktok
+include:tiktok # not serving for cn
 include:trae
 include:volcengine
 
@@ -358,3 +356,31 @@ rsproxy.cn
 #bcysnssdk.com
 #bcystatic.com
 #bcyvod.com
+
+# Ads/tracking
+ad.toutiao.com @ads
+bds.snssdk.com @ads
+byteadverts.com @ads
+ctobsnssdk.com @ads
+dig.bdurl.net @ads
+extlog.snssdk.com @ads
+i.snssdk.com @ads
+log.zijieapi.com @ads
+mcs.snssdk.com @ads
+pangolin-dsp-toutiao-b.com @ads
+pangolin-dsp-toutiao.com @ads
+pangolin-hl.snssdk.com @ads
+pangolin-lf.snssdk.com @ads
+pangolin-lq.snssdk.com @ads
+pangolin-sdk-toutiao-b.com @ads
+pangolin-sdk-toutiao.com @ads
+pangolin-sdk-toutiao1.com @ads
+pangolin.snssdk.com @ads
+panplayable-toutiao-b.com @ads
+panplayable-toutiao.com @ads
+pglstatp-sdk-toutiao.com @ads
+pglstatp-snssdk-toutiao.com @ads
+pglstatp-toutiao-b.com @ads
+pglstatp-toutiao.com @ads
+sf3-ttcdn-tos.pstatp.com @ads
+shoppingads.cn @ads

data/bytedance-ads

@@ -1,29 +0,0 @@
-include:fqnovel-ads
-
-ad.toutiao.com @ads
-analytics.tiktok.com @ads
-bds.snssdk.com @ads
-byteadverts.com @ads
-ctobsnssdk.com @ads
-dig.bdurl.net @ads
-extlog.snssdk.com @ads
-i.snssdk.com @ads
-log.zijieapi.com @ads
-mcs.snssdk.com @ads
-pangolin-dsp-toutiao-b.com @ads
-pangolin-dsp-toutiao.com @ads
-pangolin-hl.snssdk.com @ads
-pangolin-lf.snssdk.com @ads
-pangolin-lq.snssdk.com @ads
-pangolin-sdk-toutiao-b.com @ads
-pangolin-sdk-toutiao.com @ads
-pangolin-sdk-toutiao1.com @ads
-pangolin.snssdk.com @ads
-panplayable-toutiao-b.com @ads
-panplayable-toutiao.com @ads
-pglstatp-sdk-toutiao.com @ads
-pglstatp-snssdk-toutiao.com @ads
-pglstatp-toutiao-b.com @ads
-pglstatp-toutiao.com @ads
-sf3-ttcdn-tos.pstatp.com @ads
-shoppingads.cn @ads

data/bytedance-ai-!cn

@@ -1,8 +1,8 @@
-include:dola
-
-# related to doubao
-coze.com
-
-# related to trae
-marscode.com
-trae.ai
+include:dola
+
+# related to doubao
+coze.com @!cn
+
+# related to trae
+marscode.com @!cn
+trae.ai @!cn

data/cainiao

@@ -3,3 +3,6 @@ cainiao.com
 cainiao.com.cn
 cainiaoyizhan.com
 guoguo-app.com
+
+# Ads/tracking
+v6-adashx.ut.cainiao.com @ads

data/category-ads

@@ -1,64 +1,51 @@
 # This file contains domains that clearly serving ads
-
-include:acfun-ads
-include:adcolony-ads
-include:adjust-ads
-include:adobe-ads
-include:alibaba-ads
-include:amazon-ads
-include:apple-ads
-include:applovin-ads
-include:atom-data-ads
-include:baidu-ads
-include:bytedance-ads
 include:category-ads-ir
+
+include:acfun @ads
+include:adobe @ads
+include:alibaba @ads
+include:amazon @ads
+include:apple @ads
+include:baidu @ads
+include:bytedance @ads
 include:cctv @ads
-include:clearbit-ads
-include:dmm-ads
-include:duolingo-ads
-include:emogi-ads
-include:flurry-ads
-include:google-ads
-include:growingio-ads
-include:hiido-ads
-include:hotjar-ads
-include:hunantv-ads
-include:inner-active-ads
-include:iqiyi-ads
-include:jd-ads
-include:kuaishou-ads
-include:kugou-ads
-include:letv-ads
-include:meta-ads
-include:microsoft-ads
-include:mopub-ads
-include:mxplayer-ads
-include:netease-ads
-include:newrelic-ads
-include:ogury-ads
-include:ookla-speedtest-ads
-include:openx-ads
+include:disney @ads
+include:dmm @ads
+include:duolingo @ads
+include:gamersky @ads
+include:google @ads
+include:hetzner @ads
+include:hunantv @ads
+include:iqiyi @ads
+include:jd @ads
+include:kuaishou @ads
+include:kugou @ads
+include:le @ads
+include:meta @ads
+include:microsoft @ads
+include:mihoyo @ads
+include:netease @ads
+include:ookla-speedtest @ads
+include:openai @ads
 include:picacg @ads
-include:pocoiq-ads
-include:pubmatic-ads
-include:qihoo360-ads
-include:segment-ads
-include:sina-ads
-include:sohu-ads
-include:spotify-ads
-include:supersonic-ads
-include:tagtic-ads
-include:tappx-ads
-include:television-ads
-include:tencent-ads
+include:pikpak @ads
+include:pixiv @ads
+include:qihoo360 @ads
+include:samsung @ads
+include:sina @ads
+include:snap @ads
+include:sohu @ads
+include:spotify @ads
+include:tcl @ads
+include:tencent @ads
 include:tendcloud @ads
-include:uberads-ads
-include:umeng-ads
-include:unity-ads
-include:xhamster-ads
-include:xiaomi-ads
-include:ximalaya-ads
-include:yahoo-ads
+include:twitter @ads
+include:unity @ads
+include:unitychina @ads
+include:xhamster @ads
+include:xiaomi @ads
+include:ximalaya @ads
+include:yahoo @ads
 include:zhihu @ads
 
 # Other domains for ads serving
@@ -71,6 +58,8 @@ ad.api.moji.com
 ad.wang502.com
 adbutter.net
 addthisedge.com
+ads.huan.tv
+ads.huantest.com
 ads.trafficjunky.net
 ads.wteam.xyz
 adservice.sigmob.cn
@@ -82,21 +71,26 @@ cdn.banclip.com
 cfts1tifqr.com
 contentabc.com
 cretgate.com
+data.flurry.com
 decide.mixpanel.com
+emogi.com
 ero-advertising.com
 eroadvertising.com
+evt.mxplay.com
 exoclick.com
 exosrv.com
 go2.global
 gozendata.com
-gzads.com
 gz-data.com
+gzads.com
 img-bss.csdn.net
 imglnkc.com
 imglnkd.com
+inner-active.mobi
 innovid.com
 jads.co
 jl3.yjaxa.top
+js-agent.newrelic.com
 juicyads.com
 kepler-37b.com
 leanplum.com
@@ -104,22 +98,26 @@ lqc006.com
 moat.com
 moatads.com
 mobwithad.com
+mopub.com
 onesignal.com
 realsrv.com
 s4yxaqyq95.com
 shhs-ydd8x2.yjrmss.cn
+ssp.api.tappx.com
+static.hotjar.com
 static.javhd.com
 tm-banners.gamingadult.com
 trafficfactory.biz
 tsyndicate.com
+uberads.com
 wwads.cn
 
-# 36Kr
-adx.36kr.com
-
 # 12306
 ad.12306.cn
 
+# 36Kr
+adx.36kr.com
+
 # AdHub
 hubcloud.com.cn
 
@@ -130,6 +128,10 @@ beizi.biz
 click.ali213.net
 pbmp.ali213.net
 
+# AppLovin
+applovin.com
+applvn.com
+
 # Caixin
 # regexp:^pinggai\d\.caixin\.com$
 full:pinggai0.caixin.com
@@ -147,12 +149,38 @@ full:pinggai9.caixin.com
 adq.chinaso.com
 stat.chinaso.com
 
+# hiido
+mlog.hiido.com
+ylog.hiido.com
+
+# hpply
+ad.hpplay.cn
+adc.hpplay.cn
+adeng.hpplay.cn
+
 # Httpool
 toboads.com
 
+# ironSource Atom
+analytics-data.io
+atom-data.io
+ironbeast.io
+
+# joyplus
+advapi.joyplus.tv
+advapikj.joyplus.tv
+
+# pocoiq
+cdn.pocoiq.cn
+oct.pocoiq.cn
+
 # Qiniu
 dn-growing.qbox.me
 
+# tagtic
+g1.tagtic.cn
+xy-log.tagtic.cn
+
 # UNI Marketing
 ad.unimhk.com
 
@@ -201,6 +229,9 @@ zhugeapi.com
 zhugeapi.net
 zhugeio.com
 
+# 酷云互动
+kuyun.com
+
 # 车来了
 atrace.chelaile.net.cn
 logs.chelaile.net.cn

data/category-ads-all

@@ -1,30 +1,35 @@
 # This file contains domains of all ads providers, including both the domains that serves ads, and the domains of providers themselves.
+include:category-ads
 
+include:adjust
+include:clearbit
+include:growingio
+include:ogury
+include:openx
+include:pubmatic
+include:segment
+include:supersonic
+include:taboola
 
+1rx.io @ads
 7box.vip @ads
 ad-delivery.net @ads
+adcolony.com @ads
 adinplay.com @ads
 adnxs.com @ads
-adview.cn @ads
 ads.trafficjunky.net @ads
 advertserve.com @ads
+adview.cn @ads
 casalemedia.com @ads
 contextual.media.net @ads
 cpmstar.com @ads
 demdex.net @ads
 httpool.com @ads
 lijit.com @ads
-1rx.io @ads
 mfadsrvr.com @ads
 mgid.com @ads
 ns1p.net @ads
-pubmatic.com @ads
 sigmob.com @ads
-snapads.com @ads
 spotxchange.com @ads
 unimhk.com @ads
 upapi.net @ads
-
-
-include:taboola
-include:category-ads

data/category-ai-!cn

@@ -4,13 +4,16 @@ include:cerebras
 include:comfy
 include:cursor
 include:elevenlabs
+include:github-copilot
 include:google-deepmind
 include:groq
 include:huggingface
 include:liveperson
+include:manus
 include:openai
 include:perplexity
 include:poe
+include:windsurf
 include:xai
 include:youmind
 

data/category-ai-cn

@@ -22,12 +22,16 @@ yiyan.baidu.com
 # 天工AI
 tiangong.cn
 
-# 智谱清言
+# 智谱
 bigmodel.cn
 chatglm.cn
+z.ai
 zhipuai.cn
+zhipucn.com
 
 # 月之暗面
+kimi.com
+moonshot.ai
 moonshot.cn
 
 # 讯飞星火

data/category-cdn-cn

@@ -6,12 +6,14 @@ include:qiniu
 include:upai
 include:wangsu
 
-## 创世云
+# 创世云
 chuangcache.com
 chuangcdn.com
-## FUNCDN
+# 大风云CDN
+dfyun.com.cn
+# FUNCDN
 funcdn.com
-## 北京知道创宇信息技术股份有限公司
+# 北京知道创宇信息技术股份有限公司
 jiashule.com
 jiasule.com
 yunaq.com

data/category-collaborate-cn

@@ -4,6 +4,8 @@
 asklink.com
 ## EasyTier
 easytier.cn
+## 飞衡HTTP
+feihengip.com
 ## Oray
 oray.com
 oray.net
@@ -35,3 +37,5 @@ xiumi.us
 xiumius.com
 ## 吾道
 woodo.cn
+## Worktile
+worktile.com

data/category-companies

@@ -48,6 +48,7 @@ include:kakao
 include:kaspersky
 include:lg
 include:logitech
+include:louisvuitton
 include:mailru-group
 include:meta
 include:microsoft

data/category-dev-cn

@@ -18,7 +18,10 @@ include:segmentfault
 include:sxl
 include:tencent-dev
 include:ubuntukylin
+include:unitychina
 
+aardio.com
 jinrishici.com
 openvela.com
+pingcode.com
 tipdm.org

data/category-education-cn

@@ -71,6 +71,8 @@ baicizhan.com
 baicizhan.org
 bczcdn.com
 bczeducation.cn
+# 毕业之家科研服务平台
+biyehome.net
 # Burning Vocabulary
 burningvocabulary.cn
 burningvocabulary.com
@@ -142,3 +144,5 @@ ystbds.com
 zhan.com
 # 智慧树
 zhihuishu.com
+# 浙江省教育考试院
+zjzs.net

data/category-enhance-gaming

@@ -2,6 +2,9 @@ include:playcover
 include:fflogs
 include:trackernetwork
 
+# Anti-Cheat
+battleye.com
+
 # Android Emulator
 bluestacks.com
 ldmnq.com @cn
@@ -16,5 +19,5 @@ prts.plus
 heavenlywind.cc @cn
 poi.moe
 
-
+# Steam++ / Watt Toolkit
 steampp.net @cn

data/category-enterprise-query-platform-cn

@@ -6,3 +6,7 @@ include:tianyancha
 qichamao.com
 qyyjt.cn
 x315.com
+
+# 信查查
+xcc.cn
+xinchacha.com

data/category-entertainment

@@ -54,6 +54,7 @@ include:pixiv
 include:plutotv
 include:pocketcasts
 include:primevideo
+include:radiko
 include:roku
 include:showtimeanytime
 include:sling

data/category-entertainment-cn

@@ -37,7 +37,7 @@ include:xiaoheihe
 include:xiaoyuzhou
 include:ximalaya
 include:youku
-include:yuewen
+include:yuewen @-!cn
 
 # Android Emulator
 ldmnq.com
@@ -50,6 +50,8 @@ yeshen.com
 51zmt.top
 # 广东南方新媒体
 aisee.tv
+# 动画巡礼
+anitabi.cn
 # 暴风影音
 baofeng.com
 baofeng.net
@@ -80,6 +82,10 @@ jjwxc.net
 # 酷匠网
 kjcdn.com
 kujiang.com
+# 1905电影网
+1905.com
+m1905.cn
+m1905.com
 # 喵御宅
 mfuns.cn
 # 秒拍
@@ -87,6 +93,9 @@ miaopai.com
 # 磨铁文学
 motie.com
 motieimg.com
+# Mtime时光网
+mtime.cn
+mtime.com
 # 梨视频
 pearvideo.com
 # 皮皮网

data/category-food-cn

@@ -1,4 +1,5 @@
 include:bestore
+include:ddmaicai
 include:lkcoffee
 
 3songshu.com

data/category-games-!cn

@@ -1,13 +1,15 @@
-include:2kgames
 include:blizzard
 include:bluearchive
+include:bohemia
 include:curseforge
 include:cygames
 include:ea
 include:embark
+include:eneba
 include:epicgames
 include:escapefromtarkov
 include:faceit
+include:gaijin
 include:garena
 include:gog
 include:hoyoverse
@@ -28,12 +30,12 @@ include:pubg
 include:purikonejp
 include:riot
 include:roblox
-include:rockstar
 include:snk
 include:steam
 include:steaminventoryhelper
 include:steamunlocked
 include:supercell
+include:take-two
 include:ubisoft
 include:vrchat
 include:wbgames

data/category-hospital-cn

@@ -10,3 +10,6 @@ yctdyy.com
 
 # 南方医科大学深圳医院
 smuszh.com
+
+# 四川大学华西医院
+cd120.com

data/category-media-cn

@@ -78,6 +78,15 @@ freebuf.com
 geekpark.net
 # 光明网
 gmw.com
+# 硅谷网
+guigu.org
+# 同花顺
+0033.cn
+10jqka.com.cn
+hexin.cn
+hexin.com.cn
+ths123.com
+thsi.cn
 # 和讯
 hexun.com
 # 河南广播电视台/大象网
@@ -96,10 +105,14 @@ icpcw.com
 idcquan.com
 # 艾瑞咨询
 iresearch.cn
+# IT168
+it168.com
 # 华尔街见闻
 jianyuweb.com
 wallstcn.com
 wallstreetcn.com
+# 金十数据
+jin10.com
 # 上观新闻/解放日报
 jfdaily.com
 shobserver.com
@@ -122,6 +135,8 @@ kksmg.com
 statickksmg.com
 # 晚点
 latepost.com
+# 今日观察网
+miercn.com
 # 快科技
 mydrivers.com
 # 南岳新闻网
@@ -134,9 +149,14 @@ xinhuanet.com
 xinhuaxmt.com
 # 维科网
 ofweek.com
+# PChome电脑之家
+pchome.net
+pchpic.net
 # PConline 太平洋科技
 3conline.com
 pconline.com.cn
+# 泡泡网
+pcpop.com
 # 人民网
 people.cn
 people.com.cn
@@ -165,6 +185,8 @@ shangyexinzhi.com
 solidot.org
 # 南方新闻网
 southcn.com
+# 南方财富网
+southmoney.com
 # 少数派
 sspai.com
 # 证券之星
@@ -184,12 +206,10 @@ techweb.com.cn
 thecover.cn
 # 澎湃新闻
 thepaper.cn
-# 同花顺
-10jqka.com.cn
-thsi.cn
-ths123.com
 # 人人都是产品经理
 woshipm.com
+# 西陆网
+xilu.com
 # 新快报
 xkb.com.cn
 # 第一财经

data/category-ru

@@ -22,6 +22,7 @@ include:category-gov-ru
 include:category-retail-ru
 
 # Public transportation
+include:aviasales
 include:mosmetro
 
 include:avito

data/category-social-media-cn

@@ -1,26 +1,29 @@
-# This list contains social media platforms inside China mainland.
-
-include:coolapk
-include:douban
-include:gracg
-include:hupu
-include:meipian
-include:okjike
-include:sina @-!cn
-include:xiaohongshu
-include:yy
-include:zhihu
-
-tieba.baidu.com
-tieba.com
-
-# 杭州蛋蛋语音科技有限公司
-dandan818.com
-dandanvoice.com
-
-# 脉脉
-maimai.cn
-taou.com
-
-# 知识星球
-zsxq.com
+# This list contains social media platforms inside China mainland.
+
+include:coolapk
+include:douban
+include:gracg
+include:hupu
+include:meipian
+include:okjike
+include:sina @-!cn
+include:xiaohongshu
+include:yy
+include:zhihu
+
+tieba.baidu.com
+tieba.com
+
+# 杭州蛋蛋语音科技有限公司
+dandan818.com
+dandanvoice.com
+
+# 饭否
+fanfou.com
+
+# 脉脉
+maimai.cn
+taou.com
+
+# 知识星球
+zsxq.com

data/category-wiki-cn

@@ -4,6 +4,9 @@ mbalib.com
 sec-wiki.com
 shidianbaike.com
 
+# 叉子周 手机博物馆
+chaz.fun
+
 # huijiwiki
 huijistatic.com
 huijiwiki.com

data/cloudflare

@@ -41,6 +41,9 @@ cloudflarewarp.com
 cloudflareworkers.com
 encryptedsni.com
 every1dns.net
+foundationdns.com
+foundationdns.net
+foundationdns.org
 imagedelivery.net
 isbgpsafeyet.com
 one.one.one

data/ddmaicai

@@ -0,0 +1,10 @@
+# 叮咚买菜 上海壹佰米网络科技有限公司
+100.me
+ddcorp.net
+ddfresh.net
+ddimg.mobi
+ddmaicai.net
+ddmc.mobi
+dduser.mobi
+ddxq.mobi
+imaicai.mobi

data/dji

@@ -2,6 +2,7 @@ dji.com
 dji.ink
 dji.net
 djicdn.com
+djigate.com
 djiits.com
 djiops.com
 djiservice.org

data/dmm

@@ -1,7 +1,21 @@
-include:dmm-ads
 include:dmm-porn
 
 dmm.com
 dmm-extension.com
 dmmapis.com
 full:api-p.videomarket.jp
+
+# Ads/tracking
+# Refer: https://tonahazana.com/kancolle-2nd-weight-saving
+# If you use support tools to play DMM games(such as playing Kantai Collection by poi), this list maybe useful.
+ad.games.dmm.com @ads
+bluekai.com @ads
+fout.jp @ads
+gmossp-sp.jp @ads
+i-mobile.co.jp @ads
+im-apps.net @ads
+impact-ad.jp @ads
+ladsp.com @ads
+microad.co.jp @ads
+microad.jp @ads
+socdm.com @ads

data/dmm-ads

@@ -1,14 +0,0 @@
-# Refer: https://tonahazana.com/kancolle-2nd-weight-saving
-# If you use support tools to play DMM games(such as playing Kantai Collection by poi), this list maybe useful.
-
-ad.games.dmm.com @ads
-bluekai.com @ads
-fout.jp @ads
-gmossp-sp.jp @ads
-i-mobile.co.jp @ads
-im-apps.net @ads
-impact-ad.jp @ads
-ladsp.com @ads
-microad.co.jp @ads
-microad.jp @ads
-socdm.com @ads

data/dola

@@ -1,5 +1,5 @@
 # Dola, formly ciciai, an AI service of bytedance
-cici.com
-ciciai.com
-ciciaicdn.com
-dola.com
+cici.com @!cn
+ciciai.com @!cn
+ciciaicdn.com @!cn
+dola.com @!cn

data/douyu

@@ -4,3 +4,4 @@ douyucdn.cn
 douyucdn2.cn
 douyuscdn.com
 douyutv.com
+edgesrv.com

data/duolingo

@@ -1,4 +1,7 @@
-include:duolingo-ads
-
 duolingo.com
 duolingo.cn @cn
+
+# Ads/tracking
+ads-api.duolingo.com @ads
+analytics.vpc.duolingo.com @ads
+metrics.duolingo.com @ads

data/duolingo-ads

@@ -1,3 +0,0 @@
-ads-api.duolingo.com @ads
-metrics.duolingo.com @ads
-analytics.vpc.duolingo.com @ads

data/eleme

@@ -6,3 +6,8 @@ eleme.io
 elemecdn.cn
 elemecdn.com
 elenet.me
+
+# Ads/tracking
+adashx.ut.ele.me @ads
+h-adashx.ut.ele.me @ads
+v6-adashx.ut.ele.me @ads

data/emogi-ads

@@ -1 +0,0 @@
-emogi.com @ads

data/eneba

@@ -0,0 +1,2 @@
+eneba.com
+eneba.games

data/facebook

@@ -395,3 +395,8 @@ workplace.com
 workplaceusecases.com
 
 full:fbcdn-a.akamaihd.net
+
+# Ads/tracking
+analytics.facebook.com @ads
+facebookads.com @ads
+pixel.facebook.com @ads

data/facebook-ads

@@ -1,3 +0,0 @@
-analytics.facebook.com @ads
-facebookads.com @ads
-pixel.facebook.com @ads

data/flurry-ads

@@ -1 +0,0 @@
-data.flurry.com @ads

data/fqnovel

@@ -1,5 +1,3 @@
-include:fqnovel-ads
-
 activity-zhendingtech.com
 changdunovel.com
 fanqienovel.com
@@ -31,3 +29,20 @@ qznovelvod.com
 
 full:p3-novel.byteimg.com
 full:p6-novel.byteimg.com
+
+# Ads/tracking
+full:ads3-normal-hl.zijieapi.com @ads
+full:ads3-normal.zijieapi.com @ads
+full:ads5-normal-hl.zijieapi.com @ads
+full:ads5-normal.zijieapi.com @ads
+full:log3-applog-hl.fqnovel.com @ads
+full:log3-applog.fqnovel.com @ads
+full:log5-applog-hl.fqnovel.com @ads
+full:log5-applog.fqnovel.com @ads
+full:p3-ad-sign.byteimg.com @ads
+full:p6-ad-sign.byteimg.com @ads
+full:p9-ad-sign.byteimg.com @ads
+full:rtlog3-applog-hl.fqnovel.com @ads
+full:rtlog3-applog.fqnovel.com @ads
+full:rtlog5-applog-hl.fqnovel.com @ads
+full:rtlog5-applog.fqnovel.com @ads

data/fqnovel-ads

@@ -1,15 +0,0 @@
-full:ads3-normal-hl.zijieapi.com @ads
-full:ads3-normal.zijieapi.com @ads
-full:ads5-normal-hl.zijieapi.com @ads
-full:ads5-normal.zijieapi.com @ads
-full:log3-applog-hl.fqnovel.com @ads
-full:log3-applog.fqnovel.com @ads
-full:log5-applog-hl.fqnovel.com @ads
-full:log5-applog.fqnovel.com @ads
-full:p3-ad-sign.byteimg.com @ads
-full:p6-ad-sign.byteimg.com @ads
-full:p9-ad-sign.byteimg.com @ads
-full:rtlog3-applog-hl.fqnovel.com @ads
-full:rtlog3-applog.fqnovel.com @ads
-full:rtlog5-applog-hl.fqnovel.com @ads
-full:rtlog5-applog.fqnovel.com @ads

data/gaijin

@@ -0,0 +1,13 @@
+acesofthunder.net
+activematter.game
+artstorm.com
+crossout.net
+crsed.net
+cubicodyssey.game
+enlisted.net
+gaijin.net
+gaijinent.com
+modernwarships.com
+star-conflict.com
+warthunder.com
+wtmobile.com

data/geolocation-!cn

@@ -271,6 +271,8 @@ ldoceonline.com
 immersivetranslate.com # 沉浸式翻译 (国际版)
 ## OriginLab (Graphing for Science and Engineering)
 originlab.com
+## OsmAnd
+osmand.net
 
 # Software development
 include:category-dev

data/geolocation-cn

@@ -23,8 +23,8 @@ include:category-social-media-cn
 
 # Advertisment & Analytics
 include:getui
+include:growingio
 include:jiguang
-include:umeng
 
 # 神策数据
 sensorsdata.cn
@@ -164,6 +164,7 @@ ezpro.pro # 小马路由
 itpub.net # ITPUB技术论坛
 itsk.com # IT天空论坛
 jandan.net # 煎蛋
+jisilu.cn # 集思录
 kafan.cn # 卡饭论坛
 kanxue.com # 看雪
 kdslife.com # 宽带山
@@ -199,6 +200,11 @@ biomart.cn
 dxy.com
 dxy.cn
 dxycdn.com
+## 薄荷健康
+boohee.com
+## 好大夫在线
+haodf.com
+hdfimg.com
 ## 江苏健康通
 jsehealth.com
 ## 仁科医疗科技有限公司服务域名，为北大口腔和一些其他国内医院小程序提供服务
@@ -354,6 +360,8 @@ dida365.com
 ## 兑吧
 dui88.com
 duiba.com.cn
+## 方正字库
+foundertype.com
 ## 快应用
 hapjs.org
 quickapp.cn
@@ -380,25 +388,27 @@ ireader.com
 zhangyue.com
 zhangyue01.com
 zhangyuecdn.com
+## 仟寻招聘
+moseeker.com
 ## 小能智慧云客服
 ntalker.com
+## OneDNS 微步在线
+onedns.net
 ## 心知天气
 sencdn.com
 seniverse.com
-## 重庆阅品科技
-tianqi.com
-tianqistatic.com
-## 方正字库
-foundertype.com
-## 仟寻招聘
-moseeker.com
-## OneDNS 微步在线
-onedns.net
+## 实习僧
+shixiseng.com
+sxsimg.com
+xiaoyuanzhao.com
 ## 智齿客服
 sobot.com
 soboten.com
 ## TaCool SSL 酷证书
 tacool.com
+## 重庆阅品科技
+tianqi.com
+tianqistatic.com
 ## Via 浏览器
 viayoo.com
 ## X 浏览器
@@ -434,7 +444,7 @@ include:lenovo
 include:meizu
 include:midea
 include:narwal # 云鲸科技
-include:netease
+include:netease @-!cn
 include:oppo @-!cn
 include:qihoo360
 include:sumkoo #北京尚古创新科技有限公司
@@ -562,7 +572,6 @@ ycrx360.com
 17989.com
 17cdn.com
 17house.com
-1905.com
 19yxw.com
 1nongjing.com
 1ting.com
@@ -664,7 +673,6 @@ ycrx360.com
 9ht.com
 9xu.com
 a9vg.com
-aardio.com # 皖ICP备09012014号
 acetaffy.club # 粤ICP备2022042304号
 adxvip.com
 afzhan.com
@@ -720,7 +728,6 @@ bio-equip.com
 biodiscover.com
 bishijie.com
 bitecoin.com
-biyehome.net
 bjcathay.com
 bobo.com
 bojianger.com
@@ -744,7 +751,6 @@ chachaba.com
 changba.com
 chaojituzi.net
 chashebao.com
-chaz.fun # 粤ICP备2022001828号-2
 chazhengla.com
 chazidian.com
 che168.com
@@ -880,7 +886,6 @@ fanli.com
 fangxiaoer.com
 fanxian.com
 fastapi.net
-feihengip.com # 粤ICP备2023115330号-1
 feihuo.com
 feiniaomy.com
 fengniao.com
@@ -904,7 +909,6 @@ gdrc.com
 geektool.top # 极客Tool 蜀ICP备2024086015号-2
 gezida.com
 gfan.com
-giocdn.com
 globrand.com
 gm86.com
 gmz88.com
@@ -915,7 +919,6 @@ gongxiangcj.com
 goosail.com
 goufw.com
 greenxiazai.com
-growingio.com
 gtags.net
 guabu.com
 guaiguai.com
@@ -923,7 +926,6 @@ guanaitong.com
 guanhaobio.com
 guanyierp.com # 沪ICP备14043335号-8
 gucheng.com
-guigu.org
 guoxinmac.com
 gupzs.com
 gushiwen.org
@@ -998,7 +1000,6 @@ iranshao.com
 irs01.com
 istoreos.com # 粤ICP备20024441号-9
 it165.net
-it168.com
 it610.com
 itjuzi.com
 itmop.com
@@ -1121,7 +1122,6 @@ meishij.net
 mengtuoshi.wang
 miaobolive.com
 miaozhen.com
-miercn.com
 mijisou.com
 mikecrm.com
 minhangshi.com
@@ -1179,8 +1179,6 @@ p5w.net
 paipaibang.com
 paopaoche.net
 pc6.com
-pchome.net
-pcpop.com
 peccn.com
 pgzs.com
 pharmacodia.com
@@ -1246,7 +1244,6 @@ shengdaosoft.com
 shenmayouxi.com
 sheui.com
 shijiexia.com
-shixiseng.com
 shmetro.com
 shoujihuifu.com
 shouqianba.com
@@ -1270,7 +1267,6 @@ softwhy.com
 sojson.com
 somode.com
 souqian.com
-southmoney.com
 sparkletour.com
 springtour.com
 ssports.com
@@ -1377,7 +1373,6 @@ womai.com
 wondercv.com # 超级简历
 wonnder.com
 wooyun.org
-worktile.com
 woyaogexing.com
 woyoo.com
 wqiis.com

data/github

@@ -1,4 +1,4 @@
-include:github-ads
+include:github-copilot
 include:npmjs
 
 atom.io
@@ -14,7 +14,6 @@ github.dev
 github.io
 githubapp.com
 githubassets.com
-githubcopilot.com
 githubhackathon.com
 githubnext.com
 githubpreview.dev
@@ -33,3 +32,7 @@ blob.core.windows.net
 full:github-api.arkoselabs.com
 full:github-cloud.s3.amazonaws.com
 regexp:^github-production-release-asset-[0-9a-zA-Z]{6}\.s3\.amazonaws\.com$
+
+# Ads/tracking
+collector.github.com @ads
+copilot-telemetry.githubusercontent.com @ads

data/github-ads

@@ -1,2 +0,0 @@
-collector.github.com @ads
-copilot-telemetry.githubusercontent.com @ads

data/github-copilot

@@ -0,0 +1 @@
+githubcopilot.com

data/google

@@ -6,7 +6,6 @@ include:fastlane
 include:firebase
 include:flutter
 include:golang
-include:google-ads
 include:google-deepmind
 include:google-gemini
 include:google-play
@@ -542,6 +541,62 @@ zukunftswerkstatt.de
 # https://www.fastly.com/press/press-releases/google-selects-Fastly-Oblivious-HTTP-Relay-for-Privacy-Sandbox/
 full:google-ohttp-relay-safebrowsing.fastly-edge.com
 
+# Ads/tracking
+2mdn-cn.net @ads
+2mdn.net @ads
+admob-cn.com @ads
+admob.com @ads
+adsense.com @ads
+adsensecustomsearchads.com @ads
+adsenseformobileapps.com @ads
+adservice.google.com @ads
+adtrafficquality.google @ads
+advertisercommunity.com @ads
+advertiserscommunity.com @ads
+adwords-community.com @ads
+adwords.com @ads
+adwordsexpress.com @ads
+analytics-alv.google.com @ads
+app-analytics-services.com @ads
+app-analytics-services-att.com @ads
+app-measurement-cn.com @ads
+app-measurement.com @ads
+doubleclick-cn.net @ads
+doubleclick.cn @ads
+doubleclick.com @ads
+doubleclick.net @ads
+fcmatch.google.com @ads
+google-analytics-cn.com @ads
+google-analytics.com @ads
+googleadapis.com @ads
+googleadapis.l.google.com @ads
+googleads-cn.com @ads
+googleads.com @ads
+googleadservices-cn.com @ads
+googleadservices.com @ads
+googleadsserving.cn @ads
+googleanalytics.com @ads
+googleoptimize-cn.com @ads
+googleoptimize.com @ads
+googlesyndication-cn.com @ads
+googlesyndication.com @ads
+googletagmanager-cn.com @ads
+googletagmanager.com @ads
+googletagservices-cn.com @ads
+googletagservices.com @ads
+googletraveladservices-cn.com @ads
+googletraveladservices.com @ads
+googlevads-cn.com @ads
+mail-ads.google.com @ads
+mobileads.google.com @ads
+marketingplatform.google.com @ads
+pagead.l.google.com @ads
+partnerad.l.google.com @ads
+urchin.com @ads
+full:analytics.google.com @ads
+# https://github.com/AdguardTeam/FiltersRegistry/pull/1154
+# full:fundingchoicesmessages.google.com @ads
+
 # Domains and services below are available in China mainland
 # Use in config file like this: "geosite:google@cn"
 gvt1-cn.com @cn

data/google-ads

@@ -1,58 +0,0 @@
-2mdn-cn.net @ads
-2mdn.net @ads
-admob-cn.com @ads
-admob.com @ads
-ads.youtube.com @ads
-adsense.com @ads
-adsensecustomsearchads.com @ads
-adsenseformobileapps.com @ads
-adservice.google.com @ads
-adtrafficquality.google @ads
-advertisercommunity.com @ads
-advertiserscommunity.com @ads
-adwords-community.com @ads
-adwords.com @ads
-adwordsexpress.com @ads
-analytics-alv.google.com @ads
-app-analytics-services.com @ads
-app-analytics-services-att.com @ads
-app-measurement-cn.com @ads
-app-measurement.com @ads
-doubleclick-cn.net @ads
-doubleclick.cn @ads
-doubleclick.com @ads
-doubleclick.net @ads
-fcmatch.google.com @ads
-google-analytics-cn.com @ads
-google-analytics.com @ads
-googleadapis.com @ads
-googleadapis.l.google.com @ads
-googleads-cn.com @ads
-googleads.com @ads
-googleadservices-cn.com @ads
-googleadservices.com @ads
-googleadsserving.cn @ads
-googleanalytics.com @ads
-googleoptimize-cn.com @ads
-googleoptimize.com @ads
-googlesyndication-cn.com @ads
-googlesyndication.com @ads
-googletagmanager-cn.com @ads
-googletagmanager.com @ads
-googletagservices-cn.com @ads
-googletagservices.com @ads
-googletraveladservices-cn.com @ads
-googletraveladservices.com @ads
-googlevads-cn.com @ads
-mail-ads.google.com @ads
-mobileads.google.com @ads
-marketingplatform.google.com @ads
-pagead.l.google.com @ads
-partnerad.l.google.com @ads
-urchin.com @ads
-
-full:analytics.google.com @ads
-# https://github.com/AdguardTeam/FiltersRegistry/pull/1154
-# full:fundingchoicesmessages.google.com @ads
-
-regexp:^adservice\.google\.([a-z]{2}|com?)(\.[a-z]{2})?$ @ads

data/growingio

@@ -0,0 +1,7 @@
+# 北京易数科技
+datayi.cn
+gio.ren
+giocdn.com
+growin.cn
+growingio.cn
+growingio.com

data/growingio-ads

@@ -1 +0,0 @@
-assets.growingio.com @ads

data/hdrezka

@@ -0,0 +1,12 @@
+hdrezka-home.tv
+hdrezka.ac
+hdrezka.ag
+hdrezka.cm
+hdrezka.co
+hdrezka.me
+hdrezka.org
+hdrezka.site
+rezka.ag
+
+# hdrezka video CDN servers
+stream.voidboost.cc

data/hiido-ads

@@ -1,2 +0,0 @@
-mlog.hiido.com @ads
-ylog.hiido.com @ads

data/hotjar-ads

@@ -1 +0,0 @@
-static.hotjar.com @ads

data/hoyoverse

@@ -21,3 +21,6 @@ n0vadesktop.com
 
 # 絕區零(Zenless Zone Zero)
 zenlesszonezero.com
+
+# ads/tracking
+log-upload-os.hoyoverse.com @ads

data/hunantv

@@ -1,5 +1,4 @@
 # 湖南广电（芒果TV）
-include:hunantv-ads
 hifuntv.com
 hitv.com
 hnbntv.com
@@ -7,3 +6,11 @@ hunaniptv.com
 hunantv.com
 imgo.tv
 mgtv.com
+
+# Ads/tracking
+click.hunantv.com @ads
+da.hunantv.com @ads
+da.mgtv.com @ads
+log.hunantv.com @ads
+log.v2.hunantv.com @ads
+res.hunantv.com @ads

data/hunantv-ads

@@ -1,6 +0,0 @@
-click.hunantv.com @ads
-da.hunantv.com @ads
-da.mgtv.com @ads
-log.hunantv.com @ads
-log.v2.hunantv.com @ads
-res.hunantv.com @ads

data/inner-active-ads

@@ -1 +0,0 @@
-inner-active.mobi @ads

data/instagram

@@ -1,5 +1,3 @@
-include:instagram-ads
-
 achat-followers-instagram.com
 acheter-followers-instagram.com
 acheterdesfollowersinstagram.com
@@ -72,3 +70,7 @@ online-instagram.com
 onlineinstagram.com
 web-instagram.net
 wwwinstagram.com
+
+# Ads/tracking
+graph.instagram.com @ads
+graph-fallback.instagram.com @ads

data/instagram-ads

@@ -1,2 +0,0 @@
-graph.instagram.com @ads
-graph-fallback.instagram.com @ads

data/iqiyi

@@ -11,4 +11,14 @@ qy.net
 # CDN used by iqiyi
 71edge.com
 
-include:iqiyi-ads
+# Ads/tracking
+ad.m.iqiyi.com @ads
+afp.iqiyi.com @ads
+c.uaa.iqiyi.com @ads
+cloudpush.iqiyi.com @ads
+cupid.iqiyi.com @ads
+ifacelog.iqiyi.com @ads
+mbdlog.iqiyi.com @ads
+msg.video.qiyi.com @ads
+msg2.video.qiyi.com @ads
+policy.video.iqiyi.com @ads

data/iqiyi-ads

@@ -1,10 +0,0 @@
-ad.m.iqiyi.com @ads
-afp.iqiyi.com @ads
-c.uaa.iqiyi.com @ads
-cloudpush.iqiyi.com @ads
-cupid.iqiyi.com @ads
-ifacelog.iqiyi.com @ads
-mbdlog.iqiyi.com @ads
-msg.video.qiyi.com @ads
-msg2.video.qiyi.com @ads
-policy.video.iqiyi.com @ads

data/jd

@@ -1,5 +1,3 @@
-include:jd-ads
-
 1huizhan.com
 3.cn
 300hu.com
@@ -236,3 +234,13 @@ imdada.cn
 
 # 哆啦宝
 duolabao.com
+
+# Ads/tracking
+ads-union.jd.com @ads
+ads.union.jd.com @ads
+c-nfa.jd.com @ads
+cps.360buy.com @ads
+gia.jd.com @ads
+img-x.jd.com @ads
+jzt.jd.com @ads
+stat.m.jd.com @ads

data/jd-ads

@@ -1,8 +0,0 @@
-ads.union.jd.com @ads
-ads-union.jd.com @ads
-c-nfa.jd.com @ads
-cps.360buy.com @ads
-gia.jd.com @ads
-img-x.jd.com @ads
-jzt.jd.com @ads
-stat.m.jd.com @ads

data/kinopub

@@ -6,4 +6,9 @@ gfw.ovh # sub domains mirror
 mos-gorsud.co # kinopub domain to generate a mirror site through gfw.ovh
 
 # kinopub CDN servers
+cdn-service.space
+cdn2cdn.com
+cdn2site.com
+pushbr.com # poster images CDN
+
 regexp:(\w+)-static-[0-9]+\.cdntogo\.net$

data/kodik

@@ -0,0 +1,4 @@
+kodik-storage.com
+kodik.biz
+kodik.cc
+kodik.info

data/kuaishou

@@ -1,5 +1,3 @@
-include:kuaishou-ads
-
 ecukwai.com
 gifshow.com
 inkuai.com
@@ -16,3 +14,12 @@ kwaizt.com
 kwimgs.com
 wsukwai.com
 yximgs.com
+
+# Ads/tracking
+adbkwai.com @ads
+adkwai.com @ads
+adukwai.com @ads
+e.kuaishou.cn @ads
+e.kuaishou.com @ads
+full:log-sdk.gifshow.com @ads
+full:wlog.kuaishou.com @ads

data/kuaishou-ads

@@ -1,8 +0,0 @@
-adbkwai.com @ads
-adkwai.com @ads
-adukwai.com @ads
-e.kuaishou.cn @ads
-e.kuaishou.com @ads
-
-full:log-sdk.gifshow.com @ads
-full:wlog.kuaishou.com @ads

data/kugou

@@ -1,5 +1,3 @@
-include:kugou-ads
-
 fanxingliveshow.com
 kgimg.com
 kglink.cn
@@ -16,3 +14,8 @@ kugousenior.com
 kugoustore.com
 kugouvoice.com
 kugouyouth.com
+
+# Ads/tracking
+ads.service.kugou.com @ads
+adserviceretry.kglink.cn @ads
+adserviceretry.kugou.com @ads

data/kugou-ads

@@ -1,3 +0,0 @@
-ads.service.kugou.com @ads
-adserviceretry.kglink.cn @ads
-adserviceretry.kugou.com @ads