Use original timestamps for pull events

This commit is contained in:
Andras Schmelczer 2025-10-26 14:00:45 +00:00
parent de744a3946
commit f3bc3c58d1
3 changed files with 9 additions and 5 deletions

View file

@ -4,7 +4,7 @@
background-color: var(--color-base-00);
border-radius: var(--radius-l);
container-type: inline-size;
word-break: break-all;
word-break: break-word;
&.clickable {
cursor: pointer;

View file

@ -228,7 +228,8 @@ export class UnrestrictedSyncer {
},
message:
"File has been deleted remotely, so we deleted it locally",
author: response.userId
author: response.userId,
timestamp: new Date(response.updatedDate)
});
this.database.delete(document.relativePath);
@ -325,7 +326,8 @@ export class UnrestrictedSyncer {
status: SyncStatus.SUCCESS,
details: actualUpdateDetails,
message: `Successfully downloaded remotely updated file from the server`,
author: response.userId
author: response.userId,
timestamp: new Date(response.updatedDate)
});
}
});
@ -429,7 +431,8 @@ export class UnrestrictedSyncer {
status: SyncStatus.SUCCESS,
details: updateDetails,
message: `Successfully downloaded remote file which hadn't existed locally`,
author: remoteVersion.userId
author: remoteVersion.userId,
timestamp: new Date(remoteVersion.updatedDate)
});
});
}

View file

@ -39,6 +39,7 @@ export interface CommonHistoryEntry {
message: string;
details: SyncDetails;
author?: string;
timestamp?: Date;
}
export enum SyncType {
@ -92,7 +93,7 @@ export class SyncHistory {
public addHistoryEntry(entry: CommonHistoryEntry): void {
const historyEntry = {
...entry,
timestamp: new Date()
timestamp: entry.timestamp ?? new Date()
};
const candidate = this.findSimilarRecentUpdateEntry(historyEntry);