From a1ed79c5dbba16f904d142949f968730c84194ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= <havar@fosstveit.net>
Date: Mon, 4 May 2020 15:09:05 +0200
Subject: [PATCH] A button to promote all peers from lobby, fixes #287

---
 app/src/RoomClient.js                         | 20 +++++++
 app/src/actions/roomActions.js                |  6 ++
 .../AccessControl/LockDialog/ListLobbyPeer.js | 25 +++++---
 .../AccessControl/LockDialog/LockDialog.js    | 24 +++++++-
 app/src/reducers/room.js                      | 60 ++++++++++---------
 app/src/translations/cn.json                  |  1 +
 app/src/translations/cs.json                  |  1 +
 app/src/translations/de.json                  |  1 +
 app/src/translations/dk.json                  |  1 +
 app/src/translations/el.json                  |  1 +
 app/src/translations/en.json                  |  1 +
 app/src/translations/es.json                  |  1 +
 app/src/translations/fr.json                  |  1 +
 app/src/translations/hr.json                  |  1 +
 app/src/translations/hu.json                  |  1 +
 app/src/translations/it.json                  |  1 +
 app/src/translations/nb.json                  |  1 +
 app/src/translations/pl.json                  |  1 +
 app/src/translations/pt.json                  |  1 +
 app/src/translations/ro.json                  |  1 +
 app/src/translations/tr.json                  |  1 +
 app/src/translations/uk.json                  |  1 +
 server/lib/Lobby.js                           |  4 +-
 23 files changed, 117 insertions(+), 39 deletions(-)

diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js
index d52631d..52b9383 100644
--- a/app/src/RoomClient.js
+++ b/app/src/RoomClient.js
@@ -1274,6 +1274,26 @@ export default class RoomClient
 			roomActions.setSelectedPeer(peerId));
 	}
 
+	async promoteAllLobbyPeers()
+	{
+		logger.debug('promoteAllLobbyPeers()');
+
+		store.dispatch(
+			roomActions.setLobbyPeersPromotionInProgress(true));
+
+		try
+		{
+			await this.sendRequest('promoteAllPeers');
+		}
+		catch (error)
+		{
+			logger.error('promoteAllLobbyPeers() [error:"%o"]', error);
+		}
+
+		store.dispatch(
+			roomActions.setLobbyPeersPromotionInProgress(false));
+	}
+
 	async promoteLobbyPeer(peerId)
 	{
 		logger.debug('promoteLobbyPeer() [peerId:"%s"]', peerId);
diff --git a/app/src/actions/roomActions.js b/app/src/actions/roomActions.js
index ddcfcc4..30ce37c 100644
--- a/app/src/actions/roomActions.js
+++ b/app/src/actions/roomActions.js
@@ -123,6 +123,12 @@ export const toggleConsumerFullscreen = (consumerId) =>
 		payload : { consumerId }
 	});
 
+export const setLobbyPeersPromotionInProgress = (flag) =>
+	({
+		type    : 'SET_LOBBY_PEERS_PROMOTION_IN_PROGRESS',
+		payload : { flag }
+	});
+
 export const setMuteAllInProgress = (flag) =>
 	({
 		type    : 'MUTE_ALL_IN_PROGRESS',
diff --git a/app/src/components/AccessControl/LockDialog/ListLobbyPeer.js b/app/src/components/AccessControl/LockDialog/ListLobbyPeer.js
index 97f1ff6..8f9843a 100644
--- a/app/src/components/AccessControl/LockDialog/ListLobbyPeer.js
+++ b/app/src/components/AccessControl/LockDialog/ListLobbyPeer.js
@@ -27,6 +27,7 @@ const ListLobbyPeer = (props) =>
 	const {
 		roomClient,
 		peer,
+		promotionInProgress,
 		canPromote,
 		classes
 	} = props;
@@ -55,7 +56,11 @@ const ListLobbyPeer = (props) =>
 				})}
 			>
 				<IconButton
