From 13a3a594e205707c68e0d64528acf324dc643837 Mon Sep 17 00:00:00 2001
From: DorraJaouad <dorra.jaoued7@gmail.com>
Date: Thu, 11 Jan 2024 14:08:14 +0100
Subject: [PATCH 1/9] Implement base edit function

Signed-off-by: DorraJaouad <dorra.jaoued7@gmail.com>
---
 .../MessagesGroup/Message/Message.vue         | 10 +++
 .../MessageButtonsBar/MessageButtonsBar.vue   | 16 ++++-
 src/components/MessagesList/MessagesList.vue  |  1 +
 src/components/NewMessage/NewMessage.vue      | 68 ++++++++++++++++++-
 src/components/Quote.vue                      | 18 ++++-
 src/services/messagesService.js               |  7 ++
 src/store/messagesStore.js                    | 13 ++++
 src/stores/chatExtras.js                      | 21 +++++-
 8 files changed, 146 insertions(+), 8 deletions(-)

diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue
index 98a649ab6bf..81c8d719878 100644
--- a/src/components/MessagesList/MessagesGroup/Message/Message.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue
@@ -178,6 +178,7 @@ the main body of the message as well as a quote.
 				:sent-icon-tooltip="sentIconTooltip"
 				@show-translate-dialog="isTranslateDialogOpen = true"
 				@reply="handleReply"
+				@edit="handleEdit"
 				@delete="handleDelete" />
 			<div v-else-if="showCombinedSystemMessageToggle"
 				class="message-buttons-bar">
@@ -756,6 +757,15 @@ export default {
 			EventBus.$emit('focus-chat-input')
 		},
 
