summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-02-02 13:22:09 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-02-02 13:22:09 +0900
commit30407000051b97644b1b7f388d562230f164674e (patch)
tree46cfb5a6985946d4bbb8b663a23f68cfabd3e710 /src/server
parentDowngrade webpack to avoid build error (diff)
downloadmisskey-30407000051b97644b1b7f388d562230f164674e.tar.gz
misskey-30407000051b97644b1b7f388d562230f164674e.tar.bz2
misskey-30407000051b97644b1b7f388d562230f164674e.zip
Generate video thumbnails (#4084)
* Generate video thumbnails * import order
Diffstat (limited to 'src/server')
-rw-r--r--src/server/file/send-drive-file.ts7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/server/file/send-drive-file.ts b/src/server/file/send-drive-file.ts
index 05d871a4c8..1cfdd1c4d5 100644
--- a/src/server/file/send-drive-file.ts
+++ b/src/server/file/send-drive-file.ts
@@ -64,7 +64,12 @@ export default async function(ctx: Koa.BaseContext) {
const bucket = await getDriveFileThumbnailBucket();
ctx.body = bucket.openDownloadStream(thumb._id);
} else {
- await sendRaw();
+ if (file.contentType.startsWith('image/')) {
+ await sendRaw();
+ } else {
+ ctx.status = 404;
+ await send(ctx as any, '/dummy.png', { root: assets });
+ }
}
} else if ('web' in ctx.query) {
const web = await DriveFileWebpublic.findOne({