diff --git a/src/components/ConversationSettings/ConversationSettingsDialog.vue b/src/components/ConversationSettings/ConversationSettingsDialog.vue index 5e968b2861f..0cf92f17187 100644 --- a/src/components/ConversationSettings/ConversationSettingsDialog.vue +++ b/src/components/ConversationSettings/ConversationSettingsDialog.vue @@ -77,7 +77,7 @@ - @@ -104,6 +104,7 @@ diff --git a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue index f791aa823f7..4b8f32750c5 100644 --- a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue +++ b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue @@ -65,13 +65,12 @@ @@ -328,7 +378,7 @@ export default { &__actions-group { display: flex; gap: var(--default-grid-baseline); - + flex-grow: 1; } &__room { @@ -340,6 +390,10 @@ export default { } } +.right { + justify-content: right; +} + ::v-deep .app-navigation-entry__title { font-weight: bold !important; } diff --git a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.spec.js b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.spec.js index 64fa9fd9c74..aabd2170bda 100644 --- a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.spec.js +++ b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.spec.js @@ -10,8 +10,8 @@ import VideoIcon from 'vue-material-design-icons/Video.vue' import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js' import NcActionText from '@nextcloud/vue/dist/Components/NcActionText.js' -import Participant from './Participant.vue' import AvatarWrapper from '../../../../AvatarWrapper/AvatarWrapper.vue' +import Participant from './Participant.vue' import { ATTENDEE, PARTICIPANT } from '../../../../../constants.js' import storeConfig from '../../../../../store/storeConfig.js' diff --git a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue index df5c183a1f0..33083b56b3f 100644 --- a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue +++ b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue @@ -230,8 +230,8 @@ import NcActionSeparator from '@nextcloud/vue/dist/Components/NcActionSeparator. import NcActionText from '@nextcloud/vue/dist/Components/NcActionText.js' import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js' -import ParticipantPermissionsEditor from './ParticipantPermissionsEditor/ParticipantPermissionsEditor.vue' import AvatarWrapper from '../../../../AvatarWrapper/AvatarWrapper.vue' +import ParticipantPermissionsEditor from './ParticipantPermissionsEditor/ParticipantPermissionsEditor.vue' import { CONVERSATION, PARTICIPANT, ATTENDEE } from '../../../../../constants.js' import readableNumber from '../../../../../mixins/readableNumber.js' diff --git a/src/components/RightSidebar/Participants/ParticipantsList/Participant/ParticipantPermissionsEditor/ParticipantPermissionsEditor.spec.js b/src/components/RightSidebar/Participants/ParticipantsList/Participant/ParticipantPermissionsEditor/ParticipantPermissionsEditor.spec.js index c35c2a19e7a..bbeeae5eeaf 100644 --- a/src/components/RightSidebar/Participants/ParticipantsList/Participant/ParticipantPermissionsEditor/ParticipantPermissionsEditor.spec.js +++ b/src/components/RightSidebar/Participants/ParticipantsList/Participant/ParticipantPermissionsEditor/ParticipantPermissionsEditor.spec.js @@ -2,8 +2,8 @@ import { createLocalVue, mount } from '@vue/test-utils' import { cloneDeep } from 'lodash' import Vuex from 'vuex' -import ParticipantPermissionsEditor from './ParticipantPermissionsEditor.vue' import PermissionsEditor from '../../../../../PermissionsEditor/PermissionsEditor.vue' +import ParticipantPermissionsEditor from './ParticipantPermissionsEditor.vue' import { PARTICIPANT, ATTENDEE } from '../../../../../../constants.js' import storeConfig from '../../../../../../store/storeConfig.js' diff --git a/src/components/RightSidebar/Participants/ParticipantsTab.vue b/src/components/RightSidebar/Participants/ParticipantsTab.vue index 2031d5fa418..e9b1fc3e5de 100644 --- a/src/components/RightSidebar/Participants/ParticipantsTab.vue +++ b/src/components/RightSidebar/Participants/ParticipantsTab.vue @@ -48,9 +48,9 @@ import { loadState } from '@nextcloud/initial-state' import NcAppNavigationCaption from '@nextcloud/vue/dist/Components/NcAppNavigationCaption.js' +import SearchBox from '../../LeftSidebar/SearchBox/SearchBox.vue' import CurrentParticipants from './CurrentParticipants/CurrentParticipants.vue' import ParticipantsSearchResults from './ParticipantsSearchResults/ParticipantsSearchResults.vue' -import SearchBox from '../../LeftSidebar/SearchBox/SearchBox.vue' import getParticipants from '../../../mixins/getParticipants.js' import { searchPossibleConversations } from '../../../services/conversationsService.js' diff --git a/src/components/RightSidebar/RightSidebar.vue b/src/components/RightSidebar/RightSidebar.vue index 65bf295d7ab..922c899a3f4 100644 --- a/src/components/RightSidebar/RightSidebar.vue +++ b/src/components/RightSidebar/RightSidebar.vue @@ -120,13 +120,13 @@ import NcAppSidebar from '@nextcloud/vue/dist/Components/NcAppSidebar.js' import NcAppSidebarTab from '@nextcloud/vue/dist/Components/NcAppSidebarTab.js' import NcButton from '@nextcloud/vue/dist/Components/NcButton.js' +import ChatView from '../ChatView.vue' +import SetGuestUsername from '../SetGuestUsername.vue' import BreakoutRoomsTab from './BreakoutRooms/BreakoutRoomsTab.vue' import LobbyStatus from './LobbyStatus.vue' import ParticipantsTab from './Participants/ParticipantsTab.vue' import SharedItemsTab from './SharedItems/SharedItemsTab.vue' import SipSettings from './SipSettings.vue' -import ChatView from '../ChatView.vue' -import SetGuestUsername from '../SetGuestUsername.vue' import { CONVERSATION, WEBINAR, PARTICIPANT } from '../../constants.js' import isInLobby from '../../mixins/isInLobby.js' @@ -268,7 +268,9 @@ export default { }, showBreakoutRoomsTab() { - return this.getUserId && !this.isOneToOne && this.breakoutRoomsConfigured + return this.getUserId + && !this.isOneToOne + && (this.breakoutRoomsConfigured || this.conversation.breakoutRoomMode === CONVERSATION.BREAKOUT_ROOM_MODE.FREE || this.conversation.objectType === 'room') }, breakoutRoomsText() { diff --git a/src/components/TopBar/CallButton.vue b/src/components/TopBar/CallButton.vue index c6b1f9519b9..14bf09d1702 100644 --- a/src/components/TopBar/CallButton.vue +++ b/src/components/TopBar/CallButton.vue @@ -338,23 +338,9 @@ export default { async switchToParentRoom() { const parentRoomToken = this.$store.getters.parentRoomToken(this.token) - if (this.canModerate) { - EventBus.$emit('switch-to-conversation', { - token: parentRoomToken, - }) - } else { - try { - await this.$store.dispatch('switchToBreakoutRoomAction', { - token: this.token, - target: parentRoomToken, - }) - EventBus.$emit('switch-to-conversation', { - token: parentRoomToken, - }) - } catch (error) { - console.debug(error) - } - } + EventBus.$emit('switch-to-conversation', { + token: parentRoomToken, + }) }, }, } diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue index af97072920c..bdc2babccc4 100644 --- a/src/components/TopBar/TopBar.vue +++ b/src/components/TopBar/TopBar.vue @@ -148,12 +148,12 @@ import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js' import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js' import richEditor from '@nextcloud/vue/dist/Mixins/richEditor.js' -import CallButton from './CallButton.vue' -import CallTime from './CallTime.vue' -import TopBarMenu from './TopBarMenu.vue' import BreakoutRoomsEditor from '../BreakoutRoomsEditor/BreakoutRoomsEditor.vue' import LocalMediaControls from '../CallView/shared/LocalMediaControls.vue' import ConversationIcon from '../ConversationIcon.vue' +import CallButton from './CallButton.vue' +import CallTime from './CallTime.vue' +import TopBarMenu from './TopBarMenu.vue' import { CONVERSATION } from '../../constants.js' import getParticipants from '../../mixins/getParticipants.js' diff --git a/src/components/TopBar/TopBarMenu.vue b/src/components/TopBar/TopBarMenu.vue index c16890daf00..9b0751ae50e 100644 --- a/src/components/TopBar/TopBarMenu.vue +++ b/src/components/TopBar/TopBarMenu.vue @@ -372,7 +372,7 @@ export default { if (!this.conversation.type === CONVERSATION.TYPE.GROUP || !this.canFullModerate) { return false } - + const breakoutRoomsEnabled = getCapabilities()?.spreed?.config?.call?.['breakout-rooms'] return !!breakoutRoomsEnabled }, diff --git a/src/mixins/getParticipants.js b/src/mixins/getParticipants.js index 8d20ac2b97c..e39c7f8aed2 100644 --- a/src/mixins/getParticipants.js +++ b/src/mixins/getParticipants.js @@ -28,11 +28,11 @@ import Axios from '@nextcloud/axios' import { showError } from '@nextcloud/dialogs' import { emit } from '@nextcloud/event-bus' -import isInLobby from './isInLobby.js' import { PARTICIPANT } from '../constants.js' import { EventBus } from '../services/EventBus.js' import { fetchParticipants } from '../services/participantsService.js' import CancelableRequest from '../utils/cancelableRequest.js' +import isInLobby from './isInLobby.js' const getParticipants = { diff --git a/src/services/conversationsService.spec.js b/src/services/conversationsService.spec.js index 7e7c36ff1e5..007646a694c 100644 --- a/src/services/conversationsService.spec.js +++ b/src/services/conversationsService.spec.js @@ -1,9 +1,9 @@ import { loadState } from '@nextcloud/initial-state' import { generateOcsUrl } from '@nextcloud/router' -import { searchPossibleConversations } from './conversationsService.js' import mockAxios from '../__mocks__/axios.js' import { SHARE } from '../constants.js' +import { searchPossibleConversations } from './conversationsService.js' jest.mock('@nextcloud/initial-state', () => ({ loadState: jest.fn(), diff --git a/src/services/filesSharingServices.spec.js b/src/services/filesSharingServices.spec.js index c5eed2bed6b..d41e77b8bb5 100644 --- a/src/services/filesSharingServices.spec.js +++ b/src/services/filesSharingServices.spec.js @@ -1,7 +1,7 @@ import { generateOcsUrl } from '@nextcloud/router' -import { shareFile } from './filesSharingServices.js' import mockAxios from '../__mocks__/axios.js' +import { shareFile } from './filesSharingServices.js' describe('filesSharingServices', () => { afterEach(() => { diff --git a/src/services/messagesService.spec.js b/src/services/messagesService.spec.js index eb36397999a..2828e0d07e6 100644 --- a/src/services/messagesService.spec.js +++ b/src/services/messagesService.spec.js @@ -1,5 +1,6 @@ import { generateOcsUrl } from '@nextcloud/router' +import mockAxios from '../__mocks__/axios.js' import { fetchMessages, lookForNewMessages, @@ -8,7 +9,6 @@ import { postRichObjectToConversation, updateLastReadMessage, } from './messagesService.js' -import mockAxios from '../__mocks__/axios.js' describe('messagesService', () => { afterEach(() => { diff --git a/src/store/actorStore.spec.js b/src/store/actorStore.spec.js index f158389e085..4b9915bf9e3 100644 --- a/src/store/actorStore.spec.js +++ b/src/store/actorStore.spec.js @@ -2,8 +2,8 @@ import { createLocalVue } from '@vue/test-utils' import { cloneDeep } from 'lodash' import Vuex from 'vuex' -import actorStore from './actorStore.js' import { PARTICIPANT } from '../constants.js' +import actorStore from './actorStore.js' describe('actorStore', () => { let localVue = null diff --git a/src/store/callViewStore.spec.js b/src/store/callViewStore.spec.js index 6c8e55d9415..291347f5b7f 100644 --- a/src/store/callViewStore.spec.js +++ b/src/store/callViewStore.spec.js @@ -2,10 +2,10 @@ import { createLocalVue } from '@vue/test-utils' import { cloneDeep } from 'lodash' import Vuex from 'vuex' -import storeConfig from './storeConfig.js' import { CONVERSATION, } from '../constants.js' +import storeConfig from './storeConfig.js' describe('callViewStore', () => { let localVue = null diff --git a/src/store/conversationsStore.spec.js b/src/store/conversationsStore.spec.js index 6e2306462ba..741fd6c6f5b 100644 --- a/src/store/conversationsStore.spec.js +++ b/src/store/conversationsStore.spec.js @@ -2,7 +2,6 @@ import { createLocalVue } from '@vue/test-utils' import { cloneDeep } from 'lodash' import Vuex from 'vuex' -import storeConfig from './storeConfig.js' import { CONVERSATION, WEBINAR, @@ -28,6 +27,7 @@ import { setConversationPermissions, setCallPermissions, } from '../services/conversationsService.js' +import storeConfig from './storeConfig.js' jest.mock('../services/conversationsService', () => ({ makePublic: jest.fn(), diff --git a/src/store/fileUploadStore.spec.js b/src/store/fileUploadStore.spec.js index 89eb508f6b4..ed8c919bb1e 100644 --- a/src/store/fileUploadStore.spec.js +++ b/src/store/fileUploadStore.spec.js @@ -5,11 +5,11 @@ import Vuex from 'vuex' import { showError } from '@nextcloud/dialogs' -import fileUploadStore from './fileUploadStore.js' import client from '../services/DavClient.js' import { shareFile } from '../services/filesSharingServices.js' import { setAttachmentFolder } from '../services/settingsService.js' import { findUniquePath, getFileExtension } from '../utils/fileUpload.js' +import fileUploadStore from './fileUploadStore.js' jest.mock('../services/DavClient') jest.mock('../utils/fileUpload', () => ({ diff --git a/src/store/messagesStore.spec.js b/src/store/messagesStore.spec.js index d4b25df4bb9..f17a45a7c4a 100644 --- a/src/store/messagesStore.spec.js +++ b/src/store/messagesStore.spec.js @@ -5,7 +5,6 @@ import Vuex from 'vuex' import { showError } from '@nextcloud/dialogs' -import messagesStore from './messagesStore.js' import { ATTENDEE, } from '../constants.js' @@ -17,6 +16,7 @@ import { postNewMessage, } from '../services/messagesService.js' import CancelableRequest from '../utils/cancelableRequest.js' +import messagesStore from './messagesStore.js' jest.mock('../services/messagesService', () => ({ deleteMessage: jest.fn(), diff --git a/src/store/participantsStore.spec.js b/src/store/participantsStore.spec.js index 7d752f488a7..f3c0cfe373c 100644 --- a/src/store/participantsStore.spec.js +++ b/src/store/participantsStore.spec.js @@ -3,7 +3,6 @@ import mockConsole from 'jest-mock-console' import { cloneDeep } from 'lodash' import Vuex from 'vuex' -import participantsStore from './participantsStore.js' import { PARTICIPANT } from '../constants.js' import { joinCall, @@ -21,6 +20,7 @@ import { grantAllPermissionsToParticipant, removeAllPermissionsFromParticipant, } from '../services/participantsService.js' +import participantsStore from './participantsStore.js' jest.mock('../services/participantsService', () => ({ promoteToModerator: jest.fn(), diff --git a/src/utils/media/pipeline/MediaDevicesSource.js b/src/utils/media/pipeline/MediaDevicesSource.js index e3160f44c99..af044d7257d 100644 --- a/src/utils/media/pipeline/MediaDevicesSource.js +++ b/src/utils/media/pipeline/MediaDevicesSource.js @@ -21,8 +21,8 @@ import UAParser from 'ua-parser-js' -import TrackSource from './TrackSource.js' import { mediaDevicesManager } from '../../webrtc/index.js' +import TrackSource from './TrackSource.js' /** * Source node to get audio and video tracks from MediaDevicesManager. diff --git a/src/utils/media/pipeline/MediaDevicesSource.spec.js b/src/utils/media/pipeline/MediaDevicesSource.spec.js index b3901e50c7a..ec3fdf1d808 100644 --- a/src/utils/media/pipeline/MediaDevicesSource.spec.js +++ b/src/utils/media/pipeline/MediaDevicesSource.spec.js @@ -19,8 +19,8 @@ * */ -import MediaDevicesSource from './MediaDevicesSource.js' import { mediaDevicesManager } from '../../webrtc/index.js' +import MediaDevicesSource from './MediaDevicesSource.js' /** * Helper function to create MediaStreamTrack mocks with just the attributes and diff --git a/src/utils/media/pipeline/SpeakingMonitor.js b/src/utils/media/pipeline/SpeakingMonitor.js index e5b07a6adac..381e9859f8d 100644 --- a/src/utils/media/pipeline/SpeakingMonitor.js +++ b/src/utils/media/pipeline/SpeakingMonitor.js @@ -21,8 +21,8 @@ import hark from 'hark' -import TrackSink from './TrackSink.js' import EmitterMixin from '../../EmitterMixin.js' +import TrackSink from './TrackSink.js' /** * Sink node to detect sound in its input track and emit "speaking" events. diff --git a/src/utils/media/pipeline/TrackSinkSource.js b/src/utils/media/pipeline/TrackSinkSource.js index 5aaecc2bafe..fa9c9d84a35 100644 --- a/src/utils/media/pipeline/TrackSinkSource.js +++ b/src/utils/media/pipeline/TrackSinkSource.js @@ -19,9 +19,9 @@ * */ +import EmitterMixin from '../../EmitterMixin.js' import TrackSinkMixin from './TrackSinkMixin.js' import TrackSourceMixin from './TrackSourceMixin.js' -import EmitterMixin from '../../EmitterMixin.js' /** * Base class for nodes that act both as a sink and as a source (a processing diff --git a/src/utils/media/pipeline/TrackSource.js b/src/utils/media/pipeline/TrackSource.js index 174f86382f1..a61d3736580 100644 --- a/src/utils/media/pipeline/TrackSource.js +++ b/src/utils/media/pipeline/TrackSource.js @@ -19,8 +19,8 @@ * */ -import TrackSourceMixin from './TrackSourceMixin.js' import EmitterMixin from '../../EmitterMixin.js' +import TrackSourceMixin from './TrackSourceMixin.js' /** * Base class for source nodes of tracks. diff --git a/src/utils/media/pipeline/TrackToStream.js b/src/utils/media/pipeline/TrackToStream.js index 4b2b6fa780c..ef8c06b1771 100644 --- a/src/utils/media/pipeline/TrackToStream.js +++ b/src/utils/media/pipeline/TrackToStream.js @@ -19,8 +19,8 @@ * */ -import TrackSink from './TrackSink.js' import EmitterMixin from '../../EmitterMixin.js' +import TrackSink from './TrackSink.js' /** * Sink node to add one or more tracks to a single stream. diff --git a/src/utils/media/pipeline/VirtualBackground.js b/src/utils/media/pipeline/VirtualBackground.js index 2b361c55fa5..95077f8ae0f 100644 --- a/src/utils/media/pipeline/VirtualBackground.js +++ b/src/utils/media/pipeline/VirtualBackground.js @@ -21,9 +21,9 @@ * */ -import TrackSinkSource from './TrackSinkSource.js' import { VIRTUAL_BACKGROUND_TYPE } from '../effects/virtual-background/constants.js' import JitsiStreamBackgroundEffect from '../effects/virtual-background/JitsiStreamBackgroundEffect.js' +import TrackSinkSource from './TrackSinkSource.js' /** * Processor node to set a virtual background on a video track. diff --git a/src/utils/signaling.js b/src/utils/signaling.js index ff0878c4fef..cf3064145fe 100644 --- a/src/utils/signaling.js +++ b/src/utils/signaling.js @@ -43,10 +43,10 @@ import { generateUrl, } from '@nextcloud/router' -import CancelableRequest from './cancelableRequest.js' import { EventBus } from '../services/EventBus.js' import { rejoinConversation } from '../services/participantsService.js' import { pullSignalingMessages } from '../services/signalingService.js' +import CancelableRequest from './cancelableRequest.js' const Signaling = { Base: {}, diff --git a/src/utils/webrtc/analyzers/CallAnalyzer.js b/src/utils/webrtc/analyzers/CallAnalyzer.js index 84f04ea8c27..5056553daa0 100644 --- a/src/utils/webrtc/analyzers/CallAnalyzer.js +++ b/src/utils/webrtc/analyzers/CallAnalyzer.js @@ -19,10 +19,10 @@ * */ +import EmitterMixin from '../../EmitterMixin.js' import { ParticipantAnalyzer, } from './ParticipantAnalyzer.js' -import EmitterMixin from '../../EmitterMixin.js' /** * Analyzer for the quality of the connections of a call. diff --git a/src/utils/webrtc/analyzers/ParticipantAnalyzer.js b/src/utils/webrtc/analyzers/ParticipantAnalyzer.js index 9f3fbd92d11..7635eac5daf 100644 --- a/src/utils/webrtc/analyzers/ParticipantAnalyzer.js +++ b/src/utils/webrtc/analyzers/ParticipantAnalyzer.js @@ -19,11 +19,11 @@ * */ +import EmitterMixin from '../../EmitterMixin.js' import { PEER_DIRECTION, PeerConnectionAnalyzer, } from './PeerConnectionAnalyzer.js' -import EmitterMixin from '../../EmitterMixin.js' /** * Analyzer for the quality of the connections of a Participant. diff --git a/src/utils/webrtc/analyzers/PeerConnectionAnalyzer.js b/src/utils/webrtc/analyzers/PeerConnectionAnalyzer.js index 53431680679..d4b7a8734ab 100644 --- a/src/utils/webrtc/analyzers/PeerConnectionAnalyzer.js +++ b/src/utils/webrtc/analyzers/PeerConnectionAnalyzer.js @@ -19,11 +19,11 @@ * */ +import EmitterMixin from '../../EmitterMixin.js' import { STAT_VALUE_TYPE, AverageStatValue, } from './AverageStatValue.js' -import EmitterMixin from '../../EmitterMixin.js' const CONNECTION_QUALITY = { UNKNOWN: 0, diff --git a/src/utils/webrtc/models/CallParticipantCollection.js b/src/utils/webrtc/models/CallParticipantCollection.js index c2779806ef9..dd8c67d8b23 100644 --- a/src/utils/webrtc/models/CallParticipantCollection.js +++ b/src/utils/webrtc/models/CallParticipantCollection.js @@ -19,8 +19,8 @@ * */ -import CallParticipantModel from './CallParticipantModel.js' import EmitterMixin from '../../EmitterMixin.js' +import CallParticipantModel from './CallParticipantModel.js' /** * diff --git a/src/utils/webrtc/models/LocalCallParticipantModel.js b/src/utils/webrtc/models/LocalCallParticipantModel.js index 56249ae4b87..12e3969490f 100644 --- a/src/utils/webrtc/models/LocalCallParticipantModel.js +++ b/src/utils/webrtc/models/LocalCallParticipantModel.js @@ -19,9 +19,9 @@ * */ -import { ConnectionState } from './CallParticipantModel.js' import store from '../../../store/index.js' import EmitterMixin from '../../EmitterMixin.js' +import { ConnectionState } from './CallParticipantModel.js' /** * diff --git a/src/utils/webrtc/simplewebrtc/localmedia.js b/src/utils/webrtc/simplewebrtc/localmedia.js index d4d53b3258b..9c9e3294416 100644 --- a/src/utils/webrtc/simplewebrtc/localmedia.js +++ b/src/utils/webrtc/simplewebrtc/localmedia.js @@ -5,7 +5,6 @@ const util = require('util') const mockconsole = require('mockconsole') const WildEmitter = require('wildemitter') -const getScreenMedia = require('./getscreenmedia.js') // Only mediaDevicesManager is used, but it can not be assigned here due to not // being initialized yet. const BlackVideoEnforcer = require('../../media/pipeline/BlackVideoEnforcer.js').default @@ -16,6 +15,7 @@ const TrackEnabler = require('../../media/pipeline/TrackEnabler.js').default const TrackToStream = require('../../media/pipeline/TrackToStream.js').default const VirtualBackground = require('../../media/pipeline/VirtualBackground.js').default const webrtcIndex = require('../index.js') +const getScreenMedia = require('./getscreenmedia.js') /** * @param {object} opts the options object. diff --git a/src/utils/webrtc/webrtc.js b/src/utils/webrtc/webrtc.js index 8329589b364..b5a45d34183 100644 --- a/src/utils/webrtc/webrtc.js +++ b/src/utils/webrtc/webrtc.js @@ -38,10 +38,10 @@ import { TOAST_DEFAULT_TIMEOUT, } from '@nextcloud/dialogs' -import SimpleWebRTC from './simplewebrtc/simplewebrtc.js' import { PARTICIPANT } from '../../constants.js' import store from '../../store/index.js' import { Sounds } from '../sounds.js' +import SimpleWebRTC from './simplewebrtc/simplewebrtc.js' let webrtc const spreedPeerConnectionTable = []