videoroom: fix parse "Leave" and "Unpublish" event (#50)

Co-authored-by: Sergey Slobodenyuk <mdev_86@mail.ru>
meetecho · Dec 2, 2024 · bb6642c · bb6642c
1 parent 7e8b920
commit bb6642c
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/plugins/videoroom-plugin.js b/src/plugins/videoroom-plugin.js
@@ -516,13 +516,6 @@ class VideoRoomHandle extends Handle {
             janode_event.data.configured = message_data.configured;
             break;
           }
-          /* Display name changed event */
-          if (typeof message_data.display !== 'undefined' && typeof message_data.switched === 'undefined') {
-            janode_event.event = PLUGIN_EVENT.DISPLAY;
-            janode_event.data.feed = message_data.id;
-            janode_event.data.display = message_data.display;
-            break;
-          }
           /* Subscribed feed started */
           if (typeof message_data.started !== 'undefined') {
             janode_event.event = PLUGIN_EVENT.STARTED;
@@ -559,13 +552,22 @@ class VideoRoomHandle extends Handle {
           if (typeof message_data.unpublished !== 'undefined') {
             janode_event.event = PLUGIN_EVENT.UNPUBLISHED;
             janode_event.data.feed = (message_data.unpublished === 'ok') ? this.feed : message_data.unpublished;
+            if (message_data.display) janode_event.data.display = message_data.display;
             break;
           }
           /* Leaving confirmation */
           if (typeof message_data.leaving !== 'undefined') {
             janode_event.event = PLUGIN_EVENT.LEAVING;
             janode_event.data.feed = (message_data.leaving === 'ok') ? this.feed : message_data.leaving;
             if (message_data.reason) janode_event.data.reason = message_data.reason;
+            if (message_data.display) janode_event.data.display = message_data.display;
+            break;
+          }
+          /* Display name changed event */
+          if (typeof message_data.display !== 'undefined' && typeof message_data.switched === 'undefined') {
+            janode_event.event = PLUGIN_EVENT.DISPLAY;
+            janode_event.data.feed = message_data.id;
+            janode_event.data.display = message_data.display;
             break;
           }
           /* Participant kicked out */