hackchat-engine 1.1.18 → 1.1.20

package/events/UpdateUser.js

@@ -14,15 +14,19 @@ class UpdateUser extends AbstractEvent {
     const { client } = this;
     const user = client.users.get(data.userid);
 
+    let targetUser = null;
+
     if (user) {
       user.updateUser(data);
+      targetUser = user;
     }
 
     if (client.myUser && client.myUser.userid === data.userid) {
       client.myUser.updateUser(data);
+      targetUser = client.myUser;
     }
 
-    return user;
+    return targetUser || user;
   }
 }
 

package/events/UserLeave.js

@@ -1,4 +1,5 @@
 import AbstractEvent from './AbstractEvent.js';
+import { Events } from '../util/Constants.js';
 
 /**
   * This class handles an incoming `leave` event from the server
@@ -19,10 +20,16 @@ class UserLeave extends AbstractEvent {
 
       if (user.channels.size === 0) {
         user.online = false;
+        user.userEffect = 0;
+
+        client.emit(Events.USER_UPDATE, user);
       }
     }
 
-    return user;
+    return {
+      user,
+      channel: data.channel,
+    };
   }
 }
 

package/package.json

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

package/structures/EmoteStruct.js

@@ -11,10 +11,10 @@ class Emote {
     Object.defineProperty(this, 'client', { value: client });
 
     /**
-       * User who sent the emote
-       * @type {User}
-       * @readonly
-       */
+      * User who sent the emote
+      * @type {User}
+      * @readonly
+      */
     Object.defineProperty(this, 'user', { value: user });
 
     this.setup(data);

package/structures/UserStruct.js

@@ -283,12 +283,12 @@ class User {
     if (typeof data.hash !== 'undefined') this.userhash = data.hash;
     if (typeof data.effect !== 'undefined') this.userEffect = data.effect;
 
-    this.username = data.nick;
-    this.userlevel = data.uType;
-    this.botting = data.isBot;
-    this.nickColor = data.color;
-    this.flair = data.flair;
-    this.permissionLevel = data.level;
+    if (typeof data.nick !== 'undefined') this.username = data.nick;
+    if (typeof data.uType !== 'undefined') this.userlevel = data.uType;
+    if (typeof data.isBot !== 'undefined') this.botting = data.isBot;
+    if (typeof data.color !== 'undefined') this.nickColor = data.color;
+    if (typeof data.flair !== 'undefined') this.flair = data.flair;
+    if (typeof data.level !== 'undefined') this.permissionLevel = data.level;
   }
 
   /**