Merge pull request #14344 from nextcloud/bugfix/noid/allow-to-edit-bo…

…t-messages-in-one-to-one fix(chat): Allow to edit messages of bots in one-to-one conversations
nextcloud · Feb 11, 2025 · f9958b2 · f9958b2
2 parents 13776f6 + a3e3f28
commit f9958b2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/lib/Controller/ChatController.php b/lib/Controller/ChatController.php
@@ -989,7 +989,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)) {

diff --git a/src/composables/useMessageInfo.js b/src/composables/useMessageInfo.js
@@ -33,6 +33,7 @@ export function useMessageInfo(message = ref({})) {
 			isEditable: computed(() => false),
 			isDeleteable: computed(() => false),
 			isCurrentUserOwnMessage: computed(() => false),
+			isBotInOneToOne: computed(() => false),
 			isObjectShare: computed(() => false),
 			isConversationModifiable: computed(() => false),
 			isConversationReadOnly: computed(() => false),
@@ -57,10 +58,14 @@ export function useMessageInfo(message = ref({})) {
 		message.value.actorId === currentActorId
 		&& message.value.actorType === currentActorType
 	)
+	const isBotInOneToOne = computed(() =>
+		message.value.actorId.startsWith(ATTENDEE.BOT_PREFIX)
+		&& message.value.actorType === ATTENDEE.ACTOR_TYPE.BOTS
+	)
 
 	const isEditable = computed(() => {
 		if (!hasTalkFeature(message.value.token, 'edit-messages') || !isConversationModifiable.value || isObjectShare.value || message.value.systemMessage
-			|| ((!store.getters.isModerator || isOneToOneConversation.value) && !isCurrentUserOwnMessage.value)) {
+			|| ((!store.getters.isModerator || isOneToOneConversation.value) && !(isCurrentUserOwnMessage.value || isBotInOneToOne.value))) {
 			return false
 		}
 

diff --git a/src/constants.ts b/src/constants.ts
@@ -129,6 +129,7 @@ export const ATTENDEE = {
 		REMOTES: 'remotes',
 	},
 
+	BOT_PREFIX: 'bot-',
 	BRIDGE_BOT_ID: 'bridge-bot',
 
 	CHANGELOG_BOT_ID: 'changelog',