feat: Publish jibri status in visitor MUCs. (#1244)

* feat: Publish jibri status in visitor MUCs.

* squash: Remove redundant null checks.

Author: bgrozev

jicofo/src/main/java/org/jitsi/jicofo/conference/JitsiMeetConference.java

@@ -25,6 +25,7 @@
 import org.jitsi.jicofo.xmpp.muc.*;
 import org.jitsi.utils.*;
 import org.jitsi.xmpp.extensions.jibri.*;
+import org.jivesoftware.smack.packet.*;
 import org.jxmpp.jid.*;
 
 import java.util.*;
@@ -180,4 +181,6 @@ MuteResult handleMuteRequest(
     @Nullable
     String redirectVisitor(boolean visitorRequested, @Nullable String userId, @Nullable String groupId)
             throws Exception;
+
+    void setPresenceExtension(@NotNull ExtensionElement extension);
 }

jicofo/src/main/java/org/jitsi/jicofo/conference/JitsiMeetConferenceImpl.java

@@ -49,6 +49,7 @@
 import org.jivesoftware.smackx.caps.packet.*;
 import org.jxmpp.jid.*;
 
+import javax.xml.namespace.*;
 import java.time.*;
 import java.util.*;
 import java.util.concurrent.*;
@@ -271,6 +272,9 @@ public class JitsiMeetConferenceImpl
     @Nullable
     private String meetingId;
 
+    /** Presence extensions set from the outside which are to be added to the presence in each MUC. */
+    private final Map<QName, ExtensionElement> presenceExtensions = new ConcurrentHashMap<>();
+
     /**
      * Creates new instance of {@link JitsiMeetConferenceImpl}.
      *
@@ -606,6 +610,7 @@ else if (ConferenceConfig.config.enableAutoOwner() && mainRoomJid == null)
         }
 
         presenceExtensions.add(createConferenceProperties());
+        this.presenceExtensions.forEach((qName, extension) -> presenceExtensions.add(extension));
 
         // updates presence with presenceExtensions and sends it
         chatRoom.addPresenceExtensions(presenceExtensions);
@@ -648,6 +653,22 @@ private void setConferenceProperty(@NotNull String key, @NotNull String value, b
         }
     }
 
+    @Override
+    public void setPresenceExtension(@NotNull ExtensionElement extension)
+    {
+        presenceExtensions.put(extension.getQName(), extension);
+
+        ChatRoom chatRoom = this.chatRoom;
+        if (chatRoom != null)
+        {
+            chatRoom.setPresenceExtension(extension);
+        }
+        for (final ChatRoom visitorChatRoom: visitorChatRooms.values())
+        {
+            visitorChatRoom.setPresenceExtension(extension);
+        }
+    }
+
     private ConferenceProperties createConferenceProperties()
     {
         ConferenceProperties conferenceProperties = new ConferenceProperties();
@@ -2039,6 +2060,7 @@ private String selectVisitorNode()
         // properties up to date?
         presenceExtensions.add(createConferenceProperties());
 
+        this.presenceExtensions.forEach((qName, extension) -> presenceExtensions.add(extension));
         // updates presence with presenceExtensions and sends it
         chatRoomToJoin.addPresenceExtensions(presenceExtensions);
 

jicofo/src/main/kotlin/org/jitsi/jicofo/jibri/JibriRecorder.kt

@@ -188,6 +188,6 @@ class JibriRecorder(
             "Publishing new jibri-recording-status: ${recordingStatus.toXML()} in: ${conference.roomName}"
         )
 
-        conference.chatRoom?.setPresenceExtension(recordingStatus)
+        conference.setPresenceExtension(recordingStatus)
     }
 }