Merge pull request #12992 from nextcloud/fix/12861/capabilities-adjust

fix(capabilities): minor adjustments for federation
nextcloud · Aug 15, 2024 · 1042403 · 1042403
2 parents 85b31b6 + 6e24d74
commit 1042403
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/components/LeftSidebar/LeftSidebar.vue b/src/components/LeftSidebar/LeftSidebar.vue
@@ -353,7 +353,7 @@ import CancelableRequest from '../../utils/cancelableRequest.js'
 import { hasUnreadMentions, filterFunction } from '../../utils/conversation.js'
 import { requestTabLeadership } from '../../utils/requestTabLeadership.js'
 
-const isFederationEnabled = loadState('spreed', 'federation_enabled')
+const isFederationEnabled = getTalkConfig('local', 'federation', 'enabled')
 const canModerateSipDialOut = hasTalkFeature('local', 'sip-support-dialout')
 	&& getTalkConfig('local', 'call', 'sip-enabled')
 	&& getTalkConfig('local', 'call', 'sip-dialout-enabled')
@@ -419,7 +419,6 @@ export default {
 			talkHashStore,
 			isMobile,
 			canModerateSipDialOut,
-			isFederationEnabled,
 			canNoteToSelf,
 		}
 	},

diff --git a/src/components/RightSidebar/Participants/ParticipantsTab.vue b/src/components/RightSidebar/Participants/ParticipantsTab.vue
@@ -67,7 +67,6 @@ import IconInformationOutline from 'vue-material-design-icons/InformationOutline
 
 import { showError } from '@nextcloud/dialogs'
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
-import { loadState } from '@nextcloud/initial-state'
 import { t } from '@nextcloud/l10n'
 
 import NcAppNavigationCaption from '@nextcloud/vue/dist/Components/NcAppNavigationCaption.js'
@@ -92,7 +91,7 @@ import { EventBus } from '../../../services/EventBus.js'
 import { addParticipant } from '../../../services/participantsService.js'
 import CancelableRequest from '../../../utils/cancelableRequest.js'
 
-const isFederationEnabled = loadState('spreed', 'federation_enabled')
+const isFederationEnabled = getTalkConfig('local', 'federation', 'enabled')
 
 export default {
 	name: 'ParticipantsTab',

diff --git a/src/services/CapabilitiesManager.ts b/src/services/CapabilitiesManager.ts
@@ -149,14 +149,20 @@ function restoreRemoteCapabilities(): RemoteCapabilities {
 
 	// Migration step for capabilities based on token
 	let hasMigrated = false
-	Object.keys(remoteCapabilities).forEach(key => {
+	const knownRemoteServers = Object.values(remoteTokenMap).filter(Boolean)
+
+	for (const key of Object.keys(remoteCapabilities)) {
+		if (knownRemoteServers.includes(key)) {
+			continue
+		}
 		const remoteServer = remoteTokenMap[key]
 		if (remoteServer) {
 			remoteCapabilities[remoteServer] = remoteCapabilities[key]
-			delete remoteCapabilities[key]
-			hasMigrated = true
 		}
-	})
+
+		delete remoteCapabilities[key]
+		hasMigrated = true
+	}
 	if (hasMigrated) {
 		BrowserStorage.setItem('remoteCapabilities', JSON.stringify(remoteCapabilities))
 	}