From f99ed31730300c4243d3479cf7522049d39df275 Mon Sep 17 00:00:00 2001 From: AlTech98 Date: Fri, 3 Sep 2021 13:27:15 +0200 Subject: VoiceState fix for db update --- gateway/src/opcodes/VoiceStateUpdate.ts | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'gateway/src') diff --git a/gateway/src/opcodes/VoiceStateUpdate.ts b/gateway/src/opcodes/VoiceStateUpdate.ts index 04392b62..10808c10 100644 --- a/gateway/src/opcodes/VoiceStateUpdate.ts +++ b/gateway/src/opcodes/VoiceStateUpdate.ts @@ -2,7 +2,7 @@ import { VoiceStateUpdateSchema } from "../schema/VoiceStateUpdateSchema"; import { Payload } from "../util/Constants"; import WebSocket from "../util/WebSocket"; import { check } from "./instanceOf"; -import { Config, emitEvent, VoiceServerUpdateEvent, VoiceState, VoiceStateUpdateEvent } from "@fosscord/util"; +import { Config, emitEvent, Member, VoiceServerUpdateEvent, VoiceState, VoiceStateUpdateEvent } from "@fosscord/util"; import { genVoiceToken } from "../util/SessionUtils"; // TODO: check if a voice server is setup // Notice: Bot users respect the voice channel's user limit, if set. When the voice channel is full, you will not receive the Voice State Update or Voice Server Update events in response to your own Voice State Update. Having MANAGE_CHANNELS permission bypasses this limit and allows you to join regardless of the channel being full or not. @@ -14,8 +14,7 @@ export async function onVoiceStateUpdate(this: WebSocket, data: Payload) { let voiceState; try { voiceState = await VoiceState.findOneOrFail({ - where: { user_id: this.user_id }, - relations: ["member", "member.user", "member.roles"], + where: { user_id: this.user_id } }); if (voiceState.session_id !== this.session_id && body.channel_id === null) { //Should we also check guild_id === null? @@ -36,12 +35,18 @@ export async function onVoiceStateUpdate(this: WebSocket, data: Payload) { }); } + //TODO the member should only have these properties: hoisted_role, deaf, joined_at, mute, roles, user + //TODO the member.user should only have these properties: avatar, discriminator, id, username + //TODO this may fail + voiceState.member = await Member.findOneOrFail({ + where: { id: voiceState.user_id, guild_id: voiceState.guild_id }, + relations: ["user", "roles"], + }) + //If the session changed we generate a new token if (voiceState.session_id !== this.session_id) voiceState.token = genVoiceToken(); voiceState.session_id = this.session_id; - //TODO the member should only have these properties: hoisted_role, deaf, joined_at, mute, roles, user - //TODO the member.user should only have these properties: avatar, discriminator, id, username const { id, ...newObj } = voiceState; await Promise.all([ -- cgit 1.5.1 From d61e6dbab69d5a1bfdc1d298d5df885984c5e95b Mon Sep 17 00:00:00 2001 From: AlTech98 Date: Fri, 3 Sep 2021 14:12:44 +0200 Subject: Make the user leave the current channel before joining one in another guild --- gateway/src/opcodes/VoiceStateUpdate.ts | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gateway/src') diff --git a/gateway/src/opcodes/VoiceStateUpdate.ts b/gateway/src/opcodes/VoiceStateUpdate.ts index 10808c10..668508fd 100644 --- a/gateway/src/opcodes/VoiceStateUpdate.ts +++ b/gateway/src/opcodes/VoiceStateUpdate.ts @@ -22,6 +22,15 @@ export async function onVoiceStateUpdate(this: WebSocket, data: Payload) { return; } + //If a user change voice channel between guild we should send a left event first + if (voiceState.guild_id !== body.guild_id) { + await emitEvent({ + event: "VOICE_STATE_UPDATE", + data: { ...voiceState, channel_id: null }, + guild_id: voiceState.guild_id, + }) + } + //The event send by Discord's client on channel leave has both guild_id and channel_id as null if (body.guild_id === null) body.guild_id = voiceState.guild_id; voiceState.assign(body); -- cgit 1.5.1 From c8345b3223bb3825c151bd811a5b6460b1bfbc38 Mon Sep 17 00:00:00 2001 From: AlTech98 Date: Fri, 3 Sep 2021 14:23:33 +0200 Subject: Fix to send the voice leave event only to the right session --- gateway/src/opcodes/VoiceStateUpdate.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gateway/src') diff --git a/gateway/src/opcodes/VoiceStateUpdate.ts b/gateway/src/opcodes/VoiceStateUpdate.ts index 668508fd..fba0db1f 100644 --- a/gateway/src/opcodes/VoiceStateUpdate.ts +++ b/gateway/src/opcodes/VoiceStateUpdate.ts @@ -23,7 +23,7 @@ export async function onVoiceStateUpdate(this: WebSocket, data: Payload) { } //If a user change voice channel between guild we should send a left event first - if (voiceState.guild_id !== body.guild_id) { + if (voiceState.guild_id !== body.guild_id && voiceState.session_id === this.session_id) { await emitEvent({ event: "VOICE_STATE_UPDATE", data: { ...voiceState, channel_id: null }, -- cgit 1.5.1 From 991e01809bf69b2198f05d24246d9c4e61454efb Mon Sep 17 00:00:00 2001 From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com> Date: Fri, 3 Sep 2021 15:57:29 +0200 Subject: :bug: only delete session id for authenticated connections --- gateway/src/events/Close.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gateway/src') diff --git a/gateway/src/events/Close.ts b/gateway/src/events/Close.ts index b4fed316..2f274ec4 100644 --- a/gateway/src/events/Close.ts +++ b/gateway/src/events/Close.ts @@ -4,7 +4,7 @@ import { Session } from "@fosscord/util"; export async function Close(this: WebSocket, code: number, reason: string) { console.log("[WebSocket] closed", code, reason); - await Session.delete({ session_id: this.session_id }); + if (this.session_id) await Session.delete({ session_id: this.session_id }); // @ts-ignore this.off("message", Message); } -- cgit 1.5.1