diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2021-10-16 17:42:21 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2021-10-16 17:42:21 +0900 |
| commit | 23753ec75a1820b098defb70ba16d5d1ce22e03f (patch) | |
| tree | 499842deff9c8de1bc88921f753e36fab36aad37 /src/server/proxy | |
| parent | feat(api): add users/groups/leave (diff) | |
| parent | Refactor request (#7814) (diff) | |
| download | misskey-23753ec75a1820b098defb70ba16d5d1ce22e03f.tar.gz misskey-23753ec75a1820b098defb70ba16d5d1ce22e03f.tar.bz2 misskey-23753ec75a1820b098defb70ba16d5d1ce22e03f.zip | |
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to 'src/server/proxy')
| -rw-r--r-- | src/server/proxy/proxy-media.ts | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/proxy/proxy-media.ts b/src/server/proxy/proxy-media.ts index 3bd65dfe67..9e13c0877f 100644 --- a/src/server/proxy/proxy-media.ts +++ b/src/server/proxy/proxy-media.ts @@ -5,6 +5,7 @@ import { IImage, convertToPng, convertToJpeg } from '@/services/drive/image-proc import { createTemp } from '@/misc/create-temp'; import { downloadUrl } from '@/misc/download-url'; import { detectType } from '@/misc/get-file-info'; +import { StatusError } from '@/misc/fetch'; export async function proxyMedia(ctx: Koa.Context) { const url = 'url' in ctx.query ? ctx.query.url : 'https://' + ctx.params.url; @@ -37,9 +38,9 @@ export async function proxyMedia(ctx: Koa.Context) { ctx.set('Cache-Control', 'max-age=31536000, immutable'); ctx.body = image.data; } catch (e) { - serverLogger.error(e); + serverLogger.error(`${e}`); - if (typeof e.statusCode === 'number' && e.statusCode >= 400 && e.statusCode < 500) { + if (e instanceof StatusError && e.isClientError) { ctx.status = e.statusCode; } else { ctx.status = 500; |