Merge pull request #13770 from nextcloud/fix/noid/archive-v2

Author: Antreesy

src/__mocks__/capabilities.ts

@@ -86,6 +86,7 @@ export const mockedCapabilities: Capabilities = {
 			'edit-messages-note-to-self',
 			'archived-conversations',
 			'talk-polls-drafts',
+			'archived-conversations-v2',
 		],
 		'features-local': [
 			'favorites',
@@ -98,6 +99,7 @@ export const mockedCapabilities: Capabilities = {
 			'remind-me-later',
 			'note-to-self',
 			'archived-conversations',
+			'archived-conversations-v2',
 		],
 		config: {
 			attachments: {

src/components/ConversationSettings/ConversationSettingsDialog.vue

@@ -132,7 +132,7 @@ import { CALL, CONFIG, PARTICIPANT, CONVERSATION } from '../../constants.js'
 import { getTalkConfig, hasTalkFeature } from '../../services/CapabilitiesManager.ts'
 import { useSettingsStore } from '../../stores/settings.js'
 
-const supportsArchive = hasTalkFeature('local', 'archived-conversations')
+const supportsArchive = hasTalkFeature('local', 'archived-conversations-v2')
 
 export default {
 	name: 'ConversationSettingsDialog',

src/components/ConversationSettings/DangerZone.vue

@@ -110,7 +110,7 @@ import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
 
 import { hasTalkFeature } from '../../services/CapabilitiesManager.ts'
 
-const supportsArchive = hasTalkFeature('local', 'archived-conversations')
+const supportsArchive = hasTalkFeature('local', 'archived-conversations-v2')
 
 export default {
 	name: 'DangerZone',

src/components/LeftSidebar/ConversationsList/Conversation.vue

@@ -178,7 +178,7 @@ import { PARTICIPANT } from '../../../constants.js'
 import { hasTalkFeature } from '../../../services/CapabilitiesManager.ts'
 import { copyConversationLinkToClipboard } from '../../../utils/handleUrl.ts'
 
-const supportsArchive = hasTalkFeature('local', 'archived-conversations')
+const supportsArchive = hasTalkFeature('local', 'archived-conversations-v2')
 
 export default {
 	name: 'Conversation',

src/components/LeftSidebar/LeftSidebar.vue

@@ -381,7 +381,7 @@ const canModerateSipDialOut = hasTalkFeature('local', 'sip-support-dialout')
 	&& getTalkConfig('local', 'call', 'sip-dialout-enabled')
 	&& getTalkConfig('local', 'call', 'can-enable-sip')
 const canNoteToSelf = hasTalkFeature('local', 'note-to-self')
-const supportsArchive = hasTalkFeature('local', 'archived-conversations')
+const supportsArchive = hasTalkFeature('local', 'archived-conversations-v2')
 
 export default {
 	name: 'LeftSidebar',

src/utils/conversation.js

@@ -5,7 +5,7 @@
 import { CONVERSATION, PARTICIPANT } from '../constants.js'
 import { hasTalkFeature } from '../services/CapabilitiesManager.ts'
 
-const supportsArchive = hasTalkFeature('local', 'archived-conversations')
+const supportsArchive = hasTalkFeature('local', 'archived-conversations-v2')
 
 /**
  * check if the conversation has unread messages