sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into swn

Browse Source
This commit is contained in:
tamaina
2021-09-04 14:36:49 +09:00
parent 753696b4f5 e1a8b158e0
commit 33c43ad498
7 changed files with 106 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/file/send-drive-file.ts
View File

@@ -83,10 +83,10 @@ export default async function(ctx: Koa.Context) {
ctx.set('Content-Type', image.type);
ctx.set('Cache-Control', 'max-age=31536000, immutable');
} catch (e) {
serverLogger.error(e);
serverLogger.error(e.statusCode);
if (typeof e == 'number' && e >= 400 && e < 500) {
ctx.status = e;
if (typeof e.statusCode === 'number' && e.statusCode >= 400 && e.statusCode < 500) {
ctx.status = e.statusCode;
ctx.set('Cache-Control', 'max-age=86400');
} else {
ctx.status = 500;

4
src/server/proxy/proxy-media.ts
View File

@@ -39,8 +39,8 @@ export async function proxyMedia(ctx: Koa.Context) {
} catch (e) {
serverLogger.error(e);
if (typeof e == 'number' && e >= 400 && e < 500) {
ctx.status = e;
if (typeof e.statusCode === 'number' && e.statusCode >= 400 && e.statusCode < 500) {
ctx.status = e.statusCode;
} else {
ctx.status = 500;
}