From ad7e74c4cd3f704442acea38dd890018ab0d1f86 Mon Sep 17 00:00:00 2001
From: Fleny <Fleny113@outlook.com>
Date: Sun, 26 May 2024 21:36:48 +0200
Subject: [PATCH] feat(bot,types)!: Replace userId with User object in
 interactionMetadata (#3627)

* Replace userId with User object in interactionMetadata

* Fix type error

---------

Co-authored-by: Awesome Stickz <awesome@stickz.dev>
---
 packages/bot/src/transformers.ts         | 4 ++--
 packages/bot/src/transformers/message.ts | 6 +++---
 packages/types/src/discord.ts            | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/bot/src/transformers.ts b/packages/bot/src/transformers.ts
index e3439ba04..db6a13c16 100644
--- a/packages/bot/src/transformers.ts
+++ b/packages/bot/src/transformers.ts
@@ -366,7 +366,7 @@ export interface Transformers {
       interactionMetadata: {
         id: boolean
         type: boolean
-        userId: boolean
+        user: boolean
         authorizingIntegrationOwners: boolean
         originalResponseMessageId: boolean
         interactedMessageId: boolean
@@ -984,7 +984,7 @@ export function createTransformers(options: Partial<Transformers>, opts?: Create
         interactionMetadata: {
           id: opts?.defaultDesiredPropertiesValue ?? false,
           type: opts?.defaultDesiredPropertiesValue ?? false,
-          userId: opts?.defaultDesiredPropertiesValue ?? false,
+          user: opts?.defaultDesiredPropertiesValue ?? false,
           authorizingIntegrationOwners: opts?.defaultDesiredPropertiesValue ?? false,
           originalResponseMessageId: opts?.defaultDesiredPropertiesValue ?? false,
           interactedMessageId: opts?.defaultDesiredPropertiesValue ?? false,
diff --git a/packages/bot/src/transformers/message.ts b/packages/bot/src/transformers/message.ts
index d0c09fc71..e209adc84 100644
--- a/packages/bot/src/transformers/message.ts
+++ b/packages/bot/src/transformers/message.ts
@@ -417,7 +417,7 @@ export function transformMessageInteractionMetadata(bot: Bot, payload: DiscordMe
   if (props.triggeringInteractionMetadata && payload.triggering_interaction_metadata)
     metadata.triggeringInteractionMetadata = transformMessageInteractionMetadata(bot, payload.triggering_interaction_metadata)
   if (props.type) metadata.type = payload.type
-  if (props.userId) metadata.userId = bot.transformers.snowflake(payload.user_id)
+  if (props.user && payload.user) metadata.user = bot.transformers.user(bot, payload.user)
 
   return bot.transformers.customizers.messageInteractionMetadata(bot, payload, metadata)
 }
@@ -437,8 +437,8 @@ export interface MessageInteractionMetadata {
   id: bigint
   /** The type of interaction */
   type: InteractionTypes
-  /** ID of the user who triggered the interaction */
-  userId: bigint
+  /** User who triggered the interaction */
+  user: User
   /** IDs for installation context(s) related to an interaction */
   authorizingIntegrationOwners: Partial<Record<DiscordApplicationIntegrationType, bigint>>
   /** ID of the original response message, present only on follow-up messages */
diff --git a/packages/types/src/discord.ts b/packages/types/src/discord.ts
index 8744a3897..da24bb00b 100644
--- a/packages/types/src/discord.ts
+++ b/packages/types/src/discord.ts
@@ -1612,8 +1612,8 @@ export interface DiscordMessageInteractionMetadata {
   id: string
   /** The type of interaction */
   type: InteractionTypes
-  /** ID of the user who triggered the interaction */
-  user_id: string
+  /** User who triggered the interaction */
+  user: DiscordUser
   /** IDs for installation context(s) related to an interaction */
   authorizing_integration_owners: Partial<Record<DiscordApplicationIntegrationType, string>>
   /** ID of the original response message, present only on follow-up messages */