diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-05-04 17:59:51 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-05-04 17:59:51 +0900 |
| commit | ed9e7520f19daf872907f32784c98324915714a4 (patch) | |
| tree | da5c3878cb1a569fdb4e803ca2a060d78341e9ce /src/server | |
| parent | 2.1.2 (diff) | |
| download | misskey-ed9e7520f19daf872907f32784c98324915714a4.tar.gz misskey-ed9e7520f19daf872907f32784c98324915714a4.tar.bz2 misskey-ed9e7520f19daf872907f32784c98324915714a4.zip | |
Fix bug
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/file/send-drive-file.ts | 8 | ||||
| -rw-r--r-- | src/server/web/index.ts | 14 |
2 files changed, 14 insertions, 8 deletions
diff --git a/src/server/file/send-drive-file.ts b/src/server/file/send-drive-file.ts index 123f5440e2..dd682fe4d7 100644 --- a/src/server/file/send-drive-file.ts +++ b/src/server/file/send-drive-file.ts @@ -6,6 +6,8 @@ import * as mongodb from 'mongodb'; import DriveFile, { getDriveFileBucket } from '../../models/drive-file'; import DriveFileThumbnail, { getDriveFileThumbnailBucket } from '../../models/drive-file-thumbnail'; +const assets = `${__dirname}/../../server/file/assets/`; + const commonReadableHandlerGenerator = (ctx: Koa.Context) => (e: Error): void => { console.error(e); ctx.status = 500; @@ -25,16 +27,16 @@ export default async function(ctx: Koa.Context) { if (file == null) { ctx.status = 404; - await send(ctx, `${__dirname}/assets/dummy.png`); + await send(ctx, `${__dirname}/assets/dummy.png`, { root: assets }); return; } if (file.metadata.deletedAt) { ctx.status = 410; if (file.metadata.isExpired) { - await send(ctx, `${__dirname}/assets/cache-expired.png`); + await send(ctx, `${__dirname}/assets/cache-expired.png`, { root: assets }); } else { - await send(ctx, `${__dirname}/assets/tombstone.png`); + await send(ctx, `${__dirname}/assets/tombstone.png`, { root: assets }); } return; } diff --git a/src/server/web/index.ts b/src/server/web/index.ts index db8d089d64..13751835be 100644 --- a/src/server/web/index.ts +++ b/src/server/web/index.ts @@ -42,17 +42,21 @@ router.get('/assets/*', async ctx => { // Apple touch icon router.get('/apple-touch-icon.png', async ctx => { - await send(ctx, `${client}/assets/apple-touch-icon.png`); + await send(ctx, '/assets/apple-touch-icon.png', { + root: client + }); }); // ServiceWroker -router.get(/^\/sw\.(.+?)\.js$/, async ctx => { - await send(ctx, `${client}/assets/sw.${ctx.params[0]}.js`); -}); +//router.get(/^\/sw\.(.+?)\.js$/, async ctx => { +// await send(ctx, `${client}/assets/sw.${ctx.params[0]}.js`); +//}); // Manifest router.get('/manifest.json', async ctx => { - await send(ctx, `${client}/assets/manifest.json`); + await send(ctx, '/assets/manifest.json', { + root: client + }); }); //#endregion |