Docs: add a notice about the removal of xxx-ads

use fqnovel@ads instead

.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,6 +10,15 @@ 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.
+- 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.
 
 ## Usage example
 
@@ -85,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
 
@@ -126,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/4399

@@ -17,6 +17,7 @@
 4399biule.com
 4399dmw.com
 4399er.com
+4399hdhh.com
 4399hhh.com
 4399inc.com
 4399mail.com
@@ -30,17 +31,22 @@
 4399yyy.com
 5054399.com
 5054399.net
+5wyxi.com
 71acg.com
 71acg.net
+abdf002.com
 appeeres.com
+buke999.com
 bx1k.com
 edu4399.com
 funnycore.com
 guoping123.com
+haohaowan.net
 i3839.com
 ihykb.com
 img4399.com
 mail4399.com
+maindown4399.com
 me4399.com
 my4399.com
 mysiteres.com
@@ -52,4 +58,6 @@ wanwan4399.com
 we4399.com
 webgame163.com
 youba.com
+yxhapi.com
 yxhhdl.com
+yxhimg.com

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/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/annas-archive

@@ -1,3 +1,5 @@
+annas-archive.in
 annas-archive.li
 annas-archive.org
+annas-archive.pm
 annas-archive.se

data/apple

@@ -1,5 +1,4 @@
-include:apple-ads
-include:apple-dev
+include:apple-dev # swift inside
 # Not include:apple-intelligence
 include:apple-pki
 include:apple-tvplus
@@ -7,7 +6,6 @@ include:apple-update
 include:beats
 include:icloud
 include:itunes
-include:swift
 
 # All .apple domains
 apple
@@ -757,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
@@ -856,7 +855,7 @@ full:s4.mzstatic.com @cn
 full:s5.mzstatic.com @cn
 
 # The rules below are from https://github.com/felixonmars/dnsmasq-china-list/blob/master/apple.china.conf
-# Revision: 4d392cc0a822ac5626bb97fef3fe5e04e86b28b0
+# Revision: f6a2093b254a7d2baca959bd16581666ca394303
 # Duplicates removed
 # According to the consensus in #503, do not include the domain name apps.apple.com directly.
 # Use in config file like this: "geosite:apple@cn"
@@ -874,7 +873,6 @@ full:cds-cdn.v.aaplimg.com @cn
 full:cds.apple.com @cn
 full:cds.apple.com.akadns.net @cn
 full:cdsassets.apple.com @cn
-full:certs.apple.com @cn
 full:cl2-cn.apple.com @cn
 full:cl4-cn.apple.com @cn
 full:clientflow.apple.com @cn
@@ -882,7 +880,6 @@ full:clientflow.apple.com.akadns.net @cn
 full:cn-smp-paymentservices.apple.com @cn
 full:configuration.apple.com @cn
 full:configuration.apple.com.akadns.net @cn
-full:crl.apple.com @cn
 full:cstat.apple.com @cn
 full:cstat.cdn-apple.com @cn
 full:dd-cdn.origin-apple.com.akadns.net @cn
@@ -935,10 +932,6 @@ full:mesu-china.apple.com.akadns.net @cn
 full:mesu.apple.com @cn
 full:ml.cdn-apple.com @cn
 full:music.apple.com @cn
-full:ocsp-lb.apple.com.akadns.net @cn
-full:ocsp.apple.com @cn
-full:ocsp2-lb.apple.com.akadns.net @cn
-full:ocsp2.apple.com @cn
 full:oscdn.apple.com @cn
 full:oscdn.origin-apple.com.akadns.net @cn
 full:osxapps.itunes.g.aaplimg.com @cn
@@ -981,8 +974,6 @@ full:tj-pod1-smp-device.apple.com @cn
 full:updates-http.cdn-apple.com @cn
 full:updates-http.cdn-apple.com.akadns.net @cn
 full:updates.cdn-apple.com @cn
-full:valid.apple.com @cn
-full:valid.origin-apple.com.akadns.net @cn
 full:weather-data.apple.com @cn
 full:weather-data.apple.com.akadns.net @cn
 full:weather-map.apple.com @cn
@@ -991,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,4 +0,0 @@
-api-adservices.apple.com @ads
-iadsdk.apple.com @ads
-iad.apple.com @ads
-qwapi.com @ads

data/apple-pki

@@ -7,3 +7,4 @@ full:ocsp.apple.com @cn
 full:ocsp2-lb.apple.com.akadns.net @cn
 full:ocsp2.apple.com @cn
 full:valid.apple.com @cn
+full:valid.origin-apple.com.akadns.net @cn

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/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,5 +1,3 @@
-include:bytedance-ads
-
 #include:bytedance-ai-!cn # not serving for cn
 include:doubao
 include:douyin # douyin, huoshan and qishuimusic inside
