From 179af387d06fd38c40d7a51b73bb73b41b298c2a Mon Sep 17 00:00:00 2001
From: Renegade334 <Renegade334@users.noreply.github.com>
Date: Fri, 1 Dec 2023 00:35:59 +0000
Subject: [PATCH] refactor(ThreadMemberManager): #remove accepts UserResolvable
 (#10000)

Co-authored-by: Jiralite <33201955+Jiralite@users.noreply.github.com>
---
 packages/discord.js/src/managers/ThreadMemberManager.js | 6 ++++--
 packages/discord.js/typings/index.d.ts                  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/discord.js/src/managers/ThreadMemberManager.js b/packages/discord.js/src/managers/ThreadMemberManager.js
index c138aa328..e4ae5bf7d 100644
--- a/packages/discord.js/src/managers/ThreadMemberManager.js
+++ b/packages/discord.js/src/managers/ThreadMemberManager.js
@@ -103,11 +103,13 @@ class ThreadMemberManager extends CachedManager {
 
   /**
    * Remove a user from the thread.
-   * @param {Snowflake|'@me'} id The id of the member to remove
+   * @param {UserResolvable|'@me'} member The member to remove
    * @param {string} [reason] The reason for removing this member from the thread
    * @returns {Promise<Snowflake>}
    */
-  async remove(id, reason) {
+  async remove(member, reason) {
+    const id = member === '@me' ? member : this.client.users.resolveId(member);
+    if (!id) throw new DiscordjsTypeError(ErrorCodes.InvalidType, 'member', 'UserResolvable');
     await this.client.rest.delete(Routes.threadMembers(this.thread.id, id), { reason });
     return id;
   }
diff --git a/packages/discord.js/typings/index.d.ts b/packages/discord.js/typings/index.d.ts
index 75151b6d9..5592d6c93 100644
--- a/packages/discord.js/typings/index.d.ts
+++ b/packages/discord.js/typings/index.d.ts
@@ -4321,7 +4321,7 @@ export class ThreadMemberManager extends CachedManager<Snowflake, ThreadMember,
 
   public fetch(options?: FetchThreadMembersWithoutGuildMemberDataOptions): Promise<Collection<Snowflake, ThreadMember>>;
   public fetchMe(options?: BaseFetchOptions): Promise<ThreadMember>;
-  public remove(id: Snowflake | '@me', reason?: string): Promise<Snowflake>;
+  public remove(member: UserResolvable | '@me', reason?: string): Promise<Snowflake>;
 }
 
 export class UserManager extends CachedManager<Snowflake, User, UserResolvable> {