Fix: Judge instance block subdomain maching

misskey-dev · Aug 19, 2024 · 73316f7 · 73316f7
1 parent 4ff88d7
commit 73316f7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/backend/src/server/api/endpoints/federation/instances.ts b/packages/backend/src/server/api/endpoints/federation/instances.ts
@@ -83,7 +83,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				if (ps.blocked) {
 					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 ILIKE ANY(ARRAY[:...blocks])', { blocks: meta.blockedHosts.flatMap(x => [x, `%.${x}`]) });
+					query.andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'instance.host NOT ILIKE ALL(ARRAY[:...blocks])', { blocks: meta.blockedHosts.flatMap(x => [x, `%.${x}`]) });
 				}
 			}
 
@@ -114,7 +114,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 						silences: meta.silencedHosts.flatMap(x => [x, `%.${x}`]),
 					});
 				} else if (meta.silencedHosts.length > 0) {
-					query.andWhere("instance.host NOT ILIKE ANY(ARRAY[:...silences])", {
+					query.andWhere("instance.host NOT ILIKE ALL(ARRAY[:...silences])", {
 						silences: meta.silencedHosts.flatMap(x => [x, `%.${x}`]),
 					});
 				}