diff --git a/src/components/ConversationSettings/ConversationSettingsDialog.vue b/src/components/ConversationSettings/ConversationSettingsDialog.vue index 5229f04799..bcc4818287 100644 --- a/src/components/ConversationSettings/ConversationSettingsDialog.vue +++ b/src/components/ConversationSettings/ConversationSettingsDialog.vue @@ -26,9 +26,7 @@ :open.sync="showSettings" :show-navigation="true" :container="container"> - - @@ -39,7 +37,8 @@ - @@ -138,6 +137,7 @@ import { useSettingsStore } from '../../stores/settings.js' const recordingEnabled = getCapabilities()?.spreed?.config?.call?.recording || false const recordingConsentCapability = getCapabilities()?.spreed?.features?.includes('recording-consent') const recordingConsent = getCapabilities()?.spreed?.config?.call?.['recording-consent'] !== CALL.RECORDING_CONSENT.OFF +const supportFederationV1 = getCapabilities()?.spreed?.features?.includes('federation-v1') export default { name: 'ConversationSettingsDialog', @@ -196,6 +196,10 @@ export default { || this.$store.getters.getToken() }, + showMediaSettingsToggle() { + return (!supportFederationV1 || !this.conversation.remoteServer) + }, + showMediaSettings() { return this.settingsStore.getShowMediaSettings(this.token) }, @@ -226,15 +230,6 @@ export default { return this.conversation.canLeaveConversation }, - showDescription() { - if (this.canFullModerate) { - return this.conversation.type !== CONVERSATION.TYPE.ONE_TO_ONE - && this.conversation.type !== CONVERSATION.TYPE.ONE_TO_ONE_FORMER - } else { - return this.description !== '' - } - }, - isBreakoutRoom() { return this.conversation.objectType === CONVERSATION.OBJECT_TYPE.BREAKOUT_ROOM }, diff --git a/src/components/ConversationSettings/NotificationsSettings.vue b/src/components/ConversationSettings/NotificationsSettings.vue index 2dd90508ba..22f402f8d2 100644 --- a/src/components/ConversationSettings/NotificationsSettings.vue +++ b/src/components/ConversationSettings/NotificationsSettings.vue @@ -38,7 +38,8 @@ - @@ -52,10 +53,14 @@ import Account from 'vue-material-design-icons/Account.vue' import VolumeHigh from 'vue-material-design-icons/VolumeHigh.vue' import VolumeOff from 'vue-material-design-icons/VolumeOff.vue' +import { getCapabilities } from '@nextcloud/capabilities' + import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js' import { PARTICIPANT } from '../../constants.js' +const supportFederationV1 = getCapabilities()?.spreed?.features?.includes('federation-v1') + const notificationLevels = [ { value: PARTICIPANT.NOTIFY.ALWAYS, label: t('spreed', 'All messages') }, { value: PARTICIPANT.NOTIFY.MENTION, label: t('spreed', '@-mentions only') }, @@ -89,6 +94,12 @@ export default { } }, + computed: { + showCallNotificationSettings() { + return (!supportFederationV1 || !this.conversation.remoteServer) + } + }, + methods: { notificationLevelIcon(value) { switch (value) {