diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-03-11 09:59:14 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-03-11 09:59:14 +0900 |
| commit | e3e08843f16a9f0f2ff04c21072a253c413097cd (patch) | |
| tree | 27e977557e3753e416225ea4efcbd7d09518d824 /src/server/proxy/proxy-media.ts | |
| parent | リストのエクスポートをできるように (diff) | |
| parent | Update README.md [AUTOGEN] (#4467) (diff) | |
| download | misskey-e3e08843f16a9f0f2ff04c21072a253c413097cd.tar.gz misskey-e3e08843f16a9f0f2ff04c21072a253c413097cd.tar.bz2 misskey-e3e08843f16a9f0f2ff04c21072a253c413097cd.zip | |
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/server/proxy/proxy-media.ts')
| -rw-r--r-- | src/server/proxy/proxy-media.ts | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/proxy/proxy-media.ts b/src/server/proxy/proxy-media.ts index 842dbff29e..2eec2012f3 100644 --- a/src/server/proxy/proxy-media.ts +++ b/src/server/proxy/proxy-media.ts @@ -6,7 +6,7 @@ import * as request from 'request'; import fileType from 'file-type'; import { serverLogger } from '..'; import config from '../../config'; -import { IImage, ConvertToPng } from '../../services/drive/image-processor'; +import { IImage, ConvertToPng, ConvertToJpeg } from '../../services/drive/image-processor'; import checkSvg from '../../misc/check-svg'; export async function proxyMedia(ctx: Koa.BaseContext) { @@ -29,6 +29,8 @@ export async function proxyMedia(ctx: Koa.BaseContext) { if ('static' in ctx.query && ['image/png', 'image/gif'].includes(type)) { image = await ConvertToPng(path, 498, 280); + } else if ('preview' in ctx.query && ['image/jpeg', 'image/png', 'image/gif'].includes(type)) { + image = await ConvertToJpeg(path, 200, 200); } else { image = { data: fs.readFileSync(path), |