From 9dc00519dbdfa266ffe6e023cd5cfbf7184f635d Mon Sep 17 00:00:00 2001 From: Anton Georgiev Date: Thu, 22 Jun 2017 11:38:42 -0400 Subject: [PATCH 01/15] Polls 2.0 on Flash client --- .../polling/service/MessageReceiver.as | 21 +- .../modules/polling/service/MessageSender.as | 173 ++++++++--------- .../polling/service/PollDataProcessor.as | 182 ++++++++---------- 3 files changed, 177 insertions(+), 199 deletions(-) diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/polling/service/MessageReceiver.as b/bigbluebutton-client/src/org/bigbluebutton/modules/polling/service/MessageReceiver.as index bc3b0f7f3c..e120058ec7 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/polling/service/MessageReceiver.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/polling/service/MessageReceiver.as @@ -1,7 +1,7 @@ /** * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ * - * Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). + * Copyright (c) 2017 BigBlueButton Inc. and by respective authors (see below). * * This program is free software; you can redistribute it and/or modify it under the * terms of the GNU Lesser General Public License as published by the Free Software @@ -25,30 +25,33 @@ package org.bigbluebutton.modules.polling.service public class MessageReceiver implements IMessageListener { - private static const LOGGER:ILogger = getClassLogger(MessageReceiver); + private static const LOGGER:ILogger = getClassLogger(MessageReceiver); private var processor:PollDataProcessor; public function MessageReceiver(processor:PollDataProcessor) { LOGGER.debug("registering message listener"); - this.processor = processor; + this.processor = processor; BBB.initConnectionManager().addMessageListener(this); } public function onMessage(messageName:String, message:Object):void { -// LOGGER.debug("received message {0}", [messageName]); + // LOGGER.debug("received message {0}", [messageName]); switch (messageName) { - case "pollShowResultMessage": - processor.handlePollShowResultMessage(message); + case "PollShowResultEvtMsg": + processor.handlePollShowResultMessage(message, true); break; - case "pollStartedMessage": + case "PollHideResultEvtMsg": + processor.handlePollShowResultMessage(message, false); + break; + case "PollStartedEvtMsg": processor.handlePollStartedMesage(message); break; - case "pollStoppedMessage": + case "PollStoppedEvtMsg": processor.handlePollStoppedMesage(message); break; - case "pollUserVotedMessage": + case "UserRespondedToPollEvtMsg": processor.handlePollUserVotedMessage(message); break; } diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/polling/service/MessageSender.as b/bigbluebutton-client/src/org/bigbluebutton/modules/polling/service/MessageSender.as index 8d9a4b4ac6..8b82a41282 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/polling/service/MessageSender.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/polling/service/MessageSender.as @@ -1,7 +1,7 @@ /** * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ * - * Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). + * Copyright (c) 2017 BigBlueButton Inc. and by respective authors (see below). * * This program is free software; you can redistribute it and/or modify it under the * terms of the GNU Lesser General Public License as published by the Free Software @@ -18,112 +18,107 @@ */ package org.bigbluebutton.modules.polling.service { - import org.as3commons.logging.api.ILogger; - import org.as3commons.logging.api.getClassLogger; - import org.as3commons.logging.util.jsonXify; - import org.bigbluebutton.core.BBB; - import org.bigbluebutton.core.UsersUtil; - import org.bigbluebutton.core.managers.ConnectionManager; + import org.as3commons.logging.api.ILogger; + import org.as3commons.logging.api.getClassLogger; + import org.as3commons.logging.util.jsonXify; + import org.bigbluebutton.core.BBB; + import org.bigbluebutton.core.UsersUtil; + import org.bigbluebutton.core.managers.ConnectionManager; - public class MessageSender - { - private static const LOGGER:ILogger = getClassLogger(MessageSender); - - public function startCustomPoll(pollId:String, pollType: String, answers:Array):void - { + public class MessageSender { + private static const LOGGER:ILogger = getClassLogger(MessageSender); + + public function startCustomPoll(pollId:String, pollType: String, answers:Array):void { + var message:Object = { + header: {name: "StartCustomPollReqMsg", meetingId: UsersUtil.getInternalMeetingID(), userId: UsersUtil.getMyUserID()}, + body: {requesterId: UsersUtil.getMyUserID(), pollId: pollId, pollType: pollType, answers: answers} + }; - - var header:Object = new Object(); - header["timestamp"] = (new Date()).time; - header["name"] = "start_custom_poll_request_message"; - header["version"] = "0.0.1"; - - var payload:Object = new Object(); - payload["pollType"] = pollType; - payload["answers"] = answers; - payload["meetingId"] = UsersUtil.getInternalMeetingID(); - payload["pollId"] = pollId; - payload["requesterId"] = UsersUtil.getMyUserID(); - - var map:Object = new Object(); - map["header"] = header; - map["payload"] = payload; - - var _nc:ConnectionManager = BBB.initConnectionManager(); - _nc.sendMessage("poll.sendPollingMessage", - function(result:String):void { - }, - function(status:String):void { - LOGGER.error(status); - }, - JSON.stringify(map) - ); - } - - public function startPoll(pollId:String, pollType: String):void - { - var map:Object = new Object(); - map["pollId"] = pollId; - map["pollType"] = pollType; - var _nc:ConnectionManager = BBB.initConnectionManager(); - _nc.sendMessage("poll.startPoll", - function(result:String):void { - }, - function(status:String):void { - LOGGER.error(status); + _nc.sendMessage2x( + function(result:String):void { // On successful result }, - map + function(status:String):void { // status - On error occurred + LOGGER.error(status); + }, + JSON.stringify(message) + ); + } + + public function startPoll(pollId:String, pollType: String):void { + var message:Object = { + header: {name: "StartPollReqMsg", meetingId: UsersUtil.getInternalMeetingID(), userId: UsersUtil.getMyUserID()}, + body: {requesterId: UsersUtil.getMyUserID(), pollId: pollId, pollType: pollType} + }; + + var _nc:ConnectionManager = BBB.initConnectionManager(); + _nc.sendMessage2x( + function(result:String):void { // On successful result + }, + function(status:String):void { // status - On error occurred + LOGGER.error(status); + }, + JSON.stringify(message) ); } - public function stopPoll(pollId:String):void - { - var map:Object = new Object(); - map["pollId"] = pollId; - + public function stopPoll(pollId:String):void { + // note: we do not pass pollId, we stop the currentPoll + var message:Object = { + header: {name: "StopPollReqMsg", meetingId: UsersUtil.getInternalMeetingID(), userId: UsersUtil.getMyUserID()}, + body: {requesterId: UsersUtil.getMyUserID()} + }; + var _nc:ConnectionManager = BBB.initConnectionManager(); - _nc.sendMessage("poll.stopPoll", - function(result:String):void { - }, - function(status:String):void { - LOGGER.error(status); + _nc.sendMessage2x( + function(result:String):void { // On successful result }, - map + function(status:String):void { // status - On error occurred + LOGGER.error(status); + }, + JSON.stringify(message) ); } - public function votePoll(pollId:String, answerId:Number):void - { - var map:Object = new Object(); - map["pollId"] = pollId; - map["answerId"] = answerId; - + public function votePoll(pollId:String, answerId:Number):void { + var questionId: int = 0; // assume only one question per poll + + var message:Object = { + header: {name: "RespondToPollReqMsg", meetingId: UsersUtil.getInternalMeetingID(), userId: UsersUtil.getMyUserID()}, + body: {requesterId: UsersUtil.getMyUserID(), pollId: pollId, questionId: questionId, answerId: answerId} + }; + var _nc:ConnectionManager = BBB.initConnectionManager(); - _nc.sendMessage("poll.votePoll", - function(result:String):void { - }, - function(status:String):void { - LOGGER.error(status); + _nc.sendMessage2x( + function(result:String):void { // On successful result }, - map + function(status:String):void { // status - On error occurred + LOGGER.error(status); + }, + JSON.stringify(message) ); } public function showPollResult(pollId:String, show:Boolean):void { - var map:Object = new Object(); - map["pollId"] = pollId; - map["show"] = show; - + var messageName:String = "ShowPollResultReqMsg"; + if (!show) { + messageName = "HidePollResultReqMsg"; + } + + var message:Object = { + header: {name: messageName, meetingId: UsersUtil.getInternalMeetingID(), userId: UsersUtil.getMyUserID()}, + body: {requesterId: UsersUtil.getMyUserID(), pollId: pollId} + }; + var _nc:ConnectionManager = BBB.initConnectionManager(); - _nc.sendMessage("poll.showPollResult", - function(result:String):void { - }, - function(status:String):void { - LOGGER.error(status); + _nc.sendMessage2x( + function(result:String):void { // On successful result }, - map - ); + function(status:String):void { // status - On error occurred + LOGGER.error(status); + }, + JSON.stringify(message) + ); } - } -} + } +} diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/polling/service/PollDataProcessor.as b/bigbluebutton-client/src/org/bigbluebutton/modules/polling/service/PollDataProcessor.as index 50e72418ea..62d1b2018f 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/polling/service/PollDataProcessor.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/polling/service/PollDataProcessor.as @@ -22,120 +22,100 @@ package org.bigbluebutton.modules.polling.service public class PollDataProcessor { - private static const LOGGER:ILogger = getClassLogger(PollDataProcessor); - - private var model:PollingModel; - private var dispatcher:Dispatcher; - - public function PollDataProcessor(model: PollingModel) { - this.model = model; - this.dispatcher = new Dispatcher(); - } - + private static const LOGGER:ILogger = getClassLogger(PollDataProcessor); + + private var model:PollingModel; + private var dispatcher:Dispatcher; + + public function PollDataProcessor(model: PollingModel) { + this.model = model; + this.dispatcher = new Dispatcher(); + } + public function handlePollStartedMesage(msg:Object):void { - var map:Object = JSON.parse(msg.msg); - if (map.hasOwnProperty("poll")) { - var poll:Object = map.poll; - if (poll.hasOwnProperty("id") && poll.hasOwnProperty("answers")) { - var pollId:String = poll.id; - - var answers:Array = poll.answers as Array; - - var ans:Array = new Array(); - - for (var j:int = 0; j < answers.length; j++) { - var a:Object = answers[j]; - ans.push(new SimpleAnswer(Number(String(a.id)), a.key)); - } - - model.setCurrentPoll(new SimplePoll(pollId, ans)); - dispatcher.dispatchEvent(new PollStartedEvent(new SimplePoll(pollId, ans))); - } + var pollId:String = msg.body.pollId; + var answers:Array = msg.body.poll.answers as Array; + + var ans:Array = new Array(); + for (var j:int = 0; j < answers.length; j++) { + var a:Object = answers[j]; + ans.push(new SimpleAnswer(Number(String(a.id)), a.key)); } + + model.setCurrentPoll(new SimplePoll(pollId, ans)); + dispatcher.dispatchEvent(new PollStartedEvent(new SimplePoll(pollId, ans))); } public function handlePollStoppedMesage(msg:Object):void { - var map:Object = JSON.parse(msg.msg); dispatcher.dispatchEvent(new PollStoppedEvent()); } - public function handlePollShowResultMessage(msg:Object):void { - var map:Object = JSON.parse(msg.msg); - if (map.hasOwnProperty("poll")) { - var poll:Object = map.poll; - if (poll.hasOwnProperty("id") && poll.hasOwnProperty("answers") - && poll.hasOwnProperty("num_responders") && poll.hasOwnProperty("num_respondents")) { - var pollId:String = poll.id; - - var answers:Array = poll.answers as Array; - var accessibleAnswers:String = ResourceUtil.getInstance().getString("bbb.polling.results.accessible.header") + "
"; - - var ans:Array = new Array(); - - for (var j:int = 0; j < answers.length; j++) { - var a:Object = answers[j]; - ans.push(new SimpleAnswerResult(a.id as Number, a.key, a.num_votes as Number)); + public function handlePollShowResultMessage(msg:Object, show:Boolean):void { + if (!show) { + return; + } + + var poll:Object = msg.body.poll; + var pollId:String = poll.id; + + var answers:Array = poll.answers as Array; + var accessibleAnswers:String = ResourceUtil.getInstance().getString("bbb.polling.results.accessible.header") + "
"; + + var ans:Array = new Array(); + + for (var j:int = 0; j < answers.length; j++) { + var a:Object = answers[j]; + ans.push(new SimpleAnswerResult(a.id as Number, a.key, a.numVotes as Number)); + } + + var numRespondents:Number = poll.numRespondents; + var numResponders:Number = poll.numResponders; + + dispatcher.dispatchEvent(new PollShowResultEvent(new SimplePollResult(pollId, ans, numRespondents, numResponders))); + + if (Accessibility.active) { + for (var k:int = 0; k < answers.length; k++) { + var localizedKey: String = ResourceUtil.getInstance().getString('bbb.polling.answer.'+answers[k].key); + + if (localizedKey == null || localizedKey == "" || localizedKey == "undefined") { + localizedKey = answers[k].key; } - - var numRespondents:Number = poll.num_respondents; - var numResponders:Number = poll.num_responders; - - dispatcher.dispatchEvent(new PollShowResultEvent(new SimplePollResult(pollId, ans, numRespondents, numResponders))); - - if (Accessibility.active) { - for (var k:int = 0; k < answers.length; k++) { - var localizedKey: String = ResourceUtil.getInstance().getString('bbb.polling.answer.'+answers[k].key); - - if (localizedKey == null || localizedKey == "" || localizedKey == "undefined") { - localizedKey = answers[k].key; - } - accessibleAnswers += ResourceUtil.getInstance().getString("bbb.polling.results.accessible.answer", [localizedKey, answers[k].num_votes]) + "
"; - } - - var pollResultMessage:ChatMessageVO = new ChatMessageVO(); - pollResultMessage.chatType = ChatConstants.PUBLIC_CHAT; - pollResultMessage.fromUserID = ResourceUtil.getInstance().getString("bbb.chat.chatMessage.systemMessage"); - pollResultMessage.fromUsername = ResourceUtil.getInstance().getString("bbb.chat.chatMessage.systemMessage"); - pollResultMessage.fromColor = "86187"; - pollResultMessage.fromTime = new Date().getTime(); - pollResultMessage.fromTimezoneOffset = new Date().getTimezoneOffset(); - pollResultMessage.toUserID = ResourceUtil.getInstance().getString("bbb.chat.chatMessage.systemMessage"); - pollResultMessage.toUsername = ResourceUtil.getInstance().getString("bbb.chat.chatMessage.systemMessage"); - pollResultMessage.message = accessibleAnswers; - - var pollResultMessageEvent:PublicChatMessageEvent = new PublicChatMessageEvent(PublicChatMessageEvent.PUBLIC_CHAT_MESSAGE_EVENT); - pollResultMessageEvent.message = pollResultMessage; - pollResultMessageEvent.history = false; - dispatcher.dispatchEvent(pollResultMessageEvent); - } - } - } + accessibleAnswers += ResourceUtil.getInstance().getString("bbb.polling.results.accessible.answer", [localizedKey, answers[k].numVotes]) + "
"; + } + + var pollResultMessage:ChatMessageVO = new ChatMessageVO(); + pollResultMessage.chatType = ChatConstants.PUBLIC_CHAT; + pollResultMessage.fromUserID = ResourceUtil.getInstance().getString("bbb.chat.chatMessage.systemMessage"); + pollResultMessage.fromUsername = ResourceUtil.getInstance().getString("bbb.chat.chatMessage.systemMessage"); + pollResultMessage.fromColor = "86187"; + pollResultMessage.fromTime = new Date().getTime(); + pollResultMessage.fromTimezoneOffset = new Date().getTimezoneOffset(); + pollResultMessage.toUserID = ResourceUtil.getInstance().getString("bbb.chat.chatMessage.systemMessage"); + pollResultMessage.toUsername = ResourceUtil.getInstance().getString("bbb.chat.chatMessage.systemMessage"); + pollResultMessage.message = accessibleAnswers; + + var pollResultMessageEvent:PublicChatMessageEvent = new PublicChatMessageEvent(PublicChatMessageEvent.PUBLIC_CHAT_MESSAGE_EVENT); + pollResultMessageEvent.message = pollResultMessage; + pollResultMessageEvent.history = false; + dispatcher.dispatchEvent(pollResultMessageEvent); + } } public function handlePollUserVotedMessage(msg:Object):void { - var map:Object = JSON.parse(msg.msg); - if (map.hasOwnProperty("poll")) { - var poll:Object = map.poll; - if (poll.hasOwnProperty("id") && poll.hasOwnProperty("answers") - && poll.hasOwnProperty("num_responders") && poll.hasOwnProperty("num_respondents")) { - var pollId:String = poll.id; - - var answers:Array = poll.answers as Array; - - var ans:Array = new Array(); - - for (var j:int = 0; j < answers.length; j++) { - var a:Object = answers[j]; - ans.push(new SimpleAnswerResult(a.id as Number, a.key, a.num_votes as Number)); - } - - var numRespondents:Number = poll.num_respondents; - var numResponders:Number = poll.num_responders; - - dispatcher.dispatchEvent(new PollVotedEvent(new SimplePollResult(pollId, ans, numRespondents, numResponders))); - } + var pollId:String = msg.body.pollId; + var poll:Object = msg.body.poll; + var answers:Array = poll.answers as Array; + var ans:Array = new Array(); + + for (var j:int = 0; j < answers.length; j++) { + var a:Object = answers[j]; + ans.push(new SimpleAnswerResult(a.id as Number, a.key, a.numVotes as Number)); } - + + var numRespondents:Number = poll.numRespondents; + var numResponders:Number = poll.numResponders; + + dispatcher.dispatchEvent(new PollVotedEvent(new SimplePollResult(pollId, ans, numRespondents, numResponders))); } } } From 9a0a4d56699988139297add3fd7c23e1bf239afb Mon Sep 17 00:00:00 2001 From: Anton Georgiev Date: Fri, 23 Jun 2017 17:26:53 -0400 Subject: [PATCH 02/15] work on displaying poll result annotation in flash client --- .../org/bigbluebutton/core/models/Polls.scala | 49 +++++++++++-------- .../handlers/ShowPollResultReqMsgHdlr.scala | 22 +++++++-- .../whiteboard/maps/WhiteboardEventMap.mxml | 6 +-- 3 files changed, 46 insertions(+), 31 deletions(-) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Polls.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Polls.scala index 944ec9dbb6..7d6d3f791b 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Polls.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Polls.scala @@ -1,8 +1,11 @@ package org.bigbluebutton.core.models +import java.util import java.util.ArrayList + import com.google.gson.Gson import org.bigbluebutton.common2.domain._ +import org.bigbluebutton.core.apps.WhiteboardKeyUtil import scala.collection.mutable.ArrayBuffer import scala.collection.mutable.HashMap @@ -45,22 +48,30 @@ object Polls { } } - def handleShowPollResultReqMsg(requesterId: String, pollId: String, lm: LiveMeeting): Option[SimplePollResultOutVO] = { - // def send(poll: SimplePollResultOutVO, shape: scala.collection.immutable.Map[String, Object]): Unit = { - // for { - // page <- lm.presModel.getCurrentPage() - // pageId = if (poll.id.contains("deskshare")) "deskshare" else page.id - // annotation = new AnnotationVO(poll.id, WhiteboardKeyUtil.DRAW_END_STATUS, WhiteboardKeyUtil.POLL_RESULT_TYPE, shape, pageId, requesterId, -1) - // } handleSendWhiteboardAnnotationRequest(new SendWhiteboardAnnotationRequest(props.meetingProp.intId, requesterId, annotation)) - // } + def handleShowPollResultReqMsg(requesterId: String, pollId: String, lm: LiveMeeting): Option[(SimplePollResultOutVO, AnnotationProps)] = { + def sendWhiteboardAnnotation(annotation: AnnotationProps): Unit = { + lm.wbModel.updateAnnotation(annotation.wbId, annotation.userId, annotation) + annotation + } + + def send(poll: SimplePollResultOutVO, shape: scala.collection.immutable.Map[String, Object]): Option[AnnotationProps] = { + for { + page <- lm.presModel.getCurrentPage() + pageId = if (poll.id.contains("deskshare")) "deskshare" else page.id + annotation = new AnnotationProps(poll.id, WhiteboardKeyUtil.DRAW_END_STATUS, WhiteboardKeyUtil.POLL_RESULT_TYPE, shape, pageId, requesterId, -1) + } yield { + sendWhiteboardAnnotation(annotation) + annotation + } + } for { result <- getSimplePollResult(pollId, lm.polls) shape = pollResultToWhiteboardShape(result) + annot <- send(result, shape) } yield { - // send(result, shape) showPollResult(pollId, lm.polls) - result + (result, annot) } } @@ -164,18 +175,18 @@ object Polls { private def pollResultToWhiteboardShape(result: SimplePollResultOutVO): scala.collection.immutable.Map[String, Object] = { val shape = new scala.collection.mutable.HashMap[String, Object]() - shape += "num_respondents" -> new Integer(result.numRespondents) - shape += "num_responders" -> new Integer(result.numResponders) - shape += "type" -> "poll_result" + shape += "numRespondents" -> new Integer(result.numRespondents) + shape += "numResponders" -> new Integer(result.numResponders) + shape += "type" -> WhiteboardKeyUtil.POLL_RESULT_TYPE shape += "id" -> result.id - shape += "status" -> "DRAW_END" + shape += "status" -> WhiteboardKeyUtil.DRAW_END_STATUS val answers = new ArrayBuffer[java.util.HashMap[String, Object]] result.answers.foreach(ans => { val amap = new java.util.HashMap[String, Object]() amap.put("id", ans.id: java.lang.Integer) amap.put("key", ans.key) - amap.put("num_votes", ans.numVotes: java.lang.Integer) + amap.put("numVotes", ans.numVotes: java.lang.Integer) answers += amap }) @@ -184,14 +195,10 @@ object Polls { // Hardcode poll result display location for now to display result // in bottom-right corner. - val display = new ArrayList[Double]() val shapeHeight = 6.66 * answers.size - display.add(66.0) - display.add(100 - shapeHeight) - display.add(34.0) - display.add(shapeHeight) + var mapA = List(66.0, 100 - shapeHeight, 34.0, shapeHeight) - shape += "points" -> display + shape += "points" -> mapA shape.toMap } diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/ShowPollResultReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/ShowPollResultReqMsgHdlr.scala index 134dbb0a85..8de9e129fd 100644 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/ShowPollResultReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/ShowPollResultReqMsgHdlr.scala @@ -1,11 +1,11 @@ package org.bigbluebutton.core2.message.handlers -import org.bigbluebutton.common2.messages.MessageBody.PollShowResultEvtMsgBody +import org.bigbluebutton.common2.messages.MessageBody.{ PollShowResultEvtMsgBody, SendWhiteboardAnnotationEvtMsgBody, SendWhiteboardAnnotationPubMsgBody } import org.bigbluebutton.common2.messages._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Polls import org.bigbluebutton.core.running.MeetingActor -import org.bigbluebutton.common2.domain.SimplePollResultOutVO +import org.bigbluebutton.common2.domain.{ AnnotationProps, SimplePollResultOutVO } trait ShowPollResultReqMsgHdlr { this: MeetingActor => @@ -14,7 +14,8 @@ trait ShowPollResultReqMsgHdlr { def handleShowPollResultReqMsg(msg: ShowPollResultReqMsg): Unit = { - def broadcastEvent(msg: ShowPollResultReqMsg, result: SimplePollResultOutVO): Unit = { + def broadcastEvent(msg: ShowPollResultReqMsg, result: SimplePollResultOutVO, annot: AnnotationProps): Unit = { + // PollShowResultEvtMsg val routing = Routing.addMsgToClientRouting(MessageTypes.BROADCAST_TO_MEETING, props.meetingProp.intId, msg.header.userId) val envelope = BbbCoreEnvelope(PollShowResultEvtMsg.NAME, routing) val header = BbbClientMsgHeader(PollShowResultEvtMsg.NAME, props.meetingProp.intId, msg.header.userId) @@ -23,12 +24,23 @@ trait ShowPollResultReqMsgHdlr { val event = PollShowResultEvtMsg(header, body) val msgEvent = BbbCommonEnvCoreMsg(envelope, event) outGW.send(msgEvent) + + // SendWhiteboardAnnotationPubMsg + val annotationRouting = Routing.addMsgToClientRouting(MessageTypes.BROADCAST_TO_MEETING, props.meetingProp.intId, msg.header.userId) + val annotationEnvelope = BbbCoreEnvelope(SendWhiteboardAnnotationEvtMsg.NAME, annotationRouting) + val annotationHeader = BbbClientMsgHeader(SendWhiteboardAnnotationEvtMsg.NAME, props.meetingProp.intId, msg.header.userId) + + val annotMsgBody = SendWhiteboardAnnotationEvtMsgBody(annot) + val annotationEvent = SendWhiteboardAnnotationEvtMsg(annotationHeader, annotMsgBody) + val annotationMsgEvent = BbbCommonEnvCoreMsg(annotationEnvelope, annotationEvent) + outGW.send(annotationMsgEvent) } for { - result <- Polls.handleShowPollResultReqMsg(msg.header.userId, msg.body.pollId, liveMeeting) + (result, annotationProp) <- Polls.handleShowPollResultReqMsg(msg.header.userId, msg.body.pollId, liveMeeting) } yield { - broadcastEvent(msg, result) + + broadcastEvent(msg, result, annotationProp) } } } diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/maps/WhiteboardEventMap.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/maps/WhiteboardEventMap.mxml index 707a734b71..754f870e7a 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/maps/WhiteboardEventMap.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/maps/WhiteboardEventMap.mxml @@ -83,11 +83,7 @@ with BigBlueButton; if not, see . - - - - - + From 76026da06cd389ed7dafda740e0cd9692415ecb5 Mon Sep 17 00:00:00 2001 From: Chad Pilkey Date: Mon, 26 Jun 2017 15:00:32 -0400 Subject: [PATCH 03/15] moved caption messages to 2.0 format --- .../bigbluebutton/core/apps/CaptionApp.scala | 66 ++++++------- .../core/apps/CaptionModel.scala | 98 ++++++++++++------- .../core/apps/caption/CaptionApp2x.scala | 33 +++++++ .../EditCaptionHistoryPubMsgHdlr.scala | 33 +++++++ .../caption/EjectUserFromMeetingHdlr.scala | 20 ++++ .../SendCaptionHistoryReqMsgHdlr.scala | 30 ++++++ .../UpdateCaptionOwnerPubMsgHdlr.scala | 31 ++++++ .../senders/ReceivedJsonMsgHandlerActor.scala | 6 ++ .../core/running/MeetingActor.scala | 5 + .../users/EjectUserFromMeetingHdlr.scala | 1 + .../common2/domain/Caption.scala | 3 + .../common2/messages/MessageBody.scala | 8 ++ .../common2/messages/Messages.scala | 22 +++++ .../events/ReceiveCaptionHistoryEvent.as | 4 +- .../modules/caption/model/Transcripts.as | 14 +-- .../caption/services/CaptionService.as | 18 +--- .../caption/services/MessageReceiver.as | 59 ++++++----- .../modules/caption/services/MessageSender.as | 55 ++++++----- .../modules/caption/views/CaptionWindow.mxml | 57 ++++++----- 19 files changed, 405 insertions(+), 158 deletions(-) create mode 100755 akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/CaptionApp2x.scala create mode 100755 akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/EditCaptionHistoryPubMsgHdlr.scala create mode 100755 akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/EjectUserFromMeetingHdlr.scala create mode 100755 akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/SendCaptionHistoryReqMsgHdlr.scala create mode 100755 akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/UpdateCaptionOwnerPubMsgHdlr.scala create mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/domain/Caption.scala diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/CaptionApp.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/CaptionApp.scala index 6f4575c818..d0bb883da5 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/CaptionApp.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/CaptionApp.scala @@ -10,47 +10,47 @@ trait CaptionApp { val outGW: OutMessageGateway def handleSendCaptionHistoryRequest(msg: SendCaptionHistoryRequest) { - val history = liveMeeting.captionModel.getHistory() - //println("Caption history requested " + history) - outGW.send(new SendCaptionHistoryReply(props.meetingProp.intId, props.recordProp.record, msg.requesterID, history)) + // val history = liveMeeting.captionModel.getHistory() + // //println("Caption history requested " + history) + // outGW.send(new SendCaptionHistoryReply(props.meetingProp.intId, props.recordProp.record, msg.requesterID, history)) } def handleUpdateCaptionOwnerRequest(msg: UpdateCaptionOwnerRequest) { - // clear owner from previous locale - if (msg.ownerID.length > 0) { - liveMeeting.captionModel.findLocaleByOwnerId(msg.ownerID).foreach(t => { - liveMeeting.captionModel.changeTranscriptOwner(t, "") - - // send notification that owner has changed - outGW.send(new UpdateCaptionOwnerReply(props.meetingProp.intId, props.recordProp.record, t, liveMeeting.captionModel.findLocaleCodeByLocale(t), "")) - }) - } - // create the locale if it doesn't exist - if (liveMeeting.captionModel.transcripts contains msg.locale) { - liveMeeting.captionModel.changeTranscriptOwner(msg.locale, msg.ownerID) - } else { // change the owner if it does exist - liveMeeting.captionModel.newTranscript(msg.locale, msg.localeCode, msg.ownerID) - } - - outGW.send(new UpdateCaptionOwnerReply(props.meetingProp.intId, props.recordProp.record, msg.locale, msg.localeCode, msg.ownerID)) + // // clear owner from previous locale + // if (msg.ownerID.length > 0) { + // liveMeeting.captionModel.findLocaleByOwnerId(msg.ownerID).foreach(t => { + // liveMeeting.captionModel.changeTranscriptOwner(t, "") + // + // // send notification that owner has changed + // outGW.send(new UpdateCaptionOwnerReply(props.meetingProp.intId, props.recordProp.record, t, liveMeeting.captionModel.findLocaleCodeByLocale(t), "")) + // }) + // } + // // create the locale if it doesn't exist + // if (liveMeeting.captionModel.transcripts contains msg.locale) { + // liveMeeting.captionModel.changeTranscriptOwner(msg.locale, msg.ownerID) + // } else { // change the owner if it does exist + // liveMeeting.captionModel.newTranscript(msg.locale, msg.localeCode, msg.ownerID) + // } + // + // outGW.send(new UpdateCaptionOwnerReply(props.meetingProp.intId, props.recordProp.record, msg.locale, msg.localeCode, msg.ownerID)) } def handleEditCaptionHistoryRequest(msg: EditCaptionHistoryRequest) { - liveMeeting.captionModel.findLocaleByOwnerId(msg.userID).foreach(t => { - if (t == msg.locale) { - liveMeeting.captionModel.editHistory(msg.startIndex, msg.endIndex, msg.locale, msg.text) - - outGW.send(new EditCaptionHistoryReply(props.meetingProp.intId, props.recordProp.record, msg.userID, msg.startIndex, msg.endIndex, msg.locale, msg.localeCode, msg.text)) - } - }) + // liveMeeting.captionModel.findLocaleByOwnerId(msg.userID).foreach(t => { + // if (t == msg.locale) { + // liveMeeting.captionModel.editHistory(msg.startIndex, msg.endIndex, msg.locale, msg.text) + // + // outGW.send(new EditCaptionHistoryReply(props.meetingProp.intId, props.recordProp.record, msg.userID, msg.startIndex, msg.endIndex, msg.locale, msg.localeCode, msg.text)) + // } + // }) } def checkCaptionOwnerLogOut(userId: String) { - liveMeeting.captionModel.findLocaleByOwnerId(userId).foreach(t => { - liveMeeting.captionModel.changeTranscriptOwner(t, "") - - // send notification that owner has changed - outGW.send(new UpdateCaptionOwnerReply(props.meetingProp.intId, props.recordProp.record, t, liveMeeting.captionModel.findLocaleCodeByLocale(t), "")) - }) + // liveMeeting.captionModel.findLocaleByOwnerId(userId).foreach(t => { + // liveMeeting.captionModel.changeTranscriptOwner(t, "") + // + // // send notification that owner has changed + // outGW.send(new UpdateCaptionOwnerReply(props.meetingProp.intId, props.recordProp.record, t, liveMeeting.captionModel.findLocaleCodeByLocale(t), "")) + // }) } } \ No newline at end of file diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/CaptionModel.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/CaptionModel.scala index b0e4bfebf0..65d481ed10 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/CaptionModel.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/CaptionModel.scala @@ -1,58 +1,90 @@ package org.bigbluebutton.core.apps -class CaptionModel { - var transcripts = Map[String, Array[String]]() +import org.bigbluebutton.common2.domain.TranscriptVO +import scala.collection.immutable.HashMap - def newTranscript(locale: String, localeCode: String, ownerId: String) { - transcripts += locale -> Array(ownerId, "", localeCode) +class CaptionModel { + private var transcripts = new HashMap[String, TranscriptVO]() + + private def createTranscript(locale: String, localeCode: String, ownerId: String): TranscriptVO = { + val transcript = TranscriptVO(ownerId, "", localeCode) + transcripts += locale -> transcript + transcript } - def findLocaleByOwnerId(userId: String): Option[String] = { - transcripts.find(_._2(0) == userId).foreach(t => { - return Some(t._1) + private def findTranscriptByOwnerId(userId: String): Option[(String, TranscriptVO)] = { + transcripts.find(_._2.ownerId == userId).foreach(t => { + return Some(t) }) return None } - def findLocaleCodeByLocale(locale: String): String = { + def updateTranscriptOwner(locale: String, localeCode: String, ownerId: String): Map[String, TranscriptVO] = { + var updatedTranscripts = new HashMap[String, TranscriptVO] + + // clear owner from previous locale + if (ownerId.length > 0) { + findTranscriptByOwnerId(ownerId).foreach(t => { + val oldTranscript = t._2.copy(ownerId = "") + + transcripts += t._1 -> oldTranscript + updatedTranscripts += t._1 -> oldTranscript + }) + } + // change the owner if it does exist if (transcripts contains locale) { - return transcripts(locale)(2) + val newTranscript = transcripts(locale).copy(ownerId = ownerId) + + transcripts += locale -> newTranscript + updatedTranscripts += locale -> newTranscript + } else { // create the locale if it doesn't exist + val addedTranscript = createTranscript(locale, localeCode, ownerId) + updatedTranscripts += locale -> addedTranscript } - return "" + updatedTranscripts } - def changeTranscriptOwner(locale: String, ownerId: String) { - if (transcripts contains locale) { - transcripts(locale)(0) = ownerId - } + def getHistory(): Map[String, TranscriptVO] = { + transcripts } - def getHistory(): Map[String, Array[String]] = { - var history = Map[String, Array[String]]() - - transcripts.foreach(t => { - history += t._1 -> Array(t._2(0), t._2(1), t._2(2)) - }) - - history - } - - def editHistory(startIndex: Integer, endIndex: Integer, locale: String, text: String) { + def editHistory(userId: String, startIndex: Integer, endIndex: Integer, locale: String, text: String): Boolean = { + var successfulEdit = false //println("editHistory entered") if (transcripts contains locale) { - //println("editHistory found locale:" + locale) - val oText: String = transcripts(locale)(1) + val oldTranscript = transcripts(locale) + if (oldTranscript.ownerId == userId) { + //println("editHistory found locale:" + locale) + val oText: String = transcripts(locale).text - if (startIndex >= 0 && endIndex <= oText.length && startIndex <= endIndex) { - //println("editHistory passed index test") - val sText: String = oText.substring(0, startIndex) - val eText: String = oText.substring(endIndex) + if (startIndex >= 0 && endIndex <= oText.length && startIndex <= endIndex) { + //println("editHistory passed index test") + val sText: String = oText.substring(0, startIndex) + val eText: String = oText.substring(endIndex) - transcripts(locale)(1) = (sText + text + eText) - //println("editHistory new history is: " + transcripts(locale)(1)) + transcripts += locale -> transcripts(locale).copy(text = (sText + text + eText)) + //println("editHistory new history is: " + transcripts(locale).text) + successfulEdit = true + } } } + + successfulEdit + } + + def checkCaptionOwnerLogOut(userId: String): Option[(String, TranscriptVO)] = { + var rtnTranscript: Option[(String, TranscriptVO)] = None + + if (userId.length > 0) { + findTranscriptByOwnerId(userId).foreach(t => { + val oldTranscript = t._2.copy(ownerId = "") + + transcripts += t._1 -> oldTranscript + rtnTranscript = Some((t._1, oldTranscript)) + }) + } + rtnTranscript } } \ No newline at end of file diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/CaptionApp2x.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/CaptionApp2x.scala new file mode 100755 index 0000000000..f4feffd4cc --- /dev/null +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/CaptionApp2x.scala @@ -0,0 +1,33 @@ +package org.bigbluebutton.core.apps.caption + +import akka.actor.ActorContext +import akka.event.Logging +import org.bigbluebutton.common2.domain.TranscriptVO +import org.bigbluebutton.core.OutMessageGateway +import org.bigbluebutton.core.running.LiveMeeting + +class CaptionApp2x(val liveMeeting: LiveMeeting, + val outGW: OutMessageGateway)(implicit val context: ActorContext) + extends EjectUserFromMeetingHdlr + with EditCaptionHistoryPubMsgHdlr + with UpdateCaptionOwnerPubMsgHdlr + with SendCaptionHistoryReqMsgHdlr { + + val log = Logging(context.system, getClass) + + def getCaptionHistory(): Map[String, TranscriptVO] = { + liveMeeting.captionModel.getHistory() + } + + def updateCaptionOwner(locale: String, localeCode: String, userId: String): Map[String, TranscriptVO] = { + liveMeeting.captionModel.updateTranscriptOwner(locale, localeCode, userId) + } + + def editCaptionHistory(userId: String, startIndex: Integer, endIndex: Integer, locale: String, text: String): Boolean = { + liveMeeting.captionModel.editHistory(userId, startIndex, endIndex, locale, text) + } + + def checkCaptionOwnerLogOut(userId: String): Option[(String, TranscriptVO)] = { + liveMeeting.captionModel.checkCaptionOwnerLogOut(userId) + } +} diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/EditCaptionHistoryPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/EditCaptionHistoryPubMsgHdlr.scala new file mode 100755 index 0000000000..0df7f108d8 --- /dev/null +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/EditCaptionHistoryPubMsgHdlr.scala @@ -0,0 +1,33 @@ +package org.bigbluebutton.core.apps.caption + +import org.bigbluebutton.core.OutMessageGateway +import org.bigbluebutton.common2.messages.MessageBody.{ EditCaptionHistoryEvtMsgBody } +import org.bigbluebutton.common2.messages._ + +trait EditCaptionHistoryPubMsgHdlr { + this: CaptionApp2x => + + val outGW: OutMessageGateway + + def handleEditCaptionHistoryPubMsg(msg: EditCaptionHistoryPubMsg): Unit = { + + def broadcastEvent(msg: EditCaptionHistoryPubMsg): Unit = { + val routing = Routing.addMsgToClientRouting(MessageTypes.BROADCAST_TO_MEETING, liveMeeting.props.meetingProp.intId, msg.header.userId) + val envelope = BbbCoreEnvelope(EditCaptionHistoryEvtMsg.NAME, routing) + val header = BbbClientMsgHeader(EditCaptionHistoryEvtMsg.NAME, liveMeeting.props.meetingProp.intId, msg.header.userId) + + val body = EditCaptionHistoryEvtMsgBody(msg.body.startIndex, msg.body.endIndex, msg.body.locale, msg.body.localeCode, msg.body.text) + val event = EditCaptionHistoryEvtMsg(header, body) + val msgEvent = BbbCommonEnvCoreMsg(envelope, event) + outGW.send(msgEvent) + + //record(event) + } + + val successfulEdit = editCaptionHistory(msg.header.userId, msg.body.startIndex, msg.body.endIndex, msg.body.locale, msg.body.text) + println("the edit return was: " + successfulEdit) + if (successfulEdit) { + broadcastEvent(msg) + } + } +} diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/EjectUserFromMeetingHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/EjectUserFromMeetingHdlr.scala new file mode 100755 index 0000000000..9be077d0b7 --- /dev/null +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/EjectUserFromMeetingHdlr.scala @@ -0,0 +1,20 @@ +package org.bigbluebutton.core.apps.caption + +import org.bigbluebutton.core.api._ +import org.bigbluebutton.core.models.{ UserState, Users2x } + +trait EjectUserFromMeetingHdlr { + this: CaptionApp2x => + + def handle(msg: EjectUserFromMeeting, userToEject: UserState) { + // Unassign owner when user logs out + log.warning("TODO: Unassign transcript owner when they log out") + /* + for { + transcript <- checkCaptionOwnerLogOut(userToEject.intId) + } yield { + // Need to figure out how to send the update out + } + */ + } +} diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/SendCaptionHistoryReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/SendCaptionHistoryReqMsgHdlr.scala new file mode 100755 index 0000000000..234e5d4383 --- /dev/null +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/SendCaptionHistoryReqMsgHdlr.scala @@ -0,0 +1,30 @@ +package org.bigbluebutton.core.apps.caption + +import org.bigbluebutton.core.OutMessageGateway +import org.bigbluebutton.common2.domain.TranscriptVO +import org.bigbluebutton.common2.messages.MessageBody.{ SendCaptionHistoryRespMsgBody } +import org.bigbluebutton.common2.messages._ + +trait SendCaptionHistoryReqMsgHdlr { + this: CaptionApp2x => + + val outGW: OutMessageGateway + + def handleSendCaptionHistoryReqMsg(msg: SendCaptionHistoryReqMsg): Unit = { + + def broadcastEvent(msg: SendCaptionHistoryReqMsg, history: Map[String, TranscriptVO]): Unit = { + val routing = Routing.addMsgToClientRouting(MessageTypes.DIRECT, liveMeeting.props.meetingProp.intId, msg.header.userId) + val envelope = BbbCoreEnvelope(SendCaptionHistoryRespMsg.NAME, routing) + val header = BbbClientMsgHeader(SendCaptionHistoryRespMsg.NAME, liveMeeting.props.meetingProp.intId, msg.header.userId) + + val body = SendCaptionHistoryRespMsgBody(history) + val event = SendCaptionHistoryRespMsg(header, body) + val msgEvent = BbbCommonEnvCoreMsg(envelope, event) + outGW.send(msgEvent) + + //record(event) + } + + broadcastEvent(msg, getCaptionHistory()) + } +} diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/UpdateCaptionOwnerPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/UpdateCaptionOwnerPubMsgHdlr.scala new file mode 100755 index 0000000000..10e5064095 --- /dev/null +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/UpdateCaptionOwnerPubMsgHdlr.scala @@ -0,0 +1,31 @@ +package org.bigbluebutton.core.apps.caption + +import org.bigbluebutton.core.OutMessageGateway +import org.bigbluebutton.common2.messages.MessageBody.{ UpdateCaptionOwnerEvtMsgBody } +import org.bigbluebutton.common2.messages._ + +trait UpdateCaptionOwnerPubMsgHdlr { + this: CaptionApp2x => + + val outGW: OutMessageGateway + + def handleUpdateCaptionOwnerPubMsg(msg: UpdateCaptionOwnerPubMsg): Unit = { + + def broadcastEvent(msg: UpdateCaptionOwnerPubMsg, locale: String, localeCode: String, newOwnerId: String): Unit = { + val routing = Routing.addMsgToClientRouting(MessageTypes.BROADCAST_TO_MEETING, liveMeeting.props.meetingProp.intId, msg.header.userId) + val envelope = BbbCoreEnvelope(UpdateCaptionOwnerEvtMsg.NAME, routing) + val header = BbbClientMsgHeader(UpdateCaptionOwnerEvtMsg.NAME, liveMeeting.props.meetingProp.intId, msg.header.userId) + + val body = UpdateCaptionOwnerEvtMsgBody(locale, localeCode, newOwnerId) + val event = UpdateCaptionOwnerEvtMsg(header, body) + val msgEvent = BbbCommonEnvCoreMsg(envelope, event) + outGW.send(msgEvent) + + //record(event) + } + + updateCaptionOwner(msg.body.locale, msg.body.localeCode, msg.body.ownerId).foreach(f => { + broadcastEvent(msg, f._1, f._2.localeCode, f._2.ownerId) + }) + } +} diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala index 05c1f0946b..54764dc306 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala @@ -227,6 +227,12 @@ class ReceivedJsonMsgHandlerActor( routeGenericMsg[SendWhiteboardAnnotationPubMsg](envelope, jsonNode) case GetWhiteboardAnnotationsReqMsg.NAME => routeGenericMsg[GetWhiteboardAnnotationsReqMsg](envelope, jsonNode) + case EditCaptionHistoryPubMsg.NAME => + routeGenericMsg[EditCaptionHistoryPubMsg](envelope, jsonNode) + case UpdateCaptionOwnerPubMsg.NAME => + routeGenericMsg[UpdateCaptionOwnerPubMsg](envelope, jsonNode) + case SendCaptionHistoryReqMsg.NAME => + routeGenericMsg[SendCaptionHistoryReqMsg](envelope, jsonNode) case _ => log.error("Cannot route envelope name " + envelope.name) // do nothing diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala index 188d418c9e..765308ced0 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala @@ -24,6 +24,7 @@ import org.bigbluebutton.core2.message.handlers.users._ import scala.concurrent.duration._ import org.bigbluebutton.core.models.BreakoutRooms import org.bigbluebutton.core2.message.handlers.breakoutrooms._ +import org.bigbluebutton.core.apps.caption.CaptionApp2x object MeetingActor { def props(props: DefaultProps, @@ -110,6 +111,7 @@ class MeetingActor(val props: DefaultProps, val presentationApp2x = new PresentationApp2x(liveMeeting, outGW = outGW) val pollApp2x = new PollApp2x(liveMeeting, outGW = outGW) val deskshareApp2x = new DeskshareApp2x(liveMeeting, outGW = outGW) + val captionApp2x = new CaptionApp2x(liveMeeting, outGW = outGW) def receive = { //============================= @@ -257,6 +259,9 @@ class MeetingActor(val props: DefaultProps, case m: BreakoutRoomUsersUpdateMsg => handleBreakoutRoomUsersUpdateMsg(m) case m: SendBreakoutUsersUpdateMsg => handleSendBreakoutUsersUpdateMsg(m) case m: TransferUserToMeetingRequestMsg => handleTransferUserToMeetingRequestMsg(m) + case m: EditCaptionHistoryPubMsg => captionApp2x.handleEditCaptionHistoryPubMsg(m) + case m: UpdateCaptionOwnerPubMsg => captionApp2x.handleUpdateCaptionOwnerPubMsg(m) + case m: SendCaptionHistoryReqMsg => captionApp2x.handleSendCaptionHistoryReqMsg(m) case _ => println("***** Cannot handle " + msg.envelope.name) } } diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/EjectUserFromMeetingHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/EjectUserFromMeetingHdlr.scala index b07954795a..ebf5771717 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/EjectUserFromMeetingHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/EjectUserFromMeetingHdlr.scala @@ -20,6 +20,7 @@ trait EjectUserFromMeetingHdlr { presentationApp2x.handle(msg, user) pollApp2x.handle(msg, user) deskshareApp2x.handle(msg, user) + captionApp2x.handle(msg, user) } } diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/domain/Caption.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/domain/Caption.scala new file mode 100755 index 0000000000..65190f7788 --- /dev/null +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/domain/Caption.scala @@ -0,0 +1,3 @@ +package org.bigbluebutton.common2.domain + +case class TranscriptVO(ownerId: String, text: String, localeCode: String) \ No newline at end of file diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/MessageBody.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/MessageBody.scala index 1a98fb1369..a956e65d11 100755 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/MessageBody.scala +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/MessageBody.scala @@ -43,6 +43,10 @@ object MessageBody { case class ModifyWhiteboardAccessPubMsgBody(multiUser: Boolean) case class GetWhiteboardAccessReqMsgBody(requesterId: String) + // Caption Message Bodies + case class EditCaptionHistoryPubMsgBody(startIndex: Integer, endIndex: Integer, locale: String, localeCode: String, text: String) + case class UpdateCaptionOwnerPubMsgBody(locale: String, localeCode: String, ownerId: String) + case class SendCaptionHistoryReqMsgBody() // /** Event messages sent by Akka apps as result of receiving incoming messages ***/ // @@ -71,4 +75,8 @@ object MessageBody { case class GetCurrentPollRespMsgBody(userId: String, hasPoll: Boolean, poll: Option[PollVO]) case class UserRespondedToPollEvtMsgBody(presenterId: String, pollId: String, poll: SimplePollResultOutVO) + // Caption Message Bodies + case class SendCaptionHistoryRespMsgBody(history: Map[String, TranscriptVO]) + case class EditCaptionHistoryEvtMsgBody(startIndex: Integer, endIndex: Integer, locale: String, localeCode: String, text: String) + case class UpdateCaptionOwnerEvtMsgBody(locale: String, localeCode: String, ownerId: String) } diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala index 205e8ba803..9b8ce417a5 100755 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala @@ -103,6 +103,17 @@ case class GetCurrentPollReqMsg(header: BbbClientMsgHeader, body: GetCurrentPoll object RespondToPollReqMsg { val NAME = "RespondToPollReqMsg"} case class RespondToPollReqMsg(header: BbbClientMsgHeader, body: RespondToPollReqMsgBody) extends BbbCoreMsg +/** Caption Messages */ +object EditCaptionHistoryPubMsg { val NAME = "EditCaptionHistoryPubMsg"} +case class EditCaptionHistoryPubMsg(header: BbbClientMsgHeader, body: EditCaptionHistoryPubMsgBody) extends StandardMsg + +object UpdateCaptionOwnerPubMsg { val NAME = "UpdateCaptionOwnerPubMsg"} +case class UpdateCaptionOwnerPubMsg(header: BbbClientMsgHeader, body: UpdateCaptionOwnerPubMsgBody) extends StandardMsg + +object SendCaptionHistoryReqMsg { val NAME = "SendCaptionHistoryReqMsg"} +case class SendCaptionHistoryReqMsg(header: BbbClientMsgHeader, body: SendCaptionHistoryReqMsgBody) extends StandardMsg + + // /** Event messages sent by Akka apps as result of receiving incoming messages ***/ // @@ -166,6 +177,17 @@ case class GetCurrentPollRespMsg(header: BbbClientMsgHeader, body: GetCurrentPol object UserRespondedToPollEvtMsg { val NAME = "UserRespondedToPollEvtMsg"} case class UserRespondedToPollEvtMsg(header: BbbClientMsgHeader, body: UserRespondedToPollEvtMsgBody) extends BbbCoreMsg +/** Caption Messages */ +object EditCaptionHistoryEvtMsg { val NAME = "EditCaptionHistoryEvtMsg"} +case class EditCaptionHistoryEvtMsg(header: BbbClientMsgHeader, body: EditCaptionHistoryEvtMsgBody) extends StandardMsg + +object UpdateCaptionOwnerEvtMsg { val NAME = "UpdateCaptionOwnerEvtMsg"} +case class UpdateCaptionOwnerEvtMsg(header: BbbClientMsgHeader, body: UpdateCaptionOwnerEvtMsgBody) extends StandardMsg + +object SendCaptionHistoryRespMsg { val NAME = "SendCaptionHistoryRespMsg"} +case class SendCaptionHistoryRespMsg(header: BbbClientMsgHeader, body: SendCaptionHistoryRespMsgBody) extends StandardMsg + + /** System Messages **/ case class AkkaAppsCheckAliveReqBody(timestamp: Long) case class AkkaAppsCheckAliveReqMsg(header: BbbCoreHeader, body: AkkaAppsCheckAliveReqBody) diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/caption/events/ReceiveCaptionHistoryEvent.as b/bigbluebutton-client/src/org/bigbluebutton/modules/caption/events/ReceiveCaptionHistoryEvent.as index b33775cc22..783bf15e9e 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/caption/events/ReceiveCaptionHistoryEvent.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/caption/events/ReceiveCaptionHistoryEvent.as @@ -20,10 +20,12 @@ package org.bigbluebutton.modules.caption.events { import flash.events.Event; + import mx.collections.ArrayCollection; + public class ReceiveCaptionHistoryEvent extends Event { public static const RECEIVE_CAPTION_HISTORY_EVENT:String = "RECEIVE_CAPTION_HISTORY_EVENT"; - public var history:Object; + public var history:ArrayCollection; public function ReceiveCaptionHistoryEvent(type:String, bubbles:Boolean=false, cancelable:Boolean=false) { super(type, bubbles, cancelable); diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/caption/model/Transcripts.as b/bigbluebutton-client/src/org/bigbluebutton/modules/caption/model/Transcripts.as index c40347d794..3e591170dc 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/caption/model/Transcripts.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/caption/model/Transcripts.as @@ -42,16 +42,16 @@ package org.bigbluebutton.modules.caption.model { return _historyInited; } - public function receiveCaptionHistory(history:Object):void { - for (var locale:Object in history) { + public function receiveCaptionHistory(history:ArrayCollection):void { + for each(var receivedTranscript:Transcript in history) { // This convoluted conversion from Object to the actual class is required to get the accurate // String value. See, http://stackoverflow.com/a/204003, for more information - var localeClassName:String = flash.utils.getQualifiedClassName(locale); - var localeClass:Class = flash.utils.getDefinitionByName(localeClassName) as Class; + //var localeClassName:String = flash.utils.getQualifiedClassName(locale); + //var localeClass:Class = flash.utils.getDefinitionByName(localeClassName) as Class; - var t:Transcript = findLocale((locale as localeClass).toString(), history[locale][2]); - t.ownerID = history[locale][0]; - t.editHistory(0,0,history[locale][1]); + var t:Transcript = findLocale(receivedTranscript.locale, receivedTranscript.localeCode); + t.ownerID = receivedTranscript.ownerID; + t.transcript = receivedTranscript.transcript; } _historyInited = true; } diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/caption/services/CaptionService.as b/bigbluebutton-client/src/org/bigbluebutton/modules/caption/services/CaptionService.as index 5d88725989..cb7a45d4d1 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/caption/services/CaptionService.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/caption/services/CaptionService.as @@ -34,25 +34,11 @@ package org.bigbluebutton.modules.caption.services { } public function sendUpdateCaptionOwner(e:SendUpdateCaptionOwnerEvent):void { - var msg:Object = new Object(); - msg.locale = e.locale; - msg.localeCode = e.localeCode; - msg.claim = e.claim; - - sender.sendUpdateCaptionOwner(msg); + sender.sendUpdateCaptionOwner(e.locale, e.localeCode); } public function sendEditCaptionHistory(e:SendEditCaptionHistoryEvent):void { - if (e.startIndex >= 0) { - var msg:Object = new Object(); - msg.startIndex = e.startIndex; - msg.endIndex = e.endIndex; - msg.locale = e.locale; - msg.localeCode = e.localeCode; - msg.text = e.text; - - sender.sendEditCaptionHistory(msg); - } + sender.sendEditCaptionHistory(e.startIndex, e.endIndex, e.locale, e.localeCode, e.text); } } } \ No newline at end of file diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/caption/services/MessageReceiver.as b/bigbluebutton-client/src/org/bigbluebutton/modules/caption/services/MessageReceiver.as index af0d6de374..8244f2999c 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/caption/services/MessageReceiver.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/caption/services/MessageReceiver.as @@ -19,6 +19,8 @@ package org.bigbluebutton.modules.caption.services { import com.asfusion.mate.events.Dispatcher; + import mx.collections.ArrayCollection; + import org.as3commons.logging.api.ILogger; import org.as3commons.logging.api.getClassLogger; import org.bigbluebutton.core.BBB; @@ -26,62 +28,75 @@ package org.bigbluebutton.modules.caption.services { import org.bigbluebutton.modules.caption.events.ReceiveCaptionHistoryEvent; import org.bigbluebutton.modules.caption.events.ReceiveEditCaptionHistoryEvent; import org.bigbluebutton.modules.caption.events.ReceiveUpdateCaptionOwnerEvent; + import org.bigbluebutton.modules.caption.model.Transcript; public class MessageReceiver implements IMessageListener { private static const LOGGER:ILogger = getClassLogger(MessageReceiver); + private var dispatcher:Dispatcher = new Dispatcher(); + public function MessageReceiver() { BBB.initConnectionManager().addMessageListener(this); } public function onMessage(messageName:String, message:Object):void { switch (messageName) { - case "sendCaptionHistoryReply": - sendCaptionHistoryReply(message); + case "SendCaptionHistoryRespMsg": + handleSendCaptionHistoryRespMsg(message); break; - case "updateCaptionOwner": - updateCaptionOwner(message); + case "UpdateCaptionOwnerEvtMsg": + handleUpdateCaptionOwnerEvtMsg(message); break; - case "editCaptionHistory": - editCaptionHistory(message); + case "EditCaptionHistoryEvtMsg": + handleEditCaptionHistoryEvtMsg(message); break; default: } } - private function sendCaptionHistoryReply(message:Object):void { + private function handleSendCaptionHistoryRespMsg(message:Object):void { //LOGGER.debug("sendCaptionHistoryReply " + message.msg); - var map:Object = JSON.parse(message.msg); var event:ReceiveCaptionHistoryEvent = new ReceiveCaptionHistoryEvent(ReceiveCaptionHistoryEvent.RECEIVE_CAPTION_HISTORY_EVENT); - event.history = map; - var dispatcher:Dispatcher = new Dispatcher(); + event.history = processHistoryObject(message.body.history); dispatcher.dispatchEvent(event); } - private function updateCaptionOwner(message:Object):void { + private function processHistoryObject(history:Object):ArrayCollection { + var cleanedArray:ArrayCollection = new ArrayCollection(); + + for (var locale:String in history) { + var transcriptData:Object = history[locale]; + var newTranscript:Transcript = new Transcript(locale, transcriptData.localeCode); + newTranscript.ownerID = transcriptData.ownerId; + newTranscript.transcript = transcriptData.text; + cleanedArray.addItem(newTranscript); + } + + return cleanedArray; + } + + private function handleUpdateCaptionOwnerEvtMsg(message:Object):void { //LOGGER.debug("updateCaptionOwner " + message); //var map:Object = JSON.parse(message); var event:ReceiveUpdateCaptionOwnerEvent = new ReceiveUpdateCaptionOwnerEvent(ReceiveUpdateCaptionOwnerEvent.RECEIVE_UPDATE_CAPTION_OWNER_EVENT); - event.locale = message.locale; - event.localeCode = message.locale_code; - event.ownerID = message.owner_id; - var dispatcher:Dispatcher = new Dispatcher(); + event.locale = message.body.locale; + event.localeCode = message.body.localeCode; + event.ownerID = message.body.ownerId; dispatcher.dispatchEvent(event); } - private function editCaptionHistory(message:Object):void { + private function handleEditCaptionHistoryEvtMsg(message:Object):void { //LOGGER.debug("editCaptionHistory {start_index:" + message.start_index+",end_index:"+message.end_index+",locale:"+message.locale+",locale_code"+message.locale_code+",text:'"+message.text+"'}"); //var map:Object = JSON.parse(message); var event:ReceiveEditCaptionHistoryEvent = new ReceiveEditCaptionHistoryEvent(ReceiveEditCaptionHistoryEvent.RECEIVE_EDIT_CAPTION_HISTORY); - event.startIndex = int(message.start_index); - event.endIndex = int(message.end_index); - event.locale = message.locale; - event.localeCode = message.locale_code; - event.text = message.text; - var dispatcher:Dispatcher = new Dispatcher(); + event.startIndex = int(message.body.startIndex); + event.endIndex = int(message.body.endIndex); + event.locale = message.body.locale; + event.localeCode = message.body.localeCode; + event.text = message.body.text; dispatcher.dispatchEvent(event); } } diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/caption/services/MessageSender.as b/bigbluebutton-client/src/org/bigbluebutton/modules/caption/services/MessageSender.as index 4e1d50b0d9..740c18d21b 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/caption/services/MessageSender.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/caption/services/MessageSender.as @@ -20,49 +20,60 @@ package org.bigbluebutton.modules.caption.services { import org.as3commons.logging.api.ILogger; import org.as3commons.logging.api.getClassLogger; import org.bigbluebutton.core.BBB; + import org.bigbluebutton.core.UsersUtil; import org.bigbluebutton.core.managers.ConnectionManager; public class MessageSender { private static const LOGGER:ILogger = getClassLogger(MessageSender); public function getCaptionHistory():void { - LOGGER.debug("Sending [caption.getCaptionHistory] to server."); + var message:Object = { + header: {name: "SendCaptionHistoryReqMsg", meetingId: UsersUtil.getInternalMeetingID(), userId: UsersUtil.getMyUserID()}, + body: {} + }; + var _nc:ConnectionManager = BBB.initConnectionManager(); - _nc.sendMessage("caption.getCaptionHistory", + _nc.sendMessage2x( function(result:String):void { // On successful result - LOGGER.debug(result); - }, + }, function(status:String):void { // status - On error occurred - LOGGER.error(status); - } + LOGGER.error(status); + }, + JSON.stringify(message) ); } - public function sendUpdateCaptionOwner(message:Object):void { - LOGGER.debug("Sending [caption.sendUpdateCaptionOwner] to server."); + public function sendUpdateCaptionOwner(locale: String, localeCode: String):void { + var message:Object = { + header: {name: "UpdateCaptionOwnerPubMsg", meetingId: UsersUtil.getInternalMeetingID(), userId: UsersUtil.getMyUserID()}, + body: {locale: locale, localeCode: localeCode, ownerId: UsersUtil.getMyUserID()} + }; + var _nc:ConnectionManager = BBB.initConnectionManager(); - _nc.sendMessage("caption.sendUpdateCaptionOwner", + _nc.sendMessage2x( function(result:String):void { // On successful result - LOGGER.debug(result); - }, - function(status:String):void { // status - On error occurred - LOGGER.error(status); }, - message + function(status:String):void { // status - On error occurred + LOGGER.error(status); + }, + JSON.stringify(message) ); } - public function sendEditCaptionHistory(message:Object):void { - LOGGER.debug("Sending [caption.editCaptionHistory] to server."); + public function sendEditCaptionHistory(startIndex: int, endIndex: int, locale: String, localeCode: String, text: String):void { + var message:Object = { + header: {name: "EditCaptionHistoryPubMsg", meetingId: UsersUtil.getInternalMeetingID(), userId: UsersUtil.getMyUserID()}, + body: {startIndex: startIndex, endIndex: endIndex, locale: locale, localeCode: localeCode, text: text} + }; + var _nc:ConnectionManager = BBB.initConnectionManager(); - _nc.sendMessage("caption.editCaptionHistory", + _nc.sendMessage2x( function(result:String):void { // On successful result - LOGGER.debug(result); - }, - function(status:String):void { // status - On error occurred - LOGGER.error(status); }, - message + function(status:String):void { // status - On error occurred + LOGGER.error(status); + }, + JSON.stringify(message) ); } } diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/caption/views/CaptionWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/caption/views/CaptionWindow.mxml index a233d3a9d1..ee218114bb 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/caption/views/CaptionWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/caption/views/CaptionWindow.mxml @@ -36,26 +36,29 @@ with BigBlueButton; if not, see . . } private function setTextTabLabel(ownerId:String):void { - textTab.label = currentTranscript.locale + " - "; + var ownerText:String = null; + if (ownerId == "") { //unclaimed text //ownerNameOutputLabel.text = "Owner - " + "None"; - textTab.label += ResourceUtil.getInstance().getString('bbb.caption.transcript.noowner'); + ownerText = ResourceUtil.getInstance().getString('bbb.caption.transcript.noowner'); } else if (ownerId == UsersUtil.getMyUserID()) { //release text - textTab.label += ResourceUtil.getInstance().getString('bbb.caption.transcript.youowner'); + ownerText = ResourceUtil.getInstance().getString('bbb.caption.transcript.youowner'); } else { //claimed by other - textTab.label += UserManager.getInstance().getConference().getUser(ownerId).name; + var user:BBBUser = UserManager.getInstance().getConference().getUser(ownerId); + if (user != null) { + ownerText = user.name; + } } + + textTab.label = currentTranscript.locale + (ownerText != null ? " - " + ownerText : ""); } private function addTextTab():void { From f98bd01c3f3e7820861bb9a4379475accfe64f85 Mon Sep 17 00:00:00 2001 From: Anton Georgiev Date: Mon, 26 Jun 2017 15:45:15 -0400 Subject: [PATCH 04/15] send poll result without extra stringify --- .../org/bigbluebutton/core/models/Polls.scala | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Polls.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Polls.scala index 7d6d3f791b..93ee3330eb 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Polls.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Polls.scala @@ -1,9 +1,5 @@ package org.bigbluebutton.core.models -import java.util -import java.util.ArrayList - -import com.google.gson.Gson import org.bigbluebutton.common2.domain._ import org.bigbluebutton.core.apps.WhiteboardKeyUtil @@ -181,22 +177,17 @@ object Polls { shape += "id" -> result.id shape += "status" -> WhiteboardKeyUtil.DRAW_END_STATUS - val answers = new ArrayBuffer[java.util.HashMap[String, Object]] + var answers = new ArrayBuffer[SimpleVoteOutVO] result.answers.foreach(ans => { - val amap = new java.util.HashMap[String, Object]() - amap.put("id", ans.id: java.lang.Integer) - amap.put("key", ans.key) - amap.put("numVotes", ans.numVotes: java.lang.Integer) - answers += amap + answers += SimpleVoteOutVO(ans.id, ans.key, ans.numVotes) }) - val gson = new Gson() - shape += "result" -> gson.toJson(answers.toArray) + shape += "result" -> answers // Hardcode poll result display location for now to display result // in bottom-right corner. val shapeHeight = 6.66 * answers.size - var mapA = List(66.0, 100 - shapeHeight, 34.0, shapeHeight) + val mapA = List(66.toFloat, 100 - shapeHeight, 34.toFloat, shapeHeight) shape += "points" -> mapA shape.toMap From d690b498987e324eebb7fa792cda85b867b39571 Mon Sep 17 00:00:00 2001 From: Chad Pilkey Date: Mon, 26 Jun 2017 16:46:09 -0400 Subject: [PATCH 05/15] clear transcript owner when they leave the meeting --- .../core/apps/caption/CaptionApp2x.scala | 2 +- .../EditCaptionHistoryPubMsgHdlr.scala | 1 - .../caption/EjectUserFromMeetingHdlr.scala | 20 ------------- .../UpdateCaptionOwnerPubMsgHdlr.scala | 29 +++++++++---------- .../core/apps/caption/UserLeavingHdlr.scala | 19 ++++++++++++ .../users/EjectUserFromMeetingHdlr.scala | 1 - .../handlers/users/UserLeavingHdlr.scala | 2 +- 7 files changed, 35 insertions(+), 39 deletions(-) delete mode 100755 akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/EjectUserFromMeetingHdlr.scala create mode 100755 akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/UserLeavingHdlr.scala diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/CaptionApp2x.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/CaptionApp2x.scala index f4feffd4cc..c5f3a0b978 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/CaptionApp2x.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/CaptionApp2x.scala @@ -8,7 +8,7 @@ import org.bigbluebutton.core.running.LiveMeeting class CaptionApp2x(val liveMeeting: LiveMeeting, val outGW: OutMessageGateway)(implicit val context: ActorContext) - extends EjectUserFromMeetingHdlr + extends UserLeavingHdlr with EditCaptionHistoryPubMsgHdlr with UpdateCaptionOwnerPubMsgHdlr with SendCaptionHistoryReqMsgHdlr { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/EditCaptionHistoryPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/EditCaptionHistoryPubMsgHdlr.scala index 0df7f108d8..40a070406e 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/EditCaptionHistoryPubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/EditCaptionHistoryPubMsgHdlr.scala @@ -25,7 +25,6 @@ trait EditCaptionHistoryPubMsgHdlr { } val successfulEdit = editCaptionHistory(msg.header.userId, msg.body.startIndex, msg.body.endIndex, msg.body.locale, msg.body.text) - println("the edit return was: " + successfulEdit) if (successfulEdit) { broadcastEvent(msg) } diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/EjectUserFromMeetingHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/EjectUserFromMeetingHdlr.scala deleted file mode 100755 index 9be077d0b7..0000000000 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/EjectUserFromMeetingHdlr.scala +++ /dev/null @@ -1,20 +0,0 @@ -package org.bigbluebutton.core.apps.caption - -import org.bigbluebutton.core.api._ -import org.bigbluebutton.core.models.{ UserState, Users2x } - -trait EjectUserFromMeetingHdlr { - this: CaptionApp2x => - - def handle(msg: EjectUserFromMeeting, userToEject: UserState) { - // Unassign owner when user logs out - log.warning("TODO: Unassign transcript owner when they log out") - /* - for { - transcript <- checkCaptionOwnerLogOut(userToEject.intId) - } yield { - // Need to figure out how to send the update out - } - */ - } -} diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/UpdateCaptionOwnerPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/UpdateCaptionOwnerPubMsgHdlr.scala index 10e5064095..45aeb09170 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/UpdateCaptionOwnerPubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/UpdateCaptionOwnerPubMsgHdlr.scala @@ -10,22 +10,21 @@ trait UpdateCaptionOwnerPubMsgHdlr { val outGW: OutMessageGateway def handleUpdateCaptionOwnerPubMsg(msg: UpdateCaptionOwnerPubMsg): Unit = { - - def broadcastEvent(msg: UpdateCaptionOwnerPubMsg, locale: String, localeCode: String, newOwnerId: String): Unit = { - val routing = Routing.addMsgToClientRouting(MessageTypes.BROADCAST_TO_MEETING, liveMeeting.props.meetingProp.intId, msg.header.userId) - val envelope = BbbCoreEnvelope(UpdateCaptionOwnerEvtMsg.NAME, routing) - val header = BbbClientMsgHeader(UpdateCaptionOwnerEvtMsg.NAME, liveMeeting.props.meetingProp.intId, msg.header.userId) - - val body = UpdateCaptionOwnerEvtMsgBody(locale, localeCode, newOwnerId) - val event = UpdateCaptionOwnerEvtMsg(header, body) - val msgEvent = BbbCommonEnvCoreMsg(envelope, event) - outGW.send(msgEvent) - - //record(event) - } - updateCaptionOwner(msg.body.locale, msg.body.localeCode, msg.body.ownerId).foreach(f => { - broadcastEvent(msg, f._1, f._2.localeCode, f._2.ownerId) + broadcastUpdateCaptionOwnerEvent(f._1, f._2.localeCode, f._2.ownerId) }) } + + def broadcastUpdateCaptionOwnerEvent(locale: String, localeCode: String, newOwnerId: String): Unit = { + val routing = Routing.addMsgToClientRouting(MessageTypes.BROADCAST_TO_MEETING, liveMeeting.props.meetingProp.intId, newOwnerId) + val envelope = BbbCoreEnvelope(UpdateCaptionOwnerEvtMsg.NAME, routing) + val header = BbbClientMsgHeader(UpdateCaptionOwnerEvtMsg.NAME, liveMeeting.props.meetingProp.intId, newOwnerId) + + val body = UpdateCaptionOwnerEvtMsgBody(locale, localeCode, newOwnerId) + val event = UpdateCaptionOwnerEvtMsg(header, body) + val msgEvent = BbbCommonEnvCoreMsg(envelope, event) + outGW.send(msgEvent) + + //record(event) + } } diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/UserLeavingHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/UserLeavingHdlr.scala new file mode 100755 index 0000000000..19581d748a --- /dev/null +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/UserLeavingHdlr.scala @@ -0,0 +1,19 @@ +package org.bigbluebutton.core.apps.caption + +import org.bigbluebutton.core.OutMessageGateway +import org.bigbluebutton.core.running.MeetingActor + +trait UserLeavingHdlr { + this: CaptionApp2x => + + val outGW: OutMessageGateway + + def handleUserLeavingMsg(userId: String): Unit = { + for { + transcriptInfo <- checkCaptionOwnerLogOut(userId) + } yield { + broadcastUpdateCaptionOwnerEvent(transcriptInfo._1, transcriptInfo._2.localeCode, transcriptInfo._2.ownerId) + } + } +} + diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/EjectUserFromMeetingHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/EjectUserFromMeetingHdlr.scala index ebf5771717..b07954795a 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/EjectUserFromMeetingHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/EjectUserFromMeetingHdlr.scala @@ -20,7 +20,6 @@ trait EjectUserFromMeetingHdlr { presentationApp2x.handle(msg, user) pollApp2x.handle(msg, user) deskshareApp2x.handle(msg, user) - captionApp2x.handle(msg, user) } } diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserLeavingHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserLeavingHdlr.scala index 4cf3664158..e94936c82b 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserLeavingHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserLeavingHdlr.scala @@ -31,7 +31,7 @@ trait UserLeavingHdlr { vu.callerNum, vu.muted, vu.talking, vu.avatarURL, u.listenOnly)); } - checkCaptionOwnerLogOut(u.id) + captionApp2x.handleUserLeavingMsg(u.id) liveMeeting.startCheckingIfWeNeedToEndVoiceConf() stopAutoStartedRecording() } From 7c19972d24d1583b21d3b5ad8a598a5676660858 Mon Sep 17 00:00:00 2001 From: Chad Pilkey Date: Mon, 26 Jun 2017 16:47:18 -0400 Subject: [PATCH 06/15] remove pre-2.0 caption server code --- .../core/api/IBigBlueButtonInGW.java | 5 - .../receivers/CaptionMessageReceiver.java | 44 --------- .../receivers/RedisMessageReceiver.java | 3 - .../core/BigBlueButtonActor.scala | 2 +- .../core/BigBlueButtonInGW.scala | 18 ---- .../core/MessageSenderActor.scala | 21 ----- .../bigbluebutton/core/api/InMessages.scala | 4 - .../bigbluebutton/core/api/MessageNames.scala | 16 ---- .../bigbluebutton/core/api/OutMessages.scala | 4 - .../bigbluebutton/core/apps/CaptionApp.scala | 56 ----------- .../CaptionMessageToJsonConverter.scala | 44 --------- .../core/running/MeetingActor.scala | 7 +- .../endpoint/redis/RedisRecorderActor.scala | 4 +- .../client/CaptionClientMessageSender.java | 92 ------------------- .../common/messages/Constants.java | 7 -- .../messages/EditCaptionHistoryMessage.java | 79 ---------------- .../common/messages/MessagingConstants.java | 2 - .../SendCaptionHistoryReplyMessage.java | 62 ------------- .../SendCaptionHistoryRequestMessage.java | 54 ----------- .../messages/UpdateCaptionOwnerMessage.java | 64 ------------- .../red5/pubsub/MessagePublisher.java | 15 --- .../redis/RedisPubSubMessageHandler.java | 5 - .../red5/service/CaptionService.java | 84 ----------------- .../src/main/webapp/WEB-INF/red5-web.xml | 4 - 24 files changed, 5 insertions(+), 691 deletions(-) delete mode 100755 akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/CaptionMessageReceiver.java delete mode 100755 akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/CaptionApp.scala delete mode 100755 akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/CaptionMessageToJsonConverter.scala delete mode 100755 bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/CaptionClientMessageSender.java delete mode 100755 bbb-common-message/src/main/java/org/bigbluebutton/common/messages/EditCaptionHistoryMessage.java delete mode 100755 bbb-common-message/src/main/java/org/bigbluebutton/common/messages/SendCaptionHistoryReplyMessage.java delete mode 100755 bbb-common-message/src/main/java/org/bigbluebutton/common/messages/SendCaptionHistoryRequestMessage.java delete mode 100755 bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UpdateCaptionOwnerMessage.java delete mode 100755 bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/CaptionService.java diff --git a/akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java b/akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java index 35538cec56..d4a5ec6335 100755 --- a/akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java +++ b/akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java @@ -109,11 +109,6 @@ public interface IBigBlueButtonInGW { void sendPrivateMessage(String meetingID, String requesterID, Map message); void clearPublicChatHistory(String meetingID, String requesterID); - // Caption - void sendCaptionHistory(String meetingID, String requesterID); - void updateCaptionOwner(String meetingID, String locale, String localeCode, String ownerID); - void editCaptionHistory(String meetingID, String userID, Integer startIndex, Integer endIndex, String locale, String localeCode, String text); - // DeskShare void deskShareStarted(String confId, String callerId, String callerIdName); void deskShareStopped(String conferenceName, String callerId, String callerIdName); diff --git a/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/CaptionMessageReceiver.java b/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/CaptionMessageReceiver.java deleted file mode 100755 index 38ac928570..0000000000 --- a/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/CaptionMessageReceiver.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.bigbluebutton.core.pubsub.receivers; - -import org.bigbluebutton.common.messages.MessagingConstants; -import org.bigbluebutton.common.messages.EditCaptionHistoryMessage; -import org.bigbluebutton.common.messages.SendCaptionHistoryRequestMessage; -import org.bigbluebutton.common.messages.UpdateCaptionOwnerMessage; - -import com.google.gson.JsonParser; -import com.google.gson.JsonObject; - -import org.bigbluebutton.core.api.IBigBlueButtonInGW; - -public class CaptionMessageReceiver implements MessageHandler{ - - private IBigBlueButtonInGW bbbGW; - - public CaptionMessageReceiver(IBigBlueButtonInGW bbbGW) { - this.bbbGW = bbbGW; - } - - @Override - public void handleMessage(String pattern, String channel, String message) { - if (channel.equalsIgnoreCase(MessagingConstants.TO_CAPTION_CHANNEL)) { - JsonParser parser = new JsonParser(); - JsonObject obj = (JsonObject) parser.parse(message); - if (obj.has("header") && obj.has("payload")) { - JsonObject header = (JsonObject) obj.get("header"); - if (header.has("name")) { - String messageName = header.get("name").getAsString(); - if (SendCaptionHistoryRequestMessage.SEND_CAPTION_HISTORY_REQUEST.equals(messageName)){ - SendCaptionHistoryRequestMessage msg = SendCaptionHistoryRequestMessage.fromJson(message); - bbbGW.sendCaptionHistory(msg.meetingID, msg.requesterID); - } else if (UpdateCaptionOwnerMessage.UPDATE_CAPTION_OWNER.equals(messageName)) { - UpdateCaptionOwnerMessage msg = UpdateCaptionOwnerMessage.fromJson(message); - bbbGW.updateCaptionOwner(msg.meetingID, msg.locale, msg.localeCode, msg.ownerID); - } else if (EditCaptionHistoryMessage.EDIT_CAPTION_HISTORY.equals(messageName)) { - EditCaptionHistoryMessage msg = EditCaptionHistoryMessage.fromJson(message); - bbbGW.editCaptionHistory(msg.meetingID, msg.userID, msg.startIndex, msg.endIndex, msg.locale, msg.localeCode, msg.text); - } - } - } - } - } -} diff --git a/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java b/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java index d3b26427a4..c7b9d38029 100755 --- a/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java +++ b/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java @@ -51,9 +51,6 @@ public class RedisMessageReceiver { MeetingMessageReceiver meetingRx = new MeetingMessageReceiver(bbbGW); receivers.add(meetingRx); - - CaptionMessageReceiver captionRx = new CaptionMessageReceiver(bbbGW); - receivers.add(captionRx); SharedNotesMessageReceiver notesRx = new SharedNotesMessageReceiver(bbbGW); receivers.add(notesRx); diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala index 5c700b6098..7ea35dbe6e 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala @@ -320,7 +320,7 @@ class BigBlueButtonActor(val system: ActorSystem, eventBus.publish(BigBlueButtonEvent(id, new DeskShareGetDeskShareInfoRequest(id, html5clientRequesterID, html5clientRequesterID))) // send captions - eventBus.publish(BigBlueButtonEvent(id, new SendCaptionHistoryRequest(id, html5clientRequesterID))) + //eventBus.publish(BigBlueButtonEvent(id, new SendCaptionHistoryRequest(id, html5clientRequesterID))) }) outGW.send(new GetAllMeetingsReply(resultArray)) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala index fbf39f1362..039b52915a 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala @@ -543,24 +543,6 @@ class BigBlueButtonInGW( } } - /** - * ******************************************************************* - * Message Interface for Caption - * ***************************************************************** - */ - - def sendCaptionHistory(meetingID: String, requesterID: String) { - eventBus.publish(BigBlueButtonEvent(meetingID, new SendCaptionHistoryRequest(meetingID, requesterID))) - } - - def updateCaptionOwner(meetingID: String, locale: String, localeCode: String, ownerID: String) { - eventBus.publish(BigBlueButtonEvent(meetingID, new UpdateCaptionOwnerRequest(meetingID, locale, localeCode, ownerID))) - } - - def editCaptionHistory(meetingID: String, userID: String, startIndex: Integer, endIndex: Integer, locale: String, localeCode: String, text: String) { - eventBus.publish(BigBlueButtonEvent(meetingID, new EditCaptionHistoryRequest(meetingID, userID, startIndex, endIndex, locale, localeCode, text))) - } - /** * ******************************************************************* * Message Interface for Shared Notes diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala index 3309b33fe0..fd410e512e 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala @@ -13,7 +13,6 @@ import org.bigbluebutton.common.messages.StartRecordingVoiceConfRequestMessage import org.bigbluebutton.common.messages.StopRecordingVoiceConfRequestMessage import org.bigbluebutton.core.pubsub.senders.MeetingMessageToJsonConverter import org.bigbluebutton.core.pubsub.senders.PesentationMessageToJsonConverter -import org.bigbluebutton.core.pubsub.senders.CaptionMessageToJsonConverter import org.bigbluebutton.core.pubsub.senders.DeskShareMessageToJsonConverter import org.bigbluebutton.common.messages.GetPresentationInfoReplyMessage import org.bigbluebutton.common.messages.PresentationRemovedMessage @@ -139,9 +138,6 @@ class MessageSenderActor(val service: MessageSender) case msg: MeetingTimeRemainingUpdate => handleMeetingTimeRemainingUpdate(msg) case msg: BreakoutRoomsTimeRemainingUpdateOutMessage => handleBreakoutRoomsTimeRemainingUpdate(msg) - case msg: SendCaptionHistoryReply => handleSendCaptionHistoryReply(msg) - case msg: UpdateCaptionOwnerReply => handleUpdateCaptionOwnerReply(msg) - case msg: EditCaptionHistoryReply => handleEditCaptionHistoryReply(msg) case msg: DeskShareStartRTMPBroadcast => handleDeskShareStartRTMPBroadcast(msg) case msg: DeskShareStopRTMPBroadcast => handleDeskShareStopRTMPBroadcast(msg) case msg: DeskShareNotifyViewersRTMP => handleDeskShareNotifyViewersRTMP(msg) @@ -753,23 +749,6 @@ class MessageSenderActor(val service: MessageSender) service.send(MessagingConstants.FROM_USERS_CHANNEL, json) } - private def handleSendCaptionHistoryReply(msg: SendCaptionHistoryReply) { - val json = CaptionMessageToJsonConverter.sendCaptionHistoryReplyToJson(msg) - service.send(MessagingConstants.FROM_CAPTION_CHANNEL, json) - } - - private def handleUpdateCaptionOwnerReply(msg: UpdateCaptionOwnerReply) { - val json = CaptionMessageToJsonConverter.updateCaptionOwnerReplyToJson(msg) - service.send(MessagingConstants.FROM_CAPTION_CHANNEL, json) - } - - private def handleEditCaptionHistoryReply(msg: EditCaptionHistoryReply) { - println("handleEditCaptionHistoryReply") - val json = CaptionMessageToJsonConverter.editCaptionHistoryReplyToJson(msg) - println(json) - service.send(MessagingConstants.FROM_CAPTION_CHANNEL, json) - } - private def handleBreakoutRoomsTimeRemainingUpdate(msg: BreakoutRoomsTimeRemainingUpdateOutMessage) { val json = MeetingMessageToJsonConverter.breakoutRoomsTimeRemainingUpdateToJson(msg) service.send(MessagingConstants.FROM_USERS_CHANNEL, json) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala index cacedca63e..011dcef009 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala @@ -190,10 +190,6 @@ case class VoiceConfRecordingStartedMessage(voiceConfId: String, recordStream: S // No idea what part this is for case class GetAllMeetingsRequest(meetingID: String /** Not used. Just to satisfy trait **/ ) extends InMessage -// Caption -case class SendCaptionHistoryRequest(meetingID: String, requesterID: String) extends InMessage -case class UpdateCaptionOwnerRequest(meetingID: String, locale: String, localeCode: String, ownerID: String) extends InMessage -case class EditCaptionHistoryRequest(meetingID: String, userID: String, startIndex: Integer, endIndex: Integer, locale: String, localeCode: String, text: String) extends InMessage // DeskShare case class DeskShareStartedRequest(conferenceName: String, callerId: String, callerIdName: String) extends InMessage case class DeskShareStoppedRequest(conferenceName: String, callerId: String, callerIdName: String) extends InMessage diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala index acebc5ba80..33c57731a8 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala @@ -74,12 +74,6 @@ object MessageNames { val VOICE_USER_MUTED = "voice_user_muted_message" val VOICE_USER_TALKING = "voice_user_talking_message" val VOICE_RECORDING = "voice_recording_message" - val SEND_WHITEBOARD_ANNOTATION = "send_whiteboard_annotation_request" - val GET_WHITEBOARD_SHAPES = "get_whiteboard_shapes_request" - val CLEAR_WHITEBOARD = "clear_whiteboard_request" - val UNDO_WHITEBOARD = "undo_whiteboard_request" - val ENABLE_WHITEBOARD = "enable_whiteboard_request" - val IS_WHITEBOARD_ENABLED = "is_whiteboard_enabled_request" var GET_GUEST_POLICY = "get_guest_policy" val SET_GUEST_POLICY = "set_guest_policy" val RESPOND_TO_GUEST = "respond_to_guest" @@ -160,20 +154,10 @@ object MessageNames { val GET_PRESENTATION_STATUS_REPLY = "get_presentation_status_reply" val PRESENTATION_REMOVED_MESSAGE = "presentation_removed_message" val PRESENTATION_PAGE_GENERATED = "presentation_page_generated_message" - val GET_WHITEBOARD_SHAPES_REPLY = "get_whiteboard_shapes_reply" - val SEND_WHITEBOARD_SHAPE = "send_whiteboard_shape_message" - val CURSOR_POSITION_UPDATED = "cursor_position_updated_message" - val UNDO_WHITEBOARD_MESSAGE = "undo_whiteboard_message" - val MODIFIED_WHITEBOARD_ACCESS = "modified_whiteboard_access_message" - val GET_WHITEBOARD_ACCESS_REPLY = "get_whiteboard_access_reply" - val WHITEBOARD_CLEARED = "whiteboard_cleared_message" val MEETING_DESTROYED_EVENT = "meeting_destroyed_event" val KEEP_ALIVE_REPLY = "keep_alive_reply" val USER_LISTEN_ONLY = "user_listening_only" val GET_ALL_MEETINGS_REPLY = "get_all_meetings_reply_message" - val EDIT_CAPTION_HISTORY = "edit_caption_history_message" - val UPDATE_CAPTION_OWNER = "update_caption_owner_message" - val SEND_CAPTION_HISTORY_REPLY = "send_caption_history_reply_message" // breakout rooms val BREAKOUT_ROOM_STARTED = "BreakoutRoomStarted" diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala index f9700aa9e8..148eb0eaac 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala @@ -137,10 +137,6 @@ case class GetCurrentPollReplyMessage(meetingID: String, recorded: Boolean, requ // No idea what part this is for case class GetAllMeetingsReply(meetings: Array[MeetingInfo]) extends IOutMessage -// Caption -case class SendCaptionHistoryReply(meetingID: String, recorded: Boolean, requesterID: String, history: Map[String, Array[String]]) extends IOutMessage -case class UpdateCaptionOwnerReply(meetingID: String, recorded: Boolean, locale: String, localeCode: String, ownerID: String) extends IOutMessage -case class EditCaptionHistoryReply(meetingID: String, recorded: Boolean, userID: String, startIndex: Integer, endIndex: Integer, locale: String, localeCode: String, text: String) extends IOutMessage // DeskShare case class DeskShareStartRTMPBroadcast(conferenceName: String, streamPath: String) extends IOutMessage case class DeskShareStopRTMPBroadcast(conferenceName: String, streamPath: String) extends IOutMessage diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/CaptionApp.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/CaptionApp.scala deleted file mode 100755 index d0bb883da5..0000000000 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/CaptionApp.scala +++ /dev/null @@ -1,56 +0,0 @@ -package org.bigbluebutton.core.apps - -import org.bigbluebutton.core.api._ -import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.core.running.{ MeetingActor } - -trait CaptionApp { - this: MeetingActor => - - val outGW: OutMessageGateway - - def handleSendCaptionHistoryRequest(msg: SendCaptionHistoryRequest) { - // val history = liveMeeting.captionModel.getHistory() - // //println("Caption history requested " + history) - // outGW.send(new SendCaptionHistoryReply(props.meetingProp.intId, props.recordProp.record, msg.requesterID, history)) - } - - def handleUpdateCaptionOwnerRequest(msg: UpdateCaptionOwnerRequest) { - // // clear owner from previous locale - // if (msg.ownerID.length > 0) { - // liveMeeting.captionModel.findLocaleByOwnerId(msg.ownerID).foreach(t => { - // liveMeeting.captionModel.changeTranscriptOwner(t, "") - // - // // send notification that owner has changed - // outGW.send(new UpdateCaptionOwnerReply(props.meetingProp.intId, props.recordProp.record, t, liveMeeting.captionModel.findLocaleCodeByLocale(t), "")) - // }) - // } - // // create the locale if it doesn't exist - // if (liveMeeting.captionModel.transcripts contains msg.locale) { - // liveMeeting.captionModel.changeTranscriptOwner(msg.locale, msg.ownerID) - // } else { // change the owner if it does exist - // liveMeeting.captionModel.newTranscript(msg.locale, msg.localeCode, msg.ownerID) - // } - // - // outGW.send(new UpdateCaptionOwnerReply(props.meetingProp.intId, props.recordProp.record, msg.locale, msg.localeCode, msg.ownerID)) - } - - def handleEditCaptionHistoryRequest(msg: EditCaptionHistoryRequest) { - // liveMeeting.captionModel.findLocaleByOwnerId(msg.userID).foreach(t => { - // if (t == msg.locale) { - // liveMeeting.captionModel.editHistory(msg.startIndex, msg.endIndex, msg.locale, msg.text) - // - // outGW.send(new EditCaptionHistoryReply(props.meetingProp.intId, props.recordProp.record, msg.userID, msg.startIndex, msg.endIndex, msg.locale, msg.localeCode, msg.text)) - // } - // }) - } - - def checkCaptionOwnerLogOut(userId: String) { - // liveMeeting.captionModel.findLocaleByOwnerId(userId).foreach(t => { - // liveMeeting.captionModel.changeTranscriptOwner(t, "") - // - // // send notification that owner has changed - // outGW.send(new UpdateCaptionOwnerReply(props.meetingProp.intId, props.recordProp.record, t, liveMeeting.captionModel.findLocaleCodeByLocale(t), "")) - // }) - } -} \ No newline at end of file diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/CaptionMessageToJsonConverter.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/CaptionMessageToJsonConverter.scala deleted file mode 100755 index 37312df87d..0000000000 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/CaptionMessageToJsonConverter.scala +++ /dev/null @@ -1,44 +0,0 @@ -package org.bigbluebutton.core.pubsub.senders - -import org.bigbluebutton.common.messages.Constants -import org.bigbluebutton.core.api._ -import org.bigbluebutton.core.messaging.Util -import scala.collection.JavaConverters - -object CaptionMessageToJsonConverter { - def sendCaptionHistoryReplyToJson(msg: SendCaptionHistoryReply): String = { - val payload = new java.util.HashMap[String, Any]() - payload.put(Constants.MEETING_ID, msg.meetingID) - payload.put(Constants.REQUESTER_ID, msg.requesterID) - - payload.put(Constants.CAPTION_HISTORY, JavaConverters.mapAsJavaMap(msg.history)) - - val header = Util.buildHeader(MessageNames.SEND_CAPTION_HISTORY_REPLY, Some(msg.requesterID)) - Util.buildJson(header, payload) - } - - def updateCaptionOwnerReplyToJson(msg: UpdateCaptionOwnerReply): String = { - val payload = new java.util.HashMap[String, Any]() - payload.put(Constants.MEETING_ID, msg.meetingID) - payload.put(Constants.LOCALE, msg.locale) - payload.put(Constants.LOCALE_CODE, msg.localeCode) - payload.put(Constants.OWNER_ID, msg.ownerID) - - val header = Util.buildHeader(MessageNames.UPDATE_CAPTION_OWNER, None) - Util.buildJson(header, payload) - } - - def editCaptionHistoryReplyToJson(msg: EditCaptionHistoryReply): String = { - val payload = new java.util.HashMap[String, Any]() - payload.put(Constants.MEETING_ID, msg.meetingID) - payload.put(Constants.USER_ID, msg.userID) - payload.put(Constants.START_INDEX, msg.startIndex) - payload.put(Constants.END_INDEX, msg.endIndex) - payload.put(Constants.LOCALE, msg.locale) - payload.put(Constants.LOCALE_CODE, msg.localeCode) - payload.put(Constants.TEXT, msg.text) - - val header = Util.buildHeader(MessageNames.EDIT_CAPTION_HISTORY, None) - Util.buildJson(header, payload) - } -} \ No newline at end of file diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala index 765308ced0..7a3d07568b 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala @@ -39,7 +39,7 @@ class MeetingActor(val props: DefaultProps, extends Actor with ActorLogging with UsersApp with PresentationApp with LayoutApp with ChatApp with WhiteboardApp with PollApp - with BreakoutRoomApp with CaptionApp + with BreakoutRoomApp with SharedNotesApp with PermisssionCheck with UserBroadcastCamStartMsgHdlr with StartCustomPollReqMsgHdlr @@ -201,11 +201,6 @@ class MeetingActor(val props: DefaultProps, case msg: SendTimeRemainingUpdate => handleSendTimeRemainingUpdate(msg) case msg: EndMeeting => handleEndMeeting(msg) - // Closed Caption - case msg: SendCaptionHistoryRequest => handleSendCaptionHistoryRequest(msg) - case msg: UpdateCaptionOwnerRequest => handleUpdateCaptionOwnerRequest(msg) - case msg: EditCaptionHistoryRequest => handleEditCaptionHistoryRequest(msg) - case msg: DeskShareStartedRequest => handleDeskShareStartedRequest(msg) case msg: DeskShareStoppedRequest => handleDeskShareStoppedRequest(msg) case msg: DeskShareRTMPBroadcastStartedRequest => handleDeskShareRTMPBroadcastStartedRequest(msg) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala index df6798d911..ea25fa2c29 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala @@ -64,7 +64,7 @@ class RedisRecorderActor(val system: ActorSystem) // case msg: CursorPositionUpdatedEvent => handleCursorPositionUpdatedEvent(msg) // case msg: ClearWhiteboardEvent => handleClearWhiteboardEvent(msg) // case msg: UndoWhiteboardEvent => handleUndoWhiteboardEvent(msg) - case msg: EditCaptionHistoryReply => handleEditCaptionHistoryReply(msg) + // case msg: EditCaptionHistoryReply => handleEditCaptionHistoryReply(msg) case msg: DeskShareStartRTMPBroadcast => handleDeskShareStartRTMPBroadcast(msg) case msg: DeskShareStopRTMPBroadcast => handleDeskShareStopRTMPBroadcast(msg) case msg: DeskShareNotifyViewersRTMP => handleDeskShareNotifyViewersRTMP(msg) @@ -452,6 +452,7 @@ class RedisRecorderActor(val system: ActorSystem) } */ + /* private def handleEditCaptionHistoryReply(msg: EditCaptionHistoryReply) { if (msg.recorded) { val ev = new EditCaptionHistoryRecordEvent() @@ -465,6 +466,7 @@ class RedisRecorderActor(val system: ActorSystem) record(msg.meetingID, JavaConverters.mapAsScalaMap(ev.toMap).toMap) } } + */ private def handleDeskShareStartRTMPBroadcast(msg: DeskShareStartRTMPBroadcast) { val event = new DeskShareStartRTMPRecordEvent() diff --git a/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/CaptionClientMessageSender.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/CaptionClientMessageSender.java deleted file mode 100755 index adf33d5ece..0000000000 --- a/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/CaptionClientMessageSender.java +++ /dev/null @@ -1,92 +0,0 @@ -package org.bigbluebutton.red5.client; - -import java.util.HashMap; -import java.util.Map; - -import org.bigbluebutton.common.messages.Constants; -import org.bigbluebutton.common.messages.EditCaptionHistoryMessage; -import org.bigbluebutton.common.messages.SendCaptionHistoryReplyMessage; -import org.bigbluebutton.common.messages.UpdateCaptionOwnerMessage; -import org.bigbluebutton.red5.client.messaging.BroadcastClientMessage; -import org.bigbluebutton.red5.client.messaging.IConnectionInvokerService; -import org.bigbluebutton.red5.client.messaging.DirectClientMessage; - -import com.google.gson.Gson; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; - -public class CaptionClientMessageSender { - private IConnectionInvokerService service; - - public CaptionClientMessageSender(IConnectionInvokerService service) { - this.service = service; - } - - public void handleCaptionMessage(String message) { - - JsonParser parser = new JsonParser(); - JsonObject obj = (JsonObject) parser.parse(message); - - if (obj.has("header") && obj.has("payload")) { - JsonObject header = (JsonObject) obj.get("header"); - - if (header.has("name")) { - String messageName = header.get("name").getAsString(); - switch (messageName) { - case SendCaptionHistoryReplyMessage.SEND_CAPTION_HISTORY_REPLY: - SendCaptionHistoryReplyMessage sch = SendCaptionHistoryReplyMessage.fromJson(message); - - if (sch != null) { - processSendCaptionHistoryReplyMessage(sch); - } - break; - case UpdateCaptionOwnerMessage.UPDATE_CAPTION_OWNER: - UpdateCaptionOwnerMessage uco = UpdateCaptionOwnerMessage.fromJson(message); - - if (uco != null) { - processUpdateCaptionOwnerMessage(uco); - } - break; - case EditCaptionHistoryMessage.EDIT_CAPTION_HISTORY: - EditCaptionHistoryMessage ech = EditCaptionHistoryMessage.fromJson(message); - - if (ech != null) { - processEditCaptionHistoryMessage(ech); - } - break; - } - } - } - } - - private void processSendCaptionHistoryReplyMessage(SendCaptionHistoryReplyMessage msg) { - Map message = new HashMap(); - Gson gson = new Gson(); - message.put("msg", gson.toJson(msg.captionHistory)); - - DirectClientMessage m = new DirectClientMessage(msg.meetingID, msg.requesterID, "sendCaptionHistoryReply", message); - service.sendMessage(m); - } - - private void processUpdateCaptionOwnerMessage(UpdateCaptionOwnerMessage msg) { - Map message = new HashMap(); - message.put(Constants.LOCALE, msg.locale); - message.put(Constants.LOCALE_CODE, msg.localeCode); - message.put(Constants.OWNER_ID, msg.ownerID); - - BroadcastClientMessage m = new BroadcastClientMessage(msg.meetingID, "updateCaptionOwner", message); - service.sendMessage(m); - } - - private void processEditCaptionHistoryMessage(EditCaptionHistoryMessage msg) { - Map message = new HashMap(); - message.put(Constants.START_INDEX, msg.startIndex); - message.put(Constants.END_INDEX, msg.endIndex); - message.put(Constants.LOCALE, msg.locale); - message.put(Constants.LOCALE_CODE, msg.localeCode); - message.put(Constants.TEXT, msg.text); - - BroadcastClientMessage m = new BroadcastClientMessage(msg.meetingID, "editCaptionHistory", message); - service.sendMessage(m); - } -} diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java index 77bb5ceed7..b2a11c1c37 100755 --- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java +++ b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java @@ -127,13 +127,6 @@ public class Constants { public static final String PERM_LOCK_ON_JOIN = "lockOnJoin"; public static final String PERM_LOCK_ON_JOIN_CONFIG = "lockOnJoinConfigurable"; public static final String ENABLED = "enabled"; - public static final String START_INDEX = "start_index"; - public static final String END_INDEX = "end_index"; - public static final String LOCALE = "locale"; - public static final String LOCALE_CODE = "locale_code"; - public static final String TEXT = "text"; - public static final String OWNER_ID = "owner_id"; - public static final String CAPTION_HISTORY = "caption_history"; public static final String AVATAR_URL = "avatarURL"; public static final String STUNS = "stuns"; public static final String TURNS = "turns"; diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/EditCaptionHistoryMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/EditCaptionHistoryMessage.java deleted file mode 100755 index 6c0bda57af..0000000000 --- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/EditCaptionHistoryMessage.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.bigbluebutton.common.messages; - -import java.util.HashMap; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; - - -public class EditCaptionHistoryMessage implements ISubscribedMessage { - public static final String EDIT_CAPTION_HISTORY = "edit_caption_history_message"; - public static final String VERSION = "0.0.1"; - - public final String meetingID; - public final String userID; - public final Integer startIndex; - public final Integer endIndex; - public final String locale; - public final String localeCode; - public final String text; - - public EditCaptionHistoryMessage(String meetingID, String userID, Integer startIndex, Integer endIndex, String locale, String localeCode, String text) { - this.meetingID = meetingID; - this.userID = userID; - this.startIndex = startIndex; - this.endIndex = endIndex; - this.locale = locale; - this.localeCode = localeCode; - this.text = text; - } - - public String toJson() { - HashMap payload = new HashMap(); - payload.put(Constants.MEETING_ID, meetingID); - payload.put(Constants.USER_ID, userID); - payload.put(Constants.START_INDEX, startIndex); - payload.put(Constants.END_INDEX, endIndex); - payload.put(Constants.LOCALE, locale); - payload.put(Constants.LOCALE_CODE, localeCode); - payload.put(Constants.TEXT, text); - - java.util.HashMap header = MessageBuilder.buildHeader(EDIT_CAPTION_HISTORY, VERSION, null); - - return MessageBuilder.buildJson(header, payload); - } - - public static EditCaptionHistoryMessage fromJson(String message) { - JsonParser parser = new JsonParser(); - JsonObject obj = (JsonObject) parser.parse(message); - - if (obj.has("header") && obj.has("payload")) { - JsonObject header = (JsonObject) obj.get("header"); - JsonObject payload = (JsonObject) obj.get("payload"); - - if (header.has("name")) { - String messageName = header.get("name").getAsString(); - if (EDIT_CAPTION_HISTORY.equals(messageName)) { - if (payload.has(Constants.MEETING_ID) - && payload.has(Constants.USER_ID) - && payload.has(Constants.START_INDEX) - && payload.has(Constants.END_INDEX) - && payload.has(Constants.LOCALE) - && payload.has(Constants.LOCALE_CODE) - && payload.has(Constants.TEXT)) { - String meetingID = payload.get(Constants.MEETING_ID).getAsString(); - String userID = payload.get(Constants.USER_ID).getAsString(); - Integer startIndex = payload.get(Constants.START_INDEX).getAsInt(); - Integer endIndex = payload.get(Constants.END_INDEX).getAsInt(); - String locale = payload.get(Constants.LOCALE).getAsString(); - String localeCode = payload.get(Constants.LOCALE_CODE).getAsString(); - String text = payload.get(Constants.TEXT).getAsString(); - - return new EditCaptionHistoryMessage(meetingID, userID, startIndex, endIndex, locale, localeCode, text); - } - } - } - } - return null; - - } -} diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java index 07ff8c675f..9cfc19b28c 100755 --- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java +++ b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java @@ -29,7 +29,6 @@ public class MessagingConstants { public static final String FROM_USERS_CHANNEL = FROM_BBB_APPS_CHANNEL + ":users"; public static final String FROM_CHAT_CHANNEL = FROM_BBB_APPS_CHANNEL + ":chat"; public static final String FROM_WHITEBOARD_CHANNEL = FROM_BBB_APPS_CHANNEL + ":whiteboard"; - public static final String FROM_CAPTION_CHANNEL = FROM_BBB_APPS_CHANNEL + ":caption"; public static final String FROM_DESK_SHARE_CHANNEL = FROM_BBB_APPS_CHANNEL + ":deskshare"; public static final String FROM_SHAREDNOTES_CHANNEL = FROM_BBB_APPS_CHANNEL + ":sharednotes"; @@ -43,7 +42,6 @@ public class MessagingConstants { public static final String TO_CHAT_CHANNEL = TO_BBB_APPS_CHANNEL + ":chat"; public static final String TO_VOICE_CHANNEL = TO_BBB_APPS_CHANNEL + ":voice"; public static final String TO_WHITEBOARD_CHANNEL = TO_BBB_APPS_CHANNEL + ":whiteboard"; - public static final String TO_CAPTION_CHANNEL = TO_BBB_APPS_CHANNEL + ":caption"; public static final String TO_SHAREDNOTES_CHANNEL = TO_BBB_APPS_CHANNEL + ":sharednotes"; public static final String BBB_APPS_KEEP_ALIVE_CHANNEL = "bigbluebutton:from-bbb-apps:keepalive"; diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/SendCaptionHistoryReplyMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/SendCaptionHistoryReplyMessage.java deleted file mode 100755 index 4401932382..0000000000 --- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/SendCaptionHistoryReplyMessage.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.bigbluebutton.common.messages; - -import java.util.HashMap; -import java.util.Map; - -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; - -public class SendCaptionHistoryReplyMessage implements ISubscribedMessage { - public static final String SEND_CAPTION_HISTORY_REPLY = "send_caption_history_reply_message"; - public static final String VERSION = "0.0.1"; - - public final String meetingID; - public final String requesterID; - public final Map captionHistory; - - public SendCaptionHistoryReplyMessage(String meetingID, String requesterID, Map captionHistory) { - this.meetingID = meetingID; - this.captionHistory = captionHistory; - this.requesterID = requesterID; - } - - public String toJson() { - HashMap payload = new HashMap(); - payload.put(Constants.MEETING_ID, meetingID); - payload.put(Constants.REQUESTER_ID, requesterID); - payload.put(Constants.CAPTION_HISTORY, captionHistory); - - java.util.HashMap header = MessageBuilder.buildHeader(SEND_CAPTION_HISTORY_REPLY, VERSION, null); - return MessageBuilder.buildJson(header, payload); - } - - public static SendCaptionHistoryReplyMessage fromJson(String message) { - JsonParser parser = new JsonParser(); - JsonObject obj = (JsonObject) parser.parse(message); - if (obj.has("header") && obj.has("payload")) { - JsonObject header = (JsonObject) obj.get("header"); - JsonObject payload = (JsonObject) obj.get("payload"); - - if (header.has("name")) { - String messageName = header.get("name").getAsString(); - if (SEND_CAPTION_HISTORY_REPLY.equals(messageName)) { - if (payload.has(Constants.MEETING_ID) - && payload.has(Constants.CAPTION_HISTORY) - && payload.has(Constants.REQUESTER_ID)) { - String meetingID = payload.get(Constants.MEETING_ID).getAsString(); - String requesterID = payload.get(Constants.REQUESTER_ID).getAsString(); - - JsonObject history = (JsonObject) payload.get(Constants.CAPTION_HISTORY); - - Util util = new Util(); - - Map captionHistory = util.extractCaptionHistory(history); - - return new SendCaptionHistoryReplyMessage(meetingID, requesterID, captionHistory); - } - } - } - } - return null; - } -} diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/SendCaptionHistoryRequestMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/SendCaptionHistoryRequestMessage.java deleted file mode 100755 index 2e2133b874..0000000000 --- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/SendCaptionHistoryRequestMessage.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.bigbluebutton.common.messages; - -import java.util.HashMap; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; - - -public class SendCaptionHistoryRequestMessage implements ISubscribedMessage { - public static final String SEND_CAPTION_HISTORY_REQUEST = "send_caption_history_request_message"; - public static final String VERSION = "0.0.1"; - - public final String meetingID; - public final String requesterID; - - public SendCaptionHistoryRequestMessage(String meetingID, String requesterID) { - this.meetingID = meetingID; - this.requesterID = requesterID; - } - - public String toJson() { - HashMap payload = new HashMap(); - payload.put(Constants.MEETING_ID, meetingID); - payload.put(Constants.REQUESTER_ID, requesterID); - - java.util.HashMap header = MessageBuilder.buildHeader(SEND_CAPTION_HISTORY_REQUEST, VERSION, null); - - return MessageBuilder.buildJson(header, payload); - } - - public static SendCaptionHistoryRequestMessage fromJson(String message) { - JsonParser parser = new JsonParser(); - JsonObject obj = (JsonObject) parser.parse(message); - - if (obj.has("header") && obj.has("payload")) { - JsonObject header = (JsonObject) obj.get("header"); - JsonObject payload = (JsonObject) obj.get("payload"); - - if (header.has("name")) { - String messageName = header.get("name").getAsString(); - if (SEND_CAPTION_HISTORY_REQUEST.equals(messageName)) { - if (payload.has(Constants.MEETING_ID) - && payload.has(Constants.REQUESTER_ID)) { - String meetingID = payload.get(Constants.MEETING_ID).getAsString(); - String requesterID = payload.get(Constants.REQUESTER_ID).getAsString(); - - return new SendCaptionHistoryRequestMessage(meetingID, requesterID); - } - } - } - } - return null; - - } -} diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UpdateCaptionOwnerMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UpdateCaptionOwnerMessage.java deleted file mode 100755 index 36d0e390e6..0000000000 --- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UpdateCaptionOwnerMessage.java +++ /dev/null @@ -1,64 +0,0 @@ -package org.bigbluebutton.common.messages; - -import java.util.HashMap; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; - - -public class UpdateCaptionOwnerMessage implements ISubscribedMessage { - public static final String UPDATE_CAPTION_OWNER = "update_caption_owner_message"; - public static final String VERSION = "0.0.1"; - - public final String meetingID; - public final String locale; - public final String localeCode; - public final String ownerID; - - public UpdateCaptionOwnerMessage(String meetingID, String locale, String localeCode, String ownerID) { - this.meetingID = meetingID; - this.locale = locale; - this.localeCode = localeCode; - this.ownerID = ownerID; - } - - public String toJson() { - HashMap payload = new HashMap(); - payload.put(Constants.MEETING_ID, meetingID); - payload.put(Constants.LOCALE, locale); - payload.put(Constants.LOCALE_CODE, localeCode); - payload.put(Constants.OWNER_ID, ownerID); - - java.util.HashMap header = MessageBuilder.buildHeader(UPDATE_CAPTION_OWNER, VERSION, null); - - return MessageBuilder.buildJson(header, payload); - } - - public static UpdateCaptionOwnerMessage fromJson(String message) { - JsonParser parser = new JsonParser(); - JsonObject obj = (JsonObject) parser.parse(message); - - if (obj.has("header") && obj.has("payload")) { - JsonObject header = (JsonObject) obj.get("header"); - JsonObject payload = (JsonObject) obj.get("payload"); - - if (header.has("name")) { - String messageName = header.get("name").getAsString(); - if (UPDATE_CAPTION_OWNER.equals(messageName)) { - if (payload.has(Constants.MEETING_ID) - && payload.has(Constants.LOCALE) - && payload.has(Constants.LOCALE_CODE) - && payload.has(Constants.OWNER_ID)) { - String meetingID = payload.get(Constants.MEETING_ID).getAsString(); - String locale = payload.get(Constants.LOCALE).getAsString(); - String localeCode = payload.get(Constants.LOCALE_CODE). getAsString(); - String ownerID = payload.get(Constants.OWNER_ID).getAsString(); - - return new UpdateCaptionOwnerMessage(meetingID, locale, localeCode, ownerID); - } - } - } - } - return null; - - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java index 638ce98af5..d4e9c167e1 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java @@ -283,21 +283,6 @@ public class MessagePublisher { public void endAllBreakoutRooms(String jsonMessage) { sender.send(MessagingConstants.TO_USERS_CHANNEL, jsonMessage); } - - public void sendCaptionHistory(String meetingID, String requesterID) { - SendCaptionHistoryRequestMessage msg = new SendCaptionHistoryRequestMessage(meetingID, requesterID); - sender.send(MessagingConstants.TO_CAPTION_CHANNEL, msg.toJson()); - } - - public void updateCaptionOwner(String meetingID, String locale, String localeCode, String ownerID) { - UpdateCaptionOwnerMessage msg = new UpdateCaptionOwnerMessage(meetingID, locale, localeCode, ownerID); - sender.send(MessagingConstants.TO_CAPTION_CHANNEL, msg.toJson()); - } - - public void editCaptionHistory(String meetingID, String userID, Integer startIndex, Integer endIndex, String locale, String localeCode, String text) { - EditCaptionHistoryMessage msg = new EditCaptionHistoryMessage(meetingID, userID, startIndex, endIndex, locale, localeCode, text); - sender.send(MessagingConstants.TO_CAPTION_CHANNEL, msg.toJson()); - } public void patchDocument(String meetingID, String requesterID, String noteID, String patch, String operation) { PatchDocumentRequestMessage msg = new PatchDocumentRequestMessage(meetingID, requesterID, noteID, patch, operation); diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java index e5b133c740..db93f065b7 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java @@ -8,7 +8,6 @@ import org.bigbluebutton.red5.client.UserClientMessageSender; import org.bigbluebutton.red5.client.ChatClientMessageSender; import org.bigbluebutton.red5.client.SharedNotesClientMessageSender; import org.bigbluebutton.red5.client.WhiteboardClientMessageSender; -import org.bigbluebutton.red5.client.CaptionClientMessageSender; import org.bigbluebutton.red5.client.DeskShareMessageSender; import org.bigbluebutton.red5.client.messaging.IConnectionInvokerService; import org.bigbluebutton.red5.monitoring.BbbAppsIsKeepAliveHandler; @@ -25,7 +24,6 @@ public class RedisPubSubMessageHandler implements MessageHandler { private DeskShareMessageSender deskShareMessageSender; //private BbbAppsIsKeepAliveHandler bbbAppsIsKeepAliveHandler; private PollingClientMessageSender pollingMessageSender; - private CaptionClientMessageSender captionMessageSender; private SharedNotesClientMessageSender sharedNotesMessageSender; public void setConnectionInvokerService(IConnectionInvokerService s) { @@ -37,7 +35,6 @@ public class RedisPubSubMessageHandler implements MessageHandler { whiteboardMessageSender = new WhiteboardClientMessageSender(service); deskShareMessageSender = new DeskShareMessageSender(service); pollingMessageSender = new PollingClientMessageSender(service); - captionMessageSender = new CaptionClientMessageSender(service); sharedNotesMessageSender = new SharedNotesClientMessageSender(service); } @@ -64,8 +61,6 @@ public class RedisPubSubMessageHandler implements MessageHandler { deskShareMessageSender.handleDeskShareMessage(message); } else if (channel.equalsIgnoreCase(MessagingConstants.FROM_POLLING_CHANNEL)) { pollingMessageSender.handlePollMessage(message); - } else if (channel.equalsIgnoreCase(MessagingConstants.FROM_CAPTION_CHANNEL)) { - captionMessageSender.handleCaptionMessage(message); } else if (channel.equalsIgnoreCase(MessagingConstants.FROM_SHAREDNOTES_CHANNEL)) { sharedNotesMessageSender.handleSharedNotesMessage(message); } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/CaptionService.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/CaptionService.java deleted file mode 100755 index 2a240e34aa..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/CaptionService.java +++ /dev/null @@ -1,84 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.red5.service; - -import java.util.Map; - -import org.bigbluebutton.red5.BigBlueButtonSession; -import org.bigbluebutton.red5.Constants; -import org.bigbluebutton.red5.pubsub.MessagePublisher; -import org.red5.server.api.Red5; - -public class CaptionService { - - private MessagePublisher red5InGW; - - public void setRed5Publisher(MessagePublisher inGW) { - red5InGW = inGW; - } - - private BigBlueButtonSession getBbbSession() { - return (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION); - } - - public void getCaptionHistory() { - String meetingID = Red5.getConnectionLocal().getScope().getName(); - String requesterID = getBbbSession().getInternalUserID(); - - red5InGW.sendCaptionHistory(meetingID, requesterID); - } - - public void sendUpdateCaptionOwner(Map msg) { - String locale = msg.get("locale").toString(); - String localeCode = msg.get("localeCode").toString(); - Boolean claim = (Boolean) msg.get("claim"); - - String meetingID = Red5.getConnectionLocal().getScope().getName(); - String ownerID = (claim ? getBbbSession().getInternalUserID() : ""); - - red5InGW.updateCaptionOwner(meetingID, locale, localeCode, ownerID); - } - - public void editCaptionHistory(Map msg) { - String locale = msg.get("locale").toString(); - String localeCode = msg.get("localeCode").toString(); - String text = msg.get("text").toString(); - - String meetingID = Red5.getConnectionLocal().getScope().getName(); - String userID = getBbbSession().getInternalUserID(); - - Integer startIndex; - if (msg.get("startIndex") instanceof Double) { - Double tempStartIndex = (Double) msg.get("startIndex"); - startIndex = tempStartIndex.intValue(); - } else { - startIndex = (Integer) msg.get("startIndex"); - } - - Integer endIndex; - if (msg.get("endIndex") instanceof Double) { - Double tempEndIndex = (Double) msg.get("endIndex"); - endIndex = tempEndIndex.intValue(); - } else { - endIndex = (Integer) msg.get("endIndex"); - } - - red5InGW.editCaptionHistory(meetingID, userID, startIndex, endIndex, locale, localeCode, text); - } -} diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml b/bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml index 1d08481160..c8dd43eb59 100755 --- a/bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml +++ b/bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml @@ -119,10 +119,6 @@ with BigBlueButton; if not, see . - - - - From adfdd3c23012609372d7e5cd1a063d8bbeb961ff Mon Sep 17 00:00:00 2001 From: Chad Pilkey Date: Mon, 26 Jun 2017 16:48:05 -0400 Subject: [PATCH 07/15] add try/catch block to client message receiver --- .../main/model/users/NetConnectionDelegate.as | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as index 189d6e2be2..8242623d0c 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as +++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as @@ -107,9 +107,13 @@ package org.bigbluebutton.main.model.users private function notifyListeners(messageName:String, message:Object):void { if (messageName != null && messageName != "") { - for (var notify:String in _messageListeners) { - _messageListeners[notify].onMessage(messageName, message); - } + try { + for (var notify:String in _messageListeners) { + _messageListeners[notify].onMessage(messageName, message); + } + } catch(error:Error) { + LOGGER.error("Exception dispatched by a MessageListener, error: " + error.message); + } } else { LOGGER.debug("Message name is undefined"); } From 00cee79501c8d26843893776db6731513a2854f7 Mon Sep 17 00:00:00 2001 From: Richard Alam Date: Mon, 26 Jun 2017 14:00:51 -0700 Subject: [PATCH 08/15] - do not show when user joins listen-only --- .../src/org/bigbluebutton/main/views/MuteMeButton.mxml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml index dbf14b009a..73d765520c 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml @@ -124,7 +124,7 @@ $Id: $ private function allowMuteUnmute():Boolean { var me: VoiceUser2x = LiveMeeting.inst().voiceUsers.getUser(LiveMeeting.inst().me.id); // I am in voice conference. - return (me != null && !LiveMeeting.inst().me.disableMyMic); + return (me != null && !LiveMeeting.inst().me.disableMyMic && !me.listenOnly); } private function updateMuteMeBtn(placeholder:Boolean = false):void { From 4baf8369ffd5f72a8561d49e30577da04ed671cb Mon Sep 17 00:00:00 2001 From: Richard Alam Date: Mon, 26 Jun 2017 14:01:25 -0700 Subject: [PATCH 09/15] - apply voice status to correct user --- .../modules/users/services/MessageReceiver.as | 5 +---- .../modules/users/views/UsersWindowEventHandler.as | 7 +++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as index fdca07cc5e..15c07fd947 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as @@ -236,7 +236,7 @@ package org.bigbluebutton.modules.users.services LiveMeeting.inst().voiceUsers.setMutedForUser(intId, muted); if (UsersUtil.isMe(intId)) { - LiveMeeting.inst().me.muted = false; + LiveMeeting.inst().me.muted = muted; } var bbbEvent:BBBEvent = new BBBEvent(BBBEvent.USER_VOICE_MUTED); @@ -541,8 +541,6 @@ package org.bigbluebutton.modules.users.services var header:Object = msg.header as Object; var body: Object = msg.body as Object; - - var newPresenterID:String = body.presenterId as String; var newPresenterName:String = body.presenterName as String; var assignedBy:String = body.assignedBy as String; @@ -640,7 +638,6 @@ package org.bigbluebutton.modules.users.services logData.user.webcamStream = stream; LOGGER.info(JSON.stringify(logData)); -// UserManager.getInstance().getConference().unsharedWebcam(userId, stream); sendStreamStoppedEvent(userId, stream); } diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindowEventHandler.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindowEventHandler.as index 4b7155a842..5c9f24a46d 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindowEventHandler.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindowEventHandler.as @@ -46,7 +46,6 @@ package org.bigbluebutton.modules.users.views } public function handleUserLeftEvent(userId: String):void { - trace("Removing user " + userId + " from users list."); removeUser(userId, users); } @@ -55,7 +54,6 @@ package org.bigbluebutton.modules.users.views var user:BBBUser2x = users.getItemAt(i) as BBBUser2x; if (user.userId == userId) { users.removeItemAt(i); - trace("Removed user " + userId + " from users list."); users.refresh(); return; } @@ -141,7 +139,7 @@ package org.bigbluebutton.modules.users.views // We want to remove the user if it's already in the collection and re-add it. removeUser(user.userId, users); - + trace("Adding User joined to voice conference " + user.name + " id=" + user.userId); users.addItem(user); } } @@ -151,6 +149,7 @@ package org.bigbluebutton.modules.users.views public function handleUserJoinedVoiceConfEvent(userId: String):void { var webUser: BBBUser2x = findUser(userId); if (webUser != null) { + trace("User joined to voice conference " + webUser.name + " id=" + webUser.userId); addVoiceUserToWebUser(webUser); } else { var vu: VoiceUser2x = LiveMeeting.inst().voiceUsers.getUser(userId); @@ -253,7 +252,7 @@ package org.bigbluebutton.modules.users.views private function findUser(userId: String): BBBUser2x { for (var i: int = 0; i < users.length; i++) { var user: BBBUser2x = users[i] as BBBUser2x; - if (user != null) { + if (user != null && user.userId == userId) { return user; } } From f4bcb2421aecbbee6e66426681f1ebcd6c80b39c Mon Sep 17 00:00:00 2001 From: Richard Alam Date: Mon, 26 Jun 2017 14:39:52 -0700 Subject: [PATCH 10/15] - send poll voting to client --- .../main/scala/org/bigbluebutton/core/models/Polls.scala | 8 ++++---- .../core2/message/handlers/RespondToPollReqMsgHdlr.scala | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Polls.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Polls.scala index d80f820d83..ce37a99e4e 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Polls.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Polls.scala @@ -104,11 +104,11 @@ object Polls { lm: LiveMeeting): Option[(String, String, SimplePollResultOutVO)] = { for { - curPres <- Users.getCurrentPresenter(lm.users) + curPres <- Users2x.findPresenter(lm.users2x) poll <- getSimplePollResult(pollId, lm.polls) pvo <- handleRespondToPoll(poll, requesterId, pollId, questionId, answerId, lm) } yield { - (curPres.id, pollId, pvo) + (curPres.intId, pollId, pvo) } } @@ -160,8 +160,8 @@ object Polls { } for { - user <- Users.findWithId(requesterId, lm.users) - responder = new Responder(user.id, user.name) + user <- Users2x.findWithIntId(lm.users2x, requesterId) + responder = new Responder(user.intId, user.name) updatedPoll <- storePollResult(responder) } yield { updatedPoll diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/RespondToPollReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/RespondToPollReqMsgHdlr.scala index b77cddb199..6a5e71715b 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/RespondToPollReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/RespondToPollReqMsgHdlr.scala @@ -13,6 +13,7 @@ trait RespondToPollReqMsgHdlr { val outGW: OutMessageGateway def handleRespondToPollReqMsg(msg: RespondToPollReqMsg): Unit = { + log.debug("Received RespondToPollReqMsg {}", RespondToPollReqMsg) def broadcastEvent(msg: RespondToPollReqMsg, stoppedPollId: String, presenterId: String, poll: SimplePollResultOutVO): Unit = { val routing = Routing.addMsgToClientRouting(MessageTypes.BROADCAST_TO_MEETING, props.meetingProp.intId, msg.header.userId) From 02e8c4f4cb70d7b2200a974fdadbfb44f1248db4 Mon Sep 17 00:00:00 2001 From: Chad Pilkey Date: Mon, 26 Jun 2017 18:29:21 -0400 Subject: [PATCH 11/15] forgot a semi-colon --- .../org/bigbluebutton/modules/caption/views/CaptionWindow.mxml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/caption/views/CaptionWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/caption/views/CaptionWindow.mxml index 1bb2b1204d..31c4f52bc8 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/caption/views/CaptionWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/caption/views/CaptionWindow.mxml @@ -195,7 +195,7 @@ with BigBlueButton; if not, see . ownerText = ResourceUtil.getInstance().getString('bbb.caption.transcript.youowner'); } else { //claimed by other - var user:User2x = UsersUtil.getUser(ownerId) + var user:User2x = UsersUtil.getUser(ownerId); if (user != null) { ownerText = user.name; } From 03010eedb2a0f8a1349e1cbd7f97f4c35bbe9ca2 Mon Sep 17 00:00:00 2001 From: Richard Alam Date: Tue, 27 Jun 2017 13:05:38 -0700 Subject: [PATCH 12/15] - put users messages in one file - put guest policy into it's own class --- .../core/BigBlueButtonInGW.scala | 18 ++--- .../org/bigbluebutton/core/MeetingModel.scala | 5 -- .../bigbluebutton/core/api/InMessages.scala | 3 +- .../bigbluebutton/core/api/ValueObjects.scala | 11 +-- .../bigbluebutton/core/apps/UsersApp.scala | 1 - .../core/models/GuestsWaiting.scala | 23 +++++- .../core/models/UsersState.scala | 72 ----------------- .../core/models/VoiceUsers.scala | 3 + .../core/models/VoiceUsersState.scala | 77 ------------------- .../core/running/MeetingActor.scala | 12 +-- .../core/running/RunningMeeting.scala | 1 - .../bigbluebutton/core2/MeetingStatus2x.scala | 12 +-- .../users/ValidateAuthTokenReqMsgHdlr.scala | 4 +- .../bigbluebutton/core/AppsTestFixtures.scala | 2 +- .../messages/users/GetUsersReqMsg.scala | 8 -- .../common2/messages/users/Messages.scala | 74 ++++++++++++++++++ .../users/PresenterAssignedEvtMsg.scala | 7 -- .../users/PresenterUnassignedEvtMsg.scala | 7 -- .../messages/users/RegisterUserReqMsg.scala | 11 --- .../users/UserBroadcastCamStartMsg.scala | 8 -- .../users/UserBroadcastCamStartedEvtMsg.scala | 7 -- .../users/UserBroadcastCamStopMsg.scala | 8 -- .../users/UserBroadcastCamStoppedEvtMsg.scala | 8 -- .../users/UserEmojiChangedEvtMsg.scala | 8 -- .../users/UserJoinMeetingReqMsg.scala | 8 -- .../messages/users/UserLeaveReqMsg.scala | 7 -- .../users/ValidateAuthTokenReqMsg.scala | 19 ----- .../users/ValidateAuthTokenRespMsg.scala | 10 --- 28 files changed, 121 insertions(+), 313 deletions(-) delete mode 100755 akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/UsersState.scala delete mode 100755 akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/VoiceUsersState.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/GetUsersReqMsg.scala create mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/Messages.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/PresenterAssignedEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/PresenterUnassignedEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/RegisterUserReqMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserBroadcastCamStartMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserBroadcastCamStartedEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserBroadcastCamStopMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserBroadcastCamStoppedEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserEmojiChangedEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserJoinMeetingReqMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserLeaveReqMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/ValidateAuthTokenReqMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/ValidateAuthTokenRespMsg.scala diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala index 51d94e5799..8056721dcd 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala @@ -14,7 +14,7 @@ import org.bigbluebutton.messages._ import akka.event.Logging import org.bigbluebutton.SystemConfiguration import org.bigbluebutton.common2.domain.PageVO -import org.bigbluebutton.core.models.Roles +import org.bigbluebutton.core.models.{ GuestPolicyType, Roles } import scala.collection.JavaConverters @@ -46,11 +46,11 @@ class BigBlueButtonInGW( case msg: CreateMeetingRequest => { val policy = msg.payload.guestPolicy.toUpperCase() match { - case "ALWAYS_ACCEPT" => GuestPolicy.ALWAYS_ACCEPT - case "ALWAYS_DENY" => GuestPolicy.ALWAYS_DENY - case "ASK_MODERATOR" => GuestPolicy.ASK_MODERATOR + case "ALWAYS_ACCEPT" => GuestPolicyType.ALWAYS_ACCEPT + case "ALWAYS_DENY" => GuestPolicyType.ALWAYS_DENY + case "ASK_MODERATOR" => GuestPolicyType.ASK_MODERATOR //default - case undef => GuestPolicy.ASK_MODERATOR + case undef => GuestPolicyType.ASK_MODERATOR } /* val mProps = new MeetingProperties( @@ -301,11 +301,11 @@ class BigBlueButtonInGW( def setGuestPolicy(meetingId: String, guestPolicy: String, requesterId: String) { val policy = guestPolicy.toUpperCase() match { - case "ALWAYS_ACCEPT" => GuestPolicy.ALWAYS_ACCEPT - case "ALWAYS_DENY" => GuestPolicy.ALWAYS_DENY - case "ASK_MODERATOR" => GuestPolicy.ASK_MODERATOR + case "ALWAYS_ACCEPT" => GuestPolicyType.ALWAYS_ACCEPT + case "ALWAYS_DENY" => GuestPolicyType.ALWAYS_DENY + case "ASK_MODERATOR" => GuestPolicyType.ASK_MODERATOR //default - case undef => GuestPolicy.ASK_MODERATOR + case undef => GuestPolicyType.ASK_MODERATOR } eventBus.publish(BigBlueButtonEvent(meetingId, new SetGuestPolicy(meetingId, policy, requesterId))) } diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala index 413336d709..a35afa7bfd 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala @@ -1,10 +1,6 @@ package org.bigbluebutton.core -import org.bigbluebutton.core.api.GuestPolicy import org.bigbluebutton.core.api.Permissions -import java.util.concurrent.TimeUnit - -import org.bigbluebutton.core.api.GuestPolicy.GuestPolicy case object StopMeetingActor @@ -21,7 +17,6 @@ class MeetingModel { private var muted = false private var meetingEnded = false private var meetingMuted = false - private var guestPolicy = GuestPolicy.ASK_MODERATOR private var guestPolicySetBy: String = null private var hasLastWebUserLeft = false diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala index 3ab853f66c..1c9534c8a8 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala @@ -1,7 +1,6 @@ package org.bigbluebutton.core.api import org.bigbluebutton.common2.messages.breakoutrooms.BreakoutUserVO -import org.bigbluebutton.core.api.GuestPolicy.GuestPolicy import org.bigbluebutton.core.api.SharedNotesOperation.SharedNotesOperation import org.bigbluebutton.core.apps.Presentation @@ -116,7 +115,7 @@ case class UserDisconnectedFromGlobalAudio(meetingID: String, /** Not used. Just /////////////////////////////////////////////////////////////////////////////////////// case class GetGuestPolicy(meetingID: String, requesterID: String) extends InMessage -case class SetGuestPolicy(meetingID: String, policy: GuestPolicy, setBy: String) extends InMessage +case class SetGuestPolicy(meetingID: String, policy: String, setBy: String) extends InMessage case class RespondToGuest(meetingID: String, userId: String, response: Boolean, requesterID: String) extends InMessage /////////////////////////////////////////////////////////////////////////////////////// diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala index 5ca07d2f57..c89e6df2c4 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala @@ -2,6 +2,8 @@ package org.bigbluebutton.core.api import java.lang.Boolean +import org.bigbluebutton.core.models.GuestPolicyType + import scala.collection.mutable.Stack object Metadata extends Enumeration { @@ -10,13 +12,6 @@ object Metadata extends Enumeration { val INACTIVITY_TIMELEFT = "inactivity-timeleft" } -object GuestPolicy extends Enumeration { - type GuestPolicy = Value - val ALWAYS_ACCEPT = Value("ALWAYS_ACCEPT") - val ALWAYS_DENY = Value("ALWAYS_DENY") - val ASK_MODERATOR = Value("ASK_MODERATOR") -} - object SharedNotesOperation extends Enumeration { type SharedNotesOperation = Value val PATCH = Value("PATCH") @@ -101,7 +96,7 @@ case class MeetingConfig(name: String, duration: MeetingDuration, defaultAvatarURL: String, defaultConfigToken: String, - guestPolicy: GuestPolicy.GuestPolicy = GuestPolicy.ASK_MODERATOR) + guestPolicy: String = GuestPolicyType.ASK_MODERATOR) case class MeetingName(name: String) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala index ac7a7c860d..aec7fd6d0f 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala @@ -5,7 +5,6 @@ import org.bigbluebutton.common2.messages._ import org.bigbluebutton.common2.messages.users.{ PresenterAssignedEvtMsg, PresenterAssignedEvtMsgBody } import org.bigbluebutton.core.api._ import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.core.api.GuestPolicy import org.bigbluebutton.core.models._ import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core2.MeetingStatus2x diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/GuestsWaiting.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/GuestsWaiting.scala index 8ea1a0c4fb..1a8a7fb908 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/GuestsWaiting.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/GuestsWaiting.scala @@ -15,11 +15,22 @@ object GuestsWaiting { def remove(guests: GuestsWaiting, intId: String): Option[GuestWaiting] = { guests.remove(intId) } + + def getGuestPolicy(guest: GuestsWaiting): GuestPolicy = { + guest.guestPolicy + } + + def setGuestPolicy(guests: GuestsWaiting, policy: GuestPolicy): Unit = { + guests.setGuestPolicy(policy) + } + } class GuestsWaiting { private var guests: collection.immutable.HashMap[String, GuestWaiting] = new collection.immutable.HashMap[String, GuestWaiting] + private var guestPolicy = GuestPolicy(GuestPolicyType.ASK_MODERATOR, "SYSTEM") + private def toVector: Vector[GuestWaiting] = guests.values.toVector private def save(user: GuestWaiting): GuestWaiting = { @@ -35,6 +46,16 @@ class GuestsWaiting { user } } + + def getGuestPolicy(): GuestPolicy = guestPolicy + def setGuestPolicy(policy: GuestPolicy) = guestPolicy = policy } -case class GuestWaiting(intId: String, name: String, role: String) \ No newline at end of file +case class GuestWaiting(intId: String, name: String, role: String) +case class GuestPolicy(policy: String, setBy: String) + +object GuestPolicyType { + val ALWAYS_ACCEPT = "ALWAYS_ACCEPT" + val ALWAYS_DENY = "ALWAYS_DENY" + val ASK_MODERATOR = "ASK_MODERATOR" +} \ No newline at end of file diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/UsersState.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/UsersState.scala deleted file mode 100755 index dd63f4606e..0000000000 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/UsersState.scala +++ /dev/null @@ -1,72 +0,0 @@ -package org.bigbluebutton.core.models - -import com.softwaremill.quicklens.modify - -object UsersState { - def findWithIntId(users: UsersState, intId: String): Option[UserState] = users.toVector.find(u => u.intId == intId) - def findModerators(users: UsersState): Vector[UserState] = users.toVector.filter(u => u.role == Roles.MODERATOR_ROLE) - def findPresenters(users: UsersState): Vector[UserState] = users.toVector.filter(u => u.role == Roles.PRESENTER_ROLE) - def findViewers(users: UsersState): Vector[UserState] = users.toVector.filter(u => u.role == Roles.VIEWER_ROLE) - def hasModerator(users: UsersState): Boolean = users.toVector.filter(u => u.role == Roles.MODERATOR_ROLE).length > 0 - def hasPresenter(users: UsersState): Boolean = users.toVector.filter(u => u.role == Roles.PRESENTER_ROLE).length > 0 - def hasNoPresenter(users: UsersState): Boolean = users.toVector.filter(u => u.role == Roles.PRESENTER_ROLE).length == 0 - - def hasUserWithIntId(users: UsersState, intId: String): Boolean = { - findWithIntId(users, intId) match { - case Some(u) => true - case None => false - } - } - def numUsers(users: UsersState): Int = users.toVector.size - - def usersWhoAreNotPresenter(users: UsersState): Vector[UserState] = users.toVector filter (u => u.presenter == false) - - def unbecomePresenter(users: UsersState, intId: String) = { - for { - u <- findWithIntId(users, intId) - user = modify(u)(_.presenter).setTo(false) - } yield users.save(user) - } - - def becomePresenter(users: UsersState, intId: String) = { - for { - u <- findWithIntId(users, intId) - user = modify(u)(_.presenter).setTo(true) - } yield users.save(user) - } - - def isModerator(id: String, users: Users): Boolean = { - Users.findWithId(id, users) match { - case Some(user) => return user.role == Roles.MODERATOR_ROLE && !user.waitingForAcceptance - case None => return false - } - } - - def add(users: UsersState, state: UserState): Option[UserState] = { - users.save(state) - Some(state) - } - - def remove(users: UsersState, intId: String): Option[UserState] = { - users.remove(intId) - } - -} - -class UsersState { - private var usersStatus: collection.immutable.HashMap[String, UserState] = new collection.immutable.HashMap[String, UserState] - - private def toVector: Vector[UserState] = usersStatus.values.toVector - - private def save(user: UserState): UserState = { - usersStatus += user.intId -> user - user - } - - private def remove(intId: String): Option[UserState] = { - val user = usersStatus.get(intId) - user foreach (u => usersStatus -= intId) - user - } -} - diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/VoiceUsers.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/VoiceUsers.scala index e6a0b6e853..53c13e69ea 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/VoiceUsers.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/VoiceUsers.scala @@ -120,3 +120,6 @@ case class VoiceUser2x(intId: String, voiceUserId: String) case class VoiceUserVO2x(intId: String, voiceUserId: String, callerName: String, callerNum: String, joined: Boolean, locked: Boolean, muted: Boolean, talking: Boolean, callingWith: String, listenOnly: Boolean) + +case class VoiceUserState(intId: String, voiceUserId: String, callingWith: String, callerName: String, + callerNum: String, muted: Boolean, talking: Boolean, listenOnly: Boolean) \ No newline at end of file diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/VoiceUsersState.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/VoiceUsersState.scala deleted file mode 100755 index 5e955205d6..0000000000 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/VoiceUsersState.scala +++ /dev/null @@ -1,77 +0,0 @@ -package org.bigbluebutton.core.models - -import com.softwaremill.quicklens._ - -object VoiceUsersState { - def findWithId(users: VoiceUsersState, userId: String): Option[VoiceUserState] = users.toVector.find(u => u.intId == userId) - def add(users: VoiceUsersState, state: VoiceUserState): Option[VoiceUserState] = { - users.save(state) - Some(state) - } - - def remove(users: VoiceUsersState, intId: String): Option[VoiceUserState] = { - users.remove(intId) - } - - def joinedVoiceListenOnly(users: VoiceUsersState, userId: String): Option[VoiceUserState] = { - for { - u <- findWithId(users, userId) - vu = u.modify(_.talking).setTo(false) - .modify(_.listenOnly).setTo(true) - } yield { - users.save(vu) - vu - } - } - - def leftVoiceListenOnly(users: VoiceUsersState, userId: String): Option[VoiceUserState] = { - for { - u <- findWithId(users, userId) - vu = u.modify(_.talking).setTo(false) - .modify(_.listenOnly).setTo(false) - } yield { - users.save(vu) - vu - } - } - - def setUserTalking(users: VoiceUsersState, user: VoiceUserState, talking: Boolean): VoiceUserState = { - val nv = user.modify(_.talking).setTo(talking) - users.save(nv) - nv - } - - def setUserMuted(users: VoiceUsersState, user: VoiceUserState, muted: Boolean): VoiceUserState = { - val talking: Boolean = if (muted) false else user.talking - val nv = user.modify(_.muted).setTo(muted).modify(_.talking).setTo(talking) - users.save(nv) - nv - } -} - -class VoiceUsersState { - private var users: collection.immutable.HashMap[String, VoiceUserState] = new collection.immutable.HashMap[String, VoiceUserState] - - private def toVector: Vector[VoiceUserState] = users.values.toVector - - private def save(user: VoiceUserState): VoiceUserState = { - users += user.intId -> user - user - } - - private def remove(intId: String): Option[VoiceUserState] = { - val user = users.get(intId) - user foreach (u => users -= intId) - user - } -} - -object VoiceUserState { - - def setTalking(user: VoiceUserState, talking: Boolean): VoiceUserState = { - user.modify(_.talking).setTo(talking) - } -} - -case class VoiceUserState(intId: String, voiceUserId: String, callingWith: String, callerName: String, - callerNum: String, muted: Boolean, talking: Boolean, listenOnly: Boolean) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala index 0fdf6c846b..77653089c6 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala @@ -311,15 +311,15 @@ class MeetingActor(val props: DefaultProps, } def handleGetGuestPolicy(msg: GetGuestPolicy) { - outGW.send(new GetGuestPolicyReply(msg.meetingID, props.recordProp.record, - msg.requesterID, MeetingStatus2x.getGuestPolicy(liveMeeting.status).toString())) + // outGW.send(new GetGuestPolicyReply(msg.meetingID, props.recordProp.record, + // msg.requesterID, MeetingStatus2x.getGuestPolicy(liveMeeting.status).toString())) } def handleSetGuestPolicy(msg: SetGuestPolicy) { - MeetingStatus2x.setGuestPolicy(liveMeeting.status, msg.policy) - MeetingStatus2x.setGuestPolicySetBy(liveMeeting.status, msg.setBy) - outGW.send(new GuestPolicyChanged(msg.meetingID, props.recordProp.record, - MeetingStatus2x.getGuestPolicy(liveMeeting.status).toString())) + // MeetingStatus2x.setGuestPolicy(liveMeeting.status, msg.policy) + // MeetingStatus2x.setGuestPolicySetBy(liveMeeting.status, msg.setBy) + // outGW.send(new GuestPolicyChanged(msg.meetingID, props.recordProp.record, + // MeetingStatus2x.getGuestPolicy(liveMeeting.status).toString())) } def handleLogoutEndMeeting(msg: LogoutEndMeeting) { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala index c69930ce65..0b2ab1e20c 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala @@ -32,7 +32,6 @@ class RunningMeeting(val props: DefaultProps, val outGW: OutMessageGateway, val webcams = new Webcams val voiceUsers = new VoiceUsers val users2x = new Users2x - val usersState = new UsersState val polls2x = new Polls val guestsWaiting = new GuestsWaiting diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/MeetingStatus2x.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/MeetingStatus2x.scala index 32f90f7138..50d04095c6 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/MeetingStatus2x.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/MeetingStatus2x.scala @@ -3,7 +3,7 @@ package org.bigbluebutton.core2 import java.util.concurrent.TimeUnit import org.bigbluebutton.core.MeetingExtensionProp -import org.bigbluebutton.core.api.{ GuestPolicy, Permissions, Presenter } +import org.bigbluebutton.core.api.{ Permissions, Presenter } object MeetingStatus2x { def setCurrentPresenterInfo(status: MeetingStatus2x, pres: Presenter) { @@ -146,10 +146,6 @@ object MeetingStatus2x { def hasMeetingEnded(status: MeetingStatus2x): Boolean = status.meetingEnded def timeNowInMinutes(status: MeetingStatus2x): Long = TimeUnit.NANOSECONDS.toMinutes(System.nanoTime()) def timeNowInSeconds(status: MeetingStatus2x): Long = TimeUnit.NANOSECONDS.toSeconds(System.nanoTime()) - def getGuestPolicy(status: MeetingStatus2x): GuestPolicy.GuestPolicy = status.guestPolicy - def setGuestPolicy(status: MeetingStatus2x, policy: GuestPolicy.GuestPolicy) = status.guestPolicy = policy - def getGuestPolicySetBy(status: MeetingStatus2x): String = status.guestPolicySetBy - def setGuestPolicySetBy(status: MeetingStatus2x, user: String) = status.guestPolicySetBy = user def startedOn(status: MeetingStatus2x): Long = status.startedOn @@ -177,8 +173,6 @@ class MeetingStatus2x { private var muted = false private var meetingEnded = false private var meetingMuted = false - private var guestPolicy = GuestPolicy.ASK_MODERATOR - private var guestPolicySetBy: String = null private var hasLastWebUserLeft = false private var lastWebUserLeftOnTimestamp: Long = 0 @@ -332,8 +326,4 @@ class MeetingStatus2x { private def meetingHasEnded() = meetingEnded = true private def hasMeetingEnded(): Boolean = meetingEnded - private def getGuestPolicy(): GuestPolicy.GuestPolicy = guestPolicy - private def setGuestPolicy(policy: GuestPolicy.GuestPolicy) = guestPolicy = policy - private def getGuestPolicySetBy(): String = guestPolicySetBy - private def setGuestPolicySetBy(user: String) = guestPolicySetBy = user } diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/ValidateAuthTokenReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/ValidateAuthTokenReqMsgHdlr.scala index 3faecf9cd9..eb7bf69159 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/ValidateAuthTokenReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/ValidateAuthTokenReqMsgHdlr.scala @@ -4,9 +4,7 @@ import org.bigbluebutton.common2.messages._ import org.bigbluebutton.common2.messages.users.ValidateAuthTokenReqMsg import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models._ -import org.bigbluebutton.core.api.{ GuestPolicy, ValidateAuthToken } import org.bigbluebutton.core.running.MeetingActor -import org.bigbluebutton.core2.MeetingStatus2x import org.bigbluebutton.core2.message.senders._ trait ValidateAuthTokenReqMsgHdlr { @@ -20,7 +18,7 @@ trait ValidateAuthTokenReqMsgHdlr { RegisteredUsers.getRegisteredUserWithToken(msg.body.authToken, msg.body.userId, liveMeeting.registeredUsers) match { case Some(u) => - if (u.guest && u.waitingForAcceptance && MeetingStatus2x.getGuestPolicy(liveMeeting.status) == GuestPolicy.ASK_MODERATOR) { + if (u.guest && u.waitingForAcceptance && GuestsWaiting.getGuestPolicy(liveMeeting.guestsWaiting).policy == GuestPolicyType.ASK_MODERATOR) { ValidateAuthTokenRespMsgSender.send(outGW, meetingId = props.meetingProp.intId, userId = msg.body.userId, authToken = msg.body.authToken, valid = true, waitForApproval = true) diff --git a/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/AppsTestFixtures.scala b/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/AppsTestFixtures.scala index 9762b3f9de..29bf2933ef 100755 --- a/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/AppsTestFixtures.scala +++ b/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/AppsTestFixtures.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core import org.bigbluebutton.common2.domain._ -import org.bigbluebutton.core.api.GuestPolicy +import org.bigbluebutton.core.api.GuestPolicyType import org.bigbluebutton.core.apps._ import org.bigbluebutton.core.models.{ RegisteredUsers, Users } import org.bigbluebutton.core2.MeetingStatus2x diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/GetUsersReqMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/GetUsersReqMsg.scala deleted file mode 100755 index c881da7344..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/GetUsersReqMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.users - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - - -object GetUsersReqMsg { val NAME = "GetUsersReqMsg" } -case class GetUsersReqMsg(header: BbbClientMsgHeader, body: GetUsersReqMsgBody) extends BbbCoreMsg -case class GetUsersReqMsgBody(requesterId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/Messages.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/Messages.scala new file mode 100755 index 0000000000..c755c00638 --- /dev/null +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/Messages.scala @@ -0,0 +1,74 @@ +package org.bigbluebutton.common2.messages.users + +import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreHeaderWithMeetingId, BbbCoreMsg, GetGuestsWaitingApprovalRespMsg} + +object RegisterUserReqMsg { val NAME = "RegisterUserReqMsg" } +case class RegisterUserReqMsg(header: BbbCoreHeaderWithMeetingId, + body: RegisterUserReqMsgBody) extends BbbCoreMsg + +case class RegisterUserReqMsgBody(meetingId: String, intUserId: String, name: String, role: String, + extUserId: String, authToken: String, avatarURL: String, + guest: Boolean, authed: Boolean) + +object ValidateAuthTokenReqMsg { + val NAME = "ValidateAuthTokenReqMsg" + + def apply(meetingId: String, userId: String, authToken: String): ValidateAuthTokenReqMsg = { + val header = BbbClientMsgHeader(GetGuestsWaitingApprovalRespMsg.NAME, meetingId, userId) + + val body = ValidateAuthTokenReqMsgBody(userId, authToken) + ValidateAuthTokenReqMsg(header, body) + } +} + +case class ValidateAuthTokenReqMsg(header: BbbClientMsgHeader, + body: ValidateAuthTokenReqMsgBody) extends BbbCoreMsg +case class ValidateAuthTokenReqMsgBody(userId: String, authToken: String) + +object ValidateAuthTokenRespMsg { val NAME = "ValidateAuthTokenRespMsg" } +case class ValidateAuthTokenRespMsg(header: BbbClientMsgHeader, + body: ValidateAuthTokenRespMsgBody) extends BbbCoreMsg +case class ValidateAuthTokenRespMsgBody(userId: String, authToken: String, valid: Boolean, waitForApproval: Boolean) + + +object GetUsersReqMsg { val NAME = "GetUsersReqMsg" } +case class GetUsersReqMsg(header: BbbClientMsgHeader, body: GetUsersReqMsgBody) extends BbbCoreMsg +case class GetUsersReqMsgBody(requesterId: String) + +object PresenterAssignedEvtMsg { val NAME = "PresenterAssignedEvtMsg" } +case class PresenterAssignedEvtMsg(header: BbbClientMsgHeader, body: PresenterAssignedEvtMsgBody) extends BbbCoreMsg +case class PresenterAssignedEvtMsgBody(presenterId: String, presenterName: String, assignedBy: String) + +object PresenterUnassignedEvtMsg { val NAME = "PresenterUnassignedEvtMsg" } +case class PresenterUnassignedEvtMsg(header: BbbClientMsgHeader, body: PresenterUnassignedEvtMsgBody) extends BbbCoreMsg +case class PresenterUnassignedEvtMsgBody(intId: String, name: String, assignedBy: String) + +object UserBroadcastCamStartedEvtMsg { val NAME = "UserBroadcastCamStartedEvtMsg" } +case class UserBroadcastCamStartedEvtMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStartedEvtMsgBody) extends BbbCoreMsg +case class UserBroadcastCamStartedEvtMsgBody(userId: String, stream: String) + +object UserBroadcastCamStartMsg { val NAME = "UserBroadcastCamStartMsg" } +case class UserBroadcastCamStartMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStartMsgBody) extends BbbCoreMsg +case class UserBroadcastCamStartMsgBody(stream: String) + + +object UserBroadcastCamStopMsg { val NAME = "UserBroadcastCamStopMsg" } +case class UserBroadcastCamStopMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStopMsgBody) extends BbbCoreMsg +case class UserBroadcastCamStopMsgBody(stream: String) + +object UserBroadcastCamStoppedEvtMsg { val NAME = "UserBroadcastCamStoppedEvtMsg" } +case class UserBroadcastCamStoppedEvtMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStoppedEvtMsgBody) extends BbbCoreMsg +case class UserBroadcastCamStoppedEvtMsgBody(userId: String, stream: String) + + +object UserEmojiChangedEvtMsg { val NAME = "UserEmojiChangedEvtMsg" } +case class UserEmojiChangedEvtMsg(header: BbbClientMsgHeader, body: UserEmojiChangedEvtMsgBody) extends BbbCoreMsg +case class UserEmojiChangedEvtMsgBody(userId: String, emoji: String) + +object UserJoinMeetingReqMsg { val NAME = "UserJoinMeetingReqMsg" } +case class UserJoinMeetingReqMsg(header: BbbClientMsgHeader, body: UserJoinMeetingReqMsgBody) extends BbbCoreMsg +case class UserJoinMeetingReqMsgBody(userId: String, authToken: String) + +object UserLeaveReqMsg { val NAME = "UserLeaveReqMsg" } +case class UserLeaveReqMsg(header: BbbClientMsgHeader, body: UserLeaveReqMsgBody) extends BbbCoreMsg +case class UserLeaveReqMsgBody(userId: String, sessionId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/PresenterAssignedEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/PresenterAssignedEvtMsg.scala deleted file mode 100755 index 8637a48cf6..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/PresenterAssignedEvtMsg.scala +++ /dev/null @@ -1,7 +0,0 @@ -package org.bigbluebutton.common2.messages.users - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object PresenterAssignedEvtMsg { val NAME = "PresenterAssignedEvtMsg" } -case class PresenterAssignedEvtMsg(header: BbbClientMsgHeader, body: PresenterAssignedEvtMsgBody) extends BbbCoreMsg -case class PresenterAssignedEvtMsgBody(presenterId: String, presenterName: String, assignedBy: String) \ No newline at end of file diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/PresenterUnassignedEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/PresenterUnassignedEvtMsg.scala deleted file mode 100755 index 00d77b4bee..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/PresenterUnassignedEvtMsg.scala +++ /dev/null @@ -1,7 +0,0 @@ -package org.bigbluebutton.common2.messages.users - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object PresenterUnassignedEvtMsg { val NAME = "PresenterUnassignedEvtMsg" } -case class PresenterUnassignedEvtMsg(header: BbbClientMsgHeader, body: PresenterUnassignedEvtMsgBody) extends BbbCoreMsg -case class PresenterUnassignedEvtMsgBody(intId: String, name: String, assignedBy: String) \ No newline at end of file diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/RegisterUserReqMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/RegisterUserReqMsg.scala deleted file mode 100755 index 08926c9b84..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/RegisterUserReqMsg.scala +++ /dev/null @@ -1,11 +0,0 @@ -package org.bigbluebutton.common2.messages.users - -import org.bigbluebutton.common2.messages.{BbbCoreHeaderWithMeetingId, BbbCoreMsg} - -object RegisterUserReqMsg { val NAME = "RegisterUserReqMsg" } -case class RegisterUserReqMsg(header: BbbCoreHeaderWithMeetingId, - body: RegisterUserReqMsgBody) extends BbbCoreMsg - -case class RegisterUserReqMsgBody(meetingId: String, intUserId: String, name: String, role: String, - extUserId: String, authToken: String, avatarURL: String, - guest: Boolean, authed: Boolean) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserBroadcastCamStartMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserBroadcastCamStartMsg.scala deleted file mode 100755 index 0f7ee4a325..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserBroadcastCamStartMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.users - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - - -object UserBroadcastCamStartMsg { val NAME = "UserBroadcastCamStartMsg" } -case class UserBroadcastCamStartMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStartMsgBody) extends BbbCoreMsg -case class UserBroadcastCamStartMsgBody(stream: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserBroadcastCamStartedEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserBroadcastCamStartedEvtMsg.scala deleted file mode 100755 index 6a78f1a092..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserBroadcastCamStartedEvtMsg.scala +++ /dev/null @@ -1,7 +0,0 @@ -package org.bigbluebutton.common2.messages.users - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object UserBroadcastCamStartedEvtMsg { val NAME = "UserBroadcastCamStartedEvtMsg" } -case class UserBroadcastCamStartedEvtMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStartedEvtMsgBody) extends BbbCoreMsg -case class UserBroadcastCamStartedEvtMsgBody(userId: String, stream: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserBroadcastCamStopMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserBroadcastCamStopMsg.scala deleted file mode 100755 index 8887c48f24..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserBroadcastCamStopMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.users - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - - -object UserBroadcastCamStopMsg { val NAME = "UserBroadcastCamStopMsg" } -case class UserBroadcastCamStopMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStopMsgBody) extends BbbCoreMsg -case class UserBroadcastCamStopMsgBody(stream: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserBroadcastCamStoppedEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserBroadcastCamStoppedEvtMsg.scala deleted file mode 100755 index cc9524067d..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserBroadcastCamStoppedEvtMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.users - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - - -object UserBroadcastCamStoppedEvtMsg { val NAME = "UserBroadcastCamStoppedEvtMsg" } -case class UserBroadcastCamStoppedEvtMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStoppedEvtMsgBody) extends BbbCoreMsg -case class UserBroadcastCamStoppedEvtMsgBody(userId: String, stream: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserEmojiChangedEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserEmojiChangedEvtMsg.scala deleted file mode 100755 index c0c87ea0ad..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserEmojiChangedEvtMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.users - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - - -object UserEmojiChangedEvtMsg { val NAME = "UserEmojiChangedEvtMsg" } -case class UserEmojiChangedEvtMsg(header: BbbClientMsgHeader, body: UserEmojiChangedEvtMsgBody) extends BbbCoreMsg -case class UserEmojiChangedEvtMsgBody(userId: String, emoji: String) \ No newline at end of file diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserJoinMeetingReqMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserJoinMeetingReqMsg.scala deleted file mode 100755 index e8dcc63694..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserJoinMeetingReqMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.users - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - - -object UserJoinMeetingReqMsg { val NAME = "UserJoinMeetingReqMsg" } -case class UserJoinMeetingReqMsg(header: BbbClientMsgHeader, body: UserJoinMeetingReqMsgBody) extends BbbCoreMsg -case class UserJoinMeetingReqMsgBody(userId: String, authToken: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserLeaveReqMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserLeaveReqMsg.scala deleted file mode 100755 index 92e016d478..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/UserLeaveReqMsg.scala +++ /dev/null @@ -1,7 +0,0 @@ -package org.bigbluebutton.common2.messages.users - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object UserLeaveReqMsg { val NAME = "UserLeaveReqMsg" } -case class UserLeaveReqMsg(header: BbbClientMsgHeader, body: UserLeaveReqMsgBody) extends BbbCoreMsg -case class UserLeaveReqMsgBody(userId: String, sessionId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/ValidateAuthTokenReqMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/ValidateAuthTokenReqMsg.scala deleted file mode 100755 index fe9c0c4086..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/ValidateAuthTokenReqMsg.scala +++ /dev/null @@ -1,19 +0,0 @@ -package org.bigbluebutton.common2.messages.users - - -import org.bigbluebutton.common2.messages._ - -object ValidateAuthTokenReqMsg { - val NAME = "ValidateAuthTokenReqMsg" - - def apply(meetingId: String, userId: String, authToken: String): ValidateAuthTokenReqMsg = { - val header = BbbClientMsgHeader(GetGuestsWaitingApprovalRespMsg.NAME, meetingId, userId) - - val body = ValidateAuthTokenReqMsgBody(userId, authToken) - ValidateAuthTokenReqMsg(header, body) - } -} - -case class ValidateAuthTokenReqMsg(header: BbbClientMsgHeader, - body: ValidateAuthTokenReqMsgBody) extends BbbCoreMsg -case class ValidateAuthTokenReqMsgBody(userId: String, authToken: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/ValidateAuthTokenRespMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/ValidateAuthTokenRespMsg.scala deleted file mode 100755 index 902b9a23ac..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/ValidateAuthTokenRespMsg.scala +++ /dev/null @@ -1,10 +0,0 @@ -package org.bigbluebutton.common2.messages.users - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object ValidateAuthTokenRespMsg { val NAME = "ValidateAuthTokenRespMsg" } -case class ValidateAuthTokenRespMsg(header: BbbClientMsgHeader, - body: ValidateAuthTokenRespMsgBody) extends BbbCoreMsg -case class ValidateAuthTokenRespMsgBody(userId: String, authToken: String, valid: Boolean, waitForApproval: Boolean) - - From a32193bd68b46bf47d58c655736d28c138c431e0 Mon Sep 17 00:00:00 2001 From: Richard Alam Date: Tue, 27 Jun 2017 15:01:42 -0700 Subject: [PATCH 13/15] - reorganize messages --- .../core/BigBlueButtonActor.scala | 2 +- .../bigbluebutton/core/api/InMessages.scala | 3 +- .../bigbluebutton/core/api/OutMessages.scala | 2 +- .../core/apps/BreakoutRoomApp.scala | 11 +- .../bigbluebutton/core/apps/LayoutApp.scala | 6 +- .../org/bigbluebutton/core/apps/PollApp.scala | 10 +- .../core/apps/PresentationApp.scala | 2 +- .../bigbluebutton/core/apps/UsersApp.scala | 30 ++-- .../EjectUserFromMeetingHdlr.scala | 2 +- .../GetPresentationInfoReqMsgHdlr.scala | 2 +- .../presentation/NewPresentationMsgHdlr.scala | 2 +- ...ntationConversionCompletedPubMsgHdlr.scala | 2 +- ...esentationConversionUpdatePubMsgHdlr.scala | 2 +- ...PresentationPageCountErrorPubMsgHdlr.scala | 2 +- .../PresentationPageGeneratedPubMsgHdlr.scala | 2 +- .../PreuploadedPresentationsPubMsgHdlr.scala | 2 +- .../RemovePresentationPubMsgHdlr.scala | 2 +- .../ResizeAndMovePagePubMsgHdlr.scala | 2 +- .../SetCurrentPagePubMsgHdlr.scala | 2 +- .../SetCurrentPresentationPubMsgHdlr.scala | 2 +- .../core/models/BreakoutRooms.scala | 2 +- .../org/bigbluebutton/core/models/Polls.scala | 4 +- .../models/{Users.scala => Users1x.scala} | 94 ++++++------- .../senders/ReceivedJsonMsgHandlerActor.scala | 14 +- .../core/running/LiveMeeting.scala | 6 +- .../core/running/MeetingActor.scala | 28 ++-- .../core/running/RunningMeeting.scala | 2 +- .../EjectUserFromVoiceRequestHdlr.scala | 4 +- .../handlers/GetCurrentPollReqMsgHdlr.scala | 2 +- .../handlers/HidePollResultReqMsgHdlr.scala | 2 +- .../MuteAllExceptPresenterRequestHdlr.scala | 2 +- .../handlers/MuteMeetingRequestHdlr.scala | 6 +- .../handlers/RespondToPollReqMsgHdlr.scala | 2 +- .../handlers/SetLockSettingsHdlr.scala | 2 +- .../handlers/ShowPollResultReqMsgHdlr.scala | 4 +- .../handlers/StartCustomPollReqMsgHdlr.scala | 2 +- .../handlers/StartPollReqMsgHdlr.scala | 2 +- .../message/handlers/StopPollReqMsgHdlr.scala | 2 +- .../BreakoutRoomCreatedMsgHdlr.scala | 5 +- .../BreakoutRoomEndedMsgHdlr.scala | 2 +- .../BreakoutRoomUsersUpdateMsgHdlr.scala | 2 +- .../BreakoutRoomsListMsgHdlr.scala | 2 +- .../CreateBreakoutRoomsMsgHdlr.scala | 2 +- .../EndAllBreakoutRoomsMsgHdlr.scala | 2 +- .../RequestBreakoutJoinURLMsgHdlr.scala | 6 +- .../SendBreakoutUsersUpdateMsgHdlr.scala | 7 +- .../TransferUserToMeetingRequestHdlr.scala | 6 +- .../layout/BroadcastLayoutMsgHdlr.scala | 2 +- .../layout/GetCurrentLayoutMsgHdlr.scala | 3 +- .../handlers/layout/LockLayoutMsgHdlr.scala | 2 +- .../handlers/users/GetLockSettingsHdlr.scala | 2 +- .../handlers/users/InitLockSettingsHdlr.scala | 2 +- .../handlers/users/LockUserRequestHdlr.scala | 4 +- .../handlers/users/MuteUserRequestHdlr.scala | 2 +- .../users/UserBroadcastCamStartMsgHdlr.scala | 2 +- .../users/UserBroadcastCamStopMsgHdlr.scala | 2 +- .../UserConnectedToGlobalAudioHdlr.scala | 7 +- .../UserDisconnectedFromGlobalAudioHdlr.scala | 2 +- .../handlers/users/UserEmojiStatusHdlr.scala | 4 +- .../users/UserJoinMeetingReqMsgHdlr.scala | 2 +- .../users/UserJoinedVoiceConfEvtMsgHdlr.scala | 2 +- .../UserJoinedVoiceConfMessageHdlr.scala | 2 +- .../handlers/users/UserLeavingHdlr.scala | 2 +- .../users/UserLeftVoiceConfEvtMsgHdlr.scala | 2 +- .../UserMutedInVoiceConfEvtMsgHdlr.scala | 2 +- .../handlers/users/UserShareWebcamHdlr.scala | 4 +- .../UserTalkingInVoiceConfEvtMsgHdlr.scala | 2 +- .../users/UserUnshareWebcamHdlr.scala | 4 +- .../users/ValidateAuthTokenReqMsgHdlr.scala | 6 +- .../ClearWhiteboardPubMsgHdlr.scala | 2 +- .../GetWhiteboardAccessReqMsgHdlr.scala | 2 +- .../GetWhiteboardAnnotationsReqMsgHdlr.scala | 2 +- .../ModifyWhiteboardAccessPubMsgHdlr.scala | 2 +- .../SendCursorPositionPubMsgHdlr.scala | 2 +- .../SendWhiteboardAnnotationPubMsgHdlr.scala | 2 +- .../whiteboard/UndoWhiteboardPubMsgHdlr.scala | 2 +- ...etWebcamStreamsMeetingRespMsgBuilder.scala | 3 +- .../UserJoinedMeetingEvtMsgBuilder.scala | 1 + .../senders/UserLeftMeetingEvtMsgSender.scala | 1 + .../ValidateAuthTokenRespMsgSender.scala | 2 +- .../bigbluebutton/core/AppsTestFixtures.scala | 4 +- .../common2/messages/BreakoutRooms.scala | 101 ++++++++++++++ .../GetGuestsWaitingApprovalRespMsg.scala | 18 --- .../GetWebcamStreamsMeetingRespMsg.scala | 20 --- .../messages/GetWebcamStreamsRespMsg.scala | 15 -- .../common2/messages/Guests.scala | 68 ++++++++++ .../GuestsWaitingApprovalEvtMsg.scala | 17 --- .../GuestsWaitingApprovedEvtMsg.scala | 17 --- .../messages/GuestsWaitingApprovedMsg.scala | 17 --- .../common2/messages/Layout.scala | 36 +++++ .../common2/messages/MessageBody.scala | 30 ++-- .../common2/messages/Messages.scala | 62 --------- .../common2/messages/Polls.scala | 63 +++++++++ .../common2/messages/Presentation.scala | 99 ++++++++++++++ .../messages/UserJoinedMeetingEvtMsg.scala | 17 --- .../messages/UserLeftMeetingEvtMsg.scala | 14 -- .../common2/messages/Users.scala | 78 +++++++++++ .../common2/messages/VoiceConf.scala | 128 ++++++++++++++++++ .../common2/messages/Webcams.scala | 56 ++++++++ .../common2/messages/Whiteboard.scala | 119 ++++++++++++++++ .../BreakoutRoomCreatedMsg.scala | 8 -- .../BreakoutRoomEndedEvtMsg.scala | 7 - .../breakoutrooms/BreakoutRoomEndedMsg.scala | 8 -- .../BreakoutRoomJoinURLEvtMsg.scala | 8 -- .../BreakoutRoomStartedEvtMsg.scala | 7 - .../BreakoutRoomUsersUpdateMsg.scala | 8 -- .../BreakoutRoomsListEvtMsg.scala | 9 -- .../breakoutrooms/BreakoutRoomsListMsg.scala | 7 - ...eakoutRoomsTimeRemainingUpdateEvtMsg.scala | 8 -- .../CreateBreakoutRoomEvtMsg.scala | 11 -- .../CreateBreakoutRoomsMsg.scala | 8 -- .../EndAllBreakoutRoomsMsg.scala | 8 -- .../breakoutrooms/EndBreakoutRoomEvtMsg.scala | 7 - .../MeetingTimeRemainingUpdateEvtMsg.scala | 8 -- .../messages/breakoutrooms/Messages.scala | 11 -- .../RequestBreakoutJoinURLMsg.scala | 8 -- .../SendBreakoutUsersUpdateMsg.scala | 9 -- .../TransferUserToMeetingEvtMsg.scala | 7 - .../TransferUserToMeetingRequestMsg.scala | 9 -- .../UpdateBreakoutUsersEvtMsg.scala | 8 -- .../common2/messages/layout/Messages.scala | 35 ----- .../messages/polls/GetCurrentPollReqMsg.scala | 7 - .../polls/GetCurrentPollRespMsg.scala | 9 -- .../messages/polls/HidePollResultReqMsg.scala | 7 - .../messages/polls/PollHideResultEvtMsg.scala | 7 - .../messages/polls/PollShowResultEvtMsg.scala | 8 -- .../messages/polls/PollStartedEvtMsg.scala | 8 -- .../messages/polls/PollStoppedEvtMsg.scala | 8 -- .../messages/polls/RespondToPollReqMsg.scala | 7 - .../messages/polls/ShowPollResultReqMsg.scala | 8 -- .../polls/StartCustomPollReqMsg.scala | 8 -- .../messages/polls/StartPollReqMsg.scala | 7 - .../messages/polls/StopPollReqMsg.scala | 8 -- .../polls/UserRespondedToPollEvtMsg.scala | 9 -- .../common2/messages/users/Messages.scala | 74 ---------- .../DeskshareHangUpVoiceConfMsg.scala | 8 -- ...eRtmpBroadcastStartedVoiceConfEvtMsg.scala | 10 -- ...eRtmpBroadcastStoppedVoiceConfEvtMsg.scala | 11 -- ...kshareStartRtmpBroadcastVoiceConfMsg.scala | 10 -- .../DeskshareStartedVoiceConfEvtMsg.scala | 9 -- ...skshareStopRtmpBroadcastVoiceConfMsg.scala | 10 -- .../DeskshareStoppedVoiceConfEvtMsg.scala | 9 -- .../voiceconf/EjectAllFromVoiceConfMsg.scala | 10 -- .../voiceconf/EjectUserFromVoiceConfMsg.scala | 10 -- .../common2/messages/voiceconf/Messages.scala | 6 - .../voiceconf/MuteUserInVoiceConfMsg.scala | 9 -- .../RecordingStartedVoiceConfEvtMsg.scala | 9 -- .../StartRecordingVoiceConfMsg.scala | 8 -- .../voiceconf/StopRecordingVoiceConfMsg.scala | 8 -- .../TransferUserToVoiceConfMsg.scala | 8 -- .../voiceconf/UserJoinedVoiceConfEvtMsg.scala | 11 -- .../UserJoinedVoiceConfToClientEvtMsg.scala | 9 -- .../voiceconf/UserLeftVoiceConfEvtMsg.scala | 8 -- .../UserLeftVoiceConfToClientEvtMsg.scala | 7 - .../messages/voiceconf/UserMutedEvtMsg.scala | 11 -- .../UserMutedInVoiceConfEvtMsg.scala | 10 -- .../voiceconf/UserTalkingEvtMsg.scala | 11 -- .../UserTalkingInVoiceConfEvtMsg.scala | 8 -- .../whiteboard/ClearWhiteboardEvtMsg.scala | 7 - .../whiteboard/ClearWhiteboardPubMsg.scala | 7 - .../GetWhiteboardAccessReqMsg.scala | 7 - .../GetWhiteboardAccessRespMsg.scala | 7 - .../GetWhiteboardAnnotationsReqMsg.scala | 8 -- .../GetWhiteboardAnnotationsRespMsg.scala | 8 -- .../ModifyWhiteboardAccessEvtMsg.scala | 8 -- .../ModifyWhiteboardAccessPubMsg.scala | 7 - .../whiteboard/SendCursorPositionEvtMsg.scala | 7 - .../whiteboard/SendCursorPositionPubMsg.scala | 8 -- .../SendWhiteboardAnnotationEvtMsg.scala | 8 -- .../SendWhiteboardAnnotationPubMsg.scala | 8 -- .../whiteboard/UndoWhiteboardEvtMsg.scala | 7 - .../whiteboard/UndoWhiteboardPubMsg.scala | 7 - 172 files changed, 955 insertions(+), 1099 deletions(-) mode change 100644 => 100755 akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/BreakoutRooms.scala rename akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/{Users.scala => Users1x.scala} (61%) mode change 100644 => 100755 akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomCreatedMsgHdlr.scala mode change 100644 => 100755 akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomEndedMsgHdlr.scala mode change 100644 => 100755 akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomUsersUpdateMsgHdlr.scala mode change 100644 => 100755 akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomsListMsgHdlr.scala mode change 100644 => 100755 akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/CreateBreakoutRoomsMsgHdlr.scala mode change 100644 => 100755 akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/EndAllBreakoutRoomsMsgHdlr.scala mode change 100644 => 100755 akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/RequestBreakoutJoinURLMsgHdlr.scala mode change 100644 => 100755 akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/SendBreakoutUsersUpdateMsgHdlr.scala mode change 100644 => 100755 akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/TransferUserToMeetingRequestHdlr.scala mode change 100644 => 100755 akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/BroadcastLayoutMsgHdlr.scala mode change 100644 => 100755 akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/GetCurrentLayoutMsgHdlr.scala mode change 100644 => 100755 akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/LockLayoutMsgHdlr.scala create mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/BreakoutRooms.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetGuestsWaitingApprovalRespMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetWebcamStreamsMeetingRespMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetWebcamStreamsRespMsg.scala create mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Guests.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GuestsWaitingApprovalEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GuestsWaitingApprovedEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GuestsWaitingApprovedMsg.scala create mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Layout.scala create mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Polls.scala create mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Presentation.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/UserJoinedMeetingEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/UserLeftMeetingEvtMsg.scala create mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Users.scala create mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/VoiceConf.scala create mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Webcams.scala create mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Whiteboard.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomCreatedMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomEndedEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomEndedMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomJoinURLEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomStartedEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomUsersUpdateMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomsListEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomsListMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomsTimeRemainingUpdateEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/CreateBreakoutRoomEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/CreateBreakoutRoomsMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/EndAllBreakoutRoomsMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/EndBreakoutRoomEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/MeetingTimeRemainingUpdateEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/Messages.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/RequestBreakoutJoinURLMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/SendBreakoutUsersUpdateMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/TransferUserToMeetingEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/TransferUserToMeetingRequestMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/UpdateBreakoutUsersEvtMsg.scala delete mode 100644 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/layout/Messages.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/GetCurrentPollReqMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/GetCurrentPollRespMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/HidePollResultReqMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/PollHideResultEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/PollShowResultEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/PollStartedEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/PollStoppedEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/RespondToPollReqMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/ShowPollResultReqMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/StartCustomPollReqMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/StartPollReqMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/StopPollReqMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/UserRespondedToPollEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/Messages.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareHangUpVoiceConfMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareRtmpBroadcastStartedVoiceConfEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareRtmpBroadcastStoppedVoiceConfEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareStartRtmpBroadcastVoiceConfMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareStartedVoiceConfEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareStopRtmpBroadcastVoiceConfMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareStoppedVoiceConfEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/EjectAllFromVoiceConfMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/EjectUserFromVoiceConfMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/Messages.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/MuteUserInVoiceConfMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/RecordingStartedVoiceConfEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/StartRecordingVoiceConfMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/StopRecordingVoiceConfMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/TransferUserToVoiceConfMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserJoinedVoiceConfEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserJoinedVoiceConfToClientEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserLeftVoiceConfEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserLeftVoiceConfToClientEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserMutedEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserMutedInVoiceConfEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserTalkingEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserTalkingInVoiceConfEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/ClearWhiteboardEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/ClearWhiteboardPubMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/GetWhiteboardAccessReqMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/GetWhiteboardAccessRespMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/GetWhiteboardAnnotationsReqMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/GetWhiteboardAnnotationsRespMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/ModifyWhiteboardAccessEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/ModifyWhiteboardAccessPubMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/SendCursorPositionEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/SendCursorPositionPubMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/SendWhiteboardAnnotationEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/SendWhiteboardAnnotationPubMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/UndoWhiteboardEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/UndoWhiteboardPubMsg.scala diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala index 38d5f3cde4..567c3a3d2c 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala @@ -13,8 +13,8 @@ import org.bigbluebutton.core.api._ import org.bigbluebutton.SystemConfiguration import java.util.concurrent.TimeUnit +import org.bigbluebutton.common2.messages.Users.RegisterUserReqMsg import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.users.RegisterUserReqMsg import org.bigbluebutton.core.running.RunningMeeting import org.bigbluebutton.core2.RunningMeetings diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala index 1c9534c8a8..caec9df8dc 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala @@ -1,9 +1,8 @@ package org.bigbluebutton.core.api -import org.bigbluebutton.common2.messages.breakoutrooms.BreakoutUserVO +import org.bigbluebutton.common2.messages.BreakoutRooms.BreakoutUserVO import org.bigbluebutton.core.api.SharedNotesOperation.SharedNotesOperation import org.bigbluebutton.core.apps.Presentation - import spray.json.JsObject case class InMessageHeader(name: String) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala index b75b33c664..0f943b4022 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala @@ -1,9 +1,9 @@ package org.bigbluebutton.core.api -import org.bigbluebutton.common2.messages.breakoutrooms._ import org.bigbluebutton.core.apps._ import org.bigbluebutton.core.models._ import org.bigbluebutton.common2.domain.UserVO +import org.bigbluebutton.common2.messages.BreakoutRooms.{ BreakoutRoomInfo, BreakoutUserVO } case class VoiceRecordingStarted(meetingID: String, recorded: Boolean, recordingFile: String, timestamp: String, confNum: String) extends IOutMessage case class VoiceRecordingStopped(meetingID: String, recorded: Boolean, recordingFile: String, timestamp: String, confNum: String) extends IOutMessage diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala index 53248a54ec..ce37cb1778 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala @@ -4,18 +4,17 @@ import java.net.URLEncoder import scala.collection.SortedSet import scala.collection.mutable - import org.apache.commons.codec.digest.DigestUtils import org.bigbluebutton.SystemConfiguration +import org.bigbluebutton.common2.messages.BreakoutRooms.{ BreakoutRoomInfo, BreakoutUserVO } import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api._ import org.bigbluebutton.core.bus.BigBlueButtonEvent import org.bigbluebutton.core.bus.IncomingEventBus import org.bigbluebutton.core.models.BreakoutRooms -import org.bigbluebutton.core.models.Users +import org.bigbluebutton.core.models.Users1x import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core2.MeetingStatus2x -import org.bigbluebutton.common2.messages.breakoutrooms._ trait BreakoutRoomApp extends SystemConfiguration { this: MeetingActor => @@ -73,7 +72,7 @@ trait BreakoutRoomApp extends SystemConfiguration { def sendJoinURL(userId: String, externalMeetingId: String, roomSequence: String) { log.debug("Sending breakout meeting {} Join URL for user: {}", externalMeetingId, userId) for { - user <- Users.findWithId(userId, liveMeeting.users) + user <- Users1x.findWithId(userId, liveMeeting.users) apiCall = "join" params = BreakoutRoomsUtil.joinParams(user.name, userId + "-" + roomSequence, true, externalMeetingId, props.password.moderatorPass) @@ -136,7 +135,7 @@ trait BreakoutRoomApp extends SystemConfiguration { } def handleSendBreakoutUsersUpdate(msg: SendBreakoutUsersUpdate) { - val users = Users.getUsers(liveMeeting.users) + val users = Users1x.getUsers(liveMeeting.users) val breakoutUsers = users map { u => new BreakoutUserVO(u.externalId, u.name) } eventBus.publish(BigBlueButtonEvent(props.breakoutProps.parentId, new BreakoutRoomUsersUpdate(props.breakoutProps.parentId, props.meetingProp.intId, breakoutUsers))) @@ -157,7 +156,7 @@ trait BreakoutRoomApp extends SystemConfiguration { targetVoiceBridge = props.voiceProp.voiceConf.dropRight(1) } // We check the user from the mode - Users.findWithId(msg.userId, liveMeeting.users) match { + Users1x.findWithId(msg.userId, liveMeeting.users) match { case Some(u) => { if (u.voiceUser.joined) { log.info("Transferring user userId=" + u.id + " from voiceBridge=" + props.voiceProp.voiceConf + " to targetVoiceConf=" + targetVoiceBridge) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/LayoutApp.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/LayoutApp.scala index b62dadb00b..e053318e2b 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/LayoutApp.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/LayoutApp.scala @@ -5,7 +5,7 @@ import org.bigbluebutton.common2.domain.UserVO import scala.collection.mutable.ArrayBuffer import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api._ -import org.bigbluebutton.core.models.{ Layouts, Roles, Users } +import org.bigbluebutton.core.models.{ Layouts, Roles, Users1x } import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core2.MeetingStatus2x @@ -54,14 +54,14 @@ trait LayoutApp { def affectedUsers(): Array[UserVO] = { if (Layouts.doesLayoutApplyToViewersOnly()) { val au = ArrayBuffer[UserVO]() - Users.getUsers(liveMeeting.users) foreach { u => + Users1x.getUsers(liveMeeting.users) foreach { u => if (!u.presenter && u.role != Roles.MODERATOR_ROLE) { au += u } } au.toArray } else { - Users.getUsers(liveMeeting.users).toArray + Users1x.getUsers(liveMeeting.users).toArray } } diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/PollApp.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/PollApp.scala index f6e01b28e2..978c2b294c 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/PollApp.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/PollApp.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.core.apps import org.bigbluebutton.core.api._ import scala.collection.mutable.ArrayBuffer -import org.bigbluebutton.core.models.Users +import org.bigbluebutton.core.models.Users1x import org.bigbluebutton.core.running.{ MeetingActor } import com.google.gson.Gson import java.util.ArrayList @@ -133,7 +133,7 @@ trait PollApp { page <- liveMeeting.presModel.getCurrentPage() pageId = if (msg.pollId.contains("deskshare")) "deskshare" else page.id; pollId = pageId + "/" + System.currentTimeMillis() - numRespondents = Users.numUsers(liveMeeting.users) - 1 // subtract the presenter + numRespondents = Users1x.numUsers(liveMeeting.users) - 1 // subtract the presenter poll <- createPoll(pollId, numRespondents) simplePoll <- PollModel.getSimplePoll(pollId, liveMeeting.pollModel) } yield { @@ -157,7 +157,7 @@ trait PollApp { page <- liveMeeting.presModel.getCurrentPage() pageId = if (msg.pollId.contains("deskshare")) "deskshare" else page.id pollId = pageId + "/" + System.currentTimeMillis() - numRespondents = Users.numUsers(liveMeeting.users) - 1 // subtract the presenter + numRespondents = Users1x.numUsers(liveMeeting.users) - 1 // subtract the presenter poll <- createPoll(pollId, numRespondents) simplePoll <- PollModel.getSimplePoll(pollId, liveMeeting.pollModel) } yield { @@ -185,10 +185,10 @@ trait PollApp { } for { - user <- Users.findWithId(msg.requesterId, liveMeeting.users) + user <- Users1x.findWithId(msg.requesterId, liveMeeting.users) responder = new Responder(user.id, user.name) updatedPoll <- storePollResult(responder) - curPres <- Users.getCurrentPresenter(liveMeeting.users) + curPres <- Users1x.getCurrentPresenter(liveMeeting.users) } yield outGW.send(new UserRespondedToPollMessage(props.meetingProp.intId, props.recordProp.record, curPres.id, msg.pollId, updatedPoll)) } diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/PresentationApp.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/PresentationApp.scala index 8cc093a771..904960a4fe 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/PresentationApp.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/PresentationApp.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.core.apps import org.bigbluebutton.core.api._ import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.core.models.Users +import org.bigbluebutton.core.models.Users1x import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core2.MeetingStatus2x diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala index aec7fd6d0f..7cbb262742 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala @@ -1,8 +1,8 @@ package org.bigbluebutton.core.apps import org.bigbluebutton.common2.domain.UserVO +import org.bigbluebutton.common2.messages.Presentation.{ PresenterAssignedEvtMsg, PresenterAssignedEvtMsgBody } import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.users.{ PresenterAssignedEvtMsg, PresenterAssignedEvtMsgBody } import org.bigbluebutton.core.api._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models._ @@ -55,7 +55,7 @@ trait UsersApp extends UserLeavingHdlr with UserEmojiStatusHdlr { } def usersWhoAreNotPresenter(): Array[UserVO] = { - Users.usersWhoAreNotPresenter(liveMeeting.users).toArray + Users1x.usersWhoAreNotPresenter(liveMeeting.users).toArray } def makeSurePresenterIsAssigned(user: UserVO): Unit = { @@ -64,7 +64,7 @@ trait UsersApp extends UserLeavingHdlr with UserEmojiStatusHdlr { * him presenter. This way, if there is a moderator in the meeting, there * will always be a presenter. */ - val moderator = Users.findAModerator(liveMeeting.users) + val moderator = Users1x.findAModerator(liveMeeting.users) moderator.foreach { mod => log.info("Presenter left meeting. meetingId=" + props.meetingProp.intId + " userId=" + user.id + ". Making user=[" + mod.id + "] presenter.") @@ -92,7 +92,7 @@ trait UsersApp extends UserLeavingHdlr with UserEmojiStatusHdlr { } def stopRecordingVoiceConference() { - if (Users.numUsersInVoiceConference(liveMeeting.users) == 0 && + if (Users1x.numUsersInVoiceConference(liveMeeting.users) == 0 && props.recordProp.record && MeetingStatus2x.isVoiceRecording(liveMeeting.status)) { MeetingStatus2x.stopRecordingVoice(liveMeeting.status) @@ -107,15 +107,15 @@ trait UsersApp extends UserLeavingHdlr with UserEmojiStatusHdlr { + " userId=" + msg.voiceUserId) for { - user <- Users.getUserWithVoiceUserId(msg.voiceUserId, liveMeeting.users) - nu = Users.resetVoiceUser(user, liveMeeting.users) + user <- Users1x.getUserWithVoiceUserId(msg.voiceUserId, liveMeeting.users) + nu = Users1x.resetVoiceUser(user, liveMeeting.users) } yield { log.info("User left voice conf. meetingId=" + props.meetingProp.intId + " userId=" + nu.id + " user=" + nu) outGW.send(new UserLeftVoice(props.meetingProp.intId, props.recordProp.record, props.voiceProp.voiceConf, nu)) if (user.phoneUser) { for { - userLeaving <- Users.userLeft(user.id, liveMeeting.users) + userLeaving <- Users1x.userLeft(user.id, liveMeeting.users) } yield { outGW.send(new UserLeft(props.meetingProp.intId, props.recordProp.record, userLeaving)) } @@ -136,18 +136,18 @@ trait UsersApp extends UserLeavingHdlr with UserEmojiStatusHdlr { def removePresenterRightsToCurrentPresenter(): Unit = { for { - curPres <- Users.getCurrentPresenter(liveMeeting.users) + curPres <- Users1x.getCurrentPresenter(liveMeeting.users) } yield { - Users.unbecomePresenter(curPres.id, liveMeeting.users) + Users1x.unbecomePresenter(curPres.id, liveMeeting.users) outGW.send(new UserStatusChange(props.meetingProp.intId, props.recordProp.record, curPres.id, "presenter", false: java.lang.Boolean)) } } for { - newPres <- Users.findWithId(newPresenterID, liveMeeting.users) + newPres <- Users1x.findWithId(newPresenterID, liveMeeting.users) } yield { removePresenterRightsToCurrentPresenter() - Users.becomePresenter(newPres.id, liveMeeting.users) + Users1x.becomePresenter(newPres.id, liveMeeting.users) MeetingStatus2x.setCurrentPresenterInfo(liveMeeting.status, new Presenter(newPresenterID, newPresenterName, assignedBy)) outGW.send(new PresenterAssigned(props.meetingProp.intId, props.recordProp.record, new Presenter(newPresenterID, newPresenterName, assignedBy))) outGW.send(new UserStatusChange(props.meetingProp.intId, props.recordProp.record, newPresenterID, "presenter", true: java.lang.Boolean)) @@ -155,17 +155,17 @@ trait UsersApp extends UserLeavingHdlr with UserEmojiStatusHdlr { } def handleRespondToGuest(msg: RespondToGuest) { - if (Users.isModerator(msg.requesterID, liveMeeting.users)) { + if (Users1x.isModerator(msg.requesterID, liveMeeting.users)) { var usersToAnswer: Array[UserVO] = null; if (msg.userId == null) { - usersToAnswer = Users.getUsers(liveMeeting.users).filter(u => u.waitingForAcceptance == true).toArray + usersToAnswer = Users1x.getUsers(liveMeeting.users).filter(u => u.waitingForAcceptance == true).toArray } else { - usersToAnswer = Users.getUsers(liveMeeting.users).filter(u => u.waitingForAcceptance == true && u.id == msg.userId).toArray + usersToAnswer = Users1x.getUsers(liveMeeting.users).filter(u => u.waitingForAcceptance == true && u.id == msg.userId).toArray } usersToAnswer foreach { user => println("UsersApp - handleGuestAccessDenied for user [" + user.id + "]"); if (msg.response == true) { - val nu = Users.setWaitingForAcceptance(user, liveMeeting.users, false) + val nu = Users1x.setWaitingForAcceptance(user, liveMeeting.users, false) RegisteredUsers.updateRegUser(nu, liveMeeting.registeredUsers) outGW.send(new UserJoined(props.meetingProp.intId, props.recordProp.record, nu)) } else { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/EjectUserFromMeetingHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/EjectUserFromMeetingHdlr.scala index 7c94d56199..47af8bc911 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/EjectUserFromMeetingHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/EjectUserFromMeetingHdlr.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core.apps.presentation import org.bigbluebutton.core.api._ -import org.bigbluebutton.core.models.{ RegisteredUsers, UserState, Users2x, VoiceUsers } +import org.bigbluebutton.core.models.{ UserState, Users2x } trait EjectUserFromMeetingHdlr { this: PresentationApp2x => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/GetPresentationInfoReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/GetPresentationInfoReqMsgHdlr.scala index 6b40560d74..679e547d14 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/GetPresentationInfoReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/GetPresentationInfoReqMsgHdlr.scala @@ -1,9 +1,9 @@ package org.bigbluebutton.core.apps.presentation import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages.MessageBody.GetPresentationInfoRespMsgBody import org.bigbluebutton.common2.messages._ import org.bigbluebutton.common2.domain.PresentationVO +import org.bigbluebutton.common2.messages.Presentation.{ GetPresentationInfoReqMsg, GetPresentationInfoRespMsg, GetPresentationInfoRespMsgBody } import org.bigbluebutton.core.apps.Presentation trait GetPresentationInfoReqMsgHdlr { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/NewPresentationMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/NewPresentationMsgHdlr.scala index 70f0648362..a9d3df522a 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/NewPresentationMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/NewPresentationMsgHdlr.scala @@ -1,9 +1,9 @@ package org.bigbluebutton.core.apps.presentation import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages.MessageBody.NewPresentationEvtMsgBody import org.bigbluebutton.common2.messages._ import org.bigbluebutton.common2.domain.PresentationVO +import org.bigbluebutton.common2.messages.Presentation.{ NewPresentationEvtMsg, NewPresentationEvtMsgBody } trait NewPresentationMsgHdlr { this: PresentationApp2x => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationConversionCompletedPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationConversionCompletedPubMsgHdlr.scala index 5f06db955e..0a1bb9d068 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationConversionCompletedPubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationConversionCompletedPubMsgHdlr.scala @@ -1,8 +1,8 @@ package org.bigbluebutton.core.apps.presentation import org.bigbluebutton.common2.domain.PageVO +import org.bigbluebutton.common2.messages.Presentation.{ PresentationConversionCompletedEvtMsg, PresentationConversionCompletedEvtMsgBody, PresentationConversionCompletedPubMsg } import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages.MessageBody.PresentationConversionCompletedEvtMsgBody import org.bigbluebutton.common2.messages._ import org.bigbluebutton.core.apps.Presentation diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationConversionUpdatePubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationConversionUpdatePubMsgHdlr.scala index 81442c8fcb..1f79a631cc 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationConversionUpdatePubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationConversionUpdatePubMsgHdlr.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core.apps.presentation +import org.bigbluebutton.common2.messages.Presentation.{ PresentationConversionUpdateEvtMsg, PresentationConversionUpdateEvtMsgBody, PresentationConversionUpdatePubMsg } import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages.MessageBody.PresentationConversionUpdateEvtMsgBody import org.bigbluebutton.common2.messages._ trait PresentationConversionUpdatePubMsgHdlr { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationPageCountErrorPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationPageCountErrorPubMsgHdlr.scala index cc332ab081..fac7beb496 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationPageCountErrorPubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationPageCountErrorPubMsgHdlr.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core.apps.presentation +import org.bigbluebutton.common2.messages.Presentation.{ PresentationPageCountErrorEvtMsg, PresentationPageCountErrorEvtMsgBody, PresentationPageCountErrorPubMsg } import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages.MessageBody.PresentationPageCountErrorEvtMsgBody import org.bigbluebutton.common2.messages._ trait PresentationPageCountErrorPubMsgHdlr { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationPageGeneratedPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationPageGeneratedPubMsgHdlr.scala index 246c2b94dd..6ce50d0041 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationPageGeneratedPubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationPageGeneratedPubMsgHdlr.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core.apps.presentation +import org.bigbluebutton.common2.messages.Presentation.{ PresentationPageGeneratedEvtMsg, PresentationPageGeneratedEvtMsgBody, PresentationPageGeneratedPubMsg } import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages.MessageBody.PresentationPageGeneratedEvtMsgBody import org.bigbluebutton.common2.messages._ trait PresentationPageGeneratedPubMsgHdlr { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PreuploadedPresentationsPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PreuploadedPresentationsPubMsgHdlr.scala index 7f755e5258..5688f38e4b 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PreuploadedPresentationsPubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PreuploadedPresentationsPubMsgHdlr.scala @@ -1,8 +1,8 @@ package org.bigbluebutton.core.apps.presentation import org.bigbluebutton.common2.domain.PageVO +import org.bigbluebutton.common2.messages.Presentation.PreuploadedPresentationsPubMsg import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages._ import org.bigbluebutton.core.apps.Presentation trait PreuploadedPresentationsPubMsgHdlr { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/RemovePresentationPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/RemovePresentationPubMsgHdlr.scala index 79a504383c..0535cf73c5 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/RemovePresentationPubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/RemovePresentationPubMsgHdlr.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core.apps.presentation +import org.bigbluebutton.common2.messages.Presentation.{ RemovePresentationEvtMsg, RemovePresentationEvtMsgBody, RemovePresentationPubMsg } import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages.MessageBody.RemovePresentationEvtMsgBody import org.bigbluebutton.common2.messages._ trait RemovePresentationPubMsgHdlr { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/ResizeAndMovePagePubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/ResizeAndMovePagePubMsgHdlr.scala index e7d6dba15d..05582b1fc1 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/ResizeAndMovePagePubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/ResizeAndMovePagePubMsgHdlr.scala @@ -1,9 +1,9 @@ package org.bigbluebutton.core.apps.presentation import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages.MessageBody.ResizeAndMovePageEvtMsgBody import org.bigbluebutton.common2.messages._ import org.bigbluebutton.common2.domain.PageVO +import org.bigbluebutton.common2.messages.Presentation.{ ResizeAndMovePageEvtMsg, ResizeAndMovePageEvtMsgBody, ResizeAndMovePagePubMsg } trait ResizeAndMovePagePubMsgHdlr { this: PresentationApp2x => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/SetCurrentPagePubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/SetCurrentPagePubMsgHdlr.scala index 18e683eeec..aad4bde542 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/SetCurrentPagePubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/SetCurrentPagePubMsgHdlr.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core.apps.presentation +import org.bigbluebutton.common2.messages.Presentation.{ SetCurrentPageEvtMsg, SetCurrentPageEvtMsgBody, SetCurrentPagePubMsg } import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages.MessageBody.SetCurrentPageEvtMsgBody import org.bigbluebutton.common2.messages._ trait SetCurrentPagePubMsgHdlr { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/SetCurrentPresentationPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/SetCurrentPresentationPubMsgHdlr.scala index cfdf9ecfe6..2fa50e8749 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/SetCurrentPresentationPubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/SetCurrentPresentationPubMsgHdlr.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core.apps.presentation import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages.MessageBody.SetCurrentPresentationEvtMsgBody +import org.bigbluebutton.common2.messages.Presentation.{ SetCurrentPresentationEvtMsg, SetCurrentPresentationEvtMsgBody, SetCurrentPresentationPubMsg } import org.bigbluebutton.common2.messages._ trait SetCurrentPresentationPubMsgHdlr { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/BreakoutRooms.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/BreakoutRooms.scala old mode 100644 new mode 100755 index 64b6358297..8c6fca5c64 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/BreakoutRooms.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/BreakoutRooms.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.core.models -import org.bigbluebutton.common2.messages.breakoutrooms.{ BreakoutRoomVO, BreakoutUserVO } +import org.bigbluebutton.common2.messages.BreakoutRooms.{ BreakoutRoomVO, BreakoutUserVO } object BreakoutRooms { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Polls.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Polls.scala index ce37a99e4e..0a8a4319e3 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Polls.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Polls.scala @@ -24,7 +24,7 @@ object Polls { page <- lm.presModel.getCurrentPage() pageId: String = if (pollId.contains("deskshare")) "deskshare" else page.id stampedPollId: String = pageId + "/" + System.currentTimeMillis() - numRespondents: Int = Users.numUsers(lm.users) - 1 // subtract the presenter + numRespondents: Int = Users1x.numUsers(lm.users) - 1 // subtract the presenter poll <- createPoll(stampedPollId, numRespondents) simplePoll <- getSimplePoll(poll.id, lm.polls) @@ -129,7 +129,7 @@ object Polls { page <- lm.presModel.getCurrentPage() pageId: String = if (pollId.contains("deskshare")) "deskshare" else page.id stampedPollId: String = pageId + "/" + System.currentTimeMillis() - numRespondents: Int = Users.numUsers(lm.users) - 1 // subtract the presenter + numRespondents: Int = Users1x.numUsers(lm.users) - 1 // subtract the presenter poll <- createPoll(stampedPollId, numRespondents) simplePoll <- getSimplePoll(stampedPollId, lm.polls) } yield { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users1x.scala similarity index 61% rename from akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users.scala rename to akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users1x.scala index 084dc37505..39130b37b1 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users1x.scala @@ -19,10 +19,10 @@ object Roles { val GUEST_ROLE = "GUEST" } -object Users { +object Users1x { def newUser(userId: String, lockStatus: Boolean, ru: RegisteredUser, waitingForAcceptance: Boolean, - vu: VoiceUserVO, users: Users): Option[UserVO] = { + vu: VoiceUserVO, users: Users1x): Option[UserVO] = { val uvo = new UserVO(userId, ru.externId, ru.name, ru.role, ru.guest, ru.authed, waitingForAcceptance = waitingForAcceptance, emojiStatus = "none", presenter = false, hasStream = false, locked = lockStatus, @@ -32,69 +32,69 @@ object Users { Some(uvo) } - def findWithId(id: String, users: Users): Option[UserVO] = users.toVector.find(u => u.id == id) - def findWithExtId(id: String, users: Users): Option[UserVO] = users.toVector.find(u => u.externalId == id) - def findModerators(users: Users): Vector[UserVO] = users.toVector.filter(u => u.role == Roles.MODERATOR_ROLE) - def findPresenters(users: Users): Vector[UserVO] = users.toVector.filter(u => u.role == Roles.PRESENTER_ROLE) - def findViewers(users: Users): Vector[UserVO] = users.toVector.filter(u => u.role == Roles.VIEWER_ROLE) - def hasModerator(users: Users): Boolean = users.toVector.filter(u => u.role == Roles.MODERATOR_ROLE).length > 0 - def hasPresenter(users: Users): Boolean = users.toVector.filter(u => u.role == Roles.PRESENTER_ROLE).length > 0 - def hasNoPresenter(users: Users): Boolean = users.toVector.filter(u => u.role == Roles.PRESENTER_ROLE).length == 0 + def findWithId(id: String, users: Users1x): Option[UserVO] = users.toVector.find(u => u.id == id) + def findWithExtId(id: String, users: Users1x): Option[UserVO] = users.toVector.find(u => u.externalId == id) + def findModerators(users: Users1x): Vector[UserVO] = users.toVector.filter(u => u.role == Roles.MODERATOR_ROLE) + def findPresenters(users: Users1x): Vector[UserVO] = users.toVector.filter(u => u.role == Roles.PRESENTER_ROLE) + def findViewers(users: Users1x): Vector[UserVO] = users.toVector.filter(u => u.role == Roles.VIEWER_ROLE) + def hasModerator(users: Users1x): Boolean = users.toVector.filter(u => u.role == Roles.MODERATOR_ROLE).length > 0 + def hasPresenter(users: Users1x): Boolean = users.toVector.filter(u => u.role == Roles.PRESENTER_ROLE).length > 0 + def hasNoPresenter(users: Users1x): Boolean = users.toVector.filter(u => u.role == Roles.PRESENTER_ROLE).length == 0 //def hasSessionId(sessionId: String, users: Users): Boolean = { // users.toVector.find(u => usessionId) // } - def hasUserWithId(id: String, users: Users): Boolean = { + def hasUserWithId(id: String, users: Users1x): Boolean = { findWithId(id, users) match { case Some(u) => true case None => false } } - def numUsers(users: Users): Int = users.toVector.size - def numWebUsers(users: Users): Int = users.toVector filter (u => u.phoneUser == false) size - def numUsersInVoiceConference(users: Users): Int = users.toVector filter (u => u.voiceUser.joined) size - def getUserWithExternalId(id: String, users: Users): Option[UserVO] = users.toVector find (u => u.externalId == id) - def getUserWithVoiceUserId(voiceUserId: String, users: Users): Option[UserVO] = users.toVector find (u => u.voiceUser.userId == voiceUserId) - def getUser(userID: String, users: Users): Option[UserVO] = users.toVector find (u => u.id == userID) - def numModerators(users: Users): Int = findModerators(users).length - def findAModerator(users: Users): Option[UserVO] = users.toVector find (u => u.role == Roles.MODERATOR_ROLE) - def getCurrentPresenter(users: Users): Option[UserVO] = users.toVector find (u => u.presenter == true) + def numUsers(users: Users1x): Int = users.toVector.size + def numWebUsers(users: Users1x): Int = users.toVector filter (u => u.phoneUser == false) size + def numUsersInVoiceConference(users: Users1x): Int = users.toVector filter (u => u.voiceUser.joined) size + def getUserWithExternalId(id: String, users: Users1x): Option[UserVO] = users.toVector find (u => u.externalId == id) + def getUserWithVoiceUserId(voiceUserId: String, users: Users1x): Option[UserVO] = users.toVector find (u => u.voiceUser.userId == voiceUserId) + def getUser(userID: String, users: Users1x): Option[UserVO] = users.toVector find (u => u.id == userID) + def numModerators(users: Users1x): Int = findModerators(users).length + def findAModerator(users: Users1x): Option[UserVO] = users.toVector find (u => u.role == Roles.MODERATOR_ROLE) + def getCurrentPresenter(users: Users1x): Option[UserVO] = users.toVector find (u => u.presenter == true) - def getUsers(users: Users): Vector[UserVO] = users.toVector + def getUsers(users: Users1x): Vector[UserVO] = users.toVector - def userLeft(userId: String, users: Users): Option[UserVO] = { + def userLeft(userId: String, users: Users1x): Option[UserVO] = { users.remove(userId) } - def unbecomePresenter(userID: String, users: Users) = { + def unbecomePresenter(userID: String, users: Users1x) = { for { - u <- Users.findWithId(userID, users) + u <- Users1x.findWithId(userID, users) user = modify(u)(_.presenter).setTo(false) } yield users.save(user) } - def becomePresenter(userID: String, users: Users) = { + def becomePresenter(userID: String, users: Users1x) = { for { - u <- Users.findWithId(userID, users) + u <- Users1x.findWithId(userID, users) user = modify(u)(_.presenter).setTo(true) } yield users.save(user) } - def isModerator(id: String, users: Users): Boolean = { - Users.findWithId(id, users) match { + def isModerator(id: String, users: Users1x): Boolean = { + Users1x.findWithId(id, users) match { case Some(user) => return user.role == Roles.MODERATOR_ROLE && !user.waitingForAcceptance case None => return false } } - def generateWebUserId(users: Users): String = { + def generateWebUserId(users: Users1x): String = { val webUserId = RandomStringGenerator.randomAlphanumericString(6) if (!hasUserWithId(webUserId, users)) webUserId else generateWebUserId(users) } - def usersWhoAreNotPresenter(users: Users): Vector[UserVO] = users.toVector filter (u => u.presenter == false) + def usersWhoAreNotPresenter(users: Users1x): Vector[UserVO] = users.toVector filter (u => u.presenter == false) - def joinedVoiceListenOnly(userId: String, users: Users): Option[UserVO] = { + def joinedVoiceListenOnly(userId: String, users: Users1x): Option[UserVO] = { for { - u <- Users.findWithId(userId, users) + u <- Users1x.findWithId(userId, users) vu = u.modify(_.voiceUser.joined).setTo(false) .modify(_.voiceUser.talking).setTo(false) .modify(_.listenOnly).setTo(true) @@ -104,9 +104,9 @@ object Users { } } - def leftVoiceListenOnly(userId: String, users: Users): Option[UserVO] = { + def leftVoiceListenOnly(userId: String, users: Users1x): Option[UserVO] = { for { - u <- Users.findWithId(userId, users) + u <- Users1x.findWithId(userId, users) vu = u.modify(_.voiceUser.joined).setTo(false) .modify(_.voiceUser.talking).setTo(false) .modify(_.listenOnly).setTo(false) @@ -116,7 +116,7 @@ object Users { } } - def lockUser(userId: String, lock: Boolean, users: Users): Option[UserVO] = { + def lockUser(userId: String, lock: Boolean, users: Users1x): Option[UserVO] = { for { u <- findWithId(userId, users) uvo = u.modify(_.locked).setTo(lock) // u.copy(locked = msg.lock) @@ -126,7 +126,7 @@ object Users { } } - def changeRole(userId: String, users: Users, role: String): Option[UserVO] = { + def changeRole(userId: String, users: Users1x, role: String): Option[UserVO] = { for { u <- findWithId(userId, users) uvo = u.modify(_.role).setTo(role) @@ -136,7 +136,7 @@ object Users { } } - def userSharedWebcam(userId: String, users: Users, streamId: String): Option[UserVO] = { + def userSharedWebcam(userId: String, users: Users1x, streamId: String): Option[UserVO] = { for { u <- findWithId(userId, users) streams = u.webcamStreams + streamId @@ -147,7 +147,7 @@ object Users { } } - def userUnsharedWebcam(userId: String, users: Users, streamId: String): Option[UserVO] = { + def userUnsharedWebcam(userId: String, users: Users1x, streamId: String): Option[UserVO] = { def findWebcamStream(streams: Set[String], stream: String): Option[String] = { streams find (w => w == stream) @@ -164,7 +164,7 @@ object Users { } } - def setEmojiStatus(userId: String, users: Users, emoji: String): Option[UserVO] = { + def setEmojiStatus(userId: String, users: Users1x, emoji: String): Option[UserVO] = { for { u <- findWithId(userId, users) uvo = u.modify(_.emojiStatus).setTo(emoji) @@ -174,26 +174,26 @@ object Users { } } - def setWaitingForAcceptance(user: UserVO, users: Users, waitingForAcceptance: Boolean): UserVO = { + def setWaitingForAcceptance(user: UserVO, users: Users1x, waitingForAcceptance: Boolean): UserVO = { val nu = user.modify(_.waitingForAcceptance).setTo(waitingForAcceptance) users.save(nu) nu } - def setUserTalking(user: UserVO, users: Users, talking: Boolean): UserVO = { + def setUserTalking(user: UserVO, users: Users1x, talking: Boolean): UserVO = { val nv = user.modify(_.voiceUser.talking).setTo(talking) users.save(nv) nv } - def setUserMuted(user: UserVO, users: Users, muted: Boolean): UserVO = { + def setUserMuted(user: UserVO, users: Users1x, muted: Boolean): UserVO = { val talking: Boolean = if (muted) false else user.voiceUser.talking val nv = user.modify(_.voiceUser.muted).setTo(muted).modify(_.voiceUser.talking).setTo(talking) users.save(nv) nv } - def resetVoiceUser(user: UserVO, users: Users): UserVO = { + def resetVoiceUser(user: UserVO, users: Users1x): UserVO = { val vu = new VoiceUserVO(user.id, user.id, user.name, user.name, joined = false, locked = false, muted = false, talking = false, user.avatarURL, listenOnly = false) @@ -204,7 +204,7 @@ object Users { nu } - def switchUserToPhoneUser(user: UserVO, users: Users, voiceUserId: String, userId: String, + def switchUserToPhoneUser(user: UserVO, users: Users1x, voiceUserId: String, userId: String, callerIdName: String, callerIdNum: String, muted: Boolean, talking: Boolean, avatarURL: String, listenOnly: Boolean): UserVO = { val vu = new VoiceUserVO(voiceUserId, userId, callerIdName, @@ -216,7 +216,7 @@ object Users { nu } - def restoreMuteState(user: UserVO, users: Users, voiceUserId: String, userId: String, + def restoreMuteState(user: UserVO, users: Users1x, voiceUserId: String, userId: String, callerIdName: String, callerIdNum: String, muted: Boolean, talking: Boolean, avatarURL: String, listenOnly: Boolean): UserVO = { val vu = new VoiceUserVO(voiceUserId, userId, callerIdName, @@ -228,7 +228,7 @@ object Users { nu } - def makeUserPhoneUser(vu: VoiceUserVO, users: Users, webUserId: String, externUserId: String, + def makeUserPhoneUser(vu: VoiceUserVO, users: Users1x, webUserId: String, externUserId: String, callerIdName: String, lockStatus: Boolean, listenOnly: Boolean, avatarURL: String): UserVO = { val uvo = new UserVO(webUserId, externUserId, callerIdName, Roles.VIEWER_ROLE, guest = false, authed = false, waitingForAcceptance = false, emojiStatus = "none", presenter = false, @@ -242,7 +242,7 @@ object Users { } -class Users { +class Users1x { private var users: collection.immutable.HashMap[String, UserVO] = new collection.immutable.HashMap[String, UserVO] private def toVector: Vector[UserVO] = users.values.toVector diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala index 06d0205a39..38948f7055 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala @@ -3,13 +3,15 @@ package org.bigbluebutton.core.pubsub.senders import akka.actor.{ Actor, ActorLogging, Props } import org.bigbluebutton.SystemConfiguration import com.fasterxml.jackson.databind.JsonNode +import org.bigbluebutton.common2.messages.BreakoutRooms._ +import org.bigbluebutton.common2.messages.Layout.{ BroadcastLayoutMsg, GetCurrentLayoutMsg, LockLayoutMsg } +import org.bigbluebutton.common2.messages.Polls._ +import org.bigbluebutton.common2.messages.Presentation._ +import org.bigbluebutton.common2.messages.Users.{ RegisterUserReqMsg, UserJoinMeetingReqMsg, UserLeaveReqMsg, ValidateAuthTokenReqMsg } +import org.bigbluebutton.common2.messages.VoiceConf._ +import org.bigbluebutton.common2.messages.Webcams.{ UserBroadcastCamStartMsg, UserBroadcastCamStopMsg } +import org.bigbluebutton.common2.messages.Whiteboard._ import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.breakoutrooms._ -import org.bigbluebutton.common2.messages.polls._ -import org.bigbluebutton.common2.messages.users._ -import org.bigbluebutton.common2.messages.layout._ -import org.bigbluebutton.common2.messages.voiceconf._ -import org.bigbluebutton.common2.messages.whiteboard._ import org.bigbluebutton.core.bus._ import org.bigbluebutton.core2.ReceivedMessageRouter diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/LiveMeeting.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/LiveMeeting.scala index 7cb52eeb3a..6e980ea7ee 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/LiveMeeting.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/LiveMeeting.scala @@ -13,7 +13,7 @@ class LiveMeeting(val props: DefaultProps, val chatModel: ChatModel, val layoutModel: LayoutModel, val layouts: Layouts, - val users: Users, + val users: Users1x, val registeredUsers: RegisteredUsers, val polls: Polls, // 2x val pollModel: PollModel, // 1.1x @@ -33,13 +33,13 @@ class LiveMeeting(val props: DefaultProps, } def webUserJoined() { - if (Users.numWebUsers(users) > 0) { + if (Users1x.numWebUsers(users) > 0) { MeetingStatus2x.resetLastWebUserLeftOn(status) } } def startCheckingIfWeNeedToEndVoiceConf() { - if (Users.numWebUsers(users) == 0 && !props.meetingProp.isBreakout) { + if (Users1x.numWebUsers(users) == 0 && !props.meetingProp.isBreakout) { MeetingStatus2x.lastWebUserLeft(status) } } diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala index 77653089c6..cd4da5a376 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala @@ -6,13 +6,15 @@ import akka.actor._ import akka.actor.ActorLogging import akka.actor.SupervisorStrategy.Resume import org.bigbluebutton.common2.domain.DefaultProps +import org.bigbluebutton.common2.messages.BreakoutRooms._ +import org.bigbluebutton.common2.messages.Layout.{ BroadcastLayoutMsg, GetCurrentLayoutMsg, LockLayoutMsg } +import org.bigbluebutton.common2.messages.Polls._ +import org.bigbluebutton.common2.messages.Presentation._ +import org.bigbluebutton.common2.messages.Users.{ RegisterUserReqMsg, UserJoinMeetingReqMsg, UserLeaveReqMsg, ValidateAuthTokenReqMsg } +import org.bigbluebutton.common2.messages.VoiceConf.{ UserJoinedVoiceConfEvtMsg, UserLeftVoiceConfEvtMsg, UserMutedInVoiceConfEvtMsg, UserTalkingInVoiceConfEvtMsg } +import org.bigbluebutton.common2.messages.Webcams.{ UserBroadcastCamStartMsg, UserBroadcastCamStopMsg } +import org.bigbluebutton.common2.messages.Whiteboard._ import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.breakoutrooms._ -import org.bigbluebutton.common2.messages.polls._ -import org.bigbluebutton.common2.messages.users._ -import org.bigbluebutton.common2.messages.voiceconf.{ UserJoinedVoiceConfEvtMsg, UserLeftVoiceConfEvtMsg, UserMutedInVoiceConfEvtMsg, UserTalkingInVoiceConfEvtMsg } -import org.bigbluebutton.common2.messages.whiteboard._ -import org.bigbluebutton.common2.messages.layout._ import org.bigbluebutton.core._ import org.bigbluebutton.core.api._ import org.bigbluebutton.core.apps._ @@ -21,7 +23,7 @@ import org.bigbluebutton.core.apps.presentation.PresentationApp2x import org.bigbluebutton.core.apps.presentation.poll.PollApp2x import org.bigbluebutton.core.apps.users.UsersApp2x import org.bigbluebutton.core.bus._ -import org.bigbluebutton.core.models.{ RegisteredUsers, Users } +import org.bigbluebutton.core.models.{ RegisteredUsers, Users1x } import org.bigbluebutton.core2.MeetingStatus2x import org.bigbluebutton.core2.message.handlers._ import org.bigbluebutton.core2.message.handlers.users._ @@ -323,7 +325,7 @@ class MeetingActor(val props: DefaultProps, } def handleLogoutEndMeeting(msg: LogoutEndMeeting) { - if (Users.isModerator(msg.userID, liveMeeting.users)) { + if (Users1x.isModerator(msg.userID, liveMeeting.users)) { handleEndMeeting(EndMeeting(props.meetingProp.intId)) } } @@ -343,7 +345,7 @@ class MeetingActor(val props: DefaultProps, } def handleAllowUserToShareDesktop(msg: AllowUserToShareDesktop): Unit = { - Users.getCurrentPresenter(liveMeeting.users) match { + Users1x.getCurrentPresenter(liveMeeting.users) match { case Some(curPres) => { val allowed = msg.userID equals (curPres.id) outGW.send(AllowUserToShareDesktopOut(msg.meetingID, msg.userID, allowed)) @@ -434,7 +436,7 @@ class MeetingActor(val props: DefaultProps, } def monitorNumberOfWebUsers() { - if (Users.numWebUsers(liveMeeting.users) == 0 && + if (Users1x.numWebUsers(liveMeeting.users) == 0 && MeetingStatus2x.lastWebUserLeftOn(liveMeeting.status) > 0) { if (liveMeeting.timeNowInMinutes - MeetingStatus2x.lastWebUserLeftOn(liveMeeting.status) > 2) { log.info("Empty meeting. Ejecting all users from voice. meetingId={}", props.meetingProp.intId) @@ -444,7 +446,7 @@ class MeetingActor(val props: DefaultProps, } def monitorNumberOfUsers() { - val hasUsers = Users.numUsers(liveMeeting.users) != 0 + val hasUsers = Users1x.numUsers(liveMeeting.users) != 0 // TODO: We could use a better control over this message to send it just when it really matters :) eventBus.publish(BigBlueButtonEvent(props.meetingProp.intId, UpdateMeetingExpireMonitor(props.meetingProp.intId, hasUsers))) } @@ -477,7 +479,7 @@ class MeetingActor(val props: DefaultProps, def startRecordingIfAutoStart() { if (props.recordProp.record && !MeetingStatus2x.isRecording(liveMeeting.status) && - props.recordProp.autoStartRecording && Users.numWebUsers(liveMeeting.users) == 1) { + props.recordProp.autoStartRecording && Users1x.numWebUsers(liveMeeting.users) == 1) { log.info("Auto start recording. meetingId={}", props.meetingProp.intId) MeetingStatus2x.recordingStarted(liveMeeting.status) outGW.send(new RecordingStatusChanged(props.meetingProp.intId, props.recordProp.record, @@ -487,7 +489,7 @@ class MeetingActor(val props: DefaultProps, def stopAutoStartedRecording() { if (props.recordProp.record && MeetingStatus2x.isRecording(liveMeeting.status) && - props.recordProp.autoStartRecording && Users.numWebUsers(liveMeeting.users) == 0) { + props.recordProp.autoStartRecording && Users1x.numWebUsers(liveMeeting.users) == 0) { log.info("Last web user left. Auto stopping recording. meetingId={}", props.meetingProp.intId) MeetingStatus2x.recordingStopped(liveMeeting.status) outGW.send(new RecordingStatusChanged(props.meetingProp.intId, props.recordProp.record, diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala index 0b2ab1e20c..e9ec494a25 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala @@ -26,7 +26,7 @@ class RunningMeeting(val props: DefaultProps, val outGW: OutMessageGateway, val breakoutRooms = new BreakoutRooms() val captionModel = new CaptionModel() val notesModel = new SharedNotesModel() - val users = new Users + val users = new Users1x val registeredUsers = new RegisteredUsers val meetingStatux2x = new MeetingStatus2x val webcams = new Webcams diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/EjectUserFromVoiceRequestHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/EjectUserFromVoiceRequestHdlr.scala index 036bd14df9..58ac101f49 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/EjectUserFromVoiceRequestHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/EjectUserFromVoiceRequestHdlr.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.core2.message.handlers import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api.{ EjectUserFromVoiceRequest, EjectVoiceUser } -import org.bigbluebutton.core.models.Users +import org.bigbluebutton.core.models.Users1x import org.bigbluebutton.core.running.MeetingActor trait EjectUserFromVoiceRequestHdlr { @@ -14,7 +14,7 @@ trait EjectUserFromVoiceRequestHdlr { log.info("Received eject user request. meetingId=" + msg.meetingID + " userId=" + msg.userId) for { - u <- Users.findWithId(msg.userId, liveMeeting.users) + u <- Users1x.findWithId(msg.userId, liveMeeting.users) } yield { if (u.voiceUser.joined) { log.info("Ejecting user from voice. meetingId=" + props.meetingProp.intId + " userId=" + u.id) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/GetCurrentPollReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/GetCurrentPollReqMsgHdlr.scala index 03c60d25c2..d5542ac119 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/GetCurrentPollReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/GetCurrentPollReqMsgHdlr.scala @@ -5,7 +5,7 @@ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Polls import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.common2.domain.PollVO -import org.bigbluebutton.common2.messages.polls.{ GetCurrentPollReqMsg, GetCurrentPollRespMsg, GetCurrentPollRespMsgBody } +import org.bigbluebutton.common2.messages.Polls.{ GetCurrentPollReqMsg, GetCurrentPollRespMsg, GetCurrentPollRespMsgBody } trait GetCurrentPollReqMsgHdlr { this: MeetingActor => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/HidePollResultReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/HidePollResultReqMsgHdlr.scala index f0954f47cb..da2ab6c35e 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/HidePollResultReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/HidePollResultReqMsgHdlr.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core2.message.handlers +import org.bigbluebutton.common2.messages.Polls.{ HidePollResultReqMsg, PollHideResultEvtMsg, PollHideResultEvtMsgBody } import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.polls.{ HidePollResultReqMsg, PollHideResultEvtMsg, PollHideResultEvtMsgBody } import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Polls import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/MuteAllExceptPresenterRequestHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/MuteAllExceptPresenterRequestHdlr.scala index 80e4cd2853..2ef47ef2fa 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/MuteAllExceptPresenterRequestHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/MuteAllExceptPresenterRequestHdlr.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core2.message.handlers +import org.bigbluebutton.common2.messages.VoiceConf.{ MuteUserInVoiceConfMsg, MuteUserInVoiceConfMsgBody } import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.voiceconf.{ MuteUserInVoiceConfMsg, MuteUserInVoiceConfMsgBody } import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api.{ MeetingMuted, MuteAllExceptPresenterRequest, MuteVoiceUser } import org.bigbluebutton.core.models.{ Users2x, VoiceUserState, VoiceUsers } diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/MuteMeetingRequestHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/MuteMeetingRequestHdlr.scala index 6e8fed719a..bb83ca5cdc 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/MuteMeetingRequestHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/MuteMeetingRequestHdlr.scala @@ -1,10 +1,10 @@ package org.bigbluebutton.core2.message.handlers +import org.bigbluebutton.common2.messages.VoiceConf.{ MuteUserInVoiceConfMsg, MuteUserInVoiceConfMsgBody } import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.voiceconf.{ MuteUserInVoiceConfMsg, MuteUserInVoiceConfMsgBody } import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api.{ MeetingMuted, MuteMeetingRequest, MuteVoiceUser } -import org.bigbluebutton.core.models.{ Users, VoiceUserState, VoiceUsers } +import org.bigbluebutton.core.models.{ Users1x, VoiceUserState, VoiceUsers } import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core2.MeetingStatus2x @@ -23,7 +23,7 @@ trait MuteMeetingRequestHdlr { outGW.send(new MeetingMuted(props.meetingProp.intId, props.recordProp.record, MeetingStatus2x.isMeetingMuted(liveMeeting.status))) - Users.getUsers(liveMeeting.users) foreach { u => + Users1x.getUsers(liveMeeting.users) foreach { u => outGW.send(new MuteVoiceUser(props.meetingProp.intId, props.recordProp.record, msg.requesterID, u.id, props.voiceProp.voiceConf, u.voiceUser.userId, msg.mute)) } diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/RespondToPollReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/RespondToPollReqMsgHdlr.scala index 6a5e71715b..5c4667e5b4 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/RespondToPollReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/RespondToPollReqMsgHdlr.scala @@ -1,8 +1,8 @@ package org.bigbluebutton.core2.message.handlers import org.bigbluebutton.common2.domain.SimplePollResultOutVO +import org.bigbluebutton.common2.messages.Polls.{ RespondToPollReqMsg, UserRespondedToPollEvtMsg, UserRespondedToPollEvtMsgBody } import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.polls.{ RespondToPollReqMsg, UserRespondedToPollEvtMsg, UserRespondedToPollEvtMsgBody } import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Polls import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/SetLockSettingsHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/SetLockSettingsHdlr.scala index ee3044eb93..8d0e9c2489 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/SetLockSettingsHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/SetLockSettingsHdlr.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.core2.message.handlers import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api.{ NewPermissionsSetting, SetLockSettings } -import org.bigbluebutton.core.models.Users +import org.bigbluebutton.core.models.Users1x import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core2.MeetingStatus2x diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/ShowPollResultReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/ShowPollResultReqMsgHdlr.scala index 80028b198c..bac0fbd63d 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/ShowPollResultReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/ShowPollResultReqMsgHdlr.scala @@ -5,8 +5,8 @@ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Polls import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.common2.domain.{ AnnotationVO, SimplePollResultOutVO } -import org.bigbluebutton.common2.messages.polls.{ PollShowResultEvtMsg, PollShowResultEvtMsgBody, ShowPollResultReqMsg } -import org.bigbluebutton.common2.messages.whiteboard.{ SendWhiteboardAnnotationEvtMsg, SendWhiteboardAnnotationEvtMsgBody } +import org.bigbluebutton.common2.messages.Polls.{ PollShowResultEvtMsg, PollShowResultEvtMsgBody, ShowPollResultReqMsg } +import org.bigbluebutton.common2.messages.Whiteboard.{ SendWhiteboardAnnotationEvtMsg, SendWhiteboardAnnotationEvtMsgBody } trait ShowPollResultReqMsgHdlr { this: MeetingActor => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/StartCustomPollReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/StartCustomPollReqMsgHdlr.scala index 2757371e0d..c37975efe5 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/StartCustomPollReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/StartCustomPollReqMsgHdlr.scala @@ -1,8 +1,8 @@ package org.bigbluebutton.core2.message.handlers import org.bigbluebutton.common2.domain.SimplePollOutVO +import org.bigbluebutton.common2.messages.Polls.{ PollStartedEvtMsg, PollStartedEvtMsgBody, StartCustomPollReqMsg } import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.polls.{ PollStartedEvtMsg, PollStartedEvtMsgBody, StartCustomPollReqMsg } import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Polls import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/StartPollReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/StartPollReqMsgHdlr.scala index bee11876f8..a1933a661c 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/StartPollReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/StartPollReqMsgHdlr.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.core2.message.handlers import org.bigbluebutton.common2.messages._ import org.bigbluebutton.common2.domain.SimplePollOutVO -import org.bigbluebutton.common2.messages.polls.{ PollStartedEvtMsg, PollStartedEvtMsgBody, StartPollReqMsg } +import org.bigbluebutton.common2.messages.Polls.{ PollStartedEvtMsg, PollStartedEvtMsgBody, StartPollReqMsg } import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Polls import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/StopPollReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/StopPollReqMsgHdlr.scala index c0a84b234c..1713744986 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/StopPollReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/StopPollReqMsgHdlr.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core2.message.handlers +import org.bigbluebutton.common2.messages.Polls.{ PollStoppedEvtMsg, PollStoppedEvtMsgBody, StopPollReqMsg } import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.polls.{ PollStoppedEvtMsg, PollStoppedEvtMsgBody, StopPollReqMsg } import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Polls import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomCreatedMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomCreatedMsgHdlr.scala old mode 100644 new mode 100755 index bf258104fc..bcb48d713b --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomCreatedMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomCreatedMsgHdlr.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core2.message.handlers.breakoutrooms import org.bigbluebutton.common2.messages.BbbClientMsgHeader -import org.bigbluebutton.common2.messages.breakoutrooms._ +import org.bigbluebutton.common2.messages.BreakoutRooms.{ BreakoutRoomCreatedMsg, BreakoutRoomsListMsg, BreakoutRoomsListMsgBody } import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.BreakoutRooms import org.bigbluebutton.core.running.MeetingActor @@ -31,7 +31,8 @@ trait BreakoutRoomCreatedMsgHdlr { } } - handleBreakoutRoomsListMsg(new BreakoutRoomsListMsg(new BbbClientMsgHeader(BreakoutRoomsListMsg.NAME, msg.header.meetingId, msg.header.userId), new BreakoutRoomsListMsgBody(props.meetingProp.intId))) + handleBreakoutRoomsListMsg(new BreakoutRoomsListMsg(new BbbClientMsgHeader(BreakoutRoomsListMsg.NAME, + msg.header.meetingId, msg.header.userId), new BreakoutRoomsListMsgBody(props.meetingProp.intId))) } } } \ No newline at end of file diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomEndedMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomEndedMsgHdlr.scala old mode 100644 new mode 100755 index 15549a1326..18786a4bb9 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomEndedMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomEndedMsgHdlr.scala @@ -1,9 +1,9 @@ package org.bigbluebutton.core2.message.handlers.breakoutrooms +import org.bigbluebutton.common2.messages.BreakoutRooms.{ BreakoutRoomEndedEvtMsg, BreakoutRoomEndedEvtMsgBody, BreakoutRoomEndedMsg } import org.bigbluebutton.common2.messages._ import org.bigbluebutton.common2.messages.MessageTypes import org.bigbluebutton.common2.messages.Routing -import org.bigbluebutton.common2.messages.breakoutrooms._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.BreakoutRooms import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomUsersUpdateMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomUsersUpdateMsgHdlr.scala old mode 100644 new mode 100755 index e250b7b811..bca23e83de --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomUsersUpdateMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomUsersUpdateMsgHdlr.scala @@ -1,9 +1,9 @@ package org.bigbluebutton.core2.message.handlers.breakoutrooms +import org.bigbluebutton.common2.messages.BreakoutRooms.{ BreakoutRoomUsersUpdateMsg, UpdateBreakoutUsersEvtMsg, UpdateBreakoutUsersEvtMsgBody } import org.bigbluebutton.common2.messages._ import org.bigbluebutton.common2.messages.MessageTypes import org.bigbluebutton.common2.messages.Routing -import org.bigbluebutton.common2.messages.breakoutrooms._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.BreakoutRooms import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomsListMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomsListMsgHdlr.scala old mode 100644 new mode 100755 index 2106deac25..d5fdb5f477 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomsListMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomsListMsgHdlr.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core2.message.handlers.breakoutrooms +import org.bigbluebutton.common2.messages.BreakoutRooms.{ BreakoutRoomInfo, BreakoutRoomsListEvtMsg, BreakoutRoomsListEvtMsgBody, BreakoutRoomsListMsg } import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.breakoutrooms._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core.models.BreakoutRooms diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/CreateBreakoutRoomsMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/CreateBreakoutRoomsMsgHdlr.scala old mode 100644 new mode 100755 index 6234a69a43..347db42b74 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/CreateBreakoutRoomsMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/CreateBreakoutRoomsMsgHdlr.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.core2.message.handlers.breakoutrooms -import org.bigbluebutton.common2.messages.breakoutrooms.CreateBreakoutRoomsMsg +import org.bigbluebutton.common2.messages.BreakoutRooms.CreateBreakoutRoomsMsg import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api.BreakoutRoomOutPayload import org.bigbluebutton.core.api.CreateBreakoutRoom diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/EndAllBreakoutRoomsMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/EndAllBreakoutRoomsMsgHdlr.scala old mode 100644 new mode 100755 index e6475b2c73..06590ee1d9 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/EndAllBreakoutRoomsMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/EndAllBreakoutRoomsMsgHdlr.scala @@ -1,12 +1,12 @@ package org.bigbluebutton.core2.message.handlers.breakoutrooms +import org.bigbluebutton.common2.messages.BreakoutRooms.{ EndAllBreakoutRoomsMsg, EndBreakoutRoomEvtMsg, EndBreakoutRoomEvtMsgBody } import org.bigbluebutton.common2.messages._ import org.bigbluebutton.common2.messages.MessageTypes import org.bigbluebutton.common2.messages.Routing import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.BreakoutRooms import org.bigbluebutton.core.running.MeetingActor -import org.bigbluebutton.common2.messages.breakoutrooms._ trait EndAllBreakoutRoomsMsgHdlr { this: MeetingActor => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/RequestBreakoutJoinURLMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/RequestBreakoutJoinURLMsgHdlr.scala old mode 100644 new mode 100755 index b313e95b51..e7a0652954 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/RequestBreakoutJoinURLMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/RequestBreakoutJoinURLMsgHdlr.scala @@ -1,12 +1,12 @@ package org.bigbluebutton.core2.message.handlers.breakoutrooms -import org.bigbluebutton.core.models.Users +import org.bigbluebutton.common2.messages.BreakoutRooms.{ BreakoutRoomJoinURLEvtMsg, BreakoutRoomJoinURLEvtMsgBody, RequestBreakoutJoinURLMsg } +import org.bigbluebutton.core.models.Users1x import org.bigbluebutton.core.models.BreakoutRooms import org.bigbluebutton.common2.messages._ import org.bigbluebutton.core.apps.BreakoutRoomsUtil import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.running.MeetingActor -import org.bigbluebutton.common2.messages.breakoutrooms._ trait RequestBreakoutJoinURLMsgHdlr { this: MeetingActor => @@ -24,7 +24,7 @@ trait RequestBreakoutJoinURLMsgHdlr { def sendJoinURL(userId: String, externalMeetingId: String, roomSequence: String) { log.debug("Sending breakout meeting {} Join URL for user: {}", externalMeetingId, userId) for { - user <- Users.findWithId(userId, liveMeeting.users) + user <- Users1x.findWithId(userId, liveMeeting.users) apiCall = "join" params = BreakoutRoomsUtil.joinParams(user.name, userId + "-" + roomSequence, true, externalMeetingId, props.password.moderatorPass) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/SendBreakoutUsersUpdateMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/SendBreakoutUsersUpdateMsgHdlr.scala old mode 100644 new mode 100755 index a5711931f5..ed176fcfad --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/SendBreakoutUsersUpdateMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/SendBreakoutUsersUpdateMsgHdlr.scala @@ -1,11 +1,10 @@ package org.bigbluebutton.core2.message.handlers.breakoutrooms -import org.bigbluebutton.common2.messages.breakoutrooms.BreakoutUserVO -import org.bigbluebutton.common2.messages.breakoutrooms.SendBreakoutUsersUpdateMsg +import org.bigbluebutton.common2.messages.BreakoutRooms.{ BreakoutUserVO, SendBreakoutUsersUpdateMsg } import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api.BreakoutRoomUsersUpdate import org.bigbluebutton.core.bus.BigBlueButtonEvent -import org.bigbluebutton.core.models.Users +import org.bigbluebutton.core.models.Users1x import org.bigbluebutton.core.running.MeetingActor trait SendBreakoutUsersUpdateMsgHdlr { @@ -15,7 +14,7 @@ trait SendBreakoutUsersUpdateMsgHdlr { def handleSendBreakoutUsersUpdateMsg(msg: SendBreakoutUsersUpdateMsg): Unit = { - val users = Users.getUsers(liveMeeting.users) + val users = Users1x.getUsers(liveMeeting.users) val breakoutUsers = users map { u => new BreakoutUserVO(u.externalId, u.name) } eventBus.publish(BigBlueButtonEvent(props.breakoutProps.parentId, new BreakoutRoomUsersUpdate(props.breakoutProps.parentId, props.meetingProp.intId, breakoutUsers))) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/TransferUserToMeetingRequestHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/TransferUserToMeetingRequestHdlr.scala old mode 100644 new mode 100755 index 04be1d5501..b5219dd746 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/TransferUserToMeetingRequestHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/TransferUserToMeetingRequestHdlr.scala @@ -1,10 +1,10 @@ package org.bigbluebutton.core2.message.handlers.breakoutrooms +import org.bigbluebutton.common2.messages.BreakoutRooms.{ TransferUserToMeetingEvtMsg, TransferUserToMeetingEvtMsgBody, TransferUserToMeetingRequestMsg } import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.breakoutrooms._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.BreakoutRooms -import org.bigbluebutton.core.models.Users +import org.bigbluebutton.core.models.Users1x import org.bigbluebutton.core.running.MeetingActor trait TransferUserToMeetingRequestHdlr { @@ -29,7 +29,7 @@ trait TransferUserToMeetingRequestHdlr { targetVoiceBridge = props.voiceProp.voiceConf.dropRight(1) } // We check the user from the mode - Users.findWithId(msg.body.userId, liveMeeting.users) match { + Users1x.findWithId(msg.body.userId, liveMeeting.users) match { case Some(u) => { if (u.voiceUser.joined) { log.info("Transferring user userId=" + u.id + " from voiceBridge=" + props.voiceProp.voiceConf + " to targetVoiceConf=" + targetVoiceBridge) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/BroadcastLayoutMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/BroadcastLayoutMsgHdlr.scala old mode 100644 new mode 100755 index e57d77f5b9..eed124d3fb --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/BroadcastLayoutMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/BroadcastLayoutMsgHdlr.scala @@ -1,8 +1,8 @@ package org.bigbluebutton.core2.message.handlers.layout +import org.bigbluebutton.common2.messages.Layout.{ BroadcastLayoutEvtMsg, BroadcastLayoutEvtMsgBody, BroadcastLayoutMsg } import org.bigbluebutton.common2.messages._ import org.bigbluebutton.common2.messages.Routing -import org.bigbluebutton.common2.messages.layout._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Layouts import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/GetCurrentLayoutMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/GetCurrentLayoutMsgHdlr.scala old mode 100644 new mode 100755 index b1db135eac..f0b680bc0f --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/GetCurrentLayoutMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/GetCurrentLayoutMsgHdlr.scala @@ -2,15 +2,14 @@ package org.bigbluebutton.core2.message.handlers.layout import org.bigbluebutton.common2.messages.Routing import org.bigbluebutton.common2.messages.MessageTypes -import org.bigbluebutton.common2.messages.layout._ import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.common2.messages.BbbCommonEnvCoreMsg import org.bigbluebutton.core2.MeetingStatus2x -import org.bigbluebutton.common2.messages.layout.GetCurrentLayoutMsg import org.bigbluebutton.common2.messages.BbbClientMsgHeader import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Layouts import org.bigbluebutton.common2.messages.BbbCoreEnvelope +import org.bigbluebutton.common2.messages.Layout.{ GetCurrentLayoutEvtMsg, GetCurrentLayoutEvtMsgBody, GetCurrentLayoutMsg } trait GetCurrentLayoutMsgHdlr { this: MeetingActor => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/LockLayoutMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/LockLayoutMsgHdlr.scala old mode 100644 new mode 100755 index 5ba9f3b6f1..78c10d3c47 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/LockLayoutMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/LockLayoutMsgHdlr.scala @@ -1,8 +1,8 @@ package org.bigbluebutton.core2.message.handlers.layout +import org.bigbluebutton.common2.messages.Layout._ import org.bigbluebutton.common2.messages._ import org.bigbluebutton.common2.messages.Routing -import org.bigbluebutton.common2.messages.layout._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Layouts import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/GetLockSettingsHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/GetLockSettingsHdlr.scala index e9837ecfee..dcd8f429b9 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/GetLockSettingsHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/GetLockSettingsHdlr.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.core2.message.handlers.users import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api.{ GetLockSettings, NewPermissionsSetting } -import org.bigbluebutton.core.models.Users +import org.bigbluebutton.core.models.Users1x import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core2.MeetingStatus2x diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/InitLockSettingsHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/InitLockSettingsHdlr.scala index 297ab71e90..85d05f9b4a 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/InitLockSettingsHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/InitLockSettingsHdlr.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.core2.message.handlers.users import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api.{ InitLockSettings, PermissionsSettingInitialized } -import org.bigbluebutton.core.models.Users +import org.bigbluebutton.core.models.Users1x import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core2.MeetingStatus2x diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/LockUserRequestHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/LockUserRequestHdlr.scala index 3ad485b923..0d1f01dbf0 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/LockUserRequestHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/LockUserRequestHdlr.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.core2.message.handlers.users import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api.{ LockUserRequest, UserLocked } -import org.bigbluebutton.core.models.Users +import org.bigbluebutton.core.models.Users1x import org.bigbluebutton.core.running.MeetingActor trait LockUserRequestHdlr { @@ -12,7 +12,7 @@ trait LockUserRequestHdlr { def handleLockUserRequest(msg: LockUserRequest) { for { - uvo <- Users.lockUser(msg.userID, msg.lock, liveMeeting.users) + uvo <- Users1x.lockUser(msg.userID, msg.lock, liveMeeting.users) } yield { log.info("Lock user. meetingId=" + props.meetingProp.intId + " userId=" + uvo.id + " locked=" + uvo.locked) outGW.send(new UserLocked(props.meetingProp.intId, uvo.id, uvo.locked)) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/MuteUserRequestHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/MuteUserRequestHdlr.scala index 1337c4eff1..1618c1f6f1 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/MuteUserRequestHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/MuteUserRequestHdlr.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.core2.message.handlers.users import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api.{ MuteUserRequest, MuteVoiceUser } -import org.bigbluebutton.core.models.{ Users, Users2x, VoiceUsers } +import org.bigbluebutton.core.models.{ Users1x, Users2x, VoiceUsers } import org.bigbluebutton.core.running.MeetingActor trait MuteUserRequestHdlr { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserBroadcastCamStartMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserBroadcastCamStartMsgHdlr.scala index 2ed76530fa..03e82daab6 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserBroadcastCamStartMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserBroadcastCamStartMsgHdlr.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core2.message.handlers.users +import org.bigbluebutton.common2.messages.Webcams.{ UserBroadcastCamStartMsg, UserBroadcastCamStartedEvtMsg, UserBroadcastCamStartedEvtMsgBody } import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.users.{ UserBroadcastCamStartMsg, UserBroadcastCamStartedEvtMsg, UserBroadcastCamStartedEvtMsgBody } import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.{ MediaStream, WebcamStream, Webcams } import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserBroadcastCamStopMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserBroadcastCamStopMsgHdlr.scala index 43eb3a0351..6e40f2cafb 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserBroadcastCamStopMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserBroadcastCamStopMsgHdlr.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core2.message.handlers.users +import org.bigbluebutton.common2.messages.Webcams.{ UserBroadcastCamStopMsg, UserBroadcastCamStoppedEvtMsg, UserBroadcastCamStoppedEvtMsgBody } import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.users.{ UserBroadcastCamStopMsg, UserBroadcastCamStoppedEvtMsg, UserBroadcastCamStoppedEvtMsgBody } import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Webcams import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserConnectedToGlobalAudioHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserConnectedToGlobalAudioHdlr.scala index 639ed1958f..6755188ab8 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserConnectedToGlobalAudioHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserConnectedToGlobalAudioHdlr.scala @@ -1,12 +1,11 @@ package org.bigbluebutton.core2.message.handlers.users +import org.bigbluebutton.common2.messages.VoiceConf.{ UserJoinedVoiceConfToClientEvtMsg, UserJoinedVoiceConfToClientEvtMsgBody } import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.voiceconf.{ UserJoinedVoiceConfToClientEvtMsg, UserJoinedVoiceConfToClientEvtMsgBody } import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.core.api.{ UserConnectedToGlobalAudio, UserListeningOnly } -import org.bigbluebutton.core.models.{ Users, Users2x, VoiceUserState, VoiceUsers } +import org.bigbluebutton.core.api.UserConnectedToGlobalAudio +import org.bigbluebutton.core.models.{ Users2x, VoiceUserState, VoiceUsers } import org.bigbluebutton.core.running.MeetingActor -import org.bigbluebutton.core2.MeetingStatus2x trait UserConnectedToGlobalAudioHdlr { this: MeetingActor => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserDisconnectedFromGlobalAudioHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserDisconnectedFromGlobalAudioHdlr.scala index 8653af709b..9092efbf0c 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserDisconnectedFromGlobalAudioHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserDisconnectedFromGlobalAudioHdlr.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core2.message.handlers.users +import org.bigbluebutton.common2.messages.VoiceConf.{ UserLeftVoiceConfToClientEvtMsg, UserLeftVoiceConfToClientEvtMsgBody } import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.voiceconf.{ UserLeftVoiceConfToClientEvtMsg, UserLeftVoiceConfToClientEvtMsgBody } import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api.{ UserDisconnectedFromGlobalAudio, UserLeft, UserListeningOnly } import org.bigbluebutton.core.models.{ VoiceUserState, VoiceUsers } diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserEmojiStatusHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserEmojiStatusHdlr.scala index 4609dcc7c9..11a40ed95e 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserEmojiStatusHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserEmojiStatusHdlr.scala @@ -1,10 +1,10 @@ package org.bigbluebutton.core2.message.handlers.users -import org.bigbluebutton.common2.messages.users.{ UserEmojiChangedEvtMsg, UserEmojiChangedEvtMsgBody, ValidateAuthTokenRespMsg, ValidateAuthTokenRespMsgBody } +import org.bigbluebutton.common2.messages.Users.{ UserEmojiChangedEvtMsg, UserEmojiChangedEvtMsgBody } import org.bigbluebutton.common2.messages._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api.{ UserChangedEmojiStatus, UserEmojiStatus } -import org.bigbluebutton.core.models.{ Users, Users2x } +import org.bigbluebutton.core.models.{ Users1x, Users2x } import org.bigbluebutton.core.running.MeetingActor trait UserEmojiStatusHdlr { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserJoinMeetingReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserJoinMeetingReqMsgHdlr.scala index 98bbc8bfb9..6ab397c39c 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserJoinMeetingReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserJoinMeetingReqMsgHdlr.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.core2.message.handlers.users -import org.bigbluebutton.common2.messages.users.UserJoinMeetingReqMsg +import org.bigbluebutton.common2.messages.Users.UserJoinMeetingReqMsg import org.bigbluebutton.core.{ MessageRecorder, OutMessageGateway } import org.bigbluebutton.core.models.{ RegisteredUsers, UserState, Users2x } import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserJoinedVoiceConfEvtMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserJoinedVoiceConfEvtMsgHdlr.scala index bf8360b270..9c6d58c031 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserJoinedVoiceConfEvtMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserJoinedVoiceConfEvtMsgHdlr.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core2.message.handlers.users +import org.bigbluebutton.common2.messages.VoiceConf.{ UserJoinedVoiceConfEvtMsg, UserJoinedVoiceConfToClientEvtMsg, UserJoinedVoiceConfToClientEvtMsgBody } import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.voiceconf.{ UserJoinedVoiceConfEvtMsg, UserJoinedVoiceConfToClientEvtMsg, UserJoinedVoiceConfToClientEvtMsgBody } import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.{ VoiceUser2x, VoiceUserState, VoiceUsers } import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserJoinedVoiceConfMessageHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserJoinedVoiceConfMessageHdlr.scala index 7d244aad94..db6ffe7b46 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserJoinedVoiceConfMessageHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserJoinedVoiceConfMessageHdlr.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.core2.message.handlers.users import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api._ -import org.bigbluebutton.core.models.{ Roles, Users } +import org.bigbluebutton.core.models.{ Roles, Users1x } import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core2.MeetingStatus2x import org.bigbluebutton.common2.domain.VoiceUserVO diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserLeavingHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserLeavingHdlr.scala index 4039f20642..acd08523a0 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserLeavingHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserLeavingHdlr.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core2.message.handlers.users +import org.bigbluebutton.common2.messages.Users.{ UserLeaveReqMsg, UserLeftMeetingEvtMsg, UserLeftMeetingEvtMsgBody } import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.users.UserLeaveReqMsg import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Users2x import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserLeftVoiceConfEvtMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserLeftVoiceConfEvtMsgHdlr.scala index 8d3990b8bf..de4c12d09c 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserLeftVoiceConfEvtMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserLeftVoiceConfEvtMsgHdlr.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core2.message.handlers.users +import org.bigbluebutton.common2.messages.VoiceConf.{ UserLeftVoiceConfEvtMsg, UserLeftVoiceConfToClientEvtMsg, UserLeftVoiceConfToClientEvtMsgBody } import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.voiceconf.{ UserLeftVoiceConfEvtMsg, UserLeftVoiceConfToClientEvtMsg, UserLeftVoiceConfToClientEvtMsgBody } import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.{ VoiceUserState, VoiceUsers } import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserMutedInVoiceConfEvtMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserMutedInVoiceConfEvtMsgHdlr.scala index b4438bbff1..c1a0143c7d 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserMutedInVoiceConfEvtMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserMutedInVoiceConfEvtMsgHdlr.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core2.message.handlers.users +import org.bigbluebutton.common2.messages.VoiceConf.{ UserMutedEvtMsg, UserMutedEvtMsgBody, UserMutedInVoiceConfEvtMsg } import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.voiceconf._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.{ VoiceUserState, VoiceUsers } import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserShareWebcamHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserShareWebcamHdlr.scala index 816af29846..d8673495dd 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserShareWebcamHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserShareWebcamHdlr.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.core2.message.handlers.users import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api.{ UserShareWebcam, UserSharedWebcam } -import org.bigbluebutton.core.models.Users +import org.bigbluebutton.core.models.Users1x import org.bigbluebutton.core.running.MeetingActor trait UserShareWebcamHdlr { @@ -12,7 +12,7 @@ trait UserShareWebcamHdlr { def handleUserShareWebcam(msg: UserShareWebcam) { for { - uvo <- Users.userSharedWebcam(msg.userId, liveMeeting.users, msg.stream) + uvo <- Users1x.userSharedWebcam(msg.userId, liveMeeting.users, msg.stream) } yield { log.info("User shared webcam. meetingId=" + props.meetingProp.intId + " userId=" + uvo.id + " stream=" + msg.stream) outGW.send(new UserSharedWebcam(props.meetingProp.intId, props.recordProp.record, uvo.id, msg.stream)) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserTalkingInVoiceConfEvtMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserTalkingInVoiceConfEvtMsgHdlr.scala index 1754091b05..ba7335728a 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserTalkingInVoiceConfEvtMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserTalkingInVoiceConfEvtMsgHdlr.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core2.message.handlers.users +import org.bigbluebutton.common2.messages.VoiceConf.{ UserTalkingEvtMsg, UserTalkingEvtMsgBody, UserTalkingInVoiceConfEvtMsg } import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.voiceconf._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.{ VoiceUserState, VoiceUsers } import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserUnshareWebcamHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserUnshareWebcamHdlr.scala index b3891ce9ea..e0ef4e03fb 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserUnshareWebcamHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserUnshareWebcamHdlr.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.core2.message.handlers.users import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api.{ UserUnshareWebcam, UserUnsharedWebcam } -import org.bigbluebutton.core.models.Users +import org.bigbluebutton.core.models.Users1x import org.bigbluebutton.core.running.MeetingActor trait UserUnshareWebcamHdlr { @@ -12,7 +12,7 @@ trait UserUnshareWebcamHdlr { def handleUserunshareWebcam(msg: UserUnshareWebcam) { for { - uvo <- Users.userUnsharedWebcam(msg.userId, liveMeeting.users, msg.stream) + uvo <- Users1x.userUnsharedWebcam(msg.userId, liveMeeting.users, msg.stream) } yield { log.info("User unshared webcam. meetingId=" + props.meetingProp.intId + " userId=" + uvo.id + " stream=" + msg.stream) outGW.send(new UserUnsharedWebcam(props.meetingProp.intId, props.recordProp.record, uvo.id, msg.stream)) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/ValidateAuthTokenReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/ValidateAuthTokenReqMsgHdlr.scala index eb7bf69159..2832c5a322 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/ValidateAuthTokenReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/ValidateAuthTokenReqMsgHdlr.scala @@ -1,7 +1,9 @@ package org.bigbluebutton.core2.message.handlers.users +import org.bigbluebutton.common2.messages.Guests.{ GuestWaitingVO, GuestsWaitingApprovalEvtMsg, GuestsWaitingApprovalEvtMsgBody } +import org.bigbluebutton.common2.messages.Users.ValidateAuthTokenReqMsg +import org.bigbluebutton.common2.messages.Webcams.{ MediaStreamVO, WebcamStreamVO } import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.users.ValidateAuthTokenReqMsg import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models._ import org.bigbluebutton.core.running.MeetingActor @@ -87,7 +89,7 @@ trait ValidateAuthTokenReqMsgHdlr { } def sendAllWebcamStreams(requesterId: String): Unit = { - val streams = Webcams.findAll(liveMeeting.webcams) + val streams = org.bigbluebutton.core.models.Webcams.findAll(liveMeeting.webcams) val webcamStreams = streams.map { u => val msVO = MediaStreamVO(id = u.stream.id, url = u.stream.url, userId = u.stream.userId, attributes = u.stream.attributes, viewers = u.stream.viewers) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/ClearWhiteboardPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/ClearWhiteboardPubMsgHdlr.scala index bee03c1627..8a16498955 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/ClearWhiteboardPubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/ClearWhiteboardPubMsgHdlr.scala @@ -1,9 +1,9 @@ package org.bigbluebutton.core2.message.handlers.whiteboard +import org.bigbluebutton.common2.messages.Whiteboard.{ ClearWhiteboardEvtMsg, ClearWhiteboardEvtMsgBody, ClearWhiteboardPubMsg } import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.whiteboard.{ ClearWhiteboardEvtMsg, ClearWhiteboardEvtMsgBody, ClearWhiteboardPubMsg } trait ClearWhiteboardPubMsgHdlr { this: MeetingActor => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/GetWhiteboardAccessReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/GetWhiteboardAccessReqMsgHdlr.scala index d6e5b852ff..62aa77802e 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/GetWhiteboardAccessReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/GetWhiteboardAccessReqMsgHdlr.scala @@ -1,9 +1,9 @@ package org.bigbluebutton.core2.message.handlers.whiteboard +import org.bigbluebutton.common2.messages.Whiteboard.{ GetWhiteboardAccessReqMsg, GetWhiteboardAccessRespMsg, GetWhiteboardAccessRespMsgBody } import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.whiteboard.{ GetWhiteboardAccessReqMsg, GetWhiteboardAccessRespMsg, GetWhiteboardAccessRespMsgBody } trait GetWhiteboardAccessReqMsgHdlr { this: MeetingActor => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/GetWhiteboardAnnotationsReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/GetWhiteboardAnnotationsReqMsgHdlr.scala index 6493e32816..6e56d0e824 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/GetWhiteboardAnnotationsReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/GetWhiteboardAnnotationsReqMsgHdlr.scala @@ -3,8 +3,8 @@ package org.bigbluebutton.core2.message.handlers.whiteboard import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.whiteboard.{ GetWhiteboardAnnotationsReqMsg, GetWhiteboardAnnotationsRespMsg, GetWhiteboardAnnotationsRespMsgBody } import org.bigbluebutton.common2.domain.AnnotationVO +import org.bigbluebutton.common2.messages.Whiteboard.{ GetWhiteboardAnnotationsReqMsg, GetWhiteboardAnnotationsRespMsg, GetWhiteboardAnnotationsRespMsgBody } trait GetWhiteboardAnnotationsReqMsgHdlr { this: MeetingActor => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/ModifyWhiteboardAccessPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/ModifyWhiteboardAccessPubMsgHdlr.scala index c3662e06c6..9c8470721e 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/ModifyWhiteboardAccessPubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/ModifyWhiteboardAccessPubMsgHdlr.scala @@ -1,9 +1,9 @@ package org.bigbluebutton.core2.message.handlers.whiteboard +import org.bigbluebutton.common2.messages.Whiteboard.{ ModifyWhiteboardAccessEvtMsg, ModifyWhiteboardAccessEvtMsgBody, ModifyWhiteboardAccessPubMsg } import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.whiteboard.{ ModifyWhiteboardAccessEvtMsg, ModifyWhiteboardAccessEvtMsgBody, ModifyWhiteboardAccessPubMsg } trait ModifyWhiteboardAccessPubMsgHdlr { this: MeetingActor => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/SendCursorPositionPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/SendCursorPositionPubMsgHdlr.scala index ef8dd7453a..95be7a81e4 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/SendCursorPositionPubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/SendCursorPositionPubMsgHdlr.scala @@ -1,9 +1,9 @@ package org.bigbluebutton.core2.message.handlers.whiteboard +import org.bigbluebutton.common2.messages.Whiteboard.{ SendCursorPositionEvtMsg, SendCursorPositionEvtMsgBody, SendCursorPositionPubMsg } import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.whiteboard.{ SendCursorPositionEvtMsg, SendCursorPositionEvtMsgBody, SendCursorPositionPubMsg } trait SendCursorPositionPubMsgHdlr { this: MeetingActor => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/SendWhiteboardAnnotationPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/SendWhiteboardAnnotationPubMsgHdlr.scala index 370b360898..e4e12d02c1 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/SendWhiteboardAnnotationPubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/SendWhiteboardAnnotationPubMsgHdlr.scala @@ -3,8 +3,8 @@ package org.bigbluebutton.core2.message.handlers.whiteboard import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.whiteboard.{ SendWhiteboardAnnotationEvtMsg, SendWhiteboardAnnotationEvtMsgBody, SendWhiteboardAnnotationPubMsg } import org.bigbluebutton.common2.domain.AnnotationVO +import org.bigbluebutton.common2.messages.Whiteboard.{ SendWhiteboardAnnotationEvtMsg, SendWhiteboardAnnotationEvtMsgBody, SendWhiteboardAnnotationPubMsg } trait SendWhiteboardAnnotationPubMsgHdlr { this: MeetingActor => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/UndoWhiteboardPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/UndoWhiteboardPubMsgHdlr.scala index 7bf382c62e..26c652928e 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/UndoWhiteboardPubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/UndoWhiteboardPubMsgHdlr.scala @@ -1,9 +1,9 @@ package org.bigbluebutton.core2.message.handlers.whiteboard +import org.bigbluebutton.common2.messages.Whiteboard.{ UndoWhiteboardEvtMsg, UndoWhiteboardEvtMsgBody, UndoWhiteboardPubMsg } import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.whiteboard.{ UndoWhiteboardEvtMsg, UndoWhiteboardEvtMsgBody, UndoWhiteboardPubMsg } trait UndoWhiteboardPubMsgHdlr { this: MeetingActor => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/GetWebcamStreamsMeetingRespMsgBuilder.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/GetWebcamStreamsMeetingRespMsgBuilder.scala index 6ee30df122..eee88c0e92 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/GetWebcamStreamsMeetingRespMsgBuilder.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/GetWebcamStreamsMeetingRespMsgBuilder.scala @@ -1,6 +1,7 @@ package org.bigbluebutton.core2.message.senders -import org.bigbluebutton.common2.messages.{ GetWebcamStreamsMeetingRespMsg, _ } +import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.messages.Webcams.{ GetWebcamStreamsMeetingRespMsg, GetWebcamStreamsMeetingRespMsgBody, WebcamStreamVO } object GetWebcamStreamsMeetingRespMsgBuilder { def build(meetingId: String, userId: String, streams: Vector[WebcamStreamVO]): BbbCommonEnvCoreMsg = { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/UserJoinedMeetingEvtMsgBuilder.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/UserJoinedMeetingEvtMsgBuilder.scala index 2cd4cc95c9..ed7452d4b3 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/UserJoinedMeetingEvtMsgBuilder.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/UserJoinedMeetingEvtMsgBuilder.scala @@ -1,5 +1,6 @@ package org.bigbluebutton.core2.message.senders +import org.bigbluebutton.common2.messages.Users.{ UserJoinedMeetingEvtMsg, UserJoinedMeetingEvtMsgBody } import org.bigbluebutton.common2.messages._ import org.bigbluebutton.core.models.UserState diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/UserLeftMeetingEvtMsgSender.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/UserLeftMeetingEvtMsgSender.scala index 596a70b59c..606fdda627 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/UserLeftMeetingEvtMsgSender.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/UserLeftMeetingEvtMsgSender.scala @@ -1,5 +1,6 @@ package org.bigbluebutton.core2.message.senders +import org.bigbluebutton.common2.messages.Users.{ UserLeftMeetingEvtMsg, UserLeftMeetingEvtMsgBody } import org.bigbluebutton.common2.messages._ import org.bigbluebutton.core.models.UserState diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/ValidateAuthTokenRespMsgSender.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/ValidateAuthTokenRespMsgSender.scala index 011e2067ff..173e6fe069 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/ValidateAuthTokenRespMsgSender.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/ValidateAuthTokenRespMsgSender.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core2.message.senders +import org.bigbluebutton.common2.messages.Users.{ ValidateAuthTokenRespMsg, ValidateAuthTokenRespMsgBody } import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.users.{ ValidateAuthTokenRespMsg, ValidateAuthTokenRespMsgBody } import org.bigbluebutton.core.OutMessageGateway object ValidateAuthTokenRespMsgSender { diff --git a/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/AppsTestFixtures.scala b/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/AppsTestFixtures.scala index 29bf2933ef..21604304b9 100755 --- a/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/AppsTestFixtures.scala +++ b/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/AppsTestFixtures.scala @@ -3,7 +3,7 @@ package org.bigbluebutton.core import org.bigbluebutton.common2.domain._ import org.bigbluebutton.core.api.GuestPolicyType import org.bigbluebutton.core.apps._ -import org.bigbluebutton.core.models.{ RegisteredUsers, Users } +import org.bigbluebutton.core.models.{ RegisteredUsers, Users1x } import org.bigbluebutton.core2.MeetingStatus2x trait AppsTestFixtures { @@ -48,7 +48,7 @@ trait AppsTestFixtures { val breakoutModel = new BreakoutRoomModel() val captionModel = new CaptionModel() val notesModel = new SharedNotesModel() - val users = new Users + val users = new Users1x val registeredUsers = new RegisteredUsers val meetingProp = MeetingProp(name = meetingName, extId = externalMeetingId, intId = meetingId, diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/BreakoutRooms.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/BreakoutRooms.scala new file mode 100755 index 0000000000..d446f6c204 --- /dev/null +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/BreakoutRooms.scala @@ -0,0 +1,101 @@ +package org.bigbluebutton.common2.messages + +object BreakoutRooms { + object BreakoutRoomCreatedMsg { val NAME = "BreakoutRoomCreatedMsg" } + case class BreakoutRoomCreatedMsg(header: BbbClientMsgHeader, body: BreakoutRoomCreatedMsgBody) extends BbbCoreMsg + case class BreakoutRoomCreatedMsgBody(meetingId: String, breakoutRoomId: String) + + object BreakoutRoomEndedEvtMsg { val NAME = "BreakoutRoomEndedEvtMsg" } + case class BreakoutRoomEndedEvtMsg(header: BbbClientMsgHeader, body: BreakoutRoomEndedEvtMsgBody) extends BbbCoreMsg + case class BreakoutRoomEndedEvtMsgBody(parentMeetingId: String, meetingId: String) + + // Sent by breakout actor to tell meeting actor that breakout room has been ended + object BreakoutRoomEndedMsg { val NAME = "BreakoutRoomEndedMsg" } + case class BreakoutRoomEndedMsg(header: BbbClientMsgHeader, body: BreakoutRoomEndedMsgBody) extends BbbCoreMsg + case class BreakoutRoomEndedMsgBody(meetingId: String, breakoutRoomId: String) + + object BreakoutRoomJoinURLEvtMsg { val NAME = "BreakoutRoomJoinURLEvtMsg" } + case class BreakoutRoomJoinURLEvtMsg(header: BbbClientMsgHeader, body: BreakoutRoomJoinURLEvtMsgBody) extends BbbCoreMsg + case class BreakoutRoomJoinURLEvtMsgBody(parentMeetingId: String, recorded: Boolean, breakoutMeetingId: String, userId: String, redirectJoinURL: String, noRedirectJoinURL: String) + + // Outgoing messages + object BreakoutRoomsListEvtMsg { val NAME = "BreakoutRoomsListEvtMsg" } + case class BreakoutRoomsListEvtMsg(header: BbbClientMsgHeader, body: BreakoutRoomsListEvtMsgBody) extends BbbCoreMsg + case class BreakoutRoomsListEvtMsgBody(meetingId: String, rooms: Vector[BreakoutRoomInfo], roomsReady: Boolean) + case class BreakoutRoomInfo(name: String, externalMeetingId: String, meetingId: String, sequence: Int) + + + object BreakoutRoomsListMsg { val NAME = "BreakoutRoomsListMsg" } + case class BreakoutRoomsListMsg(header: BbbClientMsgHeader, body: BreakoutRoomsListMsgBody) extends BbbCoreMsg + case class BreakoutRoomsListMsgBody(meetingId: String) + + object BreakoutRoomStartedEvtMsg { val NAME = "BreakoutRoomStartedEvtMsg" } + case class BreakoutRoomStartedEvtMsg(header: BbbClientMsgHeader, body: BreakoutRoomStartedEvtMsgBody) extends BbbCoreMsg + case class BreakoutRoomStartedEvtMsgBody(parentMeetingId: String, recorded: Boolean, breakout: BreakoutRoomInfo) + + object BreakoutRoomsTimeRemainingUpdateEvtMsg { val NAME = "BreakoutRoomsTimeRemainingUpdateEvtMsg" } + case class BreakoutRoomsTimeRemainingUpdateEvtMsg(header: BbbClientMsgHeader, body: BreakoutRoomsTimeRemainingUpdateEvtMsgBody) extends BbbCoreMsg + case class BreakoutRoomsTimeRemainingUpdateEvtMsgBody(meetingId: String, recorded: Boolean, timeRemaining: Int) + + + // Sent by breakout actor to tell meeting actor the list of users in the breakout room. + object BreakoutRoomUsersUpdateMsg { val NAME = "BreakoutRoomUsersUpdateMsg" } + case class BreakoutRoomUsersUpdateMsg(header: BbbClientMsgHeader, body: BreakoutRoomUsersUpdateMsgBody) extends BbbCoreMsg + case class BreakoutRoomUsersUpdateMsgBody(meetingId: String, breakoutMeetingId: String, users: Vector[BreakoutUserVO]) + + + object CreateBreakoutRoomEvtMsg { val NAME = "CreateBreakoutRoomEvtMsg" } + case class CreateBreakoutRoomEvtMsg(header: BbbClientMsgHeader, body: CreateBreakoutRoomEvtMsgBody) extends BbbCoreMsg + case class CreateBreakoutRoomEvtMsgBody(meetingId: String, room: BreakoutRoomDetail) + case class BreakoutRoomDetail(breakoutMeetingId: String, name: String, parentId: String, sequence: Integer, + voiceConfId: String, durationInMinutes: Int, moderatorPassword: String, viewerPassword: String, + sourcePresentationId: String, sourcePresentationSlide: Int, record: Boolean) + + object CreateBreakoutRoomsMsg { val NAME = "CreateBreakoutRoomsMsg" } + case class CreateBreakoutRoomsMsg(header: BbbClientMsgHeader, body: CreateBreakoutRoomsMsgBody) extends BbbCoreMsg + case class CreateBreakoutRoomsMsgBody(meetingId: String, durationInMinutes: Int, record: Boolean, rooms: Vector[BreakoutRoomMsgBody]) + case class BreakoutRoomMsgBody(name: String, sequence: Int, users: Vector[String]) + + // Sent by user to request ending all the breakout rooms + object EndAllBreakoutRoomsMsg { val NAME = "EndAllBreakoutRoomsMsg" } + case class EndAllBreakoutRoomsMsg(header: BbbClientMsgHeader, body: EndAllBreakoutRoomsMsgBody) extends BbbCoreMsg + case class EndAllBreakoutRoomsMsgBody(meetingId: String) + + object EndBreakoutRoomEvtMsg { val NAME = "EndBreakoutRoomEvtMsg" } + case class EndBreakoutRoomEvtMsg(header: BbbClientMsgHeader, body: EndBreakoutRoomEvtMsgBody) extends BbbCoreMsg + case class EndBreakoutRoomEvtMsgBody(breakoutMeetingId: String) + + object MeetingTimeRemainingUpdateEvtMsg { val NAME = "MeetingTimeRemainingUpdateEvtMsg" } + case class MeetingTimeRemainingUpdateEvtMsg(header: BbbClientMsgHeader, body: MeetingTimeRemainingUpdateEvtMsgBody) extends BbbCoreMsg + case class MeetingTimeRemainingUpdateEvtMsgBody(meetingId: String, recorded: Boolean, timeRemaining: Int) + + + object RequestBreakoutJoinURLMsg { val NAME = "RequestBreakoutJoinURLMsg" } + case class RequestBreakoutJoinURLMsg(header: BbbClientMsgHeader, body: RequestBreakoutJoinURLMsgBody) extends BbbCoreMsg + case class RequestBreakoutJoinURLMsgBody(meetingId: String, breakoutMeetingId: String, userId: String) + + + // Send by internal actor to tell the breakout actor to send it's list of users to the main meeting actor. + object SendBreakoutUsersUpdateMsg { val NAME = "SendBreakoutUsersUpdateMsg" } + case class SendBreakoutUsersUpdateMsg(header: BbbClientMsgHeader, body: SendBreakoutUsersUpdateMsgBody) extends BbbCoreMsg + case class SendBreakoutUsersUpdateMsgBody(meetingId: String) + + object TransferUserToMeetingEvtMsg { val NAME = "TransferUserToMeetingEvtMsg" } + case class TransferUserToMeetingEvtMsg(header: BbbClientMsgHeader, body: TransferUserToMeetingEvtMsgBody) extends BbbCoreMsg + case class TransferUserToMeetingEvtMsgBody(voiceConfId: String, targetVoiceConfId: String, userId: String) + + // Sent by user actor to ask for voice conference transfer + object TransferUserToMeetingRequestMsg { val NAME = "TransferUserToMeetingRequestMsg" } + case class TransferUserToMeetingRequestMsg(header: BbbClientMsgHeader, body: TransferUserToMeetingRequestMsgBody) extends BbbCoreMsg + case class TransferUserToMeetingRequestMsgBody(meetingId: String, targetMeetingId: String, userId: String) + + object UpdateBreakoutUsersEvtMsg { val NAME = "UpdateBreakoutUsersEvtMsg" } + case class UpdateBreakoutUsersEvtMsg(header: BbbClientMsgHeader, body: UpdateBreakoutUsersEvtMsgBody) extends BbbCoreMsg + case class UpdateBreakoutUsersEvtMsgBody(parentMeetingId: String, recorded: Boolean, breakoutMeetingId: String, users: Vector[BreakoutUserVO]) + + // Common Value objects + case class BreakoutUserVO(id: String, name: String) + case class BreakoutRoomVO(id: String, externalMeetingId: String, name: String, parentRoomId: String, sequence: Integer, voiceConfId: String, + assignedUsers: Vector[String], users: Vector[BreakoutUserVO]) + +} diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetGuestsWaitingApprovalRespMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetGuestsWaitingApprovalRespMsg.scala deleted file mode 100755 index 25d6ed6771..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetGuestsWaitingApprovalRespMsg.scala +++ /dev/null @@ -1,18 +0,0 @@ -package org.bigbluebutton.common2.messages - -object GetGuestsWaitingApprovalRespMsg { - val NAME = "GetGuestsWaitingApprovalRespMsg" - - def apply(meetingId: String, userId: String, guests: Vector[GuestWaitingVO]): GetGuestsWaitingApprovalRespMsg = { - val header = BbbClientMsgHeader(GetGuestsWaitingApprovalRespMsg.NAME, meetingId, userId) - - val body = GetGuestsWaitingApprovalRespMsgBody(guests) - GetGuestsWaitingApprovalRespMsg(header, body) - } -} - -case class GetGuestsWaitingApprovalRespMsg(header: BbbClientMsgHeader, - body: GetGuestsWaitingApprovalRespMsgBody) extends BbbCoreMsg -case class GetGuestsWaitingApprovalRespMsgBody(guests: Vector[GuestWaitingVO]) - -case class GuestWaitingVO(intId: String, name: String, role: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetWebcamStreamsMeetingRespMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetWebcamStreamsMeetingRespMsg.scala deleted file mode 100755 index a26a5c7415..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetWebcamStreamsMeetingRespMsg.scala +++ /dev/null @@ -1,20 +0,0 @@ -package org.bigbluebutton.common2.messages - - -object GetWebcamStreamsMeetingRespMsg { - val NAME = "GetWebcamStreamsMeetingRespMsg" - - def apply(meetingId: String, userId: String, streams: Vector[WebcamStreamVO]): GetWebcamStreamsMeetingRespMsg = { - val header = BbbClientMsgHeader(GetWebcamStreamsMeetingRespMsg.NAME, meetingId, userId) - - val body = GetWebcamStreamsMeetingRespMsgBody(streams) - GetWebcamStreamsMeetingRespMsg(header, body) - } -} - - -case class GetWebcamStreamsMeetingRespMsg(header: BbbClientMsgHeader, body: GetWebcamStreamsMeetingRespMsgBody) extends BbbCoreMsg -case class GetWebcamStreamsMeetingRespMsgBody(streams: Vector[WebcamStreamVO]) - -case class WebcamStreamVO(streamId: String, stream: MediaStreamVO) -case class MediaStreamVO(id: String, url: String, userId: String, attributes: collection.immutable.Map[String, String], viewers: Set[String]) \ No newline at end of file diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetWebcamStreamsRespMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetWebcamStreamsRespMsg.scala deleted file mode 100755 index 122a69a91a..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetWebcamStreamsRespMsg.scala +++ /dev/null @@ -1,15 +0,0 @@ -package org.bigbluebutton.common2.messages - -object GetWebcamStreamsRespMsg { - val NAME = "GetWebcamStreamsRespMsg" - - def apply(meetingId: String, userId: String, webcamStreams: Vector[String]): GetWebcamStreamsRespMsg = { - val header = BbbClientMsgHeader(GetWebcamStreamsRespMsg.NAME, meetingId, userId) - - val body = GetWebcamStreamsRespMsgBody(webcamStreams) - GetWebcamStreamsRespMsg(header, body) - } -} - -case class GetWebcamStreamsRespMsg(header: BbbClientMsgHeader, body: GetWebcamStreamsRespMsgBody) extends BbbCoreMsg -case class GetWebcamStreamsRespMsgBody(webcamStreams: Vector[String]) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Guests.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Guests.scala new file mode 100755 index 0000000000..849d491cd2 --- /dev/null +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Guests.scala @@ -0,0 +1,68 @@ +package org.bigbluebutton.common2.messages + + +object Guests { + object GetGuestsWaitingApprovalRespMsg { + val NAME = "GetGuestsWaitingApprovalRespMsg" + + def apply(meetingId: String, userId: String, guests: Vector[GuestWaitingVO]): GetGuestsWaitingApprovalRespMsg = { + val header = BbbClientMsgHeader(GetGuestsWaitingApprovalRespMsg.NAME, meetingId, userId) + + val body = GetGuestsWaitingApprovalRespMsgBody(guests) + GetGuestsWaitingApprovalRespMsg(header, body) + } + } + + case class GetGuestsWaitingApprovalRespMsg(header: BbbClientMsgHeader, + body: GetGuestsWaitingApprovalRespMsgBody) extends BbbCoreMsg + case class GetGuestsWaitingApprovalRespMsgBody(guests: Vector[GuestWaitingVO]) + + case class GuestWaitingVO(intId: String, name: String, role: String) + + object GuestsWaitingApprovalEvtMsg { + val NAME = "GuestsWaitingApprovalEvtMsg" + + def apply(meetingId: String, userId: String, guests: Vector[GuestWaitingVO]): GuestsWaitingApprovalEvtMsg = { + val header = BbbClientMsgHeader(GetGuestsWaitingApprovalRespMsg.NAME, meetingId, userId) + + val body = GuestsWaitingApprovalEvtMsgBody(guests) + GuestsWaitingApprovalEvtMsg(header, body) + } + } + + case class GuestsWaitingApprovalEvtMsg(header: BbbClientMsgHeader, + body: GuestsWaitingApprovalEvtMsgBody) extends BbbCoreMsg + case class GuestsWaitingApprovalEvtMsgBody(guests: Vector[GuestWaitingVO]) + + object GuestsWaitingApprovedEvtMsg { + val NAME = "GuestsWaitingApprovedEvtMsg" + + def apply(meetingId: String, userId: String, guests: Vector[GuestWaitingVO]): GuestsWaitingApprovedEvtMsg = { + val header = BbbClientMsgHeader(GetGuestsWaitingApprovalRespMsg.NAME, meetingId, userId) + + val body = GuestsWaitingApprovedEvtMsgBody(guests) + GuestsWaitingApprovedEvtMsg(header, body) + } + } + + case class GuestsWaitingApprovedEvtMsg(header: BbbClientMsgHeader, + body: GuestsWaitingApprovedEvtMsgBody) extends BbbCoreMsg + case class GuestsWaitingApprovedEvtMsgBody(guests: Vector[GuestWaitingVO]) + + object GuestsWaitingApprovedMsg { + val NAME = "GuestsWaitingApprovedMsg" + + def apply(meetingId: String, userId: String, guests: Vector[String]): GuestsWaitingApprovedMsg = { + val header = BbbClientMsgHeader(GetGuestsWaitingApprovalRespMsg.NAME, meetingId, userId) + + val body = GuestsWaitingApprovedMsgBody(guests) + GuestsWaitingApprovedMsg(header, body) + } + } + + case class GuestsWaitingApprovedMsg(header: BbbClientMsgHeader, + body: GuestsWaitingApprovedMsgBody) extends BbbCoreMsg + case class GuestsWaitingApprovedMsgBody(guests: Vector[String]) + + +} diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GuestsWaitingApprovalEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GuestsWaitingApprovalEvtMsg.scala deleted file mode 100755 index 9be99b6334..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GuestsWaitingApprovalEvtMsg.scala +++ /dev/null @@ -1,17 +0,0 @@ -package org.bigbluebutton.common2.messages - -object GuestsWaitingApprovalEvtMsg { - val NAME = "GuestsWaitingApprovalEvtMsg" - - def apply(meetingId: String, userId: String, guests: Vector[GuestWaitingVO]): GuestsWaitingApprovalEvtMsg = { - val header = BbbClientMsgHeader(GetGuestsWaitingApprovalRespMsg.NAME, meetingId, userId) - - val body = GuestsWaitingApprovalEvtMsgBody(guests) - GuestsWaitingApprovalEvtMsg(header, body) - } -} - -case class GuestsWaitingApprovalEvtMsg(header: BbbClientMsgHeader, - body: GuestsWaitingApprovalEvtMsgBody) extends BbbCoreMsg -case class GuestsWaitingApprovalEvtMsgBody(guests: Vector[GuestWaitingVO]) - diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GuestsWaitingApprovedEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GuestsWaitingApprovedEvtMsg.scala deleted file mode 100755 index b0f5957e74..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GuestsWaitingApprovedEvtMsg.scala +++ /dev/null @@ -1,17 +0,0 @@ -package org.bigbluebutton.common2.messages - -object GuestsWaitingApprovedEvtMsg { - val NAME = "GuestsWaitingApprovedEvtMsg" - - def apply(meetingId: String, userId: String, guests: Vector[GuestWaitingVO]): GuestsWaitingApprovedEvtMsg = { - val header = BbbClientMsgHeader(GetGuestsWaitingApprovalRespMsg.NAME, meetingId, userId) - - val body = GuestsWaitingApprovedEvtMsgBody(guests) - GuestsWaitingApprovedEvtMsg(header, body) - } -} - -case class GuestsWaitingApprovedEvtMsg(header: BbbClientMsgHeader, - body: GuestsWaitingApprovedEvtMsgBody) extends BbbCoreMsg -case class GuestsWaitingApprovedEvtMsgBody(guests: Vector[GuestWaitingVO]) - diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GuestsWaitingApprovedMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GuestsWaitingApprovedMsg.scala deleted file mode 100755 index 2ccdb8b764..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GuestsWaitingApprovedMsg.scala +++ /dev/null @@ -1,17 +0,0 @@ -package org.bigbluebutton.common2.messages - -object GuestsWaitingApprovedMsg { - val NAME = "GuestsWaitingApprovedMsg" - - def apply(meetingId: String, userId: String, guests: Vector[String]): GuestsWaitingApprovedMsg = { - val header = BbbClientMsgHeader(GetGuestsWaitingApprovalRespMsg.NAME, meetingId, userId) - - val body = GuestsWaitingApprovedMsgBody(guests) - GuestsWaitingApprovedMsg(header, body) - } -} - -case class GuestsWaitingApprovedMsg(header: BbbClientMsgHeader, - body: GuestsWaitingApprovedMsgBody) extends BbbCoreMsg -case class GuestsWaitingApprovedMsgBody(guests: Vector[String]) - diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Layout.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Layout.scala new file mode 100755 index 0000000000..037d381cc9 --- /dev/null +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Layout.scala @@ -0,0 +1,36 @@ +package org.bigbluebutton.common2.messages + +import org.bigbluebutton.common2.domain.UserVO + + +object Layout { + // In messages + object GetCurrentLayoutMsg { val NAME = "GetCurrentLayoutMsg" } + case class GetCurrentLayoutMsg(header: BbbClientMsgHeader, body: GetCurrentLayoutMsgBody) extends BbbCoreMsg + case class GetCurrentLayoutMsgBody(meetingId: String, requesterId: String) + + object LockLayoutMsg { val NAME = "LockLayoutMsg" } + case class LockLayoutMsg(header: BbbClientMsgHeader, body: LockLayoutMsgBody) extends BbbCoreMsg + case class LockLayoutMsgBody(meetingId: String, setById: String, lock: Boolean, viewersOnly: Boolean, + layout: Option[String]) + + object BroadcastLayoutMsg { val NAME = "BroadcastLayoutMsg" } + case class BroadcastLayoutMsg(header: BbbClientMsgHeader, body: BroadcastLayoutMsgBody) extends BbbCoreMsg + case class BroadcastLayoutMsgBody(meetingId: String, requesterId: String, layout: String) + + // Out messages + object GetCurrentLayoutEvtMsg { val NAME = "GetCurrentLayoutEvtMsg" } + case class GetCurrentLayoutEvtMsg(header: BbbClientMsgHeader, body: GetCurrentLayoutEvtMsgBody) extends BbbCoreMsg + case class GetCurrentLayoutEvtMsgBody(meetingId: String, recorded: Boolean, requesterId: String, layoutId: String, + locked: Boolean, setByUserId: String) + + object BroadcastLayoutEvtMsg { val NAME = "BroadcastLayoutEvtMsg" } + case class BroadcastLayoutEvtMsg(header: BbbClientMsgHeader, body: BroadcastLayoutEvtMsgBody) extends BbbCoreMsg + case class BroadcastLayoutEvtMsgBody(meetingId: String, recorded: Boolean, requesterId: String, + layoutId: String, locked: Boolean, setByUserId: String, applyTo: Array[UserVO]) + + object LockLayoutEvtMsg { val NAME = "LockLayoutEvtMsg" } + case class LockLayoutEvtMsg(header: BbbClientMsgHeader, body: LockLayoutEvtMsgBody) extends BbbCoreMsg + case class LockLayoutEvtMsgBody(meetingId: String, recorded: Boolean, setById: String, locked: Boolean, + applyTo: Array[UserVO]) +} diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/MessageBody.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/MessageBody.scala index 6b163f9592..913a173f10 100755 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/MessageBody.scala +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/MessageBody.scala @@ -17,16 +17,13 @@ object MessageBody { case class AllowUserToShareDesktopReqMsgBody(userId: String) // Presentation Message Bodies - case class SetCurrentPresentationPubMsgBody(presentationId: String) - case class SetCurrentPagePubMsgBody(presentationId: String, pageId: String) - case class ResizeAndMovePagePubMsgBody(presentationId: String, pageId: String, xOffset: Double, yOffset: Double, widthRatio: Double, heightRatio: Double) - case class RemovePresentationPubMsgBody(presentationId: String) - case class PreuploadedPresentationsPubMsgBody(presentations: Vector[PresentationVO]) - case class PresentationConversionUpdatePubMsgBody(messageKey: String, code: String, presentationId: String, presName: String) - case class PresentationPageCountErrorPubMsgBody(messageKey: String, code: String, presentationId: String, numberOfPages: Int, maxNumberPages: Int, presName: String) - case class PresentationPageGeneratedPubMsgBody(messageKey: String, code: String, presentationId: String, numberOfPages: Int, pagesCompleted: Int, presName: String) - case class PresentationConversionCompletedPubMsgBody(messageKey: String, code: String, presentation: PresentationVO) - + + + + + + + // /** Event messages sent by Akka apps as result of receiving incoming messages ***/ // @@ -36,15 +33,6 @@ object MessageBody { /////////////////////////////////////////// // Presentation Message Bodies - case class NewPresentationEvtMsgBody(presentation: PresentationVO) - case class SetCurrentPresentationEvtMsgBody(presentationId: String) - case class GetPresentationInfoRespMsgBody(presentations: Vector[PresentationVO]) - case class SetCurrentPageEvtMsgBody(presentationId: String, pageId: String) - case class ResizeAndMovePageEvtMsgBody(presentationId: String, pageId: String, xOffset: Double, yOffset: Double, widthRatio: Double, heightRatio: Double) - case class RemovePresentationEvtMsgBody(presentationId: String) - case class PresentationConversionUpdateEvtMsgBody(messageKey: String, code: String, presentationId: String, presName: String) - case class PresentationPageCountErrorEvtMsgBody(messageKey: String, code: String, presentationId: String, numberOfPages: Int, maxNumberPages: Int, presName: String) - case class PresentationPageGeneratedEvtMsgBody(messageKey: String, code: String, presentationId: String, numberOfPages: Int, pagesCompleted: Int, presName: String) - case class PresentationConversionCompletedEvtMsgBody(messageKey: String, code: String, presentation: PresentationVO) - + + } diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala index 33911e1e84..ca16b61925 100755 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala @@ -33,69 +33,7 @@ case class BbbCoreMessageFromClient(header: BbbClientMsgHeader, body: JsonNode) case class BbbCoreHeaderBody(header: BbbCoreHeader, body: JsonNode) -/** Presentation Messages */ -object SetCurrentPresentationPubMsg { val NAME = "SetCurrentPresentationPubMsg"} -case class SetCurrentPresentationPubMsg(header: BbbClientMsgHeader, body: SetCurrentPresentationPubMsgBody) extends StandardMsg -object GetPresentationInfoReqMsg { val NAME = "GetPresentationInfoReqMsg"} -case class GetPresentationInfoReqMsg(header: BbbClientMsgHeader, body: GetPresentationInfoReqMsgBody) extends StandardMsg -case class GetPresentationInfoReqMsgBody(userId: String) - -object SetCurrentPagePubMsg { val NAME = "SetCurrentPagePubMsg"} -case class SetCurrentPagePubMsg(header: BbbClientMsgHeader, body: SetCurrentPagePubMsgBody) extends StandardMsg - -object ResizeAndMovePagePubMsg { val NAME = "ResizeAndMovePagePubMsg"} -case class ResizeAndMovePagePubMsg(header: BbbClientMsgHeader, body: ResizeAndMovePagePubMsgBody) extends StandardMsg - -object RemovePresentationPubMsg { val NAME = "RemovePresentationPubMsg"} -case class RemovePresentationPubMsg(header: BbbClientMsgHeader, body: RemovePresentationPubMsgBody) extends StandardMsg - -object PreuploadedPresentationsPubMsg { val NAME = "PreuploadedPresentationsPubMsg"} -case class PreuploadedPresentationsPubMsg(header: BbbClientMsgHeader, body: PreuploadedPresentationsPubMsgBody) extends StandardMsg - -object PresentationConversionUpdatePubMsg { val NAME = "PresentationConversionUpdatePubMsg"} -case class PresentationConversionUpdatePubMsg(header: BbbClientMsgHeader, body: PresentationConversionUpdatePubMsgBody) extends StandardMsg - -object PresentationPageCountErrorPubMsg { val NAME = "PresentationPageCountErrorPubMsg"} -case class PresentationPageCountErrorPubMsg(header: BbbClientMsgHeader, body: PresentationPageCountErrorPubMsgBody) extends StandardMsg - -object PresentationPageGeneratedPubMsg { val NAME = "PresentationPageGeneratedPubMsg"} -case class PresentationPageGeneratedPubMsg(header: BbbClientMsgHeader, body: PresentationPageGeneratedPubMsgBody) extends StandardMsg - -object PresentationConversionCompletedPubMsg { val NAME = "PresentationConversionCompletedPubMsg"} -case class PresentationConversionCompletedPubMsg(header: BbbClientMsgHeader, body: PresentationConversionCompletedPubMsgBody) extends StandardMsg - - -/** Presentation Messages */ -object NewPresentationEvtMsg { val NAME = "NewPresentationEvtMsg"} -case class NewPresentationEvtMsg(header: BbbClientMsgHeader, body: NewPresentationEvtMsgBody) extends BbbCoreMsg - -object SetCurrentPresentationEvtMsg { val NAME = "SetCurrentPresentationEvtMsg"} -case class SetCurrentPresentationEvtMsg(header: BbbClientMsgHeader, body: SetCurrentPresentationEvtMsgBody) extends BbbCoreMsg - -object GetPresentationInfoRespMsg { val NAME = "GetPresentationInfoRespMsg"} -case class GetPresentationInfoRespMsg(header: BbbClientMsgHeader, body: GetPresentationInfoRespMsgBody) extends BbbCoreMsg - -object SetCurrentPageEvtMsg { val NAME = "SetCurrentPageEvtMsg"} -case class SetCurrentPageEvtMsg(header: BbbClientMsgHeader, body: SetCurrentPageEvtMsgBody) extends BbbCoreMsg - -object ResizeAndMovePageEvtMsg { val NAME = "ResizeAndMovePageEvtMsg"} -case class ResizeAndMovePageEvtMsg(header: BbbClientMsgHeader, body: ResizeAndMovePageEvtMsgBody) extends BbbCoreMsg - -object RemovePresentationEvtMsg { val NAME = "RemovePresentationEvtMsg"} -case class RemovePresentationEvtMsg(header: BbbClientMsgHeader, body: RemovePresentationEvtMsgBody) extends BbbCoreMsg - -object PresentationConversionUpdateEvtMsg { val NAME = "PresentationConversionUpdateEvtMsg"} -case class PresentationConversionUpdateEvtMsg(header: BbbClientMsgHeader, body: PresentationConversionUpdateEvtMsgBody) extends BbbCoreMsg - -object PresentationPageCountErrorEvtMsg { val NAME = "PresentationPageCountErrorEvtMsg"} -case class PresentationPageCountErrorEvtMsg(header: BbbClientMsgHeader, body: PresentationPageCountErrorEvtMsgBody) extends BbbCoreMsg - -object PresentationPageGeneratedEvtMsg { val NAME = "PresentationPageGeneratedEvtMsg"} -case class PresentationPageGeneratedEvtMsg(header: BbbClientMsgHeader, body: PresentationPageGeneratedEvtMsgBody) extends BbbCoreMsg - -object PresentationConversionCompletedEvtMsg { val NAME = "PresentationConversionCompletedEvtMsg"} -case class PresentationConversionCompletedEvtMsg(header: BbbClientMsgHeader, body: PresentationConversionCompletedEvtMsgBody) extends BbbCoreMsg /** System Messages **/ diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Polls.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Polls.scala new file mode 100755 index 0000000000..c031256252 --- /dev/null +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Polls.scala @@ -0,0 +1,63 @@ +package org.bigbluebutton.common2.messages + +import org.bigbluebutton.common2.domain.{PollVO, SimplePollOutVO, SimplePollResultOutVO} + +object Polls { + + object GetCurrentPollReqMsg { val NAME = "GetCurrentPollReqMsg"} + case class GetCurrentPollReqMsg(header: BbbClientMsgHeader, body: GetCurrentPollReqMsgBody) extends BbbCoreMsg + case class GetCurrentPollReqMsgBody(requesterId: String) + + + object GetCurrentPollRespMsg { val NAME = "GetCurrentPollRespMsg"} + case class GetCurrentPollRespMsg(header: BbbClientMsgHeader, body: GetCurrentPollRespMsgBody) extends BbbCoreMsg + case class GetCurrentPollRespMsgBody(userId: String, hasPoll: Boolean, poll: Option[PollVO]) + + object HidePollResultReqMsg { val NAME = "HidePollResultReqMsg"} + case class HidePollResultReqMsg(header: BbbClientMsgHeader, body: HidePollResultReqMsgBody) extends BbbCoreMsg + case class HidePollResultReqMsgBody(requesterId: String, pollId: String) + + object PollHideResultEvtMsg { val NAME = "PollHideResultEvtMsg" } + case class PollHideResultEvtMsg(header: BbbClientMsgHeader, body: PollHideResultEvtMsgBody) extends BbbCoreMsg + case class PollHideResultEvtMsgBody(userId: String, pollId: String) + + object PollShowResultEvtMsg { val NAME = "PollShowResultEvtMsg" } + case class PollShowResultEvtMsg(header: BbbClientMsgHeader, body: PollShowResultEvtMsgBody) extends BbbCoreMsg + case class PollShowResultEvtMsgBody(userId: String, pollId: String, poll: SimplePollResultOutVO) + + object PollStartedEvtMsg { val NAME = "PollStartedEvtMsg" } + case class PollStartedEvtMsg(header: BbbClientMsgHeader, body: PollStartedEvtMsgBody) extends BbbCoreMsg + case class PollStartedEvtMsgBody(userId: String, pollId: String, poll: SimplePollOutVO) + + object PollStoppedEvtMsg { val NAME = "PollStoppedEvtMsg" } + case class PollStoppedEvtMsg(header: BbbClientMsgHeader, body: PollStoppedEvtMsgBody) extends BbbCoreMsg + case class PollStoppedEvtMsgBody(userId: String, pollId: String) + + object RespondToPollReqMsg { val NAME = "RespondToPollReqMsg"} + case class RespondToPollReqMsg(header: BbbClientMsgHeader, body: RespondToPollReqMsgBody) extends BbbCoreMsg + case class RespondToPollReqMsgBody(requesterId: String, pollId: String, questionId: Int, answerId: Int) + + + object ShowPollResultReqMsg { val NAME = "ShowPollResultReqMsg"} + case class ShowPollResultReqMsg(header: BbbClientMsgHeader, body: ShowPollResultReqMsgBody) extends BbbCoreMsg + case class ShowPollResultReqMsgBody(requesterId: String, pollId: String) + + + object StartCustomPollReqMsg { val NAME = "StartCustomPollReqMsg"} + case class StartCustomPollReqMsg(header: BbbClientMsgHeader, body: StartCustomPollReqMsgBody) extends BbbCoreMsg + case class StartCustomPollReqMsgBody(requesterId: String, pollId: String, pollType: String, answers: Seq[String]) + + + object StartPollReqMsg { val NAME = "StartPollReqMsg"} + case class StartPollReqMsg(header: BbbClientMsgHeader, body: StartPollReqMsgBody) extends BbbCoreMsg + case class StartPollReqMsgBody(requesterId: String, pollId: String, pollType: String) + + object StopPollReqMsg { val NAME = "StopPollReqMsg"} + case class StopPollReqMsg(header: BbbClientMsgHeader, body: StopPollReqMsgBody) extends BbbCoreMsg + case class StopPollReqMsgBody(requesterId: String) + + object UserRespondedToPollEvtMsg { val NAME = "UserRespondedToPollEvtMsg"} + case class UserRespondedToPollEvtMsg(header: BbbClientMsgHeader, body: UserRespondedToPollEvtMsgBody) extends BbbCoreMsg + case class UserRespondedToPollEvtMsgBody(presenterId: String, pollId: String, poll: SimplePollResultOutVO) + +} diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Presentation.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Presentation.scala new file mode 100755 index 0000000000..57d02c8c7f --- /dev/null +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Presentation.scala @@ -0,0 +1,99 @@ +package org.bigbluebutton.common2.messages + +import org.bigbluebutton.common2.domain.PresentationVO +import org.bigbluebutton.common2.messages.MessageBody._ + + +object Presentation { + object PresenterAssignedEvtMsg { val NAME = "PresenterAssignedEvtMsg" } + case class PresenterAssignedEvtMsg(header: BbbClientMsgHeader, body: PresenterAssignedEvtMsgBody) extends BbbCoreMsg + case class PresenterAssignedEvtMsgBody(presenterId: String, presenterName: String, assignedBy: String) + + object PresenterUnassignedEvtMsg { val NAME = "PresenterUnassignedEvtMsg" } + case class PresenterUnassignedEvtMsg(header: BbbClientMsgHeader, body: PresenterUnassignedEvtMsgBody) extends BbbCoreMsg + case class PresenterUnassignedEvtMsgBody(intId: String, name: String, assignedBy: String) + + /** Presentation Messages */ + object SetCurrentPresentationPubMsg { val NAME = "SetCurrentPresentationPubMsg"} + case class SetCurrentPresentationPubMsg(header: BbbClientMsgHeader, body: SetCurrentPresentationPubMsgBody) extends StandardMsg + case class SetCurrentPresentationPubMsgBody(presentationId: String) + + object GetPresentationInfoReqMsg { val NAME = "GetPresentationInfoReqMsg"} + case class GetPresentationInfoReqMsg(header: BbbClientMsgHeader, body: GetPresentationInfoReqMsgBody) extends StandardMsg + case class GetPresentationInfoReqMsgBody(userId: String) + + object SetCurrentPagePubMsg { val NAME = "SetCurrentPagePubMsg"} + case class SetCurrentPagePubMsg(header: BbbClientMsgHeader, body: SetCurrentPagePubMsgBody) extends StandardMsg + case class SetCurrentPagePubMsgBody(presentationId: String, pageId: String) + + object ResizeAndMovePagePubMsg { val NAME = "ResizeAndMovePagePubMsg"} + case class ResizeAndMovePagePubMsg(header: BbbClientMsgHeader, body: ResizeAndMovePagePubMsgBody) extends StandardMsg + case class ResizeAndMovePagePubMsgBody(presentationId: String, pageId: String, xOffset: Double, yOffset: Double, widthRatio: Double, heightRatio: Double) + + object RemovePresentationPubMsg { val NAME = "RemovePresentationPubMsg"} + case class RemovePresentationPubMsg(header: BbbClientMsgHeader, body: RemovePresentationPubMsgBody) extends StandardMsg + case class RemovePresentationPubMsgBody(presentationId: String) + + object PreuploadedPresentationsPubMsg { val NAME = "PreuploadedPresentationsPubMsg"} + case class PreuploadedPresentationsPubMsg(header: BbbClientMsgHeader, body: PreuploadedPresentationsPubMsgBody) extends StandardMsg + case class PreuploadedPresentationsPubMsgBody(presentations: Vector[PresentationVO]) + + object PresentationConversionUpdatePubMsg { val NAME = "PresentationConversionUpdatePubMsg"} + case class PresentationConversionUpdatePubMsg(header: BbbClientMsgHeader, body: PresentationConversionUpdatePubMsgBody) extends StandardMsg + case class PresentationConversionUpdatePubMsgBody(messageKey: String, code: String, presentationId: String, presName: String) + + object PresentationPageCountErrorPubMsg { val NAME = "PresentationPageCountErrorPubMsg"} + case class PresentationPageCountErrorPubMsg(header: BbbClientMsgHeader, body: PresentationPageCountErrorPubMsgBody) extends StandardMsg + case class PresentationPageCountErrorPubMsgBody(messageKey: String, code: String, presentationId: String, numberOfPages: Int, maxNumberPages: Int, presName: String) + + object PresentationPageGeneratedPubMsg { val NAME = "PresentationPageGeneratedPubMsg"} + case class PresentationPageGeneratedPubMsg(header: BbbClientMsgHeader, body: PresentationPageGeneratedPubMsgBody) extends StandardMsg + case class PresentationPageGeneratedPubMsgBody(messageKey: String, code: String, presentationId: String, numberOfPages: Int, pagesCompleted: Int, presName: String) + + object PresentationConversionCompletedPubMsg { val NAME = "PresentationConversionCompletedPubMsg"} + case class PresentationConversionCompletedPubMsg(header: BbbClientMsgHeader, body: PresentationConversionCompletedPubMsgBody) extends StandardMsg + case class PresentationConversionCompletedPubMsgBody(messageKey: String, code: String, presentation: PresentationVO) + + + /** Presentation Messages */ + object NewPresentationEvtMsg { val NAME = "NewPresentationEvtMsg"} + case class NewPresentationEvtMsg(header: BbbClientMsgHeader, body: NewPresentationEvtMsgBody) extends BbbCoreMsg + case class NewPresentationEvtMsgBody(presentation: PresentationVO) + + object SetCurrentPresentationEvtMsg { val NAME = "SetCurrentPresentationEvtMsg"} + case class SetCurrentPresentationEvtMsg(header: BbbClientMsgHeader, body: SetCurrentPresentationEvtMsgBody) extends BbbCoreMsg + case class SetCurrentPresentationEvtMsgBody(presentationId: String) + + object GetPresentationInfoRespMsg { val NAME = "GetPresentationInfoRespMsg"} + case class GetPresentationInfoRespMsg(header: BbbClientMsgHeader, body: GetPresentationInfoRespMsgBody) extends BbbCoreMsg + case class GetPresentationInfoRespMsgBody(presentations: Vector[PresentationVO]) + + object SetCurrentPageEvtMsg { val NAME = "SetCurrentPageEvtMsg"} + case class SetCurrentPageEvtMsg(header: BbbClientMsgHeader, body: SetCurrentPageEvtMsgBody) extends BbbCoreMsg + case class SetCurrentPageEvtMsgBody(presentationId: String, pageId: String) + + object ResizeAndMovePageEvtMsg { val NAME = "ResizeAndMovePageEvtMsg"} + case class ResizeAndMovePageEvtMsg(header: BbbClientMsgHeader, body: ResizeAndMovePageEvtMsgBody) extends BbbCoreMsg + case class ResizeAndMovePageEvtMsgBody(presentationId: String, pageId: String, xOffset: Double, yOffset: Double, widthRatio: Double, heightRatio: Double) + + object RemovePresentationEvtMsg { val NAME = "RemovePresentationEvtMsg"} + case class RemovePresentationEvtMsg(header: BbbClientMsgHeader, body: RemovePresentationEvtMsgBody) extends BbbCoreMsg + case class RemovePresentationEvtMsgBody(presentationId: String) + + object PresentationConversionUpdateEvtMsg { val NAME = "PresentationConversionUpdateEvtMsg"} + case class PresentationConversionUpdateEvtMsg(header: BbbClientMsgHeader, body: PresentationConversionUpdateEvtMsgBody) extends BbbCoreMsg + case class PresentationConversionUpdateEvtMsgBody(messageKey: String, code: String, presentationId: String, presName: String) + + object PresentationPageCountErrorEvtMsg { val NAME = "PresentationPageCountErrorEvtMsg"} + case class PresentationPageCountErrorEvtMsg(header: BbbClientMsgHeader, body: PresentationPageCountErrorEvtMsgBody) extends BbbCoreMsg + case class PresentationPageCountErrorEvtMsgBody(messageKey: String, code: String, presentationId: String, numberOfPages: Int, maxNumberPages: Int, presName: String) + + object PresentationPageGeneratedEvtMsg { val NAME = "PresentationPageGeneratedEvtMsg"} + case class PresentationPageGeneratedEvtMsg(header: BbbClientMsgHeader, body: PresentationPageGeneratedEvtMsgBody) extends BbbCoreMsg + case class PresentationPageGeneratedEvtMsgBody(messageKey: String, code: String, presentationId: String, numberOfPages: Int, pagesCompleted: Int, presName: String) + + object PresentationConversionCompletedEvtMsg { val NAME = "PresentationConversionCompletedEvtMsg"} + case class PresentationConversionCompletedEvtMsg(header: BbbClientMsgHeader, body: PresentationConversionCompletedEvtMsgBody) extends BbbCoreMsg + case class PresentationConversionCompletedEvtMsgBody(messageKey: String, code: String, presentation: PresentationVO) + +} diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/UserJoinedMeetingEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/UserJoinedMeetingEvtMsg.scala deleted file mode 100755 index e0a7a5ffcb..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/UserJoinedMeetingEvtMsg.scala +++ /dev/null @@ -1,17 +0,0 @@ -package org.bigbluebutton.common2.messages - - -object UserJoinedMeetingEvtMsg { - val NAME = "UserJoinedMeetingEvtMsg" - - def apply(meetingId: String, userId: String, body: UserJoinedMeetingEvtMsgBody):UserJoinedMeetingEvtMsg = { - val header = BbbClientMsgHeader(UserJoinedMeetingEvtMsg.NAME, meetingId, userId) - UserJoinedMeetingEvtMsg(header, body) - } -} - -case class UserJoinedMeetingEvtMsg(header: BbbClientMsgHeader, - body: UserJoinedMeetingEvtMsgBody) extends BbbCoreMsg -case class UserJoinedMeetingEvtMsgBody(intId: String, extId: String, name: String, role: String, - guest: Boolean, authed: Boolean, waitingForAcceptance: Boolean, emoji: String, - presenter: Boolean, locked: Boolean, avatar: String) \ No newline at end of file diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/UserLeftMeetingEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/UserLeftMeetingEvtMsg.scala deleted file mode 100755 index 48258e3e2f..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/UserLeftMeetingEvtMsg.scala +++ /dev/null @@ -1,14 +0,0 @@ -package org.bigbluebutton.common2.messages - -object UserLeftMeetingEvtMsg { - val NAME = "UserLeftMeetingEvtMsg" - - def apply(meetingId: String, userId: String, body: UserLeftMeetingEvtMsgBody): UserLeftMeetingEvtMsg = { - val header = BbbClientMsgHeader(UserLeftMeetingEvtMsg.NAME, meetingId, userId) - UserLeftMeetingEvtMsg(header, body) - } -} - -case class UserLeftMeetingEvtMsg(header: BbbClientMsgHeader, - body: UserLeftMeetingEvtMsgBody) extends BbbCoreMsg -case class UserLeftMeetingEvtMsgBody(intId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Users.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Users.scala new file mode 100755 index 0000000000..36366943fa --- /dev/null +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Users.scala @@ -0,0 +1,78 @@ +package org.bigbluebutton.common2.messages + + +object Users { + object RegisterUserReqMsg { val NAME = "RegisterUserReqMsg" } + case class RegisterUserReqMsg(header: BbbCoreHeaderWithMeetingId, + body: RegisterUserReqMsgBody) extends BbbCoreMsg + + case class RegisterUserReqMsgBody(meetingId: String, intUserId: String, name: String, role: String, + extUserId: String, authToken: String, avatarURL: String, + guest: Boolean, authed: Boolean) + + object ValidateAuthTokenReqMsg { + val NAME = "ValidateAuthTokenReqMsg" + + def apply(meetingId: String, userId: String, authToken: String): ValidateAuthTokenReqMsg = { + val header = BbbClientMsgHeader(ValidateAuthTokenReqMsg.NAME, meetingId, userId) + + val body = ValidateAuthTokenReqMsgBody(userId, authToken) + ValidateAuthTokenReqMsg(header, body) + } + } + + case class ValidateAuthTokenReqMsg(header: BbbClientMsgHeader, + body: ValidateAuthTokenReqMsgBody) extends BbbCoreMsg + case class ValidateAuthTokenReqMsgBody(userId: String, authToken: String) + + object ValidateAuthTokenRespMsg { val NAME = "ValidateAuthTokenRespMsg" } + case class ValidateAuthTokenRespMsg(header: BbbClientMsgHeader, + body: ValidateAuthTokenRespMsgBody) extends BbbCoreMsg + case class ValidateAuthTokenRespMsgBody(userId: String, authToken: String, valid: Boolean, waitForApproval: Boolean) + + object UserLeftMeetingEvtMsg { + val NAME = "UserLeftMeetingEvtMsg" + + def apply(meetingId: String, userId: String, body: UserLeftMeetingEvtMsgBody): UserLeftMeetingEvtMsg = { + val header = BbbClientMsgHeader(UserLeftMeetingEvtMsg.NAME, meetingId, userId) + UserLeftMeetingEvtMsg(header, body) + } + } + + case class UserLeftMeetingEvtMsg(header: BbbClientMsgHeader, + body: UserLeftMeetingEvtMsgBody) extends BbbCoreMsg + case class UserLeftMeetingEvtMsgBody(intId: String) + + object UserJoinedMeetingEvtMsg { + val NAME = "UserJoinedMeetingEvtMsg" + + def apply(meetingId: String, userId: String, body: UserJoinedMeetingEvtMsgBody):UserJoinedMeetingEvtMsg = { + val header = BbbClientMsgHeader(UserJoinedMeetingEvtMsg.NAME, meetingId, userId) + UserJoinedMeetingEvtMsg(header, body) + } + } + + case class UserJoinedMeetingEvtMsg(header: BbbClientMsgHeader, + body: UserJoinedMeetingEvtMsgBody) extends BbbCoreMsg + case class UserJoinedMeetingEvtMsgBody(intId: String, extId: String, name: String, role: String, + guest: Boolean, authed: Boolean, waitingForAcceptance: Boolean, emoji: String, + presenter: Boolean, locked: Boolean, avatar: String) + + object GetUsersReqMsg { val NAME = "GetUsersReqMsg" } + case class GetUsersReqMsg(header: BbbClientMsgHeader, body: GetUsersReqMsgBody) extends BbbCoreMsg + case class GetUsersReqMsgBody(requesterId: String) + + + + object UserEmojiChangedEvtMsg { val NAME = "UserEmojiChangedEvtMsg" } + case class UserEmojiChangedEvtMsg(header: BbbClientMsgHeader, body: UserEmojiChangedEvtMsgBody) extends BbbCoreMsg + case class UserEmojiChangedEvtMsgBody(userId: String, emoji: String) + + object UserJoinMeetingReqMsg { val NAME = "UserJoinMeetingReqMsg" } + case class UserJoinMeetingReqMsg(header: BbbClientMsgHeader, body: UserJoinMeetingReqMsgBody) extends BbbCoreMsg + case class UserJoinMeetingReqMsgBody(userId: String, authToken: String) + + object UserLeaveReqMsg { val NAME = "UserLeaveReqMsg" } + case class UserLeaveReqMsg(header: BbbClientMsgHeader, body: UserLeaveReqMsgBody) extends BbbCoreMsg + case class UserLeaveReqMsgBody(userId: String, sessionId: String) +} diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/VoiceConf.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/VoiceConf.scala new file mode 100755 index 0000000000..09d78652a1 --- /dev/null +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/VoiceConf.scala @@ -0,0 +1,128 @@ +package org.bigbluebutton.common2.messages + + +object VoiceConf { + case class BbbCoreVoiceConfHeader(name: String, voiceConf: String) extends BbbCoreHeader + + object DeskshareHangUpVoiceConfMsg { val NAME = "DeskshareHangUpVoiceConfMsg" } + case class DeskshareHangUpVoiceConfMsg(header: BbbCoreHeaderWithMeetingId, + body: DeskshareHangUpVoiceConfMsgBody) extends BbbCoreMsg + case class DeskshareHangUpVoiceConfMsgBody(voiceConf: String, deskshareConf: String, timestamp: String) + + object DeskshareRtmpBroadcastStartedVoiceConfEvtMsg { val NAME = "DeskshareRtmpBroadcastStartedVoiceConfEvtMsg"} + case class DeskshareRtmpBroadcastStartedVoiceConfEvtMsg(header: BbbCoreVoiceConfHeader, + body: DeskshareRtmpBroadcastStartedVoiceConfEvtMsgBody) extends BbbCoreMsg + case class DeskshareRtmpBroadcastStartedVoiceConfEvtMsgBody(voiceConf: String, deskshareConf: String, + stream: String, vidWidth: String, vidHeight: String, + timestamp: String) + + object DeskshareRtmpBroadcastStoppedVoiceConfEvtMsg { val NAME = "DeskshareRtmpBroadcastStoppedVoiceConfEvtMsg"} + case class DeskshareRtmpBroadcastStoppedVoiceConfEvtMsg(header: BbbCoreVoiceConfHeader, + body: DeskshareRtmpBroadcastStoppedVoiceConfEvtMsgBody) extends BbbCoreMsg + case class DeskshareRtmpBroadcastStoppedVoiceConfEvtMsgBody(voiceConf: String, deskshareConf: String, + stream: String, vidWidth: String, vidHeight: String, + timestamp: String) + + object DeskshareStartedVoiceConfEvtMsg { val NAME = "DeskshareStartedVoiceConfEvtMsg" } + case class DeskshareStartedVoiceConfEvtMsg(header: BbbCoreVoiceConfHeader, + body: DeskshareStartedVoiceConfEvtMsgBody) extends BbbCoreMsg + case class DeskshareStartedVoiceConfEvtMsgBody(voiceConf: String, deskshareConf: String, + callerIdNum: String, callerIdName: String) + + object DeskshareStartRtmpBroadcastVoiceConfMsg { val NAME = "DeskshareStartRtmpBroadcastVoiceConfMsg" } + case class DeskshareStartRtmpBroadcastVoiceConfMsg(header: BbbCoreHeaderWithMeetingId, + body: DeskshareStartRtmpBroadcastVoiceConfMsgBody) extends BbbCoreMsg + case class DeskshareStartRtmpBroadcastVoiceConfMsgBody(voiceConf: String, deskshareConf: String, url: String, timestamp: String) + + + object DeskshareStoppedVoiceConfEvtMsg { val NAME = "DeskshareStoppedVoiceConfEvtMsg"} + case class DeskshareStoppedVoiceConfEvtMsg(header: BbbCoreVoiceConfHeader, + body: DeskshareStoppedVoiceConfEvtMsgBody) extends BbbCoreMsg + case class DeskshareStoppedVoiceConfEvtMsgBody(voiceConf: String, deskshareConf: String, + callerIdNum: String, callerIdName: String) + + object DeskshareStopRtmpBroadcastVoiceConfMsg { val NAME = "DeskshareStopRtmpBroadcastVoiceConfMsg" } + case class DeskshareStopRtmpBroadcastVoiceConfMsg(header: BbbCoreHeaderWithMeetingId, + body: DeskshareStopRtmpBroadcastVoiceConfMsgBody) extends BbbCoreMsg + case class DeskshareStopRtmpBroadcastVoiceConfMsgBody(voiceConf: String, deskshareConf: String, url: String, timestamp: String) + + + object EjectAllFromVoiceConfMsg { val NAME = "EjectAllFromVoiceConfMsg" } + case class EjectAllFromVoiceConfMsg(header: BbbCoreHeaderWithMeetingId, + body: EjectAllFromVoiceConfMsgBody) extends BbbCoreMsg + case class EjectAllFromVoiceConfMsgBody(voiceConf: String) + + + object EjectUserFromVoiceConfMsg { val NAME = "EjectUserFromVoiceConfMsg"} + case class EjectUserFromVoiceConfMsg(header: BbbCoreHeaderWithMeetingId, + body: EjectUserFromVoiceConfMsgBody) extends BbbCoreMsg + case class EjectUserFromVoiceConfMsgBody(voiceConf: String, voiceUserId: String) + + object MuteUserInVoiceConfMsg { val NAME = "MuteUserInVoiceConfMsg" } + case class MuteUserInVoiceConfMsg(header: BbbCoreHeaderWithMeetingId, + body: MuteUserInVoiceConfMsgBody) extends BbbCoreMsg + case class MuteUserInVoiceConfMsgBody(voiceConf: String, voiceUserId: String, mute: Boolean) + + object RecordingStartedVoiceConfEvtMsg { val NAME = "RecordingStartedVoiceConfEvtMsg" } + case class RecordingStartedVoiceConfEvtMsg(header: BbbCoreVoiceConfHeader, + body: RecordingStartedVoiceConfEvtMsgBody) extends BbbCoreMsg + case class RecordingStartedVoiceConfEvtMsgBody(voiceConf: String, stream: String, recording: Boolean, timestamp: String) + + object StartRecordingVoiceConfMsg { val NAME = "StartRecordingVoiceConfMsg" } + case class StartRecordingVoiceConfMsg(header: BbbCoreHeaderWithMeetingId, + body: StartRecordingVoiceConfMsgBody) extends BbbCoreMsg + case class StartRecordingVoiceConfMsgBody(voiceConf: String, meetingId: String) + + object StopRecordingVoiceConfMsg { val NAME = "StopRecordingVoiceConfMsg" } + case class StopRecordingVoiceConfMsg(header: BbbCoreHeaderWithMeetingId, + body: StopRecordingVoiceConfMsgBody) extends BbbCoreMsg + case class StopRecordingVoiceConfMsgBody(voiceConf: String, meetingId: String, stream: String) + + object TransferUserToVoiceConfMsg { val NAME = "TransferUserToVoiceConfMsg" } + case class TransferUserToVoiceConfMsg(header: BbbCoreHeaderWithMeetingId, + body: TransferUserToVoiceConfMsgBody) extends BbbCoreMsg + case class TransferUserToVoiceConfMsgBody(fromVoiceConf: String, toVoiceConf: String, voiceUserId: String) + + object UserJoinedVoiceConfEvtMsg { val NAME = "UserJoinedVoiceConfEvtMsg" } + case class UserJoinedVoiceConfEvtMsg(header: BbbCoreVoiceConfHeader, + body: UserJoinedVoiceConfEvtMsgBody) extends BbbCoreMsg + case class UserJoinedVoiceConfEvtMsgBody(voiceConf: String, voiceUserId: String, intId: String, + callerIdName: String, callerIdNum: String, muted: Boolean, + talking: Boolean, callingWith: String) + + object UserJoinedVoiceConfToClientEvtMsg { val NAME = "UserJoinedVoiceConfToClientEvtMsg" } + case class UserJoinedVoiceConfToClientEvtMsg(header: BbbClientMsgHeader, body: UserJoinedVoiceConfToClientEvtMsgBody) extends BbbCoreMsg + case class UserJoinedVoiceConfToClientEvtMsgBody(intId: String, voiceUserId: String, callerName: String, + callerNum: String, muted: Boolean, + talking: Boolean, callingWith: String, listenOnly: Boolean) + + object UserLeftVoiceConfEvtMsg { val NAME = "UserLeftVoiceConfEvtMsg" } + case class UserLeftVoiceConfEvtMsg(header: BbbCoreVoiceConfHeader, + body: UserLeftVoiceConfEvtMsgBody) extends BbbCoreMsg + case class UserLeftVoiceConfEvtMsgBody(voiceConf: String, voiceUserId: String) + + object UserLeftVoiceConfToClientEvtMsg { val NAME = "UserLeftVoiceConfToClientEvtMsg" } + case class UserLeftVoiceConfToClientEvtMsg(header: BbbClientMsgHeader, body: UserLeftVoiceConfToClientEvtMsgBody) extends BbbCoreMsg + case class UserLeftVoiceConfToClientEvtMsgBody(intId: String, voiceUserId: String) + + object UserMutedEvtMsg { val NAME = "UserMutedEvtMsg" } + case class UserMutedEvtMsg(header: BbbClientMsgHeader, body: UserMutedEvtMsgBody) extends BbbCoreMsg + case class UserMutedEvtMsgBody(intId: String, voiceUserId: String, muted: Boolean) + + object UserMutedInVoiceConfEvtMsg { val NAME = "UserMutedInVoiceConfEvtMsg" } + case class UserMutedInVoiceConfEvtMsg(header: BbbCoreVoiceConfHeader, + body: UserMutedInVoiceConfEvtMsgBody) extends BbbCoreMsg + case class UserMutedInVoiceConfEvtMsgBody(voiceConf: String, voiceUserId: String, muted: Boolean) + + + object UserTalkingEvtMsg { val NAME = "UserTalkingEvtMsg" } + case class UserTalkingEvtMsg(header: BbbClientMsgHeader, body: UserTalkingEvtMsgBody) extends BbbCoreMsg + case class UserTalkingEvtMsgBody(intId: String, voiceUserId: String, talking: Boolean) + + object UserTalkingInVoiceConfEvtMsg { val NAME = "UserTalkingInVoiceConfEvtMsg" } + case class UserTalkingInVoiceConfEvtMsg(header: BbbCoreVoiceConfHeader, + body: UserTalkingInVoiceConfEvtMsgBody) extends BbbCoreMsg + case class UserTalkingInVoiceConfEvtMsgBody(voiceConf: String, voiceUserId: String, talking: Boolean) + + +} diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Webcams.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Webcams.scala new file mode 100755 index 0000000000..2545cd6ba4 --- /dev/null +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Webcams.scala @@ -0,0 +1,56 @@ +package org.bigbluebutton.common2.messages + +object Webcams { + object UserBroadcastCamStartedEvtMsg { val NAME = "UserBroadcastCamStartedEvtMsg" } + case class UserBroadcastCamStartedEvtMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStartedEvtMsgBody) extends BbbCoreMsg + case class UserBroadcastCamStartedEvtMsgBody(userId: String, stream: String) + + object UserBroadcastCamStartMsg { val NAME = "UserBroadcastCamStartMsg" } + case class UserBroadcastCamStartMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStartMsgBody) extends BbbCoreMsg + case class UserBroadcastCamStartMsgBody(stream: String) + + + object UserBroadcastCamStopMsg { val NAME = "UserBroadcastCamStopMsg" } + case class UserBroadcastCamStopMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStopMsgBody) extends BbbCoreMsg + case class UserBroadcastCamStopMsgBody(stream: String) + + object UserBroadcastCamStoppedEvtMsg { val NAME = "UserBroadcastCamStoppedEvtMsg" } + case class UserBroadcastCamStoppedEvtMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStoppedEvtMsgBody) extends BbbCoreMsg + case class UserBroadcastCamStoppedEvtMsgBody(userId: String, stream: String) + + + + object GetWebcamStreamsMeetingRespMsg { + val NAME = "GetWebcamStreamsMeetingRespMsg" + + def apply(meetingId: String, userId: String, streams: Vector[WebcamStreamVO]): GetWebcamStreamsMeetingRespMsg = { + val header = BbbClientMsgHeader(GetWebcamStreamsMeetingRespMsg.NAME, meetingId, userId) + + val body = GetWebcamStreamsMeetingRespMsgBody(streams) + GetWebcamStreamsMeetingRespMsg(header, body) + } + } + + + case class GetWebcamStreamsMeetingRespMsg(header: BbbClientMsgHeader, body: GetWebcamStreamsMeetingRespMsgBody) extends BbbCoreMsg + case class GetWebcamStreamsMeetingRespMsgBody(streams: Vector[WebcamStreamVO]) + + case class WebcamStreamVO(streamId: String, stream: MediaStreamVO) + case class MediaStreamVO(id: String, url: String, userId: String, attributes: collection.immutable.Map[String, String], viewers: Set[String]) + + + object GetWebcamStreamsRespMsg { + val NAME = "GetWebcamStreamsRespMsg" + + def apply(meetingId: String, userId: String, webcamStreams: Vector[String]): GetWebcamStreamsRespMsg = { + val header = BbbClientMsgHeader(GetWebcamStreamsRespMsg.NAME, meetingId, userId) + + val body = GetWebcamStreamsRespMsgBody(webcamStreams) + GetWebcamStreamsRespMsg(header, body) + } + } + + case class GetWebcamStreamsRespMsg(header: BbbClientMsgHeader, body: GetWebcamStreamsRespMsgBody) extends BbbCoreMsg + case class GetWebcamStreamsRespMsgBody(webcamStreams: Vector[String]) + +} diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Whiteboard.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Whiteboard.scala new file mode 100755 index 0000000000..fea5a5703b --- /dev/null +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Whiteboard.scala @@ -0,0 +1,119 @@ +package org.bigbluebutton.common2.messages + +import org.bigbluebutton.common2.domain.AnnotationVO + +object Whiteboard { + + object ClearWhiteboardEvtMsg { + val NAME = "ClearWhiteboardEvtMsg" + } + + case class ClearWhiteboardEvtMsg(header: BbbClientMsgHeader, body: ClearWhiteboardEvtMsgBody) extends BbbCoreMsg + + case class ClearWhiteboardEvtMsgBody(whiteboardId: String, userId: String, fullClear: Boolean) + + object ClearWhiteboardPubMsg { + val NAME = "ClearWhiteboardPubMsg" + } + + case class ClearWhiteboardPubMsg(header: BbbClientMsgHeader, body: ClearWhiteboardPubMsgBody) extends StandardMsg + + case class ClearWhiteboardPubMsgBody(whiteboardId: String) + + object GetWhiteboardAccessReqMsg { + val NAME = "GetWhiteboardAccessReqMsg" + } + + case class GetWhiteboardAccessReqMsg(header: BbbClientMsgHeader, body: GetWhiteboardAccessReqMsgBody) extends StandardMsg + + case class GetWhiteboardAccessReqMsgBody(requesterId: String) + + object GetWhiteboardAccessRespMsg { + val NAME = "GetWhiteboardAccessRespMsg" + } + + case class GetWhiteboardAccessRespMsg(header: BbbClientMsgHeader, body: GetWhiteboardAccessRespMsgBody) extends BbbCoreMsg + + case class GetWhiteboardAccessRespMsgBody(multiUser: Boolean) + + object GetWhiteboardAnnotationsReqMsg { + val NAME = "GetWhiteboardAnnotationsReqMsg" + } + + case class GetWhiteboardAnnotationsReqMsg(header: BbbClientMsgHeader, body: GetWhiteboardAnnotationsReqMsgBody) extends StandardMsg + + case class GetWhiteboardAnnotationsReqMsgBody(whiteboardId: String) + + object GetWhiteboardAnnotationsRespMsg { + val NAME = "GetWhiteboardAnnotationsRespMsg" + } + + case class GetWhiteboardAnnotationsRespMsg(header: BbbClientMsgHeader, body: GetWhiteboardAnnotationsRespMsgBody) extends BbbCoreMsg + + case class GetWhiteboardAnnotationsRespMsgBody(whiteboardId: String, annotations: Array[AnnotationVO]) + + object ModifyWhiteboardAccessEvtMsg { + val NAME = "ModifyWhiteboardAccessEvtMsg" + } + + case class ModifyWhiteboardAccessEvtMsg(header: BbbClientMsgHeader, body: ModifyWhiteboardAccessEvtMsgBody) extends BbbCoreMsg + + case class ModifyWhiteboardAccessEvtMsgBody(multiUser: Boolean) + + object ModifyWhiteboardAccessPubMsg { + val NAME = "ModifyWhiteboardAccessPubMsg" + } + + case class ModifyWhiteboardAccessPubMsg(header: BbbClientMsgHeader, body: ModifyWhiteboardAccessPubMsgBody) extends StandardMsg + + case class ModifyWhiteboardAccessPubMsgBody(multiUser: Boolean) + + object SendCursorPositionEvtMsg { + val NAME = "SendCursorPositionEvtMsg" + } + + case class SendCursorPositionEvtMsg(header: BbbClientMsgHeader, body: SendCursorPositionEvtMsgBody) extends BbbCoreMsg + + case class SendCursorPositionEvtMsgBody(xPercent: Double, yPercent: Double) + + object SendCursorPositionPubMsg { + val NAME = "SendCursorPositionPubMsg" + } + + case class SendCursorPositionPubMsg(header: BbbClientMsgHeader, body: SendCursorPositionPubMsgBody) extends StandardMsg + + case class SendCursorPositionPubMsgBody(xPercent: Double, yPercent: Double) + + object SendWhiteboardAnnotationEvtMsg { + val NAME = "SendWhiteboardAnnotationEvtMsg" + } + + case class SendWhiteboardAnnotationEvtMsg(header: BbbClientMsgHeader, body: SendWhiteboardAnnotationEvtMsgBody) extends BbbCoreMsg + + case class SendWhiteboardAnnotationEvtMsgBody(annotation: AnnotationVO) + + object SendWhiteboardAnnotationPubMsg { + val NAME = "SendWhiteboardAnnotationPubMsg" + } + + case class SendWhiteboardAnnotationPubMsg(header: BbbClientMsgHeader, body: SendWhiteboardAnnotationPubMsgBody) extends StandardMsg + + case class SendWhiteboardAnnotationPubMsgBody(annotation: AnnotationVO) + + object UndoWhiteboardEvtMsg { + val NAME = "UndoWhiteboardEvtMsg" + } + + case class UndoWhiteboardEvtMsg(header: BbbClientMsgHeader, body: UndoWhiteboardEvtMsgBody) extends BbbCoreMsg + + case class UndoWhiteboardEvtMsgBody(whiteboardId: String, userId: String, annotationId: String) + + object UndoWhiteboardPubMsg { + val NAME = "UndoWhiteboardPubMsg" + } + + case class UndoWhiteboardPubMsg(header: BbbClientMsgHeader, body: UndoWhiteboardPubMsgBody) extends StandardMsg + + case class UndoWhiteboardPubMsgBody(whiteboardId: String) + +} diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomCreatedMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomCreatedMsg.scala deleted file mode 100755 index 1264e7f5c7..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomCreatedMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.breakoutrooms - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object BreakoutRoomCreatedMsg { val NAME = "BreakoutRoomCreatedMsg" } -case class BreakoutRoomCreatedMsg(header: BbbClientMsgHeader, body: BreakoutRoomCreatedMsgBody) extends BbbCoreMsg -case class BreakoutRoomCreatedMsgBody(meetingId: String, breakoutRoomId: String) - diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomEndedEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomEndedEvtMsg.scala deleted file mode 100755 index 7ed740de11..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomEndedEvtMsg.scala +++ /dev/null @@ -1,7 +0,0 @@ -package org.bigbluebutton.common2.messages.breakoutrooms - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object BreakoutRoomEndedEvtMsg { val NAME = "BreakoutRoomEndedEvtMsg" } -case class BreakoutRoomEndedEvtMsg(header: BbbClientMsgHeader, body: BreakoutRoomEndedEvtMsgBody) extends BbbCoreMsg -case class BreakoutRoomEndedEvtMsgBody(parentMeetingId: String, meetingId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomEndedMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomEndedMsg.scala deleted file mode 100755 index 7ee2fb3696..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomEndedMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.breakoutrooms - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -// Sent by breakout actor to tell meeting actor that breakout room has been ended -object BreakoutRoomEndedMsg { val NAME = "BreakoutRoomEndedMsg" } -case class BreakoutRoomEndedMsg(header: BbbClientMsgHeader, body: BreakoutRoomEndedMsgBody) extends BbbCoreMsg -case class BreakoutRoomEndedMsgBody(meetingId: String, breakoutRoomId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomJoinURLEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomJoinURLEvtMsg.scala deleted file mode 100755 index 297615fe64..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomJoinURLEvtMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.breakoutrooms - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object BreakoutRoomJoinURLEvtMsg { val NAME = "BreakoutRoomJoinURLEvtMsg" } -case class BreakoutRoomJoinURLEvtMsg(header: BbbClientMsgHeader, body: BreakoutRoomJoinURLEvtMsgBody) extends BbbCoreMsg -case class BreakoutRoomJoinURLEvtMsgBody(parentMeetingId: String, recorded: Boolean, breakoutMeetingId: String, userId: String, redirectJoinURL: String, noRedirectJoinURL: String) - diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomStartedEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomStartedEvtMsg.scala deleted file mode 100755 index b64fadfffd..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomStartedEvtMsg.scala +++ /dev/null @@ -1,7 +0,0 @@ -package org.bigbluebutton.common2.messages.breakoutrooms - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object BreakoutRoomStartedEvtMsg { val NAME = "BreakoutRoomStartedEvtMsg" } -case class BreakoutRoomStartedEvtMsg(header: BbbClientMsgHeader, body: BreakoutRoomStartedEvtMsgBody) extends BbbCoreMsg -case class BreakoutRoomStartedEvtMsgBody(parentMeetingId: String, recorded: Boolean, breakout: BreakoutRoomInfo) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomUsersUpdateMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomUsersUpdateMsg.scala deleted file mode 100755 index ce0722fa6d..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomUsersUpdateMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.breakoutrooms - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -// Sent by breakout actor to tell meeting actor the list of users in the breakout room. -object BreakoutRoomUsersUpdateMsg { val NAME = "BreakoutRoomUsersUpdateMsg" } -case class BreakoutRoomUsersUpdateMsg(header: BbbClientMsgHeader, body: BreakoutRoomUsersUpdateMsgBody) extends BbbCoreMsg -case class BreakoutRoomUsersUpdateMsgBody(meetingId: String, breakoutMeetingId: String, users: Vector[BreakoutUserVO]) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomsListEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomsListEvtMsg.scala deleted file mode 100755 index 4180f3bf49..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomsListEvtMsg.scala +++ /dev/null @@ -1,9 +0,0 @@ -package org.bigbluebutton.common2.messages.breakoutrooms - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -// Outgoing messages -object BreakoutRoomsListEvtMsg { val NAME = "BreakoutRoomsListEvtMsg" } -case class BreakoutRoomsListEvtMsg(header: BbbClientMsgHeader, body: BreakoutRoomsListEvtMsgBody) extends BbbCoreMsg -case class BreakoutRoomsListEvtMsgBody(meetingId: String, rooms: Vector[BreakoutRoomInfo], roomsReady: Boolean) -case class BreakoutRoomInfo(name: String, externalMeetingId: String, meetingId: String, sequence: Int) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomsListMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomsListMsg.scala deleted file mode 100755 index 92039d3e08..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomsListMsg.scala +++ /dev/null @@ -1,7 +0,0 @@ -package org.bigbluebutton.common2.messages.breakoutrooms - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object BreakoutRoomsListMsg { val NAME = "BreakoutRoomsListMsg" } -case class BreakoutRoomsListMsg(header: BbbClientMsgHeader, body: BreakoutRoomsListMsgBody) extends BbbCoreMsg -case class BreakoutRoomsListMsgBody(meetingId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomsTimeRemainingUpdateEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomsTimeRemainingUpdateEvtMsg.scala deleted file mode 100755 index cc96d29858..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/BreakoutRoomsTimeRemainingUpdateEvtMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.breakoutrooms - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object BreakoutRoomsTimeRemainingUpdateEvtMsg { val NAME = "BreakoutRoomsTimeRemainingUpdateEvtMsg" } -case class BreakoutRoomsTimeRemainingUpdateEvtMsg(header: BbbClientMsgHeader, body: BreakoutRoomsTimeRemainingUpdateEvtMsgBody) extends BbbCoreMsg -case class BreakoutRoomsTimeRemainingUpdateEvtMsgBody(meetingId: String, recorded: Boolean, timeRemaining: Int) - diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/CreateBreakoutRoomEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/CreateBreakoutRoomEvtMsg.scala deleted file mode 100755 index ec3a805a65..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/CreateBreakoutRoomEvtMsg.scala +++ /dev/null @@ -1,11 +0,0 @@ -package org.bigbluebutton.common2.messages.breakoutrooms - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - - -object CreateBreakoutRoomEvtMsg { val NAME = "CreateBreakoutRoomEvtMsg" } -case class CreateBreakoutRoomEvtMsg(header: BbbClientMsgHeader, body: CreateBreakoutRoomEvtMsgBody) extends BbbCoreMsg -case class CreateBreakoutRoomEvtMsgBody(meetingId: String, room: BreakoutRoomDetail) -case class BreakoutRoomDetail(breakoutMeetingId: String, name: String, parentId: String, sequence: Integer, - voiceConfId: String, durationInMinutes: Int, moderatorPassword: String, viewerPassword: String, - sourcePresentationId: String, sourcePresentationSlide: Int, record: Boolean) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/CreateBreakoutRoomsMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/CreateBreakoutRoomsMsg.scala deleted file mode 100755 index 06e9882ed9..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/CreateBreakoutRoomsMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.breakoutrooms - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object CreateBreakoutRoomsMsg { val NAME = "CreateBreakoutRoomsMsg" } -case class CreateBreakoutRoomsMsg(header: BbbClientMsgHeader, body: CreateBreakoutRoomsMsgBody) extends BbbCoreMsg -case class CreateBreakoutRoomsMsgBody(meetingId: String, durationInMinutes: Int, record: Boolean, rooms: Vector[BreakoutRoomMsgBody]) -case class BreakoutRoomMsgBody(name: String, sequence: Int, users: Vector[String]) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/EndAllBreakoutRoomsMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/EndAllBreakoutRoomsMsg.scala deleted file mode 100755 index eec03fc62f..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/EndAllBreakoutRoomsMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.breakoutrooms - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -// Sent by user to request ending all the breakout rooms -object EndAllBreakoutRoomsMsg { val NAME = "EndAllBreakoutRoomsMsg" } -case class EndAllBreakoutRoomsMsg(header: BbbClientMsgHeader, body: EndAllBreakoutRoomsMsgBody) extends BbbCoreMsg -case class EndAllBreakoutRoomsMsgBody(meetingId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/EndBreakoutRoomEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/EndBreakoutRoomEvtMsg.scala deleted file mode 100755 index 79cca48271..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/EndBreakoutRoomEvtMsg.scala +++ /dev/null @@ -1,7 +0,0 @@ -package org.bigbluebutton.common2.messages.breakoutrooms - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object EndBreakoutRoomEvtMsg { val NAME = "EndBreakoutRoomEvtMsg" } -case class EndBreakoutRoomEvtMsg(header: BbbClientMsgHeader, body: EndBreakoutRoomEvtMsgBody) extends BbbCoreMsg -case class EndBreakoutRoomEvtMsgBody(breakoutMeetingId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/MeetingTimeRemainingUpdateEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/MeetingTimeRemainingUpdateEvtMsg.scala deleted file mode 100755 index 40c629b661..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/MeetingTimeRemainingUpdateEvtMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.breakoutrooms - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - - -object MeetingTimeRemainingUpdateEvtMsg { val NAME = "MeetingTimeRemainingUpdateEvtMsg" } -case class MeetingTimeRemainingUpdateEvtMsg(header: BbbClientMsgHeader, body: MeetingTimeRemainingUpdateEvtMsgBody) extends BbbCoreMsg -case class MeetingTimeRemainingUpdateEvtMsgBody(meetingId: String, recorded: Boolean, timeRemaining: Int) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/Messages.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/Messages.scala deleted file mode 100755 index d6a2d1875d..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/Messages.scala +++ /dev/null @@ -1,11 +0,0 @@ -package org.bigbluebutton.common2.messages.breakoutrooms - -import org.bigbluebutton.common2.messages.BbbClientMsgHeader -import org.bigbluebutton.common2.messages.BbbCoreMsg - - - -// Common Value objects -case class BreakoutUserVO(id: String, name: String) -case class BreakoutRoomVO(id: String, externalMeetingId: String, name: String, parentRoomId: String, sequence: Integer, voiceConfId: String, - assignedUsers: Vector[String], users: Vector[BreakoutUserVO]) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/RequestBreakoutJoinURLMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/RequestBreakoutJoinURLMsg.scala deleted file mode 100755 index f5c645dc64..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/RequestBreakoutJoinURLMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.breakoutrooms - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - - -object RequestBreakoutJoinURLMsg { val NAME = "RequestBreakoutJoinURLMsg" } -case class RequestBreakoutJoinURLMsg(header: BbbClientMsgHeader, body: RequestBreakoutJoinURLMsgBody) extends BbbCoreMsg -case class RequestBreakoutJoinURLMsgBody(meetingId: String, breakoutMeetingId: String, userId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/SendBreakoutUsersUpdateMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/SendBreakoutUsersUpdateMsg.scala deleted file mode 100755 index e955658a5d..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/SendBreakoutUsersUpdateMsg.scala +++ /dev/null @@ -1,9 +0,0 @@ -package org.bigbluebutton.common2.messages.breakoutrooms - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - - -// Send by internal actor to tell the breakout actor to send it's list of users to the main meeting actor. -object SendBreakoutUsersUpdateMsg { val NAME = "SendBreakoutUsersUpdateMsg" } -case class SendBreakoutUsersUpdateMsg(header: BbbClientMsgHeader, body: SendBreakoutUsersUpdateMsgBody) extends BbbCoreMsg -case class SendBreakoutUsersUpdateMsgBody(meetingId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/TransferUserToMeetingEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/TransferUserToMeetingEvtMsg.scala deleted file mode 100755 index 0531a604e8..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/TransferUserToMeetingEvtMsg.scala +++ /dev/null @@ -1,7 +0,0 @@ -package org.bigbluebutton.common2.messages.breakoutrooms - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object TransferUserToMeetingEvtMsg { val NAME = "TransferUserToMeetingEvtMsg" } -case class TransferUserToMeetingEvtMsg(header: BbbClientMsgHeader, body: TransferUserToMeetingEvtMsgBody) extends BbbCoreMsg -case class TransferUserToMeetingEvtMsgBody(voiceConfId: String, targetVoiceConfId: String, userId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/TransferUserToMeetingRequestMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/TransferUserToMeetingRequestMsg.scala deleted file mode 100755 index 0c89dad10c..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/TransferUserToMeetingRequestMsg.scala +++ /dev/null @@ -1,9 +0,0 @@ -package org.bigbluebutton.common2.messages.breakoutrooms - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - - -// Sent by user actor to ask for voice conference transfer -object TransferUserToMeetingRequestMsg { val NAME = "TransferUserToMeetingRequestMsg" } -case class TransferUserToMeetingRequestMsg(header: BbbClientMsgHeader, body: TransferUserToMeetingRequestMsgBody) extends BbbCoreMsg -case class TransferUserToMeetingRequestMsgBody(meetingId: String, targetMeetingId: String, userId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/UpdateBreakoutUsersEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/UpdateBreakoutUsersEvtMsg.scala deleted file mode 100755 index 6531ae5a5b..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/breakoutrooms/UpdateBreakoutUsersEvtMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.breakoutrooms - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object UpdateBreakoutUsersEvtMsg { val NAME = "UpdateBreakoutUsersEvtMsg" } -case class UpdateBreakoutUsersEvtMsg(header: BbbClientMsgHeader, body: UpdateBreakoutUsersEvtMsgBody) extends BbbCoreMsg -case class UpdateBreakoutUsersEvtMsgBody(parentMeetingId: String, recorded: Boolean, breakoutMeetingId: String, users: Vector[BreakoutUserVO]) - diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/layout/Messages.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/layout/Messages.scala deleted file mode 100644 index 6f2dbf2325..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/layout/Messages.scala +++ /dev/null @@ -1,35 +0,0 @@ -package org.bigbluebutton.common2.messages.layout - -import org.bigbluebutton.common2.domain.UserVO -import org.bigbluebutton.common2.messages.BbbClientMsgHeader -import org.bigbluebutton.common2.messages.BbbCoreMsg - -// In messages -object GetCurrentLayoutMsg { val NAME = "GetCurrentLayoutMsg" } -case class GetCurrentLayoutMsg(header: BbbClientMsgHeader, body: GetCurrentLayoutMsgBody) extends BbbCoreMsg -case class GetCurrentLayoutMsgBody(meetingId: String, requesterId: String) - -object LockLayoutMsg { val NAME = "LockLayoutMsg" } -case class LockLayoutMsg(header: BbbClientMsgHeader, body: LockLayoutMsgBody) extends BbbCoreMsg -case class LockLayoutMsgBody(meetingId: String, setById: String, lock: Boolean, viewersOnly: Boolean, - layout: Option[String]) - -object BroadcastLayoutMsg { val NAME = "BroadcastLayoutMsg" } -case class BroadcastLayoutMsg(header: BbbClientMsgHeader, body: BroadcastLayoutMsgBody) extends BbbCoreMsg -case class BroadcastLayoutMsgBody(meetingId: String, requesterId: String, layout: String) - -// Out messages -object GetCurrentLayoutEvtMsg { val NAME = "GetCurrentLayoutEvtMsg" } -case class GetCurrentLayoutEvtMsg(header: BbbClientMsgHeader, body: GetCurrentLayoutEvtMsgBody) extends BbbCoreMsg -case class GetCurrentLayoutEvtMsgBody(meetingId: String, recorded: Boolean, requesterId: String, layoutId: String, - locked: Boolean, setByUserId: String) - -object BroadcastLayoutEvtMsg { val NAME = "BroadcastLayoutEvtMsg" } -case class BroadcastLayoutEvtMsg(header: BbbClientMsgHeader, body: BroadcastLayoutEvtMsgBody) extends BbbCoreMsg -case class BroadcastLayoutEvtMsgBody(meetingId: String, recorded: Boolean, requesterId: String, - layoutId: String, locked: Boolean, setByUserId: String, applyTo: Array[UserVO]) - -object LockLayoutEvtMsg { val NAME = "LockLayoutEvtMsg" } -case class LockLayoutEvtMsg(header: BbbClientMsgHeader, body: LockLayoutEvtMsgBody) extends BbbCoreMsg -case class LockLayoutEvtMsgBody(meetingId: String, recorded: Boolean, setById: String, locked: Boolean, - applyTo: Array[UserVO]) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/GetCurrentPollReqMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/GetCurrentPollReqMsg.scala deleted file mode 100755 index 318e255e3d..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/GetCurrentPollReqMsg.scala +++ /dev/null @@ -1,7 +0,0 @@ -package org.bigbluebutton.common2.messages.polls - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object GetCurrentPollReqMsg { val NAME = "GetCurrentPollReqMsg"} -case class GetCurrentPollReqMsg(header: BbbClientMsgHeader, body: GetCurrentPollReqMsgBody) extends BbbCoreMsg -case class GetCurrentPollReqMsgBody(requesterId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/GetCurrentPollRespMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/GetCurrentPollRespMsg.scala deleted file mode 100755 index 753bd326b1..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/GetCurrentPollRespMsg.scala +++ /dev/null @@ -1,9 +0,0 @@ -package org.bigbluebutton.common2.messages.polls - -import org.bigbluebutton.common2.domain.PollVO -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - - -object GetCurrentPollRespMsg { val NAME = "GetCurrentPollRespMsg"} -case class GetCurrentPollRespMsg(header: BbbClientMsgHeader, body: GetCurrentPollRespMsgBody) extends BbbCoreMsg -case class GetCurrentPollRespMsgBody(userId: String, hasPoll: Boolean, poll: Option[PollVO]) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/HidePollResultReqMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/HidePollResultReqMsg.scala deleted file mode 100755 index dea02f7d2d..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/HidePollResultReqMsg.scala +++ /dev/null @@ -1,7 +0,0 @@ -package org.bigbluebutton.common2.messages.polls - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object HidePollResultReqMsg { val NAME = "HidePollResultReqMsg"} -case class HidePollResultReqMsg(header: BbbClientMsgHeader, body: HidePollResultReqMsgBody) extends BbbCoreMsg -case class HidePollResultReqMsgBody(requesterId: String, pollId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/PollHideResultEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/PollHideResultEvtMsg.scala deleted file mode 100755 index 7c343d2ccf..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/PollHideResultEvtMsg.scala +++ /dev/null @@ -1,7 +0,0 @@ -package org.bigbluebutton.common2.messages.polls - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object PollHideResultEvtMsg { val NAME = "PollHideResultEvtMsg" } -case class PollHideResultEvtMsg(header: BbbClientMsgHeader, body: PollHideResultEvtMsgBody) extends BbbCoreMsg -case class PollHideResultEvtMsgBody(userId: String, pollId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/PollShowResultEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/PollShowResultEvtMsg.scala deleted file mode 100755 index 5e36923b97..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/PollShowResultEvtMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.polls - -import org.bigbluebutton.common2.domain.SimplePollResultOutVO -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object PollShowResultEvtMsg { val NAME = "PollShowResultEvtMsg" } -case class PollShowResultEvtMsg(header: BbbClientMsgHeader, body: PollShowResultEvtMsgBody) extends BbbCoreMsg -case class PollShowResultEvtMsgBody(userId: String, pollId: String, poll: SimplePollResultOutVO) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/PollStartedEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/PollStartedEvtMsg.scala deleted file mode 100755 index a65b9c9a86..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/PollStartedEvtMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.polls - -import org.bigbluebutton.common2.domain.SimplePollOutVO -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object PollStartedEvtMsg { val NAME = "PollStartedEvtMsg" } -case class PollStartedEvtMsg(header: BbbClientMsgHeader, body: PollStartedEvtMsgBody) extends BbbCoreMsg -case class PollStartedEvtMsgBody(userId: String, pollId: String, poll: SimplePollOutVO) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/PollStoppedEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/PollStoppedEvtMsg.scala deleted file mode 100755 index ee6a49def3..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/PollStoppedEvtMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.polls - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - - -object PollStoppedEvtMsg { val NAME = "PollStoppedEvtMsg" } -case class PollStoppedEvtMsg(header: BbbClientMsgHeader, body: PollStoppedEvtMsgBody) extends BbbCoreMsg -case class PollStoppedEvtMsgBody(userId: String, pollId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/RespondToPollReqMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/RespondToPollReqMsg.scala deleted file mode 100755 index 1be8fe94b3..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/RespondToPollReqMsg.scala +++ /dev/null @@ -1,7 +0,0 @@ -package org.bigbluebutton.common2.messages.polls - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object RespondToPollReqMsg { val NAME = "RespondToPollReqMsg"} -case class RespondToPollReqMsg(header: BbbClientMsgHeader, body: RespondToPollReqMsgBody) extends BbbCoreMsg -case class RespondToPollReqMsgBody(requesterId: String, pollId: String, questionId: Int, answerId: Int) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/ShowPollResultReqMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/ShowPollResultReqMsg.scala deleted file mode 100755 index 791c972bea..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/ShowPollResultReqMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.polls - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - - -object ShowPollResultReqMsg { val NAME = "ShowPollResultReqMsg"} -case class ShowPollResultReqMsg(header: BbbClientMsgHeader, body: ShowPollResultReqMsgBody) extends BbbCoreMsg -case class ShowPollResultReqMsgBody(requesterId: String, pollId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/StartCustomPollReqMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/StartCustomPollReqMsg.scala deleted file mode 100755 index 0d78d5d917..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/StartCustomPollReqMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.polls - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - - -object StartCustomPollReqMsg { val NAME = "StartCustomPollReqMsg"} -case class StartCustomPollReqMsg(header: BbbClientMsgHeader, body: StartCustomPollReqMsgBody) extends BbbCoreMsg -case class StartCustomPollReqMsgBody(requesterId: String, pollId: String, pollType: String, answers: Seq[String]) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/StartPollReqMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/StartPollReqMsg.scala deleted file mode 100755 index dba660238e..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/StartPollReqMsg.scala +++ /dev/null @@ -1,7 +0,0 @@ -package org.bigbluebutton.common2.messages.polls - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object StartPollReqMsg { val NAME = "StartPollReqMsg"} -case class StartPollReqMsg(header: BbbClientMsgHeader, body: StartPollReqMsgBody) extends BbbCoreMsg -case class StartPollReqMsgBody(requesterId: String, pollId: String, pollType: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/StopPollReqMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/StopPollReqMsg.scala deleted file mode 100755 index e292f2954f..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/StopPollReqMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.polls - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - - -object StopPollReqMsg { val NAME = "StopPollReqMsg"} -case class StopPollReqMsg(header: BbbClientMsgHeader, body: StopPollReqMsgBody) extends BbbCoreMsg -case class StopPollReqMsgBody(requesterId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/UserRespondedToPollEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/UserRespondedToPollEvtMsg.scala deleted file mode 100755 index 1b6fced7bc..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/polls/UserRespondedToPollEvtMsg.scala +++ /dev/null @@ -1,9 +0,0 @@ -package org.bigbluebutton.common2.messages.polls - -import org.bigbluebutton.common2.domain.SimplePollResultOutVO -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - - -object UserRespondedToPollEvtMsg { val NAME = "UserRespondedToPollEvtMsg"} -case class UserRespondedToPollEvtMsg(header: BbbClientMsgHeader, body: UserRespondedToPollEvtMsgBody) extends BbbCoreMsg -case class UserRespondedToPollEvtMsgBody(presenterId: String, pollId: String, poll: SimplePollResultOutVO) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/Messages.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/Messages.scala deleted file mode 100755 index c755c00638..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/users/Messages.scala +++ /dev/null @@ -1,74 +0,0 @@ -package org.bigbluebutton.common2.messages.users - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreHeaderWithMeetingId, BbbCoreMsg, GetGuestsWaitingApprovalRespMsg} - -object RegisterUserReqMsg { val NAME = "RegisterUserReqMsg" } -case class RegisterUserReqMsg(header: BbbCoreHeaderWithMeetingId, - body: RegisterUserReqMsgBody) extends BbbCoreMsg - -case class RegisterUserReqMsgBody(meetingId: String, intUserId: String, name: String, role: String, - extUserId: String, authToken: String, avatarURL: String, - guest: Boolean, authed: Boolean) - -object ValidateAuthTokenReqMsg { - val NAME = "ValidateAuthTokenReqMsg" - - def apply(meetingId: String, userId: String, authToken: String): ValidateAuthTokenReqMsg = { - val header = BbbClientMsgHeader(GetGuestsWaitingApprovalRespMsg.NAME, meetingId, userId) - - val body = ValidateAuthTokenReqMsgBody(userId, authToken) - ValidateAuthTokenReqMsg(header, body) - } -} - -case class ValidateAuthTokenReqMsg(header: BbbClientMsgHeader, - body: ValidateAuthTokenReqMsgBody) extends BbbCoreMsg -case class ValidateAuthTokenReqMsgBody(userId: String, authToken: String) - -object ValidateAuthTokenRespMsg { val NAME = "ValidateAuthTokenRespMsg" } -case class ValidateAuthTokenRespMsg(header: BbbClientMsgHeader, - body: ValidateAuthTokenRespMsgBody) extends BbbCoreMsg -case class ValidateAuthTokenRespMsgBody(userId: String, authToken: String, valid: Boolean, waitForApproval: Boolean) - - -object GetUsersReqMsg { val NAME = "GetUsersReqMsg" } -case class GetUsersReqMsg(header: BbbClientMsgHeader, body: GetUsersReqMsgBody) extends BbbCoreMsg -case class GetUsersReqMsgBody(requesterId: String) - -object PresenterAssignedEvtMsg { val NAME = "PresenterAssignedEvtMsg" } -case class PresenterAssignedEvtMsg(header: BbbClientMsgHeader, body: PresenterAssignedEvtMsgBody) extends BbbCoreMsg -case class PresenterAssignedEvtMsgBody(presenterId: String, presenterName: String, assignedBy: String) - -object PresenterUnassignedEvtMsg { val NAME = "PresenterUnassignedEvtMsg" } -case class PresenterUnassignedEvtMsg(header: BbbClientMsgHeader, body: PresenterUnassignedEvtMsgBody) extends BbbCoreMsg -case class PresenterUnassignedEvtMsgBody(intId: String, name: String, assignedBy: String) - -object UserBroadcastCamStartedEvtMsg { val NAME = "UserBroadcastCamStartedEvtMsg" } -case class UserBroadcastCamStartedEvtMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStartedEvtMsgBody) extends BbbCoreMsg -case class UserBroadcastCamStartedEvtMsgBody(userId: String, stream: String) - -object UserBroadcastCamStartMsg { val NAME = "UserBroadcastCamStartMsg" } -case class UserBroadcastCamStartMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStartMsgBody) extends BbbCoreMsg -case class UserBroadcastCamStartMsgBody(stream: String) - - -object UserBroadcastCamStopMsg { val NAME = "UserBroadcastCamStopMsg" } -case class UserBroadcastCamStopMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStopMsgBody) extends BbbCoreMsg -case class UserBroadcastCamStopMsgBody(stream: String) - -object UserBroadcastCamStoppedEvtMsg { val NAME = "UserBroadcastCamStoppedEvtMsg" } -case class UserBroadcastCamStoppedEvtMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStoppedEvtMsgBody) extends BbbCoreMsg -case class UserBroadcastCamStoppedEvtMsgBody(userId: String, stream: String) - - -object UserEmojiChangedEvtMsg { val NAME = "UserEmojiChangedEvtMsg" } -case class UserEmojiChangedEvtMsg(header: BbbClientMsgHeader, body: UserEmojiChangedEvtMsgBody) extends BbbCoreMsg -case class UserEmojiChangedEvtMsgBody(userId: String, emoji: String) - -object UserJoinMeetingReqMsg { val NAME = "UserJoinMeetingReqMsg" } -case class UserJoinMeetingReqMsg(header: BbbClientMsgHeader, body: UserJoinMeetingReqMsgBody) extends BbbCoreMsg -case class UserJoinMeetingReqMsgBody(userId: String, authToken: String) - -object UserLeaveReqMsg { val NAME = "UserLeaveReqMsg" } -case class UserLeaveReqMsg(header: BbbClientMsgHeader, body: UserLeaveReqMsgBody) extends BbbCoreMsg -case class UserLeaveReqMsgBody(userId: String, sessionId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareHangUpVoiceConfMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareHangUpVoiceConfMsg.scala deleted file mode 100755 index dc21f12da4..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareHangUpVoiceConfMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.voiceconf - -import org.bigbluebutton.common2.messages.{BbbCoreHeaderWithMeetingId, BbbCoreMsg} - -object DeskshareHangUpVoiceConfMsg { val NAME = "DeskshareHangUpVoiceConfMsg" } -case class DeskshareHangUpVoiceConfMsg(header: BbbCoreHeaderWithMeetingId, - body: DeskshareHangUpVoiceConfMsgBody) extends BbbCoreMsg -case class DeskshareHangUpVoiceConfMsgBody(voiceConf: String, deskshareConf: String, timestamp: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareRtmpBroadcastStartedVoiceConfEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareRtmpBroadcastStartedVoiceConfEvtMsg.scala deleted file mode 100755 index 0bb4606bbe..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareRtmpBroadcastStartedVoiceConfEvtMsg.scala +++ /dev/null @@ -1,10 +0,0 @@ -package org.bigbluebutton.common2.messages.voiceconf - -import org.bigbluebutton.common2.messages.BbbCoreMsg - -object DeskshareRtmpBroadcastStartedVoiceConfEvtMsg { val NAME = "DeskshareRtmpBroadcastStartedVoiceConfEvtMsg"} -case class DeskshareRtmpBroadcastStartedVoiceConfEvtMsg(header: BbbCoreVoiceConfHeader, - body: DeskshareRtmpBroadcastStartedVoiceConfEvtMsgBody) extends BbbCoreMsg -case class DeskshareRtmpBroadcastStartedVoiceConfEvtMsgBody(voiceConf: String, deskshareConf: String, - stream: String, vidWidth: String, vidHeight: String, - timestamp: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareRtmpBroadcastStoppedVoiceConfEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareRtmpBroadcastStoppedVoiceConfEvtMsg.scala deleted file mode 100755 index 6596d3774b..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareRtmpBroadcastStoppedVoiceConfEvtMsg.scala +++ /dev/null @@ -1,11 +0,0 @@ -package org.bigbluebutton.common2.messages.voiceconf - -import org.bigbluebutton.common2.messages.BbbCoreMsg - - -object DeskshareRtmpBroadcastStoppedVoiceConfEvtMsg { val NAME = "DeskshareRtmpBroadcastStoppedVoiceConfEvtMsg"} -case class DeskshareRtmpBroadcastStoppedVoiceConfEvtMsg(header: BbbCoreVoiceConfHeader, - body: DeskshareRtmpBroadcastStoppedVoiceConfEvtMsgBody) extends BbbCoreMsg -case class DeskshareRtmpBroadcastStoppedVoiceConfEvtMsgBody(voiceConf: String, deskshareConf: String, - stream: String, vidWidth: String, vidHeight: String, - timestamp: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareStartRtmpBroadcastVoiceConfMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareStartRtmpBroadcastVoiceConfMsg.scala deleted file mode 100755 index 2c4491a1a3..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareStartRtmpBroadcastVoiceConfMsg.scala +++ /dev/null @@ -1,10 +0,0 @@ -package org.bigbluebutton.common2.messages.voiceconf - -import org.bigbluebutton.common2.messages.{BbbCoreHeaderWithMeetingId, BbbCoreMsg} - -object DeskshareStartRtmpBroadcastVoiceConfMsg { val NAME = "DeskshareStartRtmpBroadcastVoiceConfMsg" } -case class DeskshareStartRtmpBroadcastVoiceConfMsg(header: BbbCoreHeaderWithMeetingId, - body: DeskshareStartRtmpBroadcastVoiceConfMsgBody) extends BbbCoreMsg -case class DeskshareStartRtmpBroadcastVoiceConfMsgBody(voiceConf: String, deskshareConf: String, url: String, timestamp: String) - - diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareStartedVoiceConfEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareStartedVoiceConfEvtMsg.scala deleted file mode 100755 index 6a8c458bb1..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareStartedVoiceConfEvtMsg.scala +++ /dev/null @@ -1,9 +0,0 @@ -package org.bigbluebutton.common2.messages.voiceconf - -import org.bigbluebutton.common2.messages.BbbCoreMsg - -object DeskshareStartedVoiceConfEvtMsg { val NAME = "DeskshareStartedVoiceConfEvtMsg" } -case class DeskshareStartedVoiceConfEvtMsg(header: BbbCoreVoiceConfHeader, - body: DeskshareStartedVoiceConfEvtMsgBody) extends BbbCoreMsg -case class DeskshareStartedVoiceConfEvtMsgBody(voiceConf: String, deskshareConf: String, - callerIdNum: String, callerIdName: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareStopRtmpBroadcastVoiceConfMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareStopRtmpBroadcastVoiceConfMsg.scala deleted file mode 100755 index 924742a82d..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareStopRtmpBroadcastVoiceConfMsg.scala +++ /dev/null @@ -1,10 +0,0 @@ -package org.bigbluebutton.common2.messages.voiceconf - -import org.bigbluebutton.common2.messages.{BbbCoreHeaderWithMeetingId, BbbCoreMsg} - -object DeskshareStopRtmpBroadcastVoiceConfMsg { val NAME = "DeskshareStopRtmpBroadcastVoiceConfMsg" } -case class DeskshareStopRtmpBroadcastVoiceConfMsg(header: BbbCoreHeaderWithMeetingId, - body: DeskshareStopRtmpBroadcastVoiceConfMsgBody) extends BbbCoreMsg -case class DeskshareStopRtmpBroadcastVoiceConfMsgBody(voiceConf: String, deskshareConf: String, url: String, timestamp: String) - - diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareStoppedVoiceConfEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareStoppedVoiceConfEvtMsg.scala deleted file mode 100755 index 555f4f2fe7..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/DeskshareStoppedVoiceConfEvtMsg.scala +++ /dev/null @@ -1,9 +0,0 @@ -package org.bigbluebutton.common2.messages.voiceconf - -import org.bigbluebutton.common2.messages.BbbCoreMsg - -object DeskshareStoppedVoiceConfEvtMsg { val NAME = "DeskshareStoppedVoiceConfEvtMsg"} -case class DeskshareStoppedVoiceConfEvtMsg(header: BbbCoreVoiceConfHeader, - body: DeskshareStoppedVoiceConfEvtMsgBody) extends BbbCoreMsg -case class DeskshareStoppedVoiceConfEvtMsgBody(voiceConf: String, deskshareConf: String, - callerIdNum: String, callerIdName: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/EjectAllFromVoiceConfMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/EjectAllFromVoiceConfMsg.scala deleted file mode 100755 index 6ea56f3d73..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/EjectAllFromVoiceConfMsg.scala +++ /dev/null @@ -1,10 +0,0 @@ -package org.bigbluebutton.common2.messages.voiceconf - -import org.bigbluebutton.common2.messages.{BbbCoreHeaderWithMeetingId, BbbCoreMsg} - -object EjectAllFromVoiceConfMsg { val NAME = "EjectAllFromVoiceConfMsg" } -case class EjectAllFromVoiceConfMsg(header: BbbCoreHeaderWithMeetingId, - body: EjectAllFromVoiceConfMsgBody) extends BbbCoreMsg -case class EjectAllFromVoiceConfMsgBody(voiceConf: String) - - diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/EjectUserFromVoiceConfMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/EjectUserFromVoiceConfMsg.scala deleted file mode 100755 index 5bf2eeb87c..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/EjectUserFromVoiceConfMsg.scala +++ /dev/null @@ -1,10 +0,0 @@ -package org.bigbluebutton.common2.messages.voiceconf - -import org.bigbluebutton.common2.messages.{BbbCoreHeaderWithMeetingId, BbbCoreMsg} - -object EjectUserFromVoiceConfMsg { val NAME = "EjectUserFromVoiceConfMsg"} -case class EjectUserFromVoiceConfMsg(header: BbbCoreHeaderWithMeetingId, - body: EjectUserFromVoiceConfMsgBody) extends BbbCoreMsg -case class EjectUserFromVoiceConfMsgBody(voiceConf: String, voiceUserId: String) - - diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/Messages.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/Messages.scala deleted file mode 100755 index 6d08361487..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/Messages.scala +++ /dev/null @@ -1,6 +0,0 @@ -package org.bigbluebutton.common2.messages.voiceconf - -import org.bigbluebutton.common2.messages.{ BbbCoreHeader} - - -case class BbbCoreVoiceConfHeader(name: String, voiceConf: String) extends BbbCoreHeader diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/MuteUserInVoiceConfMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/MuteUserInVoiceConfMsg.scala deleted file mode 100755 index 96ab1e9440..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/MuteUserInVoiceConfMsg.scala +++ /dev/null @@ -1,9 +0,0 @@ -package org.bigbluebutton.common2.messages.voiceconf - -import org.bigbluebutton.common2.messages.{BbbCoreHeaderWithMeetingId, BbbCoreMsg} - -object MuteUserInVoiceConfMsg { val NAME = "MuteUserInVoiceConfMsg" } -case class MuteUserInVoiceConfMsg(header: BbbCoreHeaderWithMeetingId, - body: MuteUserInVoiceConfMsgBody) extends BbbCoreMsg -case class MuteUserInVoiceConfMsgBody(voiceConf: String, voiceUserId: String, mute: Boolean) - diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/RecordingStartedVoiceConfEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/RecordingStartedVoiceConfEvtMsg.scala deleted file mode 100755 index 00d8330219..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/RecordingStartedVoiceConfEvtMsg.scala +++ /dev/null @@ -1,9 +0,0 @@ -package org.bigbluebutton.common2.messages.voiceconf - -import org.bigbluebutton.common2.messages.BbbCoreMsg - -object RecordingStartedVoiceConfEvtMsg { val NAME = "RecordingStartedVoiceConfEvtMsg" } -case class RecordingStartedVoiceConfEvtMsg(header: BbbCoreVoiceConfHeader, - body: RecordingStartedVoiceConfEvtMsgBody) extends BbbCoreMsg -case class RecordingStartedVoiceConfEvtMsgBody(voiceConf: String, stream: String, recording: Boolean, timestamp: String) - diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/StartRecordingVoiceConfMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/StartRecordingVoiceConfMsg.scala deleted file mode 100755 index b65b6785b7..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/StartRecordingVoiceConfMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.voiceconf - -import org.bigbluebutton.common2.messages.{BbbCoreHeaderWithMeetingId, BbbCoreMsg} - -object StartRecordingVoiceConfMsg { val NAME = "StartRecordingVoiceConfMsg" } -case class StartRecordingVoiceConfMsg(header: BbbCoreHeaderWithMeetingId, - body: StartRecordingVoiceConfMsgBody) extends BbbCoreMsg -case class StartRecordingVoiceConfMsgBody(voiceConf: String, meetingId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/StopRecordingVoiceConfMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/StopRecordingVoiceConfMsg.scala deleted file mode 100755 index 8ff5e45928..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/StopRecordingVoiceConfMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.voiceconf - -import org.bigbluebutton.common2.messages.{BbbCoreHeaderWithMeetingId, BbbCoreMsg} - -object StopRecordingVoiceConfMsg { val NAME = "StopRecordingVoiceConfMsg" } -case class StopRecordingVoiceConfMsg(header: BbbCoreHeaderWithMeetingId, - body: StopRecordingVoiceConfMsgBody) extends BbbCoreMsg -case class StopRecordingVoiceConfMsgBody(voiceConf: String, meetingId: String, stream: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/TransferUserToVoiceConfMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/TransferUserToVoiceConfMsg.scala deleted file mode 100755 index dda4ec8f68..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/TransferUserToVoiceConfMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.voiceconf - -import org.bigbluebutton.common2.messages.{BbbCoreHeaderWithMeetingId, BbbCoreMsg} - -object TransferUserToVoiceConfMsg { val NAME = "TransferUserToVoiceConfMsg" } -case class TransferUserToVoiceConfMsg(header: BbbCoreHeaderWithMeetingId, - body: TransferUserToVoiceConfMsgBody) extends BbbCoreMsg -case class TransferUserToVoiceConfMsgBody(fromVoiceConf: String, toVoiceConf: String, voiceUserId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserJoinedVoiceConfEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserJoinedVoiceConfEvtMsg.scala deleted file mode 100755 index ea9729a03f..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserJoinedVoiceConfEvtMsg.scala +++ /dev/null @@ -1,11 +0,0 @@ -package org.bigbluebutton.common2.messages.voiceconf - -import org.bigbluebutton.common2.messages.BbbCoreMsg - -object UserJoinedVoiceConfEvtMsg { val NAME = "UserJoinedVoiceConfEvtMsg" } -case class UserJoinedVoiceConfEvtMsg(header: BbbCoreVoiceConfHeader, - body: UserJoinedVoiceConfEvtMsgBody) extends BbbCoreMsg -case class UserJoinedVoiceConfEvtMsgBody(voiceConf: String, voiceUserId: String, intId: String, - callerIdName: String, callerIdNum: String, muted: Boolean, - talking: Boolean, callingWith: String) - diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserJoinedVoiceConfToClientEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserJoinedVoiceConfToClientEvtMsg.scala deleted file mode 100755 index cc430b3921..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserJoinedVoiceConfToClientEvtMsg.scala +++ /dev/null @@ -1,9 +0,0 @@ -package org.bigbluebutton.common2.messages.voiceconf - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object UserJoinedVoiceConfToClientEvtMsg { val NAME = "UserJoinedVoiceConfToClientEvtMsg" } -case class UserJoinedVoiceConfToClientEvtMsg(header: BbbClientMsgHeader, body: UserJoinedVoiceConfToClientEvtMsgBody) extends BbbCoreMsg -case class UserJoinedVoiceConfToClientEvtMsgBody(intId: String, voiceUserId: String, callerName: String, - callerNum: String, muted: Boolean, - talking: Boolean, callingWith: String, listenOnly: Boolean) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserLeftVoiceConfEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserLeftVoiceConfEvtMsg.scala deleted file mode 100755 index b24a22b4e9..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserLeftVoiceConfEvtMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.voiceconf - -import org.bigbluebutton.common2.messages.BbbCoreMsg - -object UserLeftVoiceConfEvtMsg { val NAME = "UserLeftVoiceConfEvtMsg" } -case class UserLeftVoiceConfEvtMsg(header: BbbCoreVoiceConfHeader, - body: UserLeftVoiceConfEvtMsgBody) extends BbbCoreMsg -case class UserLeftVoiceConfEvtMsgBody(voiceConf: String, voiceUserId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserLeftVoiceConfToClientEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserLeftVoiceConfToClientEvtMsg.scala deleted file mode 100755 index f1d58dcfef..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserLeftVoiceConfToClientEvtMsg.scala +++ /dev/null @@ -1,7 +0,0 @@ -package org.bigbluebutton.common2.messages.voiceconf - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object UserLeftVoiceConfToClientEvtMsg { val NAME = "UserLeftVoiceConfToClientEvtMsg" } -case class UserLeftVoiceConfToClientEvtMsg(header: BbbClientMsgHeader, body: UserLeftVoiceConfToClientEvtMsgBody) extends BbbCoreMsg -case class UserLeftVoiceConfToClientEvtMsgBody(intId: String, voiceUserId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserMutedEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserMutedEvtMsg.scala deleted file mode 100755 index 20d33c71bb..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserMutedEvtMsg.scala +++ /dev/null @@ -1,11 +0,0 @@ -package org.bigbluebutton.common2.messages.voiceconf - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -/** - * Message sent to clients that the user is muted. - */ - -object UserMutedEvtMsg { val NAME = "UserMutedEvtMsg" } -case class UserMutedEvtMsg(header: BbbClientMsgHeader, body: UserMutedEvtMsgBody) extends BbbCoreMsg -case class UserMutedEvtMsgBody(intId: String, voiceUserId: String, muted: Boolean) \ No newline at end of file diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserMutedInVoiceConfEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserMutedInVoiceConfEvtMsg.scala deleted file mode 100755 index 87fcd4b2ec..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserMutedInVoiceConfEvtMsg.scala +++ /dev/null @@ -1,10 +0,0 @@ -package org.bigbluebutton.common2.messages.voiceconf - -import org.bigbluebutton.common2.messages.BbbCoreMsg - -object UserMutedInVoiceConfEvtMsg { val NAME = "UserMutedInVoiceConfEvtMsg" } -case class UserMutedInVoiceConfEvtMsg(header: BbbCoreVoiceConfHeader, - body: UserMutedInVoiceConfEvtMsgBody) extends BbbCoreMsg -case class UserMutedInVoiceConfEvtMsgBody(voiceConf: String, voiceUserId: String, muted: Boolean) - - diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserTalkingEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserTalkingEvtMsg.scala deleted file mode 100755 index c69a86afeb..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserTalkingEvtMsg.scala +++ /dev/null @@ -1,11 +0,0 @@ -package org.bigbluebutton.common2.messages.voiceconf - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -/** - * Message sent to clients that the user is talking. - */ - -object UserTalkingEvtMsg { val NAME = "UserTalkingEvtMsg" } -case class UserTalkingEvtMsg(header: BbbClientMsgHeader, body: UserTalkingEvtMsgBody) extends BbbCoreMsg -case class UserTalkingEvtMsgBody(intId: String, voiceUserId: String, talking: Boolean) \ No newline at end of file diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserTalkingInVoiceConfEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserTalkingInVoiceConfEvtMsg.scala deleted file mode 100755 index a58c18031c..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/voiceconf/UserTalkingInVoiceConfEvtMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.voiceconf - -import org.bigbluebutton.common2.messages.BbbCoreMsg - -object UserTalkingInVoiceConfEvtMsg { val NAME = "UserTalkingInVoiceConfEvtMsg" } -case class UserTalkingInVoiceConfEvtMsg(header: BbbCoreVoiceConfHeader, - body: UserTalkingInVoiceConfEvtMsgBody) extends BbbCoreMsg -case class UserTalkingInVoiceConfEvtMsgBody(voiceConf: String, voiceUserId: String, talking: Boolean) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/ClearWhiteboardEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/ClearWhiteboardEvtMsg.scala deleted file mode 100755 index 80db3955da..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/ClearWhiteboardEvtMsg.scala +++ /dev/null @@ -1,7 +0,0 @@ -package org.bigbluebutton.common2.messages.whiteboard - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object ClearWhiteboardEvtMsg { val NAME = "ClearWhiteboardEvtMsg" } -case class ClearWhiteboardEvtMsg(header: BbbClientMsgHeader, body: ClearWhiteboardEvtMsgBody) extends BbbCoreMsg -case class ClearWhiteboardEvtMsgBody(whiteboardId: String, userId: String, fullClear: Boolean) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/ClearWhiteboardPubMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/ClearWhiteboardPubMsg.scala deleted file mode 100755 index aa0824ee2d..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/ClearWhiteboardPubMsg.scala +++ /dev/null @@ -1,7 +0,0 @@ -package org.bigbluebutton.common2.messages.whiteboard - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, StandardMsg} - -object ClearWhiteboardPubMsg { val NAME = "ClearWhiteboardPubMsg"} -case class ClearWhiteboardPubMsg(header: BbbClientMsgHeader, body: ClearWhiteboardPubMsgBody) extends StandardMsg -case class ClearWhiteboardPubMsgBody(whiteboardId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/GetWhiteboardAccessReqMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/GetWhiteboardAccessReqMsg.scala deleted file mode 100755 index 36e1da2f18..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/GetWhiteboardAccessReqMsg.scala +++ /dev/null @@ -1,7 +0,0 @@ -package org.bigbluebutton.common2.messages.whiteboard - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, StandardMsg} - -object GetWhiteboardAccessReqMsg { val NAME = "GetWhiteboardAccessReqMsg"} -case class GetWhiteboardAccessReqMsg(header: BbbClientMsgHeader, body: GetWhiteboardAccessReqMsgBody) extends StandardMsg -case class GetWhiteboardAccessReqMsgBody(requesterId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/GetWhiteboardAccessRespMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/GetWhiteboardAccessRespMsg.scala deleted file mode 100755 index abacf96ea0..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/GetWhiteboardAccessRespMsg.scala +++ /dev/null @@ -1,7 +0,0 @@ -package org.bigbluebutton.common2.messages.whiteboard - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object GetWhiteboardAccessRespMsg { val NAME = "GetWhiteboardAccessRespMsg" } -case class GetWhiteboardAccessRespMsg(header: BbbClientMsgHeader, body: GetWhiteboardAccessRespMsgBody) extends BbbCoreMsg -case class GetWhiteboardAccessRespMsgBody(multiUser: Boolean) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/GetWhiteboardAnnotationsReqMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/GetWhiteboardAnnotationsReqMsg.scala deleted file mode 100755 index d4a84dea55..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/GetWhiteboardAnnotationsReqMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.whiteboard - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, StandardMsg} - - -object GetWhiteboardAnnotationsReqMsg { val NAME = "GetWhiteboardAnnotationsReqMsg"} -case class GetWhiteboardAnnotationsReqMsg(header: BbbClientMsgHeader, body: GetWhiteboardAnnotationsReqMsgBody) extends StandardMsg -case class GetWhiteboardAnnotationsReqMsgBody(whiteboardId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/GetWhiteboardAnnotationsRespMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/GetWhiteboardAnnotationsRespMsg.scala deleted file mode 100755 index 38b4c254d9..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/GetWhiteboardAnnotationsRespMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.whiteboard - -import org.bigbluebutton.common2.domain.AnnotationVO -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object GetWhiteboardAnnotationsRespMsg { val NAME = "GetWhiteboardAnnotationsRespMsg" } -case class GetWhiteboardAnnotationsRespMsg(header: BbbClientMsgHeader, body: GetWhiteboardAnnotationsRespMsgBody) extends BbbCoreMsg -case class GetWhiteboardAnnotationsRespMsgBody(whiteboardId: String, annotations: Array[AnnotationVO]) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/ModifyWhiteboardAccessEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/ModifyWhiteboardAccessEvtMsg.scala deleted file mode 100755 index 84a5815ce8..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/ModifyWhiteboardAccessEvtMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.whiteboard - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object ModifyWhiteboardAccessEvtMsg { val NAME = "ModifyWhiteboardAccessEvtMsg" } -case class ModifyWhiteboardAccessEvtMsg(header: BbbClientMsgHeader, body: ModifyWhiteboardAccessEvtMsgBody) extends BbbCoreMsg - -case class ModifyWhiteboardAccessEvtMsgBody(multiUser: Boolean) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/ModifyWhiteboardAccessPubMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/ModifyWhiteboardAccessPubMsg.scala deleted file mode 100755 index e96d85b860..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/ModifyWhiteboardAccessPubMsg.scala +++ /dev/null @@ -1,7 +0,0 @@ -package org.bigbluebutton.common2.messages.whiteboard - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, StandardMsg} - -object ModifyWhiteboardAccessPubMsg { val NAME = "ModifyWhiteboardAccessPubMsg"} -case class ModifyWhiteboardAccessPubMsg(header: BbbClientMsgHeader, body: ModifyWhiteboardAccessPubMsgBody) extends StandardMsg -case class ModifyWhiteboardAccessPubMsgBody(multiUser: Boolean) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/SendCursorPositionEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/SendCursorPositionEvtMsg.scala deleted file mode 100755 index 050ace6fc7..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/SendCursorPositionEvtMsg.scala +++ /dev/null @@ -1,7 +0,0 @@ -package org.bigbluebutton.common2.messages.whiteboard - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object SendCursorPositionEvtMsg { val NAME = "SendCursorPositionEvtMsg" } -case class SendCursorPositionEvtMsg(header: BbbClientMsgHeader, body: SendCursorPositionEvtMsgBody) extends BbbCoreMsg -case class SendCursorPositionEvtMsgBody(xPercent: Double, yPercent: Double) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/SendCursorPositionPubMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/SendCursorPositionPubMsg.scala deleted file mode 100755 index 5ca6fed48d..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/SendCursorPositionPubMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.whiteboard - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, StandardMsg} - -object SendCursorPositionPubMsg { val NAME = "SendCursorPositionPubMsg"} -case class SendCursorPositionPubMsg(header: BbbClientMsgHeader, body: SendCursorPositionPubMsgBody) extends StandardMsg -case class SendCursorPositionPubMsgBody(xPercent: Double, yPercent: Double) - diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/SendWhiteboardAnnotationEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/SendWhiteboardAnnotationEvtMsg.scala deleted file mode 100755 index 894585d3a4..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/SendWhiteboardAnnotationEvtMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.whiteboard - -import org.bigbluebutton.common2.domain.AnnotationVO -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object SendWhiteboardAnnotationEvtMsg { val NAME = "SendWhiteboardAnnotationEvtMsg" } -case class SendWhiteboardAnnotationEvtMsg(header: BbbClientMsgHeader, body: SendWhiteboardAnnotationEvtMsgBody) extends BbbCoreMsg -case class SendWhiteboardAnnotationEvtMsgBody(annotation: AnnotationVO) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/SendWhiteboardAnnotationPubMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/SendWhiteboardAnnotationPubMsg.scala deleted file mode 100755 index 12e1d5dc27..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/SendWhiteboardAnnotationPubMsg.scala +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.common2.messages.whiteboard - -import org.bigbluebutton.common2.domain.AnnotationVO -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, StandardMsg} - -object SendWhiteboardAnnotationPubMsg { val NAME = "SendWhiteboardAnnotationPubMsg"} -case class SendWhiteboardAnnotationPubMsg(header: BbbClientMsgHeader, body: SendWhiteboardAnnotationPubMsgBody) extends StandardMsg -case class SendWhiteboardAnnotationPubMsgBody(annotation: AnnotationVO) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/UndoWhiteboardEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/UndoWhiteboardEvtMsg.scala deleted file mode 100755 index 4c9fe31b88..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/UndoWhiteboardEvtMsg.scala +++ /dev/null @@ -1,7 +0,0 @@ -package org.bigbluebutton.common2.messages.whiteboard - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, BbbCoreMsg} - -object UndoWhiteboardEvtMsg { val NAME = "UndoWhiteboardEvtMsg" } -case class UndoWhiteboardEvtMsg(header: BbbClientMsgHeader, body: UndoWhiteboardEvtMsgBody) extends BbbCoreMsg -case class UndoWhiteboardEvtMsgBody(whiteboardId: String, userId: String, annotationId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/UndoWhiteboardPubMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/UndoWhiteboardPubMsg.scala deleted file mode 100755 index 484dbac561..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/whiteboard/UndoWhiteboardPubMsg.scala +++ /dev/null @@ -1,7 +0,0 @@ -package org.bigbluebutton.common2.messages.whiteboard - -import org.bigbluebutton.common2.messages.{BbbClientMsgHeader, StandardMsg} - -object UndoWhiteboardPubMsg { val NAME = "UndoWhiteboardPubMsg"} -case class UndoWhiteboardPubMsg(header: BbbClientMsgHeader, body: UndoWhiteboardPubMsgBody) extends StandardMsg -case class UndoWhiteboardPubMsgBody(whiteboardId: String) From 30827f680ed4bcb9b5e55d6a63c2e713eb987e86 Mon Sep 17 00:00:00 2001 From: Richard Alam Date: Tue, 27 Jun 2017 19:44:47 -0700 Subject: [PATCH 14/15] - move messages into different package --- .../core/BigBlueButtonActor.scala | 5 +- .../core/BigBlueButtonInGW.scala | 2 - .../bigbluebutton/core/MessageRecorder.scala | 2 +- .../core/OutMessageGateway.scala | 2 +- .../bigbluebutton/core/api/InMessages.scala | 3 +- .../bigbluebutton/core/api/OutMessages.scala | 2 +- .../core/apps/BreakoutRoomApp.scala | 7 +- .../bigbluebutton/core/apps/UsersApp.scala | 3 +- .../GetPresentationInfoReqMsgHdlr.scala | 3 +- .../presentation/NewPresentationMsgHdlr.scala | 5 +- ...ntationConversionCompletedPubMsgHdlr.scala | 3 +- ...esentationConversionUpdatePubMsgHdlr.scala | 5 +- ...PresentationPageCountErrorPubMsgHdlr.scala | 5 +- .../PresentationPageGeneratedPubMsgHdlr.scala | 5 +- .../PreuploadedPresentationsPubMsgHdlr.scala | 2 +- .../RemovePresentationPubMsgHdlr.scala | 5 +- .../ResizeAndMovePagePubMsgHdlr.scala | 5 +- .../SetCurrentPagePubMsgHdlr.scala | 5 +- .../SetCurrentPresentationPubMsgHdlr.scala | 5 +- .../core/bus/BbbMsgRouterEventBus.scala | 2 +- .../bigbluebutton/core/bus/OutEventBus2.scala | 2 +- .../core/bus/RecordingEventBus.scala | 2 +- .../core/models/BreakoutRooms.scala | 2 +- .../senders/ReceivedJsonMsgDeserializer.scala | 2 +- .../senders/ReceivedJsonMsgHandlerActor.scala | 10 +- .../core/running/MeetingActor.scala | 11 +- .../core2/FromAkkaAppsMsgSenderActor.scala | 2 +- .../handlers/GetCurrentPollReqMsgHdlr.scala | 3 +- .../handlers/HidePollResultReqMsgHdlr.scala | 3 +- .../MuteAllExceptPresenterRequestHdlr.scala | 3 +- .../handlers/MuteMeetingRequestHdlr.scala | 3 +- .../handlers/RespondToPollReqMsgHdlr.scala | 3 +- .../handlers/ShowPollResultReqMsgHdlr.scala | 4 +- .../handlers/StartCustomPollReqMsgHdlr.scala | 3 +- .../handlers/StartPollReqMsgHdlr.scala | 3 +- .../message/handlers/StopPollReqMsgHdlr.scala | 3 +- .../BreakoutRoomCreatedMsgHdlr.scala | 5 +- .../BreakoutRoomEndedMsgHdlr.scala | 5 +- .../BreakoutRoomUsersUpdateMsgHdlr.scala | 5 +- .../BreakoutRoomsListMsgHdlr.scala | 3 +- .../CreateBreakoutRoomsMsgHdlr.scala | 2 +- .../EndAllBreakoutRoomsMsgHdlr.scala | 5 +- .../RequestBreakoutJoinURLMsgHdlr.scala | 3 +- .../SendBreakoutUsersUpdateMsgHdlr.scala | 2 +- .../TransferUserToMeetingRequestHdlr.scala | 5 +- .../layout/BroadcastLayoutMsgHdlr.scala | 4 +- .../layout/GetCurrentLayoutMsgHdlr.scala | 7 +- .../handlers/layout/LockLayoutMsgHdlr.scala | 6 +- .../message/handlers/users/GetUsersHdlr.scala | 3 - .../users/UserBroadcastCamStartMsgHdlr.scala | 3 +- .../users/UserBroadcastCamStopMsgHdlr.scala | 3 +- .../UserConnectedToGlobalAudioHdlr.scala | 3 +- .../UserDisconnectedFromGlobalAudioHdlr.scala | 3 +- .../handlers/users/UserEmojiStatusHdlr.scala | 3 +- .../users/UserJoinMeetingReqMsgHdlr.scala | 2 +- .../users/UserJoinedVoiceConfEvtMsgHdlr.scala | 3 +- .../handlers/users/UserLeavingHdlr.scala | 3 +- .../users/UserLeftVoiceConfEvtMsgHdlr.scala | 3 +- .../UserMutedInVoiceConfEvtMsgHdlr.scala | 3 +- .../UserTalkingInVoiceConfEvtMsgHdlr.scala | 3 +- .../users/ValidateAuthTokenReqMsgHdlr.scala | 5 +- .../ClearWhiteboardPubMsgHdlr.scala | 3 +- .../GetWhiteboardAccessReqMsgHdlr.scala | 5 +- .../GetWhiteboardAnnotationsReqMsgHdlr.scala | 3 +- .../ModifyWhiteboardAccessPubMsgHdlr.scala | 3 +- .../SendCursorPositionPubMsgHdlr.scala | 3 +- .../SendWhiteboardAnnotationPubMsgHdlr.scala | 3 +- .../whiteboard/UndoWhiteboardPubMsgHdlr.scala | 3 +- .../GetUsersMeetingRespMsgBuilder.scala | 2 +- .../GetVoiceUsersMeetingRespMsgBuilder.scala | 2 +- ...etWebcamStreamsMeetingRespMsgBuilder.scala | 3 +- .../core2/message/senders/Sender.scala | 2 +- .../UserJoinedMeetingEvtMsgBuilder.scala | 3 +- .../senders/UserLeftMeetingEvtMsgSender.scala | 3 +- .../ValidateAuthTokenRespMsgSender.scala | 3 +- .../messages/CreateMeetingReqMsg.scala | 9 -- .../common2/messages/Deserializer.scala | 146 ----------------- .../messages/GetUsersMeetingReqMsg.scala | 9 -- .../messages/GetUsersMeetingRespMsg.scala | 20 --- .../messages/GetVoiceUsersMeetingReqMsg.scala | 6 - .../GetVoiceUsersMeetingRespMsg.scala | 18 --- .../common2/messages/Guests.scala | 68 -------- .../messages/MeetingCreatedEvtMsg.scala | 10 -- .../common2/messages/Polls.scala | 63 -------- .../common2/messages/Users.scala | 78 ---------- .../common2/messages/Webcams.scala | 56 ------- .../BreakoutMsgs.scala} | 125 ++++++++++++--- .../Messages.scala => msgs/CoreMsgs.scala} | 85 +++++----- .../common2/msgs/Deserializer.scala | 58 +++++++ .../common2/msgs/GuestsMsgs.scala | 71 +++++++++ .../Layout.scala => msgs/LayoutMsgs.scala} | 6 +- .../{messages => msgs}/MessageBody.scala | 3 +- .../bigbluebutton/common2/msgs/Messages.scala | 2 + .../common2/msgs/PollsMsgs.scala | 114 ++++++++++++++ .../PresentationMsgs.scala} | 6 +- .../common2/{messages => msgs}/Routing.scala | 2 +- .../common2/msgs/SystemMsgs.scala | 25 +++ .../bigbluebutton/common2/msgs/UsersMgs.scala | 147 ++++++++++++++++++ .../VoiceConfMsgs.scala} | 5 +- .../common2/msgs/WebcamsMsgs.scala | 72 +++++++++ .../WhiteboardMsgs.scala} | 5 +- .../bigbluebutton/common2/util/JsonUtil.scala | 2 +- ...> CreateBreakoutRoomsMsgsRequestTest.java} | 2 +- 103 files changed, 737 insertions(+), 744 deletions(-) delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/CreateMeetingReqMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Deserializer.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetUsersMeetingReqMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetUsersMeetingRespMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetVoiceUsersMeetingReqMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetVoiceUsersMeetingRespMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Guests.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/MeetingCreatedEvtMsg.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Polls.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Users.scala delete mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Webcams.scala rename bbb-common-message/src/main/scala/org/bigbluebutton/common2/{messages/BreakoutRooms.scala => msgs/BreakoutMsgs.scala} (74%) rename bbb-common-message/src/main/scala/org/bigbluebutton/common2/{messages/Messages.scala => msgs/CoreMsgs.scala} (72%) create mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/Deserializer.scala create mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/GuestsMsgs.scala rename bbb-common-message/src/main/scala/org/bigbluebutton/common2/{messages/Layout.scala => msgs/LayoutMsgs.scala} (95%) rename bbb-common-message/src/main/scala/org/bigbluebutton/common2/{messages => msgs}/MessageBody.scala (92%) create mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/Messages.scala create mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/PollsMsgs.scala rename bbb-common-message/src/main/scala/org/bigbluebutton/common2/{messages/Presentation.scala => msgs/PresentationMsgs.scala} (97%) rename bbb-common-message/src/main/scala/org/bigbluebutton/common2/{messages => msgs}/Routing.scala (88%) create mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/SystemMsgs.scala create mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/UsersMgs.scala rename bbb-common-message/src/main/scala/org/bigbluebutton/common2/{messages/VoiceConf.scala => msgs/VoiceConfMsgs.scala} (97%) create mode 100755 bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/WebcamsMsgs.scala rename bbb-common-message/src/main/scala/org/bigbluebutton/common2/{messages/Whiteboard.scala => msgs/WhiteboardMsgs.scala} (95%) rename bbb-common-message/src/test/java/org/bigbluebutton/messages/{CreateBreakoutRoomsRequestTest.java => CreateBreakoutRoomsMsgsRequestTest.java} (97%) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala index 567c3a3d2c..edaa037166 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala @@ -6,15 +6,12 @@ import akka.actor._ import akka.actor.ActorLogging import akka.actor.SupervisorStrategy.Resume import akka.util.Timeout - import scala.concurrent.duration._ import org.bigbluebutton.core.bus._ import org.bigbluebutton.core.api._ import org.bigbluebutton.SystemConfiguration import java.util.concurrent.TimeUnit - -import org.bigbluebutton.common2.messages.Users.RegisterUserReqMsg -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.running.RunningMeeting import org.bigbluebutton.core2.RunningMeetings diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala index 8056721dcd..c6f09fdb28 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala @@ -2,9 +2,7 @@ package org.bigbluebutton.core import org.bigbluebutton.core.bus._ import org.bigbluebutton.core.api._ - import scala.collection.JavaConversions._ -import org.bigbluebutton.core.apps.Page import org.bigbluebutton.core.apps.Presentation import akka.actor.ActorSystem import org.bigbluebutton.common.messages.IBigBlueButtonMessage diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageRecorder.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageRecorder.scala index ac26698441..6ee6599f51 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageRecorder.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageRecorder.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.core -import org.bigbluebutton.common2.messages.BbbCoreMsg +import org.bigbluebutton.common2.msgs.BbbCoreMsg object MessageRecorder { def record(outGW: OutMessageGateway, record: Boolean, msg: BbbCoreMsg): Unit = { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/OutMessageGateway.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/OutMessageGateway.scala index 9b6058615c..e919cc979e 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/OutMessageGateway.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/OutMessageGateway.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core import org.bigbluebutton.SystemConfiguration -import org.bigbluebutton.common2.messages.{ BbbCommonEnvCoreMsg, BbbCoreMsg } +import org.bigbluebutton.common2.msgs.{ BbbCommonEnvCoreMsg, BbbCoreMsg } import org.bigbluebutton.core.bus._ import org.bigbluebutton.core.api.IOutMessage diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala index caec9df8dc..113ab16854 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala @@ -1,10 +1,9 @@ package org.bigbluebutton.core.api -import org.bigbluebutton.common2.messages.BreakoutRooms.BreakoutUserVO +import org.bigbluebutton.common2.msgs.BreakoutUserVO import org.bigbluebutton.core.api.SharedNotesOperation.SharedNotesOperation import org.bigbluebutton.core.apps.Presentation import spray.json.JsObject - case class InMessageHeader(name: String) case class InHeaderAndJsonPayload(header: InMessageHeader, payload: JsObject) case class MessageProcessException(message: String) extends Exception(message) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala index 0f943b4022..8fbf073c15 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala @@ -3,7 +3,7 @@ package org.bigbluebutton.core.api import org.bigbluebutton.core.apps._ import org.bigbluebutton.core.models._ import org.bigbluebutton.common2.domain.UserVO -import org.bigbluebutton.common2.messages.BreakoutRooms.{ BreakoutRoomInfo, BreakoutUserVO } +import org.bigbluebutton.common2.msgs.{ BreakoutRoomInfo, BreakoutUserVO } case class VoiceRecordingStarted(meetingID: String, recorded: Boolean, recordingFile: String, timestamp: String, confNum: String) extends IOutMessage case class VoiceRecordingStopped(meetingID: String, recorded: Boolean, recordingFile: String, timestamp: String, confNum: String) extends IOutMessage diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala index ce37cb1778..79bf409da3 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala @@ -6,7 +6,7 @@ import scala.collection.SortedSet import scala.collection.mutable import org.apache.commons.codec.digest.DigestUtils import org.bigbluebutton.SystemConfiguration -import org.bigbluebutton.common2.messages.BreakoutRooms.{ BreakoutRoomInfo, BreakoutUserVO } +import org.bigbluebutton.common2.msgs.{ BreakoutRoomInfo, BreakoutUserVO } import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api._ import org.bigbluebutton.core.bus.BigBlueButtonEvent @@ -23,7 +23,10 @@ trait BreakoutRoomApp extends SystemConfiguration { val eventBus: IncomingEventBus def handleBreakoutRoomsList(msg: BreakoutRoomsListMessage) { - val breakoutRooms = BreakoutRooms.getRooms(liveMeeting.breakoutRooms).toVector map { r => new BreakoutRoomInfo(r.name, r.externalMeetingId, r.id, r.sequence) } + val breakoutRooms = BreakoutRooms.getRooms(liveMeeting.breakoutRooms).toVector map { r => + new BreakoutRoomInfo(r.name, r.externalMeetingId, r.id, r.sequence) + } + val roomsReady = liveMeeting.breakoutRooms.pendingRoomsNumber == 0 && breakoutRooms.length > 0 log.info("Sending breakout rooms list to {} with containing {} room(s)", props.meetingProp.intId, breakoutRooms.length) outGW.send(new BreakoutRoomsListOutMessage(props.meetingProp.intId, breakoutRooms, roomsReady)) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala index 7cbb262742..807abce2cc 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala @@ -1,8 +1,7 @@ package org.bigbluebutton.core.apps import org.bigbluebutton.common2.domain.UserVO -import org.bigbluebutton.common2.messages.Presentation.{ PresenterAssignedEvtMsg, PresenterAssignedEvtMsgBody } -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.api._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models._ diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/GetPresentationInfoReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/GetPresentationInfoReqMsgHdlr.scala index 679e547d14..d02dc5cbc2 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/GetPresentationInfoReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/GetPresentationInfoReqMsgHdlr.scala @@ -1,9 +1,8 @@ package org.bigbluebutton.core.apps.presentation import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.common2.domain.PresentationVO -import org.bigbluebutton.common2.messages.Presentation.{ GetPresentationInfoReqMsg, GetPresentationInfoRespMsg, GetPresentationInfoRespMsgBody } import org.bigbluebutton.core.apps.Presentation trait GetPresentationInfoReqMsgHdlr { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/NewPresentationMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/NewPresentationMsgHdlr.scala index a9d3df522a..2ca0c1705b 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/NewPresentationMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/NewPresentationMsgHdlr.scala @@ -1,9 +1,8 @@ package org.bigbluebutton.core.apps.presentation import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.common2.domain.PresentationVO -import org.bigbluebutton.common2.messages.Presentation.{ NewPresentationEvtMsg, NewPresentationEvtMsgBody } trait NewPresentationMsgHdlr { this: PresentationApp2x => @@ -22,4 +21,4 @@ trait NewPresentationMsgHdlr { //record(event) } -} \ No newline at end of file +} diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationConversionCompletedPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationConversionCompletedPubMsgHdlr.scala index 0a1bb9d068..69a9e75fff 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationConversionCompletedPubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationConversionCompletedPubMsgHdlr.scala @@ -1,9 +1,8 @@ package org.bigbluebutton.core.apps.presentation import org.bigbluebutton.common2.domain.PageVO -import org.bigbluebutton.common2.messages.Presentation.{ PresentationConversionCompletedEvtMsg, PresentationConversionCompletedEvtMsgBody, PresentationConversionCompletedPubMsg } +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages._ import org.bigbluebutton.core.apps.Presentation trait PresentationConversionCompletedPubMsgHdlr { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationConversionUpdatePubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationConversionUpdatePubMsgHdlr.scala index 1f79a631cc..894e8b8a5f 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationConversionUpdatePubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationConversionUpdatePubMsgHdlr.scala @@ -1,8 +1,7 @@ package org.bigbluebutton.core.apps.presentation -import org.bigbluebutton.common2.messages.Presentation.{ PresentationConversionUpdateEvtMsg, PresentationConversionUpdateEvtMsgBody, PresentationConversionUpdatePubMsg } +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages._ trait PresentationConversionUpdatePubMsgHdlr { this: PresentationApp2x => @@ -26,4 +25,4 @@ trait PresentationConversionUpdatePubMsgHdlr { broadcastEvent(msg) } -} \ No newline at end of file +} diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationPageCountErrorPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationPageCountErrorPubMsgHdlr.scala index fac7beb496..a018e077bf 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationPageCountErrorPubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationPageCountErrorPubMsgHdlr.scala @@ -1,8 +1,7 @@ package org.bigbluebutton.core.apps.presentation -import org.bigbluebutton.common2.messages.Presentation.{ PresentationPageCountErrorEvtMsg, PresentationPageCountErrorEvtMsgBody, PresentationPageCountErrorPubMsg } import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ trait PresentationPageCountErrorPubMsgHdlr { this: PresentationApp2x => @@ -26,4 +25,4 @@ trait PresentationPageCountErrorPubMsgHdlr { broadcastEvent(msg) } -} \ No newline at end of file +} diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationPageGeneratedPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationPageGeneratedPubMsgHdlr.scala index 6ce50d0041..4e0bcab0b6 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationPageGeneratedPubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationPageGeneratedPubMsgHdlr.scala @@ -1,8 +1,7 @@ package org.bigbluebutton.core.apps.presentation -import org.bigbluebutton.common2.messages.Presentation.{ PresentationPageGeneratedEvtMsg, PresentationPageGeneratedEvtMsgBody, PresentationPageGeneratedPubMsg } import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ trait PresentationPageGeneratedPubMsgHdlr { this: PresentationApp2x => @@ -26,4 +25,4 @@ trait PresentationPageGeneratedPubMsgHdlr { broadcastEvent(msg) } -} \ No newline at end of file +} diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PreuploadedPresentationsPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PreuploadedPresentationsPubMsgHdlr.scala index 5688f38e4b..32731be254 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PreuploadedPresentationsPubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PreuploadedPresentationsPubMsgHdlr.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core.apps.presentation import org.bigbluebutton.common2.domain.PageVO -import org.bigbluebutton.common2.messages.Presentation.PreuploadedPresentationsPubMsg +import org.bigbluebutton.common2.msgs.PreuploadedPresentationsPubMsg import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.apps.Presentation diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/RemovePresentationPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/RemovePresentationPubMsgHdlr.scala index 0535cf73c5..50bfe2bb3a 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/RemovePresentationPubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/RemovePresentationPubMsgHdlr.scala @@ -1,8 +1,7 @@ package org.bigbluebutton.core.apps.presentation -import org.bigbluebutton.common2.messages.Presentation.{ RemovePresentationEvtMsg, RemovePresentationEvtMsgBody, RemovePresentationPubMsg } +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages._ trait RemovePresentationPubMsgHdlr { this: PresentationApp2x => @@ -30,4 +29,4 @@ trait RemovePresentationPubMsgHdlr { broadcastEvent(msg) } } -} \ No newline at end of file +} diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/ResizeAndMovePagePubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/ResizeAndMovePagePubMsgHdlr.scala index 05582b1fc1..2cd05508c6 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/ResizeAndMovePagePubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/ResizeAndMovePagePubMsgHdlr.scala @@ -1,9 +1,8 @@ package org.bigbluebutton.core.apps.presentation import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.common2.domain.PageVO -import org.bigbluebutton.common2.messages.Presentation.{ ResizeAndMovePageEvtMsg, ResizeAndMovePageEvtMsgBody, ResizeAndMovePagePubMsg } trait ResizeAndMovePagePubMsgHdlr { this: PresentationApp2x => @@ -31,4 +30,4 @@ trait ResizeAndMovePagePubMsgHdlr { broadcastEvent(msg, page) } } -} \ No newline at end of file +} diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/SetCurrentPagePubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/SetCurrentPagePubMsgHdlr.scala index aad4bde542..c8c8c567d8 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/SetCurrentPagePubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/SetCurrentPagePubMsgHdlr.scala @@ -1,8 +1,7 @@ package org.bigbluebutton.core.apps.presentation -import org.bigbluebutton.common2.messages.Presentation.{ SetCurrentPageEvtMsg, SetCurrentPageEvtMsgBody, SetCurrentPagePubMsg } import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ trait SetCurrentPagePubMsgHdlr { this: PresentationApp2x => @@ -28,4 +27,4 @@ trait SetCurrentPagePubMsgHdlr { broadcastEvent(msg) } } -} \ No newline at end of file +} diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/SetCurrentPresentationPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/SetCurrentPresentationPubMsgHdlr.scala index 2fa50e8749..b89546fed2 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/SetCurrentPresentationPubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/SetCurrentPresentationPubMsgHdlr.scala @@ -1,8 +1,7 @@ package org.bigbluebutton.core.apps.presentation import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages.Presentation.{ SetCurrentPresentationEvtMsg, SetCurrentPresentationEvtMsgBody, SetCurrentPresentationPubMsg } -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ trait SetCurrentPresentationPubMsgHdlr { this: PresentationApp2x => @@ -30,4 +29,4 @@ trait SetCurrentPresentationPubMsgHdlr { broadcastEvent(msg) } } -} \ No newline at end of file +} diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/BbbMsgRouterEventBus.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/BbbMsgRouterEventBus.scala index f836e33c7f..7ceccf0e98 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/BbbMsgRouterEventBus.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/BbbMsgRouterEventBus.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.core.bus import akka.actor.ActorRef import akka.event.{ EventBus, LookupClassification } -import org.bigbluebutton.common2.messages.BbbCommonEnvCoreMsg +import org.bigbluebutton.common2.msgs.BbbCommonEnvCoreMsg case class BbbMsgEvent(val topic: String, val payload: BbbCommonEnvCoreMsg) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/OutEventBus2.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/OutEventBus2.scala index 46dde1d369..0dba14564b 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/OutEventBus2.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/OutEventBus2.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.core.bus import akka.actor.ActorRef import akka.event.{ EventBus, LookupClassification } -import org.bigbluebutton.common2.messages.{ BbbCommonEnvCoreMsg } +import org.bigbluebutton.common2.msgs.{ BbbCommonEnvCoreMsg } case class BbbOutMessage(val topic: String, val payload: BbbCommonEnvCoreMsg) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/RecordingEventBus.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/RecordingEventBus.scala index 40ac3db619..2446c4c89e 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/RecordingEventBus.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/RecordingEventBus.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.core.bus import akka.actor.ActorRef import akka.event.{ EventBus, LookupClassification } -import org.bigbluebutton.common2.messages.{ BbbCoreMsg } +import org.bigbluebutton.common2.msgs.{ BbbCoreMsg } case class BbbRecordMessage(val topic: String, val payload: BbbCoreMsg) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/BreakoutRooms.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/BreakoutRooms.scala index 8c6fca5c64..a108ef8450 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/BreakoutRooms.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/BreakoutRooms.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.core.models -import org.bigbluebutton.common2.messages.BreakoutRooms.{ BreakoutRoomVO, BreakoutUserVO } +import org.bigbluebutton.common2.msgs.{ BreakoutRoomVO, BreakoutUserVO } object BreakoutRooms { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgDeserializer.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgDeserializer.scala index 5c4f08214c..af7dcadeb1 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgDeserializer.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgDeserializer.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.core.pubsub.senders import com.fasterxml.jackson.databind.JsonNode import org.bigbluebutton.SystemConfiguration -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.bus.BbbMsgEvent import scala.reflect.runtime.universe._ diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala index 38948f7055..49bc6b5bfd 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala @@ -3,15 +3,7 @@ package org.bigbluebutton.core.pubsub.senders import akka.actor.{ Actor, ActorLogging, Props } import org.bigbluebutton.SystemConfiguration import com.fasterxml.jackson.databind.JsonNode -import org.bigbluebutton.common2.messages.BreakoutRooms._ -import org.bigbluebutton.common2.messages.Layout.{ BroadcastLayoutMsg, GetCurrentLayoutMsg, LockLayoutMsg } -import org.bigbluebutton.common2.messages.Polls._ -import org.bigbluebutton.common2.messages.Presentation._ -import org.bigbluebutton.common2.messages.Users.{ RegisterUserReqMsg, UserJoinMeetingReqMsg, UserLeaveReqMsg, ValidateAuthTokenReqMsg } -import org.bigbluebutton.common2.messages.VoiceConf._ -import org.bigbluebutton.common2.messages.Webcams.{ UserBroadcastCamStartMsg, UserBroadcastCamStopMsg } -import org.bigbluebutton.common2.messages.Whiteboard._ -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.bus._ import org.bigbluebutton.core2.ReceivedMessageRouter diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala index cd4da5a376..daae2054e8 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala @@ -6,15 +6,6 @@ import akka.actor._ import akka.actor.ActorLogging import akka.actor.SupervisorStrategy.Resume import org.bigbluebutton.common2.domain.DefaultProps -import org.bigbluebutton.common2.messages.BreakoutRooms._ -import org.bigbluebutton.common2.messages.Layout.{ BroadcastLayoutMsg, GetCurrentLayoutMsg, LockLayoutMsg } -import org.bigbluebutton.common2.messages.Polls._ -import org.bigbluebutton.common2.messages.Presentation._ -import org.bigbluebutton.common2.messages.Users.{ RegisterUserReqMsg, UserJoinMeetingReqMsg, UserLeaveReqMsg, ValidateAuthTokenReqMsg } -import org.bigbluebutton.common2.messages.VoiceConf.{ UserJoinedVoiceConfEvtMsg, UserLeftVoiceConfEvtMsg, UserMutedInVoiceConfEvtMsg, UserTalkingInVoiceConfEvtMsg } -import org.bigbluebutton.common2.messages.Webcams.{ UserBroadcastCamStartMsg, UserBroadcastCamStopMsg } -import org.bigbluebutton.common2.messages.Whiteboard._ -import org.bigbluebutton.common2.messages._ import org.bigbluebutton.core._ import org.bigbluebutton.core.api._ import org.bigbluebutton.core.apps._ @@ -27,7 +18,7 @@ import org.bigbluebutton.core.models.{ RegisteredUsers, Users1x } import org.bigbluebutton.core2.MeetingStatus2x import org.bigbluebutton.core2.message.handlers._ import org.bigbluebutton.core2.message.handlers.users._ - +import org.bigbluebutton.common2.msgs._ import scala.concurrent.duration._ import org.bigbluebutton.core.models.BreakoutRooms import org.bigbluebutton.core2.message.handlers.breakoutrooms._ diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala index f2dd0ecadf..e76370c21e 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.core2 import akka.actor.{ Actor, ActorLogging, Props } import org.bigbluebutton.SystemConfiguration -import org.bigbluebutton.common2.messages.BbbCommonEnvCoreMsg +import org.bigbluebutton.common2.msgs.BbbCommonEnvCoreMsg import org.bigbluebutton.common2.util.JsonUtil import org.bigbluebutton.core.MessageSender diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/GetCurrentPollReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/GetCurrentPollReqMsgHdlr.scala index d5542ac119..f1c7f0fb1f 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/GetCurrentPollReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/GetCurrentPollReqMsgHdlr.scala @@ -1,11 +1,10 @@ package org.bigbluebutton.core2.message.handlers -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Polls import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.common2.domain.PollVO -import org.bigbluebutton.common2.messages.Polls.{ GetCurrentPollReqMsg, GetCurrentPollRespMsg, GetCurrentPollRespMsgBody } trait GetCurrentPollReqMsgHdlr { this: MeetingActor => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/HidePollResultReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/HidePollResultReqMsgHdlr.scala index da2ab6c35e..c193ab7568 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/HidePollResultReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/HidePollResultReqMsgHdlr.scala @@ -1,7 +1,6 @@ package org.bigbluebutton.core2.message.handlers -import org.bigbluebutton.common2.messages.Polls.{ HidePollResultReqMsg, PollHideResultEvtMsg, PollHideResultEvtMsgBody } -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Polls import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/MuteAllExceptPresenterRequestHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/MuteAllExceptPresenterRequestHdlr.scala index 2ef47ef2fa..d237fcf3d6 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/MuteAllExceptPresenterRequestHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/MuteAllExceptPresenterRequestHdlr.scala @@ -1,7 +1,6 @@ package org.bigbluebutton.core2.message.handlers -import org.bigbluebutton.common2.messages.VoiceConf.{ MuteUserInVoiceConfMsg, MuteUserInVoiceConfMsgBody } -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api.{ MeetingMuted, MuteAllExceptPresenterRequest, MuteVoiceUser } import org.bigbluebutton.core.models.{ Users2x, VoiceUserState, VoiceUsers } diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/MuteMeetingRequestHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/MuteMeetingRequestHdlr.scala index bb83ca5cdc..03a8ef9e0e 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/MuteMeetingRequestHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/MuteMeetingRequestHdlr.scala @@ -1,7 +1,6 @@ package org.bigbluebutton.core2.message.handlers -import org.bigbluebutton.common2.messages.VoiceConf.{ MuteUserInVoiceConfMsg, MuteUserInVoiceConfMsgBody } -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api.{ MeetingMuted, MuteMeetingRequest, MuteVoiceUser } import org.bigbluebutton.core.models.{ Users1x, VoiceUserState, VoiceUsers } diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/RespondToPollReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/RespondToPollReqMsgHdlr.scala index 5c4667e5b4..98fc568925 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/RespondToPollReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/RespondToPollReqMsgHdlr.scala @@ -1,8 +1,7 @@ package org.bigbluebutton.core2.message.handlers import org.bigbluebutton.common2.domain.SimplePollResultOutVO -import org.bigbluebutton.common2.messages.Polls.{ RespondToPollReqMsg, UserRespondedToPollEvtMsg, UserRespondedToPollEvtMsgBody } -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Polls import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/ShowPollResultReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/ShowPollResultReqMsgHdlr.scala index bac0fbd63d..320b86ff6a 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/ShowPollResultReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/ShowPollResultReqMsgHdlr.scala @@ -1,12 +1,10 @@ package org.bigbluebutton.core2.message.handlers -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Polls import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.common2.domain.{ AnnotationVO, SimplePollResultOutVO } -import org.bigbluebutton.common2.messages.Polls.{ PollShowResultEvtMsg, PollShowResultEvtMsgBody, ShowPollResultReqMsg } -import org.bigbluebutton.common2.messages.Whiteboard.{ SendWhiteboardAnnotationEvtMsg, SendWhiteboardAnnotationEvtMsgBody } trait ShowPollResultReqMsgHdlr { this: MeetingActor => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/StartCustomPollReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/StartCustomPollReqMsgHdlr.scala index c37975efe5..82e66fec2c 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/StartCustomPollReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/StartCustomPollReqMsgHdlr.scala @@ -1,8 +1,7 @@ package org.bigbluebutton.core2.message.handlers import org.bigbluebutton.common2.domain.SimplePollOutVO -import org.bigbluebutton.common2.messages.Polls.{ PollStartedEvtMsg, PollStartedEvtMsgBody, StartCustomPollReqMsg } -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Polls import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/StartPollReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/StartPollReqMsgHdlr.scala index a1933a661c..f7c0553c61 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/StartPollReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/StartPollReqMsgHdlr.scala @@ -1,8 +1,7 @@ package org.bigbluebutton.core2.message.handlers -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.common2.domain.SimplePollOutVO -import org.bigbluebutton.common2.messages.Polls.{ PollStartedEvtMsg, PollStartedEvtMsgBody, StartPollReqMsg } import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Polls import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/StopPollReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/StopPollReqMsgHdlr.scala index 1713744986..a746c7d749 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/StopPollReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/StopPollReqMsgHdlr.scala @@ -1,7 +1,6 @@ package org.bigbluebutton.core2.message.handlers -import org.bigbluebutton.common2.messages.Polls.{ PollStoppedEvtMsg, PollStoppedEvtMsgBody, StopPollReqMsg } -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Polls import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomCreatedMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomCreatedMsgHdlr.scala index bcb48d713b..8770cc643d 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomCreatedMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomCreatedMsgHdlr.scala @@ -1,7 +1,6 @@ package org.bigbluebutton.core2.message.handlers.breakoutrooms -import org.bigbluebutton.common2.messages.BbbClientMsgHeader -import org.bigbluebutton.common2.messages.BreakoutRooms.{ BreakoutRoomCreatedMsg, BreakoutRoomsListMsg, BreakoutRoomsListMsgBody } +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.BreakoutRooms import org.bigbluebutton.core.running.MeetingActor @@ -35,4 +34,4 @@ trait BreakoutRoomCreatedMsgHdlr { msg.header.meetingId, msg.header.userId), new BreakoutRoomsListMsgBody(props.meetingProp.intId))) } } -} \ No newline at end of file +} diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomEndedMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomEndedMsgHdlr.scala index 18786a4bb9..775aa07845 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomEndedMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomEndedMsgHdlr.scala @@ -1,9 +1,6 @@ package org.bigbluebutton.core2.message.handlers.breakoutrooms -import org.bigbluebutton.common2.messages.BreakoutRooms.{ BreakoutRoomEndedEvtMsg, BreakoutRoomEndedEvtMsgBody, BreakoutRoomEndedMsg } -import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.MessageTypes -import org.bigbluebutton.common2.messages.Routing +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.BreakoutRooms import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomUsersUpdateMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomUsersUpdateMsgHdlr.scala index bca23e83de..5c2ffb2dbe 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomUsersUpdateMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomUsersUpdateMsgHdlr.scala @@ -1,9 +1,6 @@ package org.bigbluebutton.core2.message.handlers.breakoutrooms -import org.bigbluebutton.common2.messages.BreakoutRooms.{ BreakoutRoomUsersUpdateMsg, UpdateBreakoutUsersEvtMsg, UpdateBreakoutUsersEvtMsgBody } -import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.MessageTypes -import org.bigbluebutton.common2.messages.Routing +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.BreakoutRooms import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomsListMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomsListMsgHdlr.scala index d5fdb5f477..e9dd2ff085 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomsListMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/BreakoutRoomsListMsgHdlr.scala @@ -1,7 +1,6 @@ package org.bigbluebutton.core2.message.handlers.breakoutrooms -import org.bigbluebutton.common2.messages.BreakoutRooms.{ BreakoutRoomInfo, BreakoutRoomsListEvtMsg, BreakoutRoomsListEvtMsgBody, BreakoutRoomsListMsg } -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core.models.BreakoutRooms diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/CreateBreakoutRoomsMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/CreateBreakoutRoomsMsgHdlr.scala index 347db42b74..15278d4fa6 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/CreateBreakoutRoomsMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/CreateBreakoutRoomsMsgHdlr.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.core2.message.handlers.breakoutrooms -import org.bigbluebutton.common2.messages.BreakoutRooms.CreateBreakoutRoomsMsg +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api.BreakoutRoomOutPayload import org.bigbluebutton.core.api.CreateBreakoutRoom diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/EndAllBreakoutRoomsMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/EndAllBreakoutRoomsMsgHdlr.scala index 06590ee1d9..4670545fde 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/EndAllBreakoutRoomsMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/EndAllBreakoutRoomsMsgHdlr.scala @@ -1,9 +1,6 @@ package org.bigbluebutton.core2.message.handlers.breakoutrooms -import org.bigbluebutton.common2.messages.BreakoutRooms.{ EndAllBreakoutRoomsMsg, EndBreakoutRoomEvtMsg, EndBreakoutRoomEvtMsgBody } -import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.MessageTypes -import org.bigbluebutton.common2.messages.Routing +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.BreakoutRooms import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/RequestBreakoutJoinURLMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/RequestBreakoutJoinURLMsgHdlr.scala index e7a0652954..f79b62fb10 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/RequestBreakoutJoinURLMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/RequestBreakoutJoinURLMsgHdlr.scala @@ -1,9 +1,8 @@ package org.bigbluebutton.core2.message.handlers.breakoutrooms -import org.bigbluebutton.common2.messages.BreakoutRooms.{ BreakoutRoomJoinURLEvtMsg, BreakoutRoomJoinURLEvtMsgBody, RequestBreakoutJoinURLMsg } import org.bigbluebutton.core.models.Users1x import org.bigbluebutton.core.models.BreakoutRooms -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.apps.BreakoutRoomsUtil import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/SendBreakoutUsersUpdateMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/SendBreakoutUsersUpdateMsgHdlr.scala index ed176fcfad..8c9253680f 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/SendBreakoutUsersUpdateMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/SendBreakoutUsersUpdateMsgHdlr.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.core2.message.handlers.breakoutrooms -import org.bigbluebutton.common2.messages.BreakoutRooms.{ BreakoutUserVO, SendBreakoutUsersUpdateMsg } +import org.bigbluebutton.common2.msgs.{ BreakoutUserVO, SendBreakoutUsersUpdateMsg } import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api.BreakoutRoomUsersUpdate import org.bigbluebutton.core.bus.BigBlueButtonEvent diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/TransferUserToMeetingRequestHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/TransferUserToMeetingRequestHdlr.scala index b5219dd746..dda8f445f5 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/TransferUserToMeetingRequestHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/breakoutrooms/TransferUserToMeetingRequestHdlr.scala @@ -1,7 +1,6 @@ package org.bigbluebutton.core2.message.handlers.breakoutrooms -import org.bigbluebutton.common2.messages.BreakoutRooms.{ TransferUserToMeetingEvtMsg, TransferUserToMeetingEvtMsgBody, TransferUserToMeetingRequestMsg } -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.BreakoutRooms import org.bigbluebutton.core.models.Users1x @@ -51,4 +50,4 @@ trait TransferUserToMeetingRequestHdlr { broadcastEvent(msg) } -} \ No newline at end of file +} diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/BroadcastLayoutMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/BroadcastLayoutMsgHdlr.scala index eed124d3fb..51eef4df2b 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/BroadcastLayoutMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/BroadcastLayoutMsgHdlr.scala @@ -1,8 +1,6 @@ package org.bigbluebutton.core2.message.handlers.layout -import org.bigbluebutton.common2.messages.Layout.{ BroadcastLayoutEvtMsg, BroadcastLayoutEvtMsgBody, BroadcastLayoutMsg } -import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.Routing +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Layouts import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/GetCurrentLayoutMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/GetCurrentLayoutMsgHdlr.scala index f0b680bc0f..119e378edf 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/GetCurrentLayoutMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/GetCurrentLayoutMsgHdlr.scala @@ -1,15 +1,10 @@ package org.bigbluebutton.core2.message.handlers.layout -import org.bigbluebutton.common2.messages.Routing -import org.bigbluebutton.common2.messages.MessageTypes +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.running.MeetingActor -import org.bigbluebutton.common2.messages.BbbCommonEnvCoreMsg import org.bigbluebutton.core2.MeetingStatus2x -import org.bigbluebutton.common2.messages.BbbClientMsgHeader import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Layouts -import org.bigbluebutton.common2.messages.BbbCoreEnvelope -import org.bigbluebutton.common2.messages.Layout.{ GetCurrentLayoutEvtMsg, GetCurrentLayoutEvtMsgBody, GetCurrentLayoutMsg } trait GetCurrentLayoutMsgHdlr { this: MeetingActor => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/LockLayoutMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/LockLayoutMsgHdlr.scala index 78c10d3c47..6d7777300c 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/LockLayoutMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/layout/LockLayoutMsgHdlr.scala @@ -1,8 +1,6 @@ package org.bigbluebutton.core2.message.handlers.layout -import org.bigbluebutton.common2.messages.Layout._ -import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.Routing +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Layouts import org.bigbluebutton.core.running.MeetingActor @@ -56,4 +54,4 @@ trait LockLayoutMsgHdlr { broadcastEvent(msg) } -} \ No newline at end of file +} diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/GetUsersHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/GetUsersHdlr.scala index 9f4e70f51b..7217d61a35 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/GetUsersHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/GetUsersHdlr.scala @@ -1,11 +1,8 @@ package org.bigbluebutton.core2.message.handlers.users -import org.bigbluebutton.common2.messages._ import org.bigbluebutton.core.{ OutMessageGateway } import org.bigbluebutton.core.api.GetUsers -import org.bigbluebutton.core.models.Users2x import org.bigbluebutton.core.running.MeetingActor -import org.bigbluebutton.core2.message.senders.{ GetUsersMeetingRespMsgBuilder, Sender } trait GetUsersHdlr { this: MeetingActor => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserBroadcastCamStartMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserBroadcastCamStartMsgHdlr.scala index 03e82daab6..9c3d1fa29c 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserBroadcastCamStartMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserBroadcastCamStartMsgHdlr.scala @@ -1,7 +1,6 @@ package org.bigbluebutton.core2.message.handlers.users -import org.bigbluebutton.common2.messages.Webcams.{ UserBroadcastCamStartMsg, UserBroadcastCamStartedEvtMsg, UserBroadcastCamStartedEvtMsgBody } -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.{ MediaStream, WebcamStream, Webcams } import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserBroadcastCamStopMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserBroadcastCamStopMsgHdlr.scala index 6e40f2cafb..c72c60bb9b 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserBroadcastCamStopMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserBroadcastCamStopMsgHdlr.scala @@ -1,7 +1,6 @@ package org.bigbluebutton.core2.message.handlers.users -import org.bigbluebutton.common2.messages.Webcams.{ UserBroadcastCamStopMsg, UserBroadcastCamStoppedEvtMsg, UserBroadcastCamStoppedEvtMsgBody } -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Webcams import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserConnectedToGlobalAudioHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserConnectedToGlobalAudioHdlr.scala index 6755188ab8..2f7ab2a24f 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserConnectedToGlobalAudioHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserConnectedToGlobalAudioHdlr.scala @@ -1,7 +1,6 @@ package org.bigbluebutton.core2.message.handlers.users -import org.bigbluebutton.common2.messages.VoiceConf.{ UserJoinedVoiceConfToClientEvtMsg, UserJoinedVoiceConfToClientEvtMsgBody } -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api.UserConnectedToGlobalAudio import org.bigbluebutton.core.models.{ Users2x, VoiceUserState, VoiceUsers } diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserDisconnectedFromGlobalAudioHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserDisconnectedFromGlobalAudioHdlr.scala index 9092efbf0c..c45f4b7f33 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserDisconnectedFromGlobalAudioHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserDisconnectedFromGlobalAudioHdlr.scala @@ -1,7 +1,6 @@ package org.bigbluebutton.core2.message.handlers.users -import org.bigbluebutton.common2.messages.VoiceConf.{ UserLeftVoiceConfToClientEvtMsg, UserLeftVoiceConfToClientEvtMsgBody } -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api.{ UserDisconnectedFromGlobalAudio, UserLeft, UserListeningOnly } import org.bigbluebutton.core.models.{ VoiceUserState, VoiceUsers } diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserEmojiStatusHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserEmojiStatusHdlr.scala index 11a40ed95e..9e94fa1d7e 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserEmojiStatusHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserEmojiStatusHdlr.scala @@ -1,7 +1,6 @@ package org.bigbluebutton.core2.message.handlers.users -import org.bigbluebutton.common2.messages.Users.{ UserEmojiChangedEvtMsg, UserEmojiChangedEvtMsgBody } -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.api.{ UserChangedEmojiStatus, UserEmojiStatus } import org.bigbluebutton.core.models.{ Users1x, Users2x } diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserJoinMeetingReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserJoinMeetingReqMsgHdlr.scala index 6ab397c39c..17dda0a541 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserJoinMeetingReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserJoinMeetingReqMsgHdlr.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.core2.message.handlers.users -import org.bigbluebutton.common2.messages.Users.UserJoinMeetingReqMsg +import org.bigbluebutton.common2.msgs.UserJoinMeetingReqMsg import org.bigbluebutton.core.{ MessageRecorder, OutMessageGateway } import org.bigbluebutton.core.models.{ RegisteredUsers, UserState, Users2x } import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserJoinedVoiceConfEvtMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserJoinedVoiceConfEvtMsgHdlr.scala index 9c6d58c031..8c726581ee 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserJoinedVoiceConfEvtMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserJoinedVoiceConfEvtMsgHdlr.scala @@ -1,7 +1,6 @@ package org.bigbluebutton.core2.message.handlers.users -import org.bigbluebutton.common2.messages.VoiceConf.{ UserJoinedVoiceConfEvtMsg, UserJoinedVoiceConfToClientEvtMsg, UserJoinedVoiceConfToClientEvtMsgBody } -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.{ VoiceUser2x, VoiceUserState, VoiceUsers } import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserLeavingHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserLeavingHdlr.scala index acd08523a0..fe8d8ff5a0 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserLeavingHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserLeavingHdlr.scala @@ -1,7 +1,6 @@ package org.bigbluebutton.core2.message.handlers.users -import org.bigbluebutton.common2.messages.Users.{ UserLeaveReqMsg, UserLeftMeetingEvtMsg, UserLeftMeetingEvtMsgBody } -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.Users2x import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserLeftVoiceConfEvtMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserLeftVoiceConfEvtMsgHdlr.scala index de4c12d09c..57991edec9 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserLeftVoiceConfEvtMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserLeftVoiceConfEvtMsgHdlr.scala @@ -1,7 +1,6 @@ package org.bigbluebutton.core2.message.handlers.users -import org.bigbluebutton.common2.messages.VoiceConf.{ UserLeftVoiceConfEvtMsg, UserLeftVoiceConfToClientEvtMsg, UserLeftVoiceConfToClientEvtMsgBody } -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.{ VoiceUserState, VoiceUsers } import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserMutedInVoiceConfEvtMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserMutedInVoiceConfEvtMsgHdlr.scala index c1a0143c7d..1b6e4bfd36 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserMutedInVoiceConfEvtMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserMutedInVoiceConfEvtMsgHdlr.scala @@ -1,7 +1,6 @@ package org.bigbluebutton.core2.message.handlers.users -import org.bigbluebutton.common2.messages.VoiceConf.{ UserMutedEvtMsg, UserMutedEvtMsgBody, UserMutedInVoiceConfEvtMsg } -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.{ VoiceUserState, VoiceUsers } import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserTalkingInVoiceConfEvtMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserTalkingInVoiceConfEvtMsgHdlr.scala index ba7335728a..17d4b9c9c3 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserTalkingInVoiceConfEvtMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserTalkingInVoiceConfEvtMsgHdlr.scala @@ -1,7 +1,6 @@ package org.bigbluebutton.core2.message.handlers.users -import org.bigbluebutton.common2.messages.VoiceConf.{ UserTalkingEvtMsg, UserTalkingEvtMsgBody, UserTalkingInVoiceConfEvtMsg } -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models.{ VoiceUserState, VoiceUsers } import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/ValidateAuthTokenReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/ValidateAuthTokenReqMsgHdlr.scala index 2832c5a322..072db6dd11 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/ValidateAuthTokenReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/ValidateAuthTokenReqMsgHdlr.scala @@ -1,9 +1,6 @@ package org.bigbluebutton.core2.message.handlers.users -import org.bigbluebutton.common2.messages.Guests.{ GuestWaitingVO, GuestsWaitingApprovalEvtMsg, GuestsWaitingApprovalEvtMsgBody } -import org.bigbluebutton.common2.messages.Users.ValidateAuthTokenReqMsg -import org.bigbluebutton.common2.messages.Webcams.{ MediaStreamVO, WebcamStreamVO } -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway import org.bigbluebutton.core.models._ import org.bigbluebutton.core.running.MeetingActor diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/ClearWhiteboardPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/ClearWhiteboardPubMsgHdlr.scala index 8a16498955..281c1437dc 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/ClearWhiteboardPubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/ClearWhiteboardPubMsgHdlr.scala @@ -1,9 +1,8 @@ package org.bigbluebutton.core2.message.handlers.whiteboard -import org.bigbluebutton.common2.messages.Whiteboard.{ ClearWhiteboardEvtMsg, ClearWhiteboardEvtMsgBody, ClearWhiteboardPubMsg } import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ trait ClearWhiteboardPubMsgHdlr { this: MeetingActor => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/GetWhiteboardAccessReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/GetWhiteboardAccessReqMsgHdlr.scala index 62aa77802e..f6b24f59fe 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/GetWhiteboardAccessReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/GetWhiteboardAccessReqMsgHdlr.scala @@ -1,9 +1,8 @@ package org.bigbluebutton.core2.message.handlers.whiteboard -import org.bigbluebutton.common2.messages.Whiteboard.{ GetWhiteboardAccessReqMsg, GetWhiteboardAccessRespMsg, GetWhiteboardAccessRespMsgBody } import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ trait GetWhiteboardAccessReqMsgHdlr { this: MeetingActor => @@ -27,4 +26,4 @@ trait GetWhiteboardAccessReqMsgHdlr { broadcastEvent(msg, getWhiteboardAccess()) } -} \ No newline at end of file +} diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/GetWhiteboardAnnotationsReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/GetWhiteboardAnnotationsReqMsgHdlr.scala index 6e56d0e824..b184048c2c 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/GetWhiteboardAnnotationsReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/GetWhiteboardAnnotationsReqMsgHdlr.scala @@ -2,9 +2,8 @@ package org.bigbluebutton.core2.message.handlers.whiteboard import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.common2.domain.AnnotationVO -import org.bigbluebutton.common2.messages.Whiteboard.{ GetWhiteboardAnnotationsReqMsg, GetWhiteboardAnnotationsRespMsg, GetWhiteboardAnnotationsRespMsgBody } trait GetWhiteboardAnnotationsReqMsgHdlr { this: MeetingActor => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/ModifyWhiteboardAccessPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/ModifyWhiteboardAccessPubMsgHdlr.scala index 9c8470721e..7626b79422 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/ModifyWhiteboardAccessPubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/ModifyWhiteboardAccessPubMsgHdlr.scala @@ -1,9 +1,8 @@ package org.bigbluebutton.core2.message.handlers.whiteboard -import org.bigbluebutton.common2.messages.Whiteboard.{ ModifyWhiteboardAccessEvtMsg, ModifyWhiteboardAccessEvtMsgBody, ModifyWhiteboardAccessPubMsg } import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ trait ModifyWhiteboardAccessPubMsgHdlr { this: MeetingActor => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/SendCursorPositionPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/SendCursorPositionPubMsgHdlr.scala index 95be7a81e4..99ea8a23eb 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/SendCursorPositionPubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/SendCursorPositionPubMsgHdlr.scala @@ -1,9 +1,8 @@ package org.bigbluebutton.core2.message.handlers.whiteboard -import org.bigbluebutton.common2.messages.Whiteboard.{ SendCursorPositionEvtMsg, SendCursorPositionEvtMsgBody, SendCursorPositionPubMsg } import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ trait SendCursorPositionPubMsgHdlr { this: MeetingActor => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/SendWhiteboardAnnotationPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/SendWhiteboardAnnotationPubMsgHdlr.scala index e4e12d02c1..adef6166ad 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/SendWhiteboardAnnotationPubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/SendWhiteboardAnnotationPubMsgHdlr.scala @@ -2,9 +2,8 @@ package org.bigbluebutton.core2.message.handlers.whiteboard import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.common2.domain.AnnotationVO -import org.bigbluebutton.common2.messages.Whiteboard.{ SendWhiteboardAnnotationEvtMsg, SendWhiteboardAnnotationEvtMsgBody, SendWhiteboardAnnotationPubMsg } trait SendWhiteboardAnnotationPubMsgHdlr { this: MeetingActor => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/UndoWhiteboardPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/UndoWhiteboardPubMsgHdlr.scala index 26c652928e..1e6c33fba2 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/UndoWhiteboardPubMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/whiteboard/UndoWhiteboardPubMsgHdlr.scala @@ -1,9 +1,8 @@ package org.bigbluebutton.core2.message.handlers.whiteboard -import org.bigbluebutton.common2.messages.Whiteboard.{ UndoWhiteboardEvtMsg, UndoWhiteboardEvtMsgBody, UndoWhiteboardPubMsg } import org.bigbluebutton.core.running.MeetingActor import org.bigbluebutton.core.OutMessageGateway -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ trait UndoWhiteboardPubMsgHdlr { this: MeetingActor => diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/GetUsersMeetingRespMsgBuilder.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/GetUsersMeetingRespMsgBuilder.scala index 88eca6cfdf..4f4e740efc 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/GetUsersMeetingRespMsgBuilder.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/GetUsersMeetingRespMsgBuilder.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.core2.message.senders -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ object GetUsersMeetingRespMsgBuilder { def build(meetingId: String, userId: String, webusers: Vector[WebUser]): BbbCommonEnvCoreMsg = { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/GetVoiceUsersMeetingRespMsgBuilder.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/GetVoiceUsersMeetingRespMsgBuilder.scala index 2a3728ae69..b54096a097 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/GetVoiceUsersMeetingRespMsgBuilder.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/GetVoiceUsersMeetingRespMsgBuilder.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.core2.message.senders -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ object GetVoiceUsersMeetingRespMsgBuilder { def build(meetingId: String, userId: String, voiceUsers: Vector[VoiceConfUser]): BbbCommonEnvCoreMsg = { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/GetWebcamStreamsMeetingRespMsgBuilder.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/GetWebcamStreamsMeetingRespMsgBuilder.scala index eee88c0e92..bc3e83ca63 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/GetWebcamStreamsMeetingRespMsgBuilder.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/GetWebcamStreamsMeetingRespMsgBuilder.scala @@ -1,7 +1,6 @@ package org.bigbluebutton.core2.message.senders -import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.Webcams.{ GetWebcamStreamsMeetingRespMsg, GetWebcamStreamsMeetingRespMsgBody, WebcamStreamVO } +import org.bigbluebutton.common2.msgs._ object GetWebcamStreamsMeetingRespMsgBuilder { def build(meetingId: String, userId: String, streams: Vector[WebcamStreamVO]): BbbCommonEnvCoreMsg = { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/Sender.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/Sender.scala index 2c273156f0..7130b25a25 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/Sender.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/Sender.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.core2.message.senders -import org.bigbluebutton.common2.messages.BbbCommonEnvCoreMsg +import org.bigbluebutton.common2.msgs.BbbCommonEnvCoreMsg import org.bigbluebutton.core.OutMessageGateway object Sender { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/UserJoinedMeetingEvtMsgBuilder.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/UserJoinedMeetingEvtMsgBuilder.scala index ed7452d4b3..e96a7ce800 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/UserJoinedMeetingEvtMsgBuilder.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/UserJoinedMeetingEvtMsgBuilder.scala @@ -1,7 +1,6 @@ package org.bigbluebutton.core2.message.senders -import org.bigbluebutton.common2.messages.Users.{ UserJoinedMeetingEvtMsg, UserJoinedMeetingEvtMsgBody } -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.models.UserState object UserJoinedMeetingEvtMsgBuilder { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/UserLeftMeetingEvtMsgSender.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/UserLeftMeetingEvtMsgSender.scala index 606fdda627..63c75947c1 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/UserLeftMeetingEvtMsgSender.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/UserLeftMeetingEvtMsgSender.scala @@ -1,7 +1,6 @@ package org.bigbluebutton.core2.message.senders -import org.bigbluebutton.common2.messages.Users.{ UserLeftMeetingEvtMsg, UserLeftMeetingEvtMsgBody } -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.models.UserState object UserLeftMeetingEvtMsgSender { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/ValidateAuthTokenRespMsgSender.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/ValidateAuthTokenRespMsgSender.scala index 173e6fe069..31a53b1ff9 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/ValidateAuthTokenRespMsgSender.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/ValidateAuthTokenRespMsgSender.scala @@ -1,7 +1,6 @@ package org.bigbluebutton.core2.message.senders -import org.bigbluebutton.common2.messages.Users.{ ValidateAuthTokenRespMsg, ValidateAuthTokenRespMsgBody } -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.OutMessageGateway object ValidateAuthTokenRespMsgSender { diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/CreateMeetingReqMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/CreateMeetingReqMsg.scala deleted file mode 100755 index a8e4ba392d..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/CreateMeetingReqMsg.scala +++ /dev/null @@ -1,9 +0,0 @@ -package org.bigbluebutton.common2.messages - -import org.bigbluebutton.common2.domain.DefaultProps - -object CreateMeetingReqMsg { val NAME = "CreateMeetingReqMsg" } -case class CreateMeetingReqMsg(header: BbbCoreBaseHeader, - body: CreateMeetingReqMsgBody) extends BbbCoreMsg - -case class CreateMeetingReqMsgBody(props: DefaultProps) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Deserializer.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Deserializer.scala deleted file mode 100755 index 2a7bf7cf93..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Deserializer.scala +++ /dev/null @@ -1,146 +0,0 @@ -package org.bigbluebutton.common2.messages - -import com.fasterxml.jackson.databind.JsonNode -import org.bigbluebutton.common2.util.JsonUtil - -import scala.reflect.ClassTag -import scala.reflect.runtime.universe._ -import scala.util.{Failure, Success, Try} - - -trait Deserializer { - - def toBbbCoreMessageFromClient(json: String): (Option[BbbCoreMessageFromClient], String) = { - def convertFromJson(json: String): Try[BbbCoreMessageFromClient] = { - for { - msg <- JsonUtil.fromJsonToBbbCoreMessageFromClient(json) - } yield msg - } - - convertFromJson(json) match { - case Success(msg) => (Some(msg), "No Error.") - case Failure(ex) => (None, ex.getMessage) - } - - } - - def fromJson[T](json: String)(implicit tag: TypeTag[T]): Try[T] = { - // https://stackoverflow.com/questions/23383814/is-it-possible-to-convert-a-typetag-to-a-manifest - // typeTag to classTag - implicit val cl = ClassTag[T]( tag.mirror.runtimeClass( tag.tpe ) ) - - // with an implicit classTag in scope, you can get a manifest - manifest[T] - - for { - result <- Try(JsonUtil.mapper.readValue[T](json)) - } yield result - } - - def toBbbCommonMsg[V <: BbbCoreMsg](jsonNode: JsonNode)(implicit tag: TypeTag[V]): (Option[V], String) = { - val json = JsonUtil.toJson(jsonNode) - val result = for { - result <- fromJson[V](json) - } yield result - - result match { - case Success(msg) => (Some(msg), "No Error.") - case Failure(ex) => (None, ex.getMessage) - } - } - - def toBbbCommonEnvJsNodeMsg(json: String): Try[BbbCommonEnvJsNodeMsg] = { - for { - msg <- JsonUtil.fromJsonToBbbCommonEnvJsNodeMsg(json) - } yield msg - } - - /* - def toCreateMeetingReqMsg(envelope: BbbCoreEnvelope, jsonNode: JsonNode): Option[CreateMeetingReqMsg] = { - def convertFromJson(json: String): Try[CreateMeetingReqMsg] = { - for { - msg <- fromJson[CreateMeetingReqMsg](json) - } yield msg - } - - val json = JsonUtil.toJson(jsonNode) - - val result = for { - result <- convertFromJson(json) - } yield result - - - result match { - case Success(msg) => Some(msg) - case Failure(ex) => println(s"************ Problem deserializing json: ${jsonNode}") - println(s"*********** Exception deserializing json: ${ex.getMessage}") - None - } - } - - def toValidateAuthTokenReqMsg(envelope: BbbCoreEnvelope, jsonNode: JsonNode): Option[ValidateAuthTokenReqMsg] = { - def convertFromJson(json: String): Try[ValidateAuthTokenReqMsg] = { - for { - msg <- fromJson[ValidateAuthTokenReqMsg](json) - } yield msg - } - - val json = JsonUtil.toJson(jsonNode) - - val result = for { - result <- convertFromJson(json) - } yield result - - - result match { - case Success(msg) => Some(msg) - case Failure(ex) => println(s"************ Problem deserializing json: ${jsonNode}") - println(s"*********** Exception deserializing json: ${ex.getMessage}") - None - } - } - - def toMeetingCreatedEvtMsg(envelope: BbbCoreEnvelope, jsonNode: JsonNode): Option[MeetingCreatedEvtMsg] = { - def convertFromJson(json: String): Try[MeetingCreatedEvtMsg] = { - for { - msg <- fromJson[MeetingCreatedEvtMsg](json) - } yield msg - } - - val json = JsonUtil.toJson(jsonNode) - - val result = for { - result <- convertFromJson(json) - } yield result - - result match { - case Success(msg) => Some(msg) - case Failure(ex) => println(s"************ Problem deserializing json: ${jsonNode}") - println(s"*********** Exception deserializing json: ${ex.getMessage}") - None - } - } - - def toRegisterUserReqMsg(envelope: BbbCoreEnvelope, jsonNode: JsonNode): Option[RegisterUserReqMsg] = { - def convertFromJson(json: String): Try[RegisterUserReqMsg] = { - for { - msg <- fromJson[RegisterUserReqMsg](json) - } yield msg - } - - val json = JsonUtil.toJson(jsonNode) - - val result = for { - result <- convertFromJson(json) - } yield result - - result match { - case Success(msg) => Some(msg) - case Failure(ex) => println(s"************ Problem deserializing json: ${jsonNode}") - println(s"*********** Exception deserializing json: ${ex.getMessage}") - None - } - } - - */ -} diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetUsersMeetingReqMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetUsersMeetingReqMsg.scala deleted file mode 100755 index 1ed69cfa03..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetUsersMeetingReqMsg.scala +++ /dev/null @@ -1,9 +0,0 @@ -package org.bigbluebutton.common2.messages - - -object GetUsersMeetingReqMsg { - val NAME = "GetUsersMeetingReqMsg" -} - -case class GetUsersMeetingReqMsg(header: BbbClientMsgHeader, body: GetUsersMeetingReqMsgBody) extends BbbCoreMsg -case class GetUsersMeetingReqMsgBody(userId: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetUsersMeetingRespMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetUsersMeetingRespMsg.scala deleted file mode 100755 index 00334a99ce..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetUsersMeetingRespMsg.scala +++ /dev/null @@ -1,20 +0,0 @@ -package org.bigbluebutton.common2.messages - -object GetUsersMeetingRespMsg { - val NAME = "GetUsersMeetingRespMsg" - - def apply(meetingId: String, userId: String, users: Vector[WebUser]): GetUsersMeetingRespMsg = { - val header = BbbClientMsgHeader(GetUsersMeetingRespMsg.NAME, meetingId, userId) - - val body = GetUsersMeetingRespMsgBody(users) - GetUsersMeetingRespMsg(header, body) - } - -} - -case class GetUsersMeetingRespMsg(header: BbbClientMsgHeader, body: GetUsersMeetingRespMsgBody) extends BbbCoreMsg -case class GetUsersMeetingRespMsgBody(users: Vector[WebUser]) - -case class WebUser(intId: String, extId: String, name: String, role: String, - guest: Boolean, authed: Boolean, waitingForAcceptance: Boolean, emoji: String, locked: Boolean, - presenter: Boolean, avatar: String) \ No newline at end of file diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetVoiceUsersMeetingReqMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetVoiceUsersMeetingReqMsg.scala deleted file mode 100755 index 4784021a88..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetVoiceUsersMeetingReqMsg.scala +++ /dev/null @@ -1,6 +0,0 @@ -package org.bigbluebutton.common2.messages - - -object GetVoiceUsersMeetingReqMsg { - -} diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetVoiceUsersMeetingRespMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetVoiceUsersMeetingRespMsg.scala deleted file mode 100755 index c8465ec498..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/GetVoiceUsersMeetingRespMsg.scala +++ /dev/null @@ -1,18 +0,0 @@ -package org.bigbluebutton.common2.messages - -object GetVoiceUsersMeetingRespMsg { - val NAME = "GetVoiceUsersMeetingRespMsg" - - def apply(meetingId: String, userId: String, users: Vector[VoiceConfUser]): GetVoiceUsersMeetingRespMsg = { - val header = BbbClientMsgHeader(GetVoiceUsersMeetingRespMsg.NAME, meetingId, userId) - - val body = GetVoiceUsersMeetingRespMsgBody(users) - GetVoiceUsersMeetingRespMsg(header, body) - } -} - -case class GetVoiceUsersMeetingRespMsg(header: BbbClientMsgHeader, body: GetVoiceUsersMeetingRespMsgBody) extends BbbCoreMsg -case class GetVoiceUsersMeetingRespMsgBody(users: Vector[VoiceConfUser]) - -case class VoiceConfUser(intId: String, voiceUserId: String, callingWith: String, callerName: String, - callerNum: String, muted: Boolean, talking: Boolean, listenOnly: Boolean) \ No newline at end of file diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Guests.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Guests.scala deleted file mode 100755 index 849d491cd2..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Guests.scala +++ /dev/null @@ -1,68 +0,0 @@ -package org.bigbluebutton.common2.messages - - -object Guests { - object GetGuestsWaitingApprovalRespMsg { - val NAME = "GetGuestsWaitingApprovalRespMsg" - - def apply(meetingId: String, userId: String, guests: Vector[GuestWaitingVO]): GetGuestsWaitingApprovalRespMsg = { - val header = BbbClientMsgHeader(GetGuestsWaitingApprovalRespMsg.NAME, meetingId, userId) - - val body = GetGuestsWaitingApprovalRespMsgBody(guests) - GetGuestsWaitingApprovalRespMsg(header, body) - } - } - - case class GetGuestsWaitingApprovalRespMsg(header: BbbClientMsgHeader, - body: GetGuestsWaitingApprovalRespMsgBody) extends BbbCoreMsg - case class GetGuestsWaitingApprovalRespMsgBody(guests: Vector[GuestWaitingVO]) - - case class GuestWaitingVO(intId: String, name: String, role: String) - - object GuestsWaitingApprovalEvtMsg { - val NAME = "GuestsWaitingApprovalEvtMsg" - - def apply(meetingId: String, userId: String, guests: Vector[GuestWaitingVO]): GuestsWaitingApprovalEvtMsg = { - val header = BbbClientMsgHeader(GetGuestsWaitingApprovalRespMsg.NAME, meetingId, userId) - - val body = GuestsWaitingApprovalEvtMsgBody(guests) - GuestsWaitingApprovalEvtMsg(header, body) - } - } - - case class GuestsWaitingApprovalEvtMsg(header: BbbClientMsgHeader, - body: GuestsWaitingApprovalEvtMsgBody) extends BbbCoreMsg - case class GuestsWaitingApprovalEvtMsgBody(guests: Vector[GuestWaitingVO]) - - object GuestsWaitingApprovedEvtMsg { - val NAME = "GuestsWaitingApprovedEvtMsg" - - def apply(meetingId: String, userId: String, guests: Vector[GuestWaitingVO]): GuestsWaitingApprovedEvtMsg = { - val header = BbbClientMsgHeader(GetGuestsWaitingApprovalRespMsg.NAME, meetingId, userId) - - val body = GuestsWaitingApprovedEvtMsgBody(guests) - GuestsWaitingApprovedEvtMsg(header, body) - } - } - - case class GuestsWaitingApprovedEvtMsg(header: BbbClientMsgHeader, - body: GuestsWaitingApprovedEvtMsgBody) extends BbbCoreMsg - case class GuestsWaitingApprovedEvtMsgBody(guests: Vector[GuestWaitingVO]) - - object GuestsWaitingApprovedMsg { - val NAME = "GuestsWaitingApprovedMsg" - - def apply(meetingId: String, userId: String, guests: Vector[String]): GuestsWaitingApprovedMsg = { - val header = BbbClientMsgHeader(GetGuestsWaitingApprovalRespMsg.NAME, meetingId, userId) - - val body = GuestsWaitingApprovedMsgBody(guests) - GuestsWaitingApprovedMsg(header, body) - } - } - - case class GuestsWaitingApprovedMsg(header: BbbClientMsgHeader, - body: GuestsWaitingApprovedMsgBody) extends BbbCoreMsg - case class GuestsWaitingApprovedMsgBody(guests: Vector[String]) - - -} diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/MeetingCreatedEvtMsg.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/MeetingCreatedEvtMsg.scala deleted file mode 100755 index e99f62c551..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/MeetingCreatedEvtMsg.scala +++ /dev/null @@ -1,10 +0,0 @@ -package org.bigbluebutton.common2.messages - -import org.bigbluebutton.common2.domain.DefaultProps - -object MeetingCreatedEvtMsg { val NAME = "MeetingCreatedEvtMsg"} -case class MeetingCreatedEvtMsg(header: BbbCoreBaseHeader, - body: MeetingCreatedEvtBody) extends BbbCoreMsg -case class MeetingCreatedEvtBody(props: DefaultProps) - - diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Polls.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Polls.scala deleted file mode 100755 index c031256252..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Polls.scala +++ /dev/null @@ -1,63 +0,0 @@ -package org.bigbluebutton.common2.messages - -import org.bigbluebutton.common2.domain.{PollVO, SimplePollOutVO, SimplePollResultOutVO} - -object Polls { - - object GetCurrentPollReqMsg { val NAME = "GetCurrentPollReqMsg"} - case class GetCurrentPollReqMsg(header: BbbClientMsgHeader, body: GetCurrentPollReqMsgBody) extends BbbCoreMsg - case class GetCurrentPollReqMsgBody(requesterId: String) - - - object GetCurrentPollRespMsg { val NAME = "GetCurrentPollRespMsg"} - case class GetCurrentPollRespMsg(header: BbbClientMsgHeader, body: GetCurrentPollRespMsgBody) extends BbbCoreMsg - case class GetCurrentPollRespMsgBody(userId: String, hasPoll: Boolean, poll: Option[PollVO]) - - object HidePollResultReqMsg { val NAME = "HidePollResultReqMsg"} - case class HidePollResultReqMsg(header: BbbClientMsgHeader, body: HidePollResultReqMsgBody) extends BbbCoreMsg - case class HidePollResultReqMsgBody(requesterId: String, pollId: String) - - object PollHideResultEvtMsg { val NAME = "PollHideResultEvtMsg" } - case class PollHideResultEvtMsg(header: BbbClientMsgHeader, body: PollHideResultEvtMsgBody) extends BbbCoreMsg - case class PollHideResultEvtMsgBody(userId: String, pollId: String) - - object PollShowResultEvtMsg { val NAME = "PollShowResultEvtMsg" } - case class PollShowResultEvtMsg(header: BbbClientMsgHeader, body: PollShowResultEvtMsgBody) extends BbbCoreMsg - case class PollShowResultEvtMsgBody(userId: String, pollId: String, poll: SimplePollResultOutVO) - - object PollStartedEvtMsg { val NAME = "PollStartedEvtMsg" } - case class PollStartedEvtMsg(header: BbbClientMsgHeader, body: PollStartedEvtMsgBody) extends BbbCoreMsg - case class PollStartedEvtMsgBody(userId: String, pollId: String, poll: SimplePollOutVO) - - object PollStoppedEvtMsg { val NAME = "PollStoppedEvtMsg" } - case class PollStoppedEvtMsg(header: BbbClientMsgHeader, body: PollStoppedEvtMsgBody) extends BbbCoreMsg - case class PollStoppedEvtMsgBody(userId: String, pollId: String) - - object RespondToPollReqMsg { val NAME = "RespondToPollReqMsg"} - case class RespondToPollReqMsg(header: BbbClientMsgHeader, body: RespondToPollReqMsgBody) extends BbbCoreMsg - case class RespondToPollReqMsgBody(requesterId: String, pollId: String, questionId: Int, answerId: Int) - - - object ShowPollResultReqMsg { val NAME = "ShowPollResultReqMsg"} - case class ShowPollResultReqMsg(header: BbbClientMsgHeader, body: ShowPollResultReqMsgBody) extends BbbCoreMsg - case class ShowPollResultReqMsgBody(requesterId: String, pollId: String) - - - object StartCustomPollReqMsg { val NAME = "StartCustomPollReqMsg"} - case class StartCustomPollReqMsg(header: BbbClientMsgHeader, body: StartCustomPollReqMsgBody) extends BbbCoreMsg - case class StartCustomPollReqMsgBody(requesterId: String, pollId: String, pollType: String, answers: Seq[String]) - - - object StartPollReqMsg { val NAME = "StartPollReqMsg"} - case class StartPollReqMsg(header: BbbClientMsgHeader, body: StartPollReqMsgBody) extends BbbCoreMsg - case class StartPollReqMsgBody(requesterId: String, pollId: String, pollType: String) - - object StopPollReqMsg { val NAME = "StopPollReqMsg"} - case class StopPollReqMsg(header: BbbClientMsgHeader, body: StopPollReqMsgBody) extends BbbCoreMsg - case class StopPollReqMsgBody(requesterId: String) - - object UserRespondedToPollEvtMsg { val NAME = "UserRespondedToPollEvtMsg"} - case class UserRespondedToPollEvtMsg(header: BbbClientMsgHeader, body: UserRespondedToPollEvtMsgBody) extends BbbCoreMsg - case class UserRespondedToPollEvtMsgBody(presenterId: String, pollId: String, poll: SimplePollResultOutVO) - -} diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Users.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Users.scala deleted file mode 100755 index 36366943fa..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Users.scala +++ /dev/null @@ -1,78 +0,0 @@ -package org.bigbluebutton.common2.messages - - -object Users { - object RegisterUserReqMsg { val NAME = "RegisterUserReqMsg" } - case class RegisterUserReqMsg(header: BbbCoreHeaderWithMeetingId, - body: RegisterUserReqMsgBody) extends BbbCoreMsg - - case class RegisterUserReqMsgBody(meetingId: String, intUserId: String, name: String, role: String, - extUserId: String, authToken: String, avatarURL: String, - guest: Boolean, authed: Boolean) - - object ValidateAuthTokenReqMsg { - val NAME = "ValidateAuthTokenReqMsg" - - def apply(meetingId: String, userId: String, authToken: String): ValidateAuthTokenReqMsg = { - val header = BbbClientMsgHeader(ValidateAuthTokenReqMsg.NAME, meetingId, userId) - - val body = ValidateAuthTokenReqMsgBody(userId, authToken) - ValidateAuthTokenReqMsg(header, body) - } - } - - case class ValidateAuthTokenReqMsg(header: BbbClientMsgHeader, - body: ValidateAuthTokenReqMsgBody) extends BbbCoreMsg - case class ValidateAuthTokenReqMsgBody(userId: String, authToken: String) - - object ValidateAuthTokenRespMsg { val NAME = "ValidateAuthTokenRespMsg" } - case class ValidateAuthTokenRespMsg(header: BbbClientMsgHeader, - body: ValidateAuthTokenRespMsgBody) extends BbbCoreMsg - case class ValidateAuthTokenRespMsgBody(userId: String, authToken: String, valid: Boolean, waitForApproval: Boolean) - - object UserLeftMeetingEvtMsg { - val NAME = "UserLeftMeetingEvtMsg" - - def apply(meetingId: String, userId: String, body: UserLeftMeetingEvtMsgBody): UserLeftMeetingEvtMsg = { - val header = BbbClientMsgHeader(UserLeftMeetingEvtMsg.NAME, meetingId, userId) - UserLeftMeetingEvtMsg(header, body) - } - } - - case class UserLeftMeetingEvtMsg(header: BbbClientMsgHeader, - body: UserLeftMeetingEvtMsgBody) extends BbbCoreMsg - case class UserLeftMeetingEvtMsgBody(intId: String) - - object UserJoinedMeetingEvtMsg { - val NAME = "UserJoinedMeetingEvtMsg" - - def apply(meetingId: String, userId: String, body: UserJoinedMeetingEvtMsgBody):UserJoinedMeetingEvtMsg = { - val header = BbbClientMsgHeader(UserJoinedMeetingEvtMsg.NAME, meetingId, userId) - UserJoinedMeetingEvtMsg(header, body) - } - } - - case class UserJoinedMeetingEvtMsg(header: BbbClientMsgHeader, - body: UserJoinedMeetingEvtMsgBody) extends BbbCoreMsg - case class UserJoinedMeetingEvtMsgBody(intId: String, extId: String, name: String, role: String, - guest: Boolean, authed: Boolean, waitingForAcceptance: Boolean, emoji: String, - presenter: Boolean, locked: Boolean, avatar: String) - - object GetUsersReqMsg { val NAME = "GetUsersReqMsg" } - case class GetUsersReqMsg(header: BbbClientMsgHeader, body: GetUsersReqMsgBody) extends BbbCoreMsg - case class GetUsersReqMsgBody(requesterId: String) - - - - object UserEmojiChangedEvtMsg { val NAME = "UserEmojiChangedEvtMsg" } - case class UserEmojiChangedEvtMsg(header: BbbClientMsgHeader, body: UserEmojiChangedEvtMsgBody) extends BbbCoreMsg - case class UserEmojiChangedEvtMsgBody(userId: String, emoji: String) - - object UserJoinMeetingReqMsg { val NAME = "UserJoinMeetingReqMsg" } - case class UserJoinMeetingReqMsg(header: BbbClientMsgHeader, body: UserJoinMeetingReqMsgBody) extends BbbCoreMsg - case class UserJoinMeetingReqMsgBody(userId: String, authToken: String) - - object UserLeaveReqMsg { val NAME = "UserLeaveReqMsg" } - case class UserLeaveReqMsg(header: BbbClientMsgHeader, body: UserLeaveReqMsgBody) extends BbbCoreMsg - case class UserLeaveReqMsgBody(userId: String, sessionId: String) -} diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Webcams.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Webcams.scala deleted file mode 100755 index 2545cd6ba4..0000000000 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Webcams.scala +++ /dev/null @@ -1,56 +0,0 @@ -package org.bigbluebutton.common2.messages - -object Webcams { - object UserBroadcastCamStartedEvtMsg { val NAME = "UserBroadcastCamStartedEvtMsg" } - case class UserBroadcastCamStartedEvtMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStartedEvtMsgBody) extends BbbCoreMsg - case class UserBroadcastCamStartedEvtMsgBody(userId: String, stream: String) - - object UserBroadcastCamStartMsg { val NAME = "UserBroadcastCamStartMsg" } - case class UserBroadcastCamStartMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStartMsgBody) extends BbbCoreMsg - case class UserBroadcastCamStartMsgBody(stream: String) - - - object UserBroadcastCamStopMsg { val NAME = "UserBroadcastCamStopMsg" } - case class UserBroadcastCamStopMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStopMsgBody) extends BbbCoreMsg - case class UserBroadcastCamStopMsgBody(stream: String) - - object UserBroadcastCamStoppedEvtMsg { val NAME = "UserBroadcastCamStoppedEvtMsg" } - case class UserBroadcastCamStoppedEvtMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStoppedEvtMsgBody) extends BbbCoreMsg - case class UserBroadcastCamStoppedEvtMsgBody(userId: String, stream: String) - - - - object GetWebcamStreamsMeetingRespMsg { - val NAME = "GetWebcamStreamsMeetingRespMsg" - - def apply(meetingId: String, userId: String, streams: Vector[WebcamStreamVO]): GetWebcamStreamsMeetingRespMsg = { - val header = BbbClientMsgHeader(GetWebcamStreamsMeetingRespMsg.NAME, meetingId, userId) - - val body = GetWebcamStreamsMeetingRespMsgBody(streams) - GetWebcamStreamsMeetingRespMsg(header, body) - } - } - - - case class GetWebcamStreamsMeetingRespMsg(header: BbbClientMsgHeader, body: GetWebcamStreamsMeetingRespMsgBody) extends BbbCoreMsg - case class GetWebcamStreamsMeetingRespMsgBody(streams: Vector[WebcamStreamVO]) - - case class WebcamStreamVO(streamId: String, stream: MediaStreamVO) - case class MediaStreamVO(id: String, url: String, userId: String, attributes: collection.immutable.Map[String, String], viewers: Set[String]) - - - object GetWebcamStreamsRespMsg { - val NAME = "GetWebcamStreamsRespMsg" - - def apply(meetingId: String, userId: String, webcamStreams: Vector[String]): GetWebcamStreamsRespMsg = { - val header = BbbClientMsgHeader(GetWebcamStreamsRespMsg.NAME, meetingId, userId) - - val body = GetWebcamStreamsRespMsgBody(webcamStreams) - GetWebcamStreamsRespMsg(header, body) - } - } - - case class GetWebcamStreamsRespMsg(header: BbbClientMsgHeader, body: GetWebcamStreamsRespMsgBody) extends BbbCoreMsg - case class GetWebcamStreamsRespMsgBody(webcamStreams: Vector[String]) - -} diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/BreakoutRooms.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/BreakoutMsgs.scala similarity index 74% rename from bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/BreakoutRooms.scala rename to bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/BreakoutMsgs.scala index d446f6c204..dcff0bd772 100755 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/BreakoutRooms.scala +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/BreakoutMsgs.scala @@ -1,101 +1,182 @@ -package org.bigbluebutton.common2.messages +package org.bigbluebutton.common2.msgs + + object BreakoutRoomCreatedMsg { + val NAME = "BreakoutRoomCreatedMsg" + } -object BreakoutRooms { - object BreakoutRoomCreatedMsg { val NAME = "BreakoutRoomCreatedMsg" } case class BreakoutRoomCreatedMsg(header: BbbClientMsgHeader, body: BreakoutRoomCreatedMsgBody) extends BbbCoreMsg + case class BreakoutRoomCreatedMsgBody(meetingId: String, breakoutRoomId: String) - object BreakoutRoomEndedEvtMsg { val NAME = "BreakoutRoomEndedEvtMsg" } + object BreakoutRoomEndedEvtMsg { + val NAME = "BreakoutRoomEndedEvtMsg" + } + case class BreakoutRoomEndedEvtMsg(header: BbbClientMsgHeader, body: BreakoutRoomEndedEvtMsgBody) extends BbbCoreMsg + case class BreakoutRoomEndedEvtMsgBody(parentMeetingId: String, meetingId: String) // Sent by breakout actor to tell meeting actor that breakout room has been ended - object BreakoutRoomEndedMsg { val NAME = "BreakoutRoomEndedMsg" } + object BreakoutRoomEndedMsg { + val NAME = "BreakoutRoomEndedMsg" + } + case class BreakoutRoomEndedMsg(header: BbbClientMsgHeader, body: BreakoutRoomEndedMsgBody) extends BbbCoreMsg + case class BreakoutRoomEndedMsgBody(meetingId: String, breakoutRoomId: String) - object BreakoutRoomJoinURLEvtMsg { val NAME = "BreakoutRoomJoinURLEvtMsg" } + object BreakoutRoomJoinURLEvtMsg { + val NAME = "BreakoutRoomJoinURLEvtMsg" + } + case class BreakoutRoomJoinURLEvtMsg(header: BbbClientMsgHeader, body: BreakoutRoomJoinURLEvtMsgBody) extends BbbCoreMsg + case class BreakoutRoomJoinURLEvtMsgBody(parentMeetingId: String, recorded: Boolean, breakoutMeetingId: String, userId: String, redirectJoinURL: String, noRedirectJoinURL: String) // Outgoing messages - object BreakoutRoomsListEvtMsg { val NAME = "BreakoutRoomsListEvtMsg" } + object BreakoutRoomsListEvtMsg { + val NAME = "BreakoutRoomsListEvtMsg" + } + case class BreakoutRoomsListEvtMsg(header: BbbClientMsgHeader, body: BreakoutRoomsListEvtMsgBody) extends BbbCoreMsg + case class BreakoutRoomsListEvtMsgBody(meetingId: String, rooms: Vector[BreakoutRoomInfo], roomsReady: Boolean) + case class BreakoutRoomInfo(name: String, externalMeetingId: String, meetingId: String, sequence: Int) - object BreakoutRoomsListMsg { val NAME = "BreakoutRoomsListMsg" } + object BreakoutRoomsListMsg { + val NAME = "BreakoutRoomsListMsg" + } + case class BreakoutRoomsListMsg(header: BbbClientMsgHeader, body: BreakoutRoomsListMsgBody) extends BbbCoreMsg + case class BreakoutRoomsListMsgBody(meetingId: String) - object BreakoutRoomStartedEvtMsg { val NAME = "BreakoutRoomStartedEvtMsg" } + object BreakoutRoomStartedEvtMsg { + val NAME = "BreakoutRoomStartedEvtMsg" + } + case class BreakoutRoomStartedEvtMsg(header: BbbClientMsgHeader, body: BreakoutRoomStartedEvtMsgBody) extends BbbCoreMsg + case class BreakoutRoomStartedEvtMsgBody(parentMeetingId: String, recorded: Boolean, breakout: BreakoutRoomInfo) - object BreakoutRoomsTimeRemainingUpdateEvtMsg { val NAME = "BreakoutRoomsTimeRemainingUpdateEvtMsg" } + object BreakoutRoomsTimeRemainingUpdateEvtMsg { + val NAME = "BreakoutRoomsTimeRemainingUpdateEvtMsg" + } + case class BreakoutRoomsTimeRemainingUpdateEvtMsg(header: BbbClientMsgHeader, body: BreakoutRoomsTimeRemainingUpdateEvtMsgBody) extends BbbCoreMsg + case class BreakoutRoomsTimeRemainingUpdateEvtMsgBody(meetingId: String, recorded: Boolean, timeRemaining: Int) // Sent by breakout actor to tell meeting actor the list of users in the breakout room. - object BreakoutRoomUsersUpdateMsg { val NAME = "BreakoutRoomUsersUpdateMsg" } + object BreakoutRoomUsersUpdateMsg { + val NAME = "BreakoutRoomUsersUpdateMsg" + } + case class BreakoutRoomUsersUpdateMsg(header: BbbClientMsgHeader, body: BreakoutRoomUsersUpdateMsgBody) extends BbbCoreMsg + case class BreakoutRoomUsersUpdateMsgBody(meetingId: String, breakoutMeetingId: String, users: Vector[BreakoutUserVO]) - object CreateBreakoutRoomEvtMsg { val NAME = "CreateBreakoutRoomEvtMsg" } + object CreateBreakoutRoomEvtMsg { + val NAME = "CreateBreakoutRoomEvtMsg" + } + case class CreateBreakoutRoomEvtMsg(header: BbbClientMsgHeader, body: CreateBreakoutRoomEvtMsgBody) extends BbbCoreMsg + case class CreateBreakoutRoomEvtMsgBody(meetingId: String, room: BreakoutRoomDetail) + case class BreakoutRoomDetail(breakoutMeetingId: String, name: String, parentId: String, sequence: Integer, voiceConfId: String, durationInMinutes: Int, moderatorPassword: String, viewerPassword: String, sourcePresentationId: String, sourcePresentationSlide: Int, record: Boolean) - object CreateBreakoutRoomsMsg { val NAME = "CreateBreakoutRoomsMsg" } + object CreateBreakoutRoomsMsg { + val NAME = "CreateBreakoutRoomsMsg" + } + case class CreateBreakoutRoomsMsg(header: BbbClientMsgHeader, body: CreateBreakoutRoomsMsgBody) extends BbbCoreMsg + case class CreateBreakoutRoomsMsgBody(meetingId: String, durationInMinutes: Int, record: Boolean, rooms: Vector[BreakoutRoomMsgBody]) + case class BreakoutRoomMsgBody(name: String, sequence: Int, users: Vector[String]) // Sent by user to request ending all the breakout rooms - object EndAllBreakoutRoomsMsg { val NAME = "EndAllBreakoutRoomsMsg" } + object EndAllBreakoutRoomsMsg { + val NAME = "EndAllBreakoutRoomsMsg" + } + case class EndAllBreakoutRoomsMsg(header: BbbClientMsgHeader, body: EndAllBreakoutRoomsMsgBody) extends BbbCoreMsg + case class EndAllBreakoutRoomsMsgBody(meetingId: String) - object EndBreakoutRoomEvtMsg { val NAME = "EndBreakoutRoomEvtMsg" } + object EndBreakoutRoomEvtMsg { + val NAME = "EndBreakoutRoomEvtMsg" + } + case class EndBreakoutRoomEvtMsg(header: BbbClientMsgHeader, body: EndBreakoutRoomEvtMsgBody) extends BbbCoreMsg + case class EndBreakoutRoomEvtMsgBody(breakoutMeetingId: String) - object MeetingTimeRemainingUpdateEvtMsg { val NAME = "MeetingTimeRemainingUpdateEvtMsg" } + object MeetingTimeRemainingUpdateEvtMsg { + val NAME = "MeetingTimeRemainingUpdateEvtMsg" + } + case class MeetingTimeRemainingUpdateEvtMsg(header: BbbClientMsgHeader, body: MeetingTimeRemainingUpdateEvtMsgBody) extends BbbCoreMsg + case class MeetingTimeRemainingUpdateEvtMsgBody(meetingId: String, recorded: Boolean, timeRemaining: Int) - object RequestBreakoutJoinURLMsg { val NAME = "RequestBreakoutJoinURLMsg" } + object RequestBreakoutJoinURLMsg { + val NAME = "RequestBreakoutJoinURLMsg" + } + case class RequestBreakoutJoinURLMsg(header: BbbClientMsgHeader, body: RequestBreakoutJoinURLMsgBody) extends BbbCoreMsg + case class RequestBreakoutJoinURLMsgBody(meetingId: String, breakoutMeetingId: String, userId: String) // Send by internal actor to tell the breakout actor to send it's list of users to the main meeting actor. - object SendBreakoutUsersUpdateMsg { val NAME = "SendBreakoutUsersUpdateMsg" } + object SendBreakoutUsersUpdateMsg { + val NAME = "SendBreakoutUsersUpdateMsg" + } + case class SendBreakoutUsersUpdateMsg(header: BbbClientMsgHeader, body: SendBreakoutUsersUpdateMsgBody) extends BbbCoreMsg + case class SendBreakoutUsersUpdateMsgBody(meetingId: String) - object TransferUserToMeetingEvtMsg { val NAME = "TransferUserToMeetingEvtMsg" } + object TransferUserToMeetingEvtMsg { + val NAME = "TransferUserToMeetingEvtMsg" + } + case class TransferUserToMeetingEvtMsg(header: BbbClientMsgHeader, body: TransferUserToMeetingEvtMsgBody) extends BbbCoreMsg + case class TransferUserToMeetingEvtMsgBody(voiceConfId: String, targetVoiceConfId: String, userId: String) // Sent by user actor to ask for voice conference transfer - object TransferUserToMeetingRequestMsg { val NAME = "TransferUserToMeetingRequestMsg" } + object TransferUserToMeetingRequestMsg { + val NAME = "TransferUserToMeetingRequestMsg" + } + case class TransferUserToMeetingRequestMsg(header: BbbClientMsgHeader, body: TransferUserToMeetingRequestMsgBody) extends BbbCoreMsg + case class TransferUserToMeetingRequestMsgBody(meetingId: String, targetMeetingId: String, userId: String) - object UpdateBreakoutUsersEvtMsg { val NAME = "UpdateBreakoutUsersEvtMsg" } + object UpdateBreakoutUsersEvtMsg { + val NAME = "UpdateBreakoutUsersEvtMsg" + } + case class UpdateBreakoutUsersEvtMsg(header: BbbClientMsgHeader, body: UpdateBreakoutUsersEvtMsgBody) extends BbbCoreMsg + case class UpdateBreakoutUsersEvtMsgBody(parentMeetingId: String, recorded: Boolean, breakoutMeetingId: String, users: Vector[BreakoutUserVO]) // Common Value objects case class BreakoutUserVO(id: String, name: String) + case class BreakoutRoomVO(id: String, externalMeetingId: String, name: String, parentRoomId: String, sequence: Integer, voiceConfId: String, assignedUsers: Vector[String], users: Vector[BreakoutUserVO]) -} + + + diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/CoreMsgs.scala similarity index 72% rename from bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala rename to bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/CoreMsgs.scala index ca16b61925..30922a9d50 100755 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/CoreMsgs.scala @@ -1,42 +1,43 @@ -package org.bigbluebutton.common2.messages - -import com.fasterxml.jackson.databind.JsonNode -import org.bigbluebutton.common2.domain._ -import org.bigbluebutton.common2.messages.MessageBody._ - -object MessageTypes { - val DIRECT = "DIRECT" - val BROADCAST_TO_MEETING = "BROADCAST_TO_MEETING" // Send to all clients in the meeting - val BROADCAST_TO_ALL = "BROADCAST_TO_ALL" // Send to all clients - val SYSTEM = "SYSTEM" -} - -// seal trait to force all classes that extends this trait to be defined in this file. -trait BbbCoreMsg -sealed trait BbbCommonMsg -trait BbbCoreHeader - -trait StandardMsg extends BbbCoreMsg { def header: BbbClientMsgHeader } - -case class RoutingEnvelope(msgType: String, meetingId: String, userId: String) -case class BbbMsgToClientEnvelope(name: String, routing: RoutingEnvelope) -case class BbbCoreEnvelope(name: String, routing: collection.immutable.Map[String, String]) -case class BbbCommonEnvCoreMsg(envelope: BbbCoreEnvelope, core: BbbCoreMsg) extends BbbCommonMsg -case class BbbCommonEnvJsNodeMsg(envelope: BbbCoreEnvelope, core: JsonNode) extends BbbCommonMsg - -case class BbbCoreBaseHeader(name: String) extends BbbCoreHeader -case class BbbCoreHeaderWithMeetingId(name: String, meetingId: String) extends BbbCoreHeader -case class BbbClientMsgHeader(name: String, meetingId: String, userId: String) extends BbbCoreHeader - -case class BbbCoreMessageFromClient(header: BbbClientMsgHeader, body: JsonNode) - -case class BbbCoreHeaderBody(header: BbbCoreHeader, body: JsonNode) - - - - - -/** System Messages **/ -case class AkkaAppsCheckAliveReqBody(timestamp: Long) -case class AkkaAppsCheckAliveReqMsg(header: BbbCoreHeader, body: AkkaAppsCheckAliveReqBody) -case class AkkaAppsCheckAliveReq(envelope: BbbCoreEnvelope, msg: AkkaAppsCheckAliveReqMsg) extends BbbCoreMsg +package org.bigbluebutton.common2.msgs + +import com.fasterxml.jackson.databind.JsonNode + + +object MessageTypes { + val DIRECT = "DIRECT" + val BROADCAST_TO_MEETING = "BROADCAST_TO_MEETING" // Send to all clients in the meeting + val BROADCAST_TO_ALL = "BROADCAST_TO_ALL" // Send to all clients + val SYSTEM = "SYSTEM" +} + +// seal trait to force all classes that extends this trait to be defined in this file. +trait BbbCoreMsg + +sealed trait BbbCommonMsg + +trait BbbCoreHeader + +trait StandardMsg extends BbbCoreMsg { + def header: BbbClientMsgHeader +} + +case class RoutingEnvelope(msgType: String, meetingId: String, userId: String) + +case class BbbMsgToClientEnvelope(name: String, routing: RoutingEnvelope) + +case class BbbCoreEnvelope(name: String, routing: collection.immutable.Map[String, String]) + +case class BbbCommonEnvCoreMsg(envelope: BbbCoreEnvelope, core: BbbCoreMsg) extends BbbCommonMsg + +case class BbbCommonEnvJsNodeMsg(envelope: BbbCoreEnvelope, core: JsonNode) extends BbbCommonMsg + +case class BbbCoreBaseHeader(name: String) extends BbbCoreHeader + +case class BbbCoreHeaderWithMeetingId(name: String, meetingId: String) extends BbbCoreHeader + +case class BbbClientMsgHeader(name: String, meetingId: String, userId: String) extends BbbCoreHeader + +case class BbbCoreMessageFromClient(header: BbbClientMsgHeader, body: JsonNode) + +case class BbbCoreHeaderBody(header: BbbCoreHeader, body: JsonNode) + diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/Deserializer.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/Deserializer.scala new file mode 100755 index 0000000000..1773fbdc79 --- /dev/null +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/Deserializer.scala @@ -0,0 +1,58 @@ +package org.bigbluebutton.common2.msgs + +import com.fasterxml.jackson.databind.JsonNode +import org.bigbluebutton.common2.util.JsonUtil + +import scala.reflect.ClassTag +import scala.reflect.runtime.universe._ +import scala.util.{Failure, Success, Try} + + +trait Deserializer { + + def toBbbCoreMessageFromClient(json: String): (Option[BbbCoreMessageFromClient], String) = { + def convertFromJson(json: String): Try[BbbCoreMessageFromClient] = { + for { + msg <- JsonUtil.fromJsonToBbbCoreMessageFromClient(json) + } yield msg + } + + convertFromJson(json) match { + case Success(msg) => (Some(msg), "No Error.") + case Failure(ex) => (None, ex.getMessage) + } + + } + + def fromJson[T](json: String)(implicit tag: TypeTag[T]): Try[T] = { + // https://stackoverflow.com/questions/23383814/is-it-possible-to-convert-a-typetag-to-a-manifest + // typeTag to classTag + implicit val cl = ClassTag[T]( tag.mirror.runtimeClass( tag.tpe ) ) + + // with an implicit classTag in scope, you can get a manifest + manifest[T] + + for { + result <- Try(JsonUtil.mapper.readValue[T](json)) + } yield result + } + + def toBbbCommonMsg[V <: BbbCoreMsg](jsonNode: JsonNode)(implicit tag: TypeTag[V]): (Option[V], String) = { + val json = JsonUtil.toJson(jsonNode) + val result = for { + result <- fromJson[V](json) + } yield result + + result match { + case Success(msg) => (Some(msg), "No Error.") + case Failure(ex) => (None, ex.getMessage) + } + } + + def toBbbCommonEnvJsNodeMsg(json: String): Try[BbbCommonEnvJsNodeMsg] = { + for { + msg <- JsonUtil.fromJsonToBbbCommonEnvJsNodeMsg(json) + } yield msg + } + +} diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/GuestsMsgs.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/GuestsMsgs.scala new file mode 100755 index 0000000000..6f6b0c4554 --- /dev/null +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/GuestsMsgs.scala @@ -0,0 +1,71 @@ +package org.bigbluebutton.common2.msgs + + +object GetGuestsWaitingApprovalRespMsg { + val NAME = "GetGuestsWaitingApprovalRespMsg" + + def apply(meetingId: String, userId: String, guests: Vector[GuestWaitingVO]): GetGuestsWaitingApprovalRespMsg = { + val header = BbbClientMsgHeader(GetGuestsWaitingApprovalRespMsg.NAME, meetingId, userId) + + val body = GetGuestsWaitingApprovalRespMsgBody(guests) + GetGuestsWaitingApprovalRespMsg(header, body) + } +} + +case class GetGuestsWaitingApprovalRespMsg(header: BbbClientMsgHeader, + body: GetGuestsWaitingApprovalRespMsgBody) extends BbbCoreMsg + +case class GetGuestsWaitingApprovalRespMsgBody(guests: Vector[GuestWaitingVO]) + +case class GuestWaitingVO(intId: String, name: String, role: String) + +object GuestsWaitingApprovalEvtMsg { + val NAME = "GuestsWaitingApprovalEvtMsg" + + def apply(meetingId: String, userId: String, guests: Vector[GuestWaitingVO]): GuestsWaitingApprovalEvtMsg = { + val header = BbbClientMsgHeader(GetGuestsWaitingApprovalRespMsg.NAME, meetingId, userId) + + val body = GuestsWaitingApprovalEvtMsgBody(guests) + GuestsWaitingApprovalEvtMsg(header, body) + } +} + +case class GuestsWaitingApprovalEvtMsg(header: BbbClientMsgHeader, + body: GuestsWaitingApprovalEvtMsgBody) extends BbbCoreMsg + +case class GuestsWaitingApprovalEvtMsgBody(guests: Vector[GuestWaitingVO]) + +object GuestsWaitingApprovedEvtMsg { + val NAME = "GuestsWaitingApprovedEvtMsg" + + def apply(meetingId: String, userId: String, guests: Vector[GuestWaitingVO]): GuestsWaitingApprovedEvtMsg = { + val header = BbbClientMsgHeader(GetGuestsWaitingApprovalRespMsg.NAME, meetingId, userId) + + val body = GuestsWaitingApprovedEvtMsgBody(guests) + GuestsWaitingApprovedEvtMsg(header, body) + } +} + +case class GuestsWaitingApprovedEvtMsg(header: BbbClientMsgHeader, + body: GuestsWaitingApprovedEvtMsgBody) extends BbbCoreMsg + +case class GuestsWaitingApprovedEvtMsgBody(guests: Vector[GuestWaitingVO]) + +object GuestsWaitingApprovedMsg { + val NAME = "GuestsWaitingApprovedMsg" + + def apply(meetingId: String, userId: String, guests: Vector[String]): GuestsWaitingApprovedMsg = { + val header = BbbClientMsgHeader(GetGuestsWaitingApprovalRespMsg.NAME, meetingId, userId) + + val body = GuestsWaitingApprovedMsgBody(guests) + GuestsWaitingApprovedMsg(header, body) + } +} + +case class GuestsWaitingApprovedMsg(header: BbbClientMsgHeader, + body: GuestsWaitingApprovedMsgBody) extends BbbCoreMsg + +case class GuestsWaitingApprovedMsgBody(guests: Vector[String]) + + + diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Layout.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/LayoutMsgs.scala similarity index 95% rename from bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Layout.scala rename to bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/LayoutMsgs.scala index 037d381cc9..ce1ffc8ed1 100755 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Layout.scala +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/LayoutMsgs.scala @@ -1,9 +1,9 @@ -package org.bigbluebutton.common2.messages +package org.bigbluebutton.common2.msgs import org.bigbluebutton.common2.domain.UserVO -object Layout { + // In messages object GetCurrentLayoutMsg { val NAME = "GetCurrentLayoutMsg" } case class GetCurrentLayoutMsg(header: BbbClientMsgHeader, body: GetCurrentLayoutMsgBody) extends BbbCoreMsg @@ -33,4 +33,4 @@ object Layout { case class LockLayoutEvtMsg(header: BbbClientMsgHeader, body: LockLayoutEvtMsgBody) extends BbbCoreMsg case class LockLayoutEvtMsgBody(meetingId: String, recorded: Boolean, setById: String, locked: Boolean, applyTo: Array[UserVO]) -} + diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/MessageBody.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/MessageBody.scala similarity index 92% rename from bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/MessageBody.scala rename to bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/MessageBody.scala index 913a173f10..b428f8cd6d 100755 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/MessageBody.scala +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/MessageBody.scala @@ -1,5 +1,4 @@ -package org.bigbluebutton.common2.messages - +package org.bigbluebutton.common2.msgs import org.bigbluebutton.common2.domain._ diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/Messages.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/Messages.scala new file mode 100755 index 0000000000..b1080ee39c --- /dev/null +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/Messages.scala @@ -0,0 +1,2 @@ +package org.bigbluebutton.common2.msgs + diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/PollsMsgs.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/PollsMsgs.scala new file mode 100755 index 0000000000..d0c812bbef --- /dev/null +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/PollsMsgs.scala @@ -0,0 +1,114 @@ +package org.bigbluebutton.common2.msgs + +import org.bigbluebutton.common2.domain.{PollVO, SimplePollOutVO, SimplePollResultOutVO} + + +object GetCurrentPollReqMsg { + val NAME = "GetCurrentPollReqMsg" +} + +case class GetCurrentPollReqMsg(header: BbbClientMsgHeader, body: GetCurrentPollReqMsgBody) extends BbbCoreMsg + +case class GetCurrentPollReqMsgBody(requesterId: String) + + +object GetCurrentPollRespMsg { + val NAME = "GetCurrentPollRespMsg" +} + +case class GetCurrentPollRespMsg(header: BbbClientMsgHeader, body: GetCurrentPollRespMsgBody) extends BbbCoreMsg + +case class GetCurrentPollRespMsgBody(userId: String, hasPoll: Boolean, poll: Option[PollVO]) + +object HidePollResultReqMsg { + val NAME = "HidePollResultReqMsg" +} + +case class HidePollResultReqMsg(header: BbbClientMsgHeader, body: HidePollResultReqMsgBody) extends BbbCoreMsg + +case class HidePollResultReqMsgBody(requesterId: String, pollId: String) + +object PollHideResultEvtMsg { + val NAME = "PollHideResultEvtMsg" +} + +case class PollHideResultEvtMsg(header: BbbClientMsgHeader, body: PollHideResultEvtMsgBody) extends BbbCoreMsg + +case class PollHideResultEvtMsgBody(userId: String, pollId: String) + +object PollShowResultEvtMsg { + val NAME = "PollShowResultEvtMsg" +} + +case class PollShowResultEvtMsg(header: BbbClientMsgHeader, body: PollShowResultEvtMsgBody) extends BbbCoreMsg + +case class PollShowResultEvtMsgBody(userId: String, pollId: String, poll: SimplePollResultOutVO) + +object PollStartedEvtMsg { + val NAME = "PollStartedEvtMsg" +} + +case class PollStartedEvtMsg(header: BbbClientMsgHeader, body: PollStartedEvtMsgBody) extends BbbCoreMsg + +case class PollStartedEvtMsgBody(userId: String, pollId: String, poll: SimplePollOutVO) + +object PollStoppedEvtMsg { + val NAME = "PollStoppedEvtMsg" +} + +case class PollStoppedEvtMsg(header: BbbClientMsgHeader, body: PollStoppedEvtMsgBody) extends BbbCoreMsg + +case class PollStoppedEvtMsgBody(userId: String, pollId: String) + +object RespondToPollReqMsg { + val NAME = "RespondToPollReqMsg" +} + +case class RespondToPollReqMsg(header: BbbClientMsgHeader, body: RespondToPollReqMsgBody) extends BbbCoreMsg + +case class RespondToPollReqMsgBody(requesterId: String, pollId: String, questionId: Int, answerId: Int) + + +object ShowPollResultReqMsg { + val NAME = "ShowPollResultReqMsg" +} + +case class ShowPollResultReqMsg(header: BbbClientMsgHeader, body: ShowPollResultReqMsgBody) extends BbbCoreMsg + +case class ShowPollResultReqMsgBody(requesterId: String, pollId: String) + + +object StartCustomPollReqMsg { + val NAME = "StartCustomPollReqMsg" +} + +case class StartCustomPollReqMsg(header: BbbClientMsgHeader, body: StartCustomPollReqMsgBody) extends BbbCoreMsg + +case class StartCustomPollReqMsgBody(requesterId: String, pollId: String, pollType: String, answers: Seq[String]) + + +object StartPollReqMsg { + val NAME = "StartPollReqMsg" +} + +case class StartPollReqMsg(header: BbbClientMsgHeader, body: StartPollReqMsgBody) extends BbbCoreMsg + +case class StartPollReqMsgBody(requesterId: String, pollId: String, pollType: String) + +object StopPollReqMsg { + val NAME = "StopPollReqMsg" +} + +case class StopPollReqMsg(header: BbbClientMsgHeader, body: StopPollReqMsgBody) extends BbbCoreMsg + +case class StopPollReqMsgBody(requesterId: String) + +object UserRespondedToPollEvtMsg { + val NAME = "UserRespondedToPollEvtMsg" +} + +case class UserRespondedToPollEvtMsg(header: BbbClientMsgHeader, body: UserRespondedToPollEvtMsgBody) extends BbbCoreMsg + +case class UserRespondedToPollEvtMsgBody(presenterId: String, pollId: String, poll: SimplePollResultOutVO) + + diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Presentation.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/PresentationMsgs.scala similarity index 97% rename from bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Presentation.scala rename to bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/PresentationMsgs.scala index 57d02c8c7f..02f2dee830 100755 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Presentation.scala +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/PresentationMsgs.scala @@ -1,10 +1,8 @@ -package org.bigbluebutton.common2.messages +package org.bigbluebutton.common2.msgs import org.bigbluebutton.common2.domain.PresentationVO -import org.bigbluebutton.common2.messages.MessageBody._ -object Presentation { object PresenterAssignedEvtMsg { val NAME = "PresenterAssignedEvtMsg" } case class PresenterAssignedEvtMsg(header: BbbClientMsgHeader, body: PresenterAssignedEvtMsgBody) extends BbbCoreMsg case class PresenterAssignedEvtMsgBody(presenterId: String, presenterName: String, assignedBy: String) @@ -96,4 +94,4 @@ object Presentation { case class PresentationConversionCompletedEvtMsg(header: BbbClientMsgHeader, body: PresentationConversionCompletedEvtMsgBody) extends BbbCoreMsg case class PresentationConversionCompletedEvtMsgBody(messageKey: String, code: String, presentation: PresentationVO) -} + diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Routing.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/Routing.scala similarity index 88% rename from bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Routing.scala rename to bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/Routing.scala index 3004e465df..fb0c901b39 100755 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Routing.scala +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/Routing.scala @@ -1,4 +1,4 @@ -package org.bigbluebutton.common2.messages +package org.bigbluebutton.common2.msgs object Routing { val MSG_TYPE = "msgType" diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/SystemMsgs.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/SystemMsgs.scala new file mode 100755 index 0000000000..a0a8d302d1 --- /dev/null +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/SystemMsgs.scala @@ -0,0 +1,25 @@ +package org.bigbluebutton.common2.msgs + +import org.bigbluebutton.common2.domain.DefaultProps + + + + object CreateMeetingReqMsg { val NAME = "CreateMeetingReqMsg" } + case class CreateMeetingReqMsg(header: BbbCoreBaseHeader, + body: CreateMeetingReqMsgBody) extends BbbCoreMsg + + case class CreateMeetingReqMsgBody(props: DefaultProps) + + object MeetingCreatedEvtMsg { val NAME = "MeetingCreatedEvtMsg"} + case class MeetingCreatedEvtMsg(header: BbbCoreBaseHeader, + body: MeetingCreatedEvtBody) extends BbbCoreMsg + case class MeetingCreatedEvtBody(props: DefaultProps) + + + + + /** System Messages **/ + case class AkkaAppsCheckAliveReqBody(timestamp: Long) + case class AkkaAppsCheckAliveReqMsg(header: BbbCoreHeader, body: AkkaAppsCheckAliveReqBody) + case class AkkaAppsCheckAliveReq(envelope: BbbCoreEnvelope, msg: AkkaAppsCheckAliveReqMsg) extends BbbCoreMsg + diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/UsersMgs.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/UsersMgs.scala new file mode 100755 index 0000000000..0e40c6aae6 --- /dev/null +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/UsersMgs.scala @@ -0,0 +1,147 @@ +package org.bigbluebutton.common2.msgs + +object RegisterUserReqMsg { + val NAME = "RegisterUserReqMsg" +} + +case class RegisterUserReqMsg(header: BbbCoreHeaderWithMeetingId, + body: RegisterUserReqMsgBody) extends BbbCoreMsg + +case class RegisterUserReqMsgBody(meetingId: String, intUserId: String, name: String, role: String, + extUserId: String, authToken: String, avatarURL: String, + guest: Boolean, authed: Boolean) + +object ValidateAuthTokenReqMsg { + val NAME = "ValidateAuthTokenReqMsg" + + def apply(meetingId: String, userId: String, authToken: String): ValidateAuthTokenReqMsg = { + val header = BbbClientMsgHeader(ValidateAuthTokenReqMsg.NAME, meetingId, userId) + + val body = ValidateAuthTokenReqMsgBody(userId, authToken) + ValidateAuthTokenReqMsg(header, body) + } +} + +case class ValidateAuthTokenReqMsg(header: BbbClientMsgHeader, + body: ValidateAuthTokenReqMsgBody) extends BbbCoreMsg + +case class ValidateAuthTokenReqMsgBody(userId: String, authToken: String) + +object ValidateAuthTokenRespMsg { + val NAME = "ValidateAuthTokenRespMsg" +} + +case class ValidateAuthTokenRespMsg(header: BbbClientMsgHeader, + body: ValidateAuthTokenRespMsgBody) extends BbbCoreMsg + +case class ValidateAuthTokenRespMsgBody(userId: String, authToken: String, valid: Boolean, waitForApproval: Boolean) + +object UserLeftMeetingEvtMsg { + val NAME = "UserLeftMeetingEvtMsg" + + def apply(meetingId: String, userId: String, body: UserLeftMeetingEvtMsgBody): UserLeftMeetingEvtMsg = { + val header = BbbClientMsgHeader(UserLeftMeetingEvtMsg.NAME, meetingId, userId) + UserLeftMeetingEvtMsg(header, body) + } +} + +case class UserLeftMeetingEvtMsg(header: BbbClientMsgHeader, + body: UserLeftMeetingEvtMsgBody) extends BbbCoreMsg + +case class UserLeftMeetingEvtMsgBody(intId: String) + +object UserJoinedMeetingEvtMsg { + val NAME = "UserJoinedMeetingEvtMsg" + + def apply(meetingId: String, userId: String, body: UserJoinedMeetingEvtMsgBody): UserJoinedMeetingEvtMsg = { + val header = BbbClientMsgHeader(UserJoinedMeetingEvtMsg.NAME, meetingId, userId) + UserJoinedMeetingEvtMsg(header, body) + } +} + +case class UserJoinedMeetingEvtMsg(header: BbbClientMsgHeader, + body: UserJoinedMeetingEvtMsgBody) extends BbbCoreMsg + +case class UserJoinedMeetingEvtMsgBody(intId: String, extId: String, name: String, role: String, + guest: Boolean, authed: Boolean, waitingForAcceptance: Boolean, emoji: String, + presenter: Boolean, locked: Boolean, avatar: String) + +object GetUsersReqMsg { + val NAME = "GetUsersReqMsg" +} + +case class GetUsersReqMsg(header: BbbClientMsgHeader, body: GetUsersReqMsgBody) extends BbbCoreMsg + +case class GetUsersReqMsgBody(requesterId: String) + + +object UserEmojiChangedEvtMsg { + val NAME = "UserEmojiChangedEvtMsg" +} + +case class UserEmojiChangedEvtMsg(header: BbbClientMsgHeader, body: UserEmojiChangedEvtMsgBody) extends BbbCoreMsg + +case class UserEmojiChangedEvtMsgBody(userId: String, emoji: String) + +object UserJoinMeetingReqMsg { + val NAME = "UserJoinMeetingReqMsg" +} + +case class UserJoinMeetingReqMsg(header: BbbClientMsgHeader, body: UserJoinMeetingReqMsgBody) extends BbbCoreMsg + +case class UserJoinMeetingReqMsgBody(userId: String, authToken: String) + +object UserLeaveReqMsg { + val NAME = "UserLeaveReqMsg" +} + +case class UserLeaveReqMsg(header: BbbClientMsgHeader, body: UserLeaveReqMsgBody) extends BbbCoreMsg + +case class UserLeaveReqMsgBody(userId: String, sessionId: String) + +object GetUsersMeetingReqMsg { + val NAME = "GetUsersMeetingReqMsg" +} + +case class GetUsersMeetingReqMsg(header: BbbClientMsgHeader, body: GetUsersMeetingReqMsgBody) extends BbbCoreMsg + +case class GetUsersMeetingReqMsgBody(userId: String) + +object GetUsersMeetingRespMsg { + val NAME = "GetUsersMeetingRespMsg" + + def apply(meetingId: String, userId: String, users: Vector[WebUser]): GetUsersMeetingRespMsg = { + val header = BbbClientMsgHeader(GetUsersMeetingRespMsg.NAME, meetingId, userId) + + val body = GetUsersMeetingRespMsgBody(users) + GetUsersMeetingRespMsg(header, body) + } + +} + +case class GetUsersMeetingRespMsg(header: BbbClientMsgHeader, body: GetUsersMeetingRespMsgBody) extends BbbCoreMsg + +case class GetUsersMeetingRespMsgBody(users: Vector[WebUser]) + +case class WebUser(intId: String, extId: String, name: String, role: String, + guest: Boolean, authed: Boolean, waitingForAcceptance: Boolean, emoji: String, locked: Boolean, + presenter: Boolean, avatar: String) + +object GetVoiceUsersMeetingRespMsg { + val NAME = "GetVoiceUsersMeetingRespMsg" + + def apply(meetingId: String, userId: String, users: Vector[VoiceConfUser]): GetVoiceUsersMeetingRespMsg = { + val header = BbbClientMsgHeader(GetVoiceUsersMeetingRespMsg.NAME, meetingId, userId) + + val body = GetVoiceUsersMeetingRespMsgBody(users) + GetVoiceUsersMeetingRespMsg(header, body) + } +} + +case class GetVoiceUsersMeetingRespMsg(header: BbbClientMsgHeader, body: GetVoiceUsersMeetingRespMsgBody) extends BbbCoreMsg + +case class GetVoiceUsersMeetingRespMsgBody(users: Vector[VoiceConfUser]) + +case class VoiceConfUser(intId: String, voiceUserId: String, callingWith: String, callerName: String, + callerNum: String, muted: Boolean, talking: Boolean, listenOnly: Boolean) + diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/VoiceConf.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/VoiceConfMsgs.scala similarity index 97% rename from bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/VoiceConf.scala rename to bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/VoiceConfMsgs.scala index 09d78652a1..297cf46c6e 100755 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/VoiceConf.scala +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/VoiceConfMsgs.scala @@ -1,7 +1,6 @@ -package org.bigbluebutton.common2.messages +package org.bigbluebutton.common2.msgs -object VoiceConf { case class BbbCoreVoiceConfHeader(name: String, voiceConf: String) extends BbbCoreHeader object DeskshareHangUpVoiceConfMsg { val NAME = "DeskshareHangUpVoiceConfMsg" } @@ -125,4 +124,4 @@ object VoiceConf { case class UserTalkingInVoiceConfEvtMsgBody(voiceConf: String, voiceUserId: String, talking: Boolean) -} + diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/WebcamsMsgs.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/WebcamsMsgs.scala new file mode 100755 index 0000000000..21771ab0bb --- /dev/null +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/WebcamsMsgs.scala @@ -0,0 +1,72 @@ +package org.bigbluebutton.common2.msgs + +object UserBroadcastCamStartedEvtMsg { + val NAME = "UserBroadcastCamStartedEvtMsg" +} + +case class UserBroadcastCamStartedEvtMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStartedEvtMsgBody) extends BbbCoreMsg + +case class UserBroadcastCamStartedEvtMsgBody(userId: String, stream: String) + +object UserBroadcastCamStartMsg { + val NAME = "UserBroadcastCamStartMsg" +} + +case class UserBroadcastCamStartMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStartMsgBody) extends BbbCoreMsg + +case class UserBroadcastCamStartMsgBody(stream: String) + + +object UserBroadcastCamStopMsg { + val NAME = "UserBroadcastCamStopMsg" +} + +case class UserBroadcastCamStopMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStopMsgBody) extends BbbCoreMsg + +case class UserBroadcastCamStopMsgBody(stream: String) + +object UserBroadcastCamStoppedEvtMsg { + val NAME = "UserBroadcastCamStoppedEvtMsg" +} + +case class UserBroadcastCamStoppedEvtMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStoppedEvtMsgBody) extends BbbCoreMsg + +case class UserBroadcastCamStoppedEvtMsgBody(userId: String, stream: String) + + +object GetWebcamStreamsMeetingRespMsg { + val NAME = "GetWebcamStreamsMeetingRespMsg" + + def apply(meetingId: String, userId: String, streams: Vector[WebcamStreamVO]): GetWebcamStreamsMeetingRespMsg = { + val header = BbbClientMsgHeader(GetWebcamStreamsMeetingRespMsg.NAME, meetingId, userId) + + val body = GetWebcamStreamsMeetingRespMsgBody(streams) + GetWebcamStreamsMeetingRespMsg(header, body) + } +} + + +case class GetWebcamStreamsMeetingRespMsg(header: BbbClientMsgHeader, body: GetWebcamStreamsMeetingRespMsgBody) extends BbbCoreMsg + +case class GetWebcamStreamsMeetingRespMsgBody(streams: Vector[WebcamStreamVO]) + +case class WebcamStreamVO(streamId: String, stream: MediaStreamVO) + +case class MediaStreamVO(id: String, url: String, userId: String, attributes: collection.immutable.Map[String, String], viewers: Set[String]) + + +object GetWebcamStreamsRespMsg { + val NAME = "GetWebcamStreamsRespMsg" + + def apply(meetingId: String, userId: String, webcamStreams: Vector[String]): GetWebcamStreamsRespMsg = { + val header = BbbClientMsgHeader(GetWebcamStreamsRespMsg.NAME, meetingId, userId) + + val body = GetWebcamStreamsRespMsgBody(webcamStreams) + GetWebcamStreamsRespMsg(header, body) + } +} + +case class GetWebcamStreamsRespMsg(header: BbbClientMsgHeader, body: GetWebcamStreamsRespMsgBody) extends BbbCoreMsg + +case class GetWebcamStreamsRespMsgBody(webcamStreams: Vector[String]) + diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Whiteboard.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/WhiteboardMsgs.scala similarity index 95% rename from bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Whiteboard.scala rename to bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/WhiteboardMsgs.scala index fea5a5703b..9c92823781 100755 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Whiteboard.scala +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/WhiteboardMsgs.scala @@ -1,8 +1,7 @@ -package org.bigbluebutton.common2.messages +package org.bigbluebutton.common2.msgs import org.bigbluebutton.common2.domain.AnnotationVO -object Whiteboard { object ClearWhiteboardEvtMsg { val NAME = "ClearWhiteboardEvtMsg" @@ -116,4 +115,4 @@ object Whiteboard { case class UndoWhiteboardPubMsgBody(whiteboardId: String) -} + diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/util/JsonUtil.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/util/JsonUtil.scala index 4eb79a33aa..27edf906e1 100755 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/util/JsonUtil.scala +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/util/JsonUtil.scala @@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.{DeserializationFeature, JsonNode, ObjectM import com.fasterxml.jackson.module.scala.DefaultScalaModule import com.fasterxml.jackson.module.scala.experimental.ScalaObjectMapper import com.fasterxml.jackson.annotation.JsonInclude -import org.bigbluebutton.common2.messages.{BbbCommonEnvJsNodeMsg, BbbCoreMessageFromClient, BbbCoreMsg} +import org.bigbluebutton.common2.msgs.{BbbCommonEnvJsNodeMsg, BbbCoreMessageFromClient} import scala.reflect.runtime.universe._ import scala.util.Try diff --git a/bbb-common-message/src/test/java/org/bigbluebutton/messages/CreateBreakoutRoomsRequestTest.java b/bbb-common-message/src/test/java/org/bigbluebutton/messages/CreateBreakoutRoomsMsgsRequestTest.java similarity index 97% rename from bbb-common-message/src/test/java/org/bigbluebutton/messages/CreateBreakoutRoomsRequestTest.java rename to bbb-common-message/src/test/java/org/bigbluebutton/messages/CreateBreakoutRoomsMsgsRequestTest.java index 0601709612..2fd0aeb2f2 100755 --- a/bbb-common-message/src/test/java/org/bigbluebutton/messages/CreateBreakoutRoomsRequestTest.java +++ b/bbb-common-message/src/test/java/org/bigbluebutton/messages/CreateBreakoutRoomsMsgsRequestTest.java @@ -9,7 +9,7 @@ import org.junit.Test; import com.google.gson.Gson; -public class CreateBreakoutRoomsRequestTest { +public class CreateBreakoutRoomsMsgsRequestTest { @Test public void testCreateBreakoutRoomsRequest() { From c2c6b19e959006731286a2c8df854021d287555a Mon Sep 17 00:00:00 2001 From: Richard Alam Date: Wed, 28 Jun 2017 07:23:49 -0700 Subject: [PATCH 15/15] - group messages into it's own file --- .../freeswitch/RxJsonMsgDeserializer.scala | 4 +--- .../freeswitch/RxJsonMsgHdlrActor.scala | 3 +-- .../freeswitch/VoiceConferenceService.scala | 13 ++----------- .../client/MsgToAkkaAppsToJsonActor.scala | 2 +- .../client/ReceivedJsonMsgHdlrActor.scala | 2 +- .../bigbluebutton/client/RxJsonMsgHdlrTrait.scala | 2 +- .../client/bus/MsgFromAkkaAppsEventBus.scala | 2 +- .../client/bus/MsgToAkkaAppsEventBus.scala | 2 +- .../client/bus/MsgToClientEventBus.scala | 2 +- .../bigbluebutton/client/meeting/MeetingActor.scala | 2 +- .../client/meeting/MeetingManagerActor.scala | 2 +- .../bigbluebutton/client/meeting/UserActor.scala | 3 +-- .../api2/bus/MsgFromAkkaAppsEventBus.scala | 2 +- .../api2/bus/MsgToAkkaAppsEventBus.scala | 2 +- .../api2/bus/MsgToAkkaAppsToJsonActor.scala | 2 +- .../api2/bus/ReceivedJsonMsgHdlrActor.scala | 6 +++--- .../api2/bus/ReceivedMessageRouter.scala | 2 +- .../api2/meeting/FromAkkaAppsHandlersTrait.scala | 2 +- .../api2/meeting/MeetingsManagerActor.scala | 3 +-- .../api2/meeting/ToAkkaAppsSendersTrait.scala | 3 +-- 20 files changed, 23 insertions(+), 38 deletions(-) diff --git a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/RxJsonMsgDeserializer.scala b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/RxJsonMsgDeserializer.scala index f8e0dcfe4e..869a62d2af 100755 --- a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/RxJsonMsgDeserializer.scala +++ b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/RxJsonMsgDeserializer.scala @@ -1,8 +1,6 @@ package org.bigbluebutton.freeswitch -import org.bigbluebutton.common2.messages.BbbCoreEnvelope -import org.bigbluebutton.common2.messages.Deserializer -import org.bigbluebutton.common2.messages.voiceconf._ +import org.bigbluebutton.common2.msgs._ import com.fasterxml.jackson.databind.JsonNode diff --git a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/RxJsonMsgHdlrActor.scala b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/RxJsonMsgHdlrActor.scala index bb1e8a8c9b..33a6bb176c 100755 --- a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/RxJsonMsgHdlrActor.scala +++ b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/RxJsonMsgHdlrActor.scala @@ -3,8 +3,7 @@ package org.bigbluebutton.freeswitch import akka.actor.{ Actor, ActorLogging, Props } import com.fasterxml.jackson.databind.JsonNode import org.bigbluebutton.SystemConfiguration -import org.bigbluebutton.common2.messages.BbbCoreEnvelope -import org.bigbluebutton.common2.messages.voiceconf._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.freeswitch.bus.ReceivedJsonMsg import org.bigbluebutton.freeswitch.voice.freeswitch.FreeswitchApplication diff --git a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala index 5d46a94b65..501c0e3a37 100755 --- a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala +++ b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala @@ -1,19 +1,10 @@ package org.bigbluebutton.freeswitch import org.bigbluebutton.SystemConfiguration +import org.bigbluebutton.common.messages.{ DeskShareRTMPBroadcastStartedEventMessage, DeskShareRTMPBroadcastStoppedEventMessage, DeskShareStartedEventMessage, DeskShareStoppedEventMessage } import org.bigbluebutton.freeswitch.voice.IVoiceConferenceService import org.bigbluebutton.endpoint.redis.RedisPublisher -import org.bigbluebutton.common.messages.VoiceConfRecordingStartedMessage -import org.bigbluebutton.common.messages.UserJoinedVoiceConfMessage -import org.bigbluebutton.common.messages.UserLeftVoiceConfMessage -import org.bigbluebutton.common.messages.UserMutedInVoiceConfMessage -import org.bigbluebutton.common.messages.UserTalkingInVoiceConfMessage -import org.bigbluebutton.common.messages.DeskShareStartedEventMessage -import org.bigbluebutton.common.messages.DeskShareStoppedEventMessage -import org.bigbluebutton.common.messages.DeskShareRTMPBroadcastStartedEventMessage -import org.bigbluebutton.common.messages.DeskShareRTMPBroadcastStoppedEventMessage -import org.bigbluebutton.common2.messages.{ BbbCommonEnvCoreMsg, BbbCoreEnvelope } -import org.bigbluebutton.common2.messages.voiceconf._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.common2.util.JsonUtil class VoiceConferenceService(sender: RedisPublisher) extends IVoiceConferenceService with SystemConfiguration { diff --git a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/MsgToAkkaAppsToJsonActor.scala b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/MsgToAkkaAppsToJsonActor.scala index 6a667bccb2..568817b070 100755 --- a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/MsgToAkkaAppsToJsonActor.scala +++ b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/MsgToAkkaAppsToJsonActor.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.client import akka.actor.{Actor, ActorLogging, Props} import org.bigbluebutton.client.bus.{JsonMsgToAkkaAppsBus, JsonMsgToAkkaAppsBusMsg, JsonMsgToSendToAkkaApps} -import org.bigbluebutton.common2.messages.BbbCommonEnvJsNodeMsg +import org.bigbluebutton.common2.msgs.BbbCommonEnvJsNodeMsg import org.bigbluebutton.common2.util.JsonUtil object MsgToAkkaAppsToJsonActor { diff --git a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/ReceivedJsonMsgHdlrActor.scala b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/ReceivedJsonMsgHdlrActor.scala index 6cc4520dc4..83b4f0e881 100755 --- a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/ReceivedJsonMsgHdlrActor.scala +++ b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/ReceivedJsonMsgHdlrActor.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.client import akka.actor.{Actor, ActorLogging, Props} import org.bigbluebutton.client.bus.{JsonMsgFromAkkaApps, MsgFromAkkaApps, MsgFromAkkaAppsEventBus} -import org.bigbluebutton.common2.messages.BbbCommonEnvJsNodeMsg +import org.bigbluebutton.common2.msgs.BbbCommonEnvJsNodeMsg import org.bigbluebutton.common2.util.JsonUtil import scala.util.{Failure, Success} diff --git a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/RxJsonMsgHdlrTrait.scala b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/RxJsonMsgHdlrTrait.scala index 7271ce40c2..8cb793c39f 100755 --- a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/RxJsonMsgHdlrTrait.scala +++ b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/RxJsonMsgHdlrTrait.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.client import org.bigbluebutton.client.bus.JsonMsgFromAkkaApps import org.bigbluebutton.common2.util.JsonUtil -import org.bigbluebutton.common2.messages.BbbCommonEnvJsNodeMsg +import org.bigbluebutton.common2.msgs.BbbCommonEnvJsNodeMsg trait RxJsonMsgHdlrTrait { diff --git a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/bus/MsgFromAkkaAppsEventBus.scala b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/bus/MsgFromAkkaAppsEventBus.scala index f142a4b23a..20dc505536 100755 --- a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/bus/MsgFromAkkaAppsEventBus.scala +++ b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/bus/MsgFromAkkaAppsEventBus.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.client.bus import akka.actor.ActorRef import akka.event.{EventBus, LookupClassification} -import org.bigbluebutton.common2.messages.{ BbbCommonEnvJsNodeMsg} +import org.bigbluebutton.common2.msgs.{ BbbCommonEnvJsNodeMsg} case class MsgFromAkkaApps(val topic: String, val payload: BbbCommonEnvJsNodeMsg) diff --git a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/bus/MsgToAkkaAppsEventBus.scala b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/bus/MsgToAkkaAppsEventBus.scala index 1013eba253..50cf2f9363 100755 --- a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/bus/MsgToAkkaAppsEventBus.scala +++ b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/bus/MsgToAkkaAppsEventBus.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.client.bus import akka.actor.ActorRef import akka.event.{EventBus, LookupClassification} -import org.bigbluebutton.common2.messages.{BbbCommonEnvJsNodeMsg} +import org.bigbluebutton.common2.msgs.{BbbCommonEnvJsNodeMsg} case class MsgToAkkaApps(val topic: String, val payload: BbbCommonEnvJsNodeMsg) diff --git a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/bus/MsgToClientEventBus.scala b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/bus/MsgToClientEventBus.scala index fdc53bf38b..4aee1fec5b 100755 --- a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/bus/MsgToClientEventBus.scala +++ b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/bus/MsgToClientEventBus.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.client.bus import akka.actor.ActorRef import akka.event.{EventBus, LookupClassification} -import org.bigbluebutton.common2.messages.BbbCommonEnvJsNodeMsg +import org.bigbluebutton.common2.msgs.BbbCommonEnvJsNodeMsg sealed trait ToConnectionMsg case class BroadcastMsgToMeeting(meetingId: String, data: BbbCommonEnvJsNodeMsg) extends ToConnectionMsg diff --git a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/meeting/MeetingActor.scala b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/meeting/MeetingActor.scala index 0260fcdd5e..c49f4ab609 100755 --- a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/meeting/MeetingActor.scala +++ b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/meeting/MeetingActor.scala @@ -3,7 +3,7 @@ package org.bigbluebutton.client.meeting import akka.actor.{Actor, ActorLogging, Props} import org.bigbluebutton.client.SystemConfiguration import org.bigbluebutton.client.bus._ -import org.bigbluebutton.common2.messages.{BbbCommonEnvJsNodeMsg, MessageTypes} +import org.bigbluebutton.common2.msgs.{BbbCommonEnvJsNodeMsg, MessageTypes} object MeetingActor { def props(meetingId: String, msgToAkkaAppsEventBus: MsgToAkkaAppsEventBus, diff --git a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/meeting/MeetingManagerActor.scala b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/meeting/MeetingManagerActor.scala index dd874ca6d6..e2cde32887 100755 --- a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/meeting/MeetingManagerActor.scala +++ b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/meeting/MeetingManagerActor.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.client.meeting import akka.actor.{Actor, ActorLogging, Props} import org.bigbluebutton.client.bus._ -import org.bigbluebutton.common2.messages.{BbbCommonEnvJsNodeMsg, MessageTypes} +import org.bigbluebutton.common2.msgs.{BbbCommonEnvJsNodeMsg, MessageTypes} object MeetingManagerActor { diff --git a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/meeting/UserActor.scala b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/meeting/UserActor.scala index 0804114ffa..81108aca0d 100755 --- a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/meeting/UserActor.scala +++ b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/meeting/UserActor.scala @@ -3,10 +3,9 @@ package org.bigbluebutton.client.meeting import akka.actor.{Actor, ActorLogging, Props} import org.bigbluebutton.client.{ConnInfo, SystemConfiguration} import org.bigbluebutton.client.bus._ -import org.bigbluebutton.common2.messages._ +import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.common2.util.JsonUtil import com.fasterxml.jackson.databind.JsonNode -import org.bigbluebutton.common2.messages.users.{UserLeaveReqMsg, UserLeaveReqMsgBody} import scala.util.{Failure, Success} diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgFromAkkaAppsEventBus.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgFromAkkaAppsEventBus.scala index bb66bd8b2e..e9f25b91a5 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgFromAkkaAppsEventBus.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgFromAkkaAppsEventBus.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.api2.bus import akka.actor.ActorRef import akka.event.{EventBus, LookupClassification} -import org.bigbluebutton.common2.messages.{BbbCommonEnvCoreMsg} +import org.bigbluebutton.common2.msgs.{BbbCommonEnvCoreMsg} case class MsgFromAkkaApps(val topic: String, val payload: BbbCommonEnvCoreMsg) diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgToAkkaAppsEventBus.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgToAkkaAppsEventBus.scala index 77eebb7f75..86853c293d 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgToAkkaAppsEventBus.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgToAkkaAppsEventBus.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.api2.bus import akka.actor.ActorRef import akka.event.{EventBus, LookupClassification} -import org.bigbluebutton.common2.messages.BbbCommonEnvCoreMsg +import org.bigbluebutton.common2.msgs.BbbCommonEnvCoreMsg case class MsgToAkkaApps(val topic: String, val payload: BbbCommonEnvCoreMsg) diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgToAkkaAppsToJsonActor.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgToAkkaAppsToJsonActor.scala index e7bc667566..bca1b45e2b 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgToAkkaAppsToJsonActor.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgToAkkaAppsToJsonActor.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.api2.bus import akka.actor.{Actor, ActorLogging, Props} import org.bigbluebutton.api2.SystemConfiguration -import org.bigbluebutton.common2.messages.BbbCommonEnvCoreMsg +import org.bigbluebutton.common2.msgs.BbbCommonEnvCoreMsg import org.bigbluebutton.common2.util.JsonUtil object MsgToAkkaAppsToJsonActor { diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala index 20c3141591..558038d99d 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala @@ -1,9 +1,9 @@ package org.bigbluebutton.api2.bus import org.bigbluebutton.api2.SystemConfiguration -import org.bigbluebutton.common2.messages.BbbCoreEnvelope -import org.bigbluebutton.common2.messages.Deserializer -import org.bigbluebutton.common2.messages.MeetingCreatedEvtMsg +import org.bigbluebutton.common2.msgs.BbbCoreEnvelope +import org.bigbluebutton.common2.msgs.Deserializer +import org.bigbluebutton.common2.msgs.MeetingCreatedEvtMsg import com.fasterxml.jackson.databind.JsonNode diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedMessageRouter.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedMessageRouter.scala index 6fa0c750a4..e0fa4e5c9c 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedMessageRouter.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedMessageRouter.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.api2.bus import org.bigbluebutton.api2.SystemConfiguration import org.bigbluebutton.api2.SystemConfiguration -import org.bigbluebutton.common2.messages.{BbbCommonEnvCoreMsg, BbbCoreEnvelope, MeetingCreatedEvtMsg} +import org.bigbluebutton.common2.msgs.{BbbCommonEnvCoreMsg, BbbCoreEnvelope, MeetingCreatedEvtMsg} trait ReceivedMessageRouter extends SystemConfiguration { diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/FromAkkaAppsHandlersTrait.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/FromAkkaAppsHandlersTrait.scala index 38b6aecaf3..3001ced1d4 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/FromAkkaAppsHandlersTrait.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/FromAkkaAppsHandlersTrait.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.api2.meeting -import org.bigbluebutton.common2.messages.MeetingCreatedEvtMsg +import org.bigbluebutton.common2.msgs.MeetingCreatedEvtMsg trait FromAkkaAppsHandlersTrait { def handleMeetingCreatedEvtMsg(msg: MeetingCreatedEvtMsg): Unit = { diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/MeetingsManagerActor.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/MeetingsManagerActor.scala index c82c1eabbe..05c9679e3a 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/MeetingsManagerActor.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/MeetingsManagerActor.scala @@ -6,8 +6,7 @@ import org.bigbluebutton.api2.bus.MsgToAkkaAppsEventBus import org.bigbluebutton.common2.domain.DefaultProps import org.bigbluebutton.api2.util.Util2 import org.bigbluebutton.common.messages.UserJoinedVoiceMessage -import org.bigbluebutton.common2.messages.{BbbCommonEnvCoreMsg, MeetingCreatedEvtMsg} - +import org.bigbluebutton.common2.msgs.{BbbCommonEnvCoreMsg, MeetingCreatedEvtMsg} sealed trait ApiMsg case class CreateBreakoutRoomMsg(meetingId: String, parentMeetingId: String, diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/ToAkkaAppsSendersTrait.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/ToAkkaAppsSendersTrait.scala index 870abe8d63..d4212b8b2c 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/ToAkkaAppsSendersTrait.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/ToAkkaAppsSendersTrait.scala @@ -3,8 +3,7 @@ package org.bigbluebutton.api2.meeting import org.bigbluebutton.api2.SystemConfiguration import org.bigbluebutton.api2.bus.{MsgToAkkaApps, MsgToAkkaAppsEventBus} import org.bigbluebutton.common2.domain.DefaultProps -import org.bigbluebutton.common2.messages._ -import org.bigbluebutton.common2.messages.users.{RegisterUserReqMsg, RegisterUserReqMsgBody} +import org.bigbluebutton.common2.msgs._ trait ToAkkaAppsSendersTrait extends SystemConfiguration { val msgToAkkaAppsEventBus: MsgToAkkaAppsEventBus