Skip to content

Commit

Permalink
fix: Fix detecting transcriber (the extension is not added on initial…
Browse files Browse the repository at this point in the history
… join).
  • Loading branch information
bgrozev committed Jan 14, 2025
1 parent 5803269 commit 5994826
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import org.jitsi.xmpp.extensions.jitsimeet.JitsiParticipantCodecList
import org.jitsi.xmpp.extensions.jitsimeet.JitsiParticipantRegionPacketExtension
import org.jitsi.xmpp.extensions.jitsimeet.StartMutedPacketExtension
import org.jitsi.xmpp.extensions.jitsimeet.StatsId
import org.jitsi.xmpp.extensions.jitsimeet.TranscriptionStatusExtension
import org.jitsi.xmpp.extensions.jitsimeet.VideoMutedExtension
import org.jivesoftware.smack.packet.Presence
import org.jivesoftware.smack.packet.StandardExtensionElement
Expand Down Expand Up @@ -162,9 +161,13 @@ class ChatRoomMemberImpl(
val jidTrusted = domain != null && XmppConfig.config.trustedDomains.contains(domain)
val jibriSignaled = features.featureExtensions.any { it.`var` == "http://jitsi.org/protocol/jibri" }
val jigasiSignaled = features.featureExtensions.any { it.`var` == "http://jitsi.org/protocol/jigasi" }
val transcriberSignaled = features.featureExtensions.any {
it.`var` == "http://jitsi.org/protocol/transcriber"
}

isJibri = jibriSignaled && jidTrusted
isJigasi = jigasiSignaled && jidTrusted
isTranscriber = transcriberSignaled && jidTrusted

if (jibriSignaled && !jidTrusted) {
logger.warn(
Expand All @@ -181,6 +184,7 @@ class ChatRoomMemberImpl(
} else {
isJigasi = false
isJibri = false
isTranscriber = false
}

var newRole: MemberRole = MemberRole.VISITOR
Expand All @@ -195,8 +199,6 @@ class ChatRoomMemberImpl(
role = newRole
}

isTranscriber = isJigasi && presence.getExtension(TranscriptionStatusExtension::class.java) != null

presence.getExtension(JitsiParticipantRegionPacketExtension::class.java)?.let {
region = it.regionId
}
Expand Down
8 changes: 0 additions & 8 deletions jicofo/src/main/kotlin/org/jitsi/jicofo/xmpp/Smack.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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.TranscriptionStatusExtension
import org.jitsi.xmpp.extensions.jitsimeet.UserInfoPacketExt
import org.jitsi.xmpp.extensions.jitsimeet.VideoMutedExtension
import org.jitsi.xmpp.extensions.rayo.RayoIqProvider
Expand Down Expand Up @@ -128,13 +127,6 @@ fun registerXmppExtensions() {
DefaultPacketExtensionProvider(JitsiParticipantCodecList::class.java)
)

// The extension used for detecting a transcriber
ProviderManager.addExtensionProvider(
TranscriptionStatusExtension.ELEMENT,
TranscriptionStatusExtension.NAMESPACE,
DefaultPacketExtensionProvider(TranscriptionStatusExtension::class.java)
)

// register Jingle
ProviderManager.addIQProvider(
JingleIQ.ELEMENT,
Expand Down

0 comments on commit 5994826

Please sign in to comment.