Fix: Opensearch利用時ファイルのセンシティブ状態が変更されたとき変更されるように

CHANGELOG_YOJO.md

@@ -38,6 +38,7 @@ Cherrypick 4.11.1
 
 ### Server
 - Enhance: リモートユーザーの`/api/clips/show`と`/api/users/clips`の応答にemojisを追加 [#466](https://github.com/yojo-art/cherrypick/pull/466)
+- Fix: Opensearch利用時ファイルのセンシティブ状態が変更されたとき変更されるように
 - Change: `notes/advanced-search`で`query`が必須ではなくなりました
 
 ### Misc

packages/backend/src/core/AdvancedSearchService.ts

@@ -355,6 +355,41 @@ export class AdvancedSearchService {
 		this.index(this.opensearchNoteIndex as string, note.id, body);
 	}
 
+	@bindThis
+	public async updateNoteSensitive(fileId: string) {
+		if (!this.opensearch) return;
+
+		const limit = 100;
+		let latestid = undefined;
+
+		while (true) {
+			const notes = await this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), latestid, undefined)
+				.andWhere(':file <@ note.fileIds', { file: [fileId] })
+				.limit(limit)
+				.getMany();
+
+			if (notes.length === 0 ) break;
+
+			notes.forEach((note) => {
+				this.driveService.getSensitiveFileCount(note.fileIds)
+					.then((sensitiveCount) => {
+						const nonSensitiveCount = note.fileIds.length - sensitiveCount;
+						const body = {
+							fileIds: note.fileIds,
+							sensitiveFileCount: sensitiveCount,
+							nonSensitiveFileCount: nonSensitiveCount,
+						};
+						this.opensearch?.update({
+							id: note.id,
+							index: this.opensearchNoteIndex as string,
+							body: { doc: body },
+						});
+					});
+				latestid = note.id;
+			});
+		}
+	}
+
 	@bindThis
 	private async index(index: string, id: string, body: any ) {
 		if (!this.opensearch) return;

packages/backend/src/core/DriveService.ts

@@ -6,6 +6,7 @@
 import { randomUUID } from 'node:crypto';
 import * as fs from 'node:fs';
 import { Inject, Injectable } from '@nestjs/common';
+import { ModuleRef } from '@nestjs/core';
 import sharp from 'sharp';
 import { sharpBmp } from '@misskey-dev/sharp-read-bmp';
 import { IsNull } from 'typeorm';
@@ -45,6 +46,7 @@ import { isMimeImage } from '@/misc/is-mime-image.js';
 import { ModerationLogService } from '@/core/ModerationLogService.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { RegistryApiService } from '@/core/RegistryApiService.js';
+import { AdvancedSearchService } from './AdvancedSearchService.js';
 
 type AddFileArgs = {
 	/** User who wish to add file */
@@ -95,6 +97,7 @@ export class DriveService {
 	private registerLogger: Logger;
 	private downloaderLogger: Logger;
 	private deleteLogger: Logger;
+	private advancedSearchService: AdvancedSearchService;
 
 	constructor(
 		@Inject(DI.config)
@@ -131,13 +134,18 @@ export class DriveService {
 		private instanceChart: InstanceChart,
 		private utilityService: UtilityService,
 		private registryApiService: RegistryApiService,
+		private moduleRef: ModuleRef,
 	) {
 		const logger = new Logger('drive', 'blue');
 		this.registerLogger = logger.createSubLogger('register', 'yellow');
 		this.downloaderLogger = logger.createSubLogger('downloader');
 		this.deleteLogger = logger.createSubLogger('delete');
 	}
 
+	onModuleInit() {
+		this.advancedSearchService = this.moduleRef.get('AdvancedSearchService');
+	}
+
 	/***
 	 * Save file
 	 * @param path Path for original
@@ -767,6 +775,7 @@ export class DriveService {
 				}
 			}
 		}
+		this.advancedSearchService.updateNoteSensitive(file.id);
 
 		return fileObj;
 	}

packages/backend/src/server/api/endpoints/notes/advanced-search.ts

@@ -172,7 +172,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 							throw new ApiError(meta.errors.unimplemented);
 						}
 					}
-					throw new ApiError();
+					throw err;
 				},
 			);