Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve query

Browse source
This commit is contained in:
piuvas 2024-11-29 19:50:47 -03:00
parent e9feb8c9c8
commit 19a47e3835
No known key found for this signature in database
GPG key ID: 82743F52454C621D
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -89,10 +89,11 @@ export class QueryService {
.where('note.renoteUserId IS NULL')
.orWhere(`note.renoteUserId NOT IN (${ blockingQuery.getQuery() })`);
}))
// filter out renotes where the user being replied to is muted.
.andWhere(new Brackets(qb => {
qb
.where('(SELECT note.replyUserId FROM note WHERE note.id = renote.Id) IS NULL')
.orWhere(`(SELECT note.replyUserId FROM note WHERE note.id = renote.Id) NOT IN (${ blockingQuery.getQuery() })`);
.where('(SELECT "replyUserId" FROM note n WHERE "n".id = note.renoteId) IS NULL')
.orWhere(`(SELECT "replyUserId" FROM note n WHERE "n".id = note.renoteId) NOT IN (${ blockingQuery.getQuery() })`);
}));
q.setParameters(blockingQuery.getParameters());
@ -160,10 +161,11 @@ export class QueryService {
.where('note.renoteUserId IS NULL')
.orWhere(`note.renoteUserId NOT IN (${ mutingQuery.getQuery() })`);
}))
// filter out renotes where the user being replied to is muted.
.andWhere(new Brackets(qb => {
qb
.where('(SELECT note.replyUserId FROM note WHERE note.id = renote.Id) IS NULL')
.orWhere(`(SELECT note.replyUserId FROM note WHERE note.id = renote.Id) NOT IN (${ mutingQuery.getQuery() })`);
.where('(SELECT "replyUserId" FROM note n WHERE "n".id = note.renoteId) IS NULL')
.orWhere(`(SELECT "replyUserId" FROM note n WHERE "n".id = note.renoteId) NOT IN (${ mutingQuery.getQuery() })`);
}))
// mute instances
.andWhere(new Brackets(qb => {