Clean up raised hand naming. Only needs UI now. Ref #40

app/src/RoomClient.js

@@ -1505,30 +1505,30 @@ export default class RoomClient
 		}
 	}
 
-	async sendRaiseHandState(state)
+	async setRaisedHand(raisedHand)
 	{
-		logger.debug('sendRaiseHandState: ', state);
+		logger.debug('setRaisedHand: ', raisedHand);
 
 		store.dispatch(
-			meActions.setMyRaiseHandStateInProgress(true));
+			meActions.setRaisedHandInProgress(true));
 
 		try
 		{
-			await this.sendRequest('raiseHand', { raiseHandState: state });
+			await this.sendRequest('raisedHand', { raisedHand });
 
 			store.dispatch(
-				meActions.setMyRaiseHandState(state));
+				meActions.setRaisedHand(raisedHand));
 		}
 		catch (error)
 		{
-			logger.error('sendRaiseHandState() | failed: %o', error);
+			logger.error('setRaisedHand() | [error:"%o"]', error);
 
 			// We need to refresh the component for it to render changed state
-			store.dispatch(meActions.setMyRaiseHandState(!state));
+			store.dispatch(meActions.setRaisedHand(!raisedHand));
 		}
 
 		store.dispatch(
-			meActions.setMyRaiseHandStateInProgress(false));
+			meActions.setRaisedHandInProgress(false));
 	}
 
 	async setMaxSendingSpatialLayer(spatialLayer)
@@ -2205,6 +2205,15 @@ export default class RoomClient
 						break;
 					}
 
+					case 'raisedHand':
+					{
+						const { peerId, raisedHand } = notification.data;
+
+						store.dispatch(peerActions.setPeerRaisedHand(peerId, raisedHand));
+
+						break;
+					}
+
 					case 'chatMessage':
 					{
 						const { peerId, chatMessage } = notification.data;

app/src/__tests__/Room.spec.js

@@ -42,8 +42,8 @@ beforeEach(() =>
 			loggedIn              : false,
 			loginEnabled          : true,
 			picture               : null,
-			raiseHand             : false,
+			raisedHand            : false,
-			raiseHandInProgress   : false,
+			raisedHandInProgress  : false,
 			screenShareInProgress : false,
 			webcamDevices         : null,
 			webcamInProgress      : false

app/src/actions/meActions.js

@@ -63,9 +63,9 @@ export const setWebcamDevices = (devices) =>
 		payload : { devices }
 	});
 
-export const setMyRaiseHandState = (flag) =>
+export const setRaisedHand = (flag) =>
 	({
-		type    : 'SET_MY_RAISE_HAND_STATE',
+		type    : 'SET_RAISED_HAND',
 		payload : { flag }
 	});
 
@@ -93,9 +93,9 @@ export const setScreenShareInProgress = (flag) =>
 		payload : { flag }
 	});
 
-export const setMyRaiseHandStateInProgress = (flag) =>
+export const setRaisedHandInProgress = (flag) =>
 	({
-		type    : 'SET_MY_RAISE_HAND_STATE_IN_PROGRESS',
+		type    : 'SET_RAISED_HAND_IN_PROGRESS',
 		payload : { flag }
 	});
 

app/src/actions/peerActions.js

@@ -34,10 +34,10 @@ export const setPeerScreenInProgress = (peerId, flag) =>
 		payload : { peerId, flag }
 	});
 
-export const setPeerRaiseHandState = (peerId, raiseHandState) =>
+export const setPeerRaisedHand = (peerId, raisedHand) =>
 	({
-		type    : 'SET_PEER_RAISE_HAND_STATE',
+		type    : 'SET_PEER_RAISED_HAND',
-		payload : { peerId, raiseHandState }
+		payload : { peerId, raisedHand }
 	});
 
 export const setPeerPicture = (peerId, picture) =>

app/src/components/MeetingDrawer/ParticipantList/ListMe.js

@@ -63,7 +63,7 @@ const styles = (theme) =>
 			{
 				opacity : 1
 			},
