Move voice states to Guild collection (#548)

lib/structures/Guild.js

@@ -11,6 +11,7 @@ const Role = require("./Role");
 const TextChannel = require("./TextChannel");
 const NewsChannel = require("./NewsChannel");
 const VoiceChannel = require("./VoiceChannel");
+const VoiceState = require("./VoiceState");
 
 /**
 * Represents a guild
@@ -32,6 +33,7 @@ const VoiceChannel = require("./VoiceChannel");
 * @prop {Boolean} unavailable Whether the guild is unavailable or not
 * @prop {Boolean} large Whether the guild is "large" by "some Discord standard"
 * @prop {Number} maxPresences The maximum number of people that can be online in a guild at once (returned from REST API only)
+* @prop {Collection<VoiceState>} voiceStates Collection of voice states in the guild
 * @prop {Collection<GuildChannel>} channels Collection of Channels in the guild
 * @prop {Collection<Member>} members Collection of Members in the guild
 * @prop {Number} memberCount Number of members in the guild
@@ -54,6 +56,7 @@ class Guild extends Base {
         this.shard = client.shards.get(client.guildShardMap[this.id]);
         this.unavailable = !!data.unavailable;
         this.joinedAt = Date.parse(data.joined_at);
+        this.voiceStates = new Collection(VoiceState);
         this.channels = new Collection(GuildChannel);
         this.members = new Collection(Member);
         this.memberCount = data.member_count;

lib/structures/Member.js

@@ -54,7 +54,6 @@ class Member extends Base {
         } else {
             this.user = null;
         }
-        this.voiceState = new VoiceState(data);
         this.update(data);
     }
 
@@ -66,8 +65,15 @@ class Member extends Base {
         this.activities = data.activities;
         this.premiumSince = data.premium_since !== undefined ? data.premium_since : this.premiumSince;
 
-        if(data.mute !== undefined) {
-            this.voiceState.update(data);
+        if("mute" in data) {
+            const state = this.guild.voiceStates.get(this.id);
+            if(data.channel_id === null && !data.mute && !data.deaf && !data.suppress && !data.self_deaf && !data.self_mute) {
+                this.guild.voiceStates.delete(this.id);
+            } else if(state) {
+                state.update(data);
+            } else if(data.channel_id || data.mute || data.deaf || data.suppress || data.self_mute || data.self_deaf) {
+                this.guild.voiceStates.update(data);
+            }
         }
 
         this.nick = data.nick !== undefined ? data.nick : this.nick || null;
@@ -76,6 +82,12 @@ class Member extends Base {
         }
     }
 
+    get voiceState() {
+        return this.guild.voiceStates.get(this.id) || new VoiceState({
+            id: this.id
+        });
+    }
+
     get permission() {
         if(this.id === this.guild.ownerID) {
             return new Permission(Permissions.all);