Merge tag '12.117.1' into develop

2022-07-19 17:25:25 +09:00
parent 0ed40b920b 09591fa4ae
commit 049be7caab
41 changed files with 1230 additions and 939 deletions
--- a/packages/backend/src/misc/get-file-info.ts
+++ b/packages/backend/src/misc/get-file-info.ts
@ -101,13 +101,17 @@ export async function getFileInfo(path: string, opts: {
 	let porn = false;

 	if (!opts.skipSensitiveDetection) {
-		[sensitive, porn] = await detectSensitivity(
+		await detectSensitivity(
 			path,
 			type.mime,
 			opts.sensitiveThreshold ?? 0.5,
 			opts.sensitiveThresholdForPorn ?? 0.75,
 			opts.enableSensitiveMediaDetectionForVideos ?? false,
-		);
+		).then(value => {
+			[sensitive, porn] = value;
+		}, error => {
+			warnings.push(`detectSensitivity failed: ${error}`);
+		});
 	}

 	return {