summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-05-15 21:27:20 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-05-15 21:27:20 +0900
commit3d8bbedf1bbd501d3ad5e3c26e5e5005ed2d8371 (patch)
treefab0aef7b9bc928980e1788cf55867aacd14abb7 /src/server
parentResolve #4833 (diff)
downloadsharkey-3d8bbedf1bbd501d3ad5e3c26e5e5005ed2d8371.tar.gz
sharkey-3d8bbedf1bbd501d3ad5e3c26e5e5005ed2d8371.tar.bz2
sharkey-3d8bbedf1bbd501d3ad5e3c26e5e5005ed2d8371.zip
GIFのサムネイルが生成されないのを修正
#4728
Diffstat (limited to 'src/server')
-rw-r--r--src/server/proxy/proxy-media.ts6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/proxy/proxy-media.ts b/src/server/proxy/proxy-media.ts
index 357715bb92..e16665f6cd 100644
--- a/src/server/proxy/proxy-media.ts
+++ b/src/server/proxy/proxy-media.ts
@@ -1,7 +1,7 @@
import * as fs from 'fs';
import * as Koa from 'koa';
import { serverLogger } from '..';
-import { IImage, ConvertToPng, ConvertToJpeg } from '../../services/drive/image-processor';
+import { IImage, convertToPng, convertToJpeg } from '../../services/drive/image-processor';
import { createTemp } from '../../misc/create-temp';
import { downloadUrl } from '../../misc/donwload-url';
import { detectMine } from '../../misc/detect-mine';
@@ -20,9 +20,9 @@ export async function proxyMedia(ctx: Koa.BaseContext) {
let image: IImage;
if ('static' in ctx.query && ['image/png', 'image/gif'].includes(type)) {
- image = await ConvertToPng(path, 498, 280);
+ 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);
+ image = await convertToJpeg(path, 200, 200);
} else {
image = {
data: fs.readFileSync(path),