mirrors/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey.git synced 2025-07-07 20:44:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: Fix logic error in generateBlockedHostQueryForNote (!1085)

Browse source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1085

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
This commit is contained in:
Hazelnoot 2025-06-01 19:35:20 +00:00
commit cea594053f
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
packages/backend/src/core/QueryService.ts
View file

@ -261,11 +261,14 @@ export class QueryService {
q.leftJoin(`note.${key}Instance`, `${key}Instance`); q.leftJoin(`note.${key}Instance`, `${key}Instance`);
q.andWhere(new Brackets(qb => { q.andWhere(new Brackets(qb => {
qb.orWhere(`note.${key}Id IS NULL`) // no corresponding user qb.orWhere(`note.${key}Id IS NULL`) // no corresponding user
.orWhere(`note.${key}Host IS NULL`) // local .orWhere(`note.${key}Host IS NULL`); // local
.orWhere(`${key}Instance.isBlocked = false`); // not blocked
if (!allowSilenced) { if (allowSilenced) {
qb.orWhere(`${key}Instance.isSilenced = false`); // not silenced 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) { if (excludeAuthor) {