From 8fec699640d9bf7b4f748a6191e6adcba1b50ece Mon Sep 17 00:00:00 2001
From: Vaporox <jan.zichler@gmx.de>
Date: Sun, 20 Jun 2021 21:39:42 +0200
Subject: [PATCH 1/2] feat(MessageMentions): add repliedUser

---
 src/structures/Message.js         | 10 +++++++++-
 src/structures/MessageMentions.js |  8 +++++++-
 typings/index.d.ts                |  5 ++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/structures/Message.js b/src/structures/Message.js
index 2dc8dcc7657a..28e233357793 100644
--- a/src/structures/Message.js
+++ b/src/structures/Message.js
@@ -180,7 +180,14 @@ class Message extends Base {
      * All valid mentions that the message contains
      * @type {MessageMentions}
      */
-    this.mentions = new Mentions(this, data.mentions, data.mention_roles, data.mention_everyone, data.mention_channels);
+    this.mentions = new Mentions(
+      this,
+      data.mentions,
+      data.mention_roles,
+      data.mention_everyone,
+      data.mention_channels,
+      data.referenced_message?.author,
+    );
 
     /**
      * ID of the webhook that sent the message, if applicable
@@ -314,6 +321,7 @@ class Message extends Base {
       'mention_roles' in data ? data.mention_roles : this.mentions.roles,
       'mention_everyone' in data ? data.mention_everyone : this.mentions.everyone,
       'mention_channels' in data ? data.mention_channels : this.mentions.crosspostedChannels,
+      data.referenced_message?.author,
     );
 
     this.flags = new MessageFlags('flags' in data ? data.flags : 0).freeze();
diff --git a/src/structures/MessageMentions.js b/src/structures/MessageMentions.js
index d4d5fd52a85d..b510c6879cf5 100644
--- a/src/structures/MessageMentions.js
+++ b/src/structures/MessageMentions.js
@@ -8,7 +8,7 @@ const Util = require('../util/Util');
  * Keeps track of mentions in a {@link Message}.
  */
 class MessageMentions {
-  constructor(message, users, roles, everyone, crosspostedChannels) {
+  constructor(message, users, roles, everyone, crosspostedChannels, repliedUser) {
     /**
      * The client the message is from
      * @type {Client}
@@ -125,6 +125,12 @@ class MessageMentions {
     } else {
       this.crosspostedChannels = new Collection();
     }
+
+    /**
+     * The author of the message that this message is a reply to
+     * @type {?User}
+     */
+    this.repliedUser = repliedUser ? this.client.users.add(repliedUser) : this.repliedUser ?? null;
   }
 
   /**
diff --git a/typings/index.d.ts b/typings/index.d.ts
index 64505d1e9461..54e06c2c617f 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -140,6 +140,7 @@ declare module 'discord.js' {
     APIPartialEmoji as RawEmoji,
     APIRole as RawRole,
     Snowflake as APISnowflake,
+    APIUser,
     ApplicationCommandOptionType as ApplicationCommandOptionTypes,
     ApplicationCommandPermissionType as ApplicationCommandPermissionTypes,
   } from 'discord-api-types/v8';
@@ -1467,9 +1468,10 @@ declare module 'discord.js' {
   export class MessageMentions {
     constructor(
       message: Message,
-      users: unknown[] | Collection<Snowflake, User>,
+      users: APIUser[] | Collection<Snowflake, User>,
       roles: Snowflake[] | Collection<Snowflake, Role>,
       everyone: boolean,
+      repliedUser?: APIUser,
     );
     private _channels: Collection<Snowflake, Channel> | null;
     private readonly _content: string;
@@ -1481,6 +1483,7 @@ declare module 'discord.js' {
     public readonly guild: Guild;
     public has(data: UserResolvable | RoleResolvable | ChannelResolvable, options?: MessageMentionsHasOptions): boolean;
     public readonly members: Collection<Snowflake, GuildMember> | null;
+    public repliedUser: User | null;
     public roles: Collection<Snowflake, Role>;
     public users: Collection<Snowflake, User>;
     public crosspostedChannels: Collection<Snowflake, CrosspostedChannel>;

From 6537b54d0d2680305d5aa3245c8834d52d711176 Mon Sep 17 00:00:00 2001
From: Vaporox <jan.zichler@gmx.de>
Date: Wed, 23 Jun 2021 15:13:49 +0200
Subject: [PATCH 2/2] fix: pass data correctly

---
 src/structures/Message.js         | 2 +-
 src/structures/MessageMentions.js | 2 +-
 typings/index.d.ts                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/structures/Message.js b/src/structures/Message.js
index 28e233357793..63046e33f183 100644
--- a/src/structures/Message.js
+++ b/src/structures/Message.js
@@ -321,7 +321,7 @@ class Message extends Base {
       'mention_roles' in data ? data.mention_roles : this.mentions.roles,
       'mention_everyone' in data ? data.mention_everyone : this.mentions.everyone,
       'mention_channels' in data ? data.mention_channels : this.mentions.crosspostedChannels,
-      data.referenced_message?.author,
+      'referenced_message' in data ? data.referenced_message.author : this.mentions.repliedUser,
     );
 
     this.flags = new MessageFlags('flags' in data ? data.flags : 0).freeze();
diff --git a/src/structures/MessageMentions.js b/src/structures/MessageMentions.js
index b510c6879cf5..af16eabb42d9 100644
--- a/src/structures/MessageMentions.js
+++ b/src/structures/MessageMentions.js
@@ -130,7 +130,7 @@ class MessageMentions {
      * The author of the message that this message is a reply to
      * @type {?User}
      */
-    this.repliedUser = repliedUser ? this.client.users.add(repliedUser) : this.repliedUser ?? null;
+    this.repliedUser = repliedUser ? this.client.users.add(repliedUser) : null;
   }
 
   /**
diff --git a/typings/index.d.ts b/typings/index.d.ts
index 54e06c2c617f..fdba348dd473 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -1471,7 +1471,7 @@ declare module 'discord.js' {
       users: APIUser[] | Collection<Snowflake, User>,
       roles: Snowflake[] | Collection<Snowflake, Role>,
       everyone: boolean,
-      repliedUser?: APIUser,
+      repliedUser?: APIUser | User,
     );
     private _channels: Collection<Snowflake, Channel> | null;
     private readonly _content: string;