From 873bde97c5817ff91751900214330491266f2bcf Mon Sep 17 00:00:00 2001
From: MkQtS <81752398+MkQtS@users.noreply.github.com>
Date: Wed, 5 Aug 2026 14:25:35 +0800
Subject: [PATCH] Clean up domains (#3913)

* clean up duplicates

* apple: move apple-mapkit.com domains to apple-dev

* update att and attwatchtv

* epicgames: include artstation

* tiktok: remove byteoversea.com

it's listed in bytedance and not exclusively serving for tiktok

* ea: remove dawngate.com

it's listed in origin and included

* secom: remove cybertrust domains

there's another standalone list: cybertrust, and cybertrust does not belong to secom

* intel: remove opendroneid.org

it's listed in intel-dev and included

* facebook: remove rocksdb.org

it's listed in facebook-dev

* mytvsuper: remove tvb.com

tvb owns mytvsuper

* fastly: remove zencdn.net

it belongs to brightcove

* drop hkopentv

- both domains exist in cabletv
- fantv.hk is dead
- hkopentv.com redirects to hoy.tv in cabletv

* kkbox: remove kktv domains

they are listed in kktv

* category-porn: remove 2ch.hk

it's listed in 2ch and not porn

* category-ads-all: remove ads.trafficjunky.net

it's listed in category-ads and included
---
 data/apple            | 13 -------------
 data/apple-dev        | 12 ++++++++++++
 data/att              |  6 +++---
 data/attwatchtv       |  4 +++-
 data/category-ads-all |  1 -
 data/category-media   |  1 -
 data/category-porn    |  1 -
 data/ea               |  6 ------
 data/ebay             |  3 +--
 data/epicgames        |  3 ++-
 data/facebook         |  1 -
 data/fastly           |  3 ---
 data/geolocation-!cn  |  1 -
 data/hkopentv         |  2 --
 data/intel            |  1 -
 data/kaspersky        |  1 -
 data/kkbox            |  2 --
 data/mytvsuper        |  1 -
 data/otpbank          |  1 -
 data/secom            |  3 ---
 data/tiktok           |  1 -
 data/yomiuri          |  1 -
 22 files changed, 21 insertions(+), 47 deletions(-)
 delete mode 100644 data/hkopentv

diff --git a/data/apple b/data/apple
index 3361a3b4..7ebda36c 100644
--- a/data/apple
+++ b/data/apple
@@ -508,7 +508,6 @@ apple-hk.com
 apple-ibooks.cn @cn
 apple-inc.net
 apple-livephotoskit.com
-apple-mapkit.com
 apple-maps.cn @cn
 apple-online.com
 apple-studies.com
@@ -766,18 +765,6 @@ full:a3.mzstatic.com @cn
 full:a4.mzstatic.com @cn
 full:a5.mzstatic.com @cn
 
-# regexp:^cdn(-cn)?[1-4]?\.apple-mapkit\.com$ @cn
-full:cdn.apple-mapkit.com @cn
-full:cdn1.apple-mapkit.com @cn
-full:cdn2.apple-mapkit.com @cn
-full:cdn3.apple-mapkit.com @cn
-full:cdn4.apple-mapkit.com @cn
-full:cdn-cn.apple-mapkit.com @cn
-full:cdn-cn1.apple-mapkit.com @cn
-full:cdn-cn2.apple-mapkit.com @cn
-full:cdn-cn3.apple-mapkit.com @cn
-full:cdn-cn4.apple-mapkit.com @cn
-
 # regexp:^cl[1-5]-cdn\.origin-apple\.com\.akadns\.net$ @cn
 full:cl1-cdn.origin-apple.com.akadns.net @cn
 full:cl2-cdn.origin-apple.com.akadns.net @cn
diff --git a/data/apple-dev b/data/apple-dev
index 286185a4..f401baea 100644
--- a/data/apple-dev
+++ b/data/apple-dev
@@ -32,6 +32,18 @@ macruby.org
 # MapKit
 apple-mapkit.com
 
+# regexp:^cdn(-cn)?[1-4]?\.apple-mapkit\.com$ @cn
+full:cdn.apple-mapkit.com @cn
+full:cdn1.apple-mapkit.com @cn
+full:cdn2.apple-mapkit.com @cn
+full:cdn3.apple-mapkit.com @cn
+full:cdn4.apple-mapkit.com @cn
+full:cdn-cn.apple-mapkit.com @cn
+full:cdn-cn1.apple-mapkit.com @cn
+full:cdn-cn2.apple-mapkit.com @cn
+full:cdn-cn3.apple-mapkit.com @cn
+full:cdn-cn4.apple-mapkit.com @cn
+
 # Playgrounds
 playgrounds-cdn.apple.com
 
diff --git a/data/att b/data/att
index 58130272..dd2e6f15 100644
--- a/data/att
+++ b/data/att
@@ -1,4 +1,5 @@
 # AT&T Inc.
+include:attwatchtv
 
 accbusiness.com
 atandt.com
@@ -11,7 +12,6 @@ att.cn @cn
 att.com
 att.jobs
 att.net
-att.tv
 attalascom.com
 attbelieves.com
 attbusiness.net
@@ -33,7 +33,6 @@ attspecial.com
 attssl.com
 attstadium.com
 attsuppliers.com
-atttvnow.com
 attuverseoffers.com
 attuverseonline.com
 attvoip.com
@@ -51,7 +50,6 @@ enterprisepaging.com
 itcanwait.com
 mymmode.com
 naturalvoices.com
-nettyinternet.com
 openapiplatform.com
 openapiservice.com
 patentgold.net
@@ -72,6 +70,8 @@ attdns.net
 na-att-idns.net
 
 # Direct TV
+# AT&T and DIRECTV are completely separate companies now.
+# We may add a separate list for DIRECTV
 audiencenetwork.com
 audiencenetwork.tv
 cabletvdirectv.com
diff --git a/data/attwatchtv b/data/attwatchtv
index d5d9d17f..2a715bff 100644
--- a/data/attwatchtv
+++ b/data/attwatchtv
@@ -1,6 +1,8 @@
+# AT&T WatchTV was a discontinued standalone streaming service and no longer exists
+# We may remove this list.
+
 att.tv
 atttvnow.com
 attwatchtv.com
-directv.com
 dtvce.com
 nettyinternet.com
diff --git a/data/category-ads-all b/data/category-ads-all
index be7c1adf..57ce1898 100644
--- a/data/category-ads-all
+++ b/data/category-ads-all
@@ -18,7 +18,6 @@ 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
diff --git a/data/category-media b/data/category-media
index d843e208..d0c2bd89 100644
--- a/data/category-media
+++ b/data/category-media
@@ -29,7 +29,6 @@ include:globalvoices
 include:globo
 include:guo
 include:hketgroup
-include:hkopentv
 include:huffpost
 include:icable
 include:infowars
diff --git a/data/category-porn b/data/category-porn
index 26e69e33..8fd0fc24 100644
--- a/data/category-porn
+++ b/data/category-porn
@@ -178,7 +178,6 @@ porn
 2adultflashgames.com
 2beeg.me
 2bit8.com
-2ch.hk
 2chav.com
 2dgen.com
 2gayboys.com
diff --git a/data/ea b/data/ea
index 5e153e4a..f144724a 100644
--- a/data/ea
+++ b/data/ea
@@ -8,10 +8,8 @@ bejewled-stars.com
 bejeweledstars.com
 capitalgames.com
 chillingo.com
-commandandconquer.com
 conquerwithcharacter.com
 crysis.jp
-dawngate.com
 dawngatechronicles.com
 dicela.com
 dicela.net
@@ -51,15 +49,11 @@ playapex.com
 pogo.com
 pogobeta.com
 popcap.com
-projectapex.com
-pvzheroes.com
-spearhead.kr
 speedhunters.com
 spore.com
 ssx3.com
 starwarsbattlefront.com
 starwarsbattlefront2.com
-tiberiumalliances.com
 tiburon.com
 tnt-ea.com
 ultimaforever.com
diff --git a/data/ebay b/data/ebay
index 88a379ea..c83b80a1 100644
--- a/data/ebay
+++ b/data/ebay
@@ -131,7 +131,6 @@ ebaycareers.com
 ebaycbt.co.kr
 ebaycdn.net
 ebaychina.net
-ebayclassifiedsgroup.com
 ebayclassifieds.cn @cn
 ebayclassifieds.com
 ebayclassifieds.com.cn @cn
@@ -294,8 +293,8 @@ theebayshop.com
 theopportunityproject.org
 towerauction.com
 vendu.com
-weareebay.com
 watch-ebay.org
+weareebay.com
 wwwdecide.com
 wwwebay.com
 wwwebay.net
diff --git a/data/epicgames b/data/epicgames
index 5b5c2c03..56c26dc8 100644
--- a/data/epicgames
+++ b/data/epicgames
@@ -1,5 +1,6 @@
+include:artstation
+
 3lateral.com
-artstation.com
 capturingreality.com
 cubicmotion.com
 battlebreakers.com
diff --git a/data/facebook b/data/facebook
index ac8935c4..680c5812 100644
--- a/data/facebook
+++ b/data/facebook
@@ -368,7 +368,6 @@ nextstop.com
 online-deals.net
 opencreate.org
 reachtheworldonfacebook.com
-rocksdb.org
 shopfacebook.com
 sportsfacebook.com
 sportstream.com
diff --git a/data/fastly b/data/fastly
index 2f8b3a7c..1777701d 100644
--- a/data/fastly
+++ b/data/fastly
@@ -5,6 +5,3 @@ fastly.io
 fastly.net
 fastlylabs.com
 fastlylb.net
-
-# Video.js CDN
-zencdn.net
diff --git a/data/geolocation-!cn b/data/geolocation-!cn
index 9471f834..af171502 100644
--- a/data/geolocation-!cn
+++ b/data/geolocation-!cn
@@ -15,7 +15,6 @@ include:category-anticensorship
 include:category-proxy-tunnels
 
 # Art & Design & Photography
-include:artstation
 include:dribbble
 include:dyna
 include:fontsinuse
diff --git a/data/hkopentv b/data/hkopentv
deleted file mode 100644
index fc2b5cad..00000000
--- a/data/hkopentv
+++ /dev/null
@@ -1,2 +0,0 @@
-hkopentv.com
-fantv.hk
diff --git a/data/intel b/data/intel
index 49435e0f..7edb87bb 100644
--- a/data/intel
+++ b/data/intel
@@ -231,7 +231,6 @@ niosii.net
 omekinteractive.com
 omnitek.tv
 openamt.com
-opendroneid.org
 optanedifference.com
 passwordday.org
 pc.com
diff --git a/data/kaspersky b/data/kaspersky
index 5f0b177f..7b91fbb9 100644
--- a/data/kaspersky
+++ b/data/kaspersky
@@ -14,7 +14,6 @@ kaspersky.com.au
 kaspersky.com.br
 kaspersky.com.cn @cn
 kaspersky.com.hk
-kaspersky.com.hk
 kaspersky.com.pl
 kaspersky.com.tr
 kaspersky.com.tw
diff --git a/data/kkbox b/data/kkbox
index ba77aca2..c4fa38f9 100644
--- a/data/kkbox
+++ b/data/kkbox
@@ -3,5 +3,3 @@ kk.stream
 kkbox.com
 kkbox.com.tw
 kktix.com
-kktv.com.tw
-kktv.me
diff --git a/data/mytvsuper b/data/mytvsuper
index c48c9096..15a0d7d5 100644
--- a/data/mytvsuper
+++ b/data/mytvsuper
@@ -1,2 +1 @@
 mytvsuper.com
-tvb.com
diff --git a/data/otpbank b/data/otpbank
index d8b80e39..961a0c94 100644
--- a/data/otpbank
+++ b/data/otpbank
@@ -1,7 +1,6 @@
 ckb.me
 dskbank.bg
 ipotekabank.uz
-ipotekabank.uz
 mobiasbanca.md
 otpbank.al
 otpbank.com.ua
diff --git a/data/secom b/data/secom
index 84856266..cba4a312 100644
--- a/data/secom
+++ b/data/secom
@@ -2,7 +2,4 @@ secom.co.jp
 secomtrust.net
 
 # Sub brand
-
-cybertrust.co.jp
-cybertrust.ne.jp
 managedpki.ne.jp
diff --git a/data/tiktok b/data/tiktok
index ac32b222..dd1c8d43 100644
--- a/data/tiktok
+++ b/data/tiktok
@@ -1,5 +1,4 @@
 bytedapm.com @!cn
-byteoversea.com @!cn
 muscdn.com @!cn
 musical.ly @!cn
 tik-tokapi.com @!cn
diff --git a/data/yomiuri b/data/yomiuri
index 2403044c..f84fb16b 100644
--- a/data/yomiuri
+++ b/data/yomiuri
@@ -7,7 +7,6 @@ ync.ne.jp
 yomikyo.or.jp
 yomilogi.com
 yomiuri-johkai.co.jp
-yomiuri-johkai.co.jp
 yomiuri-ryokou.co.jp
 yomiuri-shimbun.pressreader.com
 yomiuri-systec.co.jp