Prevent presenter being selected by random viewer selection (#11275)

Akka-apps filter presenter and moderators from random viewer selection list

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

@@ -31,7 +31,7 @@ trait SelectRandomViewerReqMsgHdlr extends RightsManagementTrait {
       val reason = "No permission to select random user."
       PermissionCheck.ejectUserForFailedPermission(meetingId, msg.header.userId, reason, outGW, liveMeeting)
     } else {
-      val users = Users2x.findViewers(liveMeeting.users2x)
+      val users = Users2x.findNotPresentersNorModerators(liveMeeting.users2x)
       val randNum = new scala.util.Random
 
       if (users.size > 0) {

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

@@ -59,6 +59,10 @@ object Users2x {
     users.toVector.filter(u => !u.presenter)
   }
 
+  def findNotPresentersNorModerators(users: Users2x): Vector[UserState] = {
+    users.toVector.filter(u => !u.presenter && u.role != Roles.MODERATOR_ROLE)
+  }
+
   def findViewers(users: Users2x): Vector[UserState] = {
     users.toVector.filter(u => u.role == Roles.VIEWER_ROLE)
   }