Fix: Judge instance block サーバーサイレンス by endsWith

misskey-dev · Nov 9, 2023 · 4ff88d7 · 4ff88d7
1 parent e2cac3d
commit 4ff88d7
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/packages/backend/src/server/api/endpoints/federation/instances.ts b/packages/backend/src/server/api/endpoints/federation/instances.ts
@@ -81,9 +81,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			if (typeof ps.blocked === 'boolean') {
 				const meta = await this.metaService.fetch(true);
 				if (ps.blocked) {
-					query.andWhere(meta.blockedHosts.length === 0 ? '1=0' : 'instance.host IN (:...blocks)', { blocks: meta.blockedHosts });
+					query.andWhere(meta.blockedHosts.length === 0 ? '1=0' : 'instance.host ILIKE ANY(ARRAY[:...blocks])', { blocks: meta.blockedHosts.flatMap(x => [x, `%.${x}`]) });
 				} else {
-					query.andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'instance.host NOT IN (:...blocks)', { blocks: meta.blockedHosts });
+					query.andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'instance.host NOT ILIKE ANY(ARRAY[:...blocks])', { blocks: meta.blockedHosts.flatMap(x => [x, `%.${x}`]) });
 				}
 			}
 
@@ -110,12 +110,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					if (meta.silencedHosts.length === 0) {
 						return [];
 					}
-					query.andWhere("instance.host IN (:...silences)", {
-						silences: meta.silencedHosts,
+					query.andWhere("instance.host ILIKE ANY(ARRAY[:...silences])", {
+						silences: meta.silencedHosts.flatMap(x => [x, `%.${x}`]),
 					});
 				} else if (meta.silencedHosts.length > 0) {
-					query.andWhere("instance.host NOT IN (:...silences)", {
-						silences: meta.silencedHosts,
+					query.andWhere("instance.host NOT ILIKE ANY(ARRAY[:...silences])", {
+						silences: meta.silencedHosts.flatMap(x => [x, `%.${x}`]),
 					});
 				}
 			}