oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

Content-Disposition in ObjectStrage (#4524)

Browse source 
* Content-Disposition in ObjectStrage

* encode filename
This commit is contained in:
MeiMei 2019-03-18 15:23:45 +09:00 • committed by syuilo
parent bd720491a9
commit c2eec272e6
4 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/server/file/send-drive-file.ts
View file

@ -6,6 +6,7 @@ import DriveFile, { getDriveFileBucket } from '../../models/drive-file';
import DriveFileThumbnail, { getDriveFileThumbnailBucket } from '../../models/drive-file-thumbnail';
import DriveFileWebpublic, { getDriveFileWebpublicBucket } from '../../models/drive-file-webpublic';
import { serverLogger } from '..';
import { contentDisposition } from '../../misc/content-disposition';
const assets = `${__dirname}/../../server/file/assets/`;
@ -63,12 +64,12 @@ export default async function(ctx: Koa.BaseContext) {
if (thumb != null) {
ctx.set('Content-Type', 'image/jpeg');
ctx.set('Content-Disposition', `filename="${rename(file.filename, { suffix: '-thumb', extname: '.jpeg' })}"`);
ctx.set('Content-Disposition', contentDisposition('inline', `${rename(file.filename, { suffix: '-thumb', extname: '.jpeg' })}"`));
const bucket = await getDriveFileThumbnailBucket();
ctx.body = bucket.openDownloadStream(thumb._id);
} else {
if (file.contentType.startsWith('image/')) {
ctx.set('Content-Disposition', `filename="${file.filename}"`);
ctx.set('Content-Disposition', contentDisposition('inline', `${file.filename}"`));
await sendRaw();
} else {
ctx.status = 404;
@ -82,17 +83,17 @@ export default async function(ctx: Koa.BaseContext) {
if (web != null) {
ctx.set('Content-Type', file.contentType);
ctx.set('Content-Disposition', `filename="${rename(file.filename, { suffix: '-web' })}"`);
ctx.set('Content-Disposition', contentDisposition('inline', `${rename(file.filename, { suffix: '-web' })}"`));
const bucket = await getDriveFileWebpublicBucket();
ctx.body = bucket.openDownloadStream(web._id);
} else {
ctx.set('Content-Disposition', `filename="${file.filename}"`);
ctx.set('Content-Disposition', contentDisposition('inline', `${file.filename}"`));
await sendRaw();
}
} else {
if ('download' in ctx.query) {
ctx.set('Content-Disposition', `attachment; filename="${file.filename}`);
ctx.set('Content-Disposition', contentDisposition('attachment', `${file.filename}`));
}
await sendRaw();