Merge pull request #12158 from nextcloud/fix/checkbox-in-one-to-one

fix(MessageBody): restrict checkbox editing in one-to-one conversation
nextcloud · Apr 19, 2024 · ac17e26 · ac17e26
2 parents f583ca5 + 08c34c4
commit ac17e26
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
@@ -519,9 +519,14 @@ export default {
 			return !this.isConversationReadOnly && this.conversation.participantType !== PARTICIPANT.TYPE.GUEST
 		},
 
+		isOneToOne() {
+			return this.conversation.type === CONVERSATION.TYPE.ONE_TO_ONE
+				|| this.conversation.type === CONVERSATION.TYPE.ONE_TO_ONE_FORMER
+		},
+
 		isEditable() {
 			if (!canEditMessage || !this.isModifiable || this.isObjectShare
-					|| (!this.$store.getters.isModerator && !this.isMyMsg)) {
+					|| ((!this.$store.getters.isModerator || this.isOneToOne) && !this.isMyMsg)) {
 				return false
 			}
 

diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/MessageBody.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/MessageBody.vue
@@ -320,9 +320,14 @@ export default {
 				&& this.actorType === this.$store.getters.getActorType()
 		},
 
+		isOneToOne() {
+			return this.conversation.type === CONVERSATION.TYPE.ONE_TO_ONE
+				|| this.conversation.type === CONVERSATION.TYPE.ONE_TO_ONE_FORMER
+		},
+
 		isEditable() {
 			if (!canEditMessage || !this.isModifiable || this.isObjectShare
-				|| (!this.$store.getters.isModerator && !this.isMyMsg)) {
+				|| ((!this.$store.getters.isModerator || this.isOneToOne) && !this.isMyMsg)) {
 				return false
 			}