From fbfc99f167ed916e861b022766f66a601cff3654 Mon Sep 17 00:00:00 2001 From: Nihaal Sangha Date: Fri, 15 Dec 2023 21:54:28 +0000 Subject: [PATCH 1/3] fix(Discord Node): Remove requirement on parameters --- .../nodes/Discord/v2/actions/common.description.ts | 2 +- .../nodes/Discord/v2/actions/message/send.operation.ts | 1 - packages/nodes-base/nodes/Discord/v2/helpers/utils.ts | 7 ------- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/packages/nodes-base/nodes/Discord/v2/actions/common.description.ts b/packages/nodes-base/nodes/Discord/v2/actions/common.description.ts index fd5ae047ee3b3..857360a03480d 100644 --- a/packages/nodes-base/nodes/Discord/v2/actions/common.description.ts +++ b/packages/nodes-base/nodes/Discord/v2/actions/common.description.ts @@ -297,7 +297,7 @@ export const simplifyBoolean: INodeProperties = { // embeds ----------------------------------------------------------------------------------------- const embedFields: INodeProperties[] = [ { - displayName: 'Description (Required)', + displayName: 'Description', name: 'description', type: 'string', default: '', diff --git a/packages/nodes-base/nodes/Discord/v2/actions/message/send.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/message/send.operation.ts index e3d9362747872..eb207c53b1ff3 100644 --- a/packages/nodes-base/nodes/Discord/v2/actions/message/send.operation.ts +++ b/packages/nodes-base/nodes/Discord/v2/actions/message/send.operation.ts @@ -63,7 +63,6 @@ const properties: INodeProperties[] = [ name: 'content', type: 'string', default: '', - required: true, description: 'The content of the message (up to 2000 characters)', placeholder: 'e.g. My message', typeOptions: { diff --git a/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts b/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts index 84aefe132db37..33cdf855a9d58 100644 --- a/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts +++ b/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts @@ -133,13 +133,6 @@ export function prepareEmbeds(this: IExecuteFunctions, embeds: IDataObject[], i } } - if (!embedReturnData.description) { - throw new NodeOperationError( - this.getNode(), - `Description is required, embed ${index} in item ${i} is missing it`, - ); - } - if (embedReturnData.author) { embedReturnData.author = { name: embedReturnData.author, From 3b59f21a671b4d1128c39b5c1c680a2d74946a1a Mon Sep 17 00:00:00 2001 From: Michael Kret Date: Wed, 3 Jan 2024 10:03:55 +0200 Subject: [PATCH 2/3] :zap: description to empty message error --- packages/nodes-base/nodes/Discord/v2/helpers/utils.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts b/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts index 9b1ba3449d00b..b4d76894cc68a 100644 --- a/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts +++ b/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts @@ -71,6 +71,11 @@ export function parseDiscordError(this: IExecuteFunctions, error: any, itemIndex return new NodeOperationError(this.getNode(), errorData.errors, errorOptions); } + + if (errorOptions.message === 'Cannot send an empty message') { + errorOptions.description = + 'Something has to be send to the chanel whether it is a message, an embed or a file'; + } } return new NodeOperationError(this.getNode(), errorData || error, errorOptions); } From c84f8d5bde3cad87d2a1f35f031480e80fdeaf30 Mon Sep 17 00:00:00 2001 From: Jonathan Bennetts Date: Wed, 3 Jan 2024 09:04:45 +0000 Subject: [PATCH 3/3] Fix typo --- packages/nodes-base/nodes/Discord/v2/helpers/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts b/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts index b4d76894cc68a..8951320a3f757 100644 --- a/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts +++ b/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts @@ -74,7 +74,7 @@ export function parseDiscordError(this: IExecuteFunctions, error: any, itemIndex if (errorOptions.message === 'Cannot send an empty message') { errorOptions.description = - 'Something has to be send to the chanel whether it is a message, an embed or a file'; + 'Something has to be send to the channel whether it is a message, an embed or a file'; } } return new NodeOperationError(this.getNode(), errorData || error, errorOptions);