Merge pull request #1274 from dank074/patch/fix-requestGuildMembers-libraires

fix op 8 handler for some discord libraries

1 files changed, 8 insertions, 1 deletions

diff --git a/src/gateway/opcodes/RequestGuildMembers.ts b/src/gateway/opcodes/RequestGuildMembers.ts

index e1cae95a3..796d96a6d 100644
--- a/src/gateway/opcodes/RequestGuildMembers.ts
+++ b/src/gateway/opcodes/RequestGuildMembers.ts
@@ -38,9 +38,16 @@ export async function onRequestGuildMembers(this: WebSocket, { d }: Payload) {
 
 	check.call(this, RequestGuildMembersSchema, d);
 
-	const { query, presences, nonce } = d as RequestGuildMembersSchema;
+	const {
+		presences,
+		nonce,
+		query: requestQuery,
+	} = d as RequestGuildMembersSchema;
 	let { limit, user_ids, guild_id } = d as RequestGuildMembersSchema;
 
+	// some discord libraries send empty string as query when they meant to send undefined, which was leading to errors being thrown in this handler
+	const query = requestQuery != "" ? requestQuery : undefined;
+
 	guild_id = guild_id as string;
 	user_ids = user_ids as string[] | undefined;