types: no more gymnastics

Author: ducktrshessami

deno/gateway/v10.ts

@@ -46,7 +46,6 @@ import type {
 	APIGuildMemberUser,
 	GatewayGuildMembersChunkPresence,
 	APIBaseMessage,
-	APIVoiceStateMember,
 	APIVoiceState,
 } from '../payloads/v10/index';
 import type { ReactionType } from '../rest/v10/index';
@@ -880,7 +879,7 @@ export interface GatewayGuildCreateDispatchData extends APIGuild {
 	 *
 	 * @see {@link https://discord.com/developers/docs/resources/voice#voice-state-object}
 	 */
-	voice_states: (APIBaseVoiceState & APIVoiceStateMember)[];
+	voice_states: APIBaseVoiceState[];
 	/**
 	 * Users in the guild
 	 *

deno/gateway/v9.ts

@@ -46,7 +46,6 @@ import type {
 	GatewayGuildMembersChunkPresence,
 	APIBaseMessage,
 	APIGuildMemberJoined,
-	APIVoiceStateMember,
 	APIVoiceState,
 } from '../payloads/v9/index';
 import type { ReactionType } from '../rest/v9/index';
@@ -879,7 +878,7 @@ export interface GatewayGuildCreateDispatchData extends APIGuild {
 	 *
 	 * @see {@link https://discord.com/developers/docs/resources/voice#voice-state-object}
 	 */
-	voice_states: (APIBaseVoiceState & APIVoiceStateMember)[];
+	voice_states: APIBaseVoiceState[];
 	/**
 	 * Users in the guild
 	 *

deno/payloads/v10/voice.ts

@@ -23,6 +23,12 @@ export interface APIBaseVoiceState {
 	 * The user id this voice state is for
 	 */
 	user_id: Snowflake;
+	/**
+	 * The guild member this voice state is for
+	 *
+	 * @see {@link https://discord.com/developers/docs/resources/guild#guild-member-object}
+	 */
+	member?: APIGuildMember;
 	/**
 	 * The session id for this voice state
 	 */
@@ -61,20 +67,10 @@ export interface APIBaseVoiceState {
 	request_to_speak_timestamp: string | null;
 }
 
-export interface APIVoiceStateMember {
-	/**
-	 * The guild member this voice state is for
-	 *
-	 * @remarks The member field will have `joined_at` set to `null` if the member was invited as a guest.
-	 * @see {@link https://discord.com/developers/docs/resources/guild#guild-member-object}
-	 */
-	member?: APIGuildMember;
-}
-
 /**
  * @see {@link https://discord.com/developers/docs/resources/voice#voice-state-object}
  */
-export interface APIVoiceState extends APIBaseVoiceState, APIVoiceStateMember {
+export interface APIVoiceState extends APIBaseVoiceState {
 	/**
 	 * The guild id this voice state is for
 	 */

deno/payloads/v9/voice.ts

@@ -20,6 +20,12 @@ export interface APIBaseVoiceState {
 	 * The user id this voice state is for
 	 */
 	user_id: Snowflake;
+	/**
+	 * The guild member this voice state is for
+	 *
+	 * @see {@link https://discord.com/developers/docs/resources/guild#guild-member-object}
+	 */
+	member?: APIGuildMember;
 	/**
 	 * The session id for this voice state
 	 */
@@ -58,20 +64,10 @@ export interface APIBaseVoiceState {
 	request_to_speak_timestamp: string | null;
 }
 
-export interface APIVoiceStateMember {
-	/**
-	 * The guild member this voice state is for
-	 *
-	 * @remarks The member field will have `joined_at` set to `null` if the member was invited as a guest.
-	 * @see {@link https://discord.com/developers/docs/resources/guild#guild-member-object}
-	 */
-	member?: APIGuildMember;
-}
-
 /**
  * @see {@link https://discord.com/developers/docs/resources/voice#voice-state-object}
  */
-export interface APIVoiceState extends APIBaseVoiceState, APIVoiceStateMember {
+export interface APIVoiceState extends APIBaseVoiceState {
 	/**
 	 * The guild id this voice state is for
 	 */