summaryrefslogtreecommitdiff
path: root/src/server/proxy
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2019-07-05 02:13:02 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-07-05 02:13:02 +0900
commitd078f786028c066d536990c280091f9c43b67ec9 (patch)
tree4892e2dd4d94cb5d8dd3ce81d4c7ba6b190f7960 /src/server/proxy
parentMerge branch 'develop' (diff)
parent11.24.0 (diff)
downloadmisskey-d078f786028c066d536990c280091f9c43b67ec9.tar.gz
misskey-d078f786028c066d536990c280091f9c43b67ec9.tar.bz2
misskey-d078f786028c066d536990c280091f9c43b67ec9.zip
Merge branch 'develop'
Diffstat (limited to 'src/server/proxy')
-rw-r--r--src/server/proxy/proxy-media.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/proxy/proxy-media.ts b/src/server/proxy/proxy-media.ts
index 4535a0fb5d..eadfab54a3 100644
--- a/src/server/proxy/proxy-media.ts
+++ b/src/server/proxy/proxy-media.ts
@@ -21,9 +21,9 @@ export async function proxyMedia(ctx: Koa.BaseContext) {
let image: IImage;
- if ('static' in ctx.query && ['image/png', 'image/gif'].includes(type)) {
+ if ('static' in ctx.query && ['image/png', 'image/gif', 'image/apng', 'image/vnd.mozilla.apng'].includes(type)) {
image = await convertToPng(path, 498, 280);
- } else if ('preview' in ctx.query && ['image/jpeg', 'image/png', 'image/gif'].includes(type)) {
+ } else if ('preview' in ctx.query && ['image/jpeg', 'image/png', 'image/gif', 'image/apng', 'image/vnd.mozilla.apng'].includes(type)) {
image = await convertToJpeg(path, 200, 200);
} else {
image = {