Makes sure we first fire muc_joined and muc_member_joined before firing command events or any event for the data from the received presence.

JitsiConference.js

@@ -411,7 +411,7 @@ JitsiConference.prototype.muteParticipant = function (id) {
     this.room.muteParticipant(participant.getJid(), true);
 };
 
-JitsiConference.prototype.onMemberJoined = function (jid, email, nick) {
+JitsiConference.prototype.onMemberJoined = function (jid, nick) {
     var id = Strophe.getResourceFromJid(jid);
     if (id === 'focus' || this.myUserId() === id) {
        return;

lib-jitsi-meet.js

@@ -413,7 +413,7 @@ JitsiConference.prototype.muteParticipant = function (id) {
     this.room.muteParticipant(participant.getJid(), true);
 };
 
-JitsiConference.prototype.onMemberJoined = function (jid, email, nick) {
+JitsiConference.prototype.onMemberJoined = function (jid, nick) {
     var id = Strophe.getResourceFromJid(jid);
     if (id === 'focus' || this.myUserId() === id) {
        return;
@@ -6346,6 +6346,8 @@ ChatRoom.prototype.onPresence = function (pres) {
     parser.packet2JSON(pres, nodes);
     this.lastPresences[from] = nodes;
     var jibri = null;
+    // process nodes to extract data needed for MUC_JOINED and MUC_MEMBER_JOINED
+    // events
     for(var i = 0; i < nodes.length; i++)
     {
         var node = nodes[i];
@@ -6353,53 +6355,24 @@ ChatRoom.prototype.onPresence = function (pres) {
         {
             case "nick":
                 member.nick = node.value;
-                if(!member.isFocus) {
-                    var displayName = !this.xmpp.options.displayJids
-                        ? member.nick : Strophe.getResourceFromJid(from);
-
-                    if (displayName && displayName.length > 0) {
-                        this.eventEmitter.emit(XMPPEvents.DISPLAY_NAME_CHANGED, from, displayName);
-                    }
-                }
                 break;
             case "userId":
                 member.id = node.value;
                 break;
-            case "bridgeIsDown":
-                if(!this.bridgeIsDown) {
-                    this.bridgeIsDown = true;
-                    this.eventEmitter.emit(XMPPEvents.BRIDGE_DOWN);
-                }
-                break;
-            case "jibri-recording-status":
-                var jibri = node;
-                break;
-            case "call-control":
-                var att = node.attributes;
-                if(!att)
-                    break;
-                this.phoneNumber = att.phone || null;
-                this.phonePin = att.pin || null;
-                this.eventEmitter.emit(XMPPEvents.PHONE_NUMBER_CHANGED);
-                break;
-            default :
-                this.processNode(node, from);
         }
-
     }
 
     if (from == this.myroomjid) {
-        if (member.affiliation == 'owner')
-
-            if (this.role !== member.role) {
+        if (member.affiliation == 'owner'
+            &&  this.role !== member.role) {
                 this.role = member.role;
-
-                this.eventEmitter.emit(XMPPEvents.LOCAL_ROLE_CHANGED, this.role);
-            }
+                this.eventEmitter.emit(
+                    XMPPEvents.LOCAL_ROLE_CHANGED, this.role);
+        }
         if (!this.joined) {
             this.joined = true;
             console.log("(TIME) MUC joined:\t", window.performance.now());
-            this.eventEmitter.emit(XMPPEvents.MUC_JOINED, from, member);
+            this.eventEmitter.emit(XMPPEvents.MUC_JOINED);
         }
     } else if (this.members[from] === undefined) {
         // new participant
@@ -6417,14 +6390,16 @@ ChatRoom.prototype.onPresence = function (pres) {
             logger.info("Ignore focus: " + from + ", real JID: " + member.jid);
         }
         else {
-            this.eventEmitter.emit(XMPPEvents.MUC_MEMBER_JOINED, from, member.id, member.nick);
+            this.eventEmitter.emit(
+                XMPPEvents.MUC_MEMBER_JOINED, from, member.nick);
         }
     } else {
         // Presence update for existing participant
         // Watch role change:
         if (this.members[from].role != member.role) {
             this.members[from].role = member.role;
-            this.eventEmitter.emit(XMPPEvents.MUC_ROLE_CHANGED, from, member.role);
+            this.eventEmitter.emit(
+                XMPPEvents.MUC_ROLE_CHANGED, from, member.role);
         }
 
         // store the new display name
@@ -6432,7 +6407,45 @@ ChatRoom.prototype.onPresence = function (pres) {
             this.members[from].displayName = member.displayName;
     }
 
+    // after we had fired member or room joined events, lets fire events
+    // for the rest info we got in presence
+    for(var i = 0; i < nodes.length; i++)
+    {
+        var node = nodes[i];
+        switch(node.tagName)
+        {
+            case "nick":
+                if(!member.isFocus) {
+                    var displayName = !this.xmpp.options.displayJids
+                        ? member.nick : Strophe.getResourceFromJid(from);
 
+                    if (displayName && displayName.length > 0) {
+                        this.eventEmitter.emit(
+                            XMPPEvents.DISPLAY_NAME_CHANGED, from, displayName);
+                    }
+                }
+                break;
+            case "bridgeIsDown":
+                if(!this.bridgeIsDown) {
+                    this.bridgeIsDown = true;
+                    this.eventEmitter.emit(XMPPEvents.BRIDGE_DOWN);
+                }
+                break;
+            case "jibri-recording-status":
+                var jibri = node;
+                break;
+            case "call-control":
+                var att = node.attributes;
+                if(!att)
+                    break;
+                this.phoneNumber = att.phone || null;
+                this.phonePin = att.pin || null;
+                this.eventEmitter.emit(XMPPEvents.PHONE_NUMBER_CHANGED);
+                break;
+            default :
+                this.processNode(node, from);
+        }
+    }
 
     if(!member.isFocus)
         this.eventEmitter.emit(XMPPEvents.USER_ID_CHANGED, from, member.id);

modules/xmpp/ChatRoom.js

@@ -217,6 +217,8 @@ ChatRoom.prototype.onPresence = function (pres) {
     parser.packet2JSON(pres, nodes);
     this.lastPresences[from] = nodes;
     var jibri = null;
+    // process nodes to extract data needed for MUC_JOINED and MUC_MEMBER_JOINED
+    // events
     for(var i = 0; i < nodes.length; i++)
     {
         var node = nodes[i];
@@ -224,53 +226,24 @@ ChatRoom.prototype.onPresence = function (pres) {
         {
             case "nick":
                 member.nick = node.value;
-                if(!member.isFocus) {
-                    var displayName = !this.xmpp.options.displayJids
-                        ? member.nick : Strophe.getResourceFromJid(from);
-
-                    if (displayName && displayName.length > 0) {
-                        this.eventEmitter.emit(XMPPEvents.DISPLAY_NAME_CHANGED, from, displayName);
-                    }
-                }
                 break;
             case "userId":
                 member.id = node.value;
                 break;
-            case "bridgeIsDown":
-                if(!this.bridgeIsDown) {
-                    this.bridgeIsDown = true;
-                    this.eventEmitter.emit(XMPPEvents.BRIDGE_DOWN);
-                }
-                break;
-            case "jibri-recording-status":
-                var jibri = node;
-                break;
-            case "call-control":
-                var att = node.attributes;
-                if(!att)
-                    break;
-                this.phoneNumber = att.phone || null;
-                this.phonePin = att.pin || null;
-                this.eventEmitter.emit(XMPPEvents.PHONE_NUMBER_CHANGED);
-                break;
-            default :
-                this.processNode(node, from);
         }
-
     }
 
     if (from == this.myroomjid) {
-        if (member.affiliation == 'owner')
-
-            if (this.role !== member.role) {
+        if (member.affiliation == 'owner'
+            &&  this.role !== member.role) {
                 this.role = member.role;
-
-                this.eventEmitter.emit(XMPPEvents.LOCAL_ROLE_CHANGED, this.role);
-            }
+                this.eventEmitter.emit(
+                    XMPPEvents.LOCAL_ROLE_CHANGED, this.role);
+        }
         if (!this.joined) {
             this.joined = true;
             console.log("(TIME) MUC joined:\t", window.performance.now());
-            this.eventEmitter.emit(XMPPEvents.MUC_JOINED, from, member);
+            this.eventEmitter.emit(XMPPEvents.MUC_JOINED);
         }
     } else if (this.members[from] === undefined) {
         // new participant
@@ -288,14 +261,16 @@ ChatRoom.prototype.onPresence = function (pres) {
             logger.info("Ignore focus: " + from + ", real JID: " + member.jid);
         }
         else {
-            this.eventEmitter.emit(XMPPEvents.MUC_MEMBER_JOINED, from, member.id, member.nick);
+            this.eventEmitter.emit(
+                XMPPEvents.MUC_MEMBER_JOINED, from, member.nick);
         }
     } else {
         // Presence update for existing participant
         // Watch role change:
         if (this.members[from].role != member.role) {
             this.members[from].role = member.role;
-            this.eventEmitter.emit(XMPPEvents.MUC_ROLE_CHANGED, from, member.role);
+            this.eventEmitter.emit(
+                XMPPEvents.MUC_ROLE_CHANGED, from, member.role);
         }
 
         // store the new display name
@@ -303,7 +278,45 @@ ChatRoom.prototype.onPresence = function (pres) {
             this.members[from].displayName = member.displayName;
     }
 
+    // after we had fired member or room joined events, lets fire events
+    // for the rest info we got in presence
+    for(var i = 0; i < nodes.length; i++)
+    {
+        var node = nodes[i];
+        switch(node.tagName)
+        {
+            case "nick":
+                if(!member.isFocus) {
+                    var displayName = !this.xmpp.options.displayJids
+                        ? member.nick : Strophe.getResourceFromJid(from);
 
+                    if (displayName && displayName.length > 0) {
+                        this.eventEmitter.emit(
+                            XMPPEvents.DISPLAY_NAME_CHANGED, from, displayName);
+                    }
+                }
+                break;
+            case "bridgeIsDown":
+                if(!this.bridgeIsDown) {
+                    this.bridgeIsDown = true;
+                    this.eventEmitter.emit(XMPPEvents.BRIDGE_DOWN);
+                }
+                break;
+            case "jibri-recording-status":
+                var jibri = node;
+                break;
+            case "call-control":
+                var att = node.attributes;
+                if(!att)
+                    break;
+                this.phoneNumber = att.phone || null;
+                this.phonePin = att.pin || null;
+                this.eventEmitter.emit(XMPPEvents.PHONE_NUMBER_CHANGED);
+                break;
+            default :
+                this.processNode(node, from);
+        }
+    }
 
     if(!member.isFocus)
         this.eventEmitter.emit(XMPPEvents.USER_ID_CHANGED, from, member.id);