mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-23 03:53:09 +02:00
merge: nicer file type search (#107)
This commit is contained in:
commit
b43402519f
1 changed files with 12 additions and 1 deletions
|
@ -220,7 +220,18 @@ export class SearchService {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (opts.filetype) {
|
if (opts.filetype) {
|
||||||
query.andWhere(`note."attachedFileTypes"::varchar LIKE '%${opts.filetype}%'`);
|
/* this is very ugly, but the "correct" solution would
|
||||||
|
be `and exists (select 1 from
|
||||||
|
unnest(note."attachedFileTypes") x(t) where t like
|
||||||
|
:type)` and I can't find a way to get TypeORM to
|
||||||
|
generate that; this hack works because `~*` is
|
||||||
|
"regexp match, ignoring case" and the stringified
|
||||||
|
version of an array of varchars (which is what
|
||||||
|
`attachedFileTypes` is) looks like `{foo,bar}`, so
|
||||||
|
we're looking for opts.filetype as the first half of
|
||||||
|
a MIME type, either at start of the array (after the
|
||||||
|
`{`) or later (after a `,`) */
|
||||||
|
query.andWhere(`note."attachedFileTypes"::varchar ~* :type`, { type: `[{,]${opts.filetype}/` });
|
||||||
}
|
}
|
||||||
|
|
||||||
this.queryService.generateVisibilityQuery(query, me);
|
this.queryService.generateVisibilityQuery(query, me);
|
||||||
|
|
Loading…
Reference in a new issue