[FIX] "Click to Join" button is not working if there are no muted users in the room (#22871)

matheusbsilva137 · tassoevan · web-flow · commit 14f8379844dc · 2021-08-06T09:19:05.000-03:00
* Fix room.muted undefined error

* Remove unnecessary includes function calls

Co-authored-by: Tasso Evangelista &lt;tasso.evangelista@rocket.chat&gt;
diff --git a/app/authorization/server/functions/canSendMessage.js b/app/authorization/server/functions/canSendMessage.js
@@ -33,7 +33,7 @@ export const validateRoomMessagePermissionsAsync = async (room, { uid, username,
 		}
 	}
 
-	if ((room.muted || []).includes(username)) {
+	if (room?.muted?.includes(username)) {
 		throw new Error('You_have_been_muted');
 	}
 };
diff --git a/app/lib/server/lib/processDirectEmail.js b/app/lib/server/lib/processDirectEmail.js
@@ -87,7 +87,7 @@ export const processDirectEmail = function(email) {
 			return false;
 		}
 
-		if ((room.muted || []).includes(user.username)) {
+		if (room?.muted?.includes(user.username)) {
 			// user is muted
 			return false;
 		}
diff --git a/app/videobridge/client/actionLink.js b/app/videobridge/client/actionLink.js
@@ -15,7 +15,7 @@ actionLinks.register('joinJitsiCall', function(message, params, instance) {
 		const currentTime = new Date().getTime();
 		const jitsiTimeout = new Date((room && room.jitsiTimeout) || currentTime).getTime();
 
-		if (room && room.muted.includes(username)) {
+		if (room && room?.muted?.includes(username)) {
 			toastr.error(TAPi18n.__('You_have_been_muted', ''));
 		} else if (jitsiTimeout > currentTime) {
 			instance.tabBar.open('video');

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ export const validateRoomMessagePermissionsAsync = async (room, { uid, username,`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`- if ((room.muted \|\| []).includes(username)) {`
	`36`	`+ if (room?.muted?.includes(username)) {`
`37`	`37`	`throw new Error('You_have_been_muted');`
`38`	`38`	`}`
`39`	`39`	`};`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ export const processDirectEmail = function(email) {`
`87`	`87`	`return false;`
`88`	`88`	`}`
`89`	`89`
`90`		`- if ((room.muted \|\| []).includes(user.username)) {`
	`90`	`+ if (room?.muted?.includes(user.username)) {`
`91`	`91`	`// user is muted`
`92`	`92`	`return false;`
`93`	`93`	`}`