mirror of
https://github.com/SableClient/Sable.git
synced 2026-11-20 17:11:17 -08:00
Respect sliding sync setting (#1036)
<!-- Please read https://github.com/SableClient/Sable/blob/dev/CONTRIBUTING.md before submitting your pull request --> ### Description <!-- Please include a summary of the change. Please also include relevant motivation and context. List any dependencies that are required for this change. --> Fixes # #### Type of change - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] This change requires a documentation update ### Checklist: - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings ### AI disclosure: - [ ] Partially AI assisted (clarify which code was AI assisted and briefly explain what it does). - [ ] Fully AI generated (explain what all the generated code does in moderate detail). <!-- Write any explanation required here, but do not generate the explanation using AI!! You must prove you understand what the code in this PR does. -->
This commit is contained in:
2 files changed
+26
-12
No files matched your search
@@ -0,0 +1,5 @@
|
||||
---
|
||||
default: patch
|
||||
---
|
||||
|
||||
Fix sliding sync being enabled when setting is disabled.
|
||||
+21
-12
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user