summaryrefslogtreecommitdiff
path: root/packages/backend/src/core
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2025-05-24 22:01:42 -0400
committerHazelnoot <acomputerdog@gmail.com>2025-05-28 21:31:40 -0400
commitabac2f785a2e820f32914cbfa0fb00c4973fd703 (patch)
treeaf65c43d94368feaa35edd279572519acce4444f /packages/backend/src/core
parentadd foreign keys to following where instance is referenced (diff)
downloadsharkey-abac2f785a2e820f32914cbfa0fb00c4973fd703.tar.gz
sharkey-abac2f785a2e820f32914cbfa0fb00c4973fd703.tar.bz2
sharkey-abac2f785a2e820f32914cbfa0fb00c4973fd703.zip
fix QueryService.generateMutedUserRenotesQueryForNotes to properly exclude quotes
Diffstat (limited to 'packages/backend/src/core')
-rw-r--r--packages/backend/src/core/QueryService.ts11
1 files changed, 5 insertions, 6 deletions
diff --git a/packages/backend/src/core/QueryService.ts b/packages/backend/src/core/QueryService.ts
index 50a72e8aa6..e87360b00d 100644
--- a/packages/backend/src/core/QueryService.ts
+++ b/packages/backend/src/core/QueryService.ts
@@ -243,13 +243,12 @@ export class QueryService {
q.andWhere(new Brackets(qb => {
qb
- .where(new Brackets(qb => {
- qb.where('note.renoteId IS NOT NULL');
- qb.andWhere('note.text IS NULL');
- qb.andWhere(`note.userId NOT IN (${ mutingQuery.getQuery() })`);
- }))
.orWhere('note.renoteId IS NULL')
- .orWhere('note.text IS NOT NULL');
+ .orWhere('note.text IS NOT NULL')
+ .orWhere('note.cw IS NOT NULL')
+ .orWhere('note.replyId IS NOT NULL')
+ .orWhere('note.fileIds != \'{}\'')
+ .orWhere(`note.userId NOT IN (${ mutingQuery.getQuery() })`);
}));
q.setParameters(mutingQuery.getParameters());