Merge remote-tracking branch 'origin/fp-attempt-9001' into fp-attempt-9001

This commit is contained in:
Quentin Nicolini
2021-10-09 18:27:00 +02:00
+11 -5
View File
@@ -2,9 +2,13 @@ import type { VoiceState } from "../types/voice/voice_state.ts";
import { Bot } from "../bot.ts"; import { Bot } from "../bot.ts";
import { SnakeCasedPropertiesDeep } from "../types/util.ts"; import { SnakeCasedPropertiesDeep } from "../types/util.ts";
export function transformVoiceState(bot: Bot, payload: {voiceState: SnakeCasedPropertiesDeep<VoiceState> } & {guildId: bigint}): DiscordenoVoiceState { export function transformVoiceState(
bot: Bot,
payload: { voiceState: SnakeCasedPropertiesDeep<VoiceState> } & { guildId: bigint }
): DiscordenoVoiceState {
return { return {
bitfield: (payload.voiceState.deaf ? 1n : 0n) | bitfield:
(payload.voiceState.deaf ? 1n : 0n) |
(payload.voiceState.mute ? 2n : 0n) | (payload.voiceState.mute ? 2n : 0n) |
(payload.voiceState.selfDeaf ? 4n : 0n) | (payload.voiceState.selfDeaf ? 4n : 0n) |
(payload.voiceState.selfMute ? 8n : 0n) | (payload.voiceState.selfMute ? 8n : 0n) |
@@ -16,9 +20,11 @@ export function transformVoiceState(bot: Bot, payload: {voiceState: SnakeCasedPr
sessionId: payload.voiceState.session_id, sessionId: payload.voiceState.session_id,
channelId: payload.voiceState.channel_id ? bot.transformers.snowflake(payload.voiceState.channel_id) : undefined, channelId: payload.voiceState.channel_id ? bot.transformers.snowflake(payload.voiceState.channel_id) : undefined,
guildId: payload.guildId || (payload.voiceState.guild_id ? bot.transformers.snowflake(payload.voiceState.guild_id) : 0n), guildId:
userId: payload.guildId || (payload.voiceState.user_id ? bot.transformers.snowflake(payload.voiceState.user_id) : 0n) payload.guildId || (payload.voiceState.guild_id ? bot.transformers.snowflake(payload.voiceState.guild_id) : 0n),
} userId:
payload.guildId || (payload.voiceState.user_id ? bot.transformers.snowflake(payload.voiceState.user_id) : 0n),
};
} }
export interface DiscordenoVoiceState extends Omit<VoiceState, "channelId" | "guildId" | "userId" | "member"> { export interface DiscordenoVoiceState extends Omit<VoiceState, "channelId" | "guildId" | "userId" | "member"> {