Skip to content

Open source CapCut alternative.

TypeScript

fix(ios): a listing without folders leaves this phone's alone

David Lec47686dad894
diff --git a/apps/ios/Donkey/Controllers/CutCloudClient.swift b/apps/ios/Donkey/Controllers/CutCloudClient.swift
index fd086eaa..e154a01e 100644
--- a/apps/ios/Donkey/Controllers/CutCloudClient.swift
+++ b/apps/ios/Donkey/Controllers/CutCloudClient.swift
@@ -334,7 +334,8 @@ extension CutCloudClient: CloudSyncServicing {
},
// Folders are keyed by the id whichever client made them chose,
// and both clients mint UUIDs; anything else is not this phone's.
- folders: (response.folders ?? []).compactMap { dto in
+ // A missing key stays nil so the merge can tell it from "none".
+ folders: response.folders?.compactMap { dto in
guard let id = UUID(uuidString: dto.id) else { return nil }
return RemoteNoteFolder(
id: id,
diff --git a/apps/ios/DonkeyKit/Sources/DonkeyKitModels/CloudSync.swift b/apps/ios/DonkeyKit/Sources/DonkeyKitModels/CloudSync.swift
index 35c2cea0..abe83525 100644
--- a/apps/ios/DonkeyKit/Sources/DonkeyKitModels/CloudSync.swift
+++ b/apps/ios/DonkeyKit/Sources/DonkeyKitModels/CloudSync.swift
@@ -128,11 +128,16 @@ nonisolated public struct RemoteNoteFolder: Equatable, Sendable {
/// One listing of the account's notes: the notes themselves, tombstones
/// included, and every folder they file into.
+///
+/// `folders` is nil when the listing carried no folder key at all — an older
+/// site speaking to a newer phone. A reader treats that as "this response says
+/// nothing about folders", which is different from an empty list meaning the
+/// account has none.
nonisolated public struct RemoteNotes: Equatable, Sendable {
public var notes: [RemoteNote]
- public var folders: [RemoteNoteFolder]
+ public var folders: [RemoteNoteFolder]?
- public init(notes: [RemoteNote], folders: [RemoteNoteFolder]) {
+ public init(notes: [RemoteNote], folders: [RemoteNoteFolder]?) {
self.notes = notes
self.folders = folders
}
diff --git a/apps/ios/DonkeyKit/Sources/DonkeyKitModels/SyncEngine.swift b/apps/ios/DonkeyKit/Sources/DonkeyKitModels/SyncEngine.swift
index 19de83ac..a66fba7e 100644
--- a/apps/ios/DonkeyKit/Sources/DonkeyKitModels/SyncEngine.swift
+++ b/apps/ios/DonkeyKit/Sources/DonkeyKitModels/SyncEngine.swift
@@ -355,7 +355,12 @@ public final class SyncEngine {
/// Folders carry no tombstone in the cloud, so the listing is the truth:
/// what it holds is applied, and a folder this phone has clean that the
/// listing does not name was deleted on the other side.
- private func mergeRemoteFolders(_ remote: [RemoteNoteFolder]) throws {
+ ///
+ /// That truth holds only for a listing that reported folders. A nil one
+ /// came from a site that does not speak folders, and its silence leaves
+ /// this phone's folders where they are.
+ private func mergeRemoteFolders(_ remote: [RemoteNoteFolder]?) throws {
+ guard let remote else { return }
let pendingDeletes = Set(
((try? journal.tombstones()) ?? [])
.filter { $0.kind == .noteFolder }
diff --git a/apps/ios/DonkeyKit/Tests/DonkeyKitModelsTests/DonkeyKitModelsTests.swift b/apps/ios/DonkeyKit/Tests/DonkeyKitModelsTests/DonkeyKitModelsTests.swift
index 52353f09..e6cdcd67 100644
--- a/apps/ios/DonkeyKit/Tests/DonkeyKitModelsTests/DonkeyKitModelsTests.swift
+++ b/apps/ios/DonkeyKit/Tests/DonkeyKitModelsTests/DonkeyKitModelsTests.swift
@@ -137,6 +137,9 @@ import Testing
var downloads: [String] = []
var folders: [UUID: RemoteNoteFolder] = [:]
var deletedFolders: [UUID] = []
+ /// Whether the listing carries a folders key at all. A site that
+ /// predates folders answers without one.
+ var reportsFolders = true
/// What an import job answers with once it is asked about.
var imported: JobOutcome<ImportedLink> = .done(
ImportedLink(assetId: "asset-link", fileName: "source.mp4", isVideo: true)
@@ -176,7 +179,10 @@ import Testing
func fetchUsage() async throws -> StorageUsage { usage }
func fetchNotes() async throws -> RemoteNotes {
- RemoteNotes(notes: Array(notes.values), folders: Array(folders.values))
+ RemoteNotes(
+ notes: Array(notes.values),
+ folders: reportsFolders ? Array(folders.values) : nil
+ )
}
func putNote(_ note: RemoteNote) async throws -> RemoteNote {
@@ -415,6 +421,22 @@ import Testing
#expect(rig.ideas.notes(in: nil).count == 1)
}
+ @Test func aListingWithoutFoldersKeepsTheOnesHere() async throws {
+ let rig = try makeRig()
+ let folder = try #require(rig.ideas.addFolder(named: "Scripts"))
+ rig.ideas.openEditor(in: folder.id)
+ rig.ideas.draft?.body = "filed"
+ let note = try #require(rig.ideas.saveDraft())
+ await rig.engine.run()
+ // A site that does not speak folders answers without the key. Its
+ // silence says nothing about folders, so this phone keeps its own —
+ // an absent key is not an empty list.
+ rig.cloud.reportsFolders = false
+ await rig.engine.run()
+ #expect(rig.ideas.folders.map(\.id) == [folder.id])
+ #expect(rig.ideas.notes(in: folder.id).map(\.id) == [note.id])
+ }
+
@Test func folderDeletedHereReachesTheCloud() async throws {
let rig = try makeRig()
let folder = try #require(rig.ideas.addFolder(named: "Scripts"))