Merge remote-tracking branch 'origin/indev-rewrite' into indev-rewrite-voice

src/client/Client.js

@@ -100,6 +100,11 @@ class Client extends EventEmitter {
      * @type {?String}
      */
     this.password = null;
+    /**
+     * The time in milliseconds the Client connected
+     * @type {?Number}
+     */
+    this.readyTime = null;
   }
 
   /**

src/client/websocket/packets/handlers/Ready.js

@@ -11,6 +11,7 @@ class ReadyHandler extends AbstractHandler {
 
     const clientUser = new ClientUser(client, data.user);
     client.user = clientUser;
+    client.readyTime = Date.now();
     client.users.set(clientUser.id, clientUser);
     for (const guild of data.guilds) {
       client.dataManager.newGuild(guild);

src/structures/GuildChannel.js

@@ -33,9 +33,11 @@ class GuildChannel extends Channel {
     super.setup(data);
     /**
      * The type of the Guild Channel
-     * @type {Number}
+     * @type {String}
      */
-    this.type = data.type;
+    if (data.type === 0) this.type = 'text';
+    else if (data.type === 2) this.type = 'voice';
+    else this.type = data.type.toString();
     /**
      * The topic of the Guild Channel, if there is one.
      * @type {?String}