+		handleEdit() {
+			this.chatExtrasStore.setMessageIdToEdit({
+				token: this.token,
+				message: this.message,
+				id: this.id
+			})
+			EventBus.$emit('focus-chat-input')
+		},
+
 		async handleDelete() {
 			this.isDeleting = true
 			try {
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
index 56f85102d7f..a56a336ac64 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
@@ -83,6 +83,14 @@
 						</template>
 						{{ t('spreed', 'Reply privately') }}
 					</NcActionButton>
+					<NcActionButton :aria-label="t('spreed', 'Edit message')"
+						close-after-click
+						@click.stop="editMessage">
+						<template #icon>
+							<Pencil :size="20" />
+						</template>
+						{{ t('spreed', 'Edit message') }}
+					</NcActionButton>
 					<NcActionButton v-if="!isFileShareOnly"
 						close-after-click
 						@click.stop="handleCopyMessageText">
@@ -267,6 +275,7 @@ import EyeOffOutline from 'vue-material-design-icons/EyeOffOutline.vue'
 import File from 'vue-material-design-icons/File.vue'
 import Note from 'vue-material-design-icons/NoteEditOutline.vue'
 import OpenInNewIcon from 'vue-material-design-icons/OpenInNew.vue'
+import Pencil from 'vue-material-design-icons/Pencil.vue'
 import Plus from 'vue-material-design-icons/Plus.vue'
 import Reply from 'vue-material-design-icons/Reply.vue'
 import Share from 'vue-material-design-icons/Share.vue'
@@ -323,6 +332,7 @@ export default {
 		File,
 		Note,
 		OpenInNewIcon,
+		Pencil,
 		Plus,
 		Reply,
 		Share,
@@ -447,7 +457,7 @@ export default {
 		},
 	},
 
-	emits: ['delete', 'update:isActionMenuOpen', 'update:isEmojiPickerOpen', 'update:isReactionsMenuOpen', 'update:isForwarderOpen', 'show-translate-dialog', 'reply'],
+	emits: ['delete', 'update:isActionMenuOpen', 'update:isEmojiPickerOpen', 'update:isReactionsMenuOpen', 'update:isForwarderOpen', 'show-translate-dialog', 'reply', 'edit'],
 
 	setup() {
 		const reactionsStore = useReactionsStore()
@@ -791,6 +801,10 @@ export default {
 		setCustomReminder() {
 			this.setReminder(this.customReminderDateTime.valueOf())
 		},
+
+		editMessage() {
+			this.$emit('edit')
+		},
 	},
 }
 </script>
diff --git a/src/components/MessagesList/MessagesList.vue b/src/components/MessagesList/MessagesList.vue
index e0896d93536..f7ae0c67840 100644
--- a/src/components/MessagesList/MessagesList.vue
+++ b/src/components/MessagesList/MessagesList.vue
@@ -356,6 +356,7 @@ export default {
 
 		areGroupsIdentical(group1, group2) {
 			if (group1.messages.length !== group2.messages.length
+				|| JSON.stringify(group1.messages) !== JSON.stringify(group2.messages)
 				|| group1.dateSeparator !== group2.dateSeparator
 				|| group1.previousMessageId !== group2.previousMessageId
 				|| group1.nextMessageId !== group2.nextMessageId) {
diff --git a/src/components/NewMessage/NewMessage.vue b/src/components/NewMessage/NewMessage.vue
index ac2fd014e4e..2b5f420f3e9 100644
--- a/src/components/NewMessage/NewMessage.vue
+++ b/src/components/NewMessage/NewMessage.vue
@@ -82,8 +82,8 @@
 						</template>
 					</NcButton>
 				</div>
-				<div v-if="parentMessage" class="new-message-form__quote">
-					<Quote is-new-message-quote v-bind="parentMessage" />
+				<div v-if="parentMessage || messageToEdit" class="new-message-form__quote">
+					<Quote is-new-message-quote :edit-message="!!messageToEdit" v-bind="messageToEdit ?? parentMessage" />
 				</div>
 				<NcRichContenteditable ref="richContenteditable"
 					v-shortkey.once="$options.disableKeyboardShortcuts ? null : ['c']"
@@ -110,6 +110,19 @@
 				@recording="handleRecording"
 				@audio-file="handleAudioFile" />
 
+			<!-- Edit -->
+			<NcButton v-else-if="messageToEdit"
+				:disabled="disabled"
+				type="tertiary"
+				native-type="submit"
+				:title="t('spreed', 'Edit message')"
+				:aria-label="t('spreed', 'Edit message')"
+				@click="handleEdit">
+				<template #icon>
+					<CheckBold :size="16" />
+				</template>
+			</NcButton>
+
 			<!-- Send buttons -->
 			<template v-else>
 				<NcActions v-if="!broadcast"
@@ -163,6 +176,7 @@
 
 <script>
 import BellOff from 'vue-material-design-icons/BellOff.vue'
+import CheckBold from 'vue-material-design-icons/CheckBold.vue'
 import EmoticonOutline from 'vue-material-design-icons/EmoticonOutline.vue'
 import Send from 'vue-material-design-icons/Send.vue'
 
@@ -188,6 +202,7 @@ import { CONVERSATION, PARTICIPANT, PRIVACY } from '../../constants.js'
 import { EventBus } from '../../services/EventBus.js'
 import { shareFile } from '../../services/filesSharingServices.js'
 import { searchPossibleMentions } from '../../services/mentionsService.js'
+import { editMessage } from '../../services/messagesService.js'
 import { useChatExtrasStore } from '../../stores/chatExtras.js'
 import { useSettingsStore } from '../../stores/settings.js'
 import { fetchClipboardContent } from '../../utils/clipboard.js'
@@ -217,6 +232,7 @@ export default {
 		Quote,
 		// Icons
 		BellOff,
+		CheckBold,
 		EmoticonOutline,
 		Send,
 	},
@@ -338,6 +354,11 @@ export default {
 			return parentId && this.$store.getters.message(this.token, parentId)
 		},
 
+		messageToEdit() {
+			const messageToEditId = this.chatExtrasStore.getMessageIdToEdit(this.token)
+			return messageToEditId && this.$store.getters.message(this.token, messageToEditId)
+		},
+
 		currentUserIsGuest() {
 			return this.$store.getters.getUserId() === null
 		},
@@ -408,7 +429,11 @@ export default {
 
 		isMobileDevice() {
 			return /Android|iPhone|iPad|iPod/i.test(navigator.userAgent)
-		}
+		},
+
+		chatInput() {
+			return this.chatExtrasStore.getChatInput(this.token)
+		},
 	},
 
 	watch: {
@@ -420,6 +445,25 @@ export default {
 			this.chatExtrasStore.setChatInput({ token: this.token, text: newValue })
 		},
 
+		messageToEdit(newValue) {
+			if (newValue) {
+				this.text = this.chatExtrasStore.getChatInput(this.token)
+				this.chatExtrasStore.removeParentIdToReply(this.token)
+			}
+		},
+
+		parentMessage(newValue) {
+			if (newValue && this.messageToEdit) {
+				this.chatExtrasStore.removeMessageIdToEdit(this.token)
+			}
+		},
+
+		chatInput(newValue) {
+			if (this.text !== newValue) {
+				this.text = newValue
+			}
+		},
+
 		token: {
 			immediate: true,
 			handler(token) {
@@ -595,6 +639,24 @@ export default {
 			}
 		},
 
+		async handleEdit() {
+			try {
+				await editMessage({
+					token: this.token,
+					messageId: this.messageToEdit.id,
+					updatedMessage: this.text.trim()
+				})
+				this.$store.dispatch('updateMessage', {
+					token: this.token,
+					messageId: this.messageToEdit.id,
+					updatedMessageText: this.text.trim()
+				})
+				this.chatExtrasStore.removeMessageIdToEdit(this.token)
+			} catch {
+				this.$emit('failure')
+			}
+		},
+
 		sleep(ms) {
 			return new Promise(resolve => setTimeout(resolve, ms))
 		},
diff --git a/src/components/Quote.vue b/src/components/Quote.vue
index 70e877e4fe2..5c69660b3a6 100644
--- a/src/components/Quote.vue
+++ b/src/components/Quote.vue
@@ -40,6 +40,9 @@ components.
 					:size="AVATAR.SIZE.EXTRA_SMALL"
 					disable-menu />
 				{{ getDisplayName }}
+				<div v-if="editMessage">
+					{{ t('spreed', '(editing)') }}
+				</div>
 			</div>
 			<!-- file preview-->
 			<NcRichText v-if="isFileShareMessage"
@@ -54,7 +57,7 @@ components.
 		<div v-if="isNewMessageQuote" class="quote__main__right">
 			<NcButton type="tertiary"
 				:aria-label="cancelQuoteLabel"
-				@click="handleAbortReply">
+				@click="handleAbort">
 				<template #icon>
 					<Close :size="20" />
 				</template>
@@ -140,6 +143,11 @@ export default {
 			type: Boolean,
 			default: false,
 		},
+
+		editMessage: {
+			type: Boolean,
+			default: false,
+		},
 	},
 
 	setup() {
@@ -249,8 +257,12 @@ export default {
 		},
 	},
 	methods: {
-		handleAbortReply() {
-			this.chatExtrasStore.removeParentIdToReply(this.token)
+		handleAbort() {
+			if (this.editMessage) {
+				this.chatExtrasStore.removeMessageIdToEdit(this.token)
+			} else {
+				this.chatExtrasStore.removeParentIdToReply(this.token)
+			}
 			EventBus.$emit('focus-chat-input')
 		},
 
diff --git a/src/services/messagesService.js b/src/services/messagesService.js
index cf4df0bdf04..a54ca507c8f 100644
--- a/src/services/messagesService.js
+++ b/src/services/messagesService.js
@@ -178,6 +178,12 @@ const getReactionsDetails = async function(token, messageId) {
 	return axios.get(generateOcsUrl('apps/spreed/api/v1/reaction/{token}/{messageId}', { token, messageId }))
 }
 
+const editMessage = async function({ token, messageId, updatedMessage }, options) {
+	return axios.put(generateOcsUrl('apps/spreed/api/v1/chat/{token}/{messageId}', { token, messageId }), {
+		message: updatedMessage,
+	}, options)
+}
+
 const getTranslationLanguages = async function() {
 	return axios.get(generateOcsUrl('/translation/languages'))
 }
@@ -201,6 +207,7 @@ export {
 	addReactionToMessage,
 	removeReactionFromMessage,
 	getReactionsDetails,
+	editMessage,
 	getTranslationLanguages,
 	translateText,
 }
diff --git a/src/store/messagesStore.js b/src/store/messagesStore.js
index 172f9ddeae2..a2c25667d08 100644
--- a/src/store/messagesStore.js
+++ b/src/store/messagesStore.js
@@ -507,6 +507,15 @@ const mutations = {
 			Vue.set(state.firstKnown, token, newFirstKnown)
 		}
 	},
+
+	updateMessage(state, { token, messageId, updatedMessageText }) {
+		const message = state.messages[token][messageId]
+		if (!message) {
+			return
+		}
+		const updatedMessage = { ...message, message: updatedMessageText }
+		Vue.set(state.messages[token], messageId, updatedMessage)
+	},
 }
 
 const actions = {
@@ -1355,6 +1364,10 @@ const actions = {
 	async easeMessageList(context, { token }) {
 		context.commit('easeMessageList', { token })
 	},
+
+	updateMessage(context, { token, messageId, updatedMessageText }) {
+		context.commit('updateMessage', { token, messageId, updatedMessageText })
+	},
 }
 
 export default { state, mutations, getters, actions }
diff --git a/src/stores/chatExtras.js b/src/stores/chatExtras.js
index bd65e366dce..b4e4e8bcc2a 100644
--- a/src/stores/chatExtras.js
+++ b/src/stores/chatExtras.js
@@ -48,6 +48,7 @@ export const useChatExtrasStore = defineStore('chatExtras', {
 		absence: {},
 		parentToReply: {},
 		chatInput: {},
+		messageIdToEdit: {},
 	}),
 
 	getters: {
@@ -60,6 +61,10 @@ export const useChatExtrasStore = defineStore('chatExtras', {
 		getChatInput: (state) => (token) => {
 			return state.chatInput[token] ?? ''
 		},
+
+		getMessageIdToEdit: (state) => (token) => {
+			return state.messageIdToEdit[token]
+		}
 	},
 
 	actions: {
@@ -115,7 +120,9 @@ export const useChatExtrasStore = defineStore('chatExtras', {
 		 * @param {string} token The conversation token
 		 */
 		removeParentIdToReply(token) {
-			Vue.delete(this.parentToReply, token)
+			if (this.parentToReply[token]) {
+				Vue.delete(this.parentToReply, token)
+			}
 		},
 
 		/**
@@ -135,6 +142,18 @@ export const useChatExtrasStore = defineStore('chatExtras', {
 			Vue.set(this.chatInput, token, parsedText)
 		},
 
+		setMessageIdToEdit({ token, message, id }) {
+			this.setChatInput({ token, text: message })
+			Vue.set(this.messageIdToEdit, token, id)
+		},
+
+		removeMessageIdToEdit(token) {
+			this.removeChatInput(token)
+			if (this.messageIdToEdit[token]) {
+				Vue.delete(this.messageIdToEdit, token)
+			}
+		},
+
 		/**
 		 * Remove a current input value from the store for a given conversation token
 		 *

From 7b47d051b1df8e41547e67f9987ffbf3a15d1f79 Mon Sep 17 00:00:00 2001
From: DorraJaouad <dorra.jaoued7@gmail.com>
Date: Thu, 11 Jan 2024 14:10:02 +0100
Subject: [PATCH 2/9] Process message and add visual indicators

Signed-off-by: DorraJaouad <dorra.jaoued7@gmail.com>
---
 .../MessagesGroup/Message/Message.vue         | 20 +++++++++++
 .../MessageButtonsBar/MessageButtonsBar.vue   | 31 ++++++++++++++++-
 .../MessagesGroup/MessagesGroup.vue           | 23 +++++++++++++
 src/components/NewMessage/NewMessage.vue      |  5 ---
 src/store/messagesStore.js                    | 33 ++++++++++++++++---
 5 files changed, 102 insertions(+), 10 deletions(-)

diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue
index 81c8d719878..84a77147d90 100644
--- a/src/components/MessagesList/MessagesGroup/Message/Message.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue
@@ -408,6 +408,26 @@ export default {
 			type: String,
 			default: '',
 		},
+
+		lastEditActorDisplayName: {
+			type: String,
+			default: '',
+		},
+
+		lastEditActorId: {
+			type: String,
+			default: '',
+		},
+
+		lastEditActorType: {
+			type: String,
+			default: '',
+		},
+
+		lastEditTimestamp: {
+			type: Number,
+			default: 0,
+		},
 	},
 
 	emits: ['toggle-combined-system-message'],
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
index a56a336ac64..3fa1be20ae7 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
@@ -48,7 +48,8 @@
 				@open="onMenuOpen"
 				@close="onMenuClose">
 				<template v-if="submenu === null">
-					<NcActionButton>
+					<NcActionButton class="action--nested"
+						@click.stop="submenu = 'edit-history'">
 						<template #icon>
 							<span v-if="showCommonReadIcon"
 								:title="commonReadIconTooltip"
@@ -215,6 +216,24 @@
 						{{ t('spreed', 'Set custom reminder') }}
 					</NcActionButton>
 				</template>
+
+				<template v-else-if="submenu === 'edit-history'">
+					<NcActionButton :aria-label="t('spreed', 'Back')"
+						@click.stop="submenu = null">
+						<template #icon>
+							<ArrowLeft />
+						</template>
+						{{ t('spreed', 'Back') }}
+					</NcActionButton>
+					<NcActionText>
+						{{ t('spreed', 'Edited by : {actor}',
+							{actor : messageObject.lastEditActorDisplayName}) }}
+					</NcActionText>
+					<NcActionSeparator />
+					<NcActionText>
+						{{ editedDateTime }}
+					</NcActionText>
+				</template>
 			</NcActions>
 		</template>
 
@@ -290,6 +309,7 @@ import NcActionInput from '@nextcloud/vue/dist/Components/NcActionInput.js'
 import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink.js'
 import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 import NcActionSeparator from '@nextcloud/vue/dist/Components/NcActionSeparator.js'
+import NcActionText from '@nextcloud/vue/dist/Components/NcActionText.js'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcEmojiPicker from '@nextcloud/vue/dist/Components/NcEmojiPicker.js'
 
@@ -313,6 +333,7 @@ export default {
 		NcActionInput,
 		NcActionLink,
 		NcActionSeparator,
+		NcActionText,
 		NcActions,
 		NcButton,
 		NcEmojiPicker,
@@ -570,6 +591,10 @@ export default {
 			return moment(this.timestamp * 1000).format('lll')
 		},
 
+		editedDateTime() {
+			return moment(this.messageObject.lastEditTimestamp * 1000).format('lll')
+		},
+
 		reminderOptions() {
 			const currentDateTime = moment()
 
@@ -819,4 +844,8 @@ export default {
 		background: no-repeat center var(--icon-triangle-e-dark);
 	}
 }
+
+:deep(.action-text) {
+	padding-left: 5px;
+}
 </style>
diff --git a/src/components/MessagesList/MessagesGroup/MessagesGroup.vue b/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
index 678b5664cc5..672e5dc6d17 100644
--- a/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
+++ b/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
@@ -32,6 +32,11 @@
 		<ul class="messages">
 			<li class="messages__author" aria-level="4">
 				{{ actorDisplayName }}
+				<div v-if="lastEditActorDisplayName"
+					:aria-label="getLastEditor"
+					:aria-level="4">
+					{{ getLastEditor }}
+				</div>
 			</li>
 			<Message v-for="(message, index) of messages"
 				:key="message.id"
@@ -88,6 +93,11 @@ export default {
 			type: [String, Number],
 			default: 0,
 		},
+
+		lastEditActorDisplayName: {
+			type: String,
+			default: ''
+		},
 	},
 
 	setup() {
@@ -133,6 +143,17 @@ export default {
 			return displayName
 		},
 
+		getLastEditor() {
+			if (this.lastEditActorDisplayName === this.actorDisplayName) {
+				return t('spreed', '(edited)')
+			} else if (this.lastEditActorDisplayName === this.$store.getters.getDisplayName()) {
+				return t('spreed', '(edited by you)')
+			} else {
+				return t('spreed', '(edited by {user1})', { user1: this.lastEditActorDisplayName })
+			}
+
+		},
+
 		disableMenu() {
 			// disable the menu if accessing the conversation as guest
 			// or the message sender is a bridged user
@@ -184,6 +205,8 @@ export default {
 	}
 
 	&__author {
+		display: flex;
+		gap: 4px;
 		padding: 4px 0 0 8px;
 		color: var(--color-text-maxcontrast);
 	}
diff --git a/src/components/NewMessage/NewMessage.vue b/src/components/NewMessage/NewMessage.vue
index 2b5f420f3e9..463dc897655 100644
--- a/src/components/NewMessage/NewMessage.vue
+++ b/src/components/NewMessage/NewMessage.vue
@@ -646,11 +646,6 @@ export default {
 					messageId: this.messageToEdit.id,
 					updatedMessage: this.text.trim()
 				})
-				this.$store.dispatch('updateMessage', {
-					token: this.token,
-					messageId: this.messageToEdit.id,
-					updatedMessageText: this.text.trim()
-				})
 				this.chatExtrasStore.removeMessageIdToEdit(this.token)
 			} catch {
 				this.$emit('failure')
diff --git a/src/store/messagesStore.js b/src/store/messagesStore.js
index a2c25667d08..8e5d9f8e7a2 100644
--- a/src/store/messagesStore.js
+++ b/src/store/messagesStore.js
@@ -508,12 +508,12 @@ const mutations = {
 		}
 	},
 
-	updateMessage(state, { token, messageId, updatedMessageText }) {
+	updateMessage(state, { token, messageId, updatedMessageText, editDetails }) {
 		const message = state.messages[token][messageId]
 		if (!message) {
 			return
 		}
-		const updatedMessage = { ...message, message: updatedMessageText }
+		const updatedMessage = { ...message, message: updatedMessageText, ...editDetails }
 		Vue.set(state.messages[token], messageId, updatedMessage)
 	},
 }
@@ -565,6 +565,31 @@ const actions = {
 			return
 		}
 
+		if (message.parent && message.systemMessage === 'message_edited') {
+			// If parent message is presented in store already, we update it
+			const parentInStore = context.getters.message(message.token, message.parent.id)
+			if (Object.keys(parentInStore).length !== 0) {
+				context.commit('addMessage', message.parent)
+				return
+			}
+
+			// Update message in store
+			const messageUpdated = message.parent
+			const editDetails = {
+				lastEditActorDisplayName: messageUpdated.lastEditActorDisplayName,
+				lastEditActorId: messageUpdated.lastEditActorId,
+				lastEditActorType: messageUpdated.lastEditActorType,
+				lastEditTimestamp: messageUpdated.lastEditTimestamp,
+			}
+			context.commit('updateMessage', {
+				token: messageUpdated.token,
+				messageId: messageUpdated.id,
+				updatedMessageText: messageUpdated.message,
+				editDetails,
+			})
+			return
+		}
+
 		if (message.referenceId) {
 			const tempMessages = context.getters.getTemporaryReferences(token, message.referenceId)
 			tempMessages.forEach(tempMessage => {
@@ -1365,8 +1390,8 @@ const actions = {
 		context.commit('easeMessageList', { token })
 	},
 
-	updateMessage(context, { token, messageId, updatedMessageText }) {
-		context.commit('updateMessage', { token, messageId, updatedMessageText })
+	updateMessage(context, { token, messageId, updatedMessageText, editDetails }) {
+		context.commit('updateMessage', { token, messageId, updatedMessageText, editDetails })
 	},
 }
 

From 34f6e6d534114dffad248829ca54c54121d8b922 Mon Sep 17 00:00:00 2001
From: DorraJaouad <dorra.jaoued7@gmail.com>
Date: Thu, 11 Jan 2024 19:30:16 +0100
Subject: [PATCH 3/9] Restrict the ability to edit a message

Signed-off-by: DorraJaouad <dorra.jaoued7@gmail.com>
---
 .../MessageButtonsBar/MessageButtonsBar.vue   | 43 +++++++++++++++++--
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
index 3fa1be20ae7..9ede3261437 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
@@ -48,7 +48,9 @@
 				@open="onMenuOpen"
 				@close="onMenuClose">
 				<template v-if="submenu === null">
-					<NcActionButton class="action--nested"
+					<!-- Message timestamp is a menu for editing details -->
+					<NcActionButton v-if="messageObject.lastEditTimestamp"
+						class="action--nested"
 						@click.stop="submenu = 'edit-history'">
 						<template #icon>
 							<span v-if="showCommonReadIcon"
@@ -65,6 +67,23 @@
 						</template>
 						{{ messageDateTime }}
 					</NcActionButton>
+					<!-- Message timestamp if there is no editing history -->
+					<NcActionText v-else>
+						<template #icon>
+							<span v-if="showCommonReadIcon"
+								:title="commonReadIconTooltip"
+								:aria-label="commonReadIconTooltip">
+								<CheckAll :size="16" />
+							</span>
+							<span v-else-if="showSentIcon"
+								:title="sentIconTooltip"
+								:aria-label="sentIconTooltip">
+								<Check :size="16" />
+							</span>
+							<ClockOutline v-else :size="16" />
+						</template>
+						{{ messageDateTime }}
+					</NcActionText>
 
 					<NcActionButton v-if="supportReminders"
 						class="action--nested"
@@ -84,7 +103,8 @@
 						</template>
 						{{ t('spreed', 'Reply privately') }}
 					</NcActionButton>
-					<NcActionButton :aria-label="t('spreed', 'Edit message')"
+					<NcActionButton v-if="isEditable"
+						:aria-label="t('spreed', 'Edit message')"
 						close-after-click
 						@click.stop="editMessage">
 						<template #icon>
@@ -513,8 +533,21 @@ export default {
 			return this.getMessagesListScroller()
 		},
 
+		isModifiable() {
+			return !this.isConversationReadOnly && this.conversation.participantType !== PARTICIPANT.TYPE.GUEST
+		},
+
+		isEditable() {
+			if (!this.isModifiable || this.isObjectShare) {
+				return false
+			}
+
+			return (moment(this.timestamp * 1000).add(1, 'd')) > moment()
+				&& (this.$store.getters.isModerator || this.isMyMsg)
+		},
+
 		isDeleteable() {
-			if (this.isConversationReadOnly || this.conversation.participantType === PARTICIPANT.TYPE.GUEST) {
+			if (!this.isModifiable) {
 				return false
 			}
 
@@ -554,6 +587,10 @@ export default {
 			return this.isFileShare && this.message === '{file}'
 		},
 
+		isObjectShare() {
+			return Object.keys(Object(this.messageParameters)).some(key => key.startsWith('object'))
+		},
+
 		isCurrentGuest() {
 			return this.$store.getters.getActorType() === 'guests'
 		},

From 91c46d09ac1fc27b552a22359be1e5512f4bebd2 Mon Sep 17 00:00:00 2001
From: DorraJaouad <dorra.jaoued7@gmail.com>
Date: Thu, 11 Jan 2024 20:12:11 +0100
Subject: [PATCH 4/9] Prevent changes from simple message to caption

Signed-off-by: DorraJaouad <dorra.jaoued7@gmail.com>
---
 src/components/ChatView.vue                   | 20 +++++++++++++++++--
 .../MessagesGroup/Message/Message.vue         | 16 ++++++++++-----
 src/components/NewMessage/NewMessage.vue      | 17 +++++++++++++++-
 3 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/src/components/ChatView.vue b/src/components/ChatView.vue
index 61140929946..61c1610ea7e 100644
--- a/src/components/ChatView.vue
+++ b/src/components/ChatView.vue
@@ -86,6 +86,7 @@ import TransitionWrapper from './TransitionWrapper.vue'
 
 import { CONVERSATION } from '../constants.js'
 import { EventBus } from '../services/EventBus.js'
+import { useChatExtrasStore } from '../stores/chatExtras.js'
 
 export default {
 
@@ -108,6 +109,12 @@ export default {
 		},
 	},
 
+	setup() {
+		return {
+			chatExtrasStore: useChatExtrasStore(),
+		}
+	},
+
 	data() {
 		return {
 			isChatScrolledToBottom: true,
@@ -126,6 +133,10 @@ export default {
 			return !userName && this.isGuest
 		},
 
+		isEditingMessage() {
+			return this.chatExtrasStore.getMessageIdToEdit(this.token) !== undefined
+		},
+
 		dropHintText() {
 			if (this.isGuest) {
 				return t('spreed', 'You need to be logged in to upload files')
@@ -155,7 +166,7 @@ export default {
 	watch: {
 		container(value) {
 			this.containerId = value
-		}
+		},
 	},
 
 	mounted() {
@@ -163,10 +174,15 @@ export default {
 		this.containerId = this.container
 	},
 
+	beforeDestroy() {
+		EventBus.$off('editing-message')
+		EventBus.$off('message-edited')
+	},
+
 	methods: {
 
 		handleDragOver(event) {
-			if (event.dataTransfer.types.includes('Files')) {
+			if (event.dataTransfer.types.includes('Files') && !this.isEditingMessage) {
 				this.isDraggingOver = true
 			}
 		},
diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue
index 84a77147d90..96d5586729b 100644
--- a/src/components/MessagesList/MessagesGroup/Message/Message.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue
@@ -681,6 +681,10 @@ export default {
 		containsCodeBlocks() {
 			return this.message.includes('```')
 		},
+
+		isFileShareOnly() {
+			return Object.keys(Object(this.messageParameters)).some(key => key.startsWith('file')) && this.message === '{file}'
+		},
 	},
 
 	watch: {
@@ -778,11 +782,13 @@ export default {
 		},
 
 		handleEdit() {
-			this.chatExtrasStore.setMessageIdToEdit({
-				token: this.token,
-				message: this.message,
-				id: this.id
-			})
+			this.chatExtrasStore.setMessageIdToEdit(this.token, this.id)
+			if (this.isFileShareOnly) {
+				this.chatExtrasStore.setChatEditInput({ token: this.token, text: '' })
+			} else {
+				this.chatExtrasStore.setChatEditInput({ token: this.token, text: this.message })
+			}
+			EventBus.$emit('editing-message')
 			EventBus.$emit('focus-chat-input')
 		},
 
diff --git a/src/components/NewMessage/NewMessage.vue b/src/components/NewMessage/NewMessage.vue
index 463dc897655..d0039c7f3ca 100644
--- a/src/components/NewMessage/NewMessage.vue
+++ b/src/components/NewMessage/NewMessage.vue
@@ -404,10 +404,11 @@ export default {
 
 		showAttachmentsMenu() {
 			return this.canShareFiles && !this.broadcast && !this.upload
+				&& (!this.messageToEdit || this.messageToEdit?.messageParameters?.length !== 0)
 		},
 
 		showAudioRecorder() {
-			return !this.hasText && this.canUploadFiles && !this.broadcast && !this.upload
+			return !this.hasText && this.canUploadFiles && !this.broadcast && !this.upload && !this.messageToEdit
 		},
 
 		showTypingStatus() {
@@ -640,6 +641,17 @@ export default {
 		},
 
 		async handleEdit() {
+
+			if (this.messageToEdit.messageParameters.length !== 0) {
+				// Captions editing is not supported yet
+				return
+			}
+
+			// Submitting an empty message will abort the edit
+			if (this.text.trim() === '') {
+				this.chatExtrasStore.removeMessageIdToEdit(this.token)
+			}
+
 			try {
 				await editMessage({
 					token: this.token,
@@ -714,6 +726,9 @@ export default {
 		 * @param {ClipboardEvent} e native paste event
 		 */
 		async handlePastedFiles(e) {
+			if (this.messageToEdit) {
+				return
+			}
 			e.preventDefault()
 			// Prevent a new call of this.handleFiles if already called
 			if (this.clipboardTimeStamp === e.timeStamp) {

From 9946917f9e92c8b267dd7df349a9cf66d806c97a Mon Sep 17 00:00:00 2001
From: DorraJaouad <dorra.jaoued7@gmail.com>
Date: Fri, 12 Jan 2024 19:04:31 +0100
Subject: [PATCH 5/9] Split input states and split groups at edited messages

Signed-off-by: DorraJaouad <dorra.jaoued7@gmail.com>
---
 .../MessagesGroup/MessagesGroup.vue           |  9 ++-
 src/components/MessagesList/MessagesList.vue  | 57 +++++++++++++++++++
 src/components/NewMessage/NewMessage.vue      | 28 ++++++---
 src/store/messagesStore.js                    | 35 ++----------
 src/stores/chatExtras.js                      | 51 +++++++++++++++--
 5 files changed, 133 insertions(+), 47 deletions(-)

diff --git a/src/components/MessagesList/MessagesGroup/MessagesGroup.vue b/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
index 672e5dc6d17..653dc16a503 100644
--- a/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
+++ b/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
@@ -32,9 +32,7 @@
 		<ul class="messages">
 			<li class="messages__author" aria-level="4">
 				{{ actorDisplayName }}
-				<div v-if="lastEditActorDisplayName"
-					:aria-label="getLastEditor"
-					:aria-level="4">
+				<div v-if="lastEditActorDisplayName">
 					{{ getLastEditor }}
 				</div>
 			</li>
@@ -144,9 +142,10 @@ export default {
 		},
 
 		getLastEditor() {
-			if (this.lastEditActorDisplayName === this.actorDisplayName) {
+			if (this.lastEditActorId === this.actorId && this.lastEditActorType === this.actorType) {
 				return t('spreed', '(edited)')
-			} else if (this.lastEditActorDisplayName === this.$store.getters.getDisplayName()) {
+			} else if (this.lastEditActorId === this.$store.getters.getActorId()
+						&& this.lastEditActorType === this.$store.getters.getActorType()) {
 				return t('spreed', '(edited by you)')
 			} else {
 				return t('spreed', '(edited by {user1})', { user1: this.lastEditActorDisplayName })
diff --git a/src/components/MessagesList/MessagesList.vue b/src/components/MessagesList/MessagesList.vue
index f7ae0c67840..19fae2479dc 100644
--- a/src/components/MessagesList/MessagesList.vue
+++ b/src/components/MessagesList/MessagesList.vue
@@ -284,6 +284,7 @@ export default {
 		EventBus.$on('scroll-chat-to-bottom-if-sticky', this.scrollToBottomIfSticky)
 		EventBus.$on('focus-message', this.focusMessage)
 		EventBus.$on('route-change', this.onRouteChange)
+		EventBus.$on('message-edited', this.handleMessageEdited)
 		subscribe('networkOffline', this.handleNetworkOffline)
 		subscribe('networkOnline', this.handleNetworkOnline)
 		window.addEventListener('focus', this.onWindowFocus)
@@ -303,6 +304,7 @@ export default {
 		EventBus.$on('scroll-chat-to-bottom-if-sticky', this.scrollToBottomIfSticky)
 		EventBus.$off('focus-message', this.focusMessage)
 		EventBus.$off('route-change', this.onRouteChange)
+		EventBus.$off('message-edited', this.handleMessageEdited)
 
 		this.$store.dispatch('cancelLookForNewMessages', { requestId: this.chatIdentifier })
 		this.destroying = true
@@ -397,6 +399,10 @@ export default {
 				return false // No previous message
 			}
 
+			if (!!message1.lastEditTimestamp || !!message2.lastEditTimestamp) {
+				return false // Edited messages are not grouped
+			}
+
 			if (message1.actorType === ATTENDEE.ACTOR_TYPE.BOTS // Don't group messages of commands and bots
 				&& message1.actorId !== ATTENDEE.CHANGELOG_BOT_ID) { // Apart from the changelog bot
 				return false
@@ -628,6 +634,57 @@ export default {
 			}
 		},
 
+		handleMessageEdited(id) {
+			// regroup messagesGroupedByAuthor when a message is edited
+			// find the group that contains the id and split it into 3 groups
+			// 1. the messages before the edited message
+			// 2. the edited message
+			// 3. the messages after the edited message
+			const groups = this.messagesGroupedByAuthor
+			const groupIndex = groups.findIndex(group => group.messages.some(message => message.id === id))
+			if (groupIndex === -1) {
+				return
+			}
+			// split the group into 3 groups
+			const group = groups[groupIndex]
+			const messageIndex = group.messages.findIndex(message => message.id === id)
+			const beforeMessages = group.messages.slice(0, messageIndex)
+			const afterMessages = group.messages.slice(messageIndex + 1)
+			const editedMessage = group.messages[messageIndex]
+			// remove the old group and add the 3 new groups at the same index
+			groups.splice(groupIndex, 1,
+				...(beforeMessages.length
+					? [{
+						id: beforeMessages[0].id,
+						messages: beforeMessages,
+						dateSeparator: group.dateSeparator,
+						previousMessageId: group.previousMessageId,
+						nextMessageId: editedMessage.id,
+						isSystemMessagesGroup: group.isSystemMessagesGroup,
+					}]
+					: []),
+				{
+					id: editedMessage.id,
+					messages: [editedMessage],
+					dateSeparator: group.dateSeparator,
+					previousMessageId: beforeMessages.length ? beforeMessages.at(-1).id : group.previousMessageId,
+					nextMessageId: afterMessages.length ? afterMessages[0].id : group.nextMessageId,
+					isSystemMessagesGroup: group.isSystemMessagesGroup,
+				},
+				...(afterMessages.length
+					? [{
+						id: afterMessages[0].id,
+						messages: afterMessages,
+						dateSeparator: group.dateSeparator,
+						previousMessageId: editedMessage.id,
+						nextMessageId: group.nextMessageId,
+						isSystemMessagesGroup: group.isSystemMessagesGroup,
+					}]
+					: []),
+			)
+
+		},
+
 		/**
 		 * Fetches the messages of a conversation given the conversation token. Triggers
 		 * a long-polling request for new messages.
diff --git a/src/components/NewMessage/NewMessage.vue b/src/components/NewMessage/NewMessage.vue
index d0039c7f3ca..0a8b6adaa12 100644
--- a/src/components/NewMessage/NewMessage.vue
+++ b/src/components/NewMessage/NewMessage.vue
@@ -403,8 +403,7 @@ export default {
 		},
 
 		showAttachmentsMenu() {
-			return this.canShareFiles && !this.broadcast && !this.upload
-				&& (!this.messageToEdit || this.messageToEdit?.messageParameters?.length !== 0)
+			return this.canShareFiles && !this.broadcast && !this.upload && !this.messageToEdit
 		},
 
 		showAudioRecorder() {
@@ -432,8 +431,8 @@ export default {
 			return /Android|iPhone|iPad|iPod/i.test(navigator.userAgent)
 		},
 
-		chatInput() {
-			return this.chatExtrasStore.getChatInput(this.token)
+		chatEditInput() {
+			return this.chatExtrasStore.getChatEditInput(this.token)
 		},
 	},
 
@@ -443,13 +442,19 @@ export default {
 		},
 
 		text(newValue) {
-			this.chatExtrasStore.setChatInput({ token: this.token, text: newValue })
+			if (this.messageToEdit) {
+				this.chatExtrasStore.setChatEditInput({ token: this.token, text: newValue })
+			} else {
+				this.chatExtrasStore.setChatInput({ token: this.token, text: newValue })
+			}
 		},
 
 		messageToEdit(newValue) {
 			if (newValue) {
-				this.text = this.chatExtrasStore.getChatInput(this.token)
+				this.text = this.chatExtrasStore.getChatEditInput(this.token)
 				this.chatExtrasStore.removeParentIdToReply(this.token)
+			} else {
+				this.text = this.chatExtrasStore.getChatInput(this.token)
 			}
 		},
 
@@ -469,7 +474,9 @@ export default {
 			immediate: true,
 			handler(token) {
 				if (token) {
-					this.text = this.chatExtrasStore.getChatInput(token)
+					this.text = this.messageToEdit
+						? this.chatExtrasStore.getChatEditInput(token)
+						: this.chatExtrasStore.getChatInput(token)
 				} else {
 					this.text = ''
 				}
@@ -641,8 +648,9 @@ export default {
 		},
 
 		async handleEdit() {
-
-			if (this.messageToEdit.messageParameters.length !== 0) {
+			const isSimpleMessage = this.messageToEdit.messageParameters?.length === 0
+				|| this.messageToEdit.messageParameters?.some(parameter => parameter.startsWith('mention'))
+			if (!isSimpleMessage) {
 				// Captions editing is not supported yet
 				return
 			}
@@ -650,6 +658,7 @@ export default {
 			// Submitting an empty message will abort the edit
 			if (this.text.trim() === '') {
 				this.chatExtrasStore.removeMessageIdToEdit(this.token)
+				return
 			}
 
 			try {
@@ -658,6 +667,7 @@ export default {
 					messageId: this.messageToEdit.id,
 					updatedMessage: this.text.trim()
 				})
+				EventBus.$emit('message-edited', this.messageToEdit.id)
 				this.chatExtrasStore.removeMessageIdToEdit(this.token)
 			} catch {
 				this.$emit('failure')
diff --git a/src/store/messagesStore.js b/src/store/messagesStore.js
index 8e5d9f8e7a2..8640c6e737f 100644
--- a/src/store/messagesStore.js
+++ b/src/store/messagesStore.js
@@ -507,15 +507,6 @@ const mutations = {
 			Vue.set(state.firstKnown, token, newFirstKnown)
 		}
 	},
-
-	updateMessage(state, { token, messageId, updatedMessageText, editDetails }) {
-		const message = state.messages[token][messageId]
-		if (!message) {
-			return
-		}
-		const updatedMessage = { ...message, message: updatedMessageText, ...editDetails }
-		Vue.set(state.messages[token], messageId, updatedMessage)
-	},
 }
 
 const actions = {
@@ -538,11 +529,16 @@ const actions = {
 			&& (message.systemMessage === 'message_deleted'
 				|| message.systemMessage === 'reaction'
 				|| message.systemMessage === 'reaction_deleted'
-				|| message.systemMessage === 'reaction_revoked')) {
+				|| message.systemMessage === 'reaction_revoked'
+				|| message.systemMessage === 'message_edited')) {
 			// If parent message is presented in store already, we update it
 			const parentInStore = context.getters.message(token, message.parent.id)
 			if (Object.keys(parentInStore).length !== 0) {
 				context.commit('addMessage', { token, message: message.parent })
+				if (message.systemMessage === 'message_edited') {
+					// End of process for edited messages
+					return
+				}
 			}
 
 			const reactionsStore = useReactionsStore()
@@ -572,21 +568,6 @@ const actions = {
 				context.commit('addMessage', message.parent)
 				return
 			}
-
-			// Update message in store
-			const messageUpdated = message.parent
-			const editDetails = {
-				lastEditActorDisplayName: messageUpdated.lastEditActorDisplayName,
-				lastEditActorId: messageUpdated.lastEditActorId,
-				lastEditActorType: messageUpdated.lastEditActorType,
-				lastEditTimestamp: messageUpdated.lastEditTimestamp,
-			}
-			context.commit('updateMessage', {
-				token: messageUpdated.token,
-				messageId: messageUpdated.id,
-				updatedMessageText: messageUpdated.message,
-				editDetails,
-			})
 			return
 		}
 
@@ -1389,10 +1370,6 @@ const actions = {
 	async easeMessageList(context, { token }) {
 		context.commit('easeMessageList', { token })
 	},
-
-	updateMessage(context, { token, messageId, updatedMessageText, editDetails }) {
-		context.commit('updateMessage', { token, messageId, updatedMessageText, editDetails })
-	},
 }
 
 export default { state, mutations, getters, actions }
diff --git a/src/stores/chatExtras.js b/src/stores/chatExtras.js
index b4e4e8bcc2a..82f5bf08421 100644
--- a/src/stores/chatExtras.js
+++ b/src/stores/chatExtras.js
@@ -49,6 +49,7 @@ export const useChatExtrasStore = defineStore('chatExtras', {
 		parentToReply: {},
 		chatInput: {},
 		messageIdToEdit: {},
+		chatEditInput: {},
 	}),
 
 	getters: {
@@ -62,9 +63,13 @@ export const useChatExtrasStore = defineStore('chatExtras', {
 			return state.chatInput[token] ?? ''
 		},
 
+		getChatEditInput: (state) => (token) => {
+			return state.chatEditInput[token] ?? ''
+		},
+
 		getMessageIdToEdit: (state) => (token) => {
 			return state.messageIdToEdit[token]
-		}
+		},
 	},
 
 	actions: {
@@ -142,18 +147,56 @@ export const useChatExtrasStore = defineStore('chatExtras', {
 			Vue.set(this.chatInput, token, parsedText)
 		},
 
-		setMessageIdToEdit({ token, message, id }) {
-			this.setChatInput({ token, text: message })
+		/**
+		 * Add a message text that is being edited to the store for a given conversation token
+		 *
+		 * @param {object} payload action payload
+		 * @param {string} payload.token The conversation token
+		 * @param {string} payload.text The string to store
+		 */
+		setChatEditInput({ token, text }) {
+			// FIXME upstream: https://github.com/nextcloud-libraries/nextcloud-vue/issues/4492
+			const temp = document.createElement('textarea')
+			temp.innerHTML = text.replace(/&/gmi, '&amp;')
+			const parsedText = temp.value.replace(/&amp;/gmi, '&').replace(/&lt;/gmi, '<')
+				.replace(/&gt;/gmi, '>').replace(/&sect;/gmi, '§')
+
+			Vue.set(this.chatEditInput, token, parsedText)
+		},
+
+		/**
+		 * Add a message id that is being edited to the store
+		 *
+		 * @param {string} token The conversation token
+		 * @param {number} id The id of message
+		 */
+		setMessageIdToEdit(token, id) {
 			Vue.set(this.messageIdToEdit, token, id)
 		},
 
+		/**
+		 * Remove a message id that is being edited to the store
+		 *
+		 * @param {string} token The conversation token
+		 */
 		removeMessageIdToEdit(token) {
-			this.removeChatInput(token)
+			this.removeChatEditInput(token)
 			if (this.messageIdToEdit[token]) {
 				Vue.delete(this.messageIdToEdit, token)
 			}
 		},
 
+		/**
+		 * Remove the edited message text from the store for a given conversation token
+		 *
+		 * @param {string} token The conversation token
+		 */
+		removeChatEditInput(token) {
+			if (this.chatEditInput[token]) {
+				Vue.delete(this.chatEditInput, token)
+			}
+		},
+
 		/**
 		 * Remove a current input value from the store for a given conversation token
 		 *

From f3001d1211b049e38e13d15524c8e01648870cd5 Mon Sep 17 00:00:00 2001
From: DorraJaouad <dorra.jaoued7@gmail.com>
Date: Mon, 15 Jan 2024 09:13:01 +0100
Subject: [PATCH 6/9] Disable edit when text is empty or is the same as the
 original message

Signed-off-by: DorraJaouad <dorra.jaoued7@gmail.com>
---
 src/components/NewMessage/NewMessage.vue | 27 ++++++++++++------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/components/NewMessage/NewMessage.vue b/src/components/NewMessage/NewMessage.vue
index 0a8b6adaa12..f8d091cf613 100644
--- a/src/components/NewMessage/NewMessage.vue
+++ b/src/components/NewMessage/NewMessage.vue
@@ -112,7 +112,7 @@
 
 			<!-- Edit -->
 			<NcButton v-else-if="messageToEdit"
-				:disabled="disabled"
+				:disabled="disabledEdit"
 				type="tertiary"
 				native-type="submit"
 				:title="t('spreed', 'Edit message')"
@@ -336,6 +336,10 @@ export default {
 			return this.isReadOnly || this.noChatPermission || !this.currentConversationIsJoined || this.isRecordingAudio
 		},
 
+		disabledEdit() {
+			return this.disabled || this.text === this.messageToEdit.message || this.text === ''
+		},
+
 		placeholderText() {
 			if (this.isReadOnly) {
 				return t('spreed', 'This conversation has been locked')
@@ -562,6 +566,14 @@ export default {
 		 * @param {object} options the submit options
 		 */
 		async handleSubmit(options) {
+			// Submit event has enter key listener
+			// Handle edit here too
+			if (this.messageToEdit) {
+				if (!this.disabledEdit) {
+					this.handleEdit()
+				}
+				return
+			}
 			if (OC.debug && this.text.startsWith('/spam ')) {
 				const pattern = /^\/spam (\d+) messages$/i
 				const match = pattern.exec(this.text)
@@ -648,19 +660,6 @@ export default {
 		},
 
 		async handleEdit() {
-			const isSimpleMessage = this.messageToEdit.messageParameters?.length === 0
-				|| this.messageToEdit.messageParameters?.some(parameter => parameter.startsWith('mention'))
-			if (!isSimpleMessage) {
-				// Captions editing is not supported yet
-				return
-			}
-
-			// Submitting an empty message will abort the edit
-			if (this.text.trim() === '') {
-				this.chatExtrasStore.removeMessageIdToEdit(this.token)
-				return
-			}
-
 			try {
 				await editMessage({
 					token: this.token,

From ea531efad48c7be02493f4b5000611938a0b86bf Mon Sep 17 00:00:00 2001
From: DorraJaouad <dorra.jaoued7@gmail.com>
Date: Mon, 15 Jan 2024 11:32:09 +0100
Subject: [PATCH 7/9] Add tests and revert some added conditions

Signed-off-by: DorraJaouad <dorra.jaoued7@gmail.com>
---
 src/stores/__tests__/chatExtras.spec.js | 25 +++++++++++++++++++++++++
 src/stores/chatExtras.js                | 21 +++------------------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/stores/__tests__/chatExtras.spec.js b/src/stores/__tests__/chatExtras.spec.js
index 5fdd61be0a5..ee890022288 100644
--- a/src/stores/__tests__/chatExtras.spec.js
+++ b/src/stores/__tests__/chatExtras.spec.js
@@ -117,6 +117,31 @@ describe('chatExtrasStore', () => {
 		})
 	})
 
+	describe('current edit input message', () => {
+		it('sets current edit input message', () => {
+			// Act
+			chatExtrasStore.setChatEditInput({ token: 'token-1', text: 'This is an edited message' })
+			chatExtrasStore.setMessageIdToEdit('token-1', 'id-1')
+
+			// Assert
+			expect(chatExtrasStore.getChatEditInput('token-1')).toStrictEqual('This is an edited message')
+			expect(chatExtrasStore.getMessageIdToEdit('id-1')).toBe(undefined)
+		})
+
+		it('clears current edit input message', () => {
+			// Arrange
+			chatExtrasStore.setChatEditInput({ token: 'token-1', text: 'This is an edited message' })
+			chatExtrasStore.setMessageIdToEdit('token-1', 'id-1')
+
+			// Act
+			chatExtrasStore.removeMessageIdToEdit('token-1')
+
+			// Assert
+			expect(chatExtrasStore.chatEditInput['token-1']).not.toBeDefined()
+			expect(chatExtrasStore.getChatEditInput('token-1')).toBe('')
+		})
+	})
+
 	describe('purge store', () => {
 		it('clears store for provided token', async () => {
 			// Arrange
diff --git a/src/stores/chatExtras.js b/src/stores/chatExtras.js
index 82f5bf08421..34b58e4a66f 100644
--- a/src/stores/chatExtras.js
+++ b/src/stores/chatExtras.js
@@ -125,9 +125,7 @@ export const useChatExtrasStore = defineStore('chatExtras', {
 		 * @param {string} token The conversation token
 		 */
 		removeParentIdToReply(token) {
-			if (this.parentToReply[token]) {
-				Vue.delete(this.parentToReply, token)
-			}
+			Vue.delete(this.parentToReply, token)
 		},
 
 		/**
@@ -180,21 +178,8 @@ export const useChatExtrasStore = defineStore('chatExtras', {
 		 * @param {string} token The conversation token
 		 */
 		removeMessageIdToEdit(token) {
-			this.removeChatEditInput(token)
-			if (this.messageIdToEdit[token]) {
-				Vue.delete(this.messageIdToEdit, token)
-			}
-		},
-
-		/**
-		 * Remove the edited message text from the store for a given conversation token
-		 *
-		 * @param {string} token The conversation token
-		 */
-		removeChatEditInput(token) {
-			if (this.chatEditInput[token]) {
-				Vue.delete(this.chatEditInput, token)
-			}
+			Vue.delete(this.chatEditInput, token)
+			Vue.delete(this.messageIdToEdit, token)
 		},
 
 		/**

From f95bce00bc6d69ab3b0931ee59bd472dcdf553f0 Mon Sep 17 00:00:00 2001
From: DorraJaouad <dorra.jaoued7@gmail.com>
Date: Mon, 15 Jan 2024 21:13:40 +0100
Subject: [PATCH 8/9] Improve wording and UI

Signed-off-by: DorraJaouad <dorra.jaoued7@gmail.com>
---
 .../MessageButtonsBar/MessageButtonsBar.vue   |  2 +-
 .../MessagesGroup/MessagesGroup.vue           |  3 +-
 src/components/NewMessage/NewMessage.vue      | 48 +++++++++++++------
 src/components/Quote.vue                      | 14 ++++--
 4 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
index 9ede3261437..d8fc2a29a70 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
@@ -246,7 +246,7 @@
 						{{ t('spreed', 'Back') }}
 					</NcActionButton>
 					<NcActionText>
-						{{ t('spreed', 'Edited by : {actor}',
+						{{ t('spreed', 'Edited by: {actor}',
 							{actor : messageObject.lastEditActorDisplayName}) }}
 					</NcActionText>
 					<NcActionSeparator />
diff --git a/src/components/MessagesList/MessagesGroup/MessagesGroup.vue b/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
index 653dc16a503..3a176ea6eef 100644
--- a/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
+++ b/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
@@ -143,12 +143,13 @@ export default {
 
 		getLastEditor() {
 			if (this.lastEditActorId === this.actorId && this.lastEditActorType === this.actorType) {
+				// TRANSLATORS Edited by the author of the message themselves
 				return t('spreed', '(edited)')
 			} else if (this.lastEditActorId === this.$store.getters.getActorId()
 						&& this.lastEditActorType === this.$store.getters.getActorType()) {
 				return t('spreed', '(edited by you)')
 			} else {
-				return t('spreed', '(edited by {user1})', { user1: this.lastEditActorDisplayName })
+				return t('spreed', '(edited by {moderator})', { moderator: this.lastEditActorDisplayName })
 			}
 
 		},
diff --git a/src/components/NewMessage/NewMessage.vue b/src/components/NewMessage/NewMessage.vue
index f8d091cf613..7f69399352f 100644
--- a/src/components/NewMessage/NewMessage.vue
+++ b/src/components/NewMessage/NewMessage.vue
@@ -83,7 +83,9 @@
 					</NcButton>
 				</div>
 				<div v-if="parentMessage || messageToEdit" class="new-message-form__quote">
-					<Quote is-new-message-quote :edit-message="!!messageToEdit" v-bind="messageToEdit ?? parentMessage" />
+					<Quote v-bind="messageToEdit ?? parentMessage"
+						:can-cancel="!!parentMessage"
+						:edit-message="!!messageToEdit" />
 				</div>
 				<NcRichContenteditable ref="richContenteditable"
 					v-shortkey.once="$options.disableKeyboardShortcuts ? null : ['c']"
@@ -111,17 +113,27 @@
 				@audio-file="handleAudioFile" />
 
 			<!-- Edit -->
-			<NcButton v-else-if="messageToEdit"
-				:disabled="disabledEdit"
-				type="tertiary"
-				native-type="submit"
-				:title="t('spreed', 'Edit message')"
-				:aria-label="t('spreed', 'Edit message')"
-				@click="handleEdit">
-				<template #icon>
-					<CheckBold :size="16" />
-				</template>
-			</NcButton>
+			<template v-else-if="messageToEdit">
+				<NcButton type="tertiary"
+					native-type="submit"
+					:title="t('spreed', 'Cancel editing')"
+					:aria-label="t('spreed', 'Cancel editing')"
+					@click="handleAbortEdit">
+					<template #icon>
+						<CloseIcon :size="20" />
+					</template>
+				</NcButton>
+				<NcButton :disabled="disabledEdit"
+					type="tertiary"
+					native-type="submit"
+					:title="t('spreed', 'Edit message')"
+					:aria-label="t('spreed', 'Edit message')"
+					@click="handleEdit">
+					<template #icon>
+						<CheckIcon :size="20" />
+					</template>
+				</NcButton>
+			</template>
 
 			<!-- Send buttons -->
 			<template v-else>
@@ -176,7 +188,8 @@
 
 <script>
 import BellOff from 'vue-material-design-icons/BellOff.vue'
-import CheckBold from 'vue-material-design-icons/CheckBold.vue'
+import CheckIcon from 'vue-material-design-icons/Check.vue'
+import CloseIcon from 'vue-material-design-icons/Close.vue'
 import EmoticonOutline from 'vue-material-design-icons/EmoticonOutline.vue'
 import Send from 'vue-material-design-icons/Send.vue'
 
@@ -232,7 +245,8 @@ export default {
 		Quote,
 		// Icons
 		BellOff,
-		CheckBold,
+		CheckIcon,
+		CloseIcon,
 		EmoticonOutline,
 		Send,
 	},
@@ -917,7 +931,11 @@ export default {
 				// Remove stored absence status
 				this.chatExtrasStore.removeUserAbsence(this.token)
 			}
-		}
+		},
+
+		handleAbortEdit() {
+			this.chatExtrasStore.removeMessageIdToEdit(this.token)
+		},
 	},
 }
 </script>
diff --git a/src/components/Quote.vue b/src/components/Quote.vue
index 5c69660b3a6..3a0ac23fa52 100644
--- a/src/components/Quote.vue
+++ b/src/components/Quote.vue
@@ -40,7 +40,8 @@ components.
 					:size="AVATAR.SIZE.EXTRA_SMALL"
 					disable-menu />
 				{{ getDisplayName }}
-				<div v-if="editMessage">
+				<div v-if="editMessage" class="quote__main__edit-hint">
+					<PencilIcon :size="20" />
 					{{ t('spreed', '(editing)') }}
 				</div>
 			</div>
@@ -54,7 +55,7 @@ components.
 				<p dir="auto">{{ shortenedQuoteMessage }}</p>
 			</blockquote>
 		</div>
-		<div v-if="isNewMessageQuote" class="quote__main__right">
+		<div v-if="canCancel" class="quote__main__right">
 			<NcButton type="tertiary"
 				:aria-label="cancelQuoteLabel"
 				@click="handleAbort">
@@ -68,6 +69,7 @@ components.
 
 <script>
 import Close from 'vue-material-design-icons/Close.vue'
+import PencilIcon from 'vue-material-design-icons/Pencil.vue'
 
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcRichText from '@nextcloud/vue/dist/Components/NcRichText.js'
@@ -87,6 +89,7 @@ export default {
 		NcButton,
 		Close,
 		NcRichText,
+		PencilIcon,
 	},
 	props: {
 		actorId: {
@@ -139,7 +142,7 @@ export default {
 		 * If the quote component is used in the `NewMessage` component we display
 		 * the remove button.
 		 */
-		isNewMessageQuote: {
+		canCancel: {
 			type: Boolean,
 			default: false,
 		},
@@ -333,6 +336,11 @@ export default {
 				text-align: start;
 			}
 		}
+		&__edit-hint {
+			display: flex;
+			align-items: center;
+			gap: 4px;
+		}
 	}
 	&__right {
 		flex: 0 0 44px;

From c3799f20cb631c78ba64591b2c515cf38645d217 Mon Sep 17 00:00:00 2001
From: DorraJaouad <dorra.jaoued7@gmail.com>
Date: Wed, 17 Jan 2024 16:49:08 +0100
Subject: [PATCH 9/9] Last fixes

Signed-off-by: DorraJaouad <dorra.jaoued7@gmail.com>
---
 src/components/ChatView.vue                   |  5 --
 .../MessageButtonsBar/MessageButtonsBar.vue   | 68 ++++++-------------
 .../MessagesGroup/MessagesGroup.vue           | 13 ++++
 src/components/MessagesList/MessagesList.vue  | 49 +------------
 src/components/NewMessage/NewMessage.vue      |  4 +-
 src/store/messagesStore.js                    | 13 +---
 6 files changed, 39 insertions(+), 113 deletions(-)

diff --git a/src/components/ChatView.vue b/src/components/ChatView.vue
index 61c1610ea7e..d8d201241a5 100644
--- a/src/components/ChatView.vue
+++ b/src/components/ChatView.vue
@@ -174,11 +174,6 @@ export default {
 		this.containerId = this.container
 	},
 
-	beforeDestroy() {
-		EventBus.$off('editing-message')
-		EventBus.$off('message-edited')
-	},
-
 	methods: {
 
 		handleDragOver(event) {
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
index d8fc2a29a70..699756087a7 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
@@ -48,27 +48,8 @@
 				@open="onMenuOpen"
 				@close="onMenuClose">
 				<template v-if="submenu === null">
-					<!-- Message timestamp is a menu for editing details -->
-					<NcActionButton v-if="messageObject.lastEditTimestamp"
-						class="action--nested"
-						@click.stop="submenu = 'edit-history'">
-						<template #icon>
-							<span v-if="showCommonReadIcon"
-								:title="commonReadIconTooltip"
-								:aria-label="commonReadIconTooltip">
-								<CheckAll :size="16" />
-							</span>
-							<span v-else-if="showSentIcon"
-								:title="sentIconTooltip"
-								:aria-label="sentIconTooltip">
-								<Check :size="16" />
-							</span>
-							<ClockOutline v-else :size="16" />
-						</template>
-						{{ messageDateTime }}
-					</NcActionButton>
-					<!-- Message timestamp if there is no editing history -->
-					<NcActionText v-else>
+					<!-- Message timestamp -->
+					<NcActionText>
 						<template #icon>
 							<span v-if="showCommonReadIcon"
 								:title="commonReadIconTooltip"
@@ -84,6 +65,19 @@
 						</template>
 						{{ messageDateTime }}
 					</NcActionText>
+					<!-- Edited message timestamp -->
+					<NcActionButtonGroup v-if="messageObject.lastEditTimestamp">
+						<NcActionText>
+							<template #icon>
+								<ClockEditOutline :size="16" />
+							</template>
+							{{ messageObject.lastEditActorDisplayName }}
+						</NcActionText>
+						<NcActionText>
+							{{ editedDateTime }}
+						</NcActionText>
+					</NcActionButtonGroup>
+					<NcActionSeparator />
 
 					<NcActionButton v-if="supportReminders"
 						class="action--nested"
@@ -93,8 +87,6 @@
 						</template>
 						{{ t('spreed', 'Set reminder') }}
 					</NcActionButton>
-
-					<NcActionSeparator />
 					<NcActionButton v-if="isPrivateReplyable"
 						close-after-click
 						@click.stop="handlePrivateReply">
@@ -236,24 +228,6 @@
 						{{ t('spreed', 'Set custom reminder') }}
 					</NcActionButton>
 				</template>
-
-				<template v-else-if="submenu === 'edit-history'">
-					<NcActionButton :aria-label="t('spreed', 'Back')"
-						@click.stop="submenu = null">
-						<template #icon>
-							<ArrowLeft />
-						</template>
-						{{ t('spreed', 'Back') }}
-					</NcActionButton>
-					<NcActionText>
-						{{ t('spreed', 'Edited by: {actor}',
-							{actor : messageObject.lastEditActorDisplayName}) }}
-					</NcActionText>
-					<NcActionSeparator />
-					<NcActionText>
-						{{ editedDateTime }}
-					</NcActionText>
-				</template>
 			</NcActions>
 		</template>
 
@@ -305,6 +279,7 @@ import ArrowLeft from 'vue-material-design-icons/ArrowLeft.vue'
 import CalendarClock from 'vue-material-design-icons/CalendarClock.vue'
 import Check from 'vue-material-design-icons/Check.vue'
 import CheckAll from 'vue-material-design-icons/CheckAll.vue'
+import ClockEditOutline from 'vue-material-design-icons/ClockEditOutline.vue'
 import ClockOutline from 'vue-material-design-icons/ClockOutline.vue'
 import CloseCircleOutline from 'vue-material-design-icons/CloseCircleOutline.vue'
 import ContentCopy from 'vue-material-design-icons/ContentCopy.vue'
@@ -325,6 +300,7 @@ import { showError, showSuccess } from '@nextcloud/dialogs'
 import moment from '@nextcloud/moment'
 
 import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+import NcActionButtonGroup from '@nextcloud/vue/dist/Components/NcActionButtonGroup.js'
 import NcActionInput from '@nextcloud/vue/dist/Components/NcActionInput.js'
 import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink.js'
 import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
@@ -349,6 +325,7 @@ export default {
 
 	components: {
 		MessageForwarder,
+		NcActionButtonGroup,
 		NcActionButton,
 		NcActionInput,
 		NcActionLink,
@@ -365,6 +342,7 @@ export default {
 		CloseCircleOutline,
 		Check,
 		CheckAll,
+		ClockEditOutline,
 		ClockOutline,
 		ContentCopy,
 		DeleteIcon,
@@ -538,12 +516,12 @@ export default {
 		},
 
 		isEditable() {
-			if (!this.isModifiable || this.isObjectShare) {
+			if (!this.isModifiable || this.isObjectShare
+					|| (!this.$store.getters.isModerator && !this.isMyMsg)) {
 				return false
 			}
 
 			return (moment(this.timestamp * 1000).add(1, 'd')) > moment()
-				&& (this.$store.getters.isModerator || this.isMyMsg)
 		},
 
 		isDeleteable() {
@@ -881,8 +859,4 @@ export default {
 		background: no-repeat center var(--icon-triangle-e-dark);
 	}
 }
-
-:deep(.action-text) {
-	padding-left: 5px;
-}
 </style>
diff --git a/src/components/MessagesList/MessagesGroup/MessagesGroup.vue b/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
index 3a176ea6eef..e1f683560f0 100644
--- a/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
+++ b/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
@@ -92,6 +92,19 @@ export default {
 			default: 0,
 		},
 
+		lastEditTimestamp: {
+			type: Number,
+			default: 0,
+		},
+		lastEditActorId: {
+			type: String,
+			default: '',
+		},
+		lastEditActorType: {
+			type: String,
+			default: '',
+		},
+
 		lastEditActorDisplayName: {
 			type: String,
 			default: ''
diff --git a/src/components/MessagesList/MessagesList.vue b/src/components/MessagesList/MessagesList.vue
index 19fae2479dc..bf5693e1ad2 100644
--- a/src/components/MessagesList/MessagesList.vue
+++ b/src/components/MessagesList/MessagesList.vue
@@ -635,54 +635,7 @@ export default {
 		},
 
 		handleMessageEdited(id) {
-			// regroup messagesGroupedByAuthor when a message is edited
-			// find the group that contains the id and split it into 3 groups
-			// 1. the messages before the edited message
-			// 2. the edited message
-			// 3. the messages after the edited message
-			const groups = this.messagesGroupedByAuthor
-			const groupIndex = groups.findIndex(group => group.messages.some(message => message.id === id))
-			if (groupIndex === -1) {
-				return
-			}
-			// split the group into 3 groups
-			const group = groups[groupIndex]
-			const messageIndex = group.messages.findIndex(message => message.id === id)
-			const beforeMessages = group.messages.slice(0, messageIndex)
-			const afterMessages = group.messages.slice(messageIndex + 1)
-			const editedMessage = group.messages[messageIndex]
-			// remove the old group and add the 3 new groups at the same index
-			groups.splice(groupIndex, 1,
-				...(beforeMessages.length
-					? [{
-						id: beforeMessages[0].id,
-						messages: beforeMessages,
-						dateSeparator: group.dateSeparator,
-						previousMessageId: group.previousMessageId,
-						nextMessageId: editedMessage.id,
-						isSystemMessagesGroup: group.isSystemMessagesGroup,
-					}]
-					: []),
-				{
-					id: editedMessage.id,
-					messages: [editedMessage],
-					dateSeparator: group.dateSeparator,
-					previousMessageId: beforeMessages.length ? beforeMessages.at(-1).id : group.previousMessageId,
-					nextMessageId: afterMessages.length ? afterMessages[0].id : group.nextMessageId,
-					isSystemMessagesGroup: group.isSystemMessagesGroup,
-				},
-				...(afterMessages.length
-					? [{
-						id: afterMessages[0].id,
-						messages: afterMessages,
-						dateSeparator: group.dateSeparator,
-						previousMessageId: editedMessage.id,
-						nextMessageId: group.nextMessageId,
-						isSystemMessagesGroup: group.isSystemMessagesGroup,
-					}]
-					: []),
-			)
-
+			this.messagesGroupedByAuthor = this.prepareMessagesGroups(this.messagesList)
 		},
 
 		/**
diff --git a/src/components/NewMessage/NewMessage.vue b/src/components/NewMessage/NewMessage.vue
index 7f69399352f..32465f500ed 100644
--- a/src/components/NewMessage/NewMessage.vue
+++ b/src/components/NewMessage/NewMessage.vue
@@ -675,12 +675,12 @@ export default {
 
 		async handleEdit() {
 			try {
-				await editMessage({
+				const response = await editMessage({
 					token: this.token,
 					messageId: this.messageToEdit.id,
 					updatedMessage: this.text.trim()
 				})
-				EventBus.$emit('message-edited', this.messageToEdit.id)
+				this.$store.dispatch('processMessage', { token: this.token, message: response.data.ocs.data })
 				this.chatExtrasStore.removeMessageIdToEdit(this.token)
 			} catch {
 				this.$emit('failure')
diff --git a/src/store/messagesStore.js b/src/store/messagesStore.js
index 8640c6e737f..a4e78d0765e 100644
--- a/src/store/messagesStore.js
+++ b/src/store/messagesStore.js
@@ -32,6 +32,7 @@ import {
 	CONVERSATION,
 } from '../constants.js'
 import { fetchNoteToSelfConversation } from '../services/conversationsService.js'
+import { EventBus } from '../services/EventBus.js'
 import {
 	deleteMessage,
 	updateLastReadMessage,
@@ -536,7 +537,7 @@ const actions = {
 			if (Object.keys(parentInStore).length !== 0) {
 				context.commit('addMessage', { token, message: message.parent })
 				if (message.systemMessage === 'message_edited') {
-					// End of process for edited messages
+					EventBus.$emit('message-edited')
 					return
 				}
 			}
@@ -561,16 +562,6 @@ const actions = {
 			return
 		}
 
-		if (message.parent && message.systemMessage === 'message_edited') {
-			// If parent message is presented in store already, we update it
-			const parentInStore = context.getters.message(message.token, message.parent.id)
-			if (Object.keys(parentInStore).length !== 0) {
-				context.commit('addMessage', message.parent)
-				return
-			}
-			return
-		}
-
 		if (message.referenceId) {
 			const tempMessages = context.getters.getTemporaryReferences(token, message.referenceId)
 			tempMessages.forEach(tempMessage => {