Clean up ad lists (#3231)

* category-ads-all: include adjust

* category-ads-all: include clearbit

* category-ads-all: include ogury

* category-ads-all: include openx

* category-ads-all: include pubmatic

and remove pubmatic-ads

* category-ads-all: include segment

* category-ads-all: include supersonic

* geolocation-cn: remove the inclusion of umeng

it's included in alibaba

* add unitychina

* remove unity-ads

use unity@ads or unitychina@ads instead

data/adjust

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

data/category-ads

@@ -1,7 +1,6 @@
 # This file contains domains that clearly serving ads
 
 include:acfun-ads
-include:adjust-ads
 include:adobe-ads
 include:alibaba-ads
 include:amazon-ads
@@ -10,7 +9,6 @@ include:baidu-ads
 include:bytedance-ads
 include:category-ads-ir
 include:cctv @ads
-include:clearbit-ads
 include:disney @ads
 include:dmm-ads
 include:duolingo-ads
@@ -26,28 +24,24 @@ include:letv-ads
 include:meta-ads
 include:microsoft-ads
 include:netease-ads
-include:ogury-ads
 include:ookla-speedtest-ads
 include:openai @ads
-include:openx-ads
 include:picacg @ads
 include:pikpak @ads
 include:pixiv @ads
-include:pubmatic-ads
 include:qihoo360-ads
 include:samsung @ads
-include:segment-ads
 include:sina-ads
 include:snap @ads
 include:sohu-ads
 include:spotify-ads
-include:supersonic-ads
 include:television-ads
 include:tencent-ads
 include:tendcloud @ads
 include:twitter @ads
 include:umeng-ads
-include:unity-ads
+include:unity @ads
+include:unitychina @ads
 include:xhamster-ads
 include:xiaomi-ads
 include:ximalaya-ads

data/category-ads-all

@@ -1,6 +1,13 @@
 # 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
@@ -21,7 +28,6 @@ lijit.com @ads
 mfadsrvr.com @ads
 mgid.com @ads
 ns1p.net @ads
-pubmatic.com @ads
 sigmob.com @ads
 spotxchange.com @ads
 unimhk.com @ads

data/category-dev-cn

@@ -18,6 +18,7 @@ include:segmentfault
 include:sxl
 include:tencent-dev
 include:ubuntukylin
+include:unitychina
 
 jinrishici.com
 openvela.com

data/geolocation-cn

@@ -24,7 +24,6 @@ include:category-social-media-cn
 # Advertisment & Analytics
 include:getui
 include:jiguang
-include:umeng
 
 # 神策数据
 sensorsdata.cn

data/ogury

@@ -1,3 +1,3 @@
+ogury.co @ads
 ogury.com @ads
 presage.io @ads
-ogury.co @ads

data/pubmatic

@@ -2,5 +2,3 @@
 
 pubmatic.com
 pubmatic.co.jp
-
-include:pubmatic-ads

data/pubmatic-ads

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

data/supersonic

@@ -1,4 +1,5 @@
+ssacdn.com @ads
 supersonic.com @ads
 supersonicads.com @ads
-ssacdn.com @ads
+
 supersonicads-a.akamaihd.net @ads

data/unity

@@ -1,4 +1,6 @@
 unity.com
 unity3d.com
 
-include:unity-ads
+# Ads/tracking
+iads.unity3d.com @ads
+unityads.unity3d.com @ads

data/unitychina

@@ -1,6 +1,11 @@
+# 优三缔 / 优美缔 / 团结引擎
+u3d.cn
+unity.cn
+unitychina.cn
+
+# Ads/tracking
 ads.unitychina.cn @ads
 splash-ads.cdn.unity.cn @ads
 splash-ads.unitychina.cn @ads
 unityads.unity.cn @ads
-unityads.unity3d.com @ads
 unityads.unitychina.cn @ads