From e02429410e85029e77c085f0f7a4da6bba2e9980 Mon Sep 17 00:00:00 2001 From: Boris Grozev Date: Thu, 5 Sep 2024 08:05:04 -0500 Subject: [PATCH] tmp --- .../kotlin/org/jitsi/jicofo/xmpp/muc/ChatRoom.kt | 3 --- .../org/jitsi/jicofo/xmpp/muc/ChatRoomImpl.kt | 10 ---------- .../org/jitsi/jicofo/xmpp/muc/ChatRoomListener.kt | 1 - .../org/jitsi/jicofo/xmpp/muc/RoomMetadata.kt | 5 +---- .../org/jitsi/jicofo/xmpp/muc/RoomMetadataTest.kt | 14 ++++++-------- .../jicofo/conference/JitsiMeetConferenceImpl.java | 5 ----- .../src/main/kotlin/org/jitsi/jicofo/xmpp/Smack.kt | 13 +------------ 7 files changed, 8 insertions(+), 43 deletions(-) diff --git a/jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/muc/ChatRoom.kt b/jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/muc/ChatRoom.kt index 082d337568..825a5719b0 100644 --- a/jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/muc/ChatRoom.kt +++ b/jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/muc/ChatRoom.kt @@ -65,9 +65,6 @@ interface ChatRoom { * Read from the MUC config form. */ val participantsSoftLimit: Int? - /** Whether the room is configured to require transcription. */ - val transcriptionRequested: Boolean - val debugState: OrderedJsonObject /** Returns the number of members that currently have their audio sources unmuted. */ diff --git a/jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/muc/ChatRoomImpl.kt b/jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/muc/ChatRoomImpl.kt index 5e95f6ac80..a4bb683cc3 100644 --- a/jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/muc/ChatRoomImpl.kt +++ b/jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/muc/ChatRoomImpl.kt @@ -163,15 +163,6 @@ class ChatRoomImpl( } } - override var transcriptionRequested: Boolean = false - private set(value) { - if (value != field) { - logger.info("transcriptionRequested is now $value.") - field = value - eventEmitter.fireEvent { transcriptionRequestedChanged(value) } - } - } - private val avModerationByMediaType = ConcurrentHashMap() /** The emitter used to fire events. */ @@ -297,7 +288,6 @@ class ChatRoomImpl( } override fun setRoomMetadata(roomMetadata: RoomMetadata) { - transcriptionRequested = roomMetadata.metadata?.recording?.isTranscribingEnabled == true visitorsLive = roomMetadata.metadata?.visitors?.live == true } diff --git a/jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/muc/ChatRoomListener.kt b/jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/muc/ChatRoomListener.kt index 79f6f20591..6a2af2706f 100644 --- a/jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/muc/ChatRoomListener.kt +++ b/jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/muc/ChatRoomListener.kt @@ -29,7 +29,6 @@ interface ChatRoomListener { fun localRoleChanged(newRole: MemberRole) {} fun numAudioSendersChanged(numAudioSenders: Int) {} fun numVideoSendersChanged(numVideoSenders: Int) {} - fun transcriptionRequestedChanged(transcriptionRequested: Boolean) {} } /** A class with the default kotlin method implementations (to avoid using @JvmDefault) **/ diff --git a/jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/muc/RoomMetadata.kt b/jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/muc/RoomMetadata.kt index e17a6aaafe..b7d9805d19 100644 --- a/jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/muc/RoomMetadata.kt +++ b/jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/muc/RoomMetadata.kt @@ -35,10 +35,7 @@ data class RoomMetadata( val metadata: Metadata? ) { @JsonIgnoreProperties(ignoreUnknown = true) - data class Metadata(val recording: Recording?, val visitors: Visitors?) { - @JsonIgnoreProperties(ignoreUnknown = true) - data class Recording(val isTranscribingEnabled: Boolean?) - + data class Metadata(val visitors: Visitors?) { @JsonIgnoreProperties(ignoreUnknown = true) data class Visitors(val live: Boolean?) } diff --git a/jicofo-common/src/test/kotlin/org/jitsi/jicofo/xmpp/muc/RoomMetadataTest.kt b/jicofo-common/src/test/kotlin/org/jitsi/jicofo/xmpp/muc/RoomMetadataTest.kt index 07079b1155..47f42f1a88 100644 --- a/jicofo-common/src/test/kotlin/org/jitsi/jicofo/xmpp/muc/RoomMetadataTest.kt +++ b/jicofo-common/src/test/kotlin/org/jitsi/jicofo/xmpp/muc/RoomMetadataTest.kt @@ -19,21 +19,20 @@ package org.jitsi.jicofo.xmpp.muc import io.kotest.assertions.throwables.shouldThrow import io.kotest.core.spec.style.ShouldSpec -import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.shouldBe import io.kotest.matchers.types.shouldBeInstanceOf class RoomMetadataTest : ShouldSpec() { init { context("Valid") { - context("With isTranscribingEnabled set") { + context("With visitors.live set") { val parsed = RoomMetadata.parse( """ { "type": "room_metadata", "metadata": { - "recording": { - "isTranscribingEnabled": true, + "visitors": { + "live": true, "anotherField": 123 }, "anotherField": {} @@ -42,9 +41,9 @@ class RoomMetadataTest : ShouldSpec() { """.trimIndent() ) parsed.shouldBeInstanceOf() - parsed.metadata!!.recording!!.isTranscribingEnabled shouldBe true + parsed.metadata!!.visitors!!.live shouldBe true } - context("With no recording included") { + context("With no visitors included") { val parsed = RoomMetadata.parse( """ @@ -60,8 +59,7 @@ class RoomMetadataTest : ShouldSpec() { """.trimIndent() ) parsed.shouldBeInstanceOf() - parsed.metadata.shouldNotBeNull() - parsed.metadata?.recording shouldBe null + parsed.metadata!!.visitors shouldBe null } } context("Invalid") { diff --git a/jicofo/src/main/java/org/jitsi/jicofo/conference/JitsiMeetConferenceImpl.java b/jicofo/src/main/java/org/jitsi/jicofo/conference/JitsiMeetConferenceImpl.java index d84a5b6508..415b1dcdcb 100644 --- a/jicofo/src/main/java/org/jitsi/jicofo/conference/JitsiMeetConferenceImpl.java +++ b/jicofo/src/main/java/org/jitsi/jicofo/conference/JitsiMeetConferenceImpl.java @@ -2402,11 +2402,6 @@ public void memberPresenceChanged(@NotNull ChatRoomMember member) { } - @Override - public void transcriptionRequestedChanged(boolean transcriptionRequested) - { - } - @Override public void numAudioSendersChanged(int numAudioSenders) { diff --git a/jicofo/src/main/kotlin/org/jitsi/jicofo/xmpp/Smack.kt b/jicofo/src/main/kotlin/org/jitsi/jicofo/xmpp/Smack.kt index 5aeeebea13..90eec11773 100644 --- a/jicofo/src/main/kotlin/org/jitsi/jicofo/xmpp/Smack.kt +++ b/jicofo/src/main/kotlin/org/jitsi/jicofo/xmpp/Smack.kt @@ -45,7 +45,6 @@ import org.jitsi.xmpp.extensions.jitsimeet.MuteIqProvider import org.jitsi.xmpp.extensions.jitsimeet.MuteVideoIqProvider import org.jitsi.xmpp.extensions.jitsimeet.StartMutedProvider import org.jitsi.xmpp.extensions.jitsimeet.StatsId -import org.jitsi.xmpp.extensions.jitsimeet.TranscriptionRequestExtension import org.jitsi.xmpp.extensions.jitsimeet.TranscriptionStatusExtension import org.jitsi.xmpp.extensions.jitsimeet.UserInfoPacketExt import org.jitsi.xmpp.extensions.jitsimeet.VideoMutedExtension @@ -109,12 +108,7 @@ fun registerXmppExtensions() { DefaultPacketExtensionProvider(JitsiParticipantCodecList::class.java) ) - // Add the extensions used for handling the inviting of transcriber - ProviderManager.addExtensionProvider( - TranscriptionRequestExtension.ELEMENT, - TranscriptionRequestExtension.NAMESPACE, - DefaultPacketExtensionProvider(TranscriptionRequestExtension::class.java) - ) + // The extension used for detecting a transcriber ProviderManager.addExtensionProvider( TranscriptionStatusExtension.ELEMENT, TranscriptionStatusExtension.NAMESPACE, @@ -146,11 +140,6 @@ fun registerXmppExtensions() { MuteIqProvider.registerMuteIqProvider() MuteVideoIqProvider.registerMuteVideoIqProvider() StartMutedProvider.registerStartMutedProvider() - ProviderManager.addExtensionProvider( - TranscriptionStatusExtension.ELEMENT, - TranscriptionStatusExtension.NAMESPACE, - DefaultPacketExtensionProvider(TranscriptionStatusExtension::class.java) - ) ProviderManager.addExtensionProvider( AudioMutedExtension.ELEMENT,