From a06a87a7c49db29b108b77db82cf8e6f4346ef19 Mon Sep 17 00:00:00 2001
From: Shubham Parihar <shubhamparihar391@gmail.com>
Date: Mon, 27 Sep 2021 01:03:50 +0530
Subject: [PATCH] feat(UserManager): allow #fetch to take UserResolvable
 (#6677)

---
 src/managers/UserManager.js | 5 +++--
 typings/index.d.ts          | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/managers/UserManager.js b/src/managers/UserManager.js
index dfbba9e89..8aa1e4747 100644
--- a/src/managers/UserManager.js
+++ b/src/managers/UserManager.js
@@ -56,11 +56,12 @@ class UserManager extends CachedManager {
 
   /**
    * Obtains a user from Discord, or the user cache if it's already available.
-   * @param {Snowflake} id The user's id
+   * @param {UserResolvable} user The user to fetch
    * @param {BaseFetchOptions} [options] Additional options for this fetch
    * @returns {Promise<User>}
    */
-  async fetch(id, { cache = true, force = false } = {}) {
+  async fetch(user, { cache = true, force = false } = {}) {
+    const id = this.resolveId(user);
     if (!force) {
       const existing = this.cache.get(id);
       if (existing && !existing.partial) return existing;
diff --git a/typings/index.d.ts b/typings/index.d.ts
index 4bf80bbf3..00d98fcf1 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -2770,7 +2770,7 @@ export class ThreadMemberManager extends CachedManager<Snowflake, ThreadMember,
 
 export class UserManager extends CachedManager<Snowflake, User, UserResolvable> {
   public constructor(client: Client, iterable?: Iterable<RawUserData>);
-  public fetch(id: Snowflake, options?: BaseFetchOptions): Promise<User>;
+  public fetch(user: UserResolvable, options?: BaseFetchOptions): Promise<User>;
 }
 
 export class VoiceStateManager extends CachedManager<Snowflake, VoiceState, typeof VoiceState> {