@@ -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,26 +0,0 @@
-include:fqnovel-ads
-
-bds.snssdk.com @ads
-byteadverts.com @ads
-ctobsnssdk.com @ads
-dig.bdurl.net @ads
-extlog.snssdk.com @ads
-i.snssdk.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/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,65 +1,52 @@
 # 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:clearbit-ads
-include:dmm-ads
-include:duolingo-ads
-include:emogi-ads
-include:flurry-ads
-include:github-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:picacg-ads
-include:pocoiq-ads
-include:pubmatic-ads
-include:qihoo360-ads
-include:segment-ads
-include:sensorsdata-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:uberads-ads
-include:umeng-ads
-include:unity-ads
-include:xhamster-ads
-include:xiaomi-ads
-include:ximalaya-ads
-include:yahoo-ads
-include:zhihu-ads
+
+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: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: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: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
 51.la
@@ -71,31 +58,40 @@ 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
 adtechus.com
 adtrue.com
 adxprtz.com
+assets.growingio.com
 cdn.advertserve.com
 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
@@ -103,22 +99,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
 
@@ -129,6 +129,10 @@ beizi.biz
 click.ali213.net
 pbmp.ali213.net
 
+# AppLovin
+applovin.com
+applvn.com
+
 # Caixin
 # regexp:^pinggai\d\.caixin\.com$
 full:pinggai0.caixin.com
@@ -146,12 +150,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
 
@@ -192,7 +222,21 @@ reachmax.cn
 # 热云数据
 reyun.com
 
+# 神策数据
+static.sensorsdata.cn
+
 # 诸葛io
 zhugeapi.com
 zhugeapi.net
 zhugeio.com
+
+# 酷云互动
+kuyun.com
+
+# 车来了
+atrace.chelaile.net.cn
+logs.chelaile.net.cn
+
+# 航旅纵横
+analytics.umetrip.com
+sensors.umetrip.com.cn

data/category-ads-all

@@ -1,28 +1,34 @@
 # 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: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
 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
-snapads.com @ads
+sigmob.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:openai
 include:perplexity
 include:poe
 include:xai
+include:youmind
 
 # CodeRabbit
 coderabbit.ai

data/category-bank-cn

@@ -1,9 +1,9 @@
-include:boc
-include:ccb
-include:citic
-include:cmb
+include:boc @-!cn
+include:ccb @-!cn
+include:citic @-!cn
+include:cmb @-!cn
 include:hsbc-cn
-include:icbc
+include:icbc @-!cn
 include:unionpay
 
 abchina.com

data/category-collaborate-cn

@@ -1,43 +1,37 @@
 # 远程桌面/远程组网
 
+## 连连控
+asklink.com
+## EasyTier
+easytier.cn
 ## Oray
 oray.com
 oray.net
 orayer.com
 orayimg.com
 sunlogin.net
-
+## 叮当猫脚本管理系统 懒人精灵远程调试
+privateapi.xyz
 ## ToDesk
 todesk.cn
 todesk.com
-
-## 连连控
-asklink.com
-
-## 叮当猫脚本管理系统 懒人精灵远程调试
-privateapi.xyz
-
-# xEdge干将互联
+## xEdge干将互联
 include:xedge
 
 # 文档协作
 
-## Tower 团队协作
-tower.im
-
-## 秀米编辑器
-tritoninfo.net
-xiumi.us
-xiumius.com
-
+## 语雀
+nlark.com
+yuque.com
 ## 石墨文档
 shimo.im
 shimonote.com
 smgv.cn
-
-## 语雀
-nlark.com
-yuque.com
-
+## Tower 团队协作
+tower.im
+## 秀米编辑器
+tritoninfo.net
+xiumi.us
+xiumius.com
 ## 吾道
 woodo.cn

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-cryptocurrency

@@ -25,6 +25,7 @@ include:zb
 
 1inch.io
 aave.com
+bingx.com
 bitbank.cc
 bitcoin.org
 bitfinex.com

data/category-dev

@@ -114,7 +114,9 @@ mobatek.net
 mpv.io
 mysql.com
 neovim.io
+netfilter.org
 newpipe.net
+nftables.org
 nixos.org
 nodesource.com
 notepad-plus-plus.org
@@ -138,6 +140,7 @@ shellcheck.net
 shields.io
 sqlite.org
 sublimetext.com
+tampermonkey.net
 termius.com
 unpkg.com
 videojs.com

data/category-dev-cn

@@ -4,7 +4,7 @@ include:apipost
 include:baltamatica
 include:cnblogs
 include:csdn
-include:deepin
+include:deepin @-!cn
 include:gitee
 include:goproxy
 include:huawei-dev
@@ -18,6 +18,7 @@ include:segmentfault
 include:sxl
 include:tencent-dev
 include:ubuntukylin
