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

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

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
 

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

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

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

data/category-media

@@ -29,7 +29,6 @@ include:globalvoices
 include:globo
 include:guo
 include:hketgroup
-include:hkopentv
 include:huffpost
 include:icable
 include:infowars

data/category-porn

@@ -178,7 +178,6 @@ porn
 2adultflashgames.com
 2beeg.me
 2bit8.com
-2ch.hk
 2chav.com
 2dgen.com
 2gayboys.com

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

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

data/epicgames

@@ -1,5 +1,6 @@
+include:artstation
+
 3lateral.com
-artstation.com
 capturingreality.com
 cubicmotion.com
 battlebreakers.com

data/facebook

@@ -368,7 +368,6 @@ nextstop.com
 online-deals.net
 opencreate.org
 reachtheworldonfacebook.com
-rocksdb.org
 shopfacebook.com
 sportsfacebook.com
 sportstream.com

data/fastly

@@ -5,6 +5,3 @@ fastly.io
 fastly.net
 fastlylabs.com
 fastlylb.net
-
-# Video.js CDN
-zencdn.net

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

data/hkopentv

@@ -1,2 +0,0 @@
-hkopentv.com
-fantv.hk

data/intel

@@ -231,7 +231,6 @@ niosii.net
 omekinteractive.com
 omnitek.tv
 openamt.com
-opendroneid.org
 optanedifference.com
 passwordday.org
 pc.com

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

data/kkbox

@@ -3,5 +3,3 @@ kk.stream
 kkbox.com
 kkbox.com.tw
 kktix.com
-kktv.com.tw
-kktv.me

data/mytvsuper

@@ -1,2 +1 @@
 mytvsuper.com
-tvb.com

data/otpbank

@@ -1,7 +1,6 @@
 ckb.me
 dskbank.bg
 ipotekabank.uz
-ipotekabank.uz
 mobiasbanca.md
 otpbank.al
 otpbank.com.ua

data/secom

@@ -2,7 +2,4 @@ secom.co.jp
 secomtrust.net
 
 # Sub brand
-
-cybertrust.co.jp
-cybertrust.ne.jp
 managedpki.ne.jp

data/tiktok

@@ -1,5 +1,4 @@
 bytedapm.com @!cn
-byteoversea.com @!cn
 muscdn.com @!cn
 musical.ly @!cn
 tik-tokapi.com @!cn

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