From d4ff19f01366fe62dffef8fd3464a16f8d63cd25 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Sun, 3 Mar 2019 08:48:02 +0900
Subject: Fix SVG detection (#4401)

* Fix SVG detection

* remove unnecessary import
---
 src/server/proxy/proxy-media.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/server/proxy/proxy-media.ts')

diff --git a/src/server/proxy/proxy-media.ts b/src/server/proxy/proxy-media.ts
index c679086d3a..8560c0e1ef 100644
--- a/src/server/proxy/proxy-media.ts
+++ b/src/server/proxy/proxy-media.ts
@@ -4,10 +4,10 @@ import * as tmp from 'tmp';
 import * as Koa from 'koa';
 import * as request from 'request';
 import * as fileType from 'file-type';
-import * as isSvg from 'is-svg';
 import { serverLogger } from '..';
 import config from '../../config';
 import { IImage, ConvertToPng } from '../../services/drive/image-processor';
+import checkSvg from '../../misc/check-svg';
 
 export async function proxyMedia(ctx: Koa.BaseContext) {
 	const url = 'url' in ctx.query ? ctx.query.url : 'https://' + ctx.params.url;
@@ -102,7 +102,7 @@ async function detectMine(path: string) {
 				const type = fileType(buffer);
 				if (type) {
 					res([type.mime, type.ext]);
-				} else if (isSvg(buffer)) {
+				} else if (checkSvg(path)) {
 					res(['image/svg+xml', 'svg']);
 				} else {
 					// 種類が同定できなかったら application/octet-stream にする
-- 
cgit v1.2.3-freya