From e1eeddb3bb01f444a6f43fd9c5d6a88226975161 Mon Sep 17 00:00:00 2001 From: KanariKanaru <93921745+kanarikanaru@users.noreply.github.com> Date: Tue, 31 Dec 2024 20:57:15 +0900 Subject: [PATCH] =?UTF-8?q?chore=20&=20fix:=20v2=E3=81=A7=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C=E4=BA=88=E5=AE=9A=E3=81=AE=E6=A9=9F=E8=83=BD=E3=81=8C?= =?UTF-8?q?v1=E3=81=AB=E5=BD=93=E3=81=A6=E3=81=8C=E3=82=8F=E3=82=8C?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=9F=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=20(#184)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/backend/src/core/SearchService.ts | 14 +++++++------- .../server/api/endpoints/notes/hanamisearch-v1.ts | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/backend/src/core/SearchService.ts b/packages/backend/src/core/SearchService.ts index 4c9d677abccd..aa9e9e9acf49 100644 --- a/packages/backend/src/core/SearchService.ts +++ b/packages/backend/src/core/SearchService.ts @@ -190,7 +190,7 @@ export class SearchService { userId?: MiNote['userId'] | null; channelId?: MiNote['channelId'] | null; host?: string | null; - preferredMethod?: 'meilisearch' | 'hanamisearch' | null; + preferredMethod?: 'meilisearch' | 'hanamisearchv1' | 'hanamisearchv2' | null; }, pagination: { untilId?: MiNote['id']; @@ -200,10 +200,10 @@ export class SearchService { ): Promise { const preferredMethod = opts.preferredMethod ?? 'meilisearch'; - if ((preferredMethod === 'meilisearch' && this.meilisearch) || (preferredMethod === 'hanamisearch' && this.hanamisearch)) { + if ((preferredMethod === 'meilisearch' && this.meilisearch) || (preferredMethod === 'hanamisearchv1' && this.hanamisearch)) { const searchClient = preferredMethod === 'meilisearch' ? this.meilisearchNoteIndex! : this.hanamisearchNoteIndex!; - const shouldSort = preferredMethod === 'meilisearch'; - return this.searchWithExternalEngine(searchClient, q, me, opts, pagination, shouldSort); + const shouldTimeSeriesSort = true; + return this.searchWithExternalEngine(searchClient, q, me, opts, pagination, shouldTimeSeriesSort); } if (!this.meilisearch && !this.hanamisearch && preferredMethod === 'meilisearch') { @@ -227,7 +227,7 @@ export class SearchService { sinceId?: MiNote['id']; limit?: number; }, - shouldSort: boolean, + shouldTimeSeriesSort: boolean, ): Promise { const filter: Q = { op: 'and', qs: [] }; @@ -240,7 +240,7 @@ export class SearchService { } const res = await searchClient.search(q, { - sort: shouldSort ? ['createdAt:desc'] : undefined, + sort: shouldTimeSeriesSort ? ['createdAt:desc'] : undefined, matchingStrategy: 'all', attributesToRetrieve: ['id', 'createdAt'], filter: compileQuery(filter), @@ -265,7 +265,7 @@ export class SearchService { }); // ソートは MeiliSearch の場合のみ適用 - return shouldSort ? notes.sort((a, b) => (a.id > b.id ? -1 : 1)) : notes; + return shouldTimeSeriesSort ? notes.sort((a, b) => (a.id > b.id ? -1 : 1)) : notes; } private async searchWithInternalDB( diff --git a/packages/backend/src/server/api/endpoints/notes/hanamisearch-v1.ts b/packages/backend/src/server/api/endpoints/notes/hanamisearch-v1.ts index a59e1020e126..8c7c3c9e900d 100644 --- a/packages/backend/src/server/api/endpoints/notes/hanamisearch-v1.ts +++ b/packages/backend/src/server/api/endpoints/notes/hanamisearch-v1.ts @@ -59,7 +59,7 @@ export default class extends Endpoint { // eslint- userId: ps.userId, channelId: ps.channelId, host: ps.host, - preferredMethod: 'hanamisearch', + preferredMethod: 'hanamisearchv1', }, { untilId: ps.untilId, sinceId: ps.sinceId,