Merge pull request #13 from bipmeet/bugfix/BM-4399

Bugfix/bm 4399
bipmeet · Sep 19, 2024 · c296486 · c296486
2 parents 928d1cb + ea8fef9
commit c296486
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/JitsiConferenceEventManager.js b/JitsiConferenceEventManager.js
@@ -135,8 +135,9 @@ JitsiConferenceEventManager.prototype.setupChatRoomListeners = function() {
     this.chatRoomForwarder.forward(XMPPEvents.MEETING_ID_SET,
         JitsiConferenceEvents.CONFERENCE_UNIQUE_ID_SET);
 
-    this.chatRoomForwarder.forward(XMPPEvents.CONFERENCE_TIMESTAMP_RECEIVED,
-        JitsiConferenceEvents.CONFERENCE_CREATED_TIMESTAMP);
+    // Added with upgrade. We are not using it at the moment.
+    // this.chatRoomForwarder.forward(XMPPEvents.CONFERENCE_TIMESTAMP_RECEIVED,
+    //     JitsiConferenceEvents.CONFERENCE_CREATED_TIMESTAMP);
 
     // send some analytics events
     chatRoom.addListener(XMPPEvents.MUC_JOINED,
@@ -689,6 +690,11 @@ JitsiConferenceEventManager.prototype.setupXMPPListeners = function() {
             conference.eventEmitter.emit(JitsiConferenceEvents.STARTED_MUTED);
         });
 
+    this._addConferenceXMPPListener(XMPPEvents.CONFERENCE_TIMESTAMP_RECEIVED,
+        createdTimestamp => {
+            conference.eventEmitter.emit(JitsiConferenceEvents.CONFERENCE_CREATED_TIMESTAMP, createdTimestamp);
+        });
+
     this._addConferenceXMPPListener(XMPPEvents.CONFERENCE_TIMESTAMP_RECEIVED,
         conferenceDurationObj => {
             conference.eventEmitter.emit(JitsiConferenceEvents.CONFERENCE_CREATED_TIMESTAMP, conferenceDurationObj);

diff --git a/modules/xmpp/ChatRoom.js b/modules/xmpp/ChatRoom.js
@@ -453,14 +453,15 @@ export default class ChatRoom extends Listenable {
                 logger.warn('No meeting ID from backend');
             }
 
-            const meetingCreatedTSValEl
-                = $(result).find('>query>x[type="result"]>field[var="muc#roominfo_created_timestamp"]>value');
-
-            if (meetingCreatedTSValEl.length) {
-                this.eventEmitter.emit(XMPPEvents.CONFERENCE_TIMESTAMP_RECEIVED, meetingCreatedTSValEl.text());
-            } else {
-                logger.warn('No conference duration from backend');
-            }
+            // Added with upgrade. We are not using it at the moment.
+            // const meetingCreatedTSValEl
+            //     = $(result).find('>query>x[type="result"]>field[var="muc#roominfo_created_timestamp"]>value');
+
+            // if (meetingCreatedTSValEl.length) {
+            //     this.eventEmitter.emit(XMPPEvents.CONFERENCE_TIMESTAMP_RECEIVED, meetingCreatedTSValEl.text());
+            // } else {
+            //     logger.warn('No conference duration from backend');
+            // }
 
             const membersOnly = $(result).find('>query>feature[var="muc_membersonly"]').length === 1;
 

diff --git a/modules/xmpp/xmpp.js b/modules/xmpp/xmpp.js
@@ -441,6 +441,11 @@ export default class XMPP extends Listenable {
                 this._components.push(this.speakerStatsComponentAddress);
             }
 
+            if (identity.type === 'conference_duration') {
+                this.conferenceDurationComponentAddress = identity.name;
+                this._components.push(this.conferenceDurationComponentAddress);
+            }
+
             if (identity.type === 'lobbyrooms') {
                 this.lobbySupported = true;
                 const processLobbyFeatures = f => {