+include:unitychina
 
 jinrishici.com
 openvela.com

data/category-ecommerce

@@ -1,3 +1,5 @@
+include:category-ecommerce-ru
+
 include:adidas
 include:bestbuy
 include:booking
@@ -19,7 +21,6 @@ include:momo
 include:muji
 include:nike
 include:nordstrom
-include:ozon
 include:pchome
 include:rakuten
 include:ruten
@@ -27,6 +28,7 @@ include:shopee
 include:shopify
 include:suruga-ya
 include:target
+include:technogym
 include:walmart
 include:wish
 

data/category-ecommerce-ru

@@ -0,0 +1,2 @@
+include:ozon
+include:wildberries

data/category-education-cn

@@ -5,6 +5,7 @@ include:applysquare
 include:hugecore
 include:hujiang
 include:koolearn
+include:schoopia
 include:shanbay
 include:xueersi
 include:yuanfudao
@@ -141,3 +142,5 @@ ystbds.com
 zhan.com
 # 智慧树
 zhihuishu.com
+# 浙江省教育考试院
+zjzs.net

data/category-emby

@@ -188,3 +188,6 @@ emby1.69yun69.com
 
 # 云梯
 yunti.online
+
+# 守候网络
+server2.cn2gias.uk

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-entertainment

@@ -1,5 +1,7 @@
 # This list contains services related to entertainment & games & music & podcasts & videos outside China mainland.
 
+include:category-acg
+include:category-entertainment-ru
 include:category-games-!cn
 include:category-novel
 
@@ -46,7 +48,6 @@ include:mytvsuper
 include:netflix
 include:niconico
 include:now
-include:okko
 include:olevod
 include:pbs
 include:pixiv
@@ -54,7 +55,6 @@ include:plutotv
 include:pocketcasts
 include:primevideo
 include:roku
-include:rutube
 include:showtimeanytime
 include:sling
 include:sonypictures
@@ -105,6 +105,9 @@ bag.itunes.apple.com
 bookeeper.itunes.apple.com
 
 # Entertainment oriented media
+# This section references the "Source Considerations" page on the Chinese Wikipedia:
+# - https://zh.wikipedia.org/wiki/WikiProject:电子游戏/来源考量
+# - https://zh.wikipedia.org/wiki/WikiProject:ACG/來源考量
 ## 4Gamer.net
 4gamer.net
 ## 4Gamers
@@ -117,20 +120,28 @@ appget.com
 appmedia.jp
 ## Automaton
 automaton-media.com
+## 橙心社
+cxacg.com
 ## 电faminicogamer
 denfaminicogamer.jp
 ## ASCII Media Works
 dengekionline.com
 ## E-ROAD
 eroge-road.com
+## esports.gg
+esports.gg
 ## ファミ通
 famitsu.com
+## GameApps.HK
+gameapps.hk
 ## 遊戲基地
 gamebase.com.tw
 ## IID, Inc.
 gamebusiness.jp
 gamespark.jp
 inside-games.jp
+## Game Focus
+gamefocus.co.kr
 ## GameMeca
 gamemeca.com
 ## Gameover有機網
@@ -142,6 +153,8 @@ onlinegamer.jp
 greatgame.asia
 ## HobbiGame
 hobbigame.com
+## ゲーム文化保存研究所
+igcc.jp
 ## IGN
 ign.com
 ignimg.com
@@ -153,18 +166,30 @@ mediaclip.jp
 maedahiroyuki.com
 ## MANTANWEB
 mantan-web.jp
+## モエデジ
+moedigi.com
 ## Moepedia
 moepedia.net
+## マイナビニュース
+mynavi.jp
+## Openbook阅读通
+openbook.org.tw
 ## QooApp
 qoo-app.com
 ## Real Sound
 realsound.jp
+## れポたま！
+repotama.com
 ## Saiga NAK
 saiganak.com
+## SQOOL
+sqool.net
 ## The Games Daily
 tgdaily.co.kr
 ## Thisisgame
 thisisgame.com
+## 玩具人
+toy-people.com
 ## Wanuxi
 wanuxi.com
 ## よろず〜

data/category-entertainment-cn

@@ -6,7 +6,7 @@ include:aamgame
 include:acfun
 include:acplay
 include:bestv
-include:bilibili
+include:bilibili @-!cn
 include:ciweimao
 include:dedao
 include:douyin
@@ -18,7 +18,7 @@ include:gamersky
 include:gitv
 include:hunantv
 include:huya
-include:iqiyi
+include:iqiyi @-!cn
 include:ku6
 include:kuaikan
 include:kuaishou
@@ -50,6 +50,8 @@ yeshen.com
 51zmt.top
 # 广东南方新媒体
 aisee.tv
+# 动画巡礼
+anitabi.cn
 # 暴风影音
 baofeng.com
 baofeng.net
