Merge branch 'indev' into indev-prism

package.json

@@ -35,7 +35,7 @@
     "pako": "^1.0.0",
     "superagent": "^3.3.0",
     "tweetnacl": "^0.14.0",
-    "ws": "^1.1.0"
+    "ws": "^1.1.1"
   },
   "peerDependencies": {
     "erlpack": "hammerandchisel/erlpack#master",

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

@@ -10,6 +10,7 @@ class ReadyHandler extends AbstractHandler {
     client.ws.heartbeat();
 
     const clientUser = new ClientUser(client, data.user);
+    clientUser.settings = data.user_settings;
     client.user = clientUser;
     client.readyAt = new Date();
     client.users.set(clientUser.id, clientUser);

src/structures/ClientUser.js

@@ -43,6 +43,13 @@ class ClientUser extends User {
      * @type {Collection<string, string>}
      */
     this.notes = new Collection();
+
+    /**
+     * Discord client settings, such as guild positions
+     * <warn>This is only filled when using a user account.</warn>
+     * @type {Object}
+     */
+    this.settings = {};
   }
 
   edit(data) {