diff --git a/.changeset/fix-sliding-sync-force-enable.md b/.changeset/fix-sliding-sync-force-enable.md new file mode 100644 index 000000000..16f07c500 --- /dev/null +++ b/.changeset/fix-sliding-sync-force-enable.md @@ -0,0 +1,5 @@ +--- +default: patch +--- + +Fix sliding sync being enabled when setting is disabled. diff --git a/src/client/initMatrix.ts b/src/client/initMatrix.ts index 26b72e8f0..61766bc19 100644 --- a/src/client/initMatrix.ts +++ b/src/client/initMatrix.ts @@ -402,37 +402,46 @@ export const startClient = async (mx: MatrixClient, config?: StartClientConfig): debugLog.info('sync', 'Starting Matrix client', { userId: mx.getUserId() }); disposeSlidingSync(mx); disposePresenceSync(mx); + const slidingConfig = config?.slidingSync; const proxyBaseUrl = slidingConfig?.proxyBaseUrl ?? config?.baseUrl ?? mx.baseUrl; - - const manager = new SlidingSyncManager(mx, proxyBaseUrl, { - ...slidingConfig, - includeInviteList: true, - pollTimeoutMs: slidingConfig?.pollTimeoutMs ?? SLIDING_SYNC_POLL_TIMEOUT_MS, - }); + const useSliding = + config?.sessionSlidingSyncOptIn === true && + !!slidingConfig && + resolveSlidingEnabled(slidingConfig?.enabled); const presenceManager = new PresenceSyncManager(mx); presenceSyncByClient.set(mx, presenceManager); presenceManager.start(); - installStartupFetchRoomEventPatch(mx, manager); - installSlidingSyncConnId(mx); + let manager: SlidingSyncManager | undefined; - manager.attach(); - slidingSyncByClient.set(mx, manager); + if (useSliding) { + manager = new SlidingSyncManager(mx, proxyBaseUrl, { + ...slidingConfig, + includeInviteList: true, + pollTimeoutMs: slidingConfig?.pollTimeoutMs ?? SLIDING_SYNC_POLL_TIMEOUT_MS, + }); + + installStartupFetchRoomEventPatch(mx, manager); + installSlidingSyncConnId(mx); + + manager.attach(); + slidingSyncByClient.set(mx, manager); + } try { await mx.startClient({ lazyLoadMembers: true, - slidingSync: manager.slidingSync, + slidingSync: manager?.slidingSync, threadSupport: true, }); } catch (err) { debugLog.error('network', 'Failed to start client with sliding sync', { error: err instanceof Error ? err.message : String(err), userId: mx.getUserId(), - proxyBaseUrl: proxyBaseUrl, + proxyBaseUrl: useSliding ? proxyBaseUrl : undefined, stack: err instanceof Error ? err.stack : undefined, }); disposeSlidingSync(mx);