amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: fix drive search query (!576)

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

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Leah <kevinlukej@gmail.com>
This commit is contained in:
dakkar 2024-07-19 16:31:41 +00:00
commit f675f5a074
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 { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js';
import { DI } from '@/di-symbols.js'; import { DI } from '@/di-symbols.js';
import { sqlLikeEscape } from '@/misc/sql-like-escape.js'; import { sqlLikeEscape } from '@/misc/sql-like-escape.js';
import { Brackets } from 'typeorm';
export const meta = { export const meta = {
tags: ['drive'], tags: ['drive'],
@ -63,7 +64,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
} }
if (ps.searchQuery.length > 0) { 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) { if (ps.type) {