From fb7f04be4d7261b3f83178b8aa7802032f2746bc Mon Sep 17 00:00:00 2001
From: Miroslav Pejic <miroslav.pejic.85@gmail.com>
Date: Thu, 7 Dec 2023 10:48:18 +0100
Subject: [PATCH] [mirotalksfu] - #137 fix 4 broadcasting

---
 public/js/Room.js       |  4 +--
 public/js/RoomClient.js | 73 +++++++++++++++++++++++++++--------------
 public/js/Rules.js      |  4 +--
 3 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/public/js/Room.js b/public/js/Room.js
index c2e3efe1..c4eccf97 100644
--- a/public/js/Room.js
+++ b/public/js/Room.js
@@ -3035,7 +3035,7 @@ async function saveRoomPeers() {
 
 async function getRoomParticipants() {
     const peers = await getRoomPeers();
-    const lists = await getParticipantsList(peers);
+    const lists = getParticipantsList(peers);
     participantsCount = peers.size;
     participantsList.innerHTML = lists;
     refreshParticipantsCount(participantsCount, false);
@@ -3043,7 +3043,7 @@ async function getRoomParticipants() {
     console.log('*** Refresh Chat participant lists ***');
 }
 
-async function getParticipantsList(peers) {
+function getParticipantsList(peers) {
     // CHAT-GPT
     let li = `
     <li 
diff --git a/public/js/RoomClient.js b/public/js/RoomClient.js
index e87a396b..6258f49e 100644
--- a/public/js/RoomClient.js
+++ b/public/js/RoomClient.js
@@ -5352,6 +5352,7 @@ class RoomClient {
                 message: '',
                 broadcast: broadcast,
             };
+            console.log('peerAction', data);
 
             if (!this.thereAreParticipants()) {
                 if (info) return this.userLog('info', 'No participants detected', 'top-end');
@@ -5359,33 +5360,59 @@ class RoomClient {
             if (!broadcast) {
                 switch (action) {
                     case 'mute':
-                        const peerAudioStatus = this.getId(data.peer_id + '__audio');
-                        if (!peerAudioStatus || peerAudioStatus.className == html.audioOff) {
-                            if (isRulesActive && isPresenter) {
-                                data.action = 'unmute';
-                                return this.confirmPeerAction(data.action, data);
+                        const audioMessage =
+                            'The participant has been muted, and only they have the ability to unmute themselves';
+                        if (isBroadcastingEnabled) {
+                            const peerAudioButton = this.getId(data.peer_id + '___pAudio');
+                            if (peerAudioButton) {
+                                const peerAudioIcon = peerAudioButton.querySelector('i');
+                                if (peerAudioIcon && peerAudioIcon.style.color == 'red') {
+                                    if (isRulesActive && isPresenter) {
+                                        data.action = 'unmute';
+                                        return this.confirmPeerAction(data.action, data);
+                                    }
+                                    return this.userLog('info', audioMessage, 'top-end');
+                                }
+                            }
+                        } else {
+                            const peerAudioStatus = this.getId(data.peer_id + '__audio');
+                            if (!peerAudioStatus || peerAudioStatus.className == html.audioOff) {
+                                if (isRulesActive && isPresenter) {
+                                    data.action = 'unmute';
+                                    return this.confirmPeerAction(data.action, data);
+                                }
+                                return this.userLog('info', audioMessage, 'top-end');
                             }
-                            return this.userLog(
-                                'info',
-                                'The participant has been muted, and only they have the ability to unmute themselves',
-                                'top-end',
-                            );
                         }
                         break;
                     case 'hide':
-                        const peerVideoOff = this.getId(data.peer_id + '__videoOff');
-                        if (peerVideoOff) {
-                            if (isRulesActive && isPresenter) {
-                                data.action = 'unhide';
-                                return this.confirmPeerAction(data.action, data);
+                        const videoMessage =
+                            'The participant is currently hidden, and only they have the option to unhide themselves';
+                        if (isBroadcastingEnabled) {
+                            const peerVideoButton = this.getId(data.peer_id + '___pVideo');
+                            if (peerVideoButton) {
+                                const peerVideoIcon = peerVideoButton.querySelector('i');
+                                if (peerVideoIcon && peerVideoIcon.style.color == 'red') {
+                                    if (isRulesActive && isPresenter) {
+                                        data.action = 'unhide';
+                                        return this.confirmPeerAction(data.action, data);
+                                    }
+                                    return this.userLog('info', videoMessage, 'top-end');
+                                }
+                            }
+                        } else {
+                            const peerVideoOff = this.getId(data.peer_id + '__videoOff');
+                            if (peerVideoOff) {
+                                if (isRulesActive && isPresenter) {
+                                    data.action = 'unhide';
+                                    return this.confirmPeerAction(data.action, data);
+                                }
+                                return this.userLog('info', videoMessage, 'top-end');
                             }
-                            return this.userLog(
-                                'info',
-                                'The participant is currently hidden, and only they have the option to unhide themselves',
-                                'top-end',
-                            );
                         }
                     case 'stop':
+                        const screenMessage =
+                            'The participant screen is not shared, only the participant can initiate sharing';
                         const peerScreenButton = this.getId(id);
                         if (peerScreenButton) {
                             const peerScreenStatus = peerScreenButton.querySelector('i');
@@ -5394,11 +5421,7 @@ class RoomClient {
                                     data.action = 'start';
                                     return this.confirmPeerAction(data.action, data);
                                 }
-                                return this.userLog(
-                                    'info',
-                                    'The participant screen is not shared, only the participant can initiate sharing',
-                                    'top-end',
-                                );
+                                return this.userLog('info', screenMessage, 'top-end');
                             }
                         }
                         break;
diff --git a/public/js/Rules.js b/public/js/Rules.js
index 88b86d95..3111683f 100644
--- a/public/js/Rules.js
+++ b/public/js/Rules.js
@@ -180,7 +180,7 @@ function handleRulesBroadcasting() {
     BUTTONS.main.startVideoButton = false;
     BUTTONS.main.startScreenButton = false;
     BUTTONS.main.swapCameraButton = false;
-    BUTTONS.main.raiseHandButton = false;
+    //BUTTONS.main.raiseHandButton = false;
     BUTTONS.main.whiteboardButton = false;
     //BUTTONS.main.emojiRoomButton = false,
     BUTTONS.main.transcriptionButton = false;
@@ -208,7 +208,7 @@ function handleRulesBroadcasting() {
     elemDisplay('startScreenButton', false);
     elemDisplay('stopScreenButton', false);
     elemDisplay('swapCameraButton', false);
-    elemDisplay('raiseHandButton', false);
+    //elemDisplay('raiseHandButton', false);
     elemDisplay('whiteboardButton', false);
     //elemDisplay('emojiRoomButton', false);
     elemDisplay('transcriptionButton', false);