From 0ea386effe98ce5f2836c172c9f75c2d8b79255e Mon Sep 17 00:00:00 2001 From: MomentQYC Date: Mon, 14 Aug 2023 16:40:01 +0800 Subject: [PATCH] revert --- packages/backend/src/core/NoteCreateService.ts | 3 --- .../core/activitypub/models/ApNoteService.ts | 18 +++--------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts index 93ccf35a06..001947322d 100644 --- a/packages/backend/src/core/NoteCreateService.ts +++ b/packages/backend/src/core/NoteCreateService.ts @@ -436,9 +436,6 @@ export class NoteCreateService implements OnApplicationShutdown { if (isDuplicateKeyValueError(e)) { const err = new Error('Duplicated note'); err.name = 'duplicated'; - if (process.env.NODE_ENV === 'production') { - Object.defineProperty(err, 'stack', { value: '' }); - } throw err; } diff --git a/packages/backend/src/core/activitypub/models/ApNoteService.ts b/packages/backend/src/core/activitypub/models/ApNoteService.ts index fd6814f936..41d1bc48a7 100644 --- a/packages/backend/src/core/activitypub/models/ApNoteService.ts +++ b/packages/backend/src/core/activitypub/models/ApNoteService.ts @@ -80,28 +80,16 @@ export class ApNoteService { const expectHost = this.utilityService.extractDbHost(uri); if (!validPost.includes(getApType(object))) { - const error = new Error(`invalid Note: invalid object type ${getApType(object)}`); - if (process.env.NODE_ENV === 'production') { - Object.defineProperty(error, 'stack', { value: '' }); - } - return error; + return new Error(`invalid Note: invalid object type ${getApType(object)}`); } if (object.id && this.utilityService.extractDbHost(object.id) !== expectHost) { - const error = new Error(`invalid Note: id has different host. expected: ${expectHost}, actual: ${this.utilityService.extractDbHost(object.id)}`); - if (process.env.NODE_ENV === 'production') { - Object.defineProperty(error, 'stack', { value: '' }); - } - return error; + return new Error(`invalid Note: id has different host. expected: ${expectHost}, actual: ${this.utilityService.extractDbHost(object.id)}`); } const actualHost = object.attributedTo && this.utilityService.extractDbHost(getOneApId(object.attributedTo)); if (object.attributedTo && actualHost !== expectHost) { - const error = new Error(`invalid Note: attributedTo has different host. expected: ${expectHost}, actual: ${actualHost}`); - if (process.env.NODE_ENV === 'production') { - Object.defineProperty(error, 'stack', { value: '' }); - } - return error; + return new Error(`invalid Note: attributedTo has different host. expected: ${expectHost}, actual: ${actualHost}`); } return null;