fix(APIGuildMember): make user required and omit in messages (#998)

discordjs · Jun 6, 2024 · 98544fa · 98544fa
1 parent 3ce9610
commit 98544fa
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 8 deletions.
diff --git a/deno/gateway/v10.ts b/deno/gateway/v10.ts
@@ -1407,7 +1407,7 @@ export interface GatewayMessageEventExtraFields {
 	 *
 	 * See https://discord.com/developers/docs/resources/guild#guild-member-object
 	 */
-	member?: APIGuildMember;
+	member?: Omit<APIGuildMember, 'user'>;
 	/**
 	 * Users specifically mentioned in the message
 	 *

diff --git a/deno/gateway/v9.ts b/deno/gateway/v9.ts
@@ -1406,7 +1406,7 @@ export interface GatewayMessageEventExtraFields {
 	 *
 	 * See https://discord.com/developers/docs/resources/guild#guild-member-object
 	 */
-	member?: APIGuildMember;
+	member?: Omit<APIGuildMember, 'user'>;
 	/**
 	 * Users specifically mentioned in the message
 	 *

diff --git a/deno/payloads/v10/guild.ts b/deno/payloads/v10/guild.ts
@@ -621,7 +621,7 @@ export interface APIGuildMember {
 	 *
 	 * See https://discord.com/developers/docs/resources/user#user-object
 	 */
-	user?: APIUser;
+	user: APIUser;
 	/**
 	 * This users guild nickname
 	 */

diff --git a/deno/payloads/v9/guild.ts b/deno/payloads/v9/guild.ts
@@ -613,7 +613,7 @@ export interface APIGuildMember {
 	 *
 	 * See https://discord.com/developers/docs/resources/user#user-object
 	 */
-	user?: APIUser;
+	user: APIUser;
 	/**
 	 * This users guild nickname
 	 */

diff --git a/gateway/v10.ts b/gateway/v10.ts
@@ -1407,7 +1407,7 @@ export interface GatewayMessageEventExtraFields {
 	 *
 	 * See https://discord.com/developers/docs/resources/guild#guild-member-object
 	 */
-	member?: APIGuildMember;
+	member?: Omit<APIGuildMember, 'user'>;
 	/**
 	 * Users specifically mentioned in the message
 	 *

diff --git a/gateway/v9.ts b/gateway/v9.ts
@@ -1406,7 +1406,7 @@ export interface GatewayMessageEventExtraFields {
 	 *
 	 * See https://discord.com/developers/docs/resources/guild#guild-member-object
 	 */
-	member?: APIGuildMember;
+	member?: Omit<APIGuildMember, 'user'>;
 	/**
 	 * Users specifically mentioned in the message
 	 *

diff --git a/payloads/v10/guild.ts b/payloads/v10/guild.ts
@@ -621,7 +621,7 @@ export interface APIGuildMember {
 	 *
 	 * See https://discord.com/developers/docs/resources/user#user-object
 	 */
-	user?: APIUser;
+	user: APIUser;
 	/**
 	 * This users guild nickname
 	 */

diff --git a/payloads/v9/guild.ts b/payloads/v9/guild.ts
@@ -613,7 +613,7 @@ export interface APIGuildMember {
 	 *
 	 * See https://discord.com/developers/docs/resources/user#user-object
 	 */
-	user?: APIUser;
+	user: APIUser;
 	/**
 	 * This users guild nickname
 	 */

diff --git a/tests/v10/messageCreate.test-d.ts b/tests/v10/messageCreate.test-d.ts
@@ -0,0 +1,6 @@
+import { expectError } from 'tsd';
+import { GatewayMessageCreateDispatch } from '../../v10';
+
+declare const messageCreateDispatch: GatewayMessageCreateDispatch;
+
+expectError(messageCreateDispatch.d.member?.user);