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

add messageDescription in notifications

Browse Source
This commit is contained in:
Ramon Souza 2022-03-30 11:01:12 -03:00
parent 41778cb959
commit 6874156190
7 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/UpdateBreakoutRoomsTimeMsgHdlr.scala
View File

@ -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)

13
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/MsgBuilder.scala
View File

@ -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)

6
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/SystemMsgs.scala
View File

@ -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

1
bigbluebutton-html5/imports/api/meetings/server/handlers/handleNotifyAllInMeetingEvtMsg.js
View File

@ -7,6 +7,7 @@ export default function handleNotifyAllInMeeting({ body }) {
notificationType: String,
icon: String,
messageId: String,
messageDescription: String,
messageValues: Array,
});
return emitNotification(body, 'notifyAllInMeeting');

1
bigbluebutton-html5/imports/api/meetings/server/handlers/handleNotifyRoleInMeeting.js
View File

@ -8,6 +8,7 @@ export default function handleNotifyRoleInMeeting({ body }) {
notificationType: String,
icon: String,
messageId: String,
messageDescription: String,
messageValues: Array,
});
return emitNotification(body, 'NotifyRoleInMeeting');

1
bigbluebutton-html5/imports/api/meetings/server/handlers/handleNotifyUserInMeeting.js
View File

@ -8,6 +8,7 @@ export default function handleNotifyUserInMeeting({ body }) {
notificationType: String,
icon: String,
messageId: String,
messageDescription: String,
messageValues: Array,
});
return emitNotification(body, 'NotifyUserInMeeting');

2
bigbluebutton-html5/imports/ui/components/notifications/container.jsx
View File

@ -11,7 +11,7 @@ export default withTracker(() => {
<FormattedMessage
id={obj.messageId}
values={obj.messageValues}
description="Notification for when the recording starts"
description={obj.messageDescription}
/>,
obj.notificationType,
obj.icon,