category-porn: add more domains (#3320 )

category-social-media-!cn: add some mastodon domains (#3318 )
main.go: optimize attr filter (#3317 )
2026-03-03 02:00:43 +07:00 · 2026-03-02 21:29:45 +08:00 · 2026-03-02 14:48:30 +08:00 · 2026-03-02 14:15:40 +08:00 · 2026-03-02 13:53:25 +08:00 · 2026-03-02 13:51:03 +08:00
10 changed files with 30 additions and 10 deletions
--- a/data/apple
+++ b/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
--- a/data/category-gov-ru
+++ b/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

--- a/data/category-ip-geo-detect
+++ b/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
--- a/data/category-porn
+++ b/data/category-porn
@@ -2700,6 +2700,7 @@ jav.guru
 jav.la
 jav.land
 jav.place
+jav.sb
 jav.si
 jav.wine
 jav01.cc
@@ -2762,6 +2763,7 @@ javhdporn.net
 javher.com
 javheroine.com
 javhihi.com
+javhub.com
 javhub.me
 javhub.net
 javidol.org
@@ -2795,6 +2797,7 @@ javprime.net
 javpub.me
 javpush.com
 javqd.com
+javquick.com
 javrank.com
 javrate.com
 javrave.club
--- a/data/category-social-media-!cn
+++ b/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
--- a/data/geolocation-cn
+++ b/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 # 小众软件
--- a/data/perplexity
+++ b/data/perplexity
@@ -2,4 +2,5 @@ perplexity.ai
 perplexity.com
 pplx.ai

+full:ppl-ai-file-upload.s3.amazonaws.com
 full:pplx-res.cloudinary.com
--- a/data/sina
+++ b/data/sina
@@ -19,13 +19,14 @@ th.weibo.com @!cn
 tw.weibo.com @!cn
 us.weibo.com @!cn
 videoself.cn
-wbimg.com
 wbimg.cn
+wbimg.com
 wcdn.cn
 weibo.cn
 weibo.com
 weibo.com.cn
 weibocdn.com
+weibopay.com
 xhaiwai.com

 # Ads/tracking
--- a/data/yandex
+++ b/data/yandex
@@ -53,6 +53,7 @@ yandexadexchange.net
 yandexcloud.net
 yandexcom.net
 yandexmetrica.com
+yandexwebcache.net
 yandexwebcache.org
 yastat.net
 yastatic-net.ru
--- a/main.go
+++ b/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,15 +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 {
-		if _, exist := p.plMap[inc.Source]; !exist {
-			return fmt.Errorf("list %q includes a non-existent list: %q", plname, inc.Source)
-		}
+	for _, inc := range pl.Inclusions { // Add included entries
 		if err := p.resolveList(inc.Source); err != nil {
-			return err
+			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
 			}
 		}
Author	SHA1	Message	Date
EvanLiu2000	be2ec83092	category-porn: add more domains (#3320 )	2026-03-02 21:29:45 +08:00
MkQtS	6b16be4020	category-social-media-!cn: add some mastodon domains (#3318 )	2026-03-02 14:48:30 +08:00
MkQtS	42aafe324e	main.go: optimize attr filter (#3317 ) [skip ci]	2026-03-02 14:15:40 +08:00
0-Kutya-0	882f48e486	category-ip-geo-detect: add check-host.net (#3316 )	2026-03-02 13:53:25 +08:00
Ivan	614b291120	category-ru: add mil.ru (#3315 ) Ministry of Defense of the Russian Federation Co-authored-by: karspls <iaplekh@gmail.com>	2026-03-02 13:51:03 +08:00
grill-glitch	2b3211df98	geolocation-cn: add monika.love and edgemonix.top (#3314 )	2026-03-02 13:43:57 +08:00
direnquanbuKO	71e31ba221	apple: mark more sub domains with cn attr (#3312 ) Apple Music API endpoints	2026-02-27 17:35:44 +08:00
MkQtS	b11bfaa138	sina: add weibopay.com (#3311 )	2026-02-27 13:11:31 +08:00
MkQtS	afb9e6cad0	main.go: clean up (#3310 ) [skip ci]	2026-02-27 13:09:18 +08:00
Konstantin	5f7c4aa60a	yandex: add yandexwebcache.net (#3308 )	2026-02-27 13:03:46 +08:00
Nikita Ugnich	48eb616779	perplexity: add ppl-ai-file-upload.s3.amazonaws.com (#3307 )	2026-02-27 13:02:30 +08:00