fix bluesky bookmark state

Tlaster · Tlaster · commit 9faa24c75bc6 · 2025-09-12T11:50:11.000+09:00
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyDataSource.kt
@@ -2361,10 +2361,23 @@ internal class BlueskyDataSource(
         )
 
     override fun bookmark(
+        statusKey: MicroBlogKey,
         uri: String,
         cid: String,
     ) {
         coroutineScope.launch {
+            updateStatusUseCase<StatusContent.Bluesky>(
+                statusKey = statusKey,
+                accountKey = accountKey,
+                cacheDatabase = database,
+            ) { content ->
+                content.copy(
+                    data =
+                        content.data.copy(
+                            viewer = content.data.viewer?.copy(bookmarked = true),
+                        ),
+                )
+            }
             tryRun {
                 service
                     .createBookmark(
@@ -2375,12 +2388,40 @@ internal class BlueskyDataSource(
                     ).requireResponse()
             }.onFailure {
                 it.printStackTrace()
+                // rollback
+                updateStatusUseCase<StatusContent.Bluesky>(
+                    statusKey = statusKey,
+                    accountKey = accountKey,
+                    cacheDatabase = database,
+                ) { content ->
+                    content.copy(
+                        data =
+                            content.data.copy(
+                                viewer = content.data.viewer?.copy(bookmarked = false),
+                            ),
+                    )
+                }
             }
         }
     }
 
-    override fun unbookmark(uri: String) {
+    override fun unbookmark(
+        statusKey: MicroBlogKey,
+        uri: String,
+    ) {
         coroutineScope.launch {
+            updateStatusUseCase<StatusContent.Bluesky>(
+                statusKey = statusKey,
+                accountKey = accountKey,
+                cacheDatabase = database,
+            ) { content ->
+                content.copy(
+                    data =
+                        content.data.copy(
+                            viewer = content.data.viewer?.copy(bookmarked = false),
+                        ),
+                )
+            }
             tryRun {
                 service
                     .deleteBookmark(
@@ -2390,6 +2431,19 @@ internal class BlueskyDataSource(
                     ).requireResponse()
             }.onFailure {
                 it.printStackTrace()
+                // rollback
+                updateStatusUseCase<StatusContent.Bluesky>(
+                    statusKey = statusKey,
+                    accountKey = accountKey,
+                    cacheDatabase = database,
+                ) { content ->
+                    content.copy(
+                        data =
+                            content.data.copy(
+                                viewer = content.data.viewer?.copy(bookmarked = true),
+                            ),
+                    )
+                }
             }
         }
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/StatusEvent.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/StatusEvent.kt
@@ -117,11 +117,15 @@ internal sealed interface StatusEvent {
         )
 
         fun bookmark(
+            statusKey: MicroBlogKey,
             uri: String,
             cid: String,
         )
 
-        fun unbookmark(uri: String)
+        fun unbookmark(
+            statusKey: MicroBlogKey,
+            uri: String,
+        )
 
         fun likeWithResult(
             statusKey: MicroBlogKey,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Bluesky.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Bluesky.kt
@@ -510,10 +510,12 @@ internal fun PostView.renderStatus(
                                 onClicked = {
                                     if (viewer?.bookmarked == true) {
                                         event.unbookmark(
+                                            statusKey = statusKey,
                                             uri = uri.atUri,
                                         )
                                     } else {
                                         event.bookmark(
+                                            statusKey = statusKey,
                                             uri = uri.atUri,
                                             cid = cid.cid,
                                         )

Original file line number	Diff line number	Diff line change
`@@ -117,11 +117,15 @@ internal sealed interface StatusEvent {`
`117`	`117`	`)`
`118`	`118`
`119`	`119`	`fun bookmark(`
	`120`	`+ statusKey: MicroBlogKey,`
`120`	`121`	`uri: String,`
`121`	`122`	`cid: String,`
`122`	`123`	`)`
`123`	`124`
`124`		`- fun unbookmark(uri: String)`
	`125`	`+ fun unbookmark(`
	`126`	`+ statusKey: MicroBlogKey,`
	`127`	`+ uri: String,`
	`128`	`+ )`
`125`	`129`
`126`	`130`	`fun likeWithResult(`
`127`	`131`	`statusKey: MicroBlogKey,`
Original file line number	Diff line number	Diff line change
`@@ -510,10 +510,12 @@ internal fun PostView.renderStatus(`
`510`	`510`	`onClicked = {`
`511`	`511`	`if (viewer?.bookmarked == true) {`
`512`	`512`	`event.unbookmark(`
	`513`	`+ statusKey = statusKey,`
`513`	`514`	`uri = uri.atUri,`
`514`	`515`	`)`
`515`	`516`	`} else {`
`516`	`517`	`event.bookmark(`
	`518`	`+ statusKey = statusKey,`
`517`	`519`	`uri = uri.atUri,`
`518`	`520`	`cid = cid.cid,`
`519`	`521`	`)`