rune/oai-swift
1
0
Fork 0
Code Issues Pull Requests Releases 12 Activity

Union favorites on tied timestamps instead of dropping one side

Browse Source 
Two machines that already had favorites before this sync feature
shipped will both have an empty favoriteModelsUpdatedAt, so the
first sync between them ties. Previously that meant the second
machine silently kept only its own set; now tied timestamps merge
via union and re-push, so no pre-existing favorites are lost.
This commit is contained in:
rune
2026-07-21 14:06:05 +02:00
parent fc786d48f8
commit 5db1b40552
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oAI/Services/BackupService.swift
+10 -1
View File
@@ -220,14 +220,23 @@ final class BackupService {
}
let localUpdatedAt = settings.favoriteModelsUpdatedAt
let localIds = settings.favoriteModelIds
if remote.updatedAt > localUpdatedAt {
settings.favoriteModelIds = Set(remote.ids)
settings.favoriteModelsUpdatedAt = remote.updatedAt
log.info("Applied \(remote.ids.count) favorite model(s) from iCloud (remote was newer)")
} else if localUpdatedAt > remote.updatedAt {
await pushFavorites()
} else if Set(remote.ids) != localIds {
// Tied timestamps (both empty is the common case: two machines that already had
// favorites before this sync feature existed, neither ever bumped the timestamp).
// Union rather than silently dropping one side's favorites.
settings.favoriteModelIds = localIds.union(remote.ids)
settings.favoriteModelsUpdatedAt = ISO8601DateFormatter().string(from: Date())
await pushFavorites()
log.info("Merged favorites from iCloud (tied timestamps) — union of \(localIds.count) local + \(remote.ids.count) remote")
}
// Equal timestamps: already in sync, nothing to do.
// Equal timestamps and identical sets: already in sync, nothing to do.
}
// MARK: - Automatic Backup