@@ -89,6 +91,8 @@ motie.com
 motieimg.com
 # 梨视频
 pearvideo.com
+# 皮皮网
+pipi.cn
 # SF轻小说二次元
 sfacg.com
 # 书海小说
@@ -109,6 +113,9 @@ zhulang.com
 zongheng.com
 
 # 娱乐资讯媒体
+# 该部分参考了中文维基百科的「来源考量」：
+# - https://zh.wikipedia.org/wiki/WikiProject:电子游戏/来源考量
+# - https://zh.wikipedia.org/wiki/WikiProject:ACG/來源考量
 
 include:tgbus
 include:vgtime
@@ -143,11 +150,15 @@ ign.com.cn
 nadianshi.com
 ## 游戏日报
 news.yxrb.net
+## 手谈姬
+shoutanjjj.com
 ## 游戏机实用技术
 ucg.cn
 ## 游戏茶馆
 youxichaguan.com
 ## 游戏葡萄
 youxiputao.com
+## 游戏陀螺
+youxituoluo.com
 ## 游研社
 yystv.cn

data/category-entertainment-ru

@@ -0,0 +1,3 @@
+include:okko
+include:rutube
+include:wink

data/category-finance

@@ -12,6 +12,7 @@ include:itiger
 include:longbridge
 include:n26
 include:schwab
+include:standardchartered
 include:wise
 
 fxcorporate.com

data/category-games-!cn

@@ -1,10 +1,12 @@
 include:2kgames
 include:blizzard
 include:bluearchive
+include:bohemia
 include:curseforge
 include:cygames
 include:ea
 include:embark
+include:eneba
 include:epicgames
 include:escapefromtarkov
 include:faceit
@@ -24,12 +26,14 @@ include:pandanet
 include:pinkcore
 include:playstation
 include:projectsekai
+include:pubg
 include:purikonejp
 include:riot
 include:roblox
 include:rockstar
 include:snk
 include:steam
+include:steaminventoryhelper
 include:steamunlocked
 include:supercell
 include:ubisoft
@@ -38,6 +42,7 @@ include:wbgames
 include:xbox
 include:ynoproject
 
+dinopoloclub.com
 dodi-repacks.download
 dodi-repacks.site
 fabricmc.net
@@ -48,8 +53,10 @@ humblebundle.com
 joinsquad.com
 loverslab.com
 minecraft.wiki
+mobimon.com.tw
 nexus-cdn.com
 nexusmods.com
+noxygames.com
 offworldindustries.com
 offworldindustries.net
 papermc.io
@@ -57,5 +64,7 @@ planetminecraft.com
 prismlauncher.org
 protondb.com
 quiltmc.org
+rayark.download
+rayark.net
 speedrun.com
 steamdb.info

data/category-games-cn

@@ -9,13 +9,15 @@ include:mihoyo-cn
 include:tencent-games
 include:tiancity
 include:vrzwk
-include:xd
+include:xd @-!cn
 include:yokaverse
 
 # 北京奇客创想科技有限公司
 7k7k.com
 # 刀锋盒子 皖B2-20190103-4
 9xgame.com
+# 韵律谱面研究站 桂ICP备20001846号-3
+arcaea.cn
 # 《异象回声》游戏官网 沪ICP备2023010411号-1
 astral-vector.com
 # 九九互动 粤ICP备19068416号
@@ -26,14 +28,16 @@ fxt365.com
 gameabc.com
 # 游戏魅 合肥启云软件 皖B2-20160087-3
 gamemei.com
+# Enhance Gaming
+heavenlywind.cc
 # 乐都网 浙ICP备2024091002号-2
 ledu.com
 # 龙图游戏 京ICP备11023195号
 longtugame.com
 # 北京慕飞科技 京ICP备20006112号-2
 morefreegame.com
-# Enhance Gaming
-heavenlywind.cc
+# Phira
+phira.cn
 # 沪ICP备18041304号-1
 tgpro.top
 tgprocs.net

data/category-hospital-cn

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

data/category-media

@@ -112,6 +112,7 @@ hkej.com
 hkgpao.com
 hongkongfp.com
 inmediahk.net
+inquirer.net
 inside.com.tw
 itmedia.co.jp
 jfengtime.com
@@ -120,6 +121,7 @@ limedia.tw
 localpresshk.com
 ltsports.com.tw
 macaodaily.com
+maidonanews.jp
 mdnkids.com
 mirrormedia.com.tw
 mirrormedia.mg
@@ -158,6 +160,7 @@ tnntoday.com
 tvbs.com.tw
 tvmost.com.hk
 twgreatnews.com
+twreporter.org
 unwire.hk
 upmedia.mg
 vjmedia.com.hk

data/category-media-cn

