From 6956ddf723d5e75d17e4cf37572b02ebe1e36148 Mon Sep 17 00:00:00 2001
From: Richard Alam <ritzalam@gmail.com>
Date: Thu, 21 Jan 2016 20:42:47 +0000
Subject: [PATCH] - do not record events if the meeting is not recorded
---
.../bigbluebutton/core/RecorderActor.scala | 108 ++++++++++--------
1 file changed, 63 insertions(+), 45 deletions(-)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.scala
index 76bd619484..c62cec361f 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.scala
@@ -297,21 +297,30 @@ class RecorderActor(val meetingId: String, val recorder: RecorderApplication)
}
private def handleChangedUserEmojiStatus(msg: UserChangedEmojiStatus) {
- val status = UserStatusChange(msg.meetingID, msg.recorded,
- msg.userID, "emojiStatus", msg.emojiStatus)
- handleUserStatusChange(status)
+ if (msg.recorded) {
+ val status = UserStatusChange(msg.meetingID, msg.recorded,
+ msg.userID, "emojiStatus", msg.emojiStatus)
+ handleUserStatusChange(status)
+ }
+
}
private def handleUserSharedWebcam(msg: UserSharedWebcam) {
- val status = UserStatusChange(msg.meetingID, msg.recorded,
- msg.userID, "hasStream", "true,stream=" + msg.stream)
- handleUserStatusChange(status)
+ if (msg.recorded) {
+ val status = UserStatusChange(msg.meetingID, msg.recorded,
+ msg.userID, "hasStream", "true,stream=" + msg.stream)
+ handleUserStatusChange(status)
+ }
+
}
private def handleUserUnsharedWebcam(msg: UserUnsharedWebcam) {
- val status = UserStatusChange(msg.meetingID, msg.recorded,
- msg.userID, "hasStream", "false,stream=" + msg.stream)
- handleUserStatusChange(status)
+ if (msg.recorded) {
+ val status = UserStatusChange(msg.meetingID, msg.recorded,
+ msg.userID, "hasStream", "false,stream=" + msg.stream)
+ handleUserStatusChange(status)
+ }
+
}
private def handleUserStatusChange(msg: UserStatusChange): Unit = {
@@ -365,55 +374,64 @@ class RecorderActor(val meetingId: String, val recorder: RecorderApplication)
}
private def handleSendWhiteboardAnnotationEvent(msg: SendWhiteboardAnnotationEvent) {
- if ((msg.shape.shapeType == WhiteboardKeyUtil.TEXT_TYPE) && (msg.shape.status != WhiteboardKeyUtil.TEXT_CREATED_STATUS)) {
+ if (msg.recorded) {
+ if ((msg.shape.shapeType == WhiteboardKeyUtil.TEXT_TYPE) && (msg.shape.status != WhiteboardKeyUtil.TEXT_CREATED_STATUS)) {
+
+ val event = new ModifyTextWhiteboardRecordEvent()
+ event.setMeetingId(msg.meetingID)
+ event.setTimestamp(TimestampGenerator.generateTimestamp)
+ event.setPresentation(getPresentationId(msg.whiteboardId))
+ event.setPageNumber(getPageNum(msg.whiteboardId))
+ event.setWhiteboardId(msg.whiteboardId)
+ event.addAnnotation(mapAsJavaMap(msg.shape.shape))
+ recorder.record(msg.meetingID, event)
+ } else if ((msg.shape.shapeType == WhiteboardKeyUtil.POLL_RESULT_TYPE)) {
+ val event = new AddShapeWhiteboardRecordEvent()
+ event.setMeetingId(msg.meetingID)
+ event.setTimestamp(TimestampGenerator.generateTimestamp)
+ event.setPresentation(getPresentationId(msg.whiteboardId))
+ event.setPageNumber(getPageNum(msg.whiteboardId))
+ event.setWhiteboardId(msg.whiteboardId);
+ event.addAnnotation(mapAsJavaMap(msg.shape.shape))
+ recorder.record(msg.meetingID, event)
+ } else {
+ val event = new AddShapeWhiteboardRecordEvent()
+ event.setMeetingId(msg.meetingID)
+ event.setTimestamp(TimestampGenerator.generateTimestamp)
+ event.setPresentation(getPresentationId(msg.whiteboardId))
+ event.setPageNumber(getPageNum(msg.whiteboardId))
+ event.setWhiteboardId(msg.whiteboardId);
+ event.addAnnotation(mapAsJavaMap(msg.shape.shape))
+ recorder.record(msg.meetingID, event)
+ }
+ }
+
+ }
- val event = new ModifyTextWhiteboardRecordEvent()
+ private def handleClearWhiteboardEvent(msg: ClearWhiteboardEvent) {
+ if (msg.recorded) {
+ val event = new ClearPageWhiteboardRecordEvent()
event.setMeetingId(msg.meetingID)
event.setTimestamp(TimestampGenerator.generateTimestamp)
event.setPresentation(getPresentationId(msg.whiteboardId))
event.setPageNumber(getPageNum(msg.whiteboardId))
event.setWhiteboardId(msg.whiteboardId)
- event.addAnnotation(mapAsJavaMap(msg.shape.shape))
- recorder.record(msg.meetingID, event)
- } else if ((msg.shape.shapeType == WhiteboardKeyUtil.POLL_RESULT_TYPE)) {
- val event = new AddShapeWhiteboardRecordEvent()
- event.setMeetingId(msg.meetingID)
- event.setTimestamp(TimestampGenerator.generateTimestamp)
- event.setPresentation(getPresentationId(msg.whiteboardId))
- event.setPageNumber(getPageNum(msg.whiteboardId))
- event.setWhiteboardId(msg.whiteboardId);
- event.addAnnotation(mapAsJavaMap(msg.shape.shape))
recorder.record(msg.meetingID, event)
- } else {
- val event = new AddShapeWhiteboardRecordEvent()
+ }
+
+ }
+
+ private def handleUndoWhiteboardEvent(msg: UndoWhiteboardEvent) {
+ if (msg.recorded) {
+ val event = new UndoShapeWhiteboardRecordEvent()
event.setMeetingId(msg.meetingID)
event.setTimestamp(TimestampGenerator.generateTimestamp)
event.setPresentation(getPresentationId(msg.whiteboardId))
event.setPageNumber(getPageNum(msg.whiteboardId))
- event.setWhiteboardId(msg.whiteboardId);
- event.addAnnotation(mapAsJavaMap(msg.shape.shape))
+ event.setWhiteboardId(msg.whiteboardId)
+ event.setShapeId(msg.shapeId);
recorder.record(msg.meetingID, event)
}
- }
- private def handleClearWhiteboardEvent(msg: ClearWhiteboardEvent) {
- val event = new ClearPageWhiteboardRecordEvent()
- event.setMeetingId(msg.meetingID)
- event.setTimestamp(TimestampGenerator.generateTimestamp)
- event.setPresentation(getPresentationId(msg.whiteboardId))
- event.setPageNumber(getPageNum(msg.whiteboardId))
- event.setWhiteboardId(msg.whiteboardId)
- recorder.record(msg.meetingID, event)
- }
-
- private def handleUndoWhiteboardEvent(msg: UndoWhiteboardEvent) {
- val event = new UndoShapeWhiteboardRecordEvent()
- event.setMeetingId(msg.meetingID)
- event.setTimestamp(TimestampGenerator.generateTimestamp)
- event.setPresentation(getPresentationId(msg.whiteboardId))
- event.setPageNumber(getPageNum(msg.whiteboardId))
- event.setWhiteboardId(msg.whiteboardId)
- event.setShapeId(msg.shapeId);
- recorder.record(msg.meetingID, event)
}
}
\ No newline at end of file
--
GitLab