fix: Include visitors with the initial invite. (#1131)

jitsi · Jan 25, 2024 · d0fd82d · d0fd82d
1 parent 030b8e9
commit d0fd82d
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/jicofo/src/main/java/org/jitsi/jicofo/conference/JitsiMeetConferenceImpl.java b/jicofo/src/main/java/org/jitsi/jicofo/conference/JitsiMeetConferenceImpl.java
@@ -753,6 +753,16 @@ private void onMemberJoined(@NotNull ChatRoomMember chatRoomMember)
                 {
                     inviteChatMember(member, member == chatRoomMember);
                 }
+                for (final ChatRoom visitorChatRoom: visitorChatRooms.values())
+                {
+                    for (final ChatRoomMember member : visitorChatRoom.getMembers())
+                    {
+                        if (member.getRole() == MemberRole.VISITOR)
+                        {
+                            inviteChatMember(member, member == chatRoomMember);
+                        }
+                    }
+                }
             }
             // Only the one who has just joined
             else
@@ -897,9 +907,15 @@ private boolean hasToStartVideoMuted(boolean justJoined)
      */
     private boolean checkMinParticipants()
     {
-        int minParticipants = ConferenceConfig.config.getMinParticipants();
         ChatRoom chatRoom = getChatRoom();
-        return chatRoom != null && chatRoom.getMemberCount() >= minParticipants;
+        if (chatRoom == null)
+        {
+            return false;
+        }
+        int minParticipants = ConferenceConfig.config.getMinParticipants();
+        int memberCount = chatRoom.getMemberCount()
+                + visitorChatRooms.values().stream().mapToInt(ChatRoom::getMemberCount).sum();
+        return memberCount >= minParticipants;
     }
 
     /**