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

use fqnovel@ads instead

.github/workflows/build.yml

@@ -5,6 +5,11 @@ on:
       - master
     paths-ignore:
       - "**/README.md"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
+
 jobs:
   build:
     name: Build
@@ -12,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout codebase
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: code
 
@@ -28,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: |
@@ -61,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 }}

.github/workflows/test-pr.yml

@@ -10,7 +10,7 @@ jobs:
 
     steps:
       - name: Checkout codebase
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: code
 
@@ -34,7 +34,7 @@ jobs:
           mv dlc.dat TEST-${{ github.run_number }}-dlc.dat
 
       - name: Upload TEST-${{ github.run_number }}-dlc.dat
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: TEST-${{ github.run_number }}-dlc.dat
           path: TEST-${{ github.run_number }}-dlc.dat

.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.
+- Comment begins with `#`. It may begin anywhere in the file. The content in the line after `#` is treated as comment and ignored in production.
+- Subdomain begins with `domain:`, followed by a valid domain name. The prefix `domain:` may be omitted.
+- Full domain begins with `full:`, followed by a complete and valid domain name.
+- 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/config.proto#L21).
-5. Generate each `keyword:` line into a [plain domain routing rule](https://github.com/v2fly/v2ray-core/blob/master/app/router/config.proto#L17).
-6. Generate each `regexp:` line into a [regex domain routing rule](https://github.com/v2fly/v2ray-core/blob/master/app/router/config.proto#L19).
-7. Generate each `full:` line into a [full domain routing rule](https://github.com/v2fly/v2ray-core/blob/master/app/router/config.proto#L23).
+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,12 +142,12 @@ 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
 
-* Fork this repo, make modifications to your own repo, file a PR.
-* Please begin with small size PRs, say modification in a single file.
-* A PR must be reviewed and approved by another member.
-* A script will verify your pull request to test whether your PR is correct or not every time you update the PR. Only the PR which passes the test will be merged. Please go to the Action label to get detailed information if you didn't pass it. We also provide the file which has been generated to make you test.
-* After a few successful PRs, you may apply for manager access to this repository.
+- Fork this repo, make modifications to your own repo, file a PR.
+- Please begin with small size PRs, say modification in a single file.
+- A PR must be reviewed and approved by another member.
+- A script will verify your pull request to test whether your PR is correct or not every time you update the PR. Only the PR which passes the test will be merged. Please go to the Action label to get detailed information if you didn't pass it. We also provide the file which has been generated to make you test.
+- After a few successful PRs, you may apply for manager access to this repository.

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/18comic

@@ -5,11 +5,47 @@
 18comic.company
 18comic.org
 18comic.vip
+asjmapihost.cc
+cdnblackmyth.club
+cdnmhws.cc
+cdnmhwscc.vip
+cdnuc.vip
+cdnxxx-proxy.co
+cdnxxx-proxy.xyz
+jm-comic2.cc
+jm18c-bbm.cc
+jm18c-bbm.net
+jm18c-uoi.net
+jm365.work
+jm365.xyz
+jmapibranch1.cc
+jmapibranch2.cc
+jmapibranch3.cc
+jmapinode.biz
+jmapinode.vip
+jmapinode.xyz
+jmapinode1.top
+jmapinode2.top
+jmapinode3.top
+jmapinodeudzn.net
+jmapinodeudzn.xyz
+jmapiproxy1.cc
+jmapiproxy1.monster
+jmapiproxy2.cc
+jmapiproxy3.cc
+jmapiproxy4.cc
+jmapiproxyxxx.vip
+jmcomic.group
 jmcomic.ltd
 jmcomic.me
 jmcomic.mobi
 jmcomic.moe
+jmcomic.rocks
+jmcomic-fb.vip
+jmcomic-zzz.one
+jmcomic-zzz.org
 jmcomic1.city
 jmcomic1.me
 jmcomic1.mobi
+jmcomic1.rocks
 jmcomic2.moe

data/2ch

@@ -1,2 +1,4 @@
 2ch.hk
-2ch.life
+2ch.life
+2ch.org
+2ch.su

data/3dm

@@ -1 +0,0 @@
-3dmgame.com

data/3type

@@ -1 +0,0 @@
-3type.cn

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/4paradigm

@@ -1 +0,0 @@
-4paradigm.com

data/58tongcheng

@@ -29,6 +29,11 @@ jxedt.com
 jxksw.net
 roomeet.cn
 xinchong.com
+
+# 转转
 zhuancorp.com
+zhuaninc.com
+zhuanspirit.cn
 zhuanspirit.com
+zhuanstatic.com
 zhuanzhuan.com

data/75team

@@ -1,5 +0,0 @@
-75.team
-75team.com
-
-# 75CDN
-baomitu.com

data/7tv

@@ -0,0 +1,2 @@
+7tv.app
+7tv.io

data/9game

@@ -0,0 +1 @@
+9game.cn

data/accuweather

@@ -1 +1,2 @@
 accuweather.com
+awxcdn.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/adidas

@@ -1,19 +1,90 @@
+adidas.ae
 adidas.at
 adidas.be
+adidas.bh
+adidas.ca
 adidas.ch
+adidas.cl
+adidas.cn @cn
+adidas.co
+adidas.co.id
 adidas.co.in
+adidas.co.kr
+adidas.co.nz
+adidas.co.th
 adidas.co.uk
+adidas.co.za
 adidas.com
+adidas.com.ar
+adidas.com.au
+adidas.com.br
 adidas.com.cn @cn
+adidas.com.co
+adidas.com.eg
+adidas.com.hk
+adidas.com.my
+adidas.com.pe
+adidas.com.ph
+adidas.com.qa
 adidas.com.sa
+adidas.com.sg
+adidas.com.tr
 adidas.com.tw
+adidas.com.vn
 adidas.cz
 adidas.de
 adidas.dk
+adidas.es
+adidas.fi
+adidas.fr
+adidas.gr
 adidas.hu
 adidas.ie
+adidas.in
 adidas.it
+adidas.jp
+adidas.mx
 adidas.nl
+adidas.no
+adidas.pe
 adidas.pl
+adidas.pt
 adidas.ru
 adidas.se
+adidas.sk
+adidasadmin.com
+adidasarchive.org
+adidas-archive.org
+adidasbadminton.com
+adidasboxing.com
+adidascdn.com
+adidas-group.ca
+adidas-group.com
+adidasgymnastics.com
+adidashockey.com
+adidasmotorsport.com
+adidassailing.com
+adidasspecialtysports.at
+adidasspecialtysports.be
+adidasspecialtysports.cn @cn
+adidasspecialtysports.co.uk
+adidasspecialtysports.cz
+adidasspecialtysports.de
+adidasspecialtysports.dk
+adidasspecialtysports.es
+adidasspecialtysports.fi
+adidasspecialtysports.fr
+adidasspecialtysports.ie
+adidasspecialtysports.it
+adidasspecialtysports.nl
+adidasspecialtysports.pl
+adidasspecialtysports.ru
+adidasspecialtysports.se
+adidasspecialtysports.sk
+adidastabletennis.com
+adidasusnews.com
+miadidas.com
+micoach.com
+miteam.com
+shopadidas.ca
+shopadidas.com

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

@@ -1 +1,3 @@
 aiqicha.baidu.com
+aiqicha.cn
+aiqicha.com

data/akamai

@@ -66,6 +66,7 @@ akastream.com
 akastream.net
 akatns.net
 akcdn.com.cn @cn
+akstat.io
 aptdn.net @cn
 edgekey.net
 edgekey88.net @cn
@@ -77,3 +78,4 @@ janrainservices.com @cn
 skycdn.com.cn @cn
 soasta-dswb.com
 srtcdn.net
+tl88.net @cn

data/ali213

@@ -1 +0,0 @@
-ali213.net

data/alibaba

@@ -10,21 +10,23 @@ taobao
 # All .tmall domains
 tmall
 
-include:alibaba-ads
+include:9game
 include:alibabacloud
 include:aliyun
 include:aliyun-drive
+include:amap
 include:cainiao
 include:dingtalk
 include:eleme
 include:teambition
 include:uc
 include:umeng
+include:youku
 
 25pp.com
 56che.com
 95095.com
-9game.cn
+ali-health.com
 aliapp.org
 alibaba-inc.com
 alibaba.com
@@ -43,6 +45,7 @@ alihealth.com.cn
 alihealth.hk @!cn
 aliimg.com
 alikmd.com
+alimama.cn
 alimama.com
 alimebot.com
 alimei.com
@@ -86,6 +89,7 @@ gongyi.xin
 ialicdn.com
 iconfont.cn
 ics.design
+imgcook.com
 jhgtgb.com
 kanbox.com
 lazada.com
@@ -108,6 +112,7 @@ shuqi.com
 shuqireader.com
 sparenode.com
 supet.com
+tanx.com
 ttpod.com
 wandoujia.com
 xin.xin
@@ -119,8 +124,11 @@ yushanfang.com
 zuodao.com
 
 # AliExpress
+ae-rus.net @!cn
+aestatic.net @!cn
 aliexpress.com
 aliexpress.ru @!cn
+aliexpress-media.com
 
 # Alipay+
 alipayplus.com
@@ -161,6 +169,7 @@ lingshoujia.com
 mashort.cn
 pailitao.com
 taobao.com
+taobao.net
 taobao.org
 taobaocdn.com
 taobizhong.com
@@ -176,6 +185,7 @@ tmjl.ai
 
 # 夸克
 cueme.cn
+myquark.cn
 quark.cn
 
 # 飞猪
@@ -186,9 +196,6 @@ fliggy.com
 fliggy.hk @!cn
 iuynfg.com
 
-# 高德地图
-include:amap
-
 # 虾米音乐
 xiami.com
 xiami.fm
@@ -218,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,98 +0,0 @@
-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.amap.com @ads
-adashx.ut.ele.me @ads
-adashx.ut.youku.com @ads
-adashx4ae.ut.taobao.com @ads
-adashx4yt.m.taobao.com @ads
-adashxgc.ut.taobao.com @ads
-adsh.m.taobao.com @ads
-afp.adchina.com @ads
-afp.alicdn.com @ads
-agoodm.m.taobao.com @ads
-agoodm.wapa.taobao.com @ads
-alipaylog.com @ads
-amdc.alipay.com @ads
-api.wapa.taobao.com @ads
-api.waptest.taobao.com @ads
-apoll.m.taobao.com @ads
-atanx.alicdn.com @ads
-atanx2.alicdn.com @ads
-c-adash.m.taobao.com @ads
-cdn0.mobmore.com @ads
-click.aliyun.com @ads
-click.mz.simba.taobao.com @ads
-cm.ipinyou.com @ads
-dsp.simba.taobao.com @ads
-ex.mobmore.com @ads
-ex.puata.info @ads
-fav.simba.taobao.com @ads
-feedback.whalecloud.com @ads
-ff.win.taobao.com @ads
-fm.p0y.cn @ads
-g.click.taobao.com @ads
-g.tbcdn.cn @ads
-gma.alicdn.com @ads
-gtms01.alicdn.com @ads
-gtms02.alicdn.com @ads
-gtms03.alicdn.com @ads
-gtms04.alicdn.com @ads
-h-adashx.ut.ele.me @ads
-h-adashx.ut.taobao.com @ads
-h-adashx.ut.youku.com @ads
-h-adashx4yt.ut.taobao.com @ads
-hydra.alibaba.com @ads
-hz.pre.tbusergw.taobao.net @ads
-hz.tbusergw.taobao.net @ads
-i.ipinyou.com @ads
-init.phpwind.com @ads
-intl.wapa.taobao.com @ads
-intl.waptest.taobao.com @ads
-jxlog.istreamsche.com @ads
-log.umtrack.com @ads
-m-adash.m.taobao.com @ads
-m.intl.taobao.com @ads
-m.simba.taobao.com @ads
-match.p4p.1688.com @ads
-material.istreamsche.com @ads
-mlt01.com @ads
-nbsdk-baichuan.alicdn.com @ads
-nbsdk-baichuan.taobao.com @ads
-osfota.cdn.aliyun.com @ads
-osupdate.aliyun.com @ads
-osupdateservice.yunos.com @ads
-pindao.huoban.taobao.com @ads
-push.wandoujia.com @ads
-re.m.taobao.com @ads
-re.taobao.com @ads
-redirect.simba.taobao.com @ads
-rj.m.taobao.co @ads
-rj.m.taobao.com @ads
-sdkinit.taobao.com @ads
-simaba.taobao.com @ads
-simba.m.taobao.com @ads
-srd.simba.taobao.com @ads
-stats.ipinyou.com @ads
-strip.taobaocdn.com @ads
-tanxlog.istreamsche.com @ads
-tejia.taobao.com @ads
-temai.taobao.com @ads
-tns.simba.taobao.com @ads
-tongji.linezing.com @ads
-tvupgrade.yunos.com @ads
-tyh.taobao.com @ads
-userimg.qunar.com @ads
-v6-adashx.ut.amap.com @ads
-v6-adashx.ut.cainiao.com @ads
-v6-adashx.ut.ele.me @ads
-v6-adashx.ut.taobao.com @ads
-w.m.taobao.com @ads
-yiliao.hupan.com @ads

data/aliyun

@@ -3,7 +3,9 @@ alicdn.com
 alicloudapi.com
 alidayu.com
 alidns.com
+aligfwaf.com
 alikunlun.com
+alikunlun.net
 aliyun-inc.com
 aliyun-iot-share.com
 aliyun.com
@@ -65,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

@@ -8,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/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/android

@@ -1,3 +1,6 @@
+# All .android domains
+android
+
 android.com
 androidify.com
 

data/annas-archive

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

data/antutu

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

data/apple

@@ -1,12 +1,11 @@
-include:apple-ads
-include:apple-dev
+include:apple-dev # swift inside
+# Not include:apple-intelligence
 include:apple-pki
 include:apple-tvplus
 include:apple-update
 include:beats
 include:icloud
 include:itunes
-include:swift
 
 # All .apple domains
 apple
@@ -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
@@ -855,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"
@@ -873,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
@@ -881,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
@@ -934,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
@@ -980,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
@@ -990,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-intelligence

@@ -3,3 +3,10 @@ full:apple-relay.apple.com
 full:apple-relay.cloudflare.com
 full:apple-relay.fastly-edge.com
 full:apple-relay.mask.apple-dns.net
+
+# Potentially affected services include:
+# * eSIM region determination for devices in China
+# * China-specific version of Apple Maps
+# * Availability region detection for Apple Watch notifications (High Blood Pressure / Sleep Apnea)
+# * Enabling Wi-Fi Calling for certain carriers
+full:gspe1-ssl.ls.apple.com

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

@@ -1,8 +1,2 @@
-include:4plebs
-
-archive-it.org
-archive.md
-archive.org
-archive.ph
-archive.today
-openlibrary.org
+# For compatibility only
+include:category-web-archive

data/archivetoday

@@ -0,0 +1,8 @@
+archive.today
+
+archive.fo
+archive.is
+archive.li
+archive.md
+archive.ph
+archive.vn

data/archlinux

@@ -1,2 +1,5 @@
 archlinux.org
 archlinuxarm.org
+
+# Unofficial
+archlinuxcn.org

data/askdiandian

@@ -0,0 +1,3 @@
+# 点点 Ai
+askdiandian.com
+diandianlife.top

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

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

data/avito

@@ -0,0 +1,2 @@
+avito.ru
+avito.st

data/aws

@@ -22,6 +22,7 @@ amplifyapp.com
 amplifyframework.com
 aws-iot-hackathon.com
 aws.com
+aws.dev
 awsapprunner.com
 awsapps.com
 awsautopilot.com

data/b3log

@@ -1 +1,5 @@
+# 云南链滴科技有限公司 滇ICP备14007358号
 b3log.org
+b3logfile.com
+hacpai.com
+ld246.com

data/baidu

@@ -1,4 +1,3 @@
-include:baidu-ads
 include:zuoyebang
 
 # All .baidu domains
@@ -29,6 +28,7 @@ bce-cdn.cn
 bce-cdn.com
 bce-cdn.net
 bcebos.com
+bcelive.com
 bdcloudapi.com
 bdimg.com
 bdstatic.com
@@ -42,6 +42,7 @@ bdydns.net
 chuanke.com
 dlnel.com
 dlnel.org
+duapp.com
 duapp.net
 duapps.com
 duurl.cn
@@ -55,6 +56,7 @@ jomocdn.net
 jomodns.cn
 jomodns.com
 jomodns.net
+jomoxc.com
 mipcdn.com
 nuomi.com
 quyaoya.com
@@ -64,17 +66,73 @@ tieba.com
 tiebaimg.com
 xianfae.com
 xiaodutv.com
+yoojia.com
 
-# duxiaoman
+# 度小满
 duxiaoman-int.com
 duxiaoman.com
 duxiaomanfintech.com
 duxiaomantech.com
 dxm-cdn.com
 dxm-int.com
+dxmjinr.com
 dxmlcf.com
 dxmlcfintech.com
 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,156 +0,0 @@
-a.baidu.com @ads
-ad.duapps.com @ads
-ad.player.baidu.com @ads
-adm.baidu.com @ads
-adscdn.baidu.com @ads
-adx.xiaodutv.com @ads
-ae.bdstatic.com @ads
-afd.baidu.com @ads
-als.baidu.com @ads
-api.mobula.sdk.duapps.com @ads
-api.tuisong.baidu.com @ads
-appc.baidu.com @ads
-b.bdstatic.com @ads
-baichuan.baidu.com @ads
-baidustatic.com @ads
-baidutv.baidu.com @ads
-banlv.baidu.com @ads
-bar.baidu.com @ads
-bdplus.baidu.com @ads
-btlaunch.baidu.com @ads
-c.baidu.com @ads
-cb.baidu.com @ads
-cbjs.baidu.com @ads
-cjhq.baidu.com @ads
-cleaner.baidu.com @ads
-click.bes.baidu.com @ads
-click.qianqian.com @ads
-cm.baidu.com @ads
-cpro.baidu.cn @ads
-cpro.baidu.com @ads
-cpro.baidustatic.com @ads
-cpro.tieba.baidu.com @ads
-cpro.zhidao.baidu.com @ads
-cpro2.baidu.com @ads
-cpro2.baidustatic.com @ads
-cpu.baidu.com @ads
-crs.baidu.com @ads
-cstm.baidu.com @ads
-datax.baidu.com @ads
-dd713.bj.bcebos.com @ads
-dl.client.baidu.com @ads
-dl.ops.baidu.com @ads
-dl1sw.baidu.com @ads
-dl2.bav.baidu.com @ads
-dlsw.baidu.com @ads
-dlsw.br.baidu.com @ads
-dlswbr.baidu.com @ads
-dl-vip.bav.baidu.com @ads
-dl-vip.pcfaster.baidu.co.th @ads
-download.bav.baidu.com @ads
-download.sd.baidu.com @ads
-drmcmm.baidu.com @ads
-duiwai.baidu.com @ads
-dup.baidustatic.com @ads
-dxp.baidu.com @ads
-dzl.baidu.com @ads
-e.baidu.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
-em.baidu.com @ads
-entry.baidu.com @ads
-ers.baidu.com @ads
-f10.baidu.com @ads
-fc-feed.cdn.bcebos.com @ads
-fclick.baidu.com @ads
-fclog.baidu.com @ads
-feed.baidu.com @ads
-g.baidu.com @ads
-gimg.baidu.com @ads
-goutong.baidu.com @ads
-gsp1.baidu.com @ads
-guanjia.baidu.com @ads
-hao123union.baidu.com @ads
-hc.baidu.com @ads
-hm.baidu.com @ads
-hmma.baidu.com @ads
-hpd.baidu.com @ads
-idm.bce.baidu.com @ads
-idm-su.baidu.com @ads
-iebar.baidu.com @ads
-ikcode.baidu.com @ads
-img.taotaosou.cn @ads
-img01.taotaosou.cn @ads
-imgstat.baidu.com @ads
-iwanad.baidu.com @ads
-j.br.baidu.com @ads
-kstj.baidu.com @ads
-log.music.baidu.com @ads
-lxbjs.baidu.com @ads
-m1.baidu.com @ads
-ma.baidu.com @ads
-miao.baidu.com @ads
-mobads.baidu.com @ads
-mobads-logs.baidu.com @ads
-mpro.baidu.com @ads
-msite.baidu.com @ads
-neirong.baidu.com @ads
-nsclick.baidu.com @ads
-nsclickvideo.baidu.com @ads
-openrcv.baidu.com @ads
-pc.videoclick.baidu.com @ads
-pos.baidu.com @ads
-pups.bdimg.com @ads
-push.zhanzhang.baidu.com @ads
-qianclick.baidu.com @ads
-release.baidu.com @ads
-res.mi.baidu.com @ads
-rigel.baidustatic.com @ads
-river.zhidao.baidu.com @ads
-rj.baidu.com @ads
-rplog.baidu.com @ads
-s.baidu.com @ads
-sa.tuisong.baidu.com @ads
-sclick.baidu.com @ads
-sestat.baidu.com @ads
-shadu.baidu.com @ads
-share.baidu.com @ads
-sobar.baidu.com @ads
-sobartop.baidu.com @ads
-spcode.baidu.com @ads
-stat.v.baidu.com @ads
-su.bdimg.com @ads
-su.bdstatic.com @ads
-tk.baidu.com @ads
-tkweb.baidu.com @ads
-tob-cms.bj.bcebos.com @ads
-tongji.baidu.com @ads
-toolbar.baidu.com @ads
-tracker.baidu.com @ads
-tuijian.baidu.com @ads
-uat1.bfsspadserver.8le8le.com @ads
-ubmcmm.baidustatic.com @ads
-ucstat.baidu.com @ads
-ulic.baidu.com @ads
-ulog.imap.baidu.com @ads
-union.baidu.com @ads
-unionimage.baidu.com @ads
-utility.baidu.com @ads
-utk.baidu.com @ads
-videopush.baidu.com @ads
-vv84.bj.bcebos.com @ads
-w.gdown.baidu.com @ads
-w.x.baidu.com @ads
-wangmeng.baidu.com @ads
-weishi.baidu.com @ads
-wenku-cms.bj.bcebos.com @ads
-wisepush.video.baidu.com @ads
-wkctj.baidu.com @ads
-wm.baidu.com @ads
-znsv.baidu.com @ads
-zz.bdstatic.com @ads
-zzy1.quyaoya.com @ads

data/baijiayun

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

data/baishancloud

@@ -0,0 +1,3 @@
+bsclink.cn
+qingcdn.com
+trpcdn.net

data/bilibili

@@ -1,3 +1,4 @@
+include:bilibili-cdn
 include:bilibili-game
 
 
@@ -30,23 +31,8 @@ bilibili.net
 bilibili.tv @!cn
 bilibilipay.cn
 bilibilipay.com
-bilicdn1.com
-bilicdn2.com
-bilicdn3.com
-bilicdn4.com
-bilicdn5.com
 biligo.com
-biliimg.com
 biliintl.com @!cn
-bilivideo.cn
-bilivideo.com
-bilivideo.net
 dreamcast.hk @!cn
-hdslb.com
-hdslb.org
 im9.com
-maoercdn.com
-mincdn.com
 yo9.com
-
-full:upos-hz-mirrorakam.akamaized.net @!cn

data/bilibili-cdn

@@ -0,0 +1,16 @@
+bilicdn1.com
+bilicdn2.com
+bilicdn3.com
+bilicdn4.com
+bilicdn5.com
+biliimg.com
+bilivideo.cn
+bilivideo.com
+bilivideo.net
+hdslb.com
+hdslb.org
+
+maoercdn.com
+mincdn.com
+
+full:upos-hz-mirrorakam.akamaized.net @!cn

data/bilibili-game

@@ -1,6 +1,6 @@
-bilibiligame.cn @cn
-bilibiligame.co @cn
-bilibiligame.net @cn
-biligame.co @cn
-biligame.com @cn
-biligame.net @cn
+bilibiligame.cn
+bilibiligame.co
+bilibiligame.net
+biligame.co
+biligame.com
+biligame.net

data/binance

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

data/bing

@@ -5,7 +5,7 @@ bing.com
 bing.com.cn @cn
 bing.net
 bing123.com
-bingads.com
+bingads.com @ads
 bingagencyawards.com
 bingapis.com
 bingapistatistics.com

data/bluepoch

@@ -1,3 +1,4 @@
+# 深蓝互动
 include:bluepoch-games
 
-bluepoch.com @cn
+bluepoch.com

data/bluepoch-games

@@ -1,2 +1,2 @@
 # From reverse 1999
-sl916.com @cn
+sl916.com

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

@@ -1,3 +1,5 @@
 bcicdn.com
 bcrncdn.com
+bcvcdn.com
+bgicdn.com
 bongacams.com

data/bushiroad

@@ -0,0 +1,31 @@
+argo-bdp.com
+bang-dream.com
+bushi-navi.com
+bushimo.jp
+bushiroad-creative.com
+bushiroad-global-online-store.com
+bushiroad-move.com
+bushiroad-music.com
+bushiroad-store.com
+bushiroad-works.com
+bushiroad.co.jp
+bushiroad.com
+bushiroadgames.com
+cf-vanguard.com
+comic-growl.com
+comicbushi-web.com
+d4dj-pj.com
+dreamorder.com
+fc-buddyfight.com
+gamebiz.jp
+gekkan-bushi.com
+hibiki-cast.jp
+hikosen.co.jp
+njpw.co.jp
+njpw1972.com
+rebirth-fy.com
+revuestarlight.com
+shadowverse-evolve.com
+ws-blau.com
+ws-tcg.com
+wwr-stardom.com

data/bytedance

@@ -1,5 +1,4 @@
-include:bytedance-ads
-
+#include:bytedance-ai-!cn # not serving for cn
 include:doubao
 include:douyin # douyin, huoshan and qishuimusic inside
 include:fqnovel
@@ -85,7 +84,6 @@ bytedance.com
 bytedance.net
 bytedance.org
 bytedanceapi.com
-bytedapm.com
 bytedcdn.com
 bytedeliver.com
 bytedgames.com
@@ -334,6 +332,12 @@ ppxstatic.com
 ppxvod.com
 xiaoxiaapi.com
 
+# 上海格物致品
+douyinec.com
+ecombdapi.com
+ecombdstatic.com
+jinritemai.com
+
 # faceu
 faceu.com
 
@@ -352,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,23 +0,0 @@
-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

data/bytedance-ai-!cn

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

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

@@ -0,0 +1,8 @@
+# affinity
+affinity.api.serifservices.com
+affinity.studio
+affinity-beta.s3.amazonaws.com
+affinity-lessons.s3.amazonaws.com
+
+canva.com
+canvastatus.com

data/category-ads

@@ -1,67 +1,55 @@
 # 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:clearbitjs-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:leanplum-ads
-include:letv-ads
-include:mixpanel-ads
-include:mopub-ads
-include:mxplayer-ads
-include:netease-ads
-include:newrelic-ads
-include:ogury-ads
-include:onesignal-ads
-include:ookla-speedtest-ads
-include:openx-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:wteam-ads
-include:xhamster-ads
-include:xiaomi-ads
-include:ximalaya-ads
-include:yahoo-ads
-include:youku-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
 51y5.net
 a.adtng.com
 aaxads.com
@@ -70,50 +58,67 @@ 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
 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
 
@@ -124,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
@@ -141,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
 
@@ -173,3 +208,35 @@ iabchina.cn
 # 卓信id
 zxid-api.mobileservice.cn
 zxid-m.mobileservice.cn
+
+# 深演智能
+ipinyou.com
+ipinyou.com.cn
+
+# 智云众 OptAim
+optaim.com
+
+# 加和科技 AddNewer
+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

@@ -1,18 +1,28 @@
 include:anthropic
+include:bytedance-ai-!cn
 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
 coderabbit.gallery.vsassets.io
 
+# Cohere
+cohere.ai
+cohere.com
+
 # Jasper
 clipdrop.co
 jasper.ai
@@ -22,7 +32,9 @@ copilot.microsoft.com
 devin.ai
 diabrowser.com
 dify.ai
+duck.ai
 gateway.ai.cloudflare.com
+kiro.dev
 meta.ai
 mistral.ai
 openart.ai

data/category-ai-cn

@@ -1,15 +1,19 @@
-# DeepSeek
+include:askdiandian
 include:deepseek
+include:doubao
+include:trae # MarsCode
+include:xiaomi-ai
 
 # RWKV
 rwkv.cn
 rwkv.com
 
 # 通义千问
-tongyi.aliyun.com
 qianwen.aliyun.com
+qianwen.com
 qwen.ai
 qwenlm.ai
+tongyi.aliyun.com
 tongyi.com
 
 # 文心一言
@@ -18,10 +22,6 @@ yiyan.baidu.com
 # 天工AI
 tiangong.cn
 
-# 字节跳动：豆包、Trae(MarsCode)
-include:doubao
-include:trae
-
 # 智谱清言
 bigmodel.cn
 chatglm.cn
@@ -58,3 +58,11 @@ full:ai.zhaomi.cn
 
 # 妙言AI 冀ICP备20012219号-3
 miaoyanai.com
+
+# 法行宝 (百度)
+faxingbao.com
+
+# 上海秘塔网络科技
+meta.law
+metaso.cn
+xiezuocat.com

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-bourse-ir

@@ -1,4 +1,4 @@
-# Iranian stock exchange websites 
+# Iranian stock exchange websites
 
 # Bourse
 arman-ati.com

data/category-browser-!cn

@@ -28,3 +28,4 @@ pulsebrowser.app
 qutebrowser.org
 vivaldi.com
 waterfox.net
+zen-browser.app

data/category-cdn-!cn

@@ -0,0 +1,15 @@
+include:akamai
+include:cdn77
+include:cloudflare
+include:fastly
+include:imgix
+include:limelight
+include:pagecdn
+include:quantil
+include:stackpath
+include:vrcdn
+
+# Bunny CDN
+b-cdn.net
+bunny.net
+bunnycdn.com

data/category-cdn-cn

@@ -0,0 +1,17 @@
+include:baishancloud
+include:bootcdn
+include:cloudflare-cn
+include:dwion
+include:qiniu
+include:upai
+include:wangsu
+
+## 创世云
+chuangcache.com
+chuangcdn.com
+## FUNCDN
+funcdn.com
+## 北京知道创宇信息技术股份有限公司
+jiashule.com
+jiasule.com
+yunaq.com

data/category-collaborate-cn

@@ -1,36 +1,37 @@
-# Remote Desktop
+# 远程桌面/远程组网
+
+## 连连控
+asklink.com
+## EasyTier
+easytier.cn
 ## Oray
 oray.com
 oray.net
 orayer.com
 orayimg.com
 sunlogin.net
-
-## ToDesk
-todesk.com
-
-## 连连控
-asklink.com
-
 ## 叮当猫脚本管理系统 懒人精灵远程调试
 privateapi.xyz
+## ToDesk
+todesk.cn
+todesk.com
+## 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-communication

@@ -11,4 +11,6 @@ include:protonmail
 include:signal
 include:slack
 include:telegram
+include:temp-mail
+include:viber
 include:whatsapp

data/category-companies

@@ -2,12 +2,10 @@
 
 include:acer
 include:adobe
-include:agilebits
 include:alibabacloud
 include:amazon
 include:amd
 include:anexia
-include:anthropic
 include:apple
 include:asus
 include:atlassian
@@ -17,6 +15,7 @@ include:bandwagonhost
 include:blurams
 include:broadcom
 include:canon
+include:canva
 include:chegg
 include:cisco
 include:cloudcone
@@ -25,6 +24,7 @@ include:comodo
 include:corel
 include:dell
 include:digitalocean
+include:dmit
 include:drweb
 include:duolingo
 include:faronics
@@ -32,7 +32,6 @@ include:giffgaff
 include:gigabyte
 include:godaddy
 include:google
-include:groq
 include:hetzner
 include:hinet
 include:hkbn
@@ -43,12 +42,14 @@ include:ibm
 include:ibkr
 include:inshot
 include:intel
+include:intuit
 include:ixsystems
 include:kakao
 include:kaspersky
 include:lg
 include:logitech
-include:mailru
+include:louisvuitton
+include:mailru-group
 include:meta
 include:microsoft
 include:mikrotik
@@ -60,12 +61,10 @@ include:mxroute
 include:naver
 include:neuralink
 include:nvidia
-include:openai
 include:openweather
 include:oracle
 include:panasonic
 include:pccw
-include:perplexity
 include:qnap
 include:qualcomm
 include:qwant
@@ -81,7 +80,6 @@ include:spaceship
 include:st
 include:synology
 include:symantec
-include:tailscale
 include:theboringcompany
 include:tonec
 include:uber
@@ -93,7 +91,6 @@ include:westerndigital
 include:wisekey
 include:yahoo
 include:yandex
-include:xai
 
 # Remote Control
 include:category-remote-control

data/category-cryptocurrency

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

data/category-ddns

@@ -0,0 +1,12 @@
+# Dynamic DNS
+# https://github.com/alexandrosmagos/dyn-dns-list
+
+include:cloudns
+include:dynu
+include:noip
+
+dpdns.org
+duckdns.org
+nip.io
+sslip.io
+traefik.me

data/category-dev

@@ -53,6 +53,7 @@ include:ruby
 include:rust
 include:redhat
 include:scala
+include:sentry
 include:sourcehut
 include:stackexchange
 include:strikingly
@@ -69,10 +70,7 @@ apache.org
 artixlinux.org
 atom.io
 badgen.net
-
-# Bitvise official website.
 bitvise.com
-
 cdnjs.com
 centos.org
 chocolatey.org
@@ -93,12 +91,14 @@ getcomposer.org
 getzola.org
 git-scm.com
 gnu.org
+godbolt.org
 
 # PuTTY and some software official websites.
 greenend.org.uk
 
 hex.pm
 hexdocs.pm
+imageglass.org
 ius.io
 jenkins.io
 js.org
@@ -110,11 +110,13 @@ lua.org
 macports.org
 mariadb.org
 mingw.org
-
-# Mobatek official website.
 mobatek.net
-
+mpv.io
 mysql.com
+neovim.io
+netfilter.org
+newpipe.net
+nftables.org
 nixos.org
 nodesource.com
 notepad-plus-plus.org
@@ -125,11 +127,8 @@ packagist.org
 pcre.org
 phantomjs.org
 php.net
-
-# PuTTY unofficial website, owned by Bitvise.
-putty.org
-
 postgresql.org
+putty.org
 r-project.org
 raspberrypi.org
 raspbian.org
@@ -141,15 +140,15 @@ shellcheck.net
 shields.io
 sqlite.org
 sublimetext.com
-
-# Termius official website.
+tampermonkey.net
 termius.com
-
 unpkg.com
 videojs.com
 videolan.org
 wapm.io
 wasmer.io
+webflow.com
+weblate.org
 wireshark.org
 x.org
 xposed.info

data/category-dev-cn

@@ -4,11 +4,10 @@ include:apipost
 include:baltamatica
 include:cnblogs
 include:csdn
-include:deepin
+include:deepin @-!cn
 include:gitee
 include:goproxy
 include:huawei-dev
-include:jinrishici
 include:juejin
 include:kuaiyikeji
 include:oschina
@@ -18,6 +17,9 @@ include:rubychina
 include:segmentfault
 include:sxl
 include:tencent-dev
-include:tipdm
 include:ubuntukylin
-include:xueyuanjun
+include:unitychina
+
+jinrishici.com
+openvela.com
+tipdm.org

data/category-doh

@@ -0,0 +1,359 @@
+# This is not related with `category-httpdns-cn`
+
+# **Public anycast resolvers**
+
+# AdGuard DNS
+
+## Default
+full:dns.adguard.com
+full:dns.adguard-dns.com
+
+## Family Protection
+full:family.adguard-dns.com
+
+## Non-filtering
+full:unfiltered.adguard-dns.com
+
+# Ali DNS
+full:dns.alidns.com
+
+# Apple DNS
+full:doh.dns.apple.com
+
+# Caliph DNS
+full:dns.caliph.dev
+
+# BebasDNS by BebasID
+
+## Unfiltered
+full:dns.bebasid.com
+
+## Security
+full:antivirus.bebasid.com
+
+## Family
+full:internetsehat.bebasid.com
+
+# CFIEC Public DNS
+full:dns.cfiec.net
+
+# Cisco OpenDNS
+
+## Standard
+full:doh.opendns.com
+
+## FamilyShield
+full:doh.familyshield.opendns.com
+
+## Sandbox
+full:doh.sandbox.opendns.com
+
+# CleanBrowsing
+full:doh.cleanbrowsing.org
+
+# Cloudflare DNS
+
+## Standard
+full:one.one.one.one
+full:dns.cloudflare.com
+full:cloudflare-dns.com
+
+## Malware blocking only
+full:security.cloudflare-dns.com
+
+## Malware and adult content blocking
+full:family.cloudflare-dns.com
+
+# ControlD
+full:freedns.controld.com
+
+# DeCloudUs DNS
+full:dns.decloudus.com
+
+# FutureDNS
+full:futuredns.eu.org
+
+## Germany
+full:dns.de.futuredns.eu.org
+
+## United States
+full:dns.us.futuredns.eu.org
+
+# DNS.SB (xTom)
+
+## Global CDN
+full:doh.dns.sb
+full:doh.sb
+full:dns.sb
+
+## Unicast PoPs
+full:de-dus.doh.sb
+full:de-fra.doh.sb
+full:nl-ams.doh.sb
+full:uk-lon.doh.sb
+full:ee-tll.doh.sb
+full:jp-kix.doh.sb
+full:jp-nrt.doh.sb
+full:hk-hkg.doh.sb
+full:au-syd.doh.sb
+full:us-chi.doh.sb
+full:us-nyc.doh.sb
+full:us-sjc.doh.sb
+full:in-blr.doh.sb
+full:sg-sin.doh.sb
+full:kr-sel.doh.sb
+full:ru-mow.doh.sb
+full:ca-yyz.doh.sb
+full:de-ber.doh.sb
+
+# DNSPod Public DNS+
+full:doh.pub
+full:dns.pub
+full:sm2.doh.pub
+
+# dns0.eu
+full:zero.dns0.eu
+
+# Google DNS
+full:dns.google
+
+# Hurricane Electric Public Recursor
+full:ordns.he.net
+
+# Mullvad
+
+## Non-filtering
+full:dns.mullvad.net
+
+## Ad blocking
+full:adblock.dns.mullvad.net
+
+## Ad + malware blocking
+full:base.dns.mullvad.net
+
+## Ad + malware + social media blocking
+full:extended.dns.mullvad.net
+
+## Ad + malware + adult + gambling blocking
+full:family.dns.mullvad.net
+
+## Ad + malware + adult + gambling + social media blocking
+full:all.dns.mullvad.net
+
+# NextDNS
+
+## Ultra-low latency
+full:dns.nextdns.io
+
+## Anycast
+full:anycast.dns.nextdns.io
+
+# OpenBLD.net DNS
+
+## Adaptive Filtering (ADA)
+full:ada.openbld.net
+
+## Strict Filtering (RIC)
+full:ric.openbld.net
+
+# Quad9 DNS
+
+## Standard
+full:dns.quad9.net
+
+## Unsecured
+full:dns10.quad9.net
+full:dns11.quad9.net
+
+# Quadrant Security
+full:doh.qis.io
+
+# Rabbit DNS
+
+## Non-filtering
+full:dns.rabbitdns.org
+
+## Security-filtering
+full:security.rabbitdns.org
+
+## Family-filtering
+full:family.rabbitdns.org
+
+# RethinkDNS
+
+## Non-filtering
+full:basic.rethinkdns.com
+
+# 360 Secure DNS
+full:doh.360.cn
+
+# Surfshark DNS
+full:dns.surfsharkdns.com
+
+# v.recipes DNS (former 0ms.dev)
+full:v.recipes
+
+# Wikimedia DNS
+full:wikimedia-dns.org
+
+# **Regional resolvers**
+
+# Applied Privacy DNS
+full:doh.applied-privacy.net
+
+# CIRA Canadian Shield DNS
+
+## Private
+full:private.canadianshield.cira.ca
+
+## Protected
+full:protected.canadianshield.cira.ca
+
+## Family
+full:family.canadianshield.cira.ca
+
+## Geo-blocking bypass
+full:dns.comss.one
+
+## Geo-blocking bypass with ad filtering
+full:router.comss.one
+
+# CZ.NIC ODVR
+full:odvr.nic.cz
+
+# Digitale Gesellschaft DNS
+full:dns.digitale-gesellschaft.ch
+
+# DNS for Family
+full:dns-doh.dnsforfamily.com
+
+## Protective resolution
+full:protective.joindns4.eu
+
+## Protective resolution with child protection
+full:child.joindns4.eu
+
+## Protective resolution with ad blocking
+full:noads.joindns4.eu
+
+## Protective resolution with child protection and ad blocking
+full:child-noads.joindns4.eu
+
+## Unfiltered resolution
+full:unfiltered.joindns4.eu
+
+# Fondation Restena DNS
+full:kaitain.restena.lu
+
+# IIJ.JP DNS
+full:public.dns.iij.jp
+
+# JupitrDNS
+full:dns.jupitrdns.com
+
+# LibreDNS
+full:doh.libredns.gr
+
+## Pure Edition
+full:doh-pure.onedns.net
+
+## Block Edition
+full:doh.onedns.net
+
+# SWITCH DNS
+full:dns.switch.ch
+
+# Taiwan NIC
+full:dns.twnic.tw
+
+# UK DNS Privacy Project
+full:resolver.dnsprivacy.org.uk
+
+# Xstl DNS
+
+## SK Broadband
+full:dns.seia.io
+
+## Oracle Cloud South Korea
+full:secondary.dns.seia.io
+
+# Yandex DNS
+
+## Basic
+full:common.dot.dns.yandex.net
+
+## Safe
+full:safe.dot.dns.yandex.net
+
+## Family
+full:family.dot.dns.yandex.net
+
+# **Small personal resolvers**
+
+# AhaDNS
+
+## Netherlands
+full:doh.nl.ahadns.net
+
+## Los Angeles
+full:doh.la.ahadns.net
+
+# Arapurayil
+full:dns.arapurayil.com
+
+# Dandelion Sprout’s Official DNS Server
+full:dandelionsprout.asuscomm.com
+
+# DNS Forge
+full:dnsforge.de
+
+# dnswarden
+full:dns.dnswarden.com
+
+# FFMUC DNS
+full:doh.ffmuc.net
+
+# ibksturm DNS
+full:ibksturm.synology.me
+
+# Lelux DNS
+full:resolver-eu.lelux.fi
+
+# Marbled Fennec
+full:dns.marbledfennec.net
+
+# OSZX DNS
+full:dns.oszx.co
+
+## PumpleX
+full:dns.pumplex.com
+
+# Privacy-First DNS
+
+## Singapore DNS Server
+full:doh.tiarap.org
+full:doh.tiar.app
+
+## Japan DNS Server
+full:jp.tiarap.org
+full:jp.tiar.app
+
+# BlackMagicc DNS
+full:rx.techomespace.com
+
+# NWPS.fi DNS
+
+## Standard
+full:public.ns.nwps.fi
+
+## Kids
+full:kids.ns.nwps.fi
+
+# ASTRACAT DNS
+full:frd4wvnobp.cloudflare-gateway.com
+
+# DNSGuard
+full:dnsguard.pub
+
+# 18Bit DNS
+full:doh.18bit.cn

data/category-ecommerce

@@ -1,3 +1,5 @@
+include:category-ecommerce-ru
+
 include:adidas
 include:bestbuy
 include:booking
@@ -9,6 +11,7 @@ include:dmm
 include:ebay
 include:ebuyer
 include:farfetch
+include:ggsel
 include:gucci
 include:hm
 include:homedepot
@@ -18,7 +21,6 @@ include:momo
 include:muji
 include:nike
 include:nordstrom
-include:ozon
 include:pchome
 include:rakuten
 include:ruten
@@ -26,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,10 +5,25 @@ include:applysquare
 include:hugecore
 include:hujiang
 include:koolearn
+include:schoopia
 include:shanbay
 include:xueersi
 include:yuanfudao
-include:zhihuishu
+
+# 雨课堂
+include:yuketang
+## 雨豆课堂
+yudou.cn
+## 雨实验
+yushiyan.net
+## 学堂在线
+xuetangx.com
+
+edu.cn
+
+# 国家智慧教育公共服务平台
+cbern.com.cn
+smartedu.cn
 
 # 教育部学生服务与素质发展中心
 # 京ICP备19004913号
@@ -39,95 +54,93 @@ qgzb.net
 zbbm.gov.cn
 zbbm.net
 
-# 雨课堂
-include:yuketang
-
-## 雨豆课堂
-yudou.cn
-
-## 雨实验
-yushiyan.net
-
-## 学堂在线
-xuetangx.com
-
-# 时代行云
-x-cloud.cc
-
-# 学科网
-xkw.com
-zxxk.com
-
-# 第二教育网
-dearedu.com
-
-# 快对作业
-kuaiduizuoye.com
-
-# 流利说
-liulishuo.com
-llsapp.com
-llscdn.com
-llsserver.com
-
-# 百词斩
-baicizhan.com
-baicizhan.org
-bczcdn.com
-bczeducation.cn
-
-# 小站教育
-zhan.com
-
-# Burning Vocabulary
-burningvocabulary.cn
-burningvocabulary.com
-
-# 莞教通
-dgjy.net
+# 中国考试教育网
+# 京ICP备05064772号
+neea.cn
+# neea.edu.cn
 
 # 云校
 91yunxiao.com
-
 # 爱云校/好分数
 aiyunxiao.com
 haofenshu.com
 iyunxiao.com
 yunxiao.com
-
-# 课播云校
-keboyunxiao.com
-
-# 课堂派
-ketangpai.com
-
-# 批改网
-pigai.org
-
-# 未来云校
-weilaiyunxiao.com
-
-# 马哥教育
-magedu.com
-
-# 老男孩教育
-oldboyedu.com
-
+# 百词斩
+baicizhan.com
+baicizhan.org
+bczcdn.com
+bczeducation.cn
+# Burning Vocabulary
+burningvocabulary.cn
+burningvocabulary.com
+# 世纪外语网
+centuryenglish.com
+# 中国地质大学 继续教育学院
+cugbonline.cn
+# 第二教育网
+dearedu.com
+# 莞教通
+dgjy.net
 # 在职研究生教育信息网
 eduei.com
-
-edu.cn
-
-# “叶圣陶杯”全国中学生新作文大赛
-ystbds.com
-
+# 中公
+eoffcn.com
+jinrongren.net
+offcn.com
+zggqzp.com
+zgsydw.com
+# 高考100
+gk100.com
+# 华图
+huatu.com
+sydw8.com
+# 中科大数据研究院，豫ICP备19023555号
+ictbda.cn
+ictbda.com
+modex.com.cn
+xir.cn
+# 日语测试
+j-test.com
+nattest-china.com
+# 课播云校
+keboyunxiao.com
+# 课堂派
+ketangpai.com
+# 快对作业
+kuaiduizuoye.com
+# 流利说
+liulishuo.com
+llsapp.com
+llscdn.com
+llsserver.com
+# 马哥教育
+magedu.com
 # CIS NanoMasters
-# 粤ICP备2022138914号
 neoscholar.com
 neoschool.com
-
-# 北京嘉瑞新创教育咨询有限公司 京ICP备2020046790号-3
-winyoungreading.com
-
-# 公考知识库 黔ICP备2024035854号
+# 老男孩教育
+oldboyedu.com
+# 批改网
+pigai.org
+# 公考知识库
 saduck.top
+# 未来云校
+weilaiyunxiao.com
+# 北京嘉瑞新创教育咨询有限公司
+winyoungreading.com
+# 时代行云
+x-cloud.cc
+# 学科网
+xkw.com
+zxxk.com
+# 云助学
+yunzhuxue.com
+# “叶圣陶杯”全国中学生新作文大赛
+ystbds.com
+# 小站教育
+zhan.com
+# 智慧树
+zhihuishu.com
+# 浙江省教育考试院
+zjzs.net

data/category-education-ir

@@ -1,4 +1,4 @@
-# Iranian education and learning websites 
+# Iranian education and learning websites
 
 # Course
 faradars.org

data/category-electronic-cn

@@ -6,9 +6,16 @@ analog.com
 # 艾睿电子
 arrow.cn
 
+# 京东方
+boe.com
+boe.com.cn
+
 # 博流智能
 bouffalolab.com
 
+# 长鑫存储
+cxmt.com
+
 # 乐鑫信息科技
 esp8266.cn
 esp8266.com
@@ -25,7 +32,8 @@ hqdoc.com
 hqpcb.com
 
 # 英飞凌
-infineon.com
+infineon.cn
+#infineon.com
 
 # 嘉立创集团
 include:jlc
@@ -49,9 +57,12 @@ sipeed.com
 maixhub.com
 
 # 德州仪器
-ti.com
+#ti.com
 ti.com.cn
 
 # 沁恒微电子
 wch.cn
 wch-ic.com
+
+# 长江存储
+include:ymtc

data/category-emby

@@ -18,7 +18,7 @@ embyplus.club
 4545.cf
 
 # 蓝海
-blueseacdn.com 
+blueseacdn.com
 
 # 1111
 emby.ml
@@ -69,7 +69,7 @@ full:emby.nyancat.net
 
 # emby-Plus
 full:emby.plusmedia.site
-full:emby-cf.plusmedia.site 
+full:emby-cf.plusmedia.site
 full:emby.xeton.dev
 full:jellyfin.xeton.dev
 full:movie.xeton.dev
@@ -77,7 +77,7 @@ full:servers.xeton.dev
 
 # emby-Otaku
 full:emby.otakudrive.life
-full:emby2.otakudrive.life 
+full:emby2.otakudrive.life
 
 # emby-jmsooo
 full:agahk1.jmsooo.com
@@ -187,4 +187,7 @@ hongxingyunmovie.vip
 emby1.69yun69.com
 
 # 云梯
-yunti.online
+yunti.online
+
+# 守候网络
+server2.cn2gias.uk

data/category-enhance-gaming

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

data/category-enterprise-query-platform-cn

@@ -1,8 +1,8 @@
 include:aiqicha
-include:hongdunwang
 include:qcc
-include:qichamao
 include:qixin
-include:qyyjt
 include:tianyancha
-include:x315
+
+qichamao.com
+qyyjt.cn
+x315.com

data/category-entertainment

@@ -1,8 +1,11 @@
 # 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
 
+include:7tv
 include:abema
 include:amc
 include:anime
@@ -13,15 +16,18 @@ include:bahamut
 include:bandcamp
 include:bangumi
 include:boomerang
+include:bushiroad
 include:catchplay
 include:copymanga
 include:dailymotion
 include:dandanzan
 include:dazn
+include:deezer
 include:deviantart
 include:discoveryplus
 include:disney
 include:dlsite
+include:ficbook
 include:gimy
 include:goodreads
 include:hamivideo
@@ -35,7 +41,7 @@ include:kktv
 include:lastfm
 include:litv
 include:manhuagui
-include:mihoyo
+include:metacritic
 include:mubi
 include:mudvod
 include:mytvsuper
@@ -79,8 +85,8 @@ egta.com
 fireside.fm
 internationalsaimoe.com
 joox.com
+kpacg.com
 linetv.tw
-litv.tv
 megaphone.fm
 mikanani.me
 moov.hk
@@ -88,8 +94,8 @@ odysee.com
 omobi.cc
 oranum.com
 overcast.fm
+qobuz.com
 syosetu.com
-thetvdb.com
 weverse.io
 yande.re
 
@@ -97,3 +103,94 @@ yande.re
 amp-api.podcast.apple.com
 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
+4gamers.com.tw
+## 秋葉原綜研
+akiba-souken.com
+## Appget
+appget.com
+## AppMedia
+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有機網
+gameover.com.hk
+## Gamer
+gamer.ne.jp
+onlinegamer.jp
+## Great Game
+greatgame.asia
+## HobbiGame
+hobbigame.com
+## ゲーム文化保存研究所
+igcc.jp
+## IGN
+ign.com
+ignimg.com
+## Made with Unity
+madewithunity.jp
+## Media Clip
+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
+## よろず〜
+yorozoonews.jp

data/category-entertainment-cn

@@ -2,27 +2,23 @@
 
 include:category-games-cn
 
-include:3dm
+include:aamgame
 include:acfun
 include:acplay
-include:ali213
 include:bestv
-include:bilibili
+include:bilibili @-!cn
 include:ciweimao
 include:dedao
-include:dmzj
 include:douyin
 include:douyu
 include:duitang
 include:fengxing
 include:fqnovel
 include:gamersky
-include:gcores
 include:gitv
 include:hunantv
 include:huya
-include:iqiyi
-include:jinjiang
+include:iqiyi @-!cn
 include:ku6
 include:kuaikan
 include:kuaishou
@@ -30,33 +26,139 @@ include:kugou
 include:kuwo
 include:le
 include:lizhi
-include:mfuns
-include:miaopai
-include:muwai
 include:pptv
 include:qimao
 include:qingtingfm
 include:sakurafrp
-include:sfacg
 include:taomee
 include:u17
 include:wasu
 include:xiaoheihe
+include:xiaoyuzhou
 include:ximalaya
 include:youku
-include:zhanqi
+include:yuewen
 
 # Android Emulator
+ldmnq.com
 lsplayer.com
 yeshen.com
 
+# 17K小说
+17k.com
 # https://github.com/supzhang/epg
-# 鲁ICP备18015570号-1
 51zmt.top
-
-# B站空降助手 鲁ICP备2024098956号-1
+# 广东南方新媒体
+aisee.tv
+# 动画巡礼
+anitabi.cn
+# 暴风影音
+baofeng.com
+baofeng.net
+# 布咕阅读
+bgwxc.com
+# B站空降助手
 bsbsb.top
-
+# 动漫之家 #703
+dmzj.com
+muwai.com
+# 懂球帝
 dongqiudi.com
-goka.top # 三国杀打小抄官网
+# 飞卢小说
+faloo.com
+# 三国杀打小抄官网
+goka.top
+# 海读文学
+haidubooks.com
+# 黑岩小说
+heiyan.com
+heiyanimg.com
+# 红薯中文网
+hongshu.com
+# 火星小说
+hotread.com
+# 晋江文学城
+jjwxc.net
+# 酷匠网
+kjcdn.com
+kujiang.com
+# 喵御宅
+mfuns.cn
+# 秒拍
+miaopai.com
+# 磨铁文学
+motie.com
+motieimg.com
+# 梨视频
 pearvideo.com
+# 皮皮网
+pipi.cn
+# SF轻小说二次元
+sfacg.com
+# 书海小说
+shuhai.com
+# 塔读小说
+tadu.com
+# 江山文学
+vsread.com
+# 百合会
+yamibo.com
+# 易有料
+yiyouliao.com
+# 战旗直播
+zhanqi.tv
+# 逐浪小说
+zhulang.com
+# 纵横小说
+zongheng.com
+
+# 娱乐资讯媒体
+# 该部分参考了中文维基百科的「来源考量」：
+# - https://zh.wikipedia.org/wiki/WikiProject:电子游戏/来源考量
+# - https://zh.wikipedia.org/wiki/WikiProject:ACG/來源考量
+
+include:tgbus
+include:vgtime
+
+## 17173网
+17173.com
+## 18183网
+18183.com
+## 3DM游戏网
+3dmgame.com
+## 游侠网
+ali213.net
+## 竞核
+cgames.com
+## 触乐
+chuapp.com
+## DataEye
+dataeye.com
+## GameDiary
+gamediary.cn
+## GameLook
+gamelook.com.cn
+## GameRes游资网
+gameres.com
+## 游戏价值论
+gamewower.com
+## 机核
+gcores.com
+## IGN中国
+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

@@ -4,11 +4,15 @@ include:category-bank-jp
 include:category-bank-mm
 
 include:fibank
+include:futu
 include:hsbc
 include:ibkr
 include:ifast
+include:itiger
 include:longbridge
 include:n26
+include:schwab
+include:standardchartered
 include:wise
 
 fxcorporate.com

data/category-food-cn

@@ -1,12 +1,18 @@
 include:bestore
-include:heytea
 include:lkcoffee
 
 3songshu.com
 haidilao.com
 
+# 喜茶
+heytea.com
+
 # 俺来也（上海）网络科技有限公司
 anlaiye.com
 anlaiye.com.cn
 imcoming.com
 imcome.net
+
+# 美餐
+meican.com
+meicanstatic.com

data/category-forums

@@ -5,6 +5,8 @@ include:6park
 include:ck101
 include:dcard
 include:dslreports
+include:dzen
+include:habr
 include:hkgolden
 include:lihkg
 include:linuxdo
@@ -17,7 +19,6 @@ include:reddit
 include:rutracker
 include:soyjakparty
 include:xda
-include:yamibo
 
 full:bbs.boingboing.net