heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

test: more search options

Browse source
This commit is contained in:
Mar0xy 2023-10-21 22:03:19 +02:00
parent 4a90464f03
commit d392edbc6b
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
3 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
packages/backend/src/core/SearchService.ts
View file

@ -29,6 +29,7 @@ type Q =
{ op: 'is not null', k: K} |
{ op: 'and', qs: Q[] } |
{ op: 'or', qs: Q[] } |
{ op: 'likefile', k: K, v: V } |
{ op: 'not', q: Q };
function compileValue(value: V): string {
@ -54,6 +55,7 @@ function compileQuery(q: Q): string {
case 'or': return q.qs.length === 0 ? '' : `(${ q.qs.map(_q => compileQuery(_q)).join(' OR ') })`;
case 'is null': return `(${q.k} IS NULL)`;
case 'is not null': return `(${q.k} IS NOT NULL)`;
case 'likefile': return `(${q.k}::varchar LIKE ${compileValue(q.v)}))`;
case 'not': return `(NOT ${compileQuery(q.q)})`;
default: throw new Error('unrecognized query operator');
}
@ -93,6 +95,7 @@ export class SearchService {
'userHost',
'channelId',
'tags',
'attachedFileTypes',
],
typoTolerance: {
enabled: false,
@ -158,6 +161,8 @@ export class SearchService {
userId?: MiNote['userId'] | null;
channelId?: MiNote['channelId'] | null;
host?: string | null;
filetype?: string | null;
order?: string | null;
}, pagination: {
untilId?: MiNote['id'];
sinceId?: MiNote['id'];
@ -172,6 +177,7 @@ export class SearchService {
if (pagination.sinceId) filter.qs.push({ op: '>', k: 'createdAt', v: this.idService.parse(pagination.sinceId).date.getTime() });
if (opts.userId) filter.qs.push({ op: '=', k: 'userId', v: opts.userId });
if (opts.channelId) filter.qs.push({ op: '=', k: 'channelId', v: opts.channelId });
if (opts.filetype) filter.qs.push({ op: 'likefile', k: 'attachedFileTypes', v: `%${opts.filetype}%` });
if (opts.host) {
if (opts.host === '.') {
filter.qs.push({ op: 'is null', k: 'userHost' });
@ -180,7 +186,7 @@ export class SearchService {
}
}
const res = await this.meilisearchNoteIndex!.search(q, {
sort: ['createdAt:desc'],
sort: [`createdAt:${opts.order}`],
matchingStrategy: 'all',
attributesToRetrieve: ['id', 'createdAt'],
filter: compileQuery(filter),

4
packages/backend/src/server/api/endpoints/notes/search.ts
View file

@ -46,8 +46,10 @@ export const paramDef = {
type: 'string',
description: 'The local host is represented with `.`.',
},
filetype: { type: 'string', nullable: true },
userId: { type: 'string', format: 'misskey:id', nullable: true, default: null },
channelId: { type: 'string', format: 'misskey:id', nullable: true, default: null },
order: { type: 'string' },
},
required: ['query'],
} as const;
@ -71,6 +73,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
userId: ps.userId,
channelId: ps.channelId,
host: ps.host,
filetype: ps.filetype,
order: ps.order,
}, {
untilId: ps.untilId,
sinceId: ps.sinceId,