Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-10 08:33:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

rewrite voice state handling

Browse Source
This commit is contained in:
Amish Shah
2018-08-10 14:44:59 +01:00
parent 0f63c50c06
commit be5efea461
11 changed files with 187 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/structures/Guild.js
View File

@@ -12,6 +12,7 @@ const RoleStore = require('../stores/RoleStore');
const GuildEmojiStore = require('../stores/GuildEmojiStore');
const GuildChannelStore = require('../stores/GuildChannelStore');
const PresenceStore = require('../stores/PresenceStore');
const VoiceStateStore = require('../stores/VoiceStateStore');
const Base = require('./Base');
const { Error, TypeError } = require('../errors');
@@ -229,9 +230,13 @@ class Guild extends Base {
}
}
if (!this.voiceStates) this.voiceStates = new VoiceStateCollection(this);
if (!this.voiceStates) this.voiceStates = new VoiceStateStore(this);
if (data.voice_states) {
for (const voiceState of data.voice_states) this.voiceStates.set(voiceState.user_id, voiceState);
for (const voiceState of data.voice_states) {
const existing = this.voiceStates.get(voiceState.user_id);
if (existing) existing._patch(voiceState);
else this.voiceStates.add(voiceState);
}
}
if (!this.emojis) {
@@ -881,33 +886,4 @@ class Guild extends Base {
}
}
// TODO: Document this thing
class VoiceStateCollection extends Collection {
constructor(guild) {
super();
this.guild = guild;
}
set(id, voiceState) {
const member = this.guild.members.get(id);
if (member) {
if (member.voiceChannel && member.voiceChannel.id !== voiceState.channel_id) {
member.voiceChannel.members.delete(member.id);
}
const newChannel = this.guild.channels.get(voiceState.channel_id);
if (newChannel) newChannel.members.set(member.user.id, member);
}
super.set(id, voiceState);
}
delete(id) {
const voiceState = this.get(id);
if (voiceState && voiceState.channel_id) {
const channel = this.guild.channels.get(voiceState.channel_id);
if (channel) channel.members.delete(id);
}
return super.delete(id);
}
}
module.exports = Guild;