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/services/drive/add-file.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/services/drive')

diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts
index ab9fdc0c9d..3fa375e8d4 100644
--- a/src/services/drive/add-file.ts
+++ b/src/services/drive/add-file.ts
@@ -7,7 +7,6 @@ import * as Minio from 'minio';
 import * as uuid from 'uuid';
 import * as sharp from 'sharp';
 import * as fileType from 'file-type';
-import * as isSvg from 'is-svg';
 
 import DriveFile, { IMetadata, getDriveFileBucket, IDriveFile } from '../../models/drive-file';
 import DriveFolder from '../../models/drive-folder';
@@ -26,6 +25,7 @@ import { GenerateVideoThumbnail } from './generate-video-thumbnail';
 import { driveLogger } from './logger';
 import { IImage, ConvertToJpeg, ConvertToWebp, ConvertToPng } from './image-processor';
 import Instance from '../../models/instance';
+import checkSvg from '../../misc/check-svg';
 
 const logger = driveLogger.createSubLogger('register', 'yellow');
 
@@ -311,7 +311,7 @@ export default async function(
 				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