Apply suggestions from code review

Co-authored-by: Antonio Román <kyradiscord@gmail.com>
discordjs · Apr 30, 2021 · 424a339 · 424a339
1 parent 5c252bb
commit 424a339
Showing 1 changed file with 2 additions and 12 deletions.
diff --git a/src/managers/GuildMemberManager.js b/src/managers/GuildMemberManager.js
@@ -269,12 +269,7 @@ class GuildMemberManager extends BaseManager {
 
     await this.client.api.guilds(this.guild.id).members(id).delete({ reason });
 
-    if (user instanceof GuildMember) return user;
-    const _user = this.client.users.cache.get(id);
-    if (_user) {
-      return this.resolve(_user) ?? _user;
-    }
-    return id;
+    return this.resolve(user) ?? this.client.users.resolve(user) ?? id;
   }
 
   /**
@@ -300,12 +295,7 @@ class GuildMemberManager extends BaseManager {
 
     await this.client.api.guilds(this.guild.id).bans[id].put({ data: options });
 
-    if (user instanceof GuildMember) return user;
-    const _user = this.client.users.resolve(id);
-    if (_user) {
-      return this.resolve(_user) ?? _user;
-    }
-    return id;
+    return this.resolve(user) ?? this.client.users.resolve(user) ?? id;
   }
 
   /**