-			'&.raise-hand' :
+			'&.raisedHand' :
 			{
 				backgroundImage : `url(${HandIcon})`,
 				opacity         : 1
@@ -92,7 +92,7 @@ const ListMe = (props) =>
 
 				<div className={classes.indicators}>
 					{ me.raisedHand &&
-						<div className={classnames(classes.icon, 'raise-hand')} />
+						<div className={classnames(classes.icon, 'raisedHand')} />
 					}
 				</div>
 			</div>

app/src/components/MeetingDrawer/ParticipantList/ListPeer.js

@@ -82,7 +82,7 @@ const styles = (theme) =>
 			{
 				opacity : 0.2
 			},
-			'&.raise-hand' :
+			'&.raisedHand' :
 			{
 				backgroundImage : `url(${HandIcon})`
 			}
@@ -140,12 +140,12 @@ const ListPeer = (props) =>
 				{peer.displayName}
 			</div>
 			<div className={classes.indicators}>
-				{ peer.raiseHandState &&
+				{ peer.raisedHand &&
 					<div className={
 						classnames(
-							classes.icon, 'raise-hand', {
+							classes.icon, 'raisedHand', {
-								on  : peer.raiseHandState,
+								on  : peer.raisedHand,
-								off : !peer.raiseHandState
+								off : !peer.raisedHand
 							}
 						)
 					}

app/src/reducers/me.js

@@ -15,8 +15,8 @@ const initialState =
 	screenShareInProgress : false,
 	displayNameInProgress : false,
 	loginEnabled          : false,
-	raiseHand             : false,
+	raisedHand            : false,
-	raiseHandInProgress   : false,
+	raisedHandInProgress  : false,
 	loggedIn              : false,
 	isSpeaking            : false
 };
@@ -134,18 +134,18 @@ const me = (state = initialState, action) =>
 			return { ...state, screenShareInProgress: flag };
 		}
 
-		case 'SET_MY_RAISE_HAND_STATE':
+		case 'SET_RAISED_HAND':
 		{
 			const { flag } = action.payload;
 
-			return { ...state, raiseHand: flag };
+			return { ...state, raisedHand: flag };
 		}
 
-		case 'SET_MY_RAISE_HAND_STATE_IN_PROGRESS':
+		case 'SET_RAISED_HAND_IN_PROGRESS':
 		{
 			const { flag } = action.payload;
 
-			return { ...state, raiseHandInProgress: flag };
+			return { ...state, raisedHandInProgress: flag };
 		}
 
 		case 'SET_DISPLAY_NAME_IN_PROGRESS':

app/src/reducers/peers.js

@@ -20,8 +20,8 @@ const peer = (state = {}, action) =>
 		case 'SET_PEER_KICK_IN_PROGRESS':
 			return { ...state, peerKickInProgress: action.payload.flag };
 		
-		case 'SET_PEER_RAISE_HAND_STATE':
+		case 'SET_PEER_RAISED_HAND':
-			return { ...state, raiseHandState: action.payload.raiseHandState };
+			return { ...state, raisedHand: action.payload.raisedHand };
 		
 		case 'ADD_CONSUMER':
 		{
@@ -86,7 +86,7 @@ const peers = (state = {}, action) =>
 		case 'SET_PEER_VIDEO_IN_PROGRESS':
 		case 'SET_PEER_AUDIO_IN_PROGRESS':
 		case 'SET_PEER_SCREEN_IN_PROGRESS':
-		case 'SET_PEER_RAISE_HAND_STATE':
+		case 'SET_PEER_RAISED_HAND':
 		case 'SET_PEER_PICTURE':
 		case 'ADD_CONSUMER':
 		case 'ADD_PEER_ROLE':

server/lib/Room.js

@@ -1251,14 +1251,14 @@ class Room extends EventEmitter
 				break;
 			}
 
-			case 'raiseHand':
+			case 'raisedHand':
 			{
 				const { raisedHand } = request.data;
 
 				peer.raisedHand = raisedHand;
 
 				// Spread to others
-				this._notification(peer.socket, 'raiseHand', {
+				this._notification(peer.socket, 'raisedHand', {
 					peerId     : peer.id,
 					raisedHand : raisedHand
 				}, true);