diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2019-03-03 08:48:02 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-03-03 08:48:02 +0900 |
| commit | d4ff19f01366fe62dffef8fd3464a16f8d63cd25 (patch) | |
| tree | 11807372e86b5ed777c730a66a063eaf9dee33c7 /src/services/drive | |
| parent | Hide some components (diff) | |
| download | sharkey-d4ff19f01366fe62dffef8fd3464a16f8d63cd25.tar.gz sharkey-d4ff19f01366fe62dffef8fd3464a16f8d63cd25.tar.bz2 sharkey-d4ff19f01366fe62dffef8fd3464a16f8d63cd25.zip | |
Fix SVG detection (#4401)
* Fix SVG detection
* remove unnecessary import
Diffstat (limited to 'src/services/drive')
| -rw-r--r-- | src/services/drive/add-file.ts | 4 |
1 files changed, 2 insertions, 2 deletions
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 にする |