diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/UpdateBreakoutRoomsTimeMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/UpdateBreakoutRoomsTimeMsgHdlr.scala index 5f1962c607..eedc142668 100644 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/UpdateBreakoutRoomsTimeMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/UpdateBreakoutRoomsTimeMsgHdlr.scala @@ -58,6 +58,7 @@ trait UpdateBreakoutRoomsTimeMsgHdlr extends RightsManagementTrait { "success", "about", "app.chat.breakoutDurationUpdated", + "Used when the breakout duration is updated", Vector(s"${msg.body.timeInMinutes}") ) outGW.send(notifyEvent) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/MsgBuilder.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/MsgBuilder.scala index 5e4226308d..a1afc4c9d6 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/MsgBuilder.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/MsgBuilder.scala @@ -514,16 +514,17 @@ object MsgBuilder { } def buildNotifyAllInMeetingEvtMsg( - meetingId: String, - notificationType: String, - icon: String, - messageId: String, - messageValues: Vector[String] + meetingId: String, + notificationType: String, + icon: String, + messageId: String, + messageDescription: String, + messageValues: Vector[String] ): BbbCommonEnvCoreMsg = { val routing = collection.immutable.HashMap("sender" -> "bbb-apps-akka") val envelope = BbbCoreEnvelope(NotifyAllInMeetingEvtMsg.NAME, routing) val header = BbbClientMsgHeader(NotifyAllInMeetingEvtMsg.NAME, meetingId, "not-used") - val body = NotifyAllInMeetingEvtMsgBody(meetingId, notificationType, icon, messageId, messageValues) + val body = NotifyAllInMeetingEvtMsgBody(meetingId, notificationType, icon, messageId, messageDescription, messageValues) val event = NotifyAllInMeetingEvtMsg(header, body) BbbCommonEnvCoreMsg(envelope, event) 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 index e99634fe98..8458eb16f2 100755 --- 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 @@ -101,21 +101,21 @@ case class NotifyAllInMeetingEvtMsg( header: BbbClientMsgHeader, body: NotifyAllInMeetingEvtMsgBody ) extends BbbCoreMsg -case class NotifyAllInMeetingEvtMsgBody(meetingId: String, notificationType: String, icon: String, messageId: String, messageValues: Vector[String]) +case class NotifyAllInMeetingEvtMsgBody(meetingId: String, notificationType: String, icon: String, messageId: String, messageDescription: String, messageValues: Vector[String]) object NotifyUserInMeetingEvtMsg { val NAME = "NotifyUserInMeetingEvtMsg" } case class NotifyUserInMeetingEvtMsg( header: BbbClientMsgHeader, body: NotifyUserInMeetingEvtMsgBody ) extends BbbCoreMsg -case class NotifyUserInMeetingEvtMsgBody(userId: String, meetingId: String, notificationType: String, icon: String, messageId: String, messageValues: Vector[String]) +case class NotifyUserInMeetingEvtMsgBody(userId: String, meetingId: String, notificationType: String, icon: String, messageId: String, messageDescription: String, messageValues: Vector[String]) object NotifyRoleInMeetingEvtMsg { val NAME = "NotifyRoleInMeetingEvtMsg" } case class NotifyRoleInMeetingEvtMsg( header: BbbClientMsgHeader, body: NotifyRoleInMeetingEvtMsgBody ) extends BbbCoreMsg -case class NotifyRoleInMeetingEvtMsgBody(role: String, meetingId: String, notificationType: String, icon: String, messageId: String, messageValues: Vector[String]) +case class NotifyRoleInMeetingEvtMsgBody(role: String, meetingId: String, notificationType: String, icon: String, messageId: String, messageDescription: String, messageValues: Vector[String]) /** * Sent to bbb-web diff --git a/bigbluebutton-html5/imports/api/meetings/server/handlers/handleNotifyAllInMeetingEvtMsg.js b/bigbluebutton-html5/imports/api/meetings/server/handlers/handleNotifyAllInMeetingEvtMsg.js index 8daa7ecc2d..0f5b920d7b 100644 --- a/bigbluebutton-html5/imports/api/meetings/server/handlers/handleNotifyAllInMeetingEvtMsg.js +++ b/bigbluebutton-html5/imports/api/meetings/server/handlers/handleNotifyAllInMeetingEvtMsg.js @@ -7,6 +7,7 @@ export default function handleNotifyAllInMeeting({ body }) { notificationType: String, icon: String, messageId: String, + messageDescription: String, messageValues: Array, }); return emitNotification(body, 'notifyAllInMeeting'); diff --git a/bigbluebutton-html5/imports/api/meetings/server/handlers/handleNotifyRoleInMeeting.js b/bigbluebutton-html5/imports/api/meetings/server/handlers/handleNotifyRoleInMeeting.js index ad42e951df..f519c20752 100644 --- a/bigbluebutton-html5/imports/api/meetings/server/handlers/handleNotifyRoleInMeeting.js +++ b/bigbluebutton-html5/imports/api/meetings/server/handlers/handleNotifyRoleInMeeting.js @@ -8,6 +8,7 @@ export default function handleNotifyRoleInMeeting({ body }) { notificationType: String, icon: String, messageId: String, + messageDescription: String, messageValues: Array, }); return emitNotification(body, 'NotifyRoleInMeeting'); diff --git a/bigbluebutton-html5/imports/api/meetings/server/handlers/handleNotifyUserInMeeting.js b/bigbluebutton-html5/imports/api/meetings/server/handlers/handleNotifyUserInMeeting.js index 06ca6c68f2..cd93022e72 100644 --- a/bigbluebutton-html5/imports/api/meetings/server/handlers/handleNotifyUserInMeeting.js +++ b/bigbluebutton-html5/imports/api/meetings/server/handlers/handleNotifyUserInMeeting.js @@ -8,6 +8,7 @@ export default function handleNotifyUserInMeeting({ body }) { notificationType: String, icon: String, messageId: String, + messageDescription: String, messageValues: Array, }); return emitNotification(body, 'NotifyUserInMeeting'); diff --git a/bigbluebutton-html5/imports/ui/components/notifications/container.jsx b/bigbluebutton-html5/imports/ui/components/notifications/container.jsx index f603f1ba2b..c3f7ae5684 100644 --- a/bigbluebutton-html5/imports/ui/components/notifications/container.jsx +++ b/bigbluebutton-html5/imports/ui/components/notifications/container.jsx @@ -11,7 +11,7 @@ export default withTracker(() => { , obj.notificationType, obj.icon,