Remove dedicated non-category ad lists (#3241)

* remove mihoyo-ads

use mihoyo@ads instead

* remove acfun-ads

use acfun@ads instead

* remove adobe-ads

use adobe@ads instead

* remove alibaba-ads amap-ads umeng-ads youku-ads

use xxx@ads instead

* remove amazon-ads

use amazon@ads instead

* remove apple-ads

use apple@ads instead

* remove baidu-ads zuoyebang-ads

use baidu@ads zuoyebang@ads instead

* remove bytedance-ads

use bytedance@ads instead

* remove dmm-ads

use dmm@ads instead

* remove duolingo-ads

use duolingo@ads instead

* remove google-ads

use google@ads instead

the only regexp rule is dropped as there's no such rules in EasyList

* remove hunantv-ads

use hunantv@ads instead

* remove iqiyi-ads

use iqiyi@ads instead

* remove jd-ads

use jd@ads instead

* remove kuaishou-ads

use kuaishou@ads instead

* remove kugou-ads

use kugou@ads instead

* remove letv-ads

use le@ads instead

* remove meta-ads facebook-ads instagram-ads whatsapp-ads

use xxx@ads instead

* remove microsoft-ads github-ads

use microsoft@ads github@ads instead

* remove netease-ads

use netease@ads instead

* remove ookla-speedtest-ads

use ookla-speedtest@ads instead

* remove qihoo360-ads

use qihoo360@ads instead

* remove sina-ads

use sina@ads instead

* remove sohu-ads

use sohu@ads instead

* remove spotify-ads

use spotify@ads instead

* remove tencent-ads

use tencent@ads instead

* remove xhamster-ads

use xhamster@ads instead

* remove xiaomi-ads

use xiaomi@ads instead

* remove ximalaya-ads

use ximalaya@ads instead

* remove yahoo-ads

use yahoo@ads instead

* remove fqnovel-ads

use fqnovel@ads instead

* category-ads: merge television-ads

* category-ads: reorder

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

Author: MkQtS

README.md

@@ -15,7 +15,8 @@ This project is not opinionated. In other words, it does NOT endorse, claim or i
 
 ## 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.
+- 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.
 

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

@@ -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/adobe-ads

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

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