fetch user data when guest user chats

Author: René Kooi

plugged.js

@@ -521,12 +521,19 @@ Plugged.prototype._wsaprocessor = function(self, msg) {
                     self.state.chatcache.shift();
             }
 
-            if(chat.message.indexOf('@' + self.state.self.username) > -1)
-                self.emit(self.CHAT_MENTION, chat);
-            else if(chat.message.charAt(0) == '/')
-                self.emit(self.CHAT_COMMAND, chat);
-        
-            self.emit(self.CHAT, chat);
+            // guests who log in whilst in the room don't emit USER_JOIN
+            // messages, so they won't be in the user list yet. that means that
+            // plug.dj might send CHAT events from nonexistent users, so we
+            // first grab the user info, and then emit the chat event later
+            var user = self.getUserByID(chat.id);
+            if(!user || user.guest) {
+                self.getUser(chat.id, function(e, userData) {
+                    self._pushUser(userData);
+                    self._emitChat(chat);
+                });
+            }
+            else
+                self._emitChat(chat);
             break;
 
         case self.CHAT_DELETE:
@@ -682,13 +689,7 @@ Plugged.prototype._wsaprocessor = function(self, msg) {
 
         case self.USER_JOIN:
             var user = models.parseUser(data.p);
-            self.state.room.users.push(user);
-            self.state.room.meta.population++;
-
-            if(self.isFriend(user.id))
-                self.emit(self.FRIEND_JOIN, user);
-            else
-                self.emit(self.USER_JOIN, user);
+            self._pushUser(user);
             break;
 
         case self.USER_UPDATE:
@@ -765,6 +766,27 @@ Plugged.prototype._keepAliveCheck = function() {
     this.keepAliveID = setTimeout(this._keepAlive, 30*1000);
 };
 
+Plugged.prototype._emitChat = function(chat) {
+    if(chat.message.indexOf('@' + this.state.self.username) > -1)
+        this.emit(this.CHAT_MENTION, chat);
+    else if(chat.message.charAt(0) == '/')
+        this.emit(this.CHAT_COMMAND, chat);
+
+    this.emit(this.CHAT, chat);
+};
+
+Plugged.prototype._pushUser = function(user) {
+    if (user.guest)
+        return;
+
+    this.state.room.users.push(user);
+    this.state.room.population = this.state.room.users.length;
+    if(this.isFriend(user.id))
+        this.emit(this.FRIEND_JOIN, user);
+    else
+        this.emit(this.USER_JOIN, user);
+};
+
 Plugged.prototype.sendChat = function(message, deleteTimeout) {
     deleteTimeout = deleteTimeout || -1;
 

state.js

@@ -110,6 +110,7 @@ var parseUser = function(data) {
         badge: data.badge || "",
         role: data.role || 0,
         sub: data.sub || 0,
+        guest: data.guest || false,
         id: data.id || -1
     };
 };