From a6566704ff59ed7ab8f0757aaa0606fc9609e93c Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu, 22 May 2014 18:28:14 +0200
Subject: [PATCH] Fix owner's action mess when a peer shares its screen

---
 public/js/simplewebrtc.bundle.js |  2 +-
 public/js/vroom.js               | 44 ++++++++++++++++++++++++++++++++--------
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/public/js/simplewebrtc.bundle.js b/public/js/simplewebrtc.bundle.js
index 327011c..c101f56 100644
--- a/public/js/simplewebrtc.bundle.js
+++ b/public/js/simplewebrtc.bundle.js
@@ -5148,7 +5148,7 @@ Peer.prototype.handleMessage = function (message) {
     } else if (message.type === 'unmute') {
         this.parent.emit('unmute', {id: message.from, name: message.payload.name});
     } else {
-        this.parent.emit(message.type, {id: message.from, payload: message.payload});
+        this.parent.emit(message.type, {id: message.from, payload: message.payload, roomType: message.roomType});
     }
 };
 
diff --git a/public/js/vroom.js b/public/js/vroom.js
index 3b5209a..978c9c8 100644
--- a/public/js/vroom.js
+++ b/public/js/vroom.js
@@ -568,11 +568,12 @@ function initVroom(room) {
 
   // An owner is muting/unmuting ourself
   webrtc.on('owner_toggle_mute', function(data){
-    if (peers[data.id].role != 'owner'){
+    // Ignore this if the remote peer isn't the owner of the room
+    // or if the peer receiving it is our local screen
+    if (peers[data.id].role != 'owner' || data.roomType == 'screen'){
       return;
     }
     if (data.payload.peer && data.payload.peer == peers.local.id && peers.local.role != 'owner'){
-      // Ignore this if the remote peer isn't the owner of the room
       if (!peers.local.micMuted){
         muteMic();
         $('#muteMicLabel').addClass('btn-danger active');
@@ -597,7 +598,7 @@ function initVroom(room) {
   });
   // An owner is pausing/resuming our webcam
   webrtc.on('owner_toggle_pause', function(data){
-    if (peers[data.id].role != 'owner'){
+    if (peers[data.id].role != 'owner' || data.roomType == 'screen'){
       return;
     }
     if (data.payload.peer && data.payload.peer == peers.local.id && peers.local.role != 'owner'){
@@ -625,7 +626,7 @@ function initVroom(room) {
   });
   // An owner is kicking us from the room
   webrtc.on('owner_kick', function(data){
-    if (peers[data.id].role != 'owner'){
+    if (peers[data.id].role != 'owner' || data.roomType == 'screen'){
       return;
     }
     if (data.payload.peer && data.payload.peer == peers.local.id && peers.local.role != 'owner'){
@@ -760,12 +761,15 @@ function initVroom(room) {
   // This peer claims he changed its role (usually from participant to owner)
   // Lets check this
   webrtc.on('role_change', function(data){
+    if (data.roomType == 'screen'){
+      return;
+    }
     getPeerRole(data.id);
   });
 
   // A new notified email has been added
   webrtc.on('notif_change', function(data){
-    if (peers.local.role != 'owner'){
+    if (peers.local.role != 'owner' || data.roomType == 'screen'){
       return;
     }
     $('#emailNotificationList > li').remove();
@@ -792,22 +796,37 @@ function initVroom(room) {
 
   // A few notif on password set/unset or lock/unlock
   webrtc.on('room_locked', function(data){
+    if (data.roomType == 'screen'){
+      return;
+    }
     $('#lockLabel').addClass('btn-danger active');
     $('#lockButton').prop('checked', true);
     $.notify(sprintf(locale.ROOM_LOCKED_BY_s, stringEscape(peers[data.id].displayName)), 'info');
   });
   webrtc.on('room_unlocked', function(data){
+    if (data.roomType == 'screen'){
+      return;
+    }
     $('#lockLabel').removeClass('btn-danger active');
     $('#lockButton').prop('checked', false);
     $.notify(sprintf(locale.ROOM_UNLOCKED_BY_s, stringEscape(peers[data.id].displayName)), 'info');
   });
   webrtc.on('password_protect_on', function(data){
+    if (data.roomType == 'screen'){
+      return;
+    }
     $.notify(sprintf(locale.PASSWORD_PROTECT_ON_BY_s, stringEscape(peers[data.id].displayName)), 'info');
   });
   webrtc.on('password_protect_off', function(data){
+    if (data.roomType == 'screen'){
+      return;
+    }
     $.notify(sprintf(locale.PASSWORD_PROTECT_OFF_BY_s, stringEscape(peers[data.id].displayName)), 'info');
   });
   webrtc.on('owner_password_changed', function(data){
+    if (data.roomType == 'screen'){
+      return;
+    }
     if (peers.local.role == 'owner'){
       $.notify(sprintf(locale.OWNER_PASSWORD_CHANGED_BY_s, stringEscape(peers[data.id].displayName)), 'warn');
     }
@@ -816,6 +835,9 @@ function initVroom(room) {
     }
   });
   webrtc.on('owner_password_removed', function(data){
+    if (data.roomType == 'screen'){
+      return;
+    }
     if (peers.local.role == 'owner'){
       $.notify(sprintf(locale.OWNER_PASSWORD_REMOVED_BY_s, stringEscape(peers[data.id].displayName)), 'warn');
     }
@@ -882,15 +904,19 @@ function initVroom(room) {
   webrtc.on('videoRemoved', function(video,peer){
     playSound('leave.mp3');
     var id = (peer) ? peer.id : 'local';
-    id = (video.id.match(/_screen_/)) ? id + '_screen' : id;
+    // Is the screen sharing of a peer being removed ?
+    if (video.id.match(/_screen_/)){
+      id = id + '_screen';
+    }
+    // Or the peer itself
+    else if (peer && peers[peer.id]){
+      delete peers[peer.id];
+    }
     $("#peer_" + id).remove();
     if (mainVid === id){
       $('#mainVideo').html('');
       mainVid = false;
     }
-    if (peer && peers[peer.id]){
-      delete peers[peer.id];
-    }
   });
 
   // Error sending something through dataChannel