summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/error.ts
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-01-16 15:21:43 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-01-16 15:21:43 +0900
commitd56fc4186529bf41fe840cb3497f1a363ac84475 (patch)
treee4da77fc7544fb8d5619e9799ee9ce3494ccd80b /packages/backend/src/server/api/error.ts
parentmasterブランチをmaster_securityとマージ (#9260) (diff)
parent13.0.0 (diff)
downloadmisskey-d56fc4186529bf41fe840cb3497f1a363ac84475.tar.gz
misskey-d56fc4186529bf41fe840cb3497f1a363ac84475.tar.bz2
misskey-d56fc4186529bf41fe840cb3497f1a363ac84475.zip
Merge branch 'develop'
Diffstat (limited to 'packages/backend/src/server/api/error.ts')
-rw-r--r--packages/backend/src/server/api/error.ts16
1 files changed, 8 insertions, 8 deletions
diff --git a/packages/backend/src/server/api/error.ts b/packages/backend/src/server/api/error.ts
index 3f0861fdb1..347d5650ad 100644
--- a/packages/backend/src/server/api/error.ts
+++ b/packages/backend/src/server/api/error.ts
@@ -8,8 +8,8 @@ export class ApiError extends Error {
public httpStatusCode?: number;
public info?: any;
- constructor(e?: E | null | undefined, info?: any | null | undefined) {
- if (e == null) e = {
+ constructor(err?: E | null | undefined, info?: any | null | undefined) {
+ if (err == null) err = {
message: 'Internal error occurred. Please contact us if the error persists.',
code: 'INTERNAL_ERROR',
id: '5d37dbcb-891e-41ca-a3d6-e690c97775ac',
@@ -17,12 +17,12 @@ export class ApiError extends Error {
httpStatusCode: 500,
};
- super(e.message);
- this.message = e.message;
- this.code = e.code;
- this.id = e.id;
- this.kind = e.kind || 'client';
- this.httpStatusCode = e.httpStatusCode;
+ super(err.message);
+ this.message = err.message;
+ this.code = err.code;
+ this.id = err.id;
+ this.kind = err.kind ?? 'client';
+ this.httpStatusCode = err.httpStatusCode;
this.info = info;
}
}