From cde18dc37e6fee92f7ac49d43592a3f2a30d9106 Mon Sep 17 00:00:00 2001
From: March 7th <71698422+aiko-chan-ai@users.noreply.github.com>
Date: Mon, 1 Aug 2022 12:37:46 +0700
Subject: [PATCH] fix(MessageMentions): `ignoreRepliedUser` option in has()
 (v13)

#8365 v13.9.2
---
 src/structures/MessageMentions.js | 40 +++++++++++++++++++++++++++----
 typings/index.d.ts                |  3 ++-
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/src/structures/MessageMentions.js b/src/structures/MessageMentions.js
index 9d0baeb..a2438e5 100644
--- a/src/structures/MessageMentions.js
+++ b/src/structures/MessageMentions.js
@@ -93,6 +93,13 @@ class MessageMentions {
      */
     this._channels = null;
 
+    /**
+     * Cached users for {@link MessageMentions#parsedUsers}
+     * @type {?Collection<Snowflake, User>}
+     * @private
+     */
+    this._parsedUsers = null;
+
     /**
      * Crossposted channel data.
      * @typedef {Object} CrosspostedChannel
@@ -168,6 +175,23 @@ class MessageMentions {
     return this._channels;
   }
 
+  /**
+   * Any user mentions that were included in the message content
+   * <info>Order as they appear first in the message content</info>
+   * @type {Collection<Snowflake, User>}
+   * @readonly
+   */
+  get parsedUsers() {
+    if (this._parsedUsers) return this._parsedUsers;
+    this._parsedUsers = new Collection();
+    let matches;
+    while ((matches = this.constructor.USERS_PATTERN.exec(this._content)) !== null) {
+      const user = this.client.users.cache.get(matches[1]);
+      if (user) this._parsedUsers.set(user.id, user);
+    }
+    return this._parsedUsers;
+  }
+
   /**
    * Options used to check for a mention.
    * @typedef {Object} MessageMentionsHasOptions
@@ -187,14 +211,20 @@ class MessageMentions {
    */
   has(data, { ignoreDirect = false, ignoreRoles = false, ignoreRepliedUser = false, ignoreEveryone = false } = {}) {
     const user = this.client.users.resolve(data);
-    const role = this.guild?.roles.resolve(data);
-    const channel = this.client.channels.resolve(data);
+    if (!ignoreEveryone && user && this.everyone) return true;
 
+    const userWasRepliedTo = user && this.repliedUser?.id === user.id;
+
+    if (!ignoreRepliedUser && userWasRepliedTo && this.users.has(user.id)) return true;
     if (!ignoreRepliedUser && this.users.has(this.repliedUser?.id) && this.repliedUser?.id === user?.id) return true;
     if (!ignoreDirect) {
-      if (this.users.has(user?.id)) return true;
-      if (this.roles.has(role?.id)) return true;
-      if (this.channels.has(channel?.id)) return true;
+      if (user && (!ignoreRepliedUser || this.parsedUsers.has(user.id)) && this.users.has(user.id)) return true;
+
+      const role = this.guild?.roles.resolve(data);
+      if (role && this.roles.has(role.id)) return true;
+
+      const channel = this.client.channels.resolve(data);
+      if (channel && this.channels.has(channel.id)) return true;
     }
     if (user && !ignoreEveryone && this.everyone) return true;
     if (!ignoreRoles) {
diff --git a/typings/index.d.ts b/typings/index.d.ts
index d0f026a..3202796 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -2103,13 +2103,14 @@ export class MessageMentions {
   private _channels: Collection<Snowflake, AnyChannel> | null;
   private readonly _content: string;
   private _members: Collection<Snowflake, GuildMember> | null;
-
+  private _parsedUsers: Collection<Snowflake, User> | null;
   public readonly channels: Collection<Snowflake, AnyChannel>;
   public readonly client: Client;
   public everyone: boolean;
   public readonly guild: Guild;
   public has(data: UserResolvable | RoleResolvable | ChannelResolvable, options?: MessageMentionsHasOptions): boolean;
   public readonly members: Collection<Snowflake, GuildMember> | null;
+  public readonly parsedUsers: Collection<Snowflake, User>;
   public repliedUser: User | null;
   public roles: Collection<Snowflake, Role>;
   public users: Collection<Snowflake, User>;