Merge pull request #14 from gustavotrott/pr-19841

Add graphql data for Gladia transcriptions

.gitignore

@@ -24,3 +24,4 @@ artifacts/*
 bbb-presentation-video.zip
 bbb-presentation-video
 bbb-graphql-actions-adapter-server/
+bigbluebutton-html5/public/locales/index.json

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala

@@ -14,6 +14,7 @@ import org.bigbluebutton.SystemConfiguration
 import java.util.concurrent.TimeUnit
 import org.bigbluebutton.common2.msgs._
 import org.bigbluebutton.core.db.{ DatabaseConnection, MeetingDAO }
+import org.bigbluebutton.core.domain.MeetingEndReason
 import org.bigbluebutton.core.running.RunningMeeting
 import org.bigbluebutton.core.util.ColorPicker
 import org.bigbluebutton.core2.RunningMeetings
@@ -57,6 +58,9 @@ class BigBlueButtonActor(
   override def preStart() {
     bbbMsgBus.subscribe(self, meetingManagerChannel)
     DatabaseConnection.initialize()
+
+    //Terminate all previous meetings, as they will not function following the akka-apps restart
+    MeetingDAO.setAllMeetingsEnded(MeetingEndReason.ENDED_DUE_TO_SERVICE_INTERRUPTION, "system")
   }
 
   override def postStop() {

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/audiocaptions/TranscriptionProviderErrorMsgHdlr.scala

@@ -2,6 +2,7 @@ package org.bigbluebutton.core.apps.audiocaptions
 
 import org.bigbluebutton.common2.msgs._
 import org.bigbluebutton.core.bus.MessageBus
+import org.bigbluebutton.core.db.UserTranscriptionErrorDAO
 import org.bigbluebutton.core.models.AudioCaptions
 import org.bigbluebutton.core.running.LiveMeeting
 
@@ -23,5 +24,8 @@ trait TranscriptionProviderErrorMsgHdlr {
     }
 
     broadcastEvent(msg.header.userId, msg.body.errorCode, msg.body.errorMessage)
+
+    UserTranscriptionErrorDAO.insert(msg.header.userId, msg.header.meetingId, msg.body.errorCode, msg.body.errorMessage)
+
   }
 }

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/audiocaptions/UpdateTranscriptPubMsgHdlr.scala

@@ -1,12 +1,13 @@
 package org.bigbluebutton.core.apps.audiocaptions
 
+import org.bigbluebutton.ClientSettings.getConfigPropertyValueByPathAsStringOrElse
 import org.bigbluebutton.common2.msgs._
 import org.bigbluebutton.core.bus.MessageBus
 import org.bigbluebutton.core.db.CaptionDAO
-import org.bigbluebutton.core.models.{AudioCaptions, Users2x}
+import org.bigbluebutton.core.models.{AudioCaptions, UserState, Users2x}
 import org.bigbluebutton.core.running.LiveMeeting
-
-import java.sql.Timestamp
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
 
 trait UpdateTranscriptPubMsgHdlr {
   this: AudioCaptionsApp2x =>
@@ -25,6 +26,17 @@ trait UpdateTranscriptPubMsgHdlr {
       bus.outGW.send(msgEvent)
     }
 
+    def sendPadUpdatePubMsg(userId: String, defaultPad: String, text: String, transcript: Boolean): Unit = {
+      val routing = Routing.addMsgToClientRouting(MessageTypes.DIRECT, meetingId, "nodeJSapp")
+      val envelope = BbbCoreEnvelope(PadUpdatePubMsg.NAME, routing)
+      val header = BbbClientMsgHeader(PadUpdatePubMsg.NAME, meetingId, userId)
+      val body = PadUpdatePubMsgBody(defaultPad, text, transcript)
+      val event = PadUpdatePubMsg(header, body)
+      val msgEvent = BbbCommonEnvCoreMsg(envelope, event)
+
+      bus.outGW.send(msgEvent)
+    }
+
     // Adapt to the current captions' recording process
     def editTranscript(
         userId: String,
@@ -80,6 +92,28 @@ trait UpdateTranscriptPubMsgHdlr {
         msg.body.locale,
         msg.body.result,
       )
+
+      if(msg.body.result) {
+        val userName = Users2x.findWithIntId(liveMeeting.users2x, msg.header.userId).get match {
+          case u: UserState => u.name
+          case _ => "???"
+        }
+
+        val now = LocalDateTime.now()
+        val formatter = DateTimeFormatter.ofPattern("HH:mm:ss")
+        val formattedTime = now.format(formatter)
+
+        val userSpoke = s"\n $userName ($formattedTime): $transcript"
+
+        val defaultPad = getConfigPropertyValueByPathAsStringOrElse(
+          liveMeeting.clientSettings,
+          "public.captions.defaultPad",
+          alternativeValue = ""
+        )
+
+        sendPadUpdatePubMsg(msg.header.userId, defaultPad, userSpoke, transcript = true)
+      }
+
     }
   }
 }

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/layout/BroadcastLayoutMsgHdlr.scala

@@ -6,6 +6,7 @@ import org.bigbluebutton.core.running.OutMsgRouter
 import org.bigbluebutton.core2.MeetingStatus2x
 import org.bigbluebutton.core.apps.{ PermissionCheck, RightsManagementTrait }
 import org.bigbluebutton.core.db.LayoutDAO
+import org.bigbluebutton.core2.message.senders.{ MsgBuilder }
 
 trait BroadcastLayoutMsgHdlr extends RightsManagementTrait {
   this: LayoutApp2x =>
@@ -60,5 +61,18 @@ trait BroadcastLayoutMsgHdlr extends RightsManagementTrait {
     val msgEvent = BbbCommonEnvCoreMsg(envelope, event)
 
     outGW.send(msgEvent)
+
+    if (body.pushLayout) {
+      val notifyEvent = MsgBuilder.buildNotifyUserInMeetingEvtMsg(
+        fromUserId,
+        liveMeeting.props.meetingProp.intId,
+        "info",
+        "user",
+        "app.layoutUpdate.label",
+        "Notification to when the presenter changes size of cams",
+        Vector()
+      )
+      outGW.send(notifyEvent)
+    }
   }
 }

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala

@@ -165,7 +165,6 @@ class UsersApp(
   with RecordAndClearPreviousMarkersCmdMsgHdlr
   with SendRecordingTimerInternalMsgHdlr
   with GetRecordingStatusReqMsgHdlr
-  with SelectRandomViewerReqMsgHdlr
   with AssignPresenterReqMsgHdlr
   with ChangeUserPinStateReqMsgHdlr
   with ChangeUserMobileFlagReqMsgHdlr

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserJoinedVoiceConfEvtMsgHdlr.scala

@@ -58,7 +58,6 @@ trait UserJoinedVoiceConfEvtMsgHdlr extends SystemConfiguration {
         avatar = "",
         color = userColor,
         clientType = if (isDialInUser) "dial-in-user" else "",
-        pickExempted = false,
         userLeftFlag = UserLeftFlag(false, 0)
       )
       Users2x.add(liveMeeting.users2x, newUser)

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/db/MeetingDAO.scala

@@ -25,6 +25,8 @@ case class MeetingDbModel(
     bannerColor:                           Option[String],
     createdTime:                           Long,
     durationInSeconds:                     Int,
+    endWhenNoModerator:                    Boolean,
+    endWhenNoModeratorDelayInMinutes:      Int,
     endedAt:                               Option[java.sql.Timestamp],
     endedReasonCode:                       Option[String],
     endedBy:                               Option[String],
@@ -49,6 +51,8 @@ class MeetingDbTableDef(tag: Tag) extends Table[MeetingDbModel](tag, None, "meet
     bannerColor,
     createdTime,
     durationInSeconds,
+    endWhenNoModerator,
+    endWhenNoModeratorDelayInMinutes,
     endedAt,
     endedReasonCode,
     endedBy
@@ -70,6 +74,8 @@ class MeetingDbTableDef(tag: Tag) extends Table[MeetingDbModel](tag, None, "meet
   val bannerColor = column[Option[String]]("bannerColor")
   val createdTime = column[Long]("createdTime")
   val durationInSeconds = column[Int]("durationInSeconds")
+  val endWhenNoModerator = column[Boolean]("endWhenNoModerator")
+  val endWhenNoModeratorDelayInMinutes = column[Int]("endWhenNoModeratorDelayInMinutes")
   val endedAt = column[Option[java.sql.Timestamp]]("endedAt")
   val endedReasonCode = column[Option[String]]("endedReasonCode")
   val endedBy = column[Option[String]]("endedBy")
@@ -106,6 +112,8 @@ object MeetingDAO {
           },
           createdTime = meetingProps.durationProps.createdTime,
           durationInSeconds = meetingProps.durationProps.duration * 60,
+          endWhenNoModerator = meetingProps.durationProps.endWhenNoModerator,
+          endWhenNoModeratorDelayInMinutes = meetingProps.durationProps.endWhenNoModeratorDelayInMinutes,
           endedAt = None,
           endedReasonCode = None,
           endedBy = None
@@ -182,4 +190,27 @@ object MeetingDAO {
       case Failure(e) => DatabaseConnection.logger.debug(s"Error updating endedAt=now() Meeting: $e")
     }
   }
+
+  def setAllMeetingsEnded(endedReasonCode: String, endedBy: String) = {
+    DatabaseConnection.db.run(
+      TableQuery[MeetingDbTableDef]
+        .filter(_.endedAt.isEmpty)
+        .map(a => (a.endedAt, a.endedReasonCode, a.endedBy))
+        .update(
+          (
+            Some(new java.sql.Timestamp(System.currentTimeMillis())),
+            Some(endedReasonCode),
+            endedBy match {
+              case "" => None
+              case c => Some(c)
+            }
+          )
+        )
+    ).onComplete {
+      case Success(rowsAffected) => DatabaseConnection.logger.debug(s"$rowsAffected row(s) updated all-meetings endedAt=now() on Meeting table!")
+      case Failure(e) => DatabaseConnection.logger.debug(s"Error updating all-meetings endedAt=now() on Meeting table: $e")
+    }
+  }
+
+
 }

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/db/UserStateDAO.scala

@@ -26,11 +26,15 @@ case class UserStateDbModel(
     pinned: Boolean = false,
     locked: Boolean = false,
     speechLocale: String,
+    inactivityWarningDisplay: Boolean = false,
+    inactivityWarningTimeoutSecs: Option[Long],
 )
 
 class UserStateDbTableDef(tag: Tag) extends Table[UserStateDbModel](tag, None, "user") {
   override def * = (
-    userId,emoji,away,raiseHand,guestStatus,guestStatusSetByModerator,guestLobbyMessage,mobile,clientType,disconnected,expired,ejected,ejectReason,ejectReasonCode,ejectedByModerator,presenter,pinned,locked,speechLocale) <> (UserStateDbModel.tupled, UserStateDbModel.unapply)
+    userId,emoji,away,raiseHand,guestStatus,guestStatusSetByModerator,guestLobbyMessage,mobile,clientType,disconnected,
+    expired,ejected,ejectReason,ejectReasonCode,ejectedByModerator,presenter,pinned,locked,speechLocale,
+    inactivityWarningDisplay, inactivityWarningTimeoutSecs) <> (UserStateDbModel.tupled, UserStateDbModel.unapply)
   val userId = column[String]("userId", O.PrimaryKey)
   val emoji = column[String]("emoji")
   val away = column[Boolean]("away")
@@ -50,6 +54,8 @@ class UserStateDbTableDef(tag: Tag) extends Table[UserStateDbModel](tag, None, "
   val pinned = column[Boolean]("pinned")
   val locked = column[Boolean]("locked")
   val speechLocale = column[String]("speechLocale")
+  val inactivityWarningDisplay = column[Boolean]("inactivityWarningDisplay")
+  val inactivityWarningTimeoutSecs = column[Option[Long]]("inactivityWarningTimeoutSecs")
 }
 
 object UserStateDAO {
@@ -119,4 +125,21 @@ object UserStateDAO {
     }
   }
 
+  def updateInactivityWarning(intId: String, inactivityWarningDisplay: Boolean, inactivityWarningTimeoutSecs: Long) = {
+    DatabaseConnection.db.run(
+      TableQuery[UserStateDbTableDef]
+        .filter(_.userId === intId)
+        .map(u => (u.inactivityWarningDisplay, u.inactivityWarningTimeoutSecs))
+        .update((inactivityWarningDisplay,
+          inactivityWarningTimeoutSecs match {
+            case 0 => None
+            case timeout: Long => Some(timeout)
+            case _ => None
+        }))
+    ).onComplete {
+      case Success(rowsAffected) => DatabaseConnection.logger.debug(s"$rowsAffected row(s) updated inactivityWarningDisplay on user table!")
+      case Failure(e) => DatabaseConnection.logger.error(s"Error updating inactivityWarningDisplay user: $e")
+    }
+  }
+
 }

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/db/UserTranscriptionErrorDAO.scala

@@ -0,0 +1,48 @@
+package org.bigbluebutton.core.db
+
+import org.bigbluebutton.core.models.{ VoiceUserState }
+import slick.jdbc.PostgresProfile.api._
+
+import scala.concurrent.ExecutionContext.Implicits.global
+import scala.util.{ Failure, Success }
+
+case class UserTranscriptionErrorDbModel(
+    userId:        String,
+    meetingId:     String,
+    errorCode:     String,
+    errorMessage:  String,
+    lastUpdatedAt: java.sql.Timestamp = new java.sql.Timestamp(System.currentTimeMillis())
+)
+
+class UserTranscriptionErrorDbTableDef(tag: Tag) extends Table[UserTranscriptionErrorDbModel](tag, None, "user_transcriptionError") {
+  override def * = (
+    userId, meetingId, errorCode, errorMessage, lastUpdatedAt
+  ) <> (UserTranscriptionErrorDbModel.tupled, UserTranscriptionErrorDbModel.unapply)
+  val userId = column[String]("userId", O.PrimaryKey)
+  val meetingId = column[String]("meetingId")
+  val errorCode = column[String]("errorCode")
+  val errorMessage = column[String]("errorMessage")
+  val lastUpdatedAt = column[java.sql.Timestamp]("lastUpdatedAt")
+}
+
+object UserTranscriptionErrorDAO {
+  def insert(userId: String, meetingId: String, errorCode: String, errorMessage: String) = {
+    DatabaseConnection.db.run(
+      TableQuery[UserTranscriptionErrorDbTableDef].insertOrUpdate(
+        UserTranscriptionErrorDbModel(
+          userId = userId,
+          meetingId = meetingId,
+          errorCode = errorCode,
+          errorMessage = errorMessage,
+          lastUpdatedAt = new java.sql.Timestamp(System.currentTimeMillis()),
+        )
+      )
+    ).onComplete {
+        case Success(rowsAffected) => {
+          DatabaseConnection.logger.debug(s"$rowsAffected row(s) inserted on user_transcriptionError table!")
+        }
+        case Failure(e) => DatabaseConnection.logger.debug(s"Error inserting user_transcriptionError: $e")
+      }
+  }
+
+}

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingState2x.scala

@@ -42,4 +42,5 @@ object MeetingEndReason {
   val BREAKOUT_ENDED_BY_MOD = "BREAKOUT_ENDED_BY_MOD"
   val ENDED_DUE_TO_NO_AUTHED_USER = "ENDED_DUE_TO_NO_AUTHED_USER"
   val ENDED_DUE_TO_NO_MODERATOR = "ENDED_DUE_TO_NO_MODERATOR"
+  val ENDED_DUE_TO_SERVICE_INTERRUPTION = "ENDED_DUE_TO_SERVICE_INTERRUPTION"
 }