Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2026-07-19 22:02:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict resolver field names for recent channels and playlists

Browse Source 
The recent-channel resolver copied avatarURLString/providerName and the
recent-playlist resolver copied authorID/providerName - fields that do
not exist in the records the mapper writes - while missing the real
ones (thumbnailURLString, subscriberCount, isVerified, videoCount). As
a result, when the local side won a conflict, those fields silently
kept the older server values.

Also drop the notificationsEnabled preservation in the subscription
resolver: the subscription mapper never writes that field since
notification preferences moved to their own record type.
This commit is contained in:
Arkadiusz Fal
2026-07-14 23:50:04 +02:00
parent 959641b642
commit 10ca000387
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Yattee/Services/CloudKit/CloudKitConflictResolver.swift
View File

@@ -16,7 +16,6 @@ actor CloudKitConflictResolver {
///
/// Strategy:
/// - Keep record with most recent `lastUpdatedAt`
/// - EXCEPT: always preserve local `notificationsEnabled` preference
func resolveSubscriptionConflict(
local: CKRecord,
server: CKRecord
@@ -39,13 +38,7 @@ actor CloudKitConflictResolver {
resolved["lastUpdatedAt"] = local["lastUpdatedAt"]
resolved["providerName"] = local["providerName"]
}
// But always preserve local notification preference
// (user's device-specific setting should not be overwritten by other devices)
if let localNotifications = local["notificationsEnabled"] {
resolved["notificationsEnabled"] = localNotifications
}
return resolved
}
@@ -273,8 +266,9 @@ actor CloudKitConflictResolver {
// If local is newer, copy its fields to server record
if localVisited > serverVisited {
resolved["name"] = local["name"]
resolved["avatarURLString"] = local["avatarURLString"]
resolved["providerName"] = local["providerName"]
resolved["thumbnailURLString"] = local["thumbnailURLString"]
resolved["subscriberCount"] = local["subscriberCount"]
resolved["isVerified"] = local["isVerified"]
resolved["visitedAt"] = local["visitedAt"]
}
@@ -302,10 +296,8 @@ actor CloudKitConflictResolver {
if localVisited > serverVisited {
resolved["title"] = local["title"]
resolved["authorName"] = local["authorName"]
resolved["authorID"] = local["authorID"]
resolved["thumbnailURLString"] = local["thumbnailURLString"]
resolved["videoCount"] = local["videoCount"]
resolved["providerName"] = local["providerName"]
resolved["thumbnailURLString"] = local["thumbnailURLString"]
resolved["visitedAt"] = local["visitedAt"]
}