diff --git a/deno/gateway/v10.ts b/deno/gateway/v10.ts index 7b049bfa..1bdf29d7 100644 --- a/deno/gateway/v10.ts +++ b/deno/gateway/v10.ts @@ -46,7 +46,7 @@ import type { APIGuildMemberUser, GatewayGuildMembersChunkPresence, APIBaseMessage, - APIVoiceStateMember, + APIVoiceState, } from '../payloads/v10/mod.ts'; import type { ReactionType } from '../rest/v10/mod.ts'; import type { _Nullable } from '../utils/internals.ts'; @@ -881,7 +881,7 @@ export interface GatewayGuildCreateDispatchData extends APIGuild { * * @see {@link https://discord.com/developers/docs/resources/voice#voice-state-object} */ - voice_states: GatewayVoiceStateUpdateDispatchData[]; + voice_states: APIBaseVoiceState[]; /** * Users in the guild * @@ -2104,7 +2104,7 @@ export type GatewayVoiceStateUpdateDispatch = _DataPayload< /** * @see {@link https://discord.com/developers/docs/topics/gateway-events#voice-state-update} */ -export interface GatewayVoiceStateUpdateDispatchData extends APIBaseVoiceState, APIVoiceStateMember {} +export type GatewayVoiceStateUpdateDispatchData = APIVoiceState; /** * @see {@link https://discord.com/developers/docs/topics/gateway-events#voice-server-update} diff --git a/deno/gateway/v9.ts b/deno/gateway/v9.ts index bc149cdb..b42f43ea 100644 --- a/deno/gateway/v9.ts +++ b/deno/gateway/v9.ts @@ -46,7 +46,7 @@ import type { GatewayGuildMembersChunkPresence, APIBaseMessage, APIGuildMemberJoined, - APIVoiceStateMember, + APIVoiceState, } from '../payloads/v9/mod.ts'; import type { ReactionType } from '../rest/v9/mod.ts'; import type { _Nullable } from '../utils/internals.ts'; @@ -880,7 +880,7 @@ export interface GatewayGuildCreateDispatchData extends APIGuild { * * @see {@link https://discord.com/developers/docs/resources/voice#voice-state-object} */ - voice_states: GatewayVoiceStateUpdateDispatchData[]; + voice_states: APIBaseVoiceState[]; /** * Users in the guild * @@ -2103,7 +2103,7 @@ export type GatewayVoiceStateUpdateDispatch = _DataPayload< /** * @see {@link https://discord.com/developers/docs/topics/gateway-events#voice-state-update} */ -export interface GatewayVoiceStateUpdateDispatchData extends APIBaseVoiceState, APIVoiceStateMember {} +export type GatewayVoiceStateUpdateDispatchData = APIVoiceState; /** * @see {@link https://discord.com/developers/docs/topics/gateway-events#voice-server-update} diff --git a/deno/payloads/v10/voice.ts b/deno/payloads/v10/voice.ts index 0df86adf..de32e2c7 100644 --- a/deno/payloads/v10/voice.ts +++ b/deno/payloads/v10/voice.ts @@ -23,6 +23,13 @@ export interface APIBaseVoiceState { * The user id this voice state is for */ user_id: Snowflake; + /** + * 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; /** * The session id for this voice state */ @@ -61,20 +68,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 */ diff --git a/deno/payloads/v9/voice.ts b/deno/payloads/v9/voice.ts index 4e756a55..7e0919d8 100644 --- a/deno/payloads/v9/voice.ts +++ b/deno/payloads/v9/voice.ts @@ -20,6 +20,13 @@ export interface APIBaseVoiceState { * The user id this voice state is for */ user_id: Snowflake; + /** + * 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; /** * The session id for this voice state */ @@ -58,20 +65,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 */ diff --git a/gateway/v10.ts b/gateway/v10.ts index f99d60b5..8ef45f94 100644 --- a/gateway/v10.ts +++ b/gateway/v10.ts @@ -46,7 +46,7 @@ import type { APIGuildMemberUser, GatewayGuildMembersChunkPresence, APIBaseMessage, - APIVoiceStateMember, + APIVoiceState, } from '../payloads/v10/index'; import type { ReactionType } from '../rest/v10/index'; import type { _Nullable } from '../utils/internals'; @@ -881,7 +881,7 @@ export interface GatewayGuildCreateDispatchData extends APIGuild { * * @see {@link https://discord.com/developers/docs/resources/voice#voice-state-object} */ - voice_states: GatewayVoiceStateUpdateDispatchData[]; + voice_states: APIBaseVoiceState[]; /** * Users in the guild * @@ -2104,7 +2104,7 @@ export type GatewayVoiceStateUpdateDispatch = _DataPayload< /** * @see {@link https://discord.com/developers/docs/topics/gateway-events#voice-state-update} */ -export interface GatewayVoiceStateUpdateDispatchData extends APIBaseVoiceState, APIVoiceStateMember {} +export type GatewayVoiceStateUpdateDispatchData = APIVoiceState; /** * @see {@link https://discord.com/developers/docs/topics/gateway-events#voice-server-update} diff --git a/gateway/v9.ts b/gateway/v9.ts index 1ff377c2..b0fc6727 100644 --- a/gateway/v9.ts +++ b/gateway/v9.ts @@ -46,7 +46,7 @@ import type { GatewayGuildMembersChunkPresence, APIBaseMessage, APIGuildMemberJoined, - APIVoiceStateMember, + APIVoiceState, } from '../payloads/v9/index'; import type { ReactionType } from '../rest/v9/index'; import type { _Nullable } from '../utils/internals'; @@ -880,7 +880,7 @@ export interface GatewayGuildCreateDispatchData extends APIGuild { * * @see {@link https://discord.com/developers/docs/resources/voice#voice-state-object} */ - voice_states: GatewayVoiceStateUpdateDispatchData[]; + voice_states: APIBaseVoiceState[]; /** * Users in the guild * @@ -2103,7 +2103,7 @@ export type GatewayVoiceStateUpdateDispatch = _DataPayload< /** * @see {@link https://discord.com/developers/docs/topics/gateway-events#voice-state-update} */ -export interface GatewayVoiceStateUpdateDispatchData extends APIBaseVoiceState, APIVoiceStateMember {} +export type GatewayVoiceStateUpdateDispatchData = APIVoiceState; /** * @see {@link https://discord.com/developers/docs/topics/gateway-events#voice-server-update} diff --git a/payloads/v10/voice.ts b/payloads/v10/voice.ts index e4032733..9d6ebc04 100644 --- a/payloads/v10/voice.ts +++ b/payloads/v10/voice.ts @@ -23,6 +23,13 @@ export interface APIBaseVoiceState { * The user id this voice state is for */ user_id: Snowflake; + /** + * 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; /** * The session id for this voice state */ @@ -61,20 +68,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 */ diff --git a/payloads/v9/voice.ts b/payloads/v9/voice.ts index 9a77700d..13315530 100644 --- a/payloads/v9/voice.ts +++ b/payloads/v9/voice.ts @@ -20,6 +20,13 @@ export interface APIBaseVoiceState { * The user id this voice state is for */ user_id: Snowflake; + /** + * 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; /** * The session id for this voice state */ @@ -58,20 +65,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 */