Merge branch 'master' into voice-rewrite

src/client/websocket/WebSocketConnection.js

@@ -269,13 +269,15 @@ class WebSocketConnection extends EventEmitter {
 
     this.inflate.push(data, flush && zlib.Z_SYNC_FLUSH);
     if (!flush) return;
+    let packet;
     try {
-      const packet = WebSocket.unpack(this.inflate.result);
+      packet = WebSocket.unpack(this.inflate.result);
-      this.onPacket(packet);
-      if (this.client.listenerCount('raw')) this.client.emit('raw', packet);
     } catch (err) {
       this.client.emit('debug', err);
+      return;
     }
+    this.onPacket(packet);
+    if (this.client.listenerCount('raw')) this.client.emit('raw', packet);
   }
 
   /**

src/stores/ChannelStore.js

@@ -7,7 +7,6 @@ const lruable = ['group', 'dm'];
 
 /**
  * Stores channels.
- * @private
  * @extends {DataStore}
  */
 class ChannelStore extends DataStore {

src/stores/ClientPresenceStore.js

@@ -7,7 +7,6 @@ const { TypeError } = require('../errors');
 /**
  * Stores the client presence and other presences.
  * @extends {PresenceStore}
- * @private
  */
 class ClientPresenceStore extends PresenceStore {
   constructor(...args) {

src/stores/GuildChannelStore.js

@@ -7,7 +7,6 @@ const Permissions = require('../util/Permissions');
 
 /**
  * Stores guild channels.
- * @private
  * @extends {DataStore}
  */
 class GuildChannelStore extends DataStore {

src/stores/GuildEmojiStore.js

@@ -6,7 +6,6 @@ const DataResolver = require('../util/DataResolver');
 
 /**
  * Stores guild emojis.
- * @private
  * @extends {DataStore}
  */
 class GuildEmojiStore extends DataStore {

src/stores/GuildStore.js

@@ -5,7 +5,6 @@ const Guild = require('../structures/Guild');
 
 /**
  * Stores guilds.
- * @private
  * @extends {DataStore}
  */
 class GuildStore extends DataStore {

src/stores/PresenceStore.js

@@ -3,7 +3,6 @@ const { Presence } = require('../structures/Presence');
 
 /**
  * Stores presences.
- * @private
  * @extends {DataStore}
  */
 class PresenceStore extends DataStore {

src/stores/ReactionStore.js

@@ -3,7 +3,6 @@ const MessageReaction = require('../structures/MessageReaction');
 
 /**
  * Stores reactions.
- * @private
  * @extends {DataStore}
  */
 class ReactionStore extends DataStore {

src/stores/RoleStore.js

@@ -5,7 +5,6 @@ const Permissions = require('../util/Permissions');
 
 /**
  * Stores roles.
- * @private
  * @extends {DataStore}
  */
 class RoleStore extends DataStore {

src/structures/GuildMember.js

@@ -357,7 +357,8 @@ class GuildMember extends Base {
       const clone = this._clone();
       data.user = this.user;
       clone._patch(data);
-      clone._frozenVoiceState = this.voiceState;
+      clone._frozenVoiceState = {};
+      Object.assign(clone._frozenVoiceState, this.voiceState);
       if (typeof data.mute !== 'undefined') clone._frozenVoiceState.mute = data.mute;
       if (typeof data.deaf !== 'undefined') clone._frozenVoiceState.mute = data.deaf;
       if (typeof data.channel_id !== 'undefined') clone._frozenVoiceState.channel_id = data.channel_id;