Skip to content

fix(useGetMessages): better handle race condition for chat context #16185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Antreesy merged 1 commit into from
Oct 23, 2025
Merged

fix(useGetMessages): better handle race condition for chat context #16185

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions src/composables/useGetMessages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import type {
import Axios from '@nextcloud/axios'
import { subscribe, unsubscribe } from '@nextcloud/event-bus'
import { computed, inject, onBeforeUnmount, provide, ref, watch } from 'vue'
import { START_LOCATION, useRoute, useRouter } from 'vue-router'
import { START_LOCATION, useRoute } from 'vue-router'
import { useStore } from 'vuex'
import { CHAT, MESSAGE } from '../constants.ts'
import { EventBus } from '../services/EventBus.ts'
Expand Down Expand Up @@ -60,7 +60,6 @@ let pollingErrorTimeout = 1_000
*/
export function useGetMessagesProvider() {
const store = useStore()
const router = useRouter()
const route = useRoute()
const chatStore = useChatStore()
const chatExtrasStore = useChatExtrasStore()
Expand Down Expand Up @@ -136,17 +135,11 @@ export function useGetMessagesProvider() {
return lastKnownMessageId >= conversationLastMessageId.value
})

/** Initial check to ensure context is created once route is available */
router.isReady().then(() => {
if (currentToken.value && isParticipant.value && !isInLobby.value) {
handleStartGettingMessagesPreconditions(currentToken.value)
}
})

watch(
[currentToken, () => isParticipant.value && !isInLobby.value],
([newToken, canGetMessages], [oldToken, _oldCanGetMessages]) => {
if (route.name === START_LOCATION.name) { // Direct object comparison does not work
// Skip potential initial check to ensure route is available
return
}
if (oldToken && oldToken !== newToken) {
Expand All @@ -162,6 +155,7 @@ export function useGetMessagesProvider() {
/** Remove expired messages when joining a room */
store.dispatch('removeExpiredMessages', { token: newToken })
},
{ immediate: true },
)

subscribe('networkOffline', handleNetworkOffline)
Expand Down