icloud: add icloud.cn (#3322)

- illusion is dead. remove it from other categories
- dlsite is included in both category-entertainment and category-porn, no need to include it in geolocation-!cn
- dlsite: add dlaf.jp
- add illgames
- create category-urlshortner

data/apple

@@ -752,6 +752,7 @@ courier-push-apple.com.akadns.net
 full:amp-api-edge-lb-cn.itunes-apple.com.akadns.net @cn
 full:amp-api-edge-lb.itunes-apple.com.akadns.net @cn
 full:amp-api-edge.apps.apple.com @cn
+full:amp-api-edge.music.apple.com @cn
 full:amp-api-search-edge.apps.apple.com @cn
 full:amp-api.apps.apple.com @cn
 full:amp-api.music.apple.com @cn
@@ -782,6 +783,8 @@ full:js-cdn.music.apple.com @cn
 full:km.support.apple.com @cn
 full:maps.apple.com @cn
 full:misc-assets.itunes.apple.com @cn
+full:musicstatus.music.apple.com @cn
+full:mvod.itunes.apple.com @cn
 full:myapp.itunes.apple.com @cn
 full:np-edge.itunes.apple.com @cn
 full:osxapps.itunes.apple.com @cn
@@ -794,6 +797,7 @@ full:se2.itunes.apple.com @cn
 full:search.itunes.apple.com @cn
 full:sf-api-token-service.itunes.apple.com @cn
 full:sp.itunes.apple.com @cn
+full:speedysub.music.apple.com @cn
 full:streamingaudio.itunes.apple.com @cn
 full:su.itunes.apple.com @cn
 full:sync.itunes.apple.com @cn

data/category-ai-!cn

@@ -33,6 +33,7 @@ chutes.ai
 copilot.microsoft.com
 devin.ai
 diabrowser.com
+diabrowser.engineering
 dify.ai
 duck.ai
 gateway.ai.cloudflare.com

data/category-games-!cn

@@ -13,7 +13,7 @@ include:gaijin
 include:garena
 include:gog
 include:hoyoverse
-include:illusion
+# Dead include:illusion
 include:itchio
 include:lowiro
 include:modrinth

data/category-gov-ru

@@ -21,6 +21,7 @@ goskey.ru       # GosKey - an electronic signature on a smartphone
 grfc.ru         # General radio frequency center
 izbirkom.ru     # Information on ongoing elections and referendums
 kremlin.ru      # Online representation of the President of Russia
+mil.ru          # Ministry of Defense of the Russian Federation
 nalog.ru        # Federal Tax Service
 xn--80ajghhoc2aj1c8b.xn--p1ai # Honest Sign - State Labeling System
 

data/category-ip-geo-detect

@@ -3,6 +3,7 @@
 2ip.ua
 abstractapi.com
 bigdatacloud.net
+check-host.net
 db-ip.com
 extreme-ip-lookup.com
 fraudguard.io

data/category-porn

@@ -25,8 +25,9 @@ include:hentaichen
 include:hentaivn
 include:heyzo
 include:hooligapps
-include:illusion
+# Dead include:illusion
 include:illusion-nonofficial
+include:illgames
 include:jable
 include:japonx
 include:javbus
@@ -2700,6 +2701,7 @@ jav.guru
 jav.la
 jav.land
 jav.place
+jav.sb
 jav.si
 jav.wine
 jav01.cc
@@ -2762,6 +2764,7 @@ javhdporn.net
 javher.com
 javheroine.com
 javhihi.com
+javhub.com
 javhub.me
 javhub.net
 javidol.org
@@ -2795,6 +2798,7 @@ javprime.net
 javpub.me
 javpush.com
 javqd.com
+javquick.com
 javrank.com
 javrate.com
 javrave.club

data/category-social-media-!cn

@@ -13,3 +13,12 @@ include:twitter
 include:vk
 
 truthsocial.com
+
+# Mastodon
+# * We can not make a comprehensive domain list of all Mastodon instances.
+# * Many more dynamic/random instance domains are not listed here.
+# * geosite:mastodon is not provided to avoid creating excessive expectations among users.
+joinmastodon.org
+mastodon.online
+mastodon.social
+pawoo.net

data/category-urlshortner

@@ -0,0 +1,3 @@
+include:bitly
+include:shorturl
+include:tinyurl

data/dlsite

@@ -1,6 +1,7 @@
 chobit.cc
 ci-en.jp
 ci-en.net
+dlaf.jp
 dlsite.com
 dlsite.com.tw
 dlsite.jp

data/geolocation-!cn

@@ -156,6 +156,7 @@ include:category-enhance-gaming
 include:category-mobile-repair
 include:category-ntp
 include:category-password-management
+include:category-urlshortner
 include:category-web-archive
 include:decryptipastore # iOS
 
@@ -170,7 +171,6 @@ include:addtoany
 include:adguard
 include:aptoide
 include:arphic
-include:bitly
 include:blender
 include:brightcove
 include:buymeacoffee
@@ -224,7 +224,6 @@ include:sb
 include:setapp
 include:sharethis
 include:shopify
-include:shorturl
 include:slideshare
 include:sourceforge
 include:squareup
@@ -234,7 +233,6 @@ include:svp
 include:test-ipv6
 include:tex
 include:tidelift
-include:tinyurl
 include:trello
 include:tumblr
 include:tutanota
@@ -308,7 +306,6 @@ wiki.gg
 
 # Others
 include:avaxhome
-include:dlsite
 include:espressif
 include:familymart
 include:fzdm

data/geolocation-cn

@@ -180,6 +180,10 @@ wuyou.net # 无忧启动论坛
 x-station.cn # X电站
 znds.com # 智能电视网
 
+# DCC Forum（心跳文学部中文论坛）
+edgemonix.top # 图床
+monika.love
+
 423down.com # 423Down
 acwifi.net # 路由器技术分享
 appinn.com # 小众软件

data/icloud

@@ -8,6 +8,7 @@ icloud-content.com
 icloud-isupport.com
 icloud-sandbox.com
 icloud.ch
+icloud.cn @cn
 icloud.com
 icloud.com.cn @cn
 icloud.de

data/illgames

@@ -0,0 +1,3 @@
+# Also known as "Illusion"
+illgames.jp
+japan-illgames.com

data/illusion

@@ -1,2 +1,3 @@
+# Dead: https://en.wikipedia.org/wiki/Illusion_(company)
 illusion.co.jp
 illusion.jp

data/private

@@ -22,7 +22,6 @@ internal
 
 # References: https://www.iana.org/assignments/locally-served-dns-zones/locally-served-dns-zones.xhtml
 # https://www.rfc-editor.org/rfc/rfc6303.html
-0.in-addr.arpa
 2.0.192.in-addr.arpa
 10.in-addr.arpa
 16.172.in-addr.arpa
@@ -47,7 +46,6 @@ internal
 168.192.in-addr.arpa
 254.169.in-addr.arpa
 255.255.255.255.in-addr.arpa
-0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa
 8.b.d.0.1.0.0.2.ip6.arpa
 8.e.f.ip6.arpa

main.go

@@ -263,9 +263,6 @@ func (p *Processor) loadData(listName string, path string) error {
 }
 
 func isMatchAttrFilters(entry *Entry, incFilter *Inclusion) bool {
-	if len(incFilter.MustAttrs) == 0 && len(incFilter.BanAttrs) == 0 {
-		return true
-	}
 	if len(entry.Attrs) == 0 {
 		return len(incFilter.MustAttrs) == 0
 	}
@@ -352,12 +349,13 @@ func (p *Processor) resolveList(plname string) error {
 	for _, dentry := range pl.Entries { // Add direct entries
 		roughMap[dentry.Plain] = dentry
 	}
-	for _, inc := range pl.Inclusions {
+	for _, inc := range pl.Inclusions { // Add included entries
 		if err := p.resolveList(inc.Source); err != nil {
 			return fmt.Errorf("failed to resolve inclusion %q: %w", inc.Source, err)
 		}
+		isFullInc := len(inc.MustAttrs) == 0 && len(inc.BanAttrs) == 0
 		for _, ientry := range p.finalMap[inc.Source] {
-			if isMatchAttrFilters(ientry, inc) { // Add included entries
+			if isFullInc || isMatchAttrFilters(ientry, inc) {
 				roughMap[ientry.Plain] = ientry
 			}
 		}