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/server/proxy | |
| 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/server/proxy')
| -rw-r--r-- | src/server/proxy/proxy-media.ts | 4 |
1 files changed, 2 insertions, 2 deletions
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 にする |