fix: typing mismatch for empty strings being treated as undefined

Author: WhatCats

packages/discord.js/src/managers/EntitlementManager.js

@@ -78,8 +78,7 @@ class EntitlementManager extends CachedManager {
 
     const { entitlement, cache, force } = options;
     const resolvedEntitlement = this.resolveId(entitlement ?? options);
-
-    if (resolvedEntitlement) {
+    if (resolvedEntitlement !== null) {
       return this._fetchSingle({ entitlement: resolvedEntitlement, cache, force });
     }
 

packages/discord.js/src/managers/GuildBanManager.js

@@ -108,7 +108,9 @@ class GuildBanManager extends CachedManager {
 
     const { user, cache, force, limit, before, after } = options;
     const resolvedUser = this.client.users.resolveId(user ?? options);
-    if (resolvedUser) return this._fetchSingle({ user: resolvedUser, cache, force });
+    if (resolvedUser !== null) {
+      return this._fetchSingle({ user: resolvedUser, cache, force });
+    }
 
     if (!before && !after && !limit && cache === undefined) {
       throw new DiscordjsError(ErrorCodes.FetchBanResolveId);

packages/discord.js/src/managers/GuildMemberManager.js

@@ -223,7 +223,10 @@ class GuildMemberManager extends CachedManager {
 
     const { user: users, limit, withPresences, cache, force } = options;
     const resolvedUser = this.client.users.resolveId(users ?? options);
-    if (resolvedUser && !limit && !withPresences) return this._fetchSingle({ user: resolvedUser, cache, force });
+    if (resolvedUser !== null && !limit && !withPresences) {
+      return this._fetchSingle({ user: resolvedUser, cache, force });
+    }
+
     const resolvedUsers = users?.map?.(user => this.client.users.resolveId(user)) ?? resolvedUser ?? undefined;
     return this._fetchMany({ ...options, users: resolvedUsers });
   }

packages/discord.js/src/managers/GuildSoundboardSoundManager.js

@@ -205,7 +205,10 @@ class GuildSoundboardSoundManager extends CachedManager {
 
     const { cache, force, soundboardSound } = options;
     const resolvedSoundboardSound = this.resolveId(soundboardSound ?? options);
-    if (resolvedSoundboardSound) return this._fetchSingle({ cache, force, soundboardSound: resolvedSoundboardSound });
+    if (resolvedSoundboardSound !== null) {
+      return this._fetchSingle({ cache, force, soundboardSound: resolvedSoundboardSound });
+    }
+
     return this._fetchMany({ cache });
   }
 

packages/discord.js/src/managers/MessageManager.js

@@ -104,7 +104,10 @@ class MessageManager extends CachedManager {
 
     const { message, cache, force } = options;
     const resolvedMessage = this.resolveId(message ?? options);
-    if (resolvedMessage) return this._fetchSingle({ message: resolvedMessage, cache, force });
+    if (resolvedMessage !== null) {
+      return this._fetchSingle({ message: resolvedMessage, cache, force });
+    }
+
     return this._fetchMany(options);
   }
 

packages/discord.js/src/managers/ThreadMemberManager.js

@@ -171,7 +171,10 @@ class ThreadMemberManager extends CachedManager {
 
     const { member, withMember, cache, force } = options;
     const resolvedMember = this.resolveId(member ?? options);
-    if (resolvedMember) return this._fetchSingle({ member: resolvedMember, withMember, cache, force });
+    if (resolvedMember !== null) {
+      return this._fetchSingle({ member: resolvedMember, withMember, cache, force });
+    }
+
     return this._fetchMany(options);
   }