fix(MessagesList): reinitialize chat if focused messages is out of range

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
nextcloud · Jan 22, 2025 · 92972aa · 92972aa
1 parent f307f72
commit 92972aa
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 12 deletions.
diff --git a/src/components/MessagesList/MessagesList.vue b/src/components/MessagesList/MessagesList.vue
@@ -1165,6 +1165,11 @@ export default {
 
 				let newTop
 				if (options?.force) {
+					if (this.$route?.hash?.startsWith('#message_')) {
+						// drop the hash, route change will handle scrolling
+						this.$router.replace({ ...this.$route, hash: '' })
+						return
+					}
 					newTop = this.$refs.scroller.scrollHeight
 					this.setChatScrolledToBottom(true)
 				} else if (!this.isSticky) {
@@ -1290,8 +1295,20 @@ export default {
 				&& from.token === to.token
 				&& from.hash !== to.hash) {
 
-				// the hash changed, need to focus/highlight another message
-				if (to.hash && to.hash.startsWith('#message_')) {
+				if (from.hash?.startsWith('#message_') && !to.hash) {
+					// the hash is cleared
+					const lastMessageId = this.conversation.lastMessage.id
+					if (this.messagesList.find(m => m.id === lastMessageId)) {
+						this.scrollToBottom({ smooth: false })
+					} else {
+						this.$store.dispatch('cancelLookForNewMessages', { requestId: this.chatIdentifier })
+						this.$store.dispatch('purgeMessagesStore', this.token)
+						this.$nextTick(async () => {
+							await this.handleStartGettingMessagesPreconditions(this.token)
+						})
+					}
+				} else if (to.hash?.startsWith('#message_')) {
+					// the hash changed, need to focus/highlight another message
 					const focusedId = this.getMessageIdFromHash(to.hash)
 					if (this.messagesList.find(m => m.id === focusedId)) {
 						// need some delay (next tick is too short) to be able to run
@@ -1302,17 +1319,13 @@ export default {
 							this.focusMessage(focusedId, true)
 						}, 2)
 					} else {
-						// Update environment around context to fill the gaps
-						this.$store.dispatch('setFirstKnownMessageId', {
-							token: this.token,
-							id: focusedId,
-						})
-						this.$store.dispatch('setLastKnownMessageId', {
-							token: this.token,
-							id: focusedId,
+						this.isFocusingMessage = true
+						this.$store.dispatch('cancelLookForNewMessages', { requestId: this.chatIdentifier })
+						this.$store.dispatch('purgeMessagesStore', this.token)
+						this.$nextTick(async () => {
+							await this.handleStartGettingMessagesPreconditions(this.token)
+							this.setChatScrolledToBottom(false, { auto: true })
 						})
-						await this.getMessageContext(this.token, focusedId)
-						this.focusMessage(focusedId, true)
 					}
 				}
 			}

diff --git a/src/store/messagesStore.js b/src/store/messagesStore.js
@@ -413,6 +413,9 @@ const mutations = {
 		if (state.messages[token]) {
 			Vue.delete(state.messages, token)
 		}
+		if (state.loadedMessages[token]) {
+			Vue.delete(state.loadedMessages, token)
+		}
 	},
 
 	/**