From 722ffa5d0732003937471a289813aea98fd71c30 Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Thu, 30 Apr 2020 17:50:34 -0400
Subject: [PATCH] disable private chat initiation in breakouts
---
bigbluebutton-html5/imports/ui/components/chat/service.js | 6 ++++++
.../user-list-item/user-dropdown/component.jsx | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/bigbluebutton-html5/imports/ui/components/chat/service.js b/bigbluebutton-html5/imports/ui/components/chat/service.js
index 7beccbe229..33da551724 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/service.js
+++ b/bigbluebutton-html5/imports/ui/components/chat/service.js
@@ -7,6 +7,7 @@ import UnreadMessages from '/imports/ui/services/unread-messages';
import Storage from '/imports/ui/services/storage/session';
import { makeCall } from '/imports/ui/services/api';
import _ from 'lodash';
+import { meetingIsBreakout } from '/imports/ui/components/app/service';
const CHAT_CONFIG = Meteor.settings.public.chat;
const GROUPING_MESSAGES_WINDOW = CHAT_CONFIG.grouping_messages_window;
@@ -141,6 +142,11 @@ const isChatLocked = (receiverID) => {
{ fields: { role: 1 } });
const isReceiverModerator = receiver && receiver.role === ROLE_MODERATOR;
+ // disable private chat in breakouts
+ if (meetingIsBreakout()) {
+ return !isPublic;
+ }
+
if (meeting.lockSettingsProps !== undefined) {
if (user.locked && user.role !== ROLE_MODERATOR) {
if (isPublic) {
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx
index 2e166d7793..c6cd4e0540 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx
@@ -294,7 +294,7 @@ class UserDropdown extends PureComponent {
));
}
- if (CHAT_ENABLED && enablePrivateChat && isMeteorConnected) {
+ if (CHAT_ENABLED && enablePrivateChat && !meetingIsBreakout && isMeteorConnected) {
actions.push(this.makeDropdownItem(
'activeChat',
intl.formatMessage(messages.ChatLabel),
--
GitLab