sim1222/nca10.net
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix SVG detection (#4401)

Browse Source 
* Fix SVG detection

* remove unnecessary import
This commit is contained in:
MeiMei
2019-03-03 08:48:02 +09:00
committed by syuilo
parent 972fb8eb40
commit d4ff19f013
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/proxy/proxy-media.ts
View File

@ -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 にする