diff --git a/src/client/initMatrix.ts b/src/client/initMatrix.ts index 826996533..7f51bcabd 100644 --- a/src/client/initMatrix.ts +++ b/src/client/initMatrix.ts @@ -1,5 +1,5 @@ import type { CryptoCallbacks, MatrixClient } from '$types/matrix-sdk'; -import { createClient, IndexedDBStore, IndexedDBCryptoStore, SlidingSyncEvent, SlidingSyncState } from '$types/matrix-sdk'; +import { createClient, IndexedDBStore, IndexedDBCryptoStore } from '$types/matrix-sdk'; import { clearNavToActivePathStore } from '$state/navToActivePath'; import type { Session, Sessions, SessionStoreName } from '$state/sessions'; @@ -30,24 +30,16 @@ function installStartupFetchRoomEventPatch(mx: MatrixClient, slidingSyncManager: const mxWritable = mx as MatrixClientWithWritableFetchRoomEvent; const origFetchRoomEvent = mx.fetchRoomEvent.bind(mx); - let restored = false; const restore = () => { - if (restored) return; - restored = true; fetchRoomEventStartupCleanupByClient.delete(mx); mxWritable.fetchRoomEvent = origFetchRoomEvent; - slidingSyncManager.slidingSync.removeListener(SlidingSyncEvent.Lifecycle, onLifecycle); - }; - - const onLifecycle = (state: SlidingSyncState) => { - if (state === SlidingSyncState.Complete) { - restore(); - } }; mxWritable.fetchRoomEvent = (roomId: string, eventId: string) => { - if (restored) return origFetchRoomEvent(roomId, eventId); + if (slidingSyncManager.isRoomActive(roomId)) { + return origFetchRoomEvent(roomId, eventId); + } const cachedEvent = mx.getRoom(roomId)?.findEventById(eventId); const payload: FetchRoomEventResult = cachedEvent?.event ?? { event_id: eventId, @@ -56,7 +48,6 @@ function installStartupFetchRoomEventPatch(mx: MatrixClient, slidingSyncManager: return Promise.resolve(payload); }; - slidingSyncManager.slidingSync.on(SlidingSyncEvent.Lifecycle, onLifecycle); fetchRoomEventStartupCleanupByClient.set(mx, restore); } diff --git a/src/client/slidingSync.ts b/src/client/slidingSync.ts index a48ae2afb..123fce423 100644 --- a/src/client/slidingSync.ts +++ b/src/client/slidingSync.ts @@ -592,6 +592,10 @@ export class SlidingSyncManager { }); } + public isRoomActive(roomId: string): boolean { + return this.activeRoomSubscriptions.has(roomId); + } + public subscribeToRoom(roomId: string): void { if (this.disposed) return; const room = this.mx.getRoom(roomId);