@@ -16,6 +16,8 @@ include:ynet
 21jingji.com
 # 站长网
 admin5.com
+# 安徽新闻
+anhuinews.com
 # 锋潮科技
 anzhuo.cn
 # 鞭牛士
@@ -55,6 +57,8 @@ cztv.com
 cztvcdn.com
 cztvcloud.com
 zjstv.com
+# 读特新闻
+dutenews.com
 # 大智慧
 dzh.com.cn
 gw.com.cn
@@ -169,6 +173,9 @@ ssimg.cn
 stockstar.com
 # 证券时报网
 stcn.com
+# 深圳报业集团
+sznews.com
+szpgm.com
 # 大公网/大公报
 takungpao.com
 # TechWeb

data/category-password-management

@@ -2,6 +2,7 @@ include:agilebits # 1password
 include:bitwarden
 include:lastpass
 
+authpass.app
 authy.com
 dashlane.com
 enpass.io

data/category-pt

@@ -141,6 +141,9 @@ lemonhd.org
 # 备胎
 beitai.pt
 
+# NexusHD
+nexushd.org
+
 bitpt.cn
 hdarea.club
 hdchina.org

data/category-public-tracker

@@ -411,34 +411,6 @@ full:udp.tracker.projectk.org
 full:wepzone.net
 full:wg.mortis.me
 full:ws.peer.ooo
-full:www.all4nothin.net
-full:www.bit-hdtv.com
-full:www.bitseduce.com
-full:www.biztorrents.com
-full:www.blackcats-games.net
-full:www.elitezones.ro
-full:www.freerainbowtables.com
-full:www.genesis-sp.org
-full:www.learnbits.me
-full:www.legittorrents.info
-full:www.megatorrents.kg
-full:www.mvgroup.org
-full:www.peckservers.com
-full:www.shnflac.net
-full:www.siambt.com
-full:www.thegeeks.bz
-full:www.theoccult.bz
-full:www.theplace.bz
-full:www.thetradersden.org
-full:www.thevault.bz
-full:www.torrent.eu.org
-full:www.torrentsnipe.info
-full:www.tribalmixes.com
-full:www.tvnihon.com
-full:www.worldboxingvideoarchive.com
-full:www.xwt-classics.net
-full:www.yuwabits.net
-full:www.zone-torrent.net
 full:xbtrutor.com
 full:xtremewrestlingtorrents.net
 full:y.paranoid.agency
@@ -447,3 +419,32 @@ full:yggtracker.i2p.rocks
 full:yolo.liberbear.com
 full:z.paranoid.agency
 full:zupix.online
+
+all4nothin.net
+bit-hdtv.com
+bitseduce.com
+biztorrents.com
+blackcats-games.net
+elitezones.ro
+freerainbowtables.com
+genesis-sp.org
+learnbits.me
+legittorrents.info
+megatorrents.kg
+mvgroup.org
+peckservers.com
+shnflac.net
+siambt.com
+thegeeks.bz
+theoccult.bz
+theplace.bz
+thetradersden.org
+thevault.bz
+torrent.eu.org
+torrentsnipe.info
+tribalmixes.com
+tvnihon.com
+worldboxingvideoarchive.com
+xwt-classics.net
+yuwabits.net
+zone-torrent.net

data/category-retail-ru

@@ -0,0 +1,6 @@
+# Fix Price
+fix-price.com
+
+# Lenta
+lenta.com
+lenta.tech

data/category-ru

@@ -16,18 +16,31 @@ xn--p1ai
 ru.com
 ru.net
 
+include:category-ecommerce-ru
+include:category-entertainment-ru
 include:category-gov-ru
+include:category-retail-ru
+
+# Public transportation
+include:mosmetro
 
 include:avito
 include:mailru-group
-include:okko
-include:ozon
-include:rutube
-include:wildberries
-include:wink
 include:x5
 include:yandex
 
-# Anime
-animevost.org
-seasonvar.ru
+# Dodo Pizza
+dodopizza.ru
+dodopizza.com
+dodostatic.net
+dodois.com
+dodois.io
+
+# Rostics
+rostics.ru
+uni.rest
+unirest.tech
+
+trbcdn.net
+tbank-online.com
+taxsee.com

data/category-scholar-cn

@@ -52,6 +52,7 @@ hwshu.com # 瀚文民国书库
 hytung.cn # 瀚堂典藏古籍
 incopat.com # incoPat 专利数据库
 lawyee.org # 北大法意网 中国法律资料库
+libvideo.com # 知识视界 武汉缘来文化
 neohytung.com # 瀚堂近代报刊
 nmrdata.com # 微谱数据
 nssd.cn # 国家哲学社会科学学术期刊数据库
@@ -67,5 +68,3 @@ unihan.com.cn # 书同文
 wenxin-ge.com # 文心阁古籍全文数据库
 wind.com.cn # Wind 资讯金融
 yiigle.com # 中华医学期刊全文数据库
