nune/Sharkey
1
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey synced 2024-09-29 19:34:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix drive search query

Browse source 
`.andWhere` does not add parentheses, so that `or` changed the whole
meaning of the query
This commit is contained in:
dakkar 2024-07-19 14:32:14 +01:00
parent 3d5fd4a12d
commit 01b10d0d3b
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/backend/src/server/api/endpoints/drive/files.ts
View file

@ -10,6 +10,7 @@ import { QueryService } from '@/core/QueryService.js';
import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js';
import { DI } from '@/di-symbols.js';
import { sqlLikeEscape } from '@/misc/sql-like-escape.js';
import { Brackets } from 'typeorm';
export const meta = {
tags: ['drive'],
@ -63,7 +64,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
}
if (ps.searchQuery.length > 0) {
query.andWhere('file.name ILIKE :searchQuery OR file.comment ILIKE :searchQuery', { searchQuery: `%${sqlLikeEscape(ps.searchQuery)}%` });
const args = { searchQuery: `%${sqlLikeEscape(ps.searchQuery)}%` };
query.andWhere(new Brackets((qb) => {
qb
.where('file.name ILIKE :searchQuery', args)
.orWhere('file.comment ILIKE :searchQuery', args);
}));
}
if (ps.type) {