Merge pull request #1654 from DimensionDev/bugfix/bsky_deeplink

Tlaster · web-flow · commit 65f3e2412b95 · 2025-12-19T14:39:59.000+09:00
fix bluesky post deeplink
diff --git a/app/src/main/java/dev/dimension/flare/ui/AppContainer.kt b/app/src/main/java/dev/dimension/flare/ui/AppContainer.kt
@@ -49,7 +49,9 @@ fun FlareApp(content: @Composable () -> Unit) {
             object : UriHandler {
                 override fun openUri(uri: String) {
                     if (uri.startsWith("http://") || uri.startsWith("https://")) {
-                        openInBrowser(context, uri, appearanceSettings.inAppBrowser)
+                        openInBrowser(context, uri, appearanceSettings.inAppBrowser) {
+                            originalUriHandler.openUri(uri)
+                        }
                     } else {
                         originalUriHandler.openUri(uri)
                     }
@@ -120,20 +122,27 @@ private fun openInBrowser(
     context: Context,
     url: String,
     inAppBrowser: Boolean,
+    fallbackOpenUrl: (String) -> Unit,
 ) {
     val targetPackage = getNonSelfBrowserPackageName(context, url)
     if (targetPackage != null) {
-        if (inAppBrowser) {
-            val builder = CustomTabsIntent.Builder()
-            val customTabsIntent = builder.build()
-            customTabsIntent.intent.setPackage(targetPackage)
-            customTabsIntent.launchUrl(context, url.toUri())
-        } else {
-            val intent = Intent(Intent.ACTION_VIEW, url.toUri())
-            intent.addCategory(Intent.CATEGORY_BROWSABLE)
-            intent.setPackage(targetPackage)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            context.startActivity(intent)
+        runCatching {
+            if (inAppBrowser) {
+                val builder = CustomTabsIntent.Builder()
+                val customTabsIntent = builder.build()
+                customTabsIntent.intent.setPackage(targetPackage)
+                customTabsIntent.launchUrl(context, url.toUri())
+            } else {
+                val intent = Intent(Intent.ACTION_VIEW, url.toUri())
+                intent.addCategory(Intent.CATEGORY_BROWSABLE)
+                intent.setPackage(targetPackage)
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                context.startActivity(intent)
+            }
+        }.onFailure {
+            fallbackOpenUrl.invoke(url)
         }
+    } else {
+        fallbackOpenUrl.invoke(url)
     }
 }
diff --git a/app/src/main/java/dev/dimension/flare/ui/screen/status/StatusScreen.kt b/app/src/main/java/dev/dimension/flare/ui/screen/status/StatusScreen.kt
@@ -30,6 +30,7 @@ import dev.dimension.flare.ui.component.RefreshContainer
 import dev.dimension.flare.ui.component.platform.isBigScreen
 import dev.dimension.flare.ui.component.status.LazyStatusVerticalStaggeredGrid
 import dev.dimension.flare.ui.component.status.status
+import dev.dimension.flare.ui.model.takeSuccess
 import dev.dimension.flare.ui.presenter.invoke
 import dev.dimension.flare.ui.presenter.status.StatusContextPresenter
 import kotlinx.coroutines.launch
@@ -90,7 +91,10 @@ internal fun StatusScreen(
                 ) {
                     status(
                         state.state.listState,
-                        detailStatusKey = statusKey,
+                        detailStatusKey =
+                            state.state.current
+                                .takeSuccess()
+                                ?.statusKey,
                     )
                 }
             },
diff --git a/app/src/main/java/dev/dimension/flare/ui/theme/Theme.kt b/app/src/main/java/dev/dimension/flare/ui/theme/Theme.kt
@@ -51,6 +51,7 @@ private fun ColorScheme.withPureColorLightMode(): ColorScheme =
         surfaceContainerHighest = Color.White,
         onSurfaceVariant = MoreColors.Gray800,
         outlineVariant = MoreColors.Gray400,
+        outline = MoreColors.Gray600,
     )
 
 private fun ColorScheme.withPureColorDarkMode(): ColorScheme =
@@ -66,6 +67,7 @@ private fun ColorScheme.withPureColorDarkMode(): ColorScheme =
         surfaceContainerHighest = MoreColors.Gray900,
         onSurfaceVariant = MoreColors.Gray400,
         outlineVariant = MoreColors.Gray800,
+        outline = MoreColors.Gray500,
     )
 
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
diff --git a/compose-ui/src/androidMain/kotlin/dev/dimension/flare/ui/component/platform/PlatformCard.android.kt b/compose-ui/src/androidMain/kotlin/dev/dimension/flare/ui/component/platform/PlatformCard.android.kt
@@ -45,7 +45,12 @@ internal actual fun PlatformCard(
     if (onClick == null) {
         Card(
             modifier = modifier,
-            shape = shape ?: CardDefaults.shape,
+            shape =
+                shape ?: if (elevated) {
+                    CardDefaults.elevatedShape
+                } else {
+                    CardDefaults.shape
+                },
             colors = colors,
             elevation =
                 if (elevated) {
@@ -60,7 +65,12 @@ internal actual fun PlatformCard(
     } else {
         Card(
             modifier = modifier,
-            shape = shape ?: CardDefaults.shape,
+            shape =
+                shape ?: if (elevated) {
+                    CardDefaults.elevatedShape
+                } else {
+                    CardDefaults.shape
+                },
             colors = colors,
             elevation =
                 if (elevated) {
diff --git a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/status/StatusScreen.kt b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/status/StatusScreen.kt
@@ -19,9 +19,9 @@ import dev.dimension.flare.LocalWindowPadding
 import dev.dimension.flare.RegisterTabCallback
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.ui.common.plus
 import dev.dimension.flare.ui.component.status.LazyStatusVerticalStaggeredGrid
 import dev.dimension.flare.ui.component.status.status
+import dev.dimension.flare.ui.model.takeSuccess
 import dev.dimension.flare.ui.presenter.invoke
 import dev.dimension.flare.ui.presenter.status.StatusContextPresenter
 import io.github.composefluent.component.ProgressBar
@@ -53,7 +53,10 @@ internal fun StatusScreen(
         ) {
             status(
                 state.state.listState,
-                detailStatusKey = statusKey,
+                detailStatusKey =
+                    state.state.current
+                        .takeSuccess()
+                        ?.statusKey,
             )
         }
         if (state.isRefreshing) {
diff --git a/iosApp/flare/UI/Screen/StatusDetailScreen.swift b/iosApp/flare/UI/Screen/StatusDetailScreen.swift
@@ -4,8 +4,16 @@ import SwiftUI
 struct StatusDetailScreen: View {
     @Environment(\.horizontalSizeClass) private var horizontalSizeClass
     @Environment(\.openURL) private var openURL
-    @StateObject private var presenter: KotlinPresenter<TimelineState>
+    @StateObject private var presenter: KotlinPresenter<StatusContextPresenterState>
     private let statusKey: MicroBlogKey
+    private var detailStatusKey: MicroBlogKey? {
+        return switch onEnum(of: presenter.state.current) {
+        case .success(let data):
+            data.data.statusKey
+        default:
+            nil
+        }
+    }
 
     init(accountType: AccountType, statusKey: MicroBlogKey) {
         self.statusKey = statusKey
@@ -14,7 +22,7 @@ struct StatusDetailScreen: View {
 
     var body: some View {
         ZStack {
-            TimelinePagingContent(data: presenter.state.listState, detailStatusKey: statusKey, key: presenter.key)
+            TimelinePagingContent(data: presenter.state.listState, detailStatusKey: detailStatusKey, key: presenter.key)
                 .frame(maxWidth: horizontalSizeClass == .compact ? .infinity : 600, alignment: .center)
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity)
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/common/deeplink/DeepLinkMapping.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/common/deeplink/DeepLinkMapping.kt
@@ -51,6 +51,22 @@ internal object DeepLinkMapping {
                 )
         }
 
+        @Serializable
+        data class BlueskyPost(
+            val handle: String,
+            val id: String,
+        ) : Type {
+            override fun deepLink(accountKey: MicroBlogKey): DeeplinkRoute =
+                DeeplinkRoute.Status.Detail(
+                    accountType = AccountType.Specific(accountKey),
+                    statusKey =
+                        MicroBlogKey(
+                            "at://$handle/app.bsky.feed.post/$id",
+                            accountKey.host,
+                        ),
+                )
+        }
+
         @Serializable
         data class PostMedia(
             val handle: String,
@@ -105,10 +121,24 @@ internal object DeepLinkMapping {
                         Url("https://$host/profile/{handle}"),
                     ),
                     DeepLinkPattern(
-                        Type.Post.serializer(),
+                        Type.BlueskyPost.serializer(),
                         Url("https://$host/profile/{handle}/post/{id}"),
                     ),
-                )
+                ) +
+                    if (host == "bsky.social") {
+                        listOf(
+                            DeepLinkPattern(
+                                Type.Profile.serializer(),
+                                Url("https://bsky.app/profile/{handle}"),
+                            ),
+                            DeepLinkPattern(
+                                Type.BlueskyPost.serializer(),
+                                Url("https://bsky.app/profile/{handle}/post/{id}"),
+                            ),
+                        )
+                    } else {
+                        emptyList()
+                    }
             }
 
             PlatformType.xQt -> {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/PagingTimelineDao.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/PagingTimelineDao.kt
@@ -15,6 +15,7 @@ import dev.dimension.flare.data.database.cache.model.DbStatusWithReference
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.DbAccountType
 import dev.dimension.flare.model.MicroBlogKey
+import kotlinx.coroutines.flow.Flow
 
 @Dao
 internal interface PagingTimelineDao {
@@ -41,6 +42,13 @@ internal interface PagingTimelineDao {
     )
     fun searchHistoryPagingSource(query: String): PagingSource<Int, DbStatusWithReference>
 
+    @Transaction
+    @Query("SELECT * FROM DbPagingTimeline WHERE pagingKey = :pagingKey AND accountType = :accountType LIMIT 1")
+    fun get(
+        pagingKey: String,
+        accountType: DbAccountType,
+    ): Flow<DbPagingTimelineWithStatus?>
+
     @Transaction
     @Query("SELECT * FROM DbPagingTimeline WHERE pagingKey = :pagingKey ORDER BY sortId DESC")
     fun getStatusHistoryPagingSource(pagingKey: String): PagingSource<Int, DbPagingTimelineWithStatus>
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
@@ -45,6 +45,7 @@ import chat.bsky.convo.MessageInput
 import chat.bsky.convo.MessageView
 import chat.bsky.convo.SendMessageRequest
 import chat.bsky.convo.UpdateReadRequest
+import com.atproto.identity.ResolveHandleQueryParams
 import com.atproto.moderation.CreateReportRequest
 import com.atproto.moderation.CreateReportRequestSubjectUnion
 import com.atproto.moderation.Token
@@ -310,33 +311,63 @@ internal class BlueskyDataSource(
 
     override fun status(statusKey: MicroBlogKey): CacheData<UiTimeline> {
         val pagingKey = "status_only_$statusKey"
-
         return Cacheable(
             fetchSource = {
-                val result =
-                    service
-                        .getPosts(
-                            GetPostsQueryParams(
-                                persistentListOf(AtUri(statusKey.id)),
-                            ),
-                        ).requireResponse()
-                        .posts
-                        .firstOrNull()
-                        .let {
-                            listOfNotNull(it)
-                        }
-                Bluesky.savePost(
-                    accountKey,
-                    pagingKey,
-                    database,
-                    result,
-                )
+                val isDid = statusKey.id.startsWith("at://did:")
+                if (isDid) {
+                    val result =
+                        service
+                            .getPosts(
+                                GetPostsQueryParams(
+                                    persistentListOf(AtUri(statusKey.id)),
+                                ),
+                            ).requireResponse()
+                            .posts
+                            .firstOrNull()
+                            .let {
+                                listOfNotNull(it)
+                            }
+                    database.connect {
+                        Bluesky.savePost(
+                            accountKey,
+                            pagingKey,
+                            database,
+                            result,
+                        )
+                    }
+                } else {
+                    // "at://${handle}/app.bsky.feed.post/${id}"
+                    val handle = statusKey.id.substringAfter("at://").substringBefore("/")
+                    val id = statusKey.id.substringAfterLast('/')
+                    val did = service.resolveHandle(ResolveHandleQueryParams(Handle(handle))).requireResponse().did
+                    val actualAtUri = AtUri("at://${did.did}/app.bsky.feed.post/$id")
+                    val result =
+                        service
+                            .getPosts(
+                                GetPostsQueryParams(
+                                    persistentListOf(actualAtUri),
+                                ),
+                            ).requireResponse()
+                            .posts
+                            .firstOrNull()
+                            .let {
+                                listOfNotNull(it)
+                            }
+                    database.connect {
+                        Bluesky.savePost(
+                            accountKey,
+                            pagingKey,
+                            database,
+                            result,
+                        )
+                    }
+                }
             },
             cacheSource = {
                 database
-                    .statusDao()
-                    .get(statusKey, accountType = AccountType.Specific(accountKey))
-                    .mapNotNull { it?.content?.render(this) }
+                    .pagingTimelineDao()
+                    .get(pagingKey, accountType = AccountType.Specific(accountKey))
+                    .mapNotNull { it?.render(this) }
             },
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/StatusContextPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/StatusContextPresenter.kt
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/common/deeplink/DeepLinkMappingTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/common/deeplink/DeepLinkMappingTest.kt

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ private fun ColorScheme.withPureColorLightMode(): ColorScheme =`
`51`	`51`	`surfaceContainerHighest = Color.White,`
`52`	`52`	`onSurfaceVariant = MoreColors.Gray800,`
`53`	`53`	`outlineVariant = MoreColors.Gray400,`
	`54`	`+ outline = MoreColors.Gray600,`
`54`	`55`	`)`
`55`	`56`
`56`	`57`	`private fun ColorScheme.withPureColorDarkMode(): ColorScheme =`
`@@ -66,6 +67,7 @@ private fun ColorScheme.withPureColorDarkMode(): ColorScheme =`
`66`	`67`	`surfaceContainerHighest = MoreColors.Gray900,`
`67`	`68`	`onSurfaceVariant = MoreColors.Gray400,`
`68`	`69`	`outlineVariant = MoreColors.Gray800,`
	`70`	`+ outline = MoreColors.Gray500,`
`69`	`71`	`)`
`70`	`72`
`71`	`73`	`@OptIn(ExperimentalMaterial3ExpressiveApi::class)`