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

Improve code reading

Browse Source
This commit is contained in:
Gustavo Trott 2021-05-17 18:13:00 -03:00
parent 00240c925e
commit 979b21c0ed
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
View File

@ -338,27 +338,27 @@ class MeetingActor(
private def handleMessageThatAffectsInactivity(msg: BbbCommonEnvCoreMsg): Unit = { private def handleMessageThatAffectsInactivity(msg: BbbCommonEnvCoreMsg): Unit = {
msg.core match { msg.core match {
case m: EndMeetingSysCmdMsg => handleEndMeeting(m, state) case m: EndMeetingSysCmdMsg => handleEndMeeting(m, state)
// Users // Users
case m: ValidateAuthTokenReqMsg => state = usersApp.handleValidateAuthTokenReqMsg(m, state) case m: ValidateAuthTokenReqMsg => state = usersApp.handleValidateAuthTokenReqMsg(m, state)
case m: UserJoinMeetingReqMsg => case m: UserJoinMeetingReqMsg =>
state = handleUserJoinMeetingReqMsg(m, state) state = handleUserJoinMeetingReqMsg(m, state)
updateModeratorsPresence() updateModeratorsPresence()
case m: UserJoinMeetingAfterReconnectReqMsg => case m: UserJoinMeetingAfterReconnectReqMsg =>
state = handleUserJoinMeetingAfterReconnectReqMsg(m, state) state = handleUserJoinMeetingAfterReconnectReqMsg(m, state)
updateModeratorsPresence() updateModeratorsPresence()
case m: UserLeaveReqMsg => case m: UserLeaveReqMsg =>
state = handleUserLeaveReqMsg(m, state) state = handleUserLeaveReqMsg(m, state)
updateModeratorsPresence() updateModeratorsPresence()
case m: UserBroadcastCamStartMsg => handleUserBroadcastCamStartMsg(m) case m: UserBroadcastCamStartMsg => handleUserBroadcastCamStartMsg(m)
case m: UserBroadcastCamStopMsg => handleUserBroadcastCamStopMsg(m) case m: UserBroadcastCamStopMsg => handleUserBroadcastCamStopMsg(m)
case m: GetCamBroadcastPermissionReqMsg => handleGetCamBroadcastPermissionReqMsg(m) case m: GetCamBroadcastPermissionReqMsg => handleGetCamBroadcastPermissionReqMsg(m)
case m: GetCamSubscribePermissionReqMsg => handleGetCamSubscribePermissionReqMsg(m) case m: GetCamSubscribePermissionReqMsg => handleGetCamSubscribePermissionReqMsg(m)
case m: UserJoinedVoiceConfEvtMsg => handleUserJoinedVoiceConfEvtMsg(m) case m: UserJoinedVoiceConfEvtMsg => handleUserJoinedVoiceConfEvtMsg(m)
case m: LogoutAndEndMeetingCmdMsg => usersApp.handleLogoutAndEndMeetingCmdMsg(m, state) case m: LogoutAndEndMeetingCmdMsg => usersApp.handleLogoutAndEndMeetingCmdMsg(m, state)
case m: SetRecordingStatusCmdMsg => case m: SetRecordingStatusCmdMsg =>
state = usersApp.handleSetRecordingStatusCmdMsg(m, state) state = usersApp.handleSetRecordingStatusCmdMsg(m, state)
updateUserLastActivity(m.body.setBy) updateUserLastActivity(m.body.setBy)
case m: RecordAndClearPreviousMarkersCmdMsg => case m: RecordAndClearPreviousMarkersCmdMsg =>
@ -625,7 +625,7 @@ class MeetingActor(
processUserInactivityAudit() processUserInactivityAudit()
flagRegisteredUsersWhoHasNotJoined() flagRegisteredUsersWhoHasNotJoined()
checkIfNeedToEndMeetingWhenNoAuthedUsers(liveMeeting) checkIfNeedToEndMeetingWhenNoAuthedUsers(liveMeeting)
checkIfNeedToEndMeetingWhenNoNoModerators(liveMeeting) checkIfNeedToEndMeetingWhenNoModerators(liveMeeting)
} }
def checkVoiceConfUsersStatus(): Unit = { def checkVoiceConfUsersStatus(): Unit = {
@ -713,7 +713,7 @@ class MeetingActor(
} }
} }
private def checkIfNeedToEndMeetingWhenNoNoModerators(liveMeeting: LiveMeeting): Unit = { private def checkIfNeedToEndMeetingWhenNoModerators(liveMeeting: LiveMeeting): Unit = {
if (state.expiryTracker.endWhenNoModerator && if (state.expiryTracker.endWhenNoModerator &&
!liveMeeting.props.meetingProp.isBreakout && !liveMeeting.props.meetingProp.isBreakout &&
state.expiryTracker.moderatorHasJoined && state.expiryTracker.moderatorHasJoined &&

2
bbb-common-message/src/main/scala/org/bigbluebutton/common2/domain/Meeting2x.scala
View File

@ -6,7 +6,7 @@ case class DurationProps(duration: Int, createdTime: Long, createdDate: String,
meetingExpireIfNoUserJoinedInMinutes: Int, meetingExpireWhenLastUserLeftInMinutes: Int, meetingExpireIfNoUserJoinedInMinutes: Int, meetingExpireWhenLastUserLeftInMinutes: Int,
userInactivityInspectTimerInMinutes: Int, userInactivityThresholdInMinutes: Int, userInactivityInspectTimerInMinutes: Int, userInactivityThresholdInMinutes: Int,
userActivitySignResponseDelayInMinutes: Int, userActivitySignResponseDelayInMinutes: Int,
endWhenNoModerator: Boolean, endWhenNoModeratorDelayInMinutes: Int) endWhenNoModerator: Boolean, endWhenNoModeratorDelayInMinutes: Int)
case class MeetingProp(name: String, extId: String, intId: String, isBreakout: Boolean) case class MeetingProp(name: String, extId: String, intId: String, isBreakout: Boolean)