From a3c2dbbfb59cf95f1f3972e0e08dde50a66b7829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Tue, 19 Jul 2022 17:09:21 +0900 Subject: [PATCH] fix(server): make sure `getFileInfo` doesn't fail if `detectSensitivity` ever fails (#9020) --- packages/backend/src/misc/get-file-info.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/backend/src/misc/get-file-info.ts b/packages/backend/src/misc/get-file-info.ts index 42061fcf8..1c988b248 100644 --- 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 {