From 439563c5d6cf2ceced1705687b5bcbebf429e12e Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Fri, 14 Feb 2020 11:40:45 +0900
Subject: サムネイルをJPEGで生成するように (#5941)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/file/send-drive-file.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/server')

diff --git a/src/server/file/send-drive-file.ts b/src/server/file/send-drive-file.ts
index 8c57737911..63b2a3db2c 100644
--- a/src/server/file/send-drive-file.ts
+++ b/src/server/file/send-drive-file.ts
@@ -9,7 +9,7 @@ import { DriveFiles } from '../../models';
 import { InternalStorage } from '../../services/drive/internal-storage';
 import { downloadUrl } from '../../misc/donwload-url';
 import { detectType } from '../../misc/get-file-info';
-import { convertToJpeg, convertToPng } from '../../services/drive/image-processor';
+import { convertToJpeg, convertToPngOrJpeg } from '../../services/drive/image-processor';
 import { GenerateVideoThumbnail } from '../../services/drive/generate-video-thumbnail';
 
 const assets = `${__dirname}/../../server/file/assets/`;
@@ -59,7 +59,7 @@ export default async function(ctx: Koa.Context) {
 						if (['image/jpeg', 'image/webp'].includes(mime)) {
 							return await convertToJpeg(path, 498, 280);
 						} else if (['image/png'].includes(mime)) {
-							return await convertToPng(path, 498, 280);
+							return await convertToPngOrJpeg(path, 498, 280);
 						} else if (mime.startsWith('video/')) {
 							return await GenerateVideoThumbnail(path);
 						}
-- 
cgit v1.2.3-freya