-					disabled={!canPromote || peer.promotionInProgress}
+					disabled={
+						!canPromote ||
+						peer.promotionInProgress ||
+						promotionInProgress
+					}
 					onClick={(e) =>
 					{
 						e.stopPropagation();
@@ -71,18 +76,20 @@ const ListLobbyPeer = (props) =>
 
 ListLobbyPeer.propTypes =
 {
-	roomClient   : PropTypes.any.isRequired,
-	advancedMode : PropTypes.bool,
-	peer         : PropTypes.object.isRequired,
-	canPromote   : PropTypes.bool.isRequired,
-	classes      : PropTypes.object.isRequired
+	roomClient          : PropTypes.any.isRequired,
+	advancedMode        : PropTypes.bool,
+	peer                : PropTypes.object.isRequired,
+	promotionInProgress : PropTypes.bool.isRequired,
+	canPromote          : PropTypes.bool.isRequired,
+	classes             : PropTypes.object.isRequired
 };
 
 const mapStateToProps = (state, { id }) =>
 {
 	return {
-		peer       : state.lobbyPeers[id],
-		canPromote :
+		peer                : state.lobbyPeers[id],
+		promotionInProgress : state.room.lobbyPeersPromotionInProgress,
+		canPromote          :
 			state.me.roles.some((role) =>
 				state.room.permissionsFromRoles.PROMOTE_PEER.includes(role))
 	};
@@ -97,6 +104,8 @@ export default withRoomContext(connect(
 		{
 			return (
 				prev.room.permissionsFromRoles === next.room.permissionsFromRoles &&
+				prev.room.lobbyPeersPromotionInProgress ===
+					next.room.lobbyPeersPromotionInProgress &&
 				prev.me.roles === next.me.roles &&
 				prev.lobbyPeers === next.lobbyPeers
 			);
diff --git a/app/src/components/AccessControl/LockDialog/LockDialog.js b/app/src/components/AccessControl/LockDialog/LockDialog.js
index 04048cd..4d6cd24 100644
--- a/app/src/components/AccessControl/LockDialog/LockDialog.js
+++ b/app/src/components/AccessControl/LockDialog/LockDialog.js
@@ -51,9 +51,11 @@ const styles = (theme) =>
 	});
 
 const LockDialog = ({
+	roomClient,
 	room,
 	handleCloseLockDialog,
 	lobbyPeers,
+	canPromote,
 	classes
 }) =>
 {
@@ -102,6 +104,20 @@ const LockDialog = ({
 				</DialogContent>
 			}
 			<DialogActions>
+				<Button
+					disabled={
+						lobbyPeers.length === 0 ||
+						!canPromote ||
+						room.lobbyPeersPromotionInProgress
+					}
+					onClick={() => roomClient.promoteAllLobbyPeers()}
+					color='primary'
+				>
+					<FormattedMessage
+						id='label.promoteAllPeers'
+						defaultMessage='Promote all'
+					/>
+				</Button>
 				<Button onClick={() => handleCloseLockDialog(false)} color='primary'>
 					<FormattedMessage
 						id='label.close'
@@ -115,10 +131,12 @@ const LockDialog = ({
 
 LockDialog.propTypes =
 {
+	roomClient            : PropTypes.object.isRequired,
 	room                  : appPropTypes.Room.isRequired,
 	handleCloseLockDialog : PropTypes.func.isRequired,
 	handleAccessCode      : PropTypes.func.isRequired,
 	lobbyPeers            : PropTypes.array,
+	canPromote            : PropTypes.bool,
 	classes               : PropTypes.object.isRequired
 };
 
@@ -126,7 +144,10 @@ const mapStateToProps = (state) =>
 {
 	return {
 		room       : state.room,
-		lobbyPeers : lobbyPeersKeySelector(state)
+		lobbyPeers : lobbyPeersKeySelector(state),
+		canPromote :
+			state.me.roles.some((role) =>
+				state.room.permissionsFromRoles.PROMOTE_PEER.includes(role))
 	};
 };
 
@@ -144,6 +165,7 @@ export default withRoomContext(connect(
 		{
 			return (
 				prev.room === next.room &&
+				prev.me.roles === next.me.roles &&
 				prev.lobbyPeers === next.lobbyPeers
 			);
 		}
diff --git a/app/src/reducers/room.js b/app/src/reducers/room.js
index 0e422df..f4bc6ab 100644
--- a/app/src/reducers/room.js
+++ b/app/src/reducers/room.js
@@ -1,36 +1,37 @@
 const initialState =
 {
-	name                       : '',
+	name                          : '',
 	// new/connecting/connected/disconnected/closed,
-	state                      : 'new',
-	locked                     : false,
-	inLobby                    : false,
-	signInRequired             : false,
+	state                         : 'new',
+	locked                        : false,
+	inLobby                       : false,
+	signInRequired                : false,
 	// access code to the room if locked and joinByAccessCode == true
-	accessCode                 : '',
+	accessCode                    : '',
 	// if true: accessCode is a possibility to open the room
-	joinByAccessCode           : true, 
-	activeSpeakerId            : null,
-	torrentSupport             : false,
-	showSettings               : false,
-	fullScreenConsumer         : null, // ConsumerID
-	windowConsumer             : null, // ConsumerID
-	toolbarsVisible            : true,
-	mode                       : window.config.defaultLayout || 'democratic',
-	selectedPeerId             : null,
-	spotlights                 : [],
-	settingsOpen               : false,
-	extraVideoOpen             : false,
-	currentSettingsTab         : 'media', // media, appearence, advanced
-	lockDialogOpen             : false,
-	joined                     : false,
-	muteAllInProgress          : false,
-	stopAllVideoInProgress     : false,
-	closeMeetingInProgress     : false,
-	clearChatInProgress        : false,
-	clearFileSharingInProgress : false,
-	userRoles                  : { NORMAL: 'normal' }, // Default role
-	permissionsFromRoles       : {
+	joinByAccessCode              : true, 
+	activeSpeakerId               : null,
+	torrentSupport                : false,
+	showSettings                  : false,
+	fullScreenConsumer            : null, // ConsumerID
+	windowConsumer                : null, // ConsumerID
+	toolbarsVisible               : true,
+	mode                          : window.config.defaultLayout || 'democratic',
+	selectedPeerId                : null,
+	spotlights                    : [],
+	settingsOpen                  : false,
+	extraVideoOpen                : false,
+	currentSettingsTab            : 'media', // media, appearence, advanced
+	lockDialogOpen                : false,
+	joined                        : false,
+	muteAllInProgress             : false,
+	lobbyPeersPromotionInProgress : false,
+	stopAllVideoInProgress        : false,
+	closeMeetingInProgress        : false,
+	clearChatInProgress           : false,
+	clearFileSharingInProgress    : false,
+	userRoles                     : { NORMAL: 'normal' }, // Default role
+	permissionsFromRoles          : {
 		CHANGE_ROOM_LOCK : [],
 		PROMOTE_PEER     : [],
 		SEND_CHAT        : [],
@@ -199,6 +200,9 @@ const room = (state = initialState, action) =>
 			return { ...state, spotlights };
 		}
 
+		case 'SET_LOBBY_PEERS_PROMOTION_IN_PROGRESS':
+			return { ...state, lobbyPeersPromotionInProgress: action.payload.flag };
+
 		case 'MUTE_ALL_IN_PROGRESS':
 			return { ...state, muteAllInProgress: action.payload.flag };
 
diff --git a/app/src/translations/cn.json b/app/src/translations/cn.json
index 77de748..e82e9d5 100644
--- a/app/src/translations/cn.json
+++ b/app/src/translations/cn.json
@@ -106,6 +106,7 @@
 	"label.appearence": null,
 	"label.advanced": null,
 	"label.addVideo": null,
+	"label.promoteAllPeers": null,
 
 	"settings.settings": "设置",
 	"settings.camera": "视频设备",
diff --git a/app/src/translations/cs.json b/app/src/translations/cs.json
index a6a9af4..1a2b3c5 100644
--- a/app/src/translations/cs.json
+++ b/app/src/translations/cs.json
@@ -105,6 +105,7 @@
 	"label.appearence": null,
 	"label.advanced": null,
 	"label.addVideo": null,
+	"label.promoteAllPeers": null,
 
 	"settings.settings": "Nastavení",
 	"settings.camera": "Kamera",
diff --git a/app/src/translations/de.json b/app/src/translations/de.json
index 9820bcd..a6f6ac2 100644
--- a/app/src/translations/de.json
+++ b/app/src/translations/de.json
@@ -106,6 +106,7 @@
 	"label.appearence": null,
 	"label.advanced": null,
 	"label.addVideo": null,
+	"label.promoteAllPeers": null,
 
 	"settings.settings": "Einstellungen",
 	"settings.camera": "Kamera",
diff --git a/app/src/translations/dk.json b/app/src/translations/dk.json
index 163b51d..4027363 100644
--- a/app/src/translations/dk.json
+++ b/app/src/translations/dk.json
@@ -106,6 +106,7 @@
 	"label.appearence": null,
 	"label.advanced": null,
 	"label.addVideo": null,
+	"label.promoteAllPeers": null,
 
 	"settings.settings": "Indstillinger",
 	"settings.camera": "Kamera",
diff --git a/app/src/translations/el.json b/app/src/translations/el.json
index 6b6cdab..5f93f42 100644
--- a/app/src/translations/el.json
+++ b/app/src/translations/el.json
@@ -106,6 +106,7 @@
 	"label.appearence": null,
 	"label.advanced": null,
 	"label.addVideo": null,
+	"label.promoteAllPeers": null,
 
 	"settings.settings": "Ρυθμίσεις",
 	"settings.camera": "Κάμερα",
diff --git a/app/src/translations/en.json b/app/src/translations/en.json
index 38414b7..8fe4fa1 100644
--- a/app/src/translations/en.json
+++ b/app/src/translations/en.json
@@ -106,6 +106,7 @@
 	"label.appearence": "Appearence",
 	"label.advanced": "Advanced",
 	"label.addVideo": "Add video",
+	"label.promoteAllPeers": "Promote all",
 
 	"settings.settings": "Settings",
 	"settings.camera": "Camera",
diff --git a/app/src/translations/es.json b/app/src/translations/es.json
index b149a8a..d73506c 100644
--- a/app/src/translations/es.json
+++ b/app/src/translations/es.json
@@ -106,6 +106,7 @@
 	"label.appearence": null,
 	"label.advanced": null,
 	"label.addVideo": null,
+	"label.promoteAllPeers": null,
 
 	"settings.settings": "Ajustes",
 	"settings.camera": "Cámara",
diff --git a/app/src/translations/fr.json b/app/src/translations/fr.json
index 6d694e3..f884c36 100644
--- a/app/src/translations/fr.json
+++ b/app/src/translations/fr.json
@@ -106,6 +106,7 @@
 	"label.appearence": null,
 	"label.advanced": null,
 	"label.addVideo": null,
+	"label.promoteAllPeers": null,
 
 	"settings.settings": "Paramètres",
 	"settings.camera": "Caméra",
diff --git a/app/src/translations/hr.json b/app/src/translations/hr.json
index c047ce4..eb9d08e 100644
--- a/app/src/translations/hr.json
+++ b/app/src/translations/hr.json
@@ -106,6 +106,7 @@
 	"label.appearence": null,
 	"label.advanced": null,
 	"label.addVideo": null,
+	"label.promoteAllPeers": null,
 
 	"settings.settings":  "Postavke",
 	"settings.camera": "Kamera",
diff --git a/app/src/translations/hu.json b/app/src/translations/hu.json
index 44e9931..f25b06a 100644
--- a/app/src/translations/hu.json
+++ b/app/src/translations/hu.json
@@ -106,6 +106,7 @@
 	"label.appearence": null,
 	"label.advanced": null,
 	"label.addVideo": null,
+	"label.promoteAllPeers": null,
 
 	"settings.settings": "Beállítások",
 	"settings.camera": "Kamera",
diff --git a/app/src/translations/it.json b/app/src/translations/it.json
index 302a8fb..d027e7a 100644
--- a/app/src/translations/it.json
+++ b/app/src/translations/it.json
@@ -105,6 +105,7 @@
 	"label.appearence": null,
 	"label.advanced": null,
 	"label.addVideo": null,
+	"label.promoteAllPeers": null,
 
 	"settings.settings": "Impostazioni",
 	"settings.camera": "Videocamera",
diff --git a/app/src/translations/nb.json b/app/src/translations/nb.json
index 375ffae..e803bda 100644
--- a/app/src/translations/nb.json
+++ b/app/src/translations/nb.json
@@ -106,6 +106,7 @@
 	"label.appearence": "Utseende",
 	"label.advanced": "Avansert",
 	"label.addVideo": "Legg til video",
+	"label.promoteAllPeers": "Slipp inn alle",
 
 	"settings.settings": "Innstillinger",
 	"settings.camera": "Kamera",
diff --git a/app/src/translations/pl.json b/app/src/translations/pl.json
index 75a6b15..399f788 100644
--- a/app/src/translations/pl.json
+++ b/app/src/translations/pl.json
@@ -106,6 +106,7 @@
 	"label.appearence": null,
 	"label.advanced": null,
 	"label.addVideo": null,
+	"label.promoteAllPeers": null,
 
 	"settings.settings": "Ustawienia",
 	"settings.camera": "Kamera",
diff --git a/app/src/translations/pt.json b/app/src/translations/pt.json
index a823925..d66d8da 100644
--- a/app/src/translations/pt.json
+++ b/app/src/translations/pt.json
@@ -106,6 +106,7 @@
 	"label.appearence": null,
 	"label.advanced": null,
 	"label.addVideo": null,
+	"label.promoteAllPeers": null,
 
 	"settings.settings": "Definições",
 	"settings.camera": "Camera",
diff --git a/app/src/translations/ro.json b/app/src/translations/ro.json
index c63133f..b37b36a 100644
--- a/app/src/translations/ro.json
+++ b/app/src/translations/ro.json
@@ -106,6 +106,7 @@
 	"label.appearence": null,
 	"label.advanced": null,
 	"label.addVideo": null,
+	"label.promoteAllPeers": null,
 
 	"settings.settings": "Setări",
 	"settings.camera": "Cameră video",
diff --git a/app/src/translations/tr.json b/app/src/translations/tr.json
index 8502bb3..d3d20e3 100644
--- a/app/src/translations/tr.json
+++ b/app/src/translations/tr.json
@@ -106,6 +106,7 @@
 	"label.appearence": null,
 	"label.advanced": null,
 	"label.addVideo": null,
+	"label.promoteAllPeers": null,
 
 	"settings.settings": "Ayarlar",
 	"settings.camera": "Kamera",
diff --git a/app/src/translations/uk.json b/app/src/translations/uk.json
index b783913..dcb3c7d 100644
--- a/app/src/translations/uk.json
+++ b/app/src/translations/uk.json
@@ -106,6 +106,7 @@
 	"label.appearence": null,
 	"label.advanced": null,
 	"label.addVideo": null,
+	"label.promoteAllPeers": null,
 
 	"settings.settings": "Налаштування",
 	"settings.camera": "Камера",
diff --git a/server/lib/Lobby.js b/server/lib/Lobby.js
index 708dca9..0bcfb66 100644
--- a/server/lib/Lobby.js
+++ b/server/lib/Lobby.js
@@ -63,8 +63,8 @@ class Lobby extends EventEmitter
 
 		for (const peer in this._peers)
 		{
-			if (peer.socket)
-				this.promotePeer(peer.id);
+			if (!this._peers[peer].closed)
+				this.promotePeer(peer);
 		}
 	}