fix(chat): Allow to edit messages of bots in one-to-one conversations

Signed-off-by: Joas Schilling <[email protected]>

Author: nickvergessen

lib/Controller/ChatController.php

@@ -850,7 +850,11 @@ public function editMessage(int $messageId, string $message): DataResponse {
 
 		// Special case for if the message is a bridged message, then the message is the bridge bot's message.
 		$isOwnMessage = $isOwnMessage || ($comment->getActorType() === Attendee::ACTOR_BRIDGED && $attendee->getActorId() === MatterbridgeManager::BRIDGE_BOT_USERID);
-		if (!$isOwnMessage
+		$isBotInOneToOne = $comment->getActorType() === Attendee::ACTOR_BOTS
+			&& str_starts_with($comment->getActorId(), Attendee::ACTOR_BOT_PREFIX)
+			&& ($this->room->getType() === Room::TYPE_ONE_TO_ONE
+				|| $this->room->getType() === Room::TYPE_ONE_TO_ONE_FORMER);
+		if (!($isOwnMessage || $isBotInOneToOne)
 			&& (!$this->participant->hasModeratorPermissions(false)
 				|| $this->room->getType() === Room::TYPE_ONE_TO_ONE
 				|| $this->room->getType() === Room::TYPE_ONE_TO_ONE_FORMER)) {

src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue

@@ -523,7 +523,7 @@ export default {
 
 		isEditable() {
 			if (!canEditMessage || !this.isModifiable || this.isObjectShare
-					|| ((!this.$store.getters.isModerator || this.isOneToOne) && !this.isMyMsg)) {
+					|| ((!this.$store.getters.isModerator || this.isOneToOne) && !(this.isMyMsg || this.isBotInOneToOne))) {
 				return false
 			}
 
@@ -584,6 +584,12 @@ export default {
 				&& this.actorType === this.$store.getters.getActorType()
 		},
 
+		isBotInOneToOne() {
+			return this.actorId.startsWith(ATTENDEE.BOT_PREFIX)
+				&& this.actorType === ATTENDEE.ACTOR_TYPE.BOTS
+				&& this.isOneToOne
+		},
+
 		isConversationReadOnly() {
 			return this.conversation.readOnly === CONVERSATION.STATE.READ_ONLY
 		},

src/components/MessagesList/MessagesGroup/Message/MessagePart/MessageBody.vue

@@ -147,7 +147,7 @@ import Quote from '../../../../Quote.vue'
 import CallButton from '../../../../TopBar/CallButton.vue'
 
 import { useIsInCall } from '../../../../../composables/useIsInCall.js'
-import { CONVERSATION, PARTICIPANT } from '../../../../../constants.js'
+import { ATTENDEE, CONVERSATION, PARTICIPANT } from '../../../../../constants.js'
 import { EventBus } from '../../../../../services/EventBus.js'
 import { parseSpecialSymbols, parseMentions } from '../../../../../utils/textParse.ts'
 
@@ -329,14 +329,20 @@ export default {
 				&& this.actorType === this.$store.getters.getActorType()
 		},
 
+		isBotInOneToOne() {
+			return this.actorId.startsWith(ATTENDEE.BOT_PREFIX)
+				&& this.actorType === ATTENDEE.ACTOR_TYPE.BOTS
+				&& this.isOneToOne
+		},
+
 		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.isOneToOne) && !this.isMyMsg)) {
+				|| ((!this.$store.getters.isModerator || this.isOneToOne) && !(this.isMyMsg || this.isBotInOneToOne))) {
 				return false
 			}
 

src/constants.js

@@ -124,6 +124,7 @@ export const ATTENDEE = {
 		REMOTES: 'remotes',
 	},
 
+	BOT_PREFIX: 'bot-',
 	BRIDGE_BOT_ID: 'bridge-bot',
 
 	CHANGELOG_BOT_ID: 'changelog',