From 7e26e78c4f5d75667ed62b0e1ef3feb13eb863f6 Mon Sep 17 00:00:00 2001
From: Pedro Beschorner Marin <pedrobmarin@gmail.com>
Date: Sat, 23 Jan 2021 22:22:52 -0300
Subject: [PATCH] Cleanup from authenticated guests removal
While cherry-picking some of this work I noticed those extras.
---
.../core/apps/users/ChangeUserRoleCmdMsgHdlr.scala | 1 -
.../src/main/java/org/bigbluebutton/api/domain/Meeting.java | 3 +--
bigbluebutton-html5/imports/ui/components/app/component.jsx | 1 +
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ChangeUserRoleCmdMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ChangeUserRoleCmdMsgHdlr.scala
index 980d3bf5c9..cb9cb11a52 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ChangeUserRoleCmdMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ChangeUserRoleCmdMsgHdlr.scala
@@ -28,7 +28,6 @@ trait ChangeUserRoleCmdMsgHdlr extends RightsManagementTrait {
} yield {
RegisteredUsers.updateUserRole(liveMeeting.registeredUsers, u, userRole)
}
- // Mconf's guest should always be fit for promotion
val promoteGuest = !liveMeeting.props.usersProp.authenticatedGuest
if (msg.body.role == Roles.MODERATOR_ROLE && (!uvo.guest || promoteGuest)) {
// Promote non-guest users.
diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
index 1b4e1a6afb..71fa372541 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
@@ -372,7 +372,7 @@ public class Meeting {
return authenticatedGuest;
}
- private String getUnauthenticatedGuestStatus(Boolean guest) {
+ private String getUnauthenticatedGuestStatus(Boolean guest) {
if (guest) {
switch(guestPolicy) {
case GuestPolicy.ALWAYS_ACCEPT:
@@ -391,7 +391,6 @@ public class Meeting {
}
public String calcGuestStatus(String role, Boolean guest, Boolean authned) {
- // Good ol' Mconf guest status
if (!authenticatedGuest) return getUnauthenticatedGuestStatus(guest);
// Allow moderators all the time.
diff --git a/bigbluebutton-html5/imports/ui/components/app/component.jsx b/bigbluebutton-html5/imports/ui/components/app/component.jsx
index 6027d1450f..ce9958dd1f 100755
--- a/bigbluebutton-html5/imports/ui/components/app/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/app/component.jsx
@@ -108,6 +108,7 @@ class App extends Component {
this.handleWindowResize = throttle(this.handleWindowResize).bind(this);
this.shouldAriaHide = this.shouldAriaHide.bind(this);
+ this.renderMedia = withDraggableContext(this.renderMedia.bind(this));
}
componentDidMount() {
--
GitLab