hackchat-engine 1.1.16 → 1.1.17

package/events/UpdateUser.js

@@ -14,7 +14,13 @@ class UpdateUser extends AbstractEvent {
     const { client } = this;
     const user = client.users.get(data.userid);
 
-    user.updateUser(data);
+    if (user) {
+      user.updateUser(data);
+    }
+
+    if (client.myUser && client.myUser.userid === data.userid) {
+      client.myUser.updateUser(data);
+    }
 
     return user;
   }

package/package.json

@@ -59,5 +59,5 @@
     "lintfix": "eslint --fix --ignore-path .gitignore .",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "version": "1.1.16"
+  "version": "1.1.17"
 }

package/structures/UserStruct.js

@@ -261,10 +261,11 @@ class User {
   updateUser(data) {
     if (data.channel) {
       this.channels.add(data.channel);
+      this.channel = data.channel;
     }
 
-    if (data.trip) this.usertrip = data.trip;
-    if (data.hash) this.userhash = data.hash;
+    if (typeof data.trip !== 'undefined') this.usertrip = data.trip;
+    if (typeof data.hash !== 'undefined') this.userhash = data.hash;
 
     this.username = data.nick;
     this.userlevel = data.uType;

package/websocket/packets/handlers/SessionHandler.js

@@ -1,5 +1,5 @@
 import AbstractHandler from './AbstractHandler.js';
-import { Events } from '../../../util/Constants.js';
+import { Events, Status } from '../../../util/Constants.js';
 
 /**
   * Handles a new chat message that has been broadcast within a channel
@@ -15,19 +15,21 @@ class SessionHandler extends AbstractHandler {
     const { client } = this.packetRouter;
 
     client.readyAt = new Date();
-    const t = client.setTimeout(() => {
-      client.ws.connection.triggerReady();
-    }, 1);
 
-    client.once('ready', () => {
-      client.setMaxListeners(10);
-      client.clearTimeout(t);
-    });
+    if (client.status !== Status.READY) {
+      const t = client.setTimeout(() => {
+        client.ws.connection.triggerReady();
+      }, 1);
+
+      client.once(Events.READY, () => {
+        client.clearTimeout(t);
+      });
+    }
 
     const response = client.events.Session.handle(packet);
 
     /**
-      * Emitted when a message is sent in a channel
+      * Emitted when a session packet is received
       * @event Client#session
       * @param {SessionStruct} session Full session details
       */