Преглед изворни кода

feat: Drop conference duration component and use the data form.

release-8443
damencho пре 1 година
родитељ
комит
ff9f57c555
3 измењених фајлова са 12 додато и 12 уклоњено
  1. 3
    5
      JitsiConferenceEventManager.js
  2. 9
    0
      modules/xmpp/ChatRoom.js
  3. 0
    7
      modules/xmpp/xmpp.js

+ 3
- 5
JitsiConferenceEventManager.js Прегледај датотеку

@@ -135,6 +135,9 @@ JitsiConferenceEventManager.prototype.setupChatRoomListeners = function() {
135 135
     this.chatRoomForwarder.forward(XMPPEvents.MEETING_ID_SET,
136 136
         JitsiConferenceEvents.CONFERENCE_UNIQUE_ID_SET);
137 137
 
138
+    this.chatRoomForwarder.forward(XMPPEvents.CONFERENCE_TIMESTAMP_RECEIVED,
139
+        JitsiConferenceEvents.CONFERENCE_CREATED_TIMESTAMP);
140
+
138 141
     // send some analytics events
139 142
     chatRoom.addListener(XMPPEvents.MUC_JOINED,
140 143
         () => {
@@ -653,11 +656,6 @@ JitsiConferenceEventManager.prototype.setupXMPPListeners = function() {
653 656
             conference.eventEmitter.emit(JitsiConferenceEvents.STARTED_MUTED);
654 657
         });
655 658
 
656
-    this._addConferenceXMPPListener(XMPPEvents.CONFERENCE_TIMESTAMP_RECEIVED,
657
-        createdTimestamp => {
658
-            conference.eventEmitter.emit(JitsiConferenceEvents.CONFERENCE_CREATED_TIMESTAMP, createdTimestamp);
659
-        });
660
-
661 659
     this._addConferenceXMPPListener(XMPPEvents.AV_MODERATION_CHANGED,
662 660
         (value, mediaType, actorJid) => {
663 661
             const actorParticipant = conference.getParticipants().find(p => p.getJid() === actorJid);

+ 9
- 0
modules/xmpp/ChatRoom.js Прегледај датотеку

@@ -371,6 +371,15 @@ export default class ChatRoom extends Listenable {
371 371
                 logger.warn('No meeting ID from backend');
372 372
             }
373 373
 
374
+            const meetingCreatedTSValEl
375
+                = $(result).find('>query>x[type="result"]>field[var="muc#roominfo_created_timestamp"]>value');
376
+
377
+            if (meetingCreatedTSValEl.length) {
378
+                this.eventEmitter.emit(XMPPEvents.CONFERENCE_TIMESTAMP_RECEIVED, meetingCreatedTSValEl.text());
379
+            } else {
380
+                logger.warn('No conference duration from backend');
381
+            }
382
+
374 383
             const membersOnly = $(result).find('>query>feature[var="muc_membersonly"]').length === 1;
375 384
 
376 385
             const lobbyRoomField

+ 0
- 7
modules/xmpp/xmpp.js Прегледај датотеку

@@ -443,11 +443,6 @@ export default class XMPP extends Listenable {
443 443
                 this._components.push(this.speakerStatsComponentAddress);
444 444
             }
445 445
 
446
-            if (identity.type === 'conference_duration') {
447
-                this.conferenceDurationComponentAddress = identity.name;
448
-                this._components.push(this.conferenceDurationComponentAddress);
449
-            }
450
-
451 446
             if (identity.type === 'lobbyrooms') {
452 447
                 this.lobbySupported = true;
453 448
                 const processLobbyFeatures = f => {
@@ -1058,8 +1053,6 @@ export default class XMPP extends Listenable {
1058 1053
 
1059 1054
         if (parsedJson[JITSI_MEET_MUC_TYPE] === 'speakerstats' && parsedJson.users) {
1060 1055
             this.eventEmitter.emit(XMPPEvents.SPEAKER_STATS_RECEIVED, parsedJson.users);
1061
-        } else if (parsedJson[JITSI_MEET_MUC_TYPE] === 'conference_duration' && parsedJson.created_timestamp) {
1062
-            this.eventEmitter.emit(XMPPEvents.CONFERENCE_TIMESTAMP_RECEIVED, parsedJson.created_timestamp);
1063 1056
         } else if (parsedJson[JITSI_MEET_MUC_TYPE] === 'av_moderation') {
1064 1057
             this.eventEmitter.emit(XMPPEvents.AV_MODERATION_RECEIVED, parsedJson);
1065 1058
         } else if (parsedJson[JITSI_MEET_MUC_TYPE] === 'breakout_rooms') {

Loading…
Откажи
Сачувај