Merge branch 'develop' into pr/16417

CHANGELOG.md

@@ -1,8 +1,5 @@
 ## 2025.9.0
 
-### General
--
-
 ### Client
 - Enhance: AiScriptAppウィジェットで構文エラーを検知してもダイアログではなくウィジェット内にエラーを表示するように
 - Enhance: /flushページでサイトキャッシュをクリアできるようになりました
@@ -16,8 +13,7 @@
 - Fix: エラー画像が横に引き伸ばされてしまう問題に対応
 
 ### Server
--
+- Fix: webpなどの画像に対してセンシティブなメディアの検出が適用されていなかった問題を修正
-
 
 ## 2025.8.0
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2025.9.0-alpha.1",
+	"version": "2025.9.0-alpha.2",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

packages/backend/src/core/AiService.ts

@@ -29,7 +29,7 @@ export class AiService {
 	}
 
 	@bindThis
-	public async detectSensitive(path: string): Promise<nsfw.PredictionType[] | null> {
+	public async detectSensitive(source: string | Buffer): Promise<nsfw.PredictionType[] | null> {
 		try {
 			if (isSupportedCpu === undefined) {
 				isSupportedCpu = await this.computeIsSupportedCpu();
@@ -51,7 +51,7 @@ export class AiService {
 				});
 			}
 
-			const buffer = await fs.promises.readFile(path);
+			const buffer = source instanceof Buffer ? source : await fs.promises.readFile(source);
 			const image = await tf.node.decodeImage(buffer, 3) as any;
 			try {
 				const predictions = await this.model.classify(image);

packages/backend/src/core/FileInfoService.ts

@@ -21,6 +21,7 @@ import { LoggerService } from '@/core/LoggerService.js';
 import type Logger from '@/logger.js';
 import { bindThis } from '@/decorators.js';
 import type { PredictionType } from 'nsfwjs';
+import { isMimeImage } from '@/misc/is-mime-image.js';
 
 export type FileInfo = {
 	size: number;
@@ -204,16 +205,7 @@ export class FileInfoService {
 			return [sensitive, porn];
 		}
 
-		if ([
+		if (analyzeVideo && (mime === 'image/apng' || mime.startsWith('video/'))) {
-			'image/jpeg',
-			'image/png',
-			'image/webp',
-		].includes(mime)) {
-			const result = await this.aiService.detectSensitive(source);
-			if (result) {
-				[sensitive, porn] = judgePrediction(result);
-			}
-		} else if (analyzeVideo && (mime === 'image/apng' || mime.startsWith('video/'))) {
 			const [outDir, disposeOutDir] = await createTempDir();
 			try {
 				const command = FFmpeg()
@@ -281,6 +273,23 @@ export class FileInfoService {
 			} finally {
 				disposeOutDir();
 			}
+		} else if (isMimeImage(mime, 'sharp-convertible-image-with-bmp')) {
+			/*
+			 * tfjs-node は限られた画像形式しか受け付けないため、sharp で PNG に変換する
+			 * せっかくなので内部処理で使われる最大サイズの299x299に事前にリサイズする
+			 */
+			const png = await (await sharpBmp(source, mime))
+				.resize(299, 299, {
+					withoutEnlargement: false,
+				})
+				.rotate()
+				.flatten({ background: { r: 119, g: 119, b: 119 } }) // 透過部分を18%グレーで塗りつぶす
+				.png()
+				.toBuffer();
+			const result = await this.aiService.detectSensitive(png);
+			if (result) {
+				[sensitive, porn] = judgePrediction(result);
+			}
 		}
 
 		return [sensitive, porn];

packages/misskey-js/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2025.9.0-alpha.1",
+	"version": "2025.9.0-alpha.2",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",