Simplifies logic and renames a method.

Fixes tests.

modules/statistics/SpeakerStats.js

@@ -20,9 +20,9 @@ class SpeakerStats {
         this._userId = userId;
         this.setDisplayName(displayName);
         this._isLocalStats = isLocalStats || false;
-        this.setIsDominantSpeaker(false);
+        this.setDominantSpeaker(false);
         this.totalDominantSpeakerTime = 0;
-        this._dominantSpeakerStart = null;
+        this._dominantSpeakerStart = 0;
         this._hasLeft = false;
     }
 
@@ -69,7 +69,7 @@ class SpeakerStats {
      * @returns {boolean}
      */
     isDominantSpeaker() {
-        return this._isDominantSpeaker;
+        return this._dominantSpeakerStart > 0;
     }
 
     /**
@@ -80,18 +80,16 @@ class SpeakerStats {
      * and will record any time accumulated since starting as dominant speaker.
      * @returns {void}
      */
-    setIsDominantSpeaker(isNowDominantSpeaker) {
-        if (!this._isDominantSpeaker && isNowDominantSpeaker) {
+    setDominantSpeaker(isNowDominantSpeaker) {
+        if (!this.isDominantSpeaker() && isNowDominantSpeaker) {
             this._dominantSpeakerStart = Date.now();
-        } else if (this._isDominantSpeaker && !isNowDominantSpeaker) {
+        } else if (this.isDominantSpeaker() && !isNowDominantSpeaker) {
             const now = Date.now();
-            const timeElapsed = now - (this._dominantSpeakerStart || 0);
+            const timeElapsed = now - this._dominantSpeakerStart;
 
             this.totalDominantSpeakerTime += timeElapsed;
-            this._dominantSpeakerStart = null;
+            this._dominantSpeakerStart = 0;
         }
-
-        this._isDominantSpeaker = isNowDominantSpeaker;
     }
 
     /**
@@ -102,7 +100,7 @@ class SpeakerStats {
     getTotalDominantSpeakerTime() {
         let total = this.totalDominantSpeakerTime;
 
-        if (this._isDominantSpeaker) {
+        if (this.isDominantSpeaker()) {
             total += Date.now() - this._dominantSpeakerStart;
         }
 
@@ -125,7 +123,7 @@ class SpeakerStats {
      */
     markAsHasLeft() {
         this._hasLeft = true;
-        this.setIsDominantSpeaker(false);
+        this.setDominantSpeaker(false);
     }
 }
 

modules/statistics/SpeakerStats.spec.js

@@ -16,7 +16,7 @@ describe('SpeakerStats', () => {
         });
 
         it('removes the user as a dominant speaker', () => {
-            speakerStats.setIsDominantSpeaker(true);
+            speakerStats.setDominantSpeaker(true);
             speakerStats.markAsHasLeft();
             expect(speakerStats.isDominantSpeaker()).toBe(false);
         });
@@ -48,9 +48,9 @@ describe('SpeakerStats', () => {
             const domaintSpeakerTime = 100;
 
             for (let i = 0; i < domaintSpeakerEvents; i++) {
-                speakerStats.setIsDominantSpeaker(true);
+                speakerStats.setDominantSpeaker(true);
                 jasmine.clock().tick(domaintSpeakerTime);
-                speakerStats.setIsDominantSpeaker(false);
+                speakerStats.setDominantSpeaker(false);
             }
 
             expect(speakerStats.getTotalDominantSpeakerTime())

modules/statistics/SpeakerStatsCollector.js

@@ -39,9 +39,11 @@ export default class SpeakerStatsCollector {
         conference.addEventListener(
             JitsiConferenceEvents.DISPLAY_NAME_CHANGED,
             this._onDisplayNameChange.bind(this));
-        conference.xmpp.addListener(
-            XMPPEvents.SPEAKER_STATS_RECEIVED,
-            this._updateStats.bind(this));
+        if (conference.xmpp) {
+            conference.xmpp.addListener(
+                XMPPEvents.SPEAKER_STATS_RECEIVED,
+                this._updateStats.bind(this));
+        }
     }
 
     /**
@@ -58,8 +60,8 @@ export default class SpeakerStatsCollector {
             = this.stats.users[this.stats.dominantSpeakerId];
         const newDominantSpeaker = this.stats.users[dominantSpeakerId];
 
-        oldDominantSpeaker && oldDominantSpeaker.setIsDominantSpeaker(false);
-        newDominantSpeaker && newDominantSpeaker.setIsDominantSpeaker(true);
+        oldDominantSpeaker && oldDominantSpeaker.setDominantSpeaker(false);
+        newDominantSpeaker && newDominantSpeaker.setDominantSpeaker(true);
         this.stats.dominantSpeakerId = dominantSpeakerId;
     }
 

modules/xmpp/xmpp.js

@@ -596,7 +596,7 @@ export default class XMPP extends Listenable {
 
         msg.c('speakerstats', {
             xmlns: 'http://jitsi.org/jitmeet',
-            room: `${roomJid}` })
+            room: roomJid })
             .up();
 
         this.connection.send(msg);