BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- propagate privateChatEnabled value from parent meeting to breakout room

Browse Source
This commit is contained in:
Richard Alam 2019-04-10 13:53:03 -07:00
parent f6c0d21fda
commit b50c22f445
5 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/CreateBreakoutRoomsCmdMsgHdlr.scala
View File

@ -61,7 +61,8 @@ trait CreateBreakoutRoomsCmdMsgHdlr extends RightsManagementTrait {
msg.body.durationInMinutes,
liveMeeting.props.password.moderatorPass,
liveMeeting.props.password.viewerPass,
presId, presSlide, msg.body.record
presId, presSlide, msg.body.record,
liveMeeting.props.breakoutProps.privateChatEnabled
)
val event = buildCreateBreakoutRoomSysCmdMsg(liveMeeting.props.meetingProp.intId, roomDetail)

19
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/BreakoutMsgs.scala
View File

@ -42,9 +42,22 @@ case class CreateBreakoutRoomSysCmdMsg(
body: CreateBreakoutRoomSysCmdMsgBody
) extends BbbCoreMsg
case class CreateBreakoutRoomSysCmdMsgBody(meetingId: String, room: BreakoutRoomDetail)
case class BreakoutRoomDetail(breakoutMeetingId: String, name: String, parentId: String, sequence: Integer, freeJoin: Boolean,
dialNumber: String, voiceConfId: String, durationInMinutes: Int, moderatorPassword: String,
viewerPassword: String, sourcePresentationId: String, sourcePresentationSlide: Int, record: Boolean)
case class BreakoutRoomDetail(
breakoutMeetingId: String,
name: String,
parentId: String,
sequence: Integer,
freeJoin: Boolean,
dialNumber: String,
voiceConfId: String,
durationInMinutes: Int,
moderatorPassword: String,
viewerPassword: String,
sourcePresentationId: String,
sourcePresentationSlide: Int,
record: Boolean,
privateChatEnabled: Boolean
)
/**
* Sent by client to request to create breakout rooms.

1
bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
View File

@ -488,6 +488,7 @@ public class MeetingService implements MessageListener {
params.put(ApiParams.VOICE_BRIDGE, message.voiceConfId);
params.put(ApiParams.DURATION, message.durationInMinutes.toString());
params.put(ApiParams.RECORD, message.record.toString());
params.put(ApiParams.BREAKOUT_ROOMS_PRIVATE_CHAT_ENABLED, message.privateChatEnabled.toString());
params.put(ApiParams.WELCOME, getMeeting(message.parentMeetingId).getWelcomeMessageTemplate());
Map<String, String> parentMeetingMetadata = parentMeeting.getMetadata();

19
bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/messages/CreateBreakoutRoom.java
View File

@ -16,10 +16,22 @@ public class CreateBreakoutRoom implements IMessage {
public final String sourcePresentationId;
public final Integer sourcePresentationSlide;
public final Boolean record;
public final Boolean privateChatEnabled;
public CreateBreakoutRoom(String meetingId, String parentMeetingId, String name, Integer sequence, Boolean freeJoin,
String dialNumber, String voiceConfId, String viewerPassword, String moderatorPassword, Integer duration,
String sourcePresentationId, Integer sourcePresentationSlide, Boolean record) {
public CreateBreakoutRoom(String meetingId,
String parentMeetingId,
String name,
Integer sequence,
Boolean freeJoin,
String dialNumber,
String voiceConfId,
String viewerPassword,
String moderatorPassword,
Integer duration,
String sourcePresentationId,
Integer sourcePresentationSlide,
Boolean record,
Boolean privateChatEnabled) {
this.meetingId = meetingId;
this.parentMeetingId = parentMeetingId;
this.name = name;
@ -33,5 +45,6 @@ public class CreateBreakoutRoom implements IMessage {
this.sourcePresentationId = sourcePresentationId;
this.sourcePresentationSlide = sourcePresentationSlide;
this.record = record;
this.privateChatEnabled = privateChatEnabled;
}
}

3
bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
View File

@ -80,7 +80,8 @@ class OldMeetingMsgHdlrActor(val olgMsgGW: OldMessageReceivedGW)
msg.body.room.durationInMinutes,
msg.body.room.sourcePresentationId,
msg.body.room.sourcePresentationSlide,
msg.body.room.record
msg.body.room.record,
msg.body.room.privateChatEnabled
))
}