From 92c1a511dc0d9b552b797ef25c7aed2eb36b4386 Mon Sep 17 00:00:00 2001
From: Jiralite <33201955+Jiralite@users.noreply.github.com>
Date: Thu, 16 May 2024 08:27:00 +0100
Subject: [PATCH] fix(Action): Ensure all properties on `getChannel()` are
 passed (#10278)

* fix(Action): ensure all properties on `getChannel()` are passed

* refactor: flip `recipient` check
---
 packages/discord.js/src/client/actions/Action.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/discord.js/src/client/actions/Action.js b/packages/discord.js/src/client/actions/Action.js
index 6c04a64330cc..96170ee87d7e 100644
--- a/packages/discord.js/src/client/actions/Action.js
+++ b/packages/discord.js/src/client/actions/Action.js
@@ -31,21 +31,17 @@ class GenericAction {
     const payloadData = {};
     const id = data.channel_id ?? data.id;
 
-    if ('recipients' in data) {
-      payloadData.recipients = data.recipients;
-    } else {
+    if (!('recipients' in data)) {
       // Try to resolve the recipient, but do not add the client user.
       const recipient = data.author ?? data.user ?? { id: data.user_id };
       if (recipient.id !== this.client.user.id) payloadData.recipients = [recipient];
     }
 
     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(payloadData, this.client.channels, id, Partials.Channel)
+      this.getPayload({ ...data, ...payloadData }, this.client.channels, id, Partials.Channel)
     );
   }