From 26f2ae093bcb2e9eba703e9f865c264beb04dc99 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Fri, 5 Jul 2019 17:44:23 +0900
Subject: APNGでもMIME typeはimage/pngにするように (#5100)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* APNGでもMIME typeはimage/pngにするように

* Revert "APNGでもMIME typeはimage/pngにするように"

This reverts commit e579eb2bf44f526cabfa9bd4adc6b4fa84727e3b.

* APNGはファイル送信時のみimage/pngにするように
---
 src/server/file/send-drive-file.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/server')

diff --git a/src/server/file/send-drive-file.ts b/src/server/file/send-drive-file.ts
index 5da3d79eb5..44e88be8ae 100644
--- a/src/server/file/send-drive-file.ts
+++ b/src/server/file/send-drive-file.ts
@@ -42,7 +42,7 @@ export default async function(ctx: Koa.BaseContext) {
 		ctx.set('Content-Disposition', contentDisposition('inline', `${rename(file.name, { suffix: '-thumb', extname: '.jpeg' })}`));
 		ctx.body = InternalStorage.read(key);
 	} else if (isWebpublic) {
-		ctx.set('Content-Type', file.type);
+		ctx.set('Content-Type', file.type === 'image/apng' ? 'image/png' : file.type);
 		ctx.set('Content-Disposition', contentDisposition('inline', `${rename(file.name, { suffix: '-web' })}`));
 		ctx.body = InternalStorage.read(key);
 	} else {
-- 
cgit v1.2.3-freya