Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-22 22:49:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: enable merge conflict detection for sse

Browse Source
This commit is contained in:
thecodrr
2020-12-08 10:37:36 +05:00
parent 24d7b21a1d
commit 6746df2b7c
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/core/api/sync/index.js
View File

@@ -93,9 +93,6 @@ export default class Sync {
async eventMerge(serverResponse) { async eventMerge(serverResponse) {
let { lastSynced } = await this._performChecks(); let { lastSynced } = await this._performChecks();
// we update the last synced time before merging so there are no conflicts
lastSynced = serverResponse.lastSynced;
// merge the server response // merge the server response
await this._merger.merge(serverResponse, lastSynced); await this._merger.merge(serverResponse, lastSynced);
@@ -103,8 +100,8 @@ export default class Sync {
await this._db.conflicts.check(); await this._db.conflicts.check();
// update our lastSynced time // update our lastSynced time
if (lastSynced) { if (serverResponse.lastSynced) {
await this._db.user.set({ lastSynced }); await this._db.user.set({ lastSynced: serverResponse.lastSynced });
} }
} }