diff options
| author | rinsuki <428rinsuki+git@gmail.com> | 2018-05-17 07:52:24 +0900 |
|---|---|---|
| committer | rinsuki <428rinsuki+git@gmail.com> | 2018-05-17 07:52:24 +0900 |
| commit | 829b4012e6dc14eb64a3d8f60826fe9b6a41b40d (patch) | |
| tree | 42ac37f323db349dca9316e6fdb39fc33b860686 /src/server/file/index.ts | |
| parent | add yarn.lock to gitignore (diff) | |
| parent | Update deliver.ts (diff) | |
| download | misskey-829b4012e6dc14eb64a3d8f60826fe9b6a41b40d.tar.gz misskey-829b4012e6dc14eb64a3d8f60826fe9b6a41b40d.tar.bz2 misskey-829b4012e6dc14eb64a3d8f60826fe9b6a41b40d.zip | |
Merge branch 'master' into fix/yarn-lock-ignore
Diffstat (limited to 'src/server/file/index.ts')
| -rw-r--r-- | src/server/file/index.ts | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/server/file/index.ts b/src/server/file/index.ts index 29056c63e7..973528da33 100644 --- a/src/server/file/index.ts +++ b/src/server/file/index.ts @@ -6,7 +6,6 @@ import * as fs from 'fs'; import * as Koa from 'koa'; import * as cors from '@koa/cors'; import * as Router from 'koa-router'; -import pour from './pour'; import sendDriveFile from './send-drive-file'; // Init app @@ -24,12 +23,14 @@ const router = new Router(); router.get('/default-avatar.jpg', ctx => { const file = fs.createReadStream(`${__dirname}/assets/avatar.jpg`); - pour(file, 'image/jpeg', ctx); + ctx.set('Content-Type', 'image/jpeg'); + ctx.body = file; }); router.get('/app-default.jpg', ctx => { const file = fs.createReadStream(`${__dirname}/assets/dummy.png`); - pour(file, 'image/png', ctx); + ctx.set('Content-Type', 'image/jpeg'); + ctx.body = file; }); router.get('/:id', sendDriveFile); |