diff options
| author | Acid Chicken (硫酸鶏) <root@acid-chicken.com> | 2022-07-19 17:09:21 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-19 17:09:21 +0900 |
| commit | a3c2dbbfb59cf95f1f3972e0e08dde50a66b7829 (patch) | |
| tree | 83d502c1623c1db960997c155968ab9dce72da06 /packages/backend/src/misc | |
| parent | update vite (diff) | |
| download | misskey-a3c2dbbfb59cf95f1f3972e0e08dde50a66b7829.tar.gz misskey-a3c2dbbfb59cf95f1f3972e0e08dde50a66b7829.tar.bz2 misskey-a3c2dbbfb59cf95f1f3972e0e08dde50a66b7829.zip | |
fix(server): make sure `getFileInfo` doesn't fail if `detectSensitivity` ever fails (#9020)
Diffstat (limited to 'packages/backend/src/misc')
| -rw-r--r-- | packages/backend/src/misc/get-file-info.ts | 8 |
1 files 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 42061fcf83..1c988b2487 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 { |