Simplifies logic around userID and callstatsUsername in callstats.

JitsiConference.js

@@ -285,19 +285,13 @@ JitsiConference.prototype._init = function(options = {}) {
     }
 
     const { config } = this.options;
-    const statsCurrentId = config.enableEmailInStats && config.email
-        ? config.email : Settings.callStatsUserName;
-    const createRoomOptions = {
-        ...config
-    };
-
-    if (config.enableStatsID) {
-        createRoomOptions.statsId = statsCurrentId;
-    }
+    const statsCurrentId = config.statisticsId ? config.statisticsId : Settings.callStatsUserName;
 
     this.room = this.xmpp.createRoom(
-        this.options.name,
-        createRoomOptions,
+        this.options.name, {
+            ...config,
+            statsId: statsCurrentId
+        },
         JitsiConference.resourceCreator
     );
 
@@ -354,25 +348,9 @@ JitsiConference.prototype._init = function(options = {}) {
     this.participantConnectionStatus.init();
 
     if (!this.statistics) {
-        let aliasName = this.myUserId();
-        let userName = statsCurrentId;
-
-        if (config.enableDisplayNameInStats && config.displayName) {
-            aliasName = config.displayName;
-        }
-
-        if (config.enableStatsID) {
-            // let's swap the values, as instead of components to report
-            // the xmpp resource as id will use the supplied statsId
-            const newAlias = userName;
-
-            userName = aliasName;
-            aliasName = newAlias;
-        }
-
         this.statistics = new Statistics(this.xmpp, {
-            aliasName,
-            userName,
+            aliasName: statsCurrentId,
+            userName: config.statisticsDisplayName ? config.statisticsDisplayName : this.myUserId(),
             callStatsConfIDNamespace: this.connection.options.hosts.domain,
             confID: config.confID || `${this.connection.options.hosts.domain}/${this.options.name}`,
             customScriptUrl: config.callStatsCustomScriptUrl,
@@ -383,7 +361,7 @@ JitsiConference.prototype._init = function(options = {}) {
             getWiFiStatsMethod: config.getWiFiStatsMethod
         });
         Statistics.analytics.addPermanentProperties({
-            'callstats_name': aliasName
+            'callstats_name': statsCurrentId
         });
     }
 
@@ -2553,12 +2531,10 @@ JitsiConference.prototype._acceptP2PIncomingCall = function(
 
     let remoteID = Strophe.getResourceFromJid(this.p2pJingleSession.remoteJid);
 
-    if (this.options.config.enableStatsID) {
-        const participant = this.participants[remoteID];
+    const participant = this.participants[remoteID];
 
-        if (participant) {
-            remoteID = participant.getStatsID() || remoteID;
-        }
+    if (participant) {
+        remoteID = participant.getStatsID() || remoteID;
     }
 
     this.statistics.startCallStats(
@@ -2903,12 +2879,10 @@ JitsiConference.prototype._startP2PSession = function(remoteJid) {
 
     let remoteID = Strophe.getResourceFromJid(this.p2pJingleSession.remoteJid);
 
-    if (this.options.config.enableStatsID) {
-        const participant = this.participants[remoteID];
+    const participant = this.participants[remoteID];
 
-        if (participant) {
-            remoteID = participant.getStatsID() || remoteID;
-        }
+    if (participant) {
+        remoteID = participant.getStatsID() || remoteID;
     }
 
     this.statistics.startCallStats(

doc/API.md

@@ -218,18 +218,16 @@ This objects represents the server connection. You can create new ```JitsiConnec
 4. initJitsiConference(name, options) - creates new ```JitsiConference``` object.
     - name - the name of the conference
     - options - JS object with configuration options for the conference. You can change the following properties there:
-        1. openBridgeChannel - Enables/disables bridge channel. Values can be "datachannel", "websocket", true (treat it as "datachannel"), undefined (treat it as "datachannel") and false (don't open any channel). **NOTE: we recommend to set that option to true**
-        2. recordingType - the type of recording to be used
-        3. jirecon
-        4. callStatsID - callstats credentials
-        5. callStatsSecret - callstats credentials
-        6. enableTalkWhileMuted - boolean property. Enables/disables talk while muted detection, by default the value is false/disabled.
-        7. ignoreStartMuted - ignores start muted events coming from jicofo.
-        8. enableStatsID - enables sending callStatsUsername as stats-id in presence, jicofo and videobridge will use it as endpointID to report stats
-        9. enableDisplayNameInStats - enables sending the users display name, if set, to callstats as alias of the endpointID stats
-        10. startSilent - enables silent mode, will mark audio as inactive will not send/receive audio
-        11. confID - Used for statistics to identify conference, if tenants are supported will contain tenant and the non lower case variant for the room name.
-        12. enableEmailInStats - enables sending the users emails to callstats as id of the endpointID stats, set as presence so it can reach jicofo and jvb to use it when reporting, set as id to the anlytics
+        - openBridgeChannel - Enables/disables bridge channel. Values can be "datachannel", "websocket", true (treat it as "datachannel"), undefined (treat it as "datachannel") and false (don't open any channel). **NOTE: we recommend to set that option to true**
+        - recordingType - the type of recording to be used
+        - callStatsID - callstats credentials
+        - callStatsSecret - callstats credentials
+        - enableTalkWhileMuted - boolean property. Enables/disables talk while muted detection, by default the value is false/disabled.
+        - ignoreStartMuted - ignores start muted events coming from jicofo.
+        - startSilent - enables silent mode, will mark audio as inactive will not send/receive audio
+        - confID - Used for statistics to identify conference, if tenants are supported will contain tenant and the non lower case variant for the room name.
+        - statisticsId - The id to be used as stats instead of default callStatsUsername.
+        - statisticsDisplayName - The display name to be used for stats, used for callstats.
 
         **NOTE: if 4 and 5 are set the library is going to send events to callstats. Otherwise the callstats integration will be disabled.**