Spacebar/server
1
0
Fork 0
mirror of https://github.com/spacebarchat/server.git synced 2024-11-10 20:52:42 +01:00
Code Issues Releases Activity

Merge branch 'master' of https://github.com/fosscord/fosscord-api

Browse Source
This commit is contained in:
Flam3rboy 2021-09-03 20:01:42 +02:00
commit ff4246204e
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gateway/src/events/Close.ts
View File

@ -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);
}

24
gateway/src/opcodes/VoiceStateUpdate.ts
View File

@ -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?
@ -23,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 && voiceState.session_id === this.session_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);
@ -36,12 +44,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([

5
util/src/entities/VoiceState.ts
View File

@ -32,8 +32,9 @@ export class VoiceState extends BaseClass {
@ManyToOne(() => User)
user: User;
@JoinColumn({ name: "user_id" })
@ManyToOne(() => Member)
// @JoinColumn([{ name: "user_id", referencedColumnName: "id" },{ name: "guild_id", referencedColumnName: "guild_id" }])
// @ManyToOne(() => Member)
//TODO find a way to make it work without breaking Guild.voice_states
member: Member;
@Column()