Merge pull request #491 from DimensionDev/bugfix/status_reactions

bugfix for status reaction
DimensionDev · Sep 26, 2024 · 077e778 · 077e778
2 parents 0c18798 + 52d98a6
commit 077e778
Show file tree

Hide file tree

Showing 14 changed files with 728 additions and 106 deletions.
diff --git a/app/src/main/java/dev/dimension/flare/ui/component/status/CommonStatusComponent.kt b/app/src/main/java/dev/dimension/flare/ui/component/status/CommonStatusComponent.kt
@@ -528,7 +528,7 @@ private fun StatusActions(
                         text = action.displayItem.iconText,
                         color = statusActionItemColor(item = action.displayItem),
                         withTextMinWidth = index != items.lastIndex,
-                    ) {
+                    ) { closeMenu ->
                         action.actions.forEach { subActions ->
                             if (subActions is StatusAction.Item) {
                                 val color = statusActionItemColor(subActions)
@@ -550,6 +550,7 @@ private fun StatusActions(
                                         )
                                     },
                                     onClick = {
+                                        closeMenu.invoke()
                                         if (subActions is StatusAction.Item.Clickable) {
                                             subActions.onClicked.invoke(
                                                 ClickContext(

diff --git a/app/src/main/java/dev/dimension/flare/ui/component/status/StatusRetweetHeaderComponent.kt b/app/src/main/java/dev/dimension/flare/ui/component/status/StatusRetweetHeaderComponent.kt
@@ -36,7 +36,7 @@ internal fun StatusRetweetHeaderComponent(
             contentDescription = null,
             modifier =
                 Modifier
-                    .size(16.dp),
+                    .size(12.dp),
         )
         if (user != null) {
             Spacer(modifier = Modifier.width(8.dp))

diff --git a/app/src/main/java/dev/dimension/flare/ui/component/status/UiTimelineComponent.kt b/app/src/main/java/dev/dimension/flare/ui/component/status/UiTimelineComponent.kt
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
diff --git a/iosApp/iosApp/UI/Component/Status/StatusTimelineBuilder.swift b/iosApp/iosApp/UI/Component/Status/StatusTimelineBuilder.swift
@@ -57,6 +57,7 @@ struct StatusItemView: View {
             case .edit: "pencil"
             case .info: "app"
             case .reply: "arrowshape.turn.up.left"
+            case .quote: "quote.bubble.fill"
             }
             let text = switch onEnum(of: topMessage.type) {
             case .bluesky(let data):

diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Bluesky.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Bluesky.kt
@@ -213,25 +213,18 @@ internal fun List<FeedViewPost>.toDbPagingTimeline(
                 }
             }
         val references =
-            when (val data = it.reason) {
-                is FeedViewPostReasonUnion.ReasonRepost ->
-                    listOfNotNull(
-                        if (reply != null) {
-                            ReferenceType.Reply to reply
-                        } else {
-                            null
-                        },
-                        ReferenceType.Retweet to status,
-                    ).toMap()
-                else ->
-                    listOfNotNull(
-                        if (reply != null) {
-                            ReferenceType.Reply to reply
-                        } else {
-                            null
-                        },
-                    ).toMap()
-            }
+            listOfNotNull(
+                if (reply != null) {
+                    ReferenceType.Reply to reply
+                } else {
+                    null
+                },
+                if (it.reason is FeedViewPostReasonUnion.ReasonRepost) {
+                    ReferenceType.Retweet to it.post.toDbStatusWithUser(accountKey)
+                } else {
+                    null
+                },
+            ).toMap()
         createDbPagingTimelineWithStatus(
             accountKey = accountKey,
             pagingKey = pagingKey,

diff --git a/.../src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt b/.../src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt
@@ -549,7 +549,7 @@ class MastodonDataSource(
                     accountKey = account.accountKey,
                     cacheDatabase = database,
                     update = {
-                        it.copy(data = result)
+                        result.reblog?.let { StatusContent.Mastodon(it) } ?: it
                     },
                 )
             }

diff --git a/...ed/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt b/...ed/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
@@ -27,7 +27,6 @@ import dev.dimension.flare.data.datasource.microblog.timelinePager
 import dev.dimension.flare.data.network.misskey.api.model.AdminAccountsDeleteRequest
 import dev.dimension.flare.data.network.misskey.api.model.IPinRequest
 import dev.dimension.flare.data.network.misskey.api.model.MuteCreateRequest
-import dev.dimension.flare.data.network.misskey.api.model.NotesChildrenRequest
 import dev.dimension.flare.data.network.misskey.api.model.NotesCreateRequest
 import dev.dimension.flare.data.network.misskey.api.model.NotesCreateRequestPoll
 import dev.dimension.flare.data.network.misskey.api.model.NotesReactionsCreateRequest
@@ -380,11 +379,40 @@ class MisskeyDataSource(
 
     override fun renote(statusKey: MicroBlogKey) {
         coroutineScope.launch {
-            service.notesRenotes(
-                NotesChildrenRequest(
-                    noteId = statusKey.id,
-                ),
+            updateStatusUseCase<StatusContent.Misskey>(
+                statusKey = statusKey,
+                accountKey = account.accountKey,
+                cacheDatabase = database,
+                update = {
+                    it.copy(
+                        data =
+                            it.data.copy(
+                                renoteCount = it.data.renoteCount + 1,
+                            ),
+                    )
+                },
             )
+            runCatching {
+                service.notesCreate(
+                    NotesCreateRequest(
+                        renoteId = statusKey.id,
+                    ),
+                )
+            }.onFailure {
+                updateStatusUseCase<StatusContent.Misskey>(
+                    statusKey = statusKey,
+                    accountKey = account.accountKey,
+                    cacheDatabase = database,
+                    update = {
+                        it.copy(
+                            data =
+                                it.data.copy(
+                                    renoteCount = it.data.renoteCount - 1,
+                                ),
+                        )
+                    },
+                )
+            }
         }
     }
 

diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimeline.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimeline.kt
@@ -5,11 +5,11 @@ import dev.dimension.flare.data.datasource.microblog.StatusAction
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
 import dev.dimension.flare.ui.humanizer.humanize
+import dev.dimension.flare.ui.model.mapper.MisskeyAchievement
 import dev.dimension.flare.ui.render.UiDateTime
 import dev.dimension.flare.ui.render.UiRichText
 import kotlinx.collections.immutable.ImmutableList
 
-// TODO: Handling item click event internally
 @Immutable
 data class UiTimeline internal constructor(
     val topMessage: TopMessage?,
@@ -169,6 +169,7 @@ data class UiTimeline internal constructor(
             Edit,
             Info,
             Reply,
+            Quote,
         }
 
         sealed interface MessageType {
@@ -191,27 +192,50 @@ data class UiTimeline internal constructor(
             }
 
             sealed interface Misskey : MessageType {
-                data object Follow : Misskey
+                data class Follow(
+                    val id: String,
+                ) : Misskey
 
-                data object Mention : Misskey
+                data class Mention(
+                    val id: String,
+                ) : Misskey
 
-                data object Reply : Misskey
+                data class Reply(
+                    val id: String,
+                ) : Misskey
 
-                data object Renote : Misskey
+                data class Renote(
+                    val id: String,
+                ) : Misskey
 
-                data object Quote : Misskey
+                data class Quote(
+                    val id: String,
+                ) : Misskey
 
-                data object Reaction : Misskey
+                data class Reaction(
+                    val id: String,
+                ) : Misskey
 
-                data object PollEnded : Misskey
+                data class PollEnded(
+                    val id: String,
+                ) : Misskey
 
-                data object ReceiveFollowRequest : Misskey
+                data class ReceiveFollowRequest(
+                    val id: String,
+                ) : Misskey
 
-                data object FollowRequestAccepted : Misskey
+                data class FollowRequestAccepted(
+                    val id: String,
+                ) : Misskey
 
-                data object AchievementEarned : Misskey
+                data class AchievementEarned(
+                    val id: String,
+                    val achievement: MisskeyAchievement?,
+                ) : Misskey
 
-                data object App : Misskey
+                data class App(
+                    val id: String,
+                ) : Misskey
             }
 
             sealed interface Bluesky : MessageType {

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
@@ -17,11 +17,13 @@ import app.bsky.richtext.FacetFeatureUnion
 import com.fleeksoft.ksoup.nodes.Element
 import com.fleeksoft.ksoup.nodes.TextNode
 import dev.dimension.flare.common.AppDeepLink
+import dev.dimension.flare.data.database.cache.model.StatusContent
 import dev.dimension.flare.data.datasource.bluesky.bskyJson
 import dev.dimension.flare.data.datasource.microblog.StatusAction
 import dev.dimension.flare.data.datasource.microblog.StatusEvent
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
+import dev.dimension.flare.model.ReferenceType
 import dev.dimension.flare.ui.model.UiCard
 import dev.dimension.flare.ui.model.UiList
 import dev.dimension.flare.ui.model.UiMedia
@@ -138,10 +140,11 @@ private fun parseBluesky(
 
 internal fun FeedViewPostReasonUnion.render(
     accountKey: MicroBlogKey,
-    data: PostView,
     event: StatusEvent.Bluesky,
-): UiTimeline =
-    UiTimeline(
+    references: Map<ReferenceType, StatusContent>,
+): UiTimeline {
+    val data = (references[ReferenceType.Retweet] as? StatusContent.Bluesky)?.data
+    return UiTimeline(
         topMessage =
             (this as? FeedViewPostReasonUnion.ReasonRepost)?.value?.by?.let {
                 val user = it.render(accountKey)
@@ -159,9 +162,10 @@ internal fun FeedViewPostReasonUnion.render(
                     },
                 )
             },
-        content = data.renderStatus(accountKey, event),
+        content = data?.renderStatus(accountKey, event),
         platformType = PlatformType.Bluesky,
     )
+}
 
 internal fun ListNotificationsNotification.render(accountKey: MicroBlogKey): UiTimeline {
     val user = author.render(accountKey)

diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Mastodon.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Mastodon.kt
@@ -5,6 +5,7 @@ import com.fleeksoft.ksoup.nodes.Node
 import dev.dimension.flare.common.AppDeepLink
 import dev.dimension.flare.data.database.cache.model.DbEmoji
 import dev.dimension.flare.data.database.cache.model.EmojiContent
+import dev.dimension.flare.data.database.cache.model.StatusContent
 import dev.dimension.flare.data.datasource.guest.GuestDataSource
 import dev.dimension.flare.data.datasource.microblog.StatusAction
 import dev.dimension.flare.data.datasource.microblog.StatusEvent
@@ -19,6 +20,7 @@ import dev.dimension.flare.data.network.mastodon.api.model.Status
 import dev.dimension.flare.data.network.mastodon.api.model.Visibility
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
+import dev.dimension.flare.model.ReferenceType
 import dev.dimension.flare.ui.model.UiCard
 import dev.dimension.flare.ui.model.UiEmoji
 import dev.dimension.flare.ui.model.UiMedia
@@ -38,10 +40,14 @@ import kotlinx.datetime.Instant
 internal fun Notification.render(
     accountKey: MicroBlogKey,
     event: StatusEvent.Mastodon,
+    references: Map<ReferenceType, StatusContent>,
 ): UiTimeline {
     requireNotNull(account) { "account is null" }
     val user = account.render(accountKey)
-    val status = status?.renderStatus(accountKey, event)
+    val status =
+        (references[ReferenceType.Notification] as? StatusContent.Mastodon)
+            ?.data
+            ?.renderStatus(accountKey, event)
     val topMessageType =
         when (type) {
             NotificationTypes.Follow -> UiTimeline.TopMessage.MessageType.Mastodon.Follow
@@ -97,6 +103,7 @@ internal fun Notification.render(
 internal fun Status.render(
     accountKey: MicroBlogKey,
     event: StatusEvent.Mastodon,
+    references: Map<ReferenceType, StatusContent> = mapOf(),
 ): UiTimeline {
     requireNotNull(account) { "account is null" }
     val user = account.render(accountKey)
@@ -119,7 +126,7 @@ internal fun Status.render(
             )
         }
     val currentStatus = this.renderStatus(accountKey, event)
-    val actualStatus = reblog ?: this
+    val actualStatus = (references[ReferenceType.Retweet] as? StatusContent.Mastodon)?.data ?: this
     return UiTimeline(
         topMessage = topMessage,
         content =