Fix: judge domain block and silence by endsWith (federation/instances)

[atsu1125]

What

ドメインブロックとサーバーサイレンスをendsWithで評価しているが
現状完全一致したものしか一覧には表示されないので整合性が取れてないため
federation/instancesをendsWithに対応させる

Why

Fix: #9263
Fix: #12031

Additional info (optional)

tested on our developing environment

Checklist

• Read the contribution guide
• Test working in a local environment
• (If needed) Add story of storybook
• (If needed) Update CHANGELOG.md
• (If possible) Add tests

[codecov]

Codecov Report

Attention: Patch coverage is 0% with 6 lines in your changes missing coverage. Please review.

Project coverage is 39.87%. Comparing base (043ab1f) to head (5a559a0).

Files	Patch %	Lines
...d/src/server/api/endpoints/federation/instances.ts	0.00%	6 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##           develop   #12293      +/-   ##
===========================================
- Coverage    39.89%   39.87%   -0.03%     
===========================================
  Files         1547     1547              
  Lines       190970   190970              
  Branches      3519     2655     -864     
===========================================
- Hits         76190    76140      -50     
- Misses      114187   114268      +81     
+ Partials       593      562      -31     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[github-actions]

このPRによるapi.jsonの差分

差分はこちら

Get diff files from Workflow Page

[syuilo]

パフォーマンスへの影響が気になるわね

[atsu1125]

一応チャート生成時に同様のクエリが走っているのでどうだろう

misskey/packages/backend/src/core/chart/charts/federation.ts

Lines 64 to 104 in c541ced

	const [sub, pub, pubsub, subActive, pubActive] = await Promise.all([
	this.followingsRepository.createQueryBuilder('following')
	.select('COUNT(DISTINCT following.followeeHost)')
	.where('following.followeeHost IS NOT NULL')
	.andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'following.followeeHost NOT ILIKE ANY(ARRAY[:...blocked])', { blocked: meta.blockedHosts.flatMap(x => [x, `%.${x}`]) })
	.andWhere(`following.followeeHost NOT IN (${ suspendedInstancesQuery.getQuery() })`)
	.getRawOne()
	.then(x => parseInt(x.count, 10)),
	this.followingsRepository.createQueryBuilder('following')
	.select('COUNT(DISTINCT following.followerHost)')
	.where('following.followerHost IS NOT NULL')
	.andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'following.followerHost NOT ILIKE ANY(ARRAY[:...blocked])', { blocked: meta.blockedHosts.flatMap(x => [x, `%.${x}`]) })
	.andWhere(`following.followerHost NOT IN (${ suspendedInstancesQuery.getQuery() })`)
	.getRawOne()
	.then(x => parseInt(x.count, 10)),
	this.followingsRepository.createQueryBuilder('following')
	.select('COUNT(DISTINCT following.followeeHost)')
	.where('following.followeeHost IS NOT NULL')
	.andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'following.followeeHost NOT ILIKE ANY(ARRAY[:...blocked])', { blocked: meta.blockedHosts.flatMap(x => [x, `%.${x}`]) })
	.andWhere(`following.followeeHost NOT IN (${ suspendedInstancesQuery.getQuery() })`)
	.andWhere(`following.followeeHost IN (${ pubsubSubQuery.getQuery() })`)
	.setParameters(pubsubSubQuery.getParameters())
	.getRawOne()
	.then(x => parseInt(x.count, 10)),
	this.instancesRepository.createQueryBuilder('instance')
	.select('COUNT(instance.id)')
	.where(`instance.host IN (${ subInstancesQuery.getQuery() })`)
	.andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'instance.host NOT ILIKE ANY(ARRAY[:...blocked])', { blocked: meta.blockedHosts.flatMap(x => [x, `%.${x}`]) })
	.andWhere('instance.isSuspended = false')
	.andWhere('instance.isNotResponding = false')
	.getRawOne()
	.then(x => parseInt(x.count, 10)),
	this.instancesRepository.createQueryBuilder('instance')
	.select('COUNT(instance.id)')
	.where(`instance.host IN (${ pubInstancesQuery.getQuery() })`)
	.andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'instance.host NOT ILIKE ANY(ARRAY[:...blocked])', { blocked: meta.blockedHosts.flatMap(x => [x, `%.${x}`]) })
	.andWhere('instance.isSuspended = false')
	.andWhere('instance.isNotResponding = false')
	.getRawOne()
	.then(x => parseInt(x.count, 10)),
	]);

[syuilo]

ふーむ
そこも含めて実装を見直したくなってきた

[atsu1125]

#14441 の対応とPR作成から9ヶ月経ってコンフリクト出てるのもあるので、今のdevelopベースで書き直しておきますね
パフォーマンスについては

allowGet: true,
cacheSec: 3600,

があり、すでにチャートのコードで毎時で呼ばれているクエリであり、60分というキャッシュ時間とクエリの実行頻度は変わらないので、問題はないと結論付けています

[atsu1125]

今のDevelopベースで書き直しました