From ac8fad242260a4f220278ff41e02d071b3db66ca Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sun, 1 Jun 2025 14:34:58 -0400
Subject: [PATCH] fix logic error in generateBlockedHostQueryForNote that would
 allow blocked instances if allowSilenced was set to false

---
 packages/backend/src/core/QueryService.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/QueryService.ts b/packages/backend/src/core/QueryService.ts
index 1b00f41d20..14d4caff06 100644
--- a/packages/backend/src/core/QueryService.ts
+++ b/packages/backend/src/core/QueryService.ts
@@ -263,8 +263,12 @@ export class QueryService {
 					.orWhere(`note.${key}Host IS NULL`) // local
 					.orWhere(`${key}Instance.isBlocked = false`); // not blocked
 
-				if (!allowSilenced) {
-					qb.orWhere(`${key}Instance.isSilenced = false`); // not silenced
+				if (allowSilenced) {
+					qb.orWhere(`${key}Instance.isBlocked = false`); // not blocked
+				} else {
+					qb.orWhere(new Brackets(qbb => qbb
+						.andWhere(`${key}Instance.isBlocked = false`) // not blocked
+						.andWhere(`${key}Instance.isSilenced = false`))); // not silenced
 				}
 
 				if (excludeAuthor) {