From ec3b43b3bde2e54f05fc8876b4450115a1fd317f Mon Sep 17 00:00:00 2001 From: Ramon Souza Date: Wed, 6 Apr 2022 16:24:48 -0300 Subject: [PATCH] add guest user notifications - akka-apps --- .../core/apps/users/RegisterUserReqMsgHdlr.scala | 10 ++++++++++ bigbluebutton-html5/public/locales/en.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/RegisterUserReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/RegisterUserReqMsgHdlr.scala index 24034dd5ee..ee031d4af5 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/RegisterUserReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/RegisterUserReqMsgHdlr.scala @@ -60,6 +60,16 @@ trait RegisterUserReqMsgHdlr { val guest = GuestWaiting(regUser.id, regUser.name, regUser.role, regUser.guest, regUser.avatarURL, regUser.authed, regUser.registeredOn) addGuestToWaitingForApproval(guest, liveMeeting.guestsWaiting) notifyModeratorsOfGuestWaiting(Vector(guest), liveMeeting.users2x, liveMeeting.props.meetingProp.intId) + val notifyEvent = MsgBuilder.buildNotifyRoleInMeetingEvtMsg( + "MODERATOR", + liveMeeting.props.meetingProp.intId, + "info", + "user", + "app.userList.guest.pendingGuestAlert", + "Notification that a new guest user joined the session", + Vector(s"${regUser.name}") + ) + outGW.send(notifyEvent) case GuestStatus.DENY => val g = GuestApprovedVO(regUser.id, GuestStatus.DENY) UsersApp.approveOrRejectGuest(liveMeeting, outGW, g, SystemUser.ID) diff --git a/bigbluebutton-html5/public/locales/en.json b/bigbluebutton-html5/public/locales/en.json index 91eca41b43..022755c517 100755 --- a/bigbluebutton-html5/public/locales/en.json +++ b/bigbluebutton-html5/public/locales/en.json @@ -636,7 +636,7 @@ "app.userList.guest.pendingUsers": "{0} Pending Users", "app.userList.guest.noPendingUsers": "Currently no pending users...", "app.userList.guest.pendingGuestUsers": "{0} Pending Guest Users", - "app.userList.guest.pendingGuestAlert": "Has joined the session and is waiting for your approval.", + "app.userList.guest.pendingGuestAlert": "{0} has joined the session and is waiting for your approval.", "app.userList.guest.rememberChoice": "Remember choice", "app.userList.guest.emptyMessage": "There is currently no message", "app.userList.guest.inputPlaceholder": "Message to the guests' lobby",