From a63ac88fcca5b61209892a6e560e35d58f5adc3b Mon Sep 17 00:00:00 2001
From: Vlad Frangu <kingdgrizzle@gmail.com>
Date: Thu, 9 Mar 2023 13:05:52 +0200
Subject: [PATCH] fix(Actions): inject built data by using a symbol (#9203)

This fixes the hard crash encountered from message component interactions
where a `channel` property was added to them, causing hard crashes

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
---
 packages/discord.js/src/client/actions/Action.js         | 6 +++---
 packages/discord.js/src/client/actions/ActionsManager.js | 7 +++++++
 packages/discord.js/src/structures/Message.js            | 6 +++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/discord.js/src/client/actions/Action.js b/packages/discord.js/src/client/actions/Action.js
index 7f055301266e..540a3fe85bac 100644
--- a/packages/discord.js/src/client/actions/Action.js
+++ b/packages/discord.js/src/client/actions/Action.js
@@ -34,7 +34,7 @@ class GenericAction {
   getChannel(data) {
     const id = data.channel_id ?? data.id;
     return (
-      data.channel ??
+      data[this.client.actions.injectedChannel] ??
       this.getPayload(
         {
           id,
@@ -51,7 +51,7 @@ class GenericAction {
   getMessage(data, channel, cache) {
     const id = data.message_id ?? data.id;
     return (
-      data.message ??
+      data[this.client.actions.injectedMessage] ??
       this.getPayload(
         {
           id,
@@ -86,7 +86,7 @@ class GenericAction {
 
   getUser(data) {
     const id = data.user_id;
-    return data.user ?? this.getPayload({ id }, this.client.users, id, Partials.User);
+    return data[this.client.actions.injectedUser] ?? this.getPayload({ id }, this.client.users, id, Partials.User);
   }
 
   getUserFromMember(data) {
diff --git a/packages/discord.js/src/client/actions/ActionsManager.js b/packages/discord.js/src/client/actions/ActionsManager.js
index 3c8e2d549fec..ff3dc86bb891 100644
--- a/packages/discord.js/src/client/actions/ActionsManager.js
+++ b/packages/discord.js/src/client/actions/ActionsManager.js
@@ -1,6 +1,13 @@
 'use strict';
 
 class ActionsManager {
+  // These symbols represent fully built data that we inject at times when calling actions manually. Action#getUser,
+  // for example, will return the injected data (which is assumed to be a built structure) instead of trying to make it
+  // from provided data
+  injectedUser = Symbol('djs.actions.injectedUser');
+  injectedChannel = Symbol('djs.actions.injectedChannel');
+  injectedMessage = Symbol('djs.actions.injectedMessage');
+
   constructor(client) {
     this.client = client;
 
diff --git a/packages/discord.js/src/structures/Message.js b/packages/discord.js/src/structures/Message.js
index 8d5e4fc0f7e3..407ede4f3fd8 100644
--- a/packages/discord.js/src/structures/Message.js
+++ b/packages/discord.js/src/structures/Message.js
@@ -787,9 +787,9 @@ class Message extends Base {
 
     return this.client.actions.MessageReactionAdd.handle(
       {
-        user: this.client.user,
-        channel: this.channel,
-        message: this,
+        [this.client.actions.injectedUser]: this.client.user,
+        [this.client.actions.injectedChannel]: this.channel,
+        [this.client.actions.injectedMessage]: this,
         emoji: resolvePartialEmoji(emoji),
       },
       true,