feat: HanamiSearch v1.5

packages/backend/src/core/CoreModule.ts

@@ -73,7 +73,7 @@ import { ProxyAccountService } from './ProxyAccountService.js';
 import { UtilityService } from './UtilityService.js';
 import { FileInfoService } from './FileInfoService.js';
 import { SearchService } from './SearchService.js';
-import { HanamiSearchService } from './HanamiSearchService.js';
+import { HanamiSearchService } from './hanamisearch/HanamiSearchService.js';
 import { ClipService } from './ClipService.js';
 import { FeaturedService } from './FeaturedService.js';
 import { FanoutTimelineService } from './FanoutTimelineService.js';

packages/backend/src/core/NoteCreateService.ts

@@ -47,7 +47,7 @@ import { RemoteUserResolveService } from '@/core/RemoteUserResolveService.js';
 import { bindThis } from '@/decorators.js';
 import { DB_MAX_NOTE_TEXT_LENGTH } from '@/const.js';
 import { RoleService } from '@/core/RoleService.js';
-import { HanamiSearchService } from '@/core/HanamiSearchService.js';
+import { HanamiSearchService } from '@/core/hanamisearch/HanamiSearchService.js';
 import { FeaturedService } from '@/core/FeaturedService.js';
 import { FanoutTimelineNamePrefix, FanoutTimelineService } from '@/core/FanoutTimelineService.js';
 import { UtilityService } from '@/core/UtilityService.js';

packages/backend/src/core/NoteDeleteService.ts

@@ -20,7 +20,7 @@ import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
 import { ApDeliverManagerService } from '@/core/activitypub/ApDeliverManagerService.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { bindThis } from '@/decorators.js';
-import { HanamiSearchService } from '@/core/HanamiSearchService.js';
+import { HanamiSearchService } from '@/core/hanamisearch/HanamiSearchService.js';
 import { ModerationLogService } from '@/core/ModerationLogService.js';
 import { isQuote, isRenote } from '@/misc/is-renote.js';
 import { SearchService } from './SearchService.js';

packages/backend/src/core/HanamiSearchService.ts → packages/backend/src/core/hanamisearch/HanamiSearchService.ts

@@ -76,7 +76,6 @@ export class HanamiSearchService {
 		private notesRepository: NotesRepository,
 
 		private cacheService: CacheService,
-		private queryService: QueryService,
 		private idService: IdService,
 	) {
 		this.hanamisearchIndexScope = config.hanamisearch?.scope || 'global';
@@ -100,6 +99,7 @@ export class HanamiSearchService {
 				'userHost',
 				'channelId',
 				'tags',
+				'fileIds',
 			],
 			typoTolerance: {
 				enabled: false,
@@ -116,6 +116,10 @@ export class HanamiSearchService {
 		if (note.text == null && note.cw == null) return;
 		if (!['home', 'public'].includes(note.visibility)) return;
 
+		// 配列が空の場合は null にする（検索時のパフォーマンスのためにインデックスしない）
+		const fileIds = (note.fileIds.length > 0) ? note.fileIds : null;
+		const tags = (note.tags.length > 0) ? note.tags : null;
+
 		const createdAt = this.idService.parse(note.id).date.getTime();
 		const noteData = {
 			id: note.id,
@@ -125,7 +129,8 @@ export class HanamiSearchService {
 			channelId: note.channelId,
 			cw: note.cw,
 			text: note.text,
-			tags: note.tags,
+			tags: tags,
+			fileIds: fileIds,
 		};
 
 		const shouldIndex = (scope: string | string[], userHost: string | null): boolean => {
@@ -165,6 +170,7 @@ export class HanamiSearchService {
 			channelId?: MiNote['channelId'] | null;
 			host?: string | null;
 			preferredMethod?: 'hanamisearchv1' | 'hanamisearchv2' | null;
+			onlyWithFiles?: boolean;
 		},
 		pagination: {
 			untilId?: MiNote['id'];
@@ -191,6 +197,7 @@ export class HanamiSearchService {
 			userId?: MiNote['userId'] | null;
 			channelId?: MiNote['channelId'] | null;
 			host?: string | null;
+			onlyWithFiles?: boolean;
 		},
 		pagination: {
 			untilId?: MiNote['id'];
@@ -208,6 +215,7 @@ export class HanamiSearchService {
 		if (opts.host) {
 			filter.qs.push(opts.host === '.' ? { op: 'is null', k: 'userHost' } : { op: '=', k: 'userHost', v: opts.host });
 		}
+		if (opts.onlyWithFiles) filter.qs.push({ op: 'is not null', k: 'fileIds' });
 
 		const res = await searchClient.search(q, {
 			sort: shouldTimeSeriesSort ? ['createdAt:desc'] : undefined,

packages/backend/src/queue/processors/DeleteAccountProcessorService.ts

@@ -14,7 +14,7 @@ import type { MiNote } from '@/models/Note.js';
 import { EmailService } from '@/core/EmailService.js';
 import { bindThis } from '@/decorators.js';
 import { SearchService } from '@/core/SearchService.js';
-import { HanamiSearchService } from '@/core/HanamiSearchService.js';
+import { HanamiSearchService } from '@/core/hanamisearch/HanamiSearchService.js';
 import { QueueLoggerService } from '../QueueLoggerService.js';
 import type * as Bull from 'bullmq';
 import type { DbUserDeleteJobData } from '../types.js';

packages/backend/src/server/api/endpoints/notes/hanamisearch-v1.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
-import { HanamiSearchService } from '@/core/HanamiSearchService.js';
+import { HanamiSearchService } from '@/core/hanamisearch/HanamiSearchService.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { isMustRemove } from '@/misc/is-hidden-or-visibility-modified.js';
 
@@ -43,6 +43,7 @@ export const paramDef = {
 		},
 		userId: { type: 'string', format: 'misskey:id', nullable: true, default: null },
 		channelId: { type: 'string', format: 'misskey:id', nullable: true, default: null },
+		onlyWithFiles: { type: 'boolean', default: false },
 	},
 	required: ['query'],
 } as const;
@@ -61,6 +62,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				channelId: ps.channelId,
 				host: ps.host,
 				preferredMethod: 'hanamisearchv1',
+				onlyWithFiles: ps.onlyWithFiles,
 			}, {
 				untilId: ps.untilId,
 				sinceId: ps.sinceId,

packages/misskey-js/src/autogen/types.ts

@@ -23082,6 +23082,8 @@ export type operations = {
            * @default null
            */
           channelId?: string | null;
+          /** @default false */
+          onlyWithFiles?: boolean;
         };
       };
     };