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

data/category-ads

@@ -1,51 +1,51 @@
 # This file contains domains that clearly serving ads
-
-include:acfun-ads
-include:adobe-ads
-include:alibaba-ads
-include:amazon-ads
-include:apple-ads
-include:baidu-ads
-include:bytedance-ads
 include:category-ads-ir
+
+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:dmm @ads
+include:duolingo @ads
 include:gamersky @ads
-include:google-ads
+include:google @ads
 include:hetzner @ads
-include:hunantv-ads
-include:iqiyi-ads
-include:jd-ads
-include:kuaishou-ads
-include:kugou-ads
-include:letv-ads
-include:meta-ads
-include:microsoft-ads
-include:netease-ads
-include:ookla-speedtest-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:qihoo360 @ads
 include:samsung @ads
-include:sina-ads
+include:sina @ads
 include:snap @ads
-include:sohu-ads
-include:spotify-ads
-include:television-ads
-include:tencent-ads
+include:sohu @ads
+include:spotify @ads
+include:tcl @ads
+include:tencent @ads
 include:tendcloud @ads
 include:twitter @ads
-include:umeng-ads
 include:unity @ads
 include:unitychina @ads
-include:xhamster-ads
-include:xiaomi-ads
-include:ximalaya-ads
-include:yahoo-ads
+include:xhamster @ads
+include:xiaomi @ads
+include:ximalaya @ads
+include:yahoo @ads
 include:zhihu @ads
 
 # Other domains for ads serving
@@ -58,6 +58,8 @@ 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
@@ -151,6 +153,11 @@ stat.chinaso.com
 mlog.hiido.com
 ylog.hiido.com
 
+# hpply
+ad.hpplay.cn
+adc.hpplay.cn
+adeng.hpplay.cn
+
 # Httpool
 toboads.com
 
@@ -159,6 +166,10 @@ analytics-data.io
 atom-data.io
 ironbeast.io
 
+# joyplus
+advapi.joyplus.tv
+advapikj.joyplus.tv
+
 # pocoiq
 cdn.pocoiq.cn
 oct.pocoiq.cn
@@ -218,6 +229,9 @@ zhugeapi.com
 zhugeapi.net
 zhugeio.com
 
+# 酷云互动
+kuyun.com
+
 # 车来了
 atrace.chelaile.net.cn
 logs.chelaile.net.cn