e2net/iceshrimp
3
0
Fork 0
forked from mirrors/iceshrimp
Code Pull requests Activity

[backend] Make inverse postgres FTS filters consistent with regular ones

Browse source
This commit is contained in:
Laura Hausmann 2023-11-18 23:15:59 +01:00
parent 98f40d8865
commit 8c43c5cae6
Signed by: zotan
GPG key ID: D044E84C5BE01605
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/backend/src/server/api/common/generate-fts-query.ts
View file

@ -143,8 +143,12 @@ function instanceFilter(query: SelectQueryBuilder<any>, filter: string, id: numb
}
function instanceFilterInverse(query: SelectQueryBuilder<any>, filter: string, id: number) {
query.andWhere(`note.userHost <> :instance_${id}`);
query.setParameter(`instance_${id}`, filter);
if (filter === 'local') {
query.andWhere(`note.userHost IS NOT NULL`);
} else {
query.andWhere(`note.userHost <> :instance_${id}`);
query.setParameter(`instance_${id}`, filter);
}
}
function miscFilter(query: SelectQueryBuilder<any>, filter: string) {
@ -176,7 +180,7 @@ function miscFilterInverse(query: SelectQueryBuilder<any>, filter: string) {
subQuery = Followings.createQueryBuilder('following')
.select('following.followeeId')
.where('following.followerId = :meId')
} else if (filter === 'replies') {
} else if (filter === 'replies' || filter === 'reply') {
query.andWhere('note.replyId IS NULL');
} else if (filter === 'boosts' || filter === 'boost' || filter === 'renotes' || filter === 'renote') {
query.andWhere('note.renoteId IS NULL');