Merge pull request #1240 from DimensionDev/feature/bsky_bookmarks

add bookmark support for bluesky

Author: Tlaster

compose-ui/src/commonMain/kotlin/dev/dimension/flare/data/model/TabSettings.kt

@@ -490,6 +490,9 @@ public sealed interface TimelineTabItem : TabItem {
                             icon = IconType.Mixed(IconType.Material.MaterialIcon.Feeds, accountKey),
                         ),
                 ),
+                Bluesky.BookmarkTimelineTabItem(
+                    accountType = AccountType.Specific(accountKey),
+                ),
                 DirectMessageTabItem(
                     account = AccountType.Specific(accountKey),
                     metaData =
@@ -887,6 +890,30 @@ public object Bluesky {
 
         override fun update(metaData: TabMetaData): TabItem = copy(metaData = metaData)
     }
+
+    @Serializable
+    public data class BookmarkTimelineTabItem(
+        override val account: AccountType,
+        override val metaData: TabMetaData,
+    ) : TimelineTabItem {
+        override val key: String = "bookmark_$account"
+
+        override fun createPresenter(): TimelinePresenter =
+            dev.dimension.flare.ui.presenter.home.bluesky
+                .BlueskyBookmarkTimelinePresenter(account)
+
+        override fun update(metaData: TabMetaData): TabItem = copy(metaData = metaData)
+
+        public constructor(accountType: AccountType) :
+            this(
+                account = accountType,
+                metaData =
+                    TabMetaData(
+                        title = TitleType.Localized(TitleType.Localized.LocalizedKey.Bookmark),
+                        icon = IconType.Material(IconType.Material.MaterialIcon.Bookmark),
+                    ),
+            )
+    }
 }
 
 @Serializable

shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyDataSource.kt

@@ -13,6 +13,8 @@ import app.bsky.actor.PreferencesUnion
 import app.bsky.actor.PutPreferencesRequest
 import app.bsky.actor.SavedFeed
 import app.bsky.actor.SavedFeedType
+import app.bsky.bookmark.CreateBookmarkRequest
+import app.bsky.bookmark.DeleteBookmarkRequest
 import app.bsky.embed.Images
 import app.bsky.embed.ImagesImage
 import app.bsky.embed.Record
@@ -59,6 +61,7 @@ import com.atproto.repo.PutRecordRequest
 import com.atproto.repo.StrongRef
 import dev.dimension.flare.common.BasePagingSource
 import dev.dimension.flare.common.BaseRemoteMediator
+import dev.dimension.flare.common.BaseTimelineLoader
 import dev.dimension.flare.common.CacheData
 import dev.dimension.flare.common.Cacheable
 import dev.dimension.flare.common.FileItem
@@ -2349,6 +2352,101 @@ internal class BlueskyDataSource(
                 null
             },
         ).toPersistentList()
+
+    fun bookmarkTimeline(): BaseTimelineLoader =
+        BookmarkTimelineRemoteMediator(
+            service = service,
+            accountKey = accountKey,
+            database = database,
+        )
+
+    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(
+                        CreateBookmarkRequest(
+                            uri = AtUri(uri),
+                            cid = Cid(cid),
+                        ),
+                    ).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(
+        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(
+                        DeleteBookmarkRequest(
+                            uri = AtUri(uri),
+                        ),
+                    ).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),
+                            ),
+                    )
+                }
+            }
+        }
+    }
 }
 
 internal inline fun <reified T : Any> T.bskyJson(): JsonContent = bskyJson.encodeAsJsonContent(this)

shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/StatusEvent.kt

@@ -116,6 +116,17 @@ internal sealed interface StatusEvent {
             likedUri: String?,
         )
 
+        fun bookmark(
+            statusKey: MicroBlogKey,
+            uri: String,
+            cid: String,
+        )
+
+        fun unbookmark(
+            statusKey: MicroBlogKey,
+            uri: String,
+        )
+
         fun likeWithResult(
             statusKey: MicroBlogKey,
             cid: String,

shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Bluesky.kt

@@ -504,6 +504,24 @@ internal fun PostView.renderStatus(
                     displayItem = StatusAction.Item.More,
                     actions =
                         listOfNotNull(
+                            StatusAction.Item.Bookmark(
+                                count = 0,
+                                bookmarked = viewer?.bookmarked == true,
+                                onClicked = {
+                                    if (viewer?.bookmarked == true) {
+                                        event.unbookmark(
+                                            statusKey = statusKey,
+                                            uri = uri.atUri,
+                                        )
+                                    } else {
+                                        event.bookmark(
+                                            statusKey = statusKey,
+                                            uri = uri.atUri,
+                                            cid = cid.cid,
+                                        )
+                                    }
+                                },
+                            ),
                             if (isFromMe) {
                                 StatusAction.Item.Delete(
                                     onClicked = {

shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/bluesky/BlueskyBookmarkTimelinePresenter.kt

@@ -0,0 +1,28 @@
+package dev.dimension.flare.ui.presenter.home.bluesky
+
+import dev.dimension.flare.common.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.bluesky.BlueskyDataSource
+import dev.dimension.flare.data.repository.AccountRepository
+import dev.dimension.flare.data.repository.accountServiceFlow
+import dev.dimension.flare.model.AccountType
+import dev.dimension.flare.ui.presenter.home.TimelinePresenter
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+
+public class BlueskyBookmarkTimelinePresenter(
+    private val accountType: AccountType,
+) : TimelinePresenter(),
+    KoinComponent {
+    private val accountRepository: AccountRepository by inject()
+    override val loader: Flow<BaseTimelineLoader> by lazy {
+        accountServiceFlow(
+            accountType = accountType,
+            repository = accountRepository,
+        ).map { value ->
+            require(value is BlueskyDataSource)
+            value.bookmarkTimeline()
+        }
+    }
+}