From 65bbed8a0f294d869076f5ad7af6cadf0b2f20a4 Mon Sep 17 00:00:00 2001 From: Jaw0r3k Date: Sat, 12 Aug 2023 14:04:23 +0200 Subject: [PATCH] fix(Action): Do not set undefined values (#9755) Co-authored-by: Jiralite <33201955+Jiralite@users.noreply.github.com> --- src/client/actions/Action.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/client/actions/Action.js b/src/client/actions/Action.js index f3968344f..40b33b98c 100644 --- a/src/client/actions/Action.js +++ b/src/client/actions/Action.js @@ -32,19 +32,15 @@ class GenericAction { } getChannel(data) { + const payloadData = { recipients: data.recipients ?? [data.author ?? data.user ?? { id: data.user_id }] }; const id = data.channel_id ?? data.id; + if (id !== undefined) payloadData.id = id; + if ('guild_id' in data) payloadData.guild_id = data.guild_id; + if ('last_message_id' in data) payloadData.last_message_id = data.last_message_id; + return ( data[this.client.actions.injectedChannel] ?? - this.getPayload( - { - id, - guild_id: data.guild_id, - recipients: [data.author ?? data.user ?? { id: data.user_id }], - }, - this.client.channels, - id, - PartialTypes.CHANNEL, - ) + this.getPayload(payloadData, this.client.channels, id, PartialTypes.CHANNEL) ); }