From 9b1630186ce638b85098023de4de6f463dffb55e Mon Sep 17 00:00:00 2001
From: Mario Jr <mariogasparoni@gmail.com>
Date: Fri, 5 Mar 2021 15:50:03 -0300
Subject: [PATCH] Move some validations to the User's collection query
Also removed unnecessary fields
---
.../imports/startup/client/base.jsx | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/bigbluebutton-html5/imports/startup/client/base.jsx b/bigbluebutton-html5/imports/startup/client/base.jsx
index 0c1595e56c..1a3c84796f 100755
--- a/bigbluebutton-html5/imports/startup/client/base.jsx
+++ b/bigbluebutton-html5/imports/startup/client/base.jsx
@@ -94,15 +94,14 @@ class Base extends Component {
});
Session.set('isFullscreen', false);
- const users = Users.find({meetingId: Auth.meetingID}, { fields: {
- validated: 1,
- name: 1,
- userId: 1,
- meetingId: 1,
- }
- });
+ const users = Users.find({
+ meetingId: Auth.meetingID,
+ validated: true,
+ userId: { $ne: localUserId },
+ }, { fields: { name: 1, userId: 1 } }
+ );
- this.usersAlreadyInMeetingAtBeggining =
+ this.usersAlreadyInMeetingAtBeginning =
users && (typeof users.map === 'function') ?
users.map(user => user.userId)
: [];
@@ -116,9 +115,7 @@ class Base extends Component {
if (!userJoinAudioAlerts && !userJoinPushAlerts) return;
- if (user.validated && user.name
- && user.userId !== localUserId
- && !this.usersAlreadyInMeetingAtBeggining.includes(user.userId)) {
+ if (!this.usersAlreadyInMeetingAtBeginning.includes(user.userId)) {
if (userJoinAudioAlerts) {
AudioService.playAlertSound(`${Meteor.settings.public.app.cdn
+ Meteor.settings.public.app.basename
--
GitLab