Open source video conferencing app powered by LiveKit. Built with Django and React.
♻️(frontend) sync publishing sources with Django backend settings
lebaudantoine3e69a2380f0a
diff --git a/src/backend/core/api/__init__.py b/src/backend/core/api/__init__.pyindex 45bfaf6b..cee68ac7 100644--- a/src/backend/core/api/__init__.py+++ b/src/backend/core/api/__init__.py@@ -55,6 +55,7 @@ def get_frontend_configuration(request):"url": settings.LIVEKIT_CONFIGURATION["url"],"force_wss_protocol": settings.LIVEKIT_FORCE_WSS_PROTOCOL,"enable_firefox_proxy_workaround": settings.LIVEKIT_ENABLE_FIREFOX_PROXY_WORKAROUND,+ "default_sources": settings.LIVEKIT_DEFAULT_SOURCES,},}frontend_configuration.update(settings.FRONTEND_CONFIGURATION)diff --git a/src/frontend/src/api/useConfig.ts b/src/frontend/src/api/useConfig.tsindex e64bd02e..d9047c1c 100644--- a/src/frontend/src/api/useConfig.ts+++ b/src/frontend/src/api/useConfig.ts@@ -44,6 +44,7 @@ export interface ApiConfig {url: stringforce_wss_protocol: booleanenable_firefox_proxy_workaround: boolean+ default_sources: string[]}}diff --git a/src/frontend/src/features/rooms/livekit/hooks/usePublishSourcesManager.ts b/src/frontend/src/features/rooms/livekit/hooks/usePublishSourcesManager.tsindex 5fe4b707..e14f70d0 100644--- a/src/frontend/src/features/rooms/livekit/hooks/usePublishSourcesManager.ts+++ b/src/frontend/src/features/rooms/livekit/hooks/usePublishSourcesManager.ts@@ -2,6 +2,7 @@ import { Track } from 'livekit-client'import { useCallback, useMemo } from 'react'import { queryClient } from '@/api/queryClient'import { keys } from '@/api/queryKeys'+import { useConfig } from '@/api/useConfig'import { usePatchRoom } from '@/features/rooms/api/patchRoom'import { useRemoteParticipants } from '@livekit/components-react'import { useUpdateParticipantsPermissions } from '@/features/rooms/api/updateParticipantsPermissions'@@ -9,14 +10,6 @@ import { useRoomData } from '@/features/rooms/livekit/hooks/useRoomData'import { isSubsetOf } from '@/features/rooms/utils/isSubsetOf'import Source = Track.Source-// todo - synchronisation with backend-export const DEFAULT_PUBLISH_SOURCES: Array<Source> = [- Source.Microphone,- Source.Camera,- Source.ScreenShare,- Source.ScreenShareAudio,-]-export const updatePublishSources = (currentSources: Source[],sources: Source[],@@ -36,8 +29,13 @@ export const usePublishSourcesManager = () => {const { mutateAsync: patchRoom } = usePatchRoom()const data = useRoomData()+ const { data: configData } = useConfig()const configuration = data?.configuration+ const defaultSources = configData?.livekit?.default_sources?.map((source) => {+ return source as Source+ })+// The name can be misleading—use the slug instead to ensure the correct React Query key is updated.const roomId = data?.slug@@ -51,16 +49,16 @@ export const usePublishSourcesManager = () => {configuration?.can_publish_sources == undefined ||!Array.isArray(configuration?.can_publish_sources)) {- return DEFAULT_PUBLISH_SOURCES+ return defaultSources}return configuration.can_publish_sources.map((source) => {return source as Source})- }, [configuration?.can_publish_sources])+ }, [defaultSources, configuration?.can_publish_sources])const updateSource = useCallback(async (sources: Source[], enabled: boolean) => {- if (!roomId) return+ if (!roomId || currentSources == undefined) returntry {const newSources = updatePublishSources(