Merge branch 'main' into cs-7985-implement-sliding-sync

packages/host/app/services/matrix-service.ts

@@ -497,9 +497,19 @@ export default class MatrixService extends Service {
       this.bindEventListeners();
 
       try {
+        let deviceId = this._client.getDeviceId();
+        if (deviceId) {
+          let { last_seen_ts } = await this._client.getDevice(deviceId);
+          if (last_seen_ts) {
+            this.startedAtTs = last_seen_ts;
+          }
+        }
+        if (this.startedAtTs === -1) {
+          this.startedAtTs = 0;
+        }
         await this.initSlidingSync();
         await this.client.startClient({ slidingSync: this.slidingSync });
-        let accountDataContent = await this.client.getAccountDataFromServer<{
+        let accountDataContent = await this._client.getAccountDataFromServer<{
           realms: string[];
         }>(APP_BOXEL_REALMS_EVENT_TYPE);
         await this.realmServer.setAvailableRealmURLs(

packages/host/tests/helpers/mock-matrix/_client.ts

@@ -689,4 +689,12 @@ export class MockClient implements ExtendedClient {
 
     return Promise.resolve(response);
   }
+
+  getDeviceId(): string | null {
+    return null;
+  }
+
+  getDevice(deviceId: string): Promise<MatrixSDK.IMyDevice> {
+    throw new Error(`Method not implemented: getDevice ${deviceId}`);
+  }
 }