diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-06-01 14:34:58 -0400 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-06-01 14:34:58 -0400 |
| commit | ac8fad242260a4f220278ff41e02d071b3db66ca (patch) | |
| tree | 6bbea20655219446567dee6edbff6c6f8eaa2f17 /packages/backend/src/core/QueryService.ts | |
| parent | fix bad merge in UtilityService.ts (diff) | |
| download | sharkey-ac8fad242260a4f220278ff41e02d071b3db66ca.tar.gz sharkey-ac8fad242260a4f220278ff41e02d071b3db66ca.tar.bz2 sharkey-ac8fad242260a4f220278ff41e02d071b3db66ca.zip | |
fix logic error in generateBlockedHostQueryForNote that would allow blocked instances if allowSilenced was set to false
Diffstat (limited to 'packages/backend/src/core/QueryService.ts')
| -rw-r--r-- | packages/backend/src/core/QueryService.ts | 8 |
1 files 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) { |