From 4d425fc8a47444952f8761b8e198adc602adec9d Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Mon, 11 Mar 2019 01:03:09 +0900
Subject: Use proxy instead of weserv for url-preview images (#4466)

---
 src/server/proxy/proxy-media.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/server/proxy')

diff --git a/src/server/proxy/proxy-media.ts b/src/server/proxy/proxy-media.ts
index 842dbff29e..2eec2012f3 100644
--- a/src/server/proxy/proxy-media.ts
+++ b/src/server/proxy/proxy-media.ts
@@ -6,7 +6,7 @@ import * as request from 'request';
 import fileType from 'file-type';
 import { serverLogger } from '..';
 import config from '../../config';
-import { IImage, ConvertToPng } from '../../services/drive/image-processor';
+import { IImage, ConvertToPng, ConvertToJpeg } from '../../services/drive/image-processor';
 import checkSvg from '../../misc/check-svg';
 
 export async function proxyMedia(ctx: Koa.BaseContext) {
@@ -29,6 +29,8 @@ export async function proxyMedia(ctx: Koa.BaseContext) {
 
 		if ('static' in ctx.query && ['image/png', 'image/gif'].includes(type)) {
 			image = await ConvertToPng(path, 498, 280);
+		} else if ('preview' in ctx.query && ['image/jpeg', 'image/png', 'image/gif'].includes(type)) {
+			image = await ConvertToJpeg(path, 200, 200);
 		} else {
 			image = {
 				data: fs.readFileSync(path),
-- 
cgit v1.2.3-freya