- fix formatting using scalariform
This commit is contained in:
parent
09a5a09c67
commit
790c9f9629
@ -1,6 +1,6 @@
|
||||
package org.bigbluebutton.core.running
|
||||
|
||||
import java.io.{PrintWriter, StringWriter}
|
||||
import java.io.{ PrintWriter, StringWriter }
|
||||
|
||||
import akka.actor._
|
||||
import akka.actor.SupervisorStrategy.Resume
|
||||
@ -11,7 +11,7 @@ import org.bigbluebutton.core.apps.users._
|
||||
import org.bigbluebutton.core.apps.whiteboard.ClientToServerLatencyTracerMsgHdlr
|
||||
import org.bigbluebutton.core.domain._
|
||||
import org.bigbluebutton.core.util.TimeUtil
|
||||
import org.bigbluebutton.common2.domain.{DefaultProps, LockSettingsProps}
|
||||
import org.bigbluebutton.common2.domain.{ DefaultProps, LockSettingsProps }
|
||||
import org.bigbluebutton.core.api._
|
||||
import org.bigbluebutton.core.apps._
|
||||
import org.bigbluebutton.core.apps.caption.CaptionApp2x
|
||||
@ -23,7 +23,7 @@ import org.bigbluebutton.core.apps.sharednotes.SharedNotesApp2x
|
||||
import org.bigbluebutton.core.apps.whiteboard.WhiteboardApp2x
|
||||
import org.bigbluebutton.core.bus._
|
||||
import org.bigbluebutton.core.models._
|
||||
import org.bigbluebutton.core2.{MeetingStatus2x, Permissions}
|
||||
import org.bigbluebutton.core2.{ MeetingStatus2x, Permissions }
|
||||
import org.bigbluebutton.core2.message.handlers._
|
||||
import org.bigbluebutton.core2.message.handlers.meeting._
|
||||
import org.bigbluebutton.common2.msgs._
|
||||
@ -35,9 +35,9 @@ import akka.actor.SupervisorStrategy.Resume
|
||||
|
||||
import scala.concurrent.duration._
|
||||
import org.bigbluebutton.core.apps.layout.LayoutApp2x
|
||||
import org.bigbluebutton.core.apps.meeting.{SyncGetMeetingInfoRespMsgHdlr, ValidateConnAuthTokenSysMsgHdlr}
|
||||
import org.bigbluebutton.core.apps.meeting.{ SyncGetMeetingInfoRespMsgHdlr, ValidateConnAuthTokenSysMsgHdlr }
|
||||
import org.bigbluebutton.core.apps.users.ChangeLockSettingsInMeetingCmdMsgHdlr
|
||||
import org.bigbluebutton.core2.message.senders.{MsgBuilder, Sender}
|
||||
import org.bigbluebutton.core2.message.senders.{ MsgBuilder, Sender }
|
||||
|
||||
object MeetingActor {
|
||||
def props(
|
||||
@ -184,7 +184,6 @@ class MeetingActor(
|
||||
initLockSettings(liveMeeting, lockSettingsProps)
|
||||
}
|
||||
|
||||
|
||||
/** *****************************************************************/
|
||||
// Helper to create fake users for testing (ralam jan 5, 2018)
|
||||
//object FakeTestData extends FakeTestData
|
||||
@ -241,7 +240,8 @@ class MeetingActor(
|
||||
disablePubChat = lockSettingsProp.disablePublicChat,
|
||||
lockedLayout = lockSettingsProp.lockedLayout,
|
||||
lockOnJoin = lockSettingsProp.lockOnJoin,
|
||||
lockOnJoinConfigurable = lockSettingsProp.lockOnJoinConfigurable)
|
||||
lockOnJoinConfigurable = lockSettingsProp.lockOnJoinConfigurable
|
||||
)
|
||||
|
||||
MeetingStatus2x.initializePermissions(liveMeeting.status)
|
||||
|
||||
|
@ -9,10 +9,12 @@ case class DurationProps(duration: Int, createdTime: Long, createdDate: String,
|
||||
|
||||
case class MeetingProp(name: String, extId: String, intId: String, isBreakout: Boolean)
|
||||
|
||||
case class BreakoutProps(parentId: String,
|
||||
sequence: Int,
|
||||
freeJoin: Boolean,
|
||||
breakoutRooms: Vector[String])
|
||||
case class BreakoutProps(
|
||||
parentId: String,
|
||||
sequence: Int,
|
||||
freeJoin: Boolean,
|
||||
breakoutRooms: Vector[String]
|
||||
)
|
||||
|
||||
case class PasswordProp(moderatorPass: String, viewerPass: String)
|
||||
|
||||
@ -28,25 +30,29 @@ case class MetadataProp(metadata: collection.immutable.Map[String, String])
|
||||
|
||||
case class ScreenshareProps(screenshareConf: String, red5ScreenshareIp: String, red5ScreenshareApp: String)
|
||||
|
||||
case class LockSettingsProps(disableCam: Boolean,
|
||||
disableMic: Boolean,
|
||||
disablePrivateChat: Boolean,
|
||||
disablePublicChat: Boolean,
|
||||
lockedLayout: Boolean,
|
||||
lockOnJoin: Boolean,
|
||||
lockOnJoinConfigurable: Boolean)
|
||||
case class LockSettingsProps(
|
||||
disableCam: Boolean,
|
||||
disableMic: Boolean,
|
||||
disablePrivateChat: Boolean,
|
||||
disablePublicChat: Boolean,
|
||||
lockedLayout: Boolean,
|
||||
lockOnJoin: Boolean,
|
||||
lockOnJoinConfigurable: Boolean
|
||||
)
|
||||
|
||||
case class DefaultProps(meetingProp: MeetingProp,
|
||||
breakoutProps: BreakoutProps,
|
||||
durationProps: DurationProps,
|
||||
password: PasswordProp,
|
||||
recordProp: RecordProp,
|
||||
welcomeProp: WelcomeProp,
|
||||
voiceProp: VoiceProp,
|
||||
usersProp: UsersProp,
|
||||
metadataProp: MetadataProp,
|
||||
screenshareProps: ScreenshareProps,
|
||||
lockSettingsProps: Option[LockSettingsProps])
|
||||
case class DefaultProps(
|
||||
meetingProp: MeetingProp,
|
||||
breakoutProps: BreakoutProps,
|
||||
durationProps: DurationProps,
|
||||
password: PasswordProp,
|
||||
recordProp: RecordProp,
|
||||
welcomeProp: WelcomeProp,
|
||||
voiceProp: VoiceProp,
|
||||
usersProp: UsersProp,
|
||||
metadataProp: MetadataProp,
|
||||
screenshareProps: ScreenshareProps,
|
||||
lockSettingsProps: Option[LockSettingsProps]
|
||||
)
|
||||
|
||||
case class StartEndTimeStatus(startTime: Long, endTime: Long)
|
||||
case class RecordingStatus(isRecording: Boolean)
|
||||
|
@ -3,12 +3,12 @@ package org.bigbluebutton.api2
|
||||
import scala.collection.JavaConverters._
|
||||
import akka.actor.ActorSystem
|
||||
import akka.event.Logging
|
||||
import org.bigbluebutton.api.domain.{BreakoutRoomsParams, LockSettingsParams}
|
||||
import org.bigbluebutton.api.domain.{ BreakoutRoomsParams, LockSettingsParams }
|
||||
import org.bigbluebutton.api.messaging.converters.messages._
|
||||
import org.bigbluebutton.api2.bus._
|
||||
import org.bigbluebutton.api2.endpoint.redis.WebRedisSubscriberActor
|
||||
import org.bigbluebutton.common2.redis.MessageSender
|
||||
import org.bigbluebutton.api2.meeting.{OldMeetingMsgHdlrActor, RegisterUser}
|
||||
import org.bigbluebutton.api2.meeting.{ OldMeetingMsgHdlrActor, RegisterUser }
|
||||
import org.bigbluebutton.common2.domain._
|
||||
import org.bigbluebutton.common2.util.JsonUtil
|
||||
import org.bigbluebutton.presentation.messages._
|
||||
@ -100,8 +100,8 @@ class BbbWebApiGWApp(
|
||||
userActivitySignResponseDelayInMinutes: java.lang.Integer,
|
||||
muteOnStart: java.lang.Boolean,
|
||||
keepEvents: java.lang.Boolean,
|
||||
breakoutParams : BreakoutRoomsParams,
|
||||
lockSettingsParams: LockSettingsParams): Unit = {
|
||||
breakoutParams: BreakoutRoomsParams,
|
||||
lockSettingsParams: LockSettingsParams): Unit = {
|
||||
|
||||
val meetingProp = MeetingProp(name = meetingName, extId = extMeetingId, intId = meetingId,
|
||||
isBreakout = isBreakout.booleanValue())
|
||||
@ -121,10 +121,12 @@ class BbbWebApiGWApp(
|
||||
val recordProp = RecordProp(record = recorded.booleanValue(), autoStartRecording = autoStartRecording.booleanValue(),
|
||||
allowStartStopRecording = allowStartStopRecording.booleanValue(), keepEvents = keepEvents.booleanValue())
|
||||
|
||||
val breakoutProps = BreakoutProps(parentId = parentMeetingId,
|
||||
val breakoutProps = BreakoutProps(
|
||||
parentId = parentMeetingId,
|
||||
sequence = sequence.intValue(),
|
||||
freeJoin = freeJoin.booleanValue(),
|
||||
breakoutRooms = Vector())
|
||||
breakoutRooms = Vector()
|
||||
)
|
||||
|
||||
val welcomeProp = WelcomeProp(welcomeMsgTemplate = welcomeMsgTemplate, welcomeMsg = welcomeMsg,
|
||||
modOnlyMessage = modOnlyMessage)
|
||||
@ -165,7 +167,8 @@ class BbbWebApiGWApp(
|
||||
usersProp,
|
||||
metadataProp,
|
||||
screenshareProps,
|
||||
lockSettingsProps)
|
||||
lockSettingsProps
|
||||
)
|
||||
|
||||
//meetingManagerActorRef ! new CreateMeetingMsg(defaultProps)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user