-
-full:www.libvideo.com # 武汉缘来文化-知识视界

data/category-social-media-cn

@@ -6,7 +6,7 @@ include:gracg
 include:hupu
 include:meipian
 include:okjike
-include:sina
+include:sina @-!cn
 include:xiaohongshu
 include:yy
 include:zhihu
@@ -21,3 +21,6 @@ dandanvoice.com
 # 脉脉
 maimai.cn
 taou.com
+
+# 知识星球
+zsxq.com

data/cctv

@@ -39,3 +39,5 @@ zggbdszt.cn
 zggbdszt.com.cn
 zggbdszt.net.cn
 zygbdszt.net.cn
+
+ad.cctv.com @ads

data/chinamobile

@@ -13,11 +13,21 @@ migucloud.com
 migufun.com
 miguvideo.com
 
+# 中移金科
+cmft.com.cn
+
+# 中移在线
+cmcc-cs.cn
+online-cmcc.cn
+
 # 中移互联
 andfx.cn
 andfx.net
+cmicapm.com
 cmicrwx.cn
+cmicvip.cn
 cmpassport.com
+cytxl.com.cn
 fetion-portal.com
 fetionpic.com
 mmarket.com

data/chinaunicom

@@ -23,3 +23,4 @@ wo.com.cn
 wo116114.com
 wocloud.com.cn
 woread.com.cn
+wosms.cn

data/cloudflare

@@ -2,34 +2,48 @@ include:cloudflare-cn
 include:cloudflare-ipfs
 
 argotunnel.com
+browser.run
 cfargotunnel.com
+cfdata.org
 cfl.re
 cloudflare-dns.com
 cloudflare-ech.com
 cloudflare-esni.com
 cloudflare-gateway.com
 cloudflare-quic.com
+cloudflare-terms-of-service-abuse.com
 cloudflare.com
+cloudflare.dev
 cloudflare.net
 cloudflare.tv
 cloudflareaccess.com
 cloudflareapps.com
 cloudflarebolt.com
+cloudflarebrowser.com
+cloudflarechallenge.com
 cloudflareclient.com
+cloudflarecp.com
 cloudflareinsights.com
 cloudflareok.com
 cloudflarepartners.com
 cloudflareportal.com
 cloudflarepreview.com
 cloudflareregistrar.com
+cloudflareresearch.com
 cloudflareresolve.com
 cloudflaressl.com
 cloudflarestatus.com
 cloudflarestorage.com
 cloudflarestream.com
+cloudflaresupport.com
 cloudflaretest.com
 cloudflarewarp.com
+cloudflareworkers.com
+encryptedsni.com
 every1dns.net
+foundationdns.com
+foundationdns.net
+foundationdns.org
 imagedelivery.net
 isbgpsafeyet.com
 one.one.one

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/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/epochmediagroup

@@ -46,16 +46,20 @@ ntd.com
 ntd.tv
 ntdca.com
 ntdimg.com
+ntdtv-dc.com
 ntdtv.ca
+ntdtv.co.il
 ntdtv.co.kr
 ntdtv.com
 ntdtv.com.tw
+ntdtv.fr
 ntdtv.jp
 ntdtv.kr
 ntdtv.org
 ntdtv.ru
-ntdtv-dc.com
+ntdtv.se
 ntdtvla.com
+ntdvideo.tw
 ntdvn.com
 persianepochtimes.com
 renminbao.com

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/geolocation-!cn

@@ -3,9 +3,6 @@
 # AI Chat
 include:category-ai-!cn
 
-# Anime, Comics & Games
-include:category-acg
-
 # Advertisment & Analytics
 include:pubmatic
 include:taboola
@@ -105,6 +102,8 @@ include:w3schools
 include:zotero
 
 chemequations.com # 线上化学方程式！
+geogebra.org
+wolframalpha.com
 
 # Entertainment & Games & Music & Podcasts & Videos
 include:category-entertainment
@@ -247,29 +246,33 @@ include:zeplin
 include:zoho
 include:zoom
 
-biliplus.com # BiliPlus
-
-# Graphing for Science and Engineering
-originlab.com
-
-# Online LaTeX Editor
-cloudlatex.io
-overleaf.com
-
-# Translator & Dictionary
-include:linguee
-
-collinsdictionary.com
-ldoceonline.com
-immersivetranslate.com # 沉浸式翻译 (国际版)
-
-# Aurora Open Source Software (https://gitlab.com/AuroraOSS)
+## Aurora Open Source Software (https://gitlab.com/AuroraOSS)
 auroraoss.com
-
-# CookiePro, provides cookies and tracking
+## BiliPlus
+biliplus.com
+## CataBoom
+cataboom.com
+## Consent Management Platforms / Cookie service
+consentpro.com
 cookiepro.com
 cookielaw.org
 onetrust.com
+osano.com
+usercentrics.eu
+## Greasy Fork
+greasyfork.org
+## Online LaTeX Editor
+cloudlatex.io
+overleaf.com
+## Translator & Dictionary
+include:linguee
+collinsdictionary.com
+ldoceonline.com
+immersivetranslate.com # 沉浸式翻译 (国际版)
+## OriginLab (Graphing for Science and Engineering)
+originlab.com
+## OsmAnd
+osmand.net
 
 # Software development
 include:category-dev
@@ -287,9 +290,6 @@ include:rarbg
 dmhy.org
 rutor.info
 
-# User scripts
-greasyfork.org
-
 # VPN services
 include:category-vpnservices
 
@@ -304,6 +304,7 @@ include:wikimedia
 
 atwiki.jp
 touhouwiki.net
+wiki.gg
 
 # Others
 include:avaxhome

data/geolocation-cn

@@ -24,7 +24,9 @@ include:category-social-media-cn
 # Advertisment & Analytics
 include:getui
 include:jiguang
-include:umeng
+
+# 神策数据
+sensorsdata.cn
 
 # category-httpdns-cn is mainly for advertising purpose
 include:category-httpdns-cn
@@ -35,9 +37,9 @@ include:category-httpdns-cn
 # Bank & Finance & Insurance & Securities
 include:category-bank-cn
 include:category-securities-cn
-include:eastmoney
+include:eastmoney @-!cn
 include:everbright
-include:pingan
+include:pingan @-!cn
 include:taikang
 
 ## 航财通·校园付
@@ -89,11 +91,11 @@ pkoplink.com
 
 # E-commerce
 include:58tongcheng
-include:ctrip
+include:ctrip @-!cn
 include:dangdang
-include:dewu
+include:dewu @-!cn
 include:dongjiao
-include:jd
+include:jd @-!cn
 include:lianjia
 include:meituan
 include:miaomiaozhe
@@ -108,6 +110,8 @@ include:ziroom
 
 ## 无忧易售
 51selling.com
+## 爱回收
+aihuishou.com
 ## 唯品会
 appsimg.com
 appvipshop.com
@@ -176,6 +180,7 @@ znds.com # 智能电视网
 
 423down.com # 423Down
 acwifi.net # 路由器技术分享
+appinn.com # 小众软件
 chongdiantou.com # 充电头网
 ghxi.com # 果核剥壳
 iplaysoft.com # 异次元软件世界
@@ -227,8 +232,14 @@ xiamenair.com # 厦门航空
 12306.cn
 95306.cn
 ccrgt.com
+## 北京市政交通一卡通
+bmac.com.cn
+## 车来了
+chelaile.net.cn
 ## 跨境巴士
 kuajing84.com
+## 掌上公交
+mygolbs.com
 ## 宁停车
 ningtingche.com
 ## 航旅纵横
@@ -312,27 +323,46 @@ include:zhubajie
 ## 容联七陌 客服 营销
 7moor-fs1.com
 7moor.com
+## Alook 浏览器
+alookweb.com
 ## 安兔兔
 antutu.com
+antutu.net
 ## 拓竹科技
 bambulab.com
 bblmw.com
 ## BOSS 直聘
 bosszhipin.com
 zhipin.com
+## 下厨房
+chuimg.com
+xiachufang.com
 ## 天润融通 AI外呼 客服
 clink.cn
 ## 当贝
 dangbei.com
 dangbei.net
+## DCloud 数字天堂
+dcloud.io
+dcloud.net.cn
 ## 酷控
 deepepg.com
 kookong.com
 ## 滴答清单
 dida365.com
+## 兑吧
+dui88.com
+duiba.com.cn
 ## 快应用
 hapjs.org
 quickapp.cn
+## 乐播投屏
+hpplay.cn
+lbtp.com
+lebo.cn
+lebo.com.cn
+lebo.top
+mirrorcast.cn
 ## 货拉拉
 huolala.cn
 ## 火绒
@@ -370,6 +400,8 @@ soboten.com
 tacool.com
 ## Via 浏览器
 viayoo.com
+## X 浏览器
+xbext.com
 ## 印象笔记
 yinxiang.com
 ## 智联招聘
@@ -378,19 +410,19 @@ zhaopin.cn
 # Tech companies & Orginations
 include:aisiku # 北京艾斯酷科技有限公司
 include:akiko # 秋子酱科技
-include:alibaba
+include:alibaba @-!cn
 include:baidu
 include:beisen
 include:bluepoch
-include:bytedance
-include:didi
+include:bytedance @-!cn
+include:didi @-!cn
 include:dingdatech # 叮哒出行(杭州金通互联科技有限公司)
 include:dji
 include:gree
 include:haier
 include:hikvision
 include:honor
-include:huawei
+include:huawei @-!cn
 include:hupun # 杭州湖畔网络技术有限公司
 include:iflytek
 include:ishumei # 北京数美时代科技有限公司
@@ -402,14 +434,14 @@ include:meizu
 include:midea
 include:narwal # 云鲸科技
 include:netease
-include:oppo
+include:oppo @-!cn
 include:qihoo360
 include:sumkoo #北京尚古创新科技有限公司
 include:tcl
-include:tencent
+include:tencent @-!cn
 include:tongfang
-include:vivo
-include:xiaomi
+include:vivo @-!cn
+include:xiaomi @-!cn
 include:xunlei
 include:youquan # 祐全科技
 include:yuanbei # 上海圆贝信息科技有限公司
@@ -429,6 +461,10 @@ suzuki-china.com # 铃木中国官网
 udesk.cn # 沃丰科技
 ysjf.com # 影视飓风
 
+# 飞牛
+fnnas.com
+fnnas.net
+fnos.net
 # 稿定（厦门）信息服务有限公司
 ## 花瓣网 闽ICP备2021013850号
 huaban.com
@@ -442,13 +478,20 @@ xsbapp.cn
 
 # Telecommunication
 include:chinabroadnet
-include:chinamobile
-include:chinatelecom
+include:chinamobile @-!cn
+include:chinatelecom @-!cn
 include:chinatower
-include:chinaunicom
+include:chinaunicom @-!cn
 
 # 在线工具
-include:ipip # IPIP ip地理位置数据库
+## IPIP ip地理位置数据库
+include:ipip @-!cn
+
+## 白描
+baimiao.tech
+baimiaoapp.com
+shinescan.tech
+uzero.cn
 
 chaziyu.com # 滇ICP备2024035496号
 fofa.info # Fofa网站测绘（华顺信安）
@@ -645,7 +688,6 @@ apk3.com
 apk8.com
 aplaybox.com
 appchina.com
-appinn.com
 arpun.com
 asklib.com
 babytree.com
@@ -1351,7 +1393,6 @@ xdqtech.com # 上邻 | 新渡桥科技 浙ICP备2020031247号-1
 xdtool.com # 闽ICP备2024056202号-4
 xdwan.com
 xfdown.com
-xiachufang.com
 xiaobaixitong.com
 xiaoe-tech.com
 xiaogouh5.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/google-deepmind

@@ -22,7 +22,15 @@ bard.google.com
 gemini.google
 gemini.google.com
 
+# Gemini Code Assist
+# https://docs.cloud.google.com/gemini/docs/codeassist/set-up-gemini
+full:cloudaicompanion.googleapis.com
+full:cloudcode-pa.googleapis.com
+full:daily-cloudcode-pa.googleapis.com
+
 # NotebookLM
+full:notebooklm-pa.googleapis.com
+full:notebooklm.googleapis.com
 notebooklm.google
 notebooklm.google.com
 
@@ -32,6 +40,7 @@ jules.google.com
 
 # Google AI Labs
 labs.google
+labs.google.com
 aisandbox-pa.googleapis.com
 
 # Android Studio Gemini Code Assist
@@ -40,3 +49,9 @@ aida.googleapis.com
 # Opal
 opal.google
 opal.google.com
+
+# Antigravity
+full:antigravity-pa.googleapis.com
+full:antigravity.googleapis.com
+antigravity.google
+antigravity-unleash.goog

data/growingio-ads

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

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/huawei-dev

@@ -1,23 +1,23 @@
-bisheng.cn @cn
-bishengcompiler.cn @cn
-devui.design @cn
-gneec.com @cn
-gneec.com.cn @cn
-gneec3.com @cn
-gneec4.com @cn
-gneec7.com @cn
-harmonyos.com @cn
-hiascend.cn @cn
-hiascend.com @cn
-hiclc.com @cn
-hikunpeng.cn @cn
-hikunpeng.com @cn
-hikunpeng.com.cn @cn
-hikunpeng.net @cn
-hisilicon.com @cn
-hisilicon.com.cn @cn
-huaweiapaas.com @cn
-mindspore.cn @cn
-owsgo.com @cn
-teleows.com @cn
-saasops.tech @cn
+bisheng.cn
+bishengcompiler.cn
+devui.design
+gneec.com
+gneec.com.cn
+gneec3.com
+gneec4.com
+gneec7.com
+harmonyos.com
+hiascend.cn
+hiascend.com
+hiclc.com
+hikunpeng.cn
+hikunpeng.com
+hikunpeng.com.cn
+hikunpeng.net
+hisilicon.com
+hisilicon.com.cn
+huaweiapaas.com
+mindspore.cn
+owsgo.com
+saasops.tech
+teleows.com

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