From 0d974c2e86e1d77483534261caac1a678995bb4d Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Thu, 26 Feb 2026 00:00:29 +0900
Subject: [PATCH 01/33] [WIP] add UiTimelineV2

---
 .../HomeTimelineWithTabsPresenter.kt          |  28 +-
 .../data/datasource/microblog/ActionMenu.kt   |  87 +++---
 .../AuthenticatedMicroblogDataSource.kt       |   2 +
 .../data/datasource/microblog/StatusEvent.kt  | 168 ++++++++++++
 .../dimension/flare/ui/model/ClickContext.kt  |   8 +-
 .../dimension/flare/ui/model/DeeplinkEvent.kt |  29 ++
 .../dev/dimension/flare/ui/model/UiCard.kt    |   2 +
 .../dev/dimension/flare/ui/model/UiIcon.kt    |  39 +++
 .../dev/dimension/flare/ui/model/UiMedia.kt   |   6 +
 .../dev/dimension/flare/ui/model/UiPoll.kt    |   6 +-
 .../dimension/flare/ui/model/UiTimelineV2.kt  | 253 ++++++++++++++++++
 .../ui/presenter/home/DeepLinkPresenter.kt    |  19 +-
 .../dimension/flare/ui/render/UiDateTime.kt   |  23 ++
 .../dimension/flare/ui/route/DeeplinkRoute.kt |   2 +
 14 files changed, 617 insertions(+), 55 deletions(-)
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/DeeplinkEvent.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiIcon.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt

diff --git a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/HomeTimelineWithTabsPresenter.kt b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/HomeTimelineWithTabsPresenter.kt
index d96387d01..2c319a5f7 100644
--- a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/HomeTimelineWithTabsPresenter.kt
+++ b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/HomeTimelineWithTabsPresenter.kt
@@ -108,12 +108,28 @@ public class HomeTimelineWithTabsPresenter(
                 settingsRepository.updateTabSettings {
                     copy(
                         mainTabs =
-                            mainTabs.filterNot {
-                                it.account ==
-                                    AccountType.Specific(
-                                        accountKey,
-                                    )
-                            },
+                            mainTabs
+                                .filterNot {
+                                    it.account ==
+                                        AccountType.Specific(
+                                            accountKey,
+                                        )
+                                }.map {
+                                    if (it is MixedTimelineTabItem) {
+                                        it.copy(
+                                            subTimelineTabItem =
+                                                it.subTimelineTabItem
+                                                    .filterNot {
+                                                        it.account ==
+                                                            AccountType.Specific(
+                                                                accountKey,
+                                                            )
+                                                    }.toImmutableList(),
+                                        )
+                                    } else {
+                                        it
+                                    }
+                                },
                     )
                 }
             }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ActionMenu.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ActionMenu.kt
index 3aade57fd..0c6b232f4 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ActionMenu.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ActionMenu.kt
@@ -3,86 +3,81 @@ package dev.dimension.flare.data.datasource.microblog
 import androidx.compose.runtime.Immutable
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.ClickContext
+import dev.dimension.flare.ui.model.ClickEvent
+import dev.dimension.flare.ui.model.UiIcon
 import dev.dimension.flare.ui.model.UiNumber
-import dev.dimension.flare.ui.model.launch
+import dev.dimension.flare.ui.model.onClicked
 import dev.dimension.flare.ui.route.DeeplinkRoute
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
-import kotlinx.coroutines.flow.Flow
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
 
+@Serializable
 @Immutable
-public sealed interface ActionMenu {
+public sealed class ActionMenu {
     @Immutable
+    @Serializable
     public data class Group internal constructor(
         val displayItem: Item,
         val actions: ImmutableList<ActionMenu>,
-    ) : ActionMenu
+    ) : ActionMenu()
 
-    @Immutable
-    public data class AsyncActionMenuItem internal constructor(
-        val flow: Flow<Item>,
-    ) : ActionMenu
+//    @Immutable
+//    @Serializable
+//    public data class AsyncActionMenuItem internal constructor(
+//        @Transient
+//        val flow: Flow<Item> = emptyFlow(),
+//    ) : ActionMenu()
 
     @Immutable
-    public data object Divider : ActionMenu
+    @Serializable
+    public data object Divider : ActionMenu()
 
     @Immutable
+    @Serializable
     public data class Item internal constructor(
-        val icon: Icon? = null,
+        val icon: UiIcon? = null,
         val text: Text? = null,
         val count: UiNumber? = null,
-        val onClicked: (ClickContext.() -> Unit)? = null,
         val color: Color? = null,
-    ) : ActionMenu {
+        private val clickEvent: ClickEvent? = null,
+        @Transient
+        private val clickAction: (ClickContext.() -> Unit)? = null,
+    ) : ActionMenu() {
         init {
             require(icon != null || text != null) {
                 "icon and text cannot be both null"
             }
         }
 
+        val onClicked: (ClickContext.() -> Unit)? by lazy {
+            clickAction ?: clickEvent?.onClicked
+        }
+
+        @Serializable
         public enum class Color {
             Red,
             ContentColor,
             PrimaryColor,
         }
 
-        public enum class Icon {
-            Like,
-            Unlike,
-            Retweet,
-            Unretweet,
-            Reply,
-            Comment,
-            Quote,
-            Bookmark,
-            Unbookmark,
-            More,
-            MoreVerticel,
-            Delete,
-            Report,
-            React,
-            UnReact,
-            Share,
-            List,
-            ChatMessage,
-            Mute,
-            UnMute,
-            Block,
-            UnBlock,
-        }
-
         @Immutable
+        @Serializable
         public sealed interface Text {
             @Immutable
+            @Serializable
             public data class Raw(
                 val text: String,
             ) : Text
 
             @Immutable
+            @Serializable
             public data class Localized(
                 val type: Type,
                 val parameters: ImmutableList<String> = persistentListOf(),
             ) : Text {
+                @Serializable
                 public enum class Type {
                     Like,
                     Unlike,
@@ -121,25 +116,27 @@ internal fun userActionsMenu(
 ): List<ActionMenu> =
     listOfNotNull(
         ActionMenu.Item(
-            icon = ActionMenu.Item.Icon.Mute,
+            icon = UiIcon.Mute,
             text =
                 ActionMenu.Item.Text.Localized(
                     type = ActionMenu.Item.Text.Localized.Type.MuteWithHandleParameter,
                     parameters = persistentListOf(handle),
                 ),
-            onClicked = {
-                launcher.launch(DeeplinkRoute.MuteUser(accountKey, userKey))
-            },
+            clickEvent =
+                ClickEvent.Deeplink(
+                    DeeplinkRoute.MuteUser(accountKey, userKey),
+                ),
         ),
         ActionMenu.Item(
-            icon = ActionMenu.Item.Icon.Block,
+            icon = UiIcon.Block,
             text =
                 ActionMenu.Item.Text.Localized(
                     type = ActionMenu.Item.Text.Localized.Type.BlockWithHandleParameter,
                     parameters = persistentListOf(handle),
                 ),
-            onClicked = {
-                launcher.launch(DeeplinkRoute.BlockUser(accountKey, userKey))
-            },
+            clickEvent =
+                ClickEvent.Deeplink(
+                    DeeplinkRoute.BlockUser(accountKey, userKey),
+                ),
         ),
     )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/AuthenticatedMicroblogDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/AuthenticatedMicroblogDataSource.kt
index 56f5b4326..ad266e993 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/AuthenticatedMicroblogDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/AuthenticatedMicroblogDataSource.kt
@@ -41,6 +41,8 @@ internal interface AuthenticatedMicroblogDataSource :
     )
 
     fun notificationBadgeCount(): CacheData<Int> = Cacheable({ }, { flowOf(0) })
+
+    fun handleEvent(event: PostEvent)
 }
 
 internal interface RelationDataSource {
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
index abc197f6c..6f0836e1e 100644
--- 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
@@ -1,7 +1,9 @@
 package dev.dimension.flare.data.datasource.microblog
 
 import dev.dimension.flare.model.MicroBlogKey
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.flow.Flow
+import kotlinx.serialization.Serializable
 
 internal sealed interface StatusEvent {
     val accountKey: MicroBlogKey
@@ -140,3 +142,169 @@ internal sealed interface StatusEvent {
         )
     }
 }
+
+@Serializable
+internal sealed interface PostEvent {
+    @Serializable
+    sealed interface PollEvent : PostEvent {
+        val options: ImmutableList<Int>
+    }
+
+    @Serializable
+    sealed interface Mastodon : PostEvent {
+        @Serializable
+        data class Reblog(
+            val statusKey: MicroBlogKey,
+            val reblogged: Boolean,
+        ) : Mastodon
+
+        @Serializable
+        data class Like(
+            val statusKey: MicroBlogKey,
+            val liked: Boolean,
+        ) : Mastodon
+
+        @Serializable
+        data class Bookmark(
+            val statusKey: MicroBlogKey,
+            val bookmarked: Boolean,
+        ) : Mastodon
+
+        @Serializable
+        data class Vote(
+            val statusKey: MicroBlogKey,
+            override val options: ImmutableList<Int>,
+        ) : Mastodon,
+            PollEvent
+
+        @Serializable
+        data class AcceptFollowRequest(
+            val userKey: MicroBlogKey,
+            val notificationStatusKey: MicroBlogKey,
+        ) : Mastodon
+
+        @Serializable
+        data class RejectFollowRequest(
+            val userKey: MicroBlogKey,
+            val notificationStatusKey: MicroBlogKey,
+        ) : Mastodon
+    }
+
+    @Serializable
+    sealed interface Pleroma : PostEvent {
+        @Serializable
+        data class React(
+            val statusKey: MicroBlogKey,
+            val hasReacted: Boolean,
+            val reaction: String,
+        ) : Pleroma
+    }
+
+    @Serializable
+    sealed interface Misskey : PostEvent {
+        @Serializable
+        data class React(
+            val statusKey: MicroBlogKey,
+            val hasReacted: Boolean,
+            val reaction: String,
+        ) : Misskey
+
+        @Serializable
+        data class Renote(
+            val statusKey: MicroBlogKey,
+        ) : Misskey
+
+        @Serializable
+        data class Vote(
+            val statusKey: MicroBlogKey,
+            override val options: ImmutableList<Int>,
+        ) : Misskey,
+            PollEvent
+
+        @Serializable
+        data class Favourite(
+            val statusKey: MicroBlogKey,
+            val favourited: Boolean,
+        ) : Misskey
+
+        @Serializable
+        data class AcceptFollowRequest(
+            val userKey: MicroBlogKey,
+            val notificationStatusKey: MicroBlogKey,
+        ) : Misskey
+
+        @Serializable
+        data class RejectFollowRequest(
+            val userKey: MicroBlogKey,
+            val notificationStatusKey: MicroBlogKey,
+        ) : Misskey
+    }
+
+    @Serializable
+    sealed interface Bluesky : PostEvent {
+        @Serializable
+        data class Reblog(
+            val statusKey: MicroBlogKey,
+            val reblogged: Boolean,
+        ) : Bluesky
+
+        @Serializable
+        data class Like(
+            val statusKey: MicroBlogKey,
+            val liked: Boolean,
+        ) : Bluesky
+
+        @Serializable
+        data class Bookmark(
+            val statusKey: MicroBlogKey,
+            val bookmarked: Boolean,
+        ) : Bluesky
+
+        @Serializable
+        data class Unbookmark(
+            val statusKey: MicroBlogKey,
+        ) : Bluesky
+    }
+
+    @Serializable
+    sealed interface XQT : PostEvent {
+        @Serializable
+        data class Retweet(
+            val statusKey: MicroBlogKey,
+            val retweeted: Boolean,
+        ) : XQT
+
+        @Serializable
+        data class Like(
+            val statusKey: MicroBlogKey,
+            val liked: Boolean,
+        ) : XQT
+
+        @Serializable
+        data class Bookmark(
+            val statusKey: MicroBlogKey,
+            val bookmarked: Boolean,
+        ) : XQT
+    }
+
+    @Serializable
+    sealed interface VVO : PostEvent {
+        @Serializable
+        data class Like(
+            val statusKey: MicroBlogKey,
+            val liked: Boolean,
+        ) : VVO
+
+        @Serializable
+        data class LikeComment(
+            val statusKey: MicroBlogKey,
+            val liked: Boolean,
+        ) : VVO
+
+        @Serializable
+        data class Favorite(
+            val statusKey: MicroBlogKey,
+            val favorited: Boolean,
+        ) : VVO
+    }
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/ClickContext.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/ClickContext.kt
index 807475aa9..29e274431 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/ClickContext.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/ClickContext.kt
@@ -1,5 +1,7 @@
 package dev.dimension.flare.ui.model
 
+import dev.dimension.flare.ui.route.DeeplinkRoute
+import dev.dimension.flare.ui.route.toUri
 import kotlinx.serialization.Serializable
 
 public data class ClickContext(
@@ -12,9 +14,11 @@ internal sealed interface ClickEvent {
     data object Noop : ClickEvent
 
     @Serializable
-    data class Deeplink(
+    data class Deeplink private constructor(
         val url: String,
-    ) : ClickEvent
+    ) : ClickEvent {
+        constructor(route: DeeplinkRoute) : this(route.toUri())
+    }
 }
 
 internal val ClickEvent.onClicked: ClickContext.() -> Unit
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/DeeplinkEvent.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/DeeplinkEvent.kt
new file mode 100644
index 000000000..e187ca441
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/DeeplinkEvent.kt
@@ -0,0 +1,29 @@
+package dev.dimension.flare.ui.model
+
+import dev.dimension.flare.data.datasource.microblog.PostEvent
+import dev.dimension.flare.model.MicroBlogKey
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromHexString
+import kotlinx.serialization.encodeToHexString
+import kotlinx.serialization.protobuf.ProtoBuf
+
+@Serializable
+@OptIn(ExperimentalSerializationApi::class)
+internal data class DeeplinkEvent(
+    val accountKey: MicroBlogKey,
+    val postEvent: PostEvent,
+) {
+    companion object {
+        const val SCHEME = "flare-event"
+
+        fun parse(uri: String): DeeplinkEvent? =
+            runCatching {
+                ProtoBuf.decodeFromHexString<DeeplinkEvent>(uri.removePrefix("$SCHEME://"))
+            }.getOrNull()
+
+        fun isDeeplinkEvent(uri: String): Boolean = uri.startsWith("$SCHEME://")
+    }
+
+    fun toUri(): String = "$SCHEME://${ProtoBuf.encodeToHexString(this)}"
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiCard.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiCard.kt
index f40ea0a74..87722e36b 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiCard.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiCard.kt
@@ -1,7 +1,9 @@
 package dev.dimension.flare.ui.model
 
 import androidx.compose.runtime.Immutable
+import kotlinx.serialization.Serializable
 
+@Serializable
 @Immutable
 public data class UiCard internal constructor(
     val title: String,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiIcon.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiIcon.kt
new file mode 100644
index 000000000..64608f6be
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiIcon.kt
@@ -0,0 +1,39 @@
+package dev.dimension.flare.ui.model
+
+import androidx.compose.runtime.Immutable
+import kotlinx.serialization.Serializable
+
+@Serializable
+@Immutable
+public enum class UiIcon {
+    Like,
+    Unlike,
+    Retweet,
+    Unretweet,
+    Reply,
+    Comment,
+    Quote,
+    Bookmark,
+    Unbookmark,
+    More,
+    MoreVerticel,
+    Delete,
+    Report,
+    React,
+    UnReact,
+    Share,
+    List,
+    ChatMessage,
+    Mute,
+    UnMute,
+    Block,
+    UnBlock,
+
+    Follow,
+    Favourite,
+    Mention,
+    Poll,
+    Edit,
+    Info,
+    Pin,
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiMedia.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiMedia.kt
index 98bb38cbd..e5cdf5fb3 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiMedia.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiMedia.kt
@@ -2,13 +2,16 @@ package dev.dimension.flare.ui.model
 
 import androidx.compose.runtime.Immutable
 import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.serialization.Serializable
 
+@Serializable
 @Immutable
 public sealed interface UiMedia {
     public val url: String
     public val description: String?
     public val customHeaders: ImmutableMap<String, String>?
 
+    @Serializable
     @Immutable
     public data class Image internal constructor(
         override val url: String,
@@ -23,6 +26,7 @@ public sealed interface UiMedia {
             get() = (width / (height.takeUnless { it == 0f } ?: 1f)).takeUnless { it == 0f } ?: 1f
     }
 
+    @Serializable
     @Immutable
     public data class Video internal constructor(
         override val url: String,
@@ -36,6 +40,7 @@ public sealed interface UiMedia {
             get() = (width / (height.takeUnless { it == 0f } ?: 1f)).takeUnless { it == 0f } ?: 1f
     }
 
+    @Serializable
     @Immutable
     public data class Gif internal constructor(
         override val url: String,
@@ -49,6 +54,7 @@ public sealed interface UiMedia {
             get() = (width / (height.takeUnless { it == 0f } ?: 1f)).takeUnless { it == 0f } ?: 1f
     }
 
+    @Serializable
     @Immutable
     public data class Audio internal constructor(
         override val url: String,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiPoll.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiPoll.kt
index 04d2111ba..f7dfb504b 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiPoll.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiPoll.kt
@@ -1,20 +1,23 @@
 package dev.dimension.flare.ui.model
 
 import androidx.compose.runtime.Immutable
+import dev.dimension.flare.data.datasource.microblog.PostEvent
 import dev.dimension.flare.ui.humanizer.humanizePercentage
 import dev.dimension.flare.ui.render.UiDateTime
 import dev.dimension.flare.ui.render.toUi
 import kotlinx.collections.immutable.ImmutableList
+import kotlinx.serialization.Serializable
 import kotlin.time.Clock
 import kotlin.time.Instant
 
+@Serializable
 @Immutable
 public data class UiPoll internal constructor(
     val id: String,
     val options: ImmutableList<Option>,
     val multiple: Boolean,
     val ownVotes: ImmutableList<Int>,
-    val onVote: (options: ImmutableList<Int>) -> Unit,
+    private val onVote: PostEvent.PollEvent,
     // null indicates no expiration
     private val expiresAt: Instant?,
     private val enabled: Boolean = true,
@@ -31,6 +34,7 @@ public data class UiPoll internal constructor(
 
     val canVote: Boolean by lazy { !expired && !voted && enabled }
 
+    @Serializable
     @Immutable
     public data class Option internal constructor(
         val title: String,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
new file mode 100644
index 000000000..61c9e1da2
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
@@ -0,0 +1,253 @@
+package dev.dimension.flare.ui.model
+
+import androidx.compose.runtime.Immutable
+import dev.dimension.flare.data.datasource.microblog.ActionMenu
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.model.PlatformType
+import dev.dimension.flare.ui.render.UiDateTime
+import dev.dimension.flare.ui.render.UiRichText
+import dev.dimension.flare.ui.route.DeeplinkRoute
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.serialization.Serializable
+
+@Serializable
+@Immutable
+public sealed class UiTimelineV2 {
+    public val id: String by lazy {
+        itemKey
+    }
+
+    public abstract val itemKey: String
+
+    public val itemType: String
+        get() =
+            when (this) {
+                is Feed -> "feed"
+                is Post -> "post"
+                is User -> "user"
+                is UserList -> "user_list"
+                is Message -> "message"
+            }
+
+    @Serializable
+    @Immutable
+    public data class Message internal constructor(
+        private val _id: String,
+        val user: UiProfile? = null,
+        val statusKey: MicroBlogKey? = null,
+        val icon: UiIcon,
+        val type: Type,
+        private val clickEvent: ClickEvent,
+    ) : UiTimelineV2() {
+        override val itemKey: String = "Message_${_id}"
+
+        @Serializable
+        @Immutable
+        public sealed class Type {
+            @Serializable
+            @Immutable
+            public data class Unknown internal constructor(
+                val rawType: String,
+            ) : Type()
+
+            @Serializable
+            @Immutable
+            public data class Raw internal constructor(
+                val content: String,
+            ) : Type()
+
+            @Serializable
+            @Immutable
+            public data class Localized internal constructor(
+                val data: MessageId,
+                val args: ImmutableList<String> = persistentListOf(),
+            ) : Type() {
+                @Serializable
+                @Immutable
+                public enum class MessageId {
+                    Mention,
+                    NewPost,
+                    Repost,
+                    Follow,
+                    FollowRequest,
+                    Favourite,
+                    PollEnded,
+                    PostUpdated,
+                    Reply,
+                    Quote,
+                    Reaction,
+                    FollowRequestAccepted,
+                    AchievementEarned,
+                    App,
+                    StarterpackJoined,
+                    Pinned,
+                }
+            }
+        }
+    }
+
+    @Serializable
+    @Immutable
+    public data class Feed internal constructor(
+        val title: String?,
+        val description: String?,
+        val url: String,
+        val image: String?,
+        val createdAt: UiDateTime?,
+        val source: Source,
+        val imageHeaders: ImmutableMap<String, String>?,
+        val openInBrowser: Boolean,
+        private val clickEvent: ClickEvent =
+            if (openInBrowser) {
+                ClickEvent.Deeplink(DeeplinkRoute.OpenLinkDirectly(url))
+            } else {
+                ClickEvent.Deeplink(DeeplinkRoute.Rss.Detail(url))
+            },
+    ) : UiTimelineV2() {
+        override val itemKey: String
+            get() =
+                buildString {
+                    append("Feed_")
+                    append(url)
+                }
+
+        @Serializable
+        @Immutable
+        public data class Source internal constructor(
+            val name: String,
+            val icon: String?,
+        )
+    }
+
+    @Serializable
+    @Immutable
+    public data class Post internal constructor(
+        val message: Message? = null,
+        val platformType: PlatformType,
+        val images: ImmutableList<UiMedia>,
+        val sensitive: Boolean,
+        val contentWarning: UiRichText?,
+        val user: UiProfile?,
+        val quote: ImmutableList<Post> = persistentListOf(),
+        val content: UiRichText,
+        val actions: ImmutableList<ActionMenu>,
+        val poll: UiPoll?,
+        val statusKey: MicroBlogKey,
+        val card: UiCard?,
+        val createdAt: UiDateTime,
+        val emojiReactions: ImmutableList<EmojiReaction> = persistentListOf(),
+        val sourceChannel: SourceChannel? = null,
+        val visibility: Visibility? = null,
+        val replyToHandle: String? = null,
+        val parents: ImmutableList<Post> = persistentListOf(),
+        private val clickEvent: ClickEvent,
+        private val mediaClickEvent: ClickEvent,
+    ) : UiTimelineV2() {
+        override val itemKey: String
+            get() =
+                buildString {
+                    append(platformType.name)
+                    append("_")
+                    append(statusKey)
+                    message?.let {
+                        append("_")
+                        append(it.itemKey)
+                    }
+                }
+
+        val shouldExpandTextByDefault: Boolean by lazy {
+            (contentWarning == null || contentWarning.isEmpty) && !content.isLongText
+        }
+
+        @Serializable
+        @Immutable
+        public data class SourceChannel(
+            val id: String,
+            val name: String,
+        )
+
+        @Serializable
+        @Immutable
+        public data class EmojiReaction internal constructor(
+            val name: String,
+            val url: String,
+            val count: UiNumber,
+            private val clickEvent: ClickEvent,
+            val isUnicode: Boolean,
+            val me: Boolean,
+        ) {
+            val isImageReaction: Boolean by lazy {
+                name.startsWith(":") && name.endsWith(":")
+            }
+        }
+
+        @Serializable
+        public enum class Visibility {
+            Public,
+            Home,
+            Followers,
+            Specified,
+            Channel,
+        }
+    }
+
+    @Serializable
+    @Immutable
+    public data class User internal constructor(
+        val message: Message? = null,
+        val value: UiProfile,
+        val button: ImmutableList<Button> = persistentListOf(),
+    ) : UiTimelineV2() {
+        override val itemKey: String
+            get() =
+                buildString {
+                    append("User_")
+                    append(value.key)
+                    message?.let {
+                        append("_")
+                        append(it.itemKey)
+                    }
+                }
+
+        @Serializable
+        @Immutable
+        public sealed class Button {
+            @Serializable
+            @Immutable
+            public data class AcceptFollowRequest internal constructor(
+                private val clickEvent: ClickEvent,
+            ) : Button()
+
+            @Serializable
+            @Immutable
+            public data class RejectFollowRequest internal constructor(
+                private val clickEvent: ClickEvent,
+            ) : Button()
+        }
+    }
+
+    @Serializable
+    @Immutable
+    public data class UserList internal constructor(
+        val message: Message? = null,
+        val users: ImmutableList<UiProfile>,
+        val status: Post? = null,
+    ) : UiTimelineV2() {
+        override val itemKey: String
+            get() =
+                buildString {
+                    append("UserList_")
+                    append(users.hashCode())
+                    status?.let {
+                        append("_")
+                        append(it.itemKey)
+                    }
+                    message?.let {
+                        append("_")
+                        append(it.itemKey)
+                    }
+                }
+    }
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/DeepLinkPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/DeepLinkPresenter.kt
index 2ece52cf5..d08238799 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/DeepLinkPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/DeepLinkPresenter.kt
@@ -7,7 +7,11 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import dev.dimension.flare.common.deeplink.DeepLinkMapping
+import dev.dimension.flare.data.datasource.microblog.AuthenticatedMicroblogDataSource
 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.model.DeeplinkEvent
 import dev.dimension.flare.ui.presenter.PresenterBase
 import dev.dimension.flare.ui.route.APPSCHEMA
 import dev.dimension.flare.ui.route.DeeplinkRoute
@@ -51,7 +55,20 @@ public class DeepLinkPresenter(
         var pendingUrl by remember { mutableStateOf<String?>(null) }
         pendingUrl?.let { url ->
             LaunchedEffect(url) {
-                if (url.startsWith("$APPSCHEMA://")) {
+                if (DeeplinkEvent.isDeeplinkEvent(url)) {
+                    val event = DeeplinkEvent.parse(url)
+                    if (event != null) {
+                        accountServiceFlow(
+                            accountType = AccountType.Specific(event.accountKey),
+                            repository = accountRepository,
+                        ).collect { service ->
+                            if (service is AuthenticatedMicroblogDataSource) {
+                                service.handleEvent(event.postEvent)
+                            }
+                        }
+                    }
+                    pendingUrl = null
+                } else if (DeeplinkRoute.isDeeplink(url)) {
                     DeeplinkRoute.parse(url)?.let {
                         if (it is DeeplinkRoute.OpenLinkDirectly) {
                             withContext(Dispatchers.Main) {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/render/UiDateTime.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/render/UiDateTime.kt
index 1114f1b46..3e17a2671 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/render/UiDateTime.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/render/UiDateTime.kt
@@ -4,6 +4,7 @@ import androidx.compose.runtime.Immutable
 import dev.dimension.flare.ui.humanizer.Formatter.absolute
 import dev.dimension.flare.ui.humanizer.Formatter.full
 import dev.dimension.flare.ui.humanizer.Formatter.relative
+import kotlinx.serialization.Serializable
 import kotlin.time.Clock
 import kotlin.time.Instant
 
@@ -11,6 +12,7 @@ public expect class PlatformDateTime
 
 internal expect fun Instant.toPlatform(): PlatformDateTime
 
+@Serializable(with = UiDateTimeSerializer::class)
 @Immutable
 public data class UiDateTime internal constructor(
     val value: Instant,
@@ -32,3 +34,24 @@ public data class UiDateTime internal constructor(
 public fun Instant.toUi(): UiDateTime = UiDateTime(this)
 
 internal operator fun UiDateTime.compareTo(other: UiDateTime): Int = value.compareTo(other.value)
+
+internal object UiDateTimeSerializer : kotlinx.serialization.KSerializer<UiDateTime> {
+    override val descriptor: kotlinx.serialization.descriptors.SerialDescriptor
+        get() =
+            kotlinx.serialization.descriptors.PrimitiveSerialDescriptor(
+                "UiDateTime",
+                kotlinx.serialization.descriptors.PrimitiveKind.STRING,
+            )
+
+    override fun deserialize(decoder: kotlinx.serialization.encoding.Decoder): UiDateTime {
+        val epochMillis = decoder.decodeLong()
+        return UiDateTime(Instant.fromEpochMilliseconds(epochMillis))
+    }
+
+    override fun serialize(
+        encoder: kotlinx.serialization.encoding.Encoder,
+        value: UiDateTime,
+    ) {
+        encoder.encodeLong(value.value.toEpochMilliseconds())
+    }
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/route/DeeplinkRoute.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/route/DeeplinkRoute.kt
index 9e83303e1..19e174181 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/route/DeeplinkRoute.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/route/DeeplinkRoute.kt
@@ -223,6 +223,8 @@ public sealed class DeeplinkRoute {
             runCatching {
                 ProtoBuf.decodeFromHexString<RoutePackage>(uri.removePrefix("$APPSCHEMA://")).route
             }.getOrNull()
+
+        public fun isDeeplink(uri: String): Boolean = uri.startsWith("$APPSCHEMA://")
     }
 }
 

From 55ea443bea8440c05c6031978d6fdd58a1bf0459 Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Thu, 26 Feb 2026 13:17:59 +0900
Subject: [PATCH 02/33] [WIP] update UiTimelineV2

---
 .../dev/dimension/flare/ui/model/UiDMRoom.kt  |  4 +-
 .../dev/dimension/flare/ui/model/UiEmoji.kt   |  8 +--
 .../flare/ui/model/UiInstanceMetadata.kt      |  8 +--
 .../dev/dimension/flare/ui/model/UiMedia.kt   | 12 ++--
 .../dev/dimension/flare/ui/model/UiPodcast.kt |  8 +--
 .../dev/dimension/flare/ui/model/UiPoll.kt    |  8 +--
 .../dimension/flare/ui/model/UiTimeline.kt    | 20 +++----
 .../dimension/flare/ui/model/UiTimelineV2.kt  | 56 ++++++++++---------
 .../flare/ui/model/mapper/Bluesky.kt          |  3 +-
 9 files changed, 66 insertions(+), 61 deletions(-)

diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiDMRoom.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiDMRoom.kt
index a05352d7c..064f0d39a 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiDMRoom.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiDMRoom.kt
@@ -1,15 +1,15 @@
 package dev.dimension.flare.ui.model
 
 import androidx.compose.runtime.Immutable
+import dev.dimension.flare.common.SerializableImmutableList
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.render.UiDateTime
 import dev.dimension.flare.ui.render.UiRichText
-import kotlinx.collections.immutable.ImmutableList
 
 @Immutable
 public data class UiDMRoom internal constructor(
     val key: MicroBlogKey,
-    val users: ImmutableList<UiProfile>,
+    val users: SerializableImmutableList<UiProfile>,
     val lastMessage: UiDMItem?,
     val unreadCount: Long,
 ) {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiEmoji.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiEmoji.kt
index 67e540ff5..98ae5d4ad 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiEmoji.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiEmoji.kt
@@ -1,8 +1,8 @@
 package dev.dimension.flare.ui.model
 
 import androidx.compose.runtime.Immutable
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.ImmutableMap
+import dev.dimension.flare.common.SerializableImmutableList
+import dev.dimension.flare.common.SerializableImmutableMap
 
 @Immutable
 public data class UiEmoji internal constructor(
@@ -16,12 +16,12 @@ public data class UiEmoji internal constructor(
 // compatibility class for Kotlin native
 @Immutable
 public data class EmojiData internal constructor(
-    val data: ImmutableMap<String, ImmutableList<UiEmoji>>,
+    val data: SerializableImmutableMap<String, SerializableImmutableList<UiEmoji>>,
 ) {
     private val list = data.toList()
     public val size: Int get() = data.size
 
     public fun getKey(index: Int): String = list[index].first
 
-    public fun getValue(index: Int): ImmutableList<UiEmoji> = list[index].second
+    public fun getValue(index: Int): SerializableImmutableList<UiEmoji> = list[index].second
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiInstanceMetadata.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiInstanceMetadata.kt
index e08421116..72524dee3 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiInstanceMetadata.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiInstanceMetadata.kt
@@ -1,13 +1,13 @@
 package dev.dimension.flare.ui.model
 
 import androidx.compose.runtime.Immutable
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.ImmutableMap
+import dev.dimension.flare.common.SerializableImmutableList
+import dev.dimension.flare.common.SerializableImmutableMap
 
 @Immutable
 public data class UiInstanceMetadata internal constructor(
     val instance: UiInstance,
-    val rules: ImmutableMap<String, String>,
+    val rules: SerializableImmutableMap<String, String>,
     val configuration: Configuration,
 ) {
     @Immutable
@@ -32,7 +32,7 @@ public data class UiInstanceMetadata internal constructor(
         public data class MediaAttachment(
             val imageSizeLimit: Long,
             val descriptionLimit: Long,
-            val supportedMimeTypes: ImmutableList<String>,
+            val supportedMimeTypes: SerializableImmutableList<String>,
         )
 
         @Immutable
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiMedia.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiMedia.kt
index e5cdf5fb3..2e331e4e5 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiMedia.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiMedia.kt
@@ -1,7 +1,7 @@
 package dev.dimension.flare.ui.model
 
 import androidx.compose.runtime.Immutable
-import kotlinx.collections.immutable.ImmutableMap
+import dev.dimension.flare.common.SerializableImmutableMap
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -9,7 +9,7 @@ import kotlinx.serialization.Serializable
 public sealed interface UiMedia {
     public val url: String
     public val description: String?
-    public val customHeaders: ImmutableMap<String, String>?
+    public val customHeaders: SerializableImmutableMap<String, String>?
 
     @Serializable
     @Immutable
@@ -20,7 +20,7 @@ public sealed interface UiMedia {
         val height: Float,
         val width: Float,
         val sensitive: Boolean,
-        override val customHeaders: ImmutableMap<String, String>? = null,
+        override val customHeaders: SerializableImmutableMap<String, String>? = null,
     ) : UiMedia {
         val aspectRatio: Float
             get() = (width / (height.takeUnless { it == 0f } ?: 1f)).takeUnless { it == 0f } ?: 1f
@@ -34,7 +34,7 @@ public sealed interface UiMedia {
         override val description: String?,
         val height: Float,
         val width: Float,
-        override val customHeaders: ImmutableMap<String, String>? = null,
+        override val customHeaders: SerializableImmutableMap<String, String>? = null,
     ) : UiMedia {
         val aspectRatio: Float
             get() = (width / (height.takeUnless { it == 0f } ?: 1f)).takeUnless { it == 0f } ?: 1f
@@ -48,7 +48,7 @@ public sealed interface UiMedia {
         override val description: String?,
         val height: Float,
         val width: Float,
-        override val customHeaders: ImmutableMap<String, String>? = null,
+        override val customHeaders: SerializableImmutableMap<String, String>? = null,
     ) : UiMedia {
         val aspectRatio: Float
             get() = (width / (height.takeUnless { it == 0f } ?: 1f)).takeUnless { it == 0f } ?: 1f
@@ -60,7 +60,7 @@ public sealed interface UiMedia {
         override val url: String,
         override val description: String?,
         val previewUrl: String?,
-        override val customHeaders: ImmutableMap<String, String>? = null,
+        override val customHeaders: SerializableImmutableMap<String, String>? = null,
     ) : UiMedia
 }
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiPodcast.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiPodcast.kt
index 931196e4a..6ef7efab8 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiPodcast.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiPodcast.kt
@@ -1,7 +1,7 @@
 package dev.dimension.flare.ui.model
 
 import androidx.compose.runtime.Immutable
-import kotlinx.collections.immutable.ImmutableList
+import dev.dimension.flare.common.SerializableImmutableList
 
 @Immutable
 public data class UiPodcast(
@@ -10,7 +10,7 @@ public data class UiPodcast(
     val playbackUrl: String?,
     val ended: Boolean,
     val creator: UiProfile,
-    val hosts: ImmutableList<UiProfile>,
-    val speakers: ImmutableList<UiProfile>,
-    val listeners: ImmutableList<UiProfile>,
+    val hosts: SerializableImmutableList<UiProfile>,
+    val speakers: SerializableImmutableList<UiProfile>,
+    val listeners: SerializableImmutableList<UiProfile>,
 )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiPoll.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiPoll.kt
index f7dfb504b..d4a2b857b 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiPoll.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiPoll.kt
@@ -1,11 +1,11 @@
 package dev.dimension.flare.ui.model
 
 import androidx.compose.runtime.Immutable
+import dev.dimension.flare.common.SerializableImmutableList
 import dev.dimension.flare.data.datasource.microblog.PostEvent
 import dev.dimension.flare.ui.humanizer.humanizePercentage
 import dev.dimension.flare.ui.render.UiDateTime
 import dev.dimension.flare.ui.render.toUi
-import kotlinx.collections.immutable.ImmutableList
 import kotlinx.serialization.Serializable
 import kotlin.time.Clock
 import kotlin.time.Instant
@@ -14,10 +14,10 @@ import kotlin.time.Instant
 @Immutable
 public data class UiPoll internal constructor(
     val id: String,
-    val options: ImmutableList<Option>,
+    val options: SerializableImmutableList<Option>,
     val multiple: Boolean,
-    val ownVotes: ImmutableList<Int>,
-    private val onVote: PostEvent.PollEvent,
+    val ownVotes: SerializableImmutableList<Int>,
+    private val voteEvent: PostEvent.PollEvent,
     // null indicates no expiration
     private val expiresAt: Instant?,
     private val enabled: Boolean = true,
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
index 5075bd479..a1f2a1e3d 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimeline.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimeline.kt
@@ -1,6 +1,8 @@
 package dev.dimension.flare.ui.model
 
 import androidx.compose.runtime.Immutable
+import dev.dimension.flare.common.SerializableImmutableList
+import dev.dimension.flare.common.SerializableImmutableMap
 import dev.dimension.flare.data.datasource.microblog.ActionMenu
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
@@ -9,8 +11,6 @@ import dev.dimension.flare.ui.render.UiDateTime
 import dev.dimension.flare.ui.render.UiRichText
 import dev.dimension.flare.ui.route.DeeplinkRoute
 import dev.dimension.flare.ui.route.toUri
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.serialization.Serializable
 
@@ -79,7 +79,7 @@ public data class UiTimeline internal constructor(
             val createdAt: UiDateTime?,
             val source: String,
             val sourceIcon: String?,
-            val imageHeaders: ImmutableMap<String, String>?,
+            val imageHeaders: SerializableImmutableMap<String, String>?,
             private val openInBrowser: Boolean,
         ) : ItemContent() {
             val id: String by lazy {
@@ -100,13 +100,13 @@ public data class UiTimeline internal constructor(
         @Immutable
         public data class Status internal constructor(
             val platformType: PlatformType,
-            val images: ImmutableList<UiMedia>,
+            val images: SerializableImmutableList<UiMedia>,
             val sensitive: Boolean,
             val contentWarning: UiRichText?,
             val user: UiProfile?,
-            val quote: ImmutableList<Status>,
+            val quote: SerializableImmutableList<Status>,
             val content: UiRichText,
-            val actions: ImmutableList<ActionMenu>,
+            val actions: SerializableImmutableList<ActionMenu>,
             val poll: UiPoll?,
             val statusKey: MicroBlogKey,
             val card: UiCard?,
@@ -114,7 +114,7 @@ public data class UiTimeline internal constructor(
             val bottomContent: BottomContent? = null,
             val topEndContent: TopEndContent? = null,
             val aboveTextContent: AboveTextContent? = null,
-            val parents: ImmutableList<Status> = persistentListOf(),
+            val parents: SerializableImmutableList<Status> = persistentListOf(),
             val url: String,
             val onClicked: ClickContext.() -> Unit,
             val onMediaClicked: ClickContext.(media: UiMedia, index: Int) -> Unit,
@@ -138,7 +138,7 @@ public data class UiTimeline internal constructor(
             public sealed class BottomContent {
                 @Immutable
                 public data class Reaction internal constructor(
-                    val emojiReactions: ImmutableList<EmojiReaction>,
+                    val emojiReactions: SerializableImmutableList<EmojiReaction>,
                     val channel: SourceChannel? = null,
                 ) : BottomContent() {
                     @Immutable
@@ -193,7 +193,7 @@ public data class UiTimeline internal constructor(
         @Immutable
         public data class User internal constructor(
             val value: UiProfile,
-            val button: ImmutableList<Button> = persistentListOf(),
+            val button: SerializableImmutableList<Button> = persistentListOf(),
         ) : ItemContent() {
             val id: String by lazy {
                 itemKey
@@ -221,7 +221,7 @@ public data class UiTimeline internal constructor(
 
         @Immutable
         public data class UserList internal constructor(
-            val users: ImmutableList<UiProfile>,
+            val users: SerializableImmutableList<UiProfile>,
             val status: Status? = null,
         ) : ItemContent() {
             val id: String by lazy {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
index 61c9e1da2..196a5bcfa 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
@@ -1,14 +1,13 @@
 package dev.dimension.flare.ui.model
 
 import androidx.compose.runtime.Immutable
+import dev.dimension.flare.common.SerializableImmutableList
 import dev.dimension.flare.data.datasource.microblog.ActionMenu
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
 import dev.dimension.flare.ui.render.UiDateTime
 import dev.dimension.flare.ui.render.UiRichText
 import dev.dimension.flare.ui.route.DeeplinkRoute
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.serialization.Serializable
 
@@ -41,6 +40,9 @@ public sealed class UiTimelineV2 {
         val type: Type,
         private val clickEvent: ClickEvent,
     ) : UiTimelineV2() {
+        val onClicked: ClickContext.() -> Unit by lazy {
+            clickEvent.onClicked
+        }
         override val itemKey: String = "Message_${_id}"
 
         @Serializable
@@ -62,7 +64,7 @@ public sealed class UiTimelineV2 {
             @Immutable
             public data class Localized internal constructor(
                 val data: MessageId,
-                val args: ImmutableList<String> = persistentListOf(),
+                val args: SerializableImmutableList<String> = persistentListOf(),
             ) : Type() {
                 @Serializable
                 @Immutable
@@ -83,6 +85,8 @@ public sealed class UiTimelineV2 {
                     App,
                     StarterpackJoined,
                     Pinned,
+                    AcceptFollowRequest,
+                    RejectFollowRequest,
                 }
             }
         }
@@ -94,11 +98,10 @@ public sealed class UiTimelineV2 {
         val title: String?,
         val description: String?,
         val url: String,
-        val image: String?,
         val createdAt: UiDateTime?,
         val source: Source,
-        val imageHeaders: ImmutableMap<String, String>?,
         val openInBrowser: Boolean,
+        val media: UiMedia.Image? = null,
         private val clickEvent: ClickEvent =
             if (openInBrowser) {
                 ClickEvent.Deeplink(DeeplinkRoute.OpenLinkDirectly(url))
@@ -106,6 +109,9 @@ public sealed class UiTimelineV2 {
                 ClickEvent.Deeplink(DeeplinkRoute.Rss.Detail(url))
             },
     ) : UiTimelineV2() {
+        val onClicked: ClickContext.() -> Unit by lazy {
+            clickEvent.onClicked
+        }
         override val itemKey: String
             get() =
                 buildString {
@@ -126,25 +132,27 @@ public sealed class UiTimelineV2 {
     public data class Post internal constructor(
         val message: Message? = null,
         val platformType: PlatformType,
-        val images: ImmutableList<UiMedia>,
+        val images: SerializableImmutableList<UiMedia>,
         val sensitive: Boolean,
         val contentWarning: UiRichText?,
         val user: UiProfile?,
-        val quote: ImmutableList<Post> = persistentListOf(),
+        val quote: SerializableImmutableList<Post> = persistentListOf(),
         val content: UiRichText,
-        val actions: ImmutableList<ActionMenu>,
+        val actions: SerializableImmutableList<ActionMenu>,
         val poll: UiPoll?,
         val statusKey: MicroBlogKey,
         val card: UiCard?,
         val createdAt: UiDateTime,
-        val emojiReactions: ImmutableList<EmojiReaction> = persistentListOf(),
+        val emojiReactions: SerializableImmutableList<EmojiReaction> = persistentListOf(),
         val sourceChannel: SourceChannel? = null,
         val visibility: Visibility? = null,
         val replyToHandle: String? = null,
-        val parents: ImmutableList<Post> = persistentListOf(),
+        val parents: SerializableImmutableList<Post> = persistentListOf(),
         private val clickEvent: ClickEvent,
-        private val mediaClickEvent: ClickEvent,
     ) : UiTimelineV2() {
+        val onClicked: ClickContext.() -> Unit by lazy {
+            clickEvent.onClicked
+        }
         override val itemKey: String
             get() =
                 buildString {
@@ -178,6 +186,9 @@ public sealed class UiTimelineV2 {
             val isUnicode: Boolean,
             val me: Boolean,
         ) {
+            val onClicked: ClickContext.() -> Unit by lazy {
+                clickEvent.onClicked
+            }
             val isImageReaction: Boolean by lazy {
                 name.startsWith(":") && name.endsWith(":")
             }
@@ -198,7 +209,7 @@ public sealed class UiTimelineV2 {
     public data class User internal constructor(
         val message: Message? = null,
         val value: UiProfile,
-        val button: ImmutableList<Button> = persistentListOf(),
+        val button: SerializableImmutableList<Button> = persistentListOf(),
     ) : UiTimelineV2() {
         override val itemKey: String
             get() =
@@ -213,18 +224,13 @@ public sealed class UiTimelineV2 {
 
         @Serializable
         @Immutable
-        public sealed class Button {
-            @Serializable
-            @Immutable
-            public data class AcceptFollowRequest internal constructor(
-                private val clickEvent: ClickEvent,
-            ) : Button()
-
-            @Serializable
-            @Immutable
-            public data class RejectFollowRequest internal constructor(
-                private val clickEvent: ClickEvent,
-            ) : Button()
+        public data class Button internal constructor(
+            val messageId: Message.Type.Localized.MessageId,
+            private val clickEvent: ClickEvent,
+        ) {
+            val onClicked: ClickContext.() -> Unit by lazy {
+                clickEvent.onClicked
+            }
         }
     }
 
@@ -232,7 +238,7 @@ public sealed class UiTimelineV2 {
     @Immutable
     public data class UserList internal constructor(
         val message: Message? = null,
-        val users: ImmutableList<UiProfile>,
+        val users: SerializableImmutableList<UiProfile>,
         val status: Post? = null,
     ) : UiTimelineV2() {
         override val itemKey: String
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
index 2261c67e8..fa6d0c456 100644
--- 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
@@ -48,7 +48,6 @@ import dev.dimension.flare.ui.route.toUri
 import io.ktor.http.Url
 import io.ktor.utils.io.charsets.Charsets
 import io.ktor.utils.io.core.toByteArray
-import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
@@ -947,7 +946,7 @@ private fun findCard(postView: PostView): UiCard? =
         null
     }
 
-private fun findMedias(postView: PostView): ImmutableList<UiMedia> =
+private fun findMedias(postView: PostView): SerializableImmutableList<UiMedia> =
     when (val embed = postView.embed) {
         is PostViewEmbedUnion.ImagesView -> {
             embed.value.images

From 6acac65c9acf7a919c3de2f2969d04ba9a55761a Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Thu, 26 Feb 2026 21:49:36 +0900
Subject: [PATCH 03/33] add remote loader

---
 .../database/adapter/AccountTypeConverter.kt  |  14 +
 .../data/database/cache/CacaheDatabase.kt     |   4 +-
 .../flare/data/database/cache/dao/UserDao.kt  |   4 +
 .../data/database/cache/mapper/Microblog.kt   | 278 ++++----
 .../database/cache/model/DbPagingTimeline.kt  |  43 +-
 .../data/database/cache/model/DbStatus.kt     |  13 +-
 .../flare/data/database/cache/model/DbUser.kt |  14 +-
 .../BookmarkTimelineRemoteMediator.kt         |  26 +-
 .../mastodon/DiscoverStatusRemoteMediator.kt  |  22 +-
 .../FavouriteTimelineRemoteMediator.kt        |  22 +-
 .../mastodon/HomeTimelineRemoteMediator.kt    |  24 +-
 .../mastodon/ListTimelineRemoteMediator.kt    |  22 +-
 .../datasource/mastodon/MastodonDataSource.kt | 452 ++++++-------
 .../mastodon/MastodonFansPagingSource.kt      |  55 +-
 .../mastodon/MastodonFollowingPagingSource.kt |  55 +-
 .../mastodon/MentionRemoteMediator.kt         |  22 +-
 .../mastodon/NotificationRemoteMediator.kt    |  22 +-
 .../mastodon/PublicTimelineRemoteMediator.kt  |  22 +-
 .../mastodon/SearchStatusPagingSource.kt      |  22 +-
 .../mastodon/SearchUserPagingSource.kt        |  69 +-
 .../mastodon/StatusDetailRemoteMediator.kt    |  23 +-
 .../mastodon/TrendHashtagPagingSource.kt      |  49 +-
 .../datasource/mastodon/TrendsUserLoader.kt   |  39 ++
 .../mastodon/TrendsUserPagingSource.kt        |  30 -
 .../mastodon/UserTimelineRemoteMediator.kt    |  29 +-
 .../data/datasource/microblog/ActionMenu.kt   |  11 +-
 .../AuthenticatedMicroblogDataSource.kt       |  51 +-
 .../microblog/MicroblogDataSource.kt          |  50 +-
 .../microblog/MixedRemoteMediator.kt          |  36 +-
 .../flare/data/datasource/microblog/Paging.kt | 331 +++++----
 .../{StatusEvent.kt => PostEvent.kt}          | 275 ++++----
 .../datasource/microblog/ProfileAction.kt     |  27 +-
 .../data/datasource/microblog/ProfileTab.kt   |   5 +-
 .../microblog/list/ListDataSource.kt          |   5 +-
 .../paging/BaseTimelineRemoteMediator.kt      |  52 --
 .../microblog/paging/CacheableRemoteLoader.kt |   5 +
 .../microblog/paging/RemoteLoader.kt          |  39 ++
 .../paging/TimelineRemoteMediator.kt          | 178 +++++
 .../rss/RssTimelineRemoteMediator.kt          | 143 +---
 .../dimension/flare/ui/model/ClickContext.kt  |  19 +
 .../dev/dimension/flare/ui/model/UiIcon.kt    |   1 +
 .../dev/dimension/flare/ui/model/UiMedia.kt   |  10 +
 .../dev/dimension/flare/ui/model/UiPoll.kt    |   3 +-
 .../dev/dimension/flare/ui/model/UiProfile.kt |   7 +
 .../dimension/flare/ui/model/UiTimelineV2.kt  | 187 +++--
 .../flare/ui/model/mapper/Mastodon.kt         | 638 +++++++++---------
 .../dimension/flare/ui/model/mapper/Rss.kt    | 197 +++---
 .../home/DiscoverStatusTimelinePresenter.kt   |   5 +-
 .../presenter/home/HomeTimelinePresenter.kt   |   5 +-
 .../presenter/home/MixedTimelinePresenter.kt  |   9 +-
 .../home/SearchStatusTimelinePresenter.kt     |   4 +-
 .../ui/presenter/home/TimelinePresenter.kt    | 181 +++--
 .../BlueskyBookmarkTimelinePresenter.kt       |   5 +-
 .../home/bluesky/BlueskyFeedPresenter.kt      |   5 +-
 .../bluesky/BlueskyFeedTimelinePresenter.kt   |   5 +-
 .../MastodonBookmarkTimelinePresenter.kt      |   5 +-
 .../MastodonFavouriteTimelinePresenter.kt     |   5 +-
 .../MastodonLocalTimelinePresenter.kt         |   5 +-
 .../MastodonPublicTimelinePresenter.kt        |   5 +-
 .../misskey/MissKeyLocalTimelinePresenter.kt  |   5 +-
 .../misskey/MissKeyPublicTimelinePresenter.kt |   5 +-
 .../home/misskey/MisskeyChannelPresenter.kt   |   5 +-
 .../MisskeyChannelTimelinePresenter.kt        |   5 +-
 .../MisskeyFavouriteTimelinePresenter.kt      |   5 +-
 .../misskey/MisskeyHybridTimelinePresenter.kt |   5 +-
 .../home/rss/RssTimelinePresenter.kt          |   7 +-
 .../home/vvo/VVOFavouriteTimelinePresenter.kt |   5 +-
 .../home/vvo/VVOLikeTimelinePresenter.kt      |   5 +-
 .../home/xqt/XQTBookmarkTimelinePresenter.kt  |   5 +-
 .../xqt/XQTDeviceFollowTimelinePresenter.kt   |   5 +-
 .../home/xqt/XQTFeaturedTimelinePresenter.kt  |   5 +-
 .../list/AntennasTimelinePresenter.kt         |   5 +-
 .../list/ChannelTimelinePresenter.kt          |   5 +-
 .../presenter/list/ListTimelinePresenter.kt   |   5 +-
 .../profile/ProfileMediaPresenter.kt          |   5 +-
 .../ui/presenter/profile/ProfilePresenter.kt  |   5 +-
 .../status/StatusContextPresenter.kt          |   5 +-
 77 files changed, 2065 insertions(+), 1911 deletions(-)
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/TrendsUserLoader.kt
 delete mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/TrendsUserPagingSource.kt
 rename shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/{StatusEvent.kt => PostEvent.kt} (57%)
 delete mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/BaseTimelineRemoteMediator.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/CacheableRemoteLoader.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/RemoteLoader.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelineRemoteMediator.kt

diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/adapter/AccountTypeConverter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/adapter/AccountTypeConverter.kt
index 1cef7b081..3ded9eeb1 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/adapter/AccountTypeConverter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/adapter/AccountTypeConverter.kt
@@ -4,6 +4,8 @@ import androidx.room.TypeConverter
 import dev.dimension.flare.common.decodeJson
 import dev.dimension.flare.common.encodeJson
 import dev.dimension.flare.model.DbAccountType
+import dev.dimension.flare.ui.model.UiProfile
+import dev.dimension.flare.ui.model.UiTimelineV2
 
 internal class AccountTypeConverter {
     @TypeConverter
@@ -11,4 +13,16 @@ internal class AccountTypeConverter {
 
     @TypeConverter
     fun fromEnum(value: DbAccountType): String = value.encodeJson()
+
+    @TypeConverter
+    fun fromUiProfile(value: UiProfile): String = value.encodeJson()
+
+    @TypeConverter
+    fun toUiProfile(value: String): UiProfile = value.decodeJson()
+
+    @TypeConverter
+    fun fromUiTimelineV2(value: UiTimelineV2): String = value.encodeJson()
+
+    @TypeConverter
+    fun toUiTimelineV2(value: String): UiTimelineV2 = value.decodeJson()
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/CacaheDatabase.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/CacaheDatabase.kt
index 130cee269..4ed78b09f 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/CacaheDatabase.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/CacaheDatabase.kt
@@ -8,12 +8,13 @@ import androidx.room.TypeConverters
 import androidx.room.immediateTransaction
 import androidx.room.useWriterConnection
 
-internal const val CACHE_DATABASE_VERSION = 23
+internal const val CACHE_DATABASE_VERSION = 24
 
 @Database(
     entities = [
         dev.dimension.flare.data.database.cache.model.DbEmoji::class,
         dev.dimension.flare.data.database.cache.model.DbStatusReference::class,
+        dev.dimension.flare.data.database.cache.model.DbStatusUserReference::class,
         dev.dimension.flare.data.database.cache.model.DbStatus::class,
         dev.dimension.flare.data.database.cache.model.DbUser::class,
         dev.dimension.flare.data.database.cache.model.DbPagingTimeline::class,
@@ -37,7 +38,6 @@ internal const val CACHE_DATABASE_VERSION = 23
     dev.dimension.flare.data.database.adapter.AccountTypeConverter::class,
     dev.dimension.flare.data.database.cache.model.EmojiContentConverter::class,
     dev.dimension.flare.data.database.cache.model.StatusConverter::class,
-    dev.dimension.flare.data.database.cache.model.UserContentConverters::class,
     dev.dimension.flare.data.database.cache.model.MessageContentConverters::class,
     dev.dimension.flare.data.database.cache.model.ListContentConverters::class,
 )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt
index 80e26879e..c7514a0fc 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt
@@ -6,6 +6,7 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Transaction
+import dev.dimension.flare.data.database.cache.model.DbStatusUserReference
 import dev.dimension.flare.data.database.cache.model.DbUser
 import dev.dimension.flare.data.database.cache.model.DbUserHistory
 import dev.dimension.flare.data.database.cache.model.DbUserHistoryWithUser
@@ -23,6 +24,9 @@ internal interface UserDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertAll(users: List<DbUser>)
 
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAll(users: List<DbStatusUserReference>)
+
     @Query("UPDATE DbUser SET content = :content WHERE userKey = :userKey")
     suspend fun update(
         userKey: MicroBlogKey,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Microblog.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Microblog.kt
index a02a646b7..86eada329 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Microblog.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Microblog.kt
@@ -1,87 +1,101 @@
 package dev.dimension.flare.data.database.cache.mapper
 
 import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.model.DbPagingTimeline
 import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.database.cache.model.DbStatusReference
-import dev.dimension.flare.data.database.cache.model.DbStatusReferenceWithStatus
-import dev.dimension.flare.data.database.cache.model.DbStatusWithReference
-import dev.dimension.flare.data.database.cache.model.DbStatusWithUser
-import dev.dimension.flare.data.database.cache.model.UserContent
-import dev.dimension.flare.model.AccountType
-import dev.dimension.flare.model.DbAccountType
-import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.model.ReferenceType
-import kotlinx.coroutines.flow.firstOrNull
-import kotlin.uuid.Uuid
 
 internal suspend fun saveToDatabase(
     database: CacheDatabase,
     items: List<DbPagingTimelineWithStatus>,
 ) {
-    (
-        items.mapNotNull { it.status.status.user } +
-            items
-                .flatMap { it.status.references }
-                .mapNotNull { it.status?.user }
-    ).let { allUsers ->
-        val exsitingUsers =
-            database
-                .userDao()
-                .findByKeys(allUsers.map { it.userKey })
-                .firstOrNull()
-                .orEmpty()
-                .map {
-                    when (val content = it.content) {
-                        is UserContent.Bluesky -> {
-                            val user =
-                                allUsers.find { user ->
-                                    user.userKey == it.userKey
-                                }
-                            if (user != null && user.content is UserContent.BlueskyLite) {
-                                it.copy(
-                                    content =
-                                        content.copy(
-                                            data =
-                                                content.data.copy(
-                                                    handle = user.content.data.handle,
-                                                    displayName = user.content.data.displayName,
-                                                    avatar = user.content.data.avatar,
-                                                ),
-                                        ),
-                                )
-                            } else {
-                                it
-                            }
-                        }
-                        is UserContent.Misskey -> {
-                            val user =
-                                allUsers.find { user ->
-                                    user.userKey == it.userKey
-                                }
-                            if (user != null && user.content is UserContent.MisskeyLite) {
-                                it.copy(
-                                    content =
-                                        content.copy(
-                                            data =
-                                                content.data.copy(
-                                                    name = user.content.data.name,
-                                                    username = user.content.data.username,
-                                                    avatarUrl = user.content.data.avatarUrl,
-                                                ),
-                                        ),
-                                )
-                            } else {
-                                it
-                            }
-                        }
-                        else -> it
-                    }
-                }
+    // TODO: check existing users and update them if needed
+    val users =
+        items
+            .flatMap {
+                listOfNotNull(it.status.status) + it.status.references.mapNotNull { it.status }
+            }.flatMap { it.references }
+            .mapNotNull { it.user }
+            .distinctBy { it.userKey }
+    val userReferences =
+        items
+            .flatMap {
+                listOfNotNull(it.status.status) + it.status.references.mapNotNull { it.status }
+            }.flatMap { post ->
+                post.references.map { it.reference }
+            }
+    database.userDao().insertAll(users)
+    database.userDao().insertAll(userReferences)
 
-        val result = (exsitingUsers + allUsers).distinctBy { it.userKey }
-        database.userDao().insertAll(result)
-    }
+//    (
+//            items.flatMap { it.status.status.references.mapNotNull { it.user } } +
+//                    items
+//                        .flatMap { it.status.references }
+//                        .flatMap { it.status?.references.orEmpty() }
+//                        .mapNotNull { it.user }
+//            ).let { allUsers ->
+//            val exsitingUsers =
+//                database
+//                    .userDao()
+//                    .findByKeys(allUsers.map { it.userKey })
+//                    .firstOrNull()
+//                    .orEmpty()
+// //                .map {
+// //                    when (val content = it.content) {
+// //                        is UserContent.Bluesky -> {
+// //                            val user =
+// //                                allUsers.find { user ->
+// //                                    user.userKey == it.userKey
+// //                                }
+// //                            if (user != null && user.content is UserContent.BlueskyLite) {
+// //                                it.copy(
+// //                                    content =
+// //                                        content.copy(
+// //                                            data =
+// //                                                content.data.copy(
+// //                                                    handle = user.content.data.handle,
+// //                                                    displayName = user.content.data.displayName,
+// //                                                    avatar = user.content.data.avatar,
+// //                                                ),
+// //                                        ),
+// //                                )
+// //                            } else {
+// //                                it
+// //                            }
+// //                        }
+// //                        is UserContent.Misskey -> {
+// //                            val user =
+// //                                allUsers.find { user ->
+// //                                    user.userKey == it.userKey
+// //                                }
+// //                            if (user != null && user.content is UserContent.MisskeyLite) {
+// //                                it.copy(
+// //                                    content =
+// //                                        content.copy(
+// //                                            data =
+// //                                                content.data.copy(
+// //                                                    name = user.content.data.name,
+// //                                                    username = user.content.data.username,
+// //                                                    avatarUrl = user.content.data.avatarUrl,
+// //                                                ),
+// //                                        ),
+// //                                )
+// //                            } else {
+// //                                it
+// //                            }
+// //                        }
+// //                        else -> it
+// //                    }
+// //                }
+//
+//            val result = (exsitingUsers + allUsers).distinctBy { it.userKey }
+//            database.userDao().insertAll(result)
+//            database.userDao().insertAll(result.map {
+//                DbStatusUserReference(
+//                    _id = "${it.userKey}_${it.name}",
+//                    statusKey = it.userKey,
+//                    referenceUserKey = it.userKey,
+//                )
+//            })
+//        }
     (
         items.map { it.status.status.data } +
             items
@@ -97,61 +111,61 @@ internal suspend fun saveToDatabase(
     database.pagingTimelineDao().insertAll(items.map { it.timeline })
 }
 
-internal fun createDbPagingTimelineWithStatus(
-    accountType: DbAccountType,
-    pagingKey: String,
-    sortId: Long,
-    status: DbStatusWithUser,
-    references: Map<ReferenceType, List<DbStatusWithUser>>,
-): DbPagingTimelineWithStatus {
-    val timeline =
-        DbPagingTimeline(
-            accountType = accountType,
-            statusKey = status.data.statusKey,
-            pagingKey = pagingKey,
-            sortId = sortId,
-        )
-    return DbPagingTimelineWithStatus(
-        timeline = timeline,
-        status =
-            DbStatusWithReference(
-                status = status,
-                references =
-                    references.flatMap { (type, reference) ->
-                        reference.map {
-                            it.toDbStatusReference(status.data.statusKey, type)
-                        }
-                    },
-            ),
-    )
-}
-
-internal fun createDbPagingTimelineWithStatus(
-    accountKey: MicroBlogKey,
-    pagingKey: String,
-    sortId: Long,
-    status: DbStatusWithUser,
-    references: Map<ReferenceType, List<DbStatusWithUser>>,
-): DbPagingTimelineWithStatus =
-    createDbPagingTimelineWithStatus(
-        accountType = AccountType.Specific(accountKey),
-        pagingKey = pagingKey,
-        sortId = sortId,
-        status = status,
-        references = references,
-    )
-
-private fun DbStatusWithUser.toDbStatusReference(
-    statusKey: MicroBlogKey,
-    referenceType: ReferenceType,
-): DbStatusReferenceWithStatus =
-    DbStatusReferenceWithStatus(
-        reference =
-            DbStatusReference(
-                _id = Uuid.random().toString(),
-                referenceType = referenceType,
-                statusKey = statusKey,
-                referenceStatusKey = data.statusKey,
-            ),
-        status = this,
-    )
+// internal fun createDbPagingTimelineWithStatus(
+//    accountType: DbAccountType,
+//    pagingKey: String,
+//    sortId: Long,
+//    status: DbStatusWithUser,
+//    references: Map<ReferenceType, List<DbStatusWithUser>>,
+// ): DbPagingTimelineWithStatus {
+//    val timeline =
+//        DbPagingTimeline(
+//            accountType = accountType,
+//            statusKey = status.data.statusKey,
+//            pagingKey = pagingKey,
+//            sortId = sortId,
+//        )
+//    return DbPagingTimelineWithStatus(
+//        timeline = timeline,
+//        status =
+//            DbStatusWithReference(
+//                status = status,
+//                references =
+//                    references.flatMap { (type, reference) ->
+//                        reference.map {
+//                            it.toDbStatusReference(status.data.statusKey, type)
+//                        }
+//                    },
+//            ),
+//    )
+// }
+//
+// internal fun createDbPagingTimelineWithStatus(
+//    accountKey: MicroBlogKey,
+//    pagingKey: String,
+//    sortId: Long,
+//    status: DbStatusWithUser,
+//    references: Map<ReferenceType, List<DbStatusWithUser>>,
+// ): DbPagingTimelineWithStatus =
+//    createDbPagingTimelineWithStatus(
+//        accountType = AccountType.Specific(accountKey),
+//        pagingKey = pagingKey,
+//        sortId = sortId,
+//        status = status,
+//        references = references,
+//    )
+//
+// private fun DbStatusWithUser.toDbStatusReference(
+//    statusKey: MicroBlogKey,
+//    referenceType: ReferenceType,
+// ): DbStatusReferenceWithStatus =
+//    DbStatusReferenceWithStatus(
+//        reference =
+//            DbStatusReference(
+//                _id = Uuid.random().toString(),
+//                referenceType = referenceType,
+//                statusKey = statusKey,
+//                referenceStatusKey = data.statusKey,
+//            ),
+//        status = this,
+//    )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbPagingTimeline.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbPagingTimeline.kt
index e47f8ca17..25986d591 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbPagingTimeline.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbPagingTimeline.kt
@@ -8,7 +8,6 @@ import androidx.room.Relation
 import androidx.room.TypeConverter
 import dev.dimension.flare.common.decodeJson
 import dev.dimension.flare.common.encodeJson
-import dev.dimension.flare.model.DbAccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.ReferenceType
 import kotlin.time.Instant
@@ -17,13 +16,12 @@ import kotlin.uuid.Uuid
 @Entity(
     indices = [
         Index(
-            value = ["accountType", "statusKey", "pagingKey"],
+            value = ["statusKey", "pagingKey"],
             unique = true,
         ),
     ],
 )
 internal data class DbPagingTimeline(
-    val accountType: DbAccountType,
     val pagingKey: String,
     val statusKey: MicroBlogKey,
     val sortId: Long,
@@ -53,7 +51,44 @@ internal data class DbPagingTimelineWithStatus(
 internal data class DbStatusWithUser(
     @Embedded
     val data: DbStatus,
-    @Relation(parentColumn = "userKey", entityColumn = "userKey")
+    @Relation(
+        parentColumn = "statusKey",
+        entityColumn = "statusKey",
+        entity = DbStatusReference::class,
+    )
+    val references: List<DbStatusUserReferenceWithUser>,
+)
+
+@Entity(
+    tableName = "status_user_reference",
+    indices = [
+        Index(
+            value = [
+                "statusKey",
+                "referenceUserKey",
+            ],
+            unique = true,
+        ),
+    ],
+)
+internal data class DbStatusUserReference(
+    /**
+     * Id that being used in the database
+     */
+    @PrimaryKey
+    val _id: String,
+    val statusKey: MicroBlogKey,
+    val referenceUserKey: MicroBlogKey,
+)
+
+internal data class DbStatusUserReferenceWithUser(
+    @Embedded
+    val reference: DbStatusUserReference,
+    @Relation(
+        parentColumn = "referenceUserKey",
+        entityColumn = "userKey",
+        entity = DbUser::class,
+    )
     val user: DbUser?,
 )
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbStatus.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbStatus.kt
index 2f2a62898..7e51233bf 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbStatus.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbStatus.kt
@@ -3,20 +3,17 @@ package dev.dimension.flare.data.database.cache.model
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import dev.dimension.flare.model.DbAccountType
 import dev.dimension.flare.model.MicroBlogKey
-import kotlin.time.Instant
+import dev.dimension.flare.ui.model.UiTimelineV2
 
 @Entity(
-    indices = [Index(value = ["statusKey", "accountType"], unique = true)],
+    indices = [Index(value = ["statusKey", "pagingKey"], unique = true)],
 )
 internal data class DbStatus(
     val statusKey: MicroBlogKey,
-    val accountType: DbAccountType,
-    val userKey: MicroBlogKey?,
-    val content: StatusContent,
+    val pagingKey: String,
+    val content: UiTimelineV2,
     val text: String?, // For Searching
-    val createdAt: Instant,
     @PrimaryKey
-    val id: String = "${accountType}_$statusKey",
+    val id: String = "${pagingKey}_$statusKey",
 )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbUser.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbUser.kt
index 131fb2f7c..e3e499182 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbUser.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbUser.kt
@@ -3,11 +3,9 @@ package dev.dimension.flare.data.database.cache.model
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import androidx.room.TypeConverter
-import dev.dimension.flare.common.decodeJson
-import dev.dimension.flare.common.encodeJson
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
+import dev.dimension.flare.ui.model.UiProfile
 
 @Entity(
     indices = [
@@ -21,13 +19,5 @@ internal data class DbUser(
     val name: String,
     val handle: String,
     val host: String,
-    val content: UserContent,
+    val content: UiProfile,
 )
-
-internal class UserContentConverters {
-    @TypeConverter
-    fun fromUserContent(content: UserContent): String = content.encodeJson()
-
-    @TypeConverter
-    fun toUserContent(value: String): UserContent = value.decodeJson()
-}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/BookmarkTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/BookmarkTimelineRemoteMediator.kt
index dcde86c39..80166fada 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/BookmarkTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/BookmarkTimelineRemoteMediator.kt
@@ -1,30 +1,25 @@
 package dev.dimension.flare.data.datasource.mastodon
 
-import SnowflakeIdGenerator
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.mastodon.MastodonService
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class BookmarkTimelineRemoteMediator(
     private val service: MastodonService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String = "bookmark_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
@@ -50,14 +45,7 @@ internal class BookmarkTimelineRemoteMediator(
 
         return PagingResult(
             endOfPaginationReached = response.isEmpty() || response.next == null,
-            data =
-                response.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                    sortIdProvider = {
-                        -SnowflakeIdGenerator.nextId()
-                    },
-                ),
+            data = response.render(accountKey),
             nextKey = response.next,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/DiscoverStatusRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/DiscoverStatusRemoteMediator.kt
index ce429243c..fe5200a00 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/DiscoverStatusRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/DiscoverStatusRemoteMediator.kt
@@ -1,29 +1,25 @@
 package dev.dimension.flare.data.datasource.mastodon
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.mastodon.MastodonService
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class DiscoverStatusRemoteMediator(
     private val service: MastodonService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String = "discover_status_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
@@ -39,11 +35,7 @@ internal class DiscoverStatusRemoteMediator(
 
         return PagingResult(
             endOfPaginationReached = true,
-            data =
-                response.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+            data = response.render(accountKey),
         )
     }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/FavouriteTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/FavouriteTimelineRemoteMediator.kt
index 829afb139..2981fba5b 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/FavouriteTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/FavouriteTimelineRemoteMediator.kt
@@ -1,29 +1,25 @@
 package dev.dimension.flare.data.datasource.mastodon
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.mastodon.MastodonService
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class FavouriteTimelineRemoteMediator(
     private val service: MastodonService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String = "favourite_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
@@ -49,11 +45,7 @@ internal class FavouriteTimelineRemoteMediator(
 
         return PagingResult(
             endOfPaginationReached = response.isEmpty() || response.next == null,
-            data =
-                response.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+            data = response.render(accountKey),
             nextKey = response.next,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/HomeTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/HomeTimelineRemoteMediator.kt
index 2177a747b..cd29da393 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/HomeTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/HomeTimelineRemoteMediator.kt
@@ -1,31 +1,25 @@
 package dev.dimension.flare.data.datasource.mastodon
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.mastodon.MastodonService
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class HomeTimelineRemoteMediator(
     private val service: MastodonService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String = "home_$accountKey"
 
-    override suspend fun initialize(): InitializeAction = InitializeAction.SKIP_INITIAL_REFRESH
-
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
@@ -52,11 +46,7 @@ internal class HomeTimelineRemoteMediator(
 
         return PagingResult(
             endOfPaginationReached = response.isEmpty(),
-            data =
-                response.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+            data = response.render(accountKey),
             nextKey = response.next,
             previousKey = response.prev,
         )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/ListTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/ListTimelineRemoteMediator.kt
index 03f6c3bcf..10b8117ad 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/ListTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/ListTimelineRemoteMediator.kt
@@ -1,30 +1,26 @@
 package dev.dimension.flare.data.datasource.mastodon
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.mastodon.MastodonService
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class ListTimelineRemoteMediator(
     private val listId: String,
     private val service: MastodonService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey = "list_${accountKey}_$listId"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
@@ -52,11 +48,7 @@ internal class ListTimelineRemoteMediator(
 
         return PagingResult(
             endOfPaginationReached = response.isEmpty(),
-            data =
-                response.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+            data = response.render(accountKey),
             nextKey = response.next,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt
index 37d108f14..a0e569ef3 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt
@@ -1,18 +1,12 @@
 package dev.dimension.flare.data.datasource.mastodon
 
 import androidx.paging.ExperimentalPagingApi
-import androidx.paging.Pager
-import androidx.paging.PagingData
-import androidx.paging.cachedIn
-import dev.dimension.flare.common.CacheData
 import dev.dimension.flare.common.Cacheable
 import dev.dimension.flare.common.FileType
 import dev.dimension.flare.common.MemCacheable
 import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.connect
-import dev.dimension.flare.data.database.cache.mapper.Mastodon
 import dev.dimension.flare.data.database.cache.mapper.toDb
-import dev.dimension.flare.data.database.cache.mapper.toDbUser
 import dev.dimension.flare.data.database.cache.model.StatusContent
 import dev.dimension.flare.data.database.cache.model.updateStatusUseCase
 import dev.dimension.flare.data.datasource.microblog.AuthenticatedMicroblogDataSource
@@ -21,18 +15,17 @@ import dev.dimension.flare.data.datasource.microblog.ComposeData
 import dev.dimension.flare.data.datasource.microblog.ComposeProgress
 import dev.dimension.flare.data.datasource.microblog.ComposeType
 import dev.dimension.flare.data.datasource.microblog.NotificationFilter
+import dev.dimension.flare.data.datasource.microblog.PostEvent
 import dev.dimension.flare.data.datasource.microblog.ProfileAction
 import dev.dimension.flare.data.datasource.microblog.ProfileTab
 import dev.dimension.flare.data.datasource.microblog.RelationDataSource
-import dev.dimension.flare.data.datasource.microblog.StatusEvent
 import dev.dimension.flare.data.datasource.microblog.list.ListDataSource
 import dev.dimension.flare.data.datasource.microblog.list.ListHandler
 import dev.dimension.flare.data.datasource.microblog.list.ListLoader
 import dev.dimension.flare.data.datasource.microblog.list.ListMemberHandler
 import dev.dimension.flare.data.datasource.microblog.list.ListMemberLoader
-import dev.dimension.flare.data.datasource.microblog.pagingConfig
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.datasource.microblog.relationKeyWithUserKey
-import dev.dimension.flare.data.datasource.microblog.timelinePager
 import dev.dimension.flare.data.datasource.pleroma.PleromaDataSource
 import dev.dimension.flare.data.network.mastodon.MastodonService
 import dev.dimension.flare.data.network.mastodon.api.model.PostPoll
@@ -41,22 +34,19 @@ import dev.dimension.flare.data.network.mastodon.api.model.PostStatus
 import dev.dimension.flare.data.network.mastodon.api.model.PostVote
 import dev.dimension.flare.data.network.mastodon.api.model.Visibility
 import dev.dimension.flare.data.repository.AccountRepository
-import dev.dimension.flare.data.repository.LocalFilterRepository
 import dev.dimension.flare.data.repository.tryRun
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.model.PlatformType
 import dev.dimension.flare.shared.image.ImageCompressor
 import dev.dimension.flare.ui.model.UiAccount
 import dev.dimension.flare.ui.model.UiEmoji
 import dev.dimension.flare.ui.model.UiHashtag
 import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.UiRelation
-import dev.dimension.flare.ui.model.UiState
 import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.mapper.render
 import dev.dimension.flare.ui.model.mapper.toUi
-import dev.dimension.flare.ui.model.toUi
 import dev.dimension.flare.ui.presenter.compose.ComposeStatus
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableMap
@@ -64,7 +54,6 @@ import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.collections.immutable.toPersistentList
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
@@ -79,11 +68,9 @@ internal open class MastodonDataSource(
     val instance: String,
 ) : AuthenticatedMicroblogDataSource,
     KoinComponent,
-    StatusEvent.Mastodon,
     ListDataSource,
     RelationDataSource {
     private val database: CacheDatabase by inject()
-    private val localFilterRepository: LocalFilterRepository by inject()
     private val coroutineScope: CoroutineScope by inject()
     private val accountRepository: AccountRepository by inject()
     private val imageCompressor: ImageCompressor by inject()
@@ -97,63 +84,24 @@ internal open class MastodonDataSource(
         )
     }
 
+    override fun handleEvent(event: PostEvent) {
+    }
+
     override fun homeTimeline() =
         HomeTimelineRemoteMediator(
             service,
-            database,
             accountKey,
         )
 
-    fun localTimeline(
-        pageSize: Int = 20,
-        scope: CoroutineScope,
-    ): Flow<PagingData<UiTimeline>> =
-        timelinePager(
-            pageSize = pageSize,
-            database = database,
-            scope = scope,
-            filterFlow = localFilterRepository.getFlow(forTimeline = true),
-            accountRepository = accountRepository,
-            mediator = publicTimelineLoader(local = true),
-        )
-
-    fun bookmarkTimeline(
-        pageSize: Int = 20,
-        scope: CoroutineScope,
-    ): Flow<PagingData<UiTimeline>> =
-        timelinePager(
-            pageSize = pageSize,
-            database = database,
-            scope = scope,
-            filterFlow = localFilterRepository.getFlow(forTimeline = true),
-            accountRepository = accountRepository,
-            mediator = bookmarkTimelineLoader(),
-        )
-
     fun bookmarkTimelineLoader() =
         BookmarkTimelineRemoteMediator(
             service,
-            database,
             accountKey,
         )
 
-    fun favouriteTimeline(
-        pageSize: Int = 20,
-        scope: CoroutineScope,
-    ): Flow<PagingData<UiTimeline>> =
-        timelinePager(
-            pageSize = pageSize,
-            database = database,
-            scope = scope,
-            filterFlow = localFilterRepository.getFlow(forTimeline = true),
-            accountRepository = accountRepository,
-            mediator = favouriteTimelineLoader(),
-        )
-
     fun favouriteTimelineLoader() =
         FavouriteTimelineRemoteMediator(
             service,
-            database,
             accountKey,
         )
 
@@ -161,64 +109,35 @@ internal open class MastodonDataSource(
         ListTimelineRemoteMediator(
             listId,
             service,
-            database,
             accountKey,
         )
 
-    fun publicTimeline(
-        pageSize: Int = 20,
-        scope: CoroutineScope,
-    ): Flow<PagingData<UiTimeline>> =
-        timelinePager(
-            pageSize = pageSize,
-            database = database,
-            scope = scope,
-            filterFlow = localFilterRepository.getFlow(forTimeline = true),
-            accountRepository = accountRepository,
-            mediator = publicTimelineLoader(local = false),
-        )
-
     fun publicTimelineLoader(local: Boolean) =
         PublicTimelineRemoteMediator(
             service,
-            database,
             accountKey,
             local = local,
         )
 
-    override fun notification(
-        type: NotificationFilter,
-        pageSize: Int,
-        scope: CoroutineScope,
-    ): Flow<PagingData<UiTimeline>> =
-        timelinePager(
-            pageSize = pageSize,
-            database = database,
-            scope = scope,
-            filterFlow = localFilterRepository.getFlow(forNotification = true),
-            accountRepository = accountRepository,
-            mediator =
-                when (type) {
-                    NotificationFilter.All ->
-                        NotificationRemoteMediator(
-                            service,
-                            database,
-                            accountKey,
-                            onClearMarker = {
-                                MemCacheable.update(notificationMarkerKey, 0)
-                            },
-                        )
+    override fun notification(type: NotificationFilter): RemoteLoader<UiTimelineV2> =
+        when (type) {
+            NotificationFilter.All ->
+                NotificationRemoteMediator(
+                    service,
+                    accountKey,
+                    onClearMarker = {
+                        MemCacheable.update(notificationMarkerKey, 0)
+                    },
+                )
 
-                    NotificationFilter.Mention ->
-                        MentionRemoteMediator(
-                            service,
-                            database,
-                            accountKey,
-                        )
+            NotificationFilter.Mention ->
+                MentionRemoteMediator(
+                    service,
+                    accountKey,
+                )
 
-                    else -> throw IllegalStateException("Unsupported notification type")
-                },
-        )
+            else -> throw IllegalStateException("Unsupported notification type")
+        }
 
     override val supportedNotificationFilter: List<NotificationFilter>
         get() =
@@ -227,56 +146,76 @@ internal open class MastodonDataSource(
                 NotificationFilter.Mention,
             )
 
-    override fun userByAcct(acct: String): CacheData<UiProfile> {
-        val (name, host) = MicroBlogKey.valueOf(acct)
-        return Cacheable(
-            fetchSource = {
-                val user =
-                    service
-                        .lookupUserByAcct("$name@$host")
-                        ?.toDbUser(accountKey.host) ?: throw Exception("User not found")
-                database.userDao().insert(user)
-            },
-            cacheSource = {
-                database
-                    .userDao()
-                    .findByHandleAndHost(name, host, PlatformType.Mastodon)
-                    .distinctUntilChanged()
-                    .mapNotNull { it?.render(accountKey) }
-            },
-        )
-    }
+    override suspend fun userByNameAndHost(
+        name: String,
+        host: String,
+    ): UiProfile =
+        service
+            .lookupUserByAcct("$name@$host")
+            ?.render(
+                accountKey = accountKey,
+                host = accountKey.host,
+            ) ?: throw Exception("User not found")
 
-    override fun userById(id: String): CacheData<UiProfile> {
-        val userKey = MicroBlogKey(id, accountKey.host)
-        return Cacheable(
-            fetchSource = {
-                val user = service.lookupUser(id).toDbUser(accountKey.host)
-                database.userDao().insert(user)
-            },
-            cacheSource = {
-                database
-                    .userDao()
-                    .findByKey(userKey)
-                    .distinctUntilChanged()
-                    .mapNotNull { it?.render(accountKey) }
-            },
-        )
-    }
+//    override fun userByAcct(acct: String): CacheData<UiProfile> {
+//        val (name, host) = MicroBlogKey.valueOf(acct)
+//        return Cacheable(
+//            fetchSource = {
+//                val user =
+//                    service
+//                        .lookupUserByAcct("$name@$host")
+//                        ?.toDbUser(accountKey.host) ?: throw Exception("User not found")
+//                database.userDao().insert(user)
+//            },
+//            cacheSource = {
+//                database
+//                    .userDao()
+//                    .findByHandleAndHost(name, host, PlatformType.Mastodon)
+//                    .distinctUntilChanged()
+//                    .mapNotNull { it?.render(accountKey) }
+//            },
+//        )
+//    }
 
-    override fun relation(userKey: MicroBlogKey): Flow<UiState<UiRelation>> =
-        MemCacheable<UiRelation>(
-            relationKeyWithUserKey(userKey),
-        ) {
-            service.showFriendships(listOf(userKey.id)).first().toUi()
-        }.toUi()
+    override suspend fun userById(id: String): UiProfile =
+        service
+            .lookupUser(id)
+            .render(
+                accountKey = accountKey,
+                host = accountKey.host,
+            )
+
+//    override fun userById(id: String): CacheData<UiProfile> {
+//        val userKey = MicroBlogKey(id, accountKey.host)
+//        return Cacheable(
+//            fetchSource = {
+//                val user = service.lookupUser(id).toDbUser(accountKey.host)
+//                database.userDao().insert(user)
+//            },
+//            cacheSource = {
+//                database
+//                    .userDao()
+//                    .findByKey(userKey)
+//                    .distinctUntilChanged()
+//                    .mapNotNull { it?.render(accountKey) }
+//            },
+//        )
+//    }
+
+    override suspend fun relation(userKey: MicroBlogKey): UiRelation = service.showFriendships(listOf(userKey.id)).first().toUi()
+
+//    override fun relation(userKey: MicroBlogKey): Flow<UiState<UiRelation>> =
+//        MemCacheable<UiRelation>(
+//            relationKeyWithUserKey(userKey),
+//        ) {
+//            service.showFriendships(listOf(userKey.id)).first().toUi()
+//        }.toUi()
 
     override fun userTimeline(
         userKey: MicroBlogKey,
         mediaOnly: Boolean,
     ) = UserTimelineRemoteMediator(
         service,
-        database,
         accountKey,
         userKey,
         onlyMedia = mediaOnly,
@@ -291,30 +230,14 @@ internal open class MastodonDataSource(
             statusOnly = false,
         )
 
-    override fun status(statusKey: MicroBlogKey): CacheData<UiTimeline> {
-        val pagingKey = "status_only_$statusKey"
-        return Cacheable(
-            fetchSource = {
-                val result =
-                    service.lookupStatus(
-                        statusKey.id,
-                    )
-                Mastodon.save(
-                    database = database,
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                    data = listOf(result),
-                )
-            },
-            cacheSource = {
-                database
-                    .statusDao()
-                    .get(statusKey, AccountType.Specific(accountKey))
-                    .distinctUntilChanged()
-                    .mapNotNull { it?.content?.render(this) }
-            },
-        )
-    }
+    override suspend fun status(statusKey: MicroBlogKey): UiTimelineV2 =
+        service
+            .lookupStatus(
+                statusKey.id,
+            ).render(
+                accountKey = accountKey,
+                host = accountKey.host,
+            )
 
     fun emoji(): Cacheable<ImmutableMap<String, ImmutableList<UiEmoji>>> =
         Cacheable(
@@ -770,73 +693,53 @@ internal open class MastodonDataSource(
         }
     }
 
-    override fun discoverUsers(pageSize: Int): Flow<PagingData<UiProfile>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            TrendsUserPagingSource(
-                service = service,
-                accountKey = accountKey,
-                host = accountKey.host,
-            )
-        }.flow
+    override fun discoverUsers(): RemoteLoader<UiProfile> =
+        TrendsUserLoader(
+            service = service,
+            accountKey = accountKey,
+            host = accountKey.host,
+        )
 
     override fun discoverStatuses() =
         DiscoverStatusRemoteMediator(
             service,
-            database,
             accountKey,
         )
 
-    override fun discoverHashtags(pageSize: Int): Flow<PagingData<UiHashtag>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            TrendHashtagPagingSource(
-                service,
-            )
-        }.flow
+    override fun discoverHashtags(): RemoteLoader<UiHashtag> =
+        TrendHashtagPagingSource(
+            service = service,
+        )
 
     override fun searchStatus(query: String) =
         SearchStatusPagingSource(
             service,
-            database,
             accountKey,
             query,
         )
 
-    override fun searchUser(
-        query: String,
-        pageSize: Int,
-    ): Flow<PagingData<UiProfile>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            SearchUserPagingSource(
-                service = service,
-                accountKey = accountKey,
-                query = query,
-                host = accountKey.host,
-            )
-        }.flow
-
-    fun searchFollowing(
-        query: String,
-        scope: CoroutineScope,
-        pageSize: Int = 20,
-    ): Flow<PagingData<UiProfile>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            SearchUserPagingSource(
-                service = service,
-                accountKey = accountKey,
-                query = query,
-                host = accountKey.host,
-                following = true,
-                resolve = false,
-            )
-        }.flow.cachedIn(scope)
+//    override fun searchUser(
+//        query: String,
+//        pageSize: Int,
+//    ): Flow<PagingData<UiProfile>> =
+//        Pager(
+//            config = pagingConfig,
+//        ) {
+//            SearchUserPagingSource(
+//                service = service,
+//                accountKey = accountKey,
+//                query = query,
+//                host = accountKey.host,
+//            )
+//        }.flow
+
+    override fun searchUser(query: String): RemoteLoader<UiProfile> =
+        SearchUserPagingSource(
+            service = service,
+            accountKey = accountKey,
+            query = query,
+            host = accountKey.host,
+        )
 
     override fun composeConfig(type: ComposeType): ComposeConfig =
         ComposeConfig(
@@ -941,16 +844,23 @@ internal open class MastodonDataSource(
     private val notificationMarkerKey: String
         get() = "notificationBadgeCount_$accountKey"
 
-    override fun notificationBadgeCount(): CacheData<Int> {
-        return MemCacheable(
-            key = notificationMarkerKey,
-            fetchSource = {
-                val marker =
-                    service.notificationMarkers().notifications?.lastReadID ?: return@MemCacheable 0
-                val timeline = service.notification(min_id = marker)
-                timeline.size
-            },
-        )
+//    override fun notificationBadgeCount(): CacheData<Int> {
+//        return MemCacheable(
+//            key = notificationMarkerKey,
+//            fetchSource = {
+//                val marker =
+//                    service.notificationMarkers().notifications?.lastReadID ?: return@MemCacheable 0
+//                val timeline = service.notification(min_id = marker)
+//                timeline.size
+//            },
+//        )
+//    }
+
+    override suspend fun notificationBadgeCount(): Int {
+        val marker =
+            service.notificationMarkers().notifications?.lastReadID ?: return 0
+        val timeline = service.notification(min_id = marker)
+        return timeline.size
     }
 
     override fun vote(
@@ -1041,37 +951,53 @@ internal open class MastodonDataSource(
         }
     }
 
-    override fun following(
-        userKey: MicroBlogKey,
-        scope: CoroutineScope,
-        pageSize: Int,
-    ): Flow<PagingData<UiProfile>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            MastodonFollowingPagingSource(
-                service = service,
-                host = accountKey.host,
-                userKey = userKey,
-                accountKey = accountKey,
-            )
-        }.flow.cachedIn(scope)
+//    override fun following(
+//        userKey: MicroBlogKey,
+//        scope: CoroutineScope,
+//        pageSize: Int,
+//    ): Flow<PagingData<UiProfile>> =
+//        Pager(
+//            config = pagingConfig,
+//        ) {
+//            MastodonFollowingPagingSource(
+//                service = service,
+//                host = accountKey.host,
+//                userKey = userKey,
+//                accountKey = accountKey,
+//            )
+//        }.flow.cachedIn(scope)
+//
+//    override fun fans(
+//        userKey: MicroBlogKey,
+//        scope: CoroutineScope,
+//        pageSize: Int,
+//    ): Flow<PagingData<UiProfile>> =
+//        Pager(
+//            config = pagingConfig,
+//        ) {
+//            MastodonFansPagingSource(
+//                service = service,
+//                host = accountKey.host,
+//                userKey = userKey,
+//                accountKey = accountKey,
+//            )
+//        }.flow.cachedIn(scope)
 
-    override fun fans(
-        userKey: MicroBlogKey,
-        scope: CoroutineScope,
-        pageSize: Int,
-    ): Flow<PagingData<UiProfile>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            MastodonFansPagingSource(
-                service = service,
-                host = accountKey.host,
-                userKey = userKey,
-                accountKey = accountKey,
-            )
-        }.flow.cachedIn(scope)
+    override fun fans(userKey: MicroBlogKey): RemoteLoader<UiProfile> =
+        MastodonFansPagingSource(
+            service = service,
+            host = accountKey.host,
+            userKey = userKey,
+            accountKey = accountKey,
+        )
+
+    override fun following(userKey: MicroBlogKey): RemoteLoader<UiProfile> =
+        MastodonFollowingPagingSource(
+            service = service,
+            host = accountKey.host,
+            userKey = userKey,
+            accountKey = accountKey,
+        )
 
     override fun profileTabs(userKey: MicroBlogKey): ImmutableList<ProfileTab> =
         listOfNotNull(
@@ -1080,7 +1006,6 @@ internal open class MastodonDataSource(
                 loader =
                     UserTimelineRemoteMediator(
                         service = service,
-                        database = database,
                         accountKey = accountKey,
                         userKey = userKey,
                         withPinned = true,
@@ -1092,7 +1017,6 @@ internal open class MastodonDataSource(
                     UserTimelineRemoteMediator(
                         service = service,
                         accountKey = accountKey,
-                        database = database,
                         userKey = userKey,
                         withReplies = true,
                     ),
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonFansPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonFansPagingSource.kt
index 063b486fa..b392fc9da 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonFansPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonFansPagingSource.kt
@@ -1,7 +1,8 @@
 package dev.dimension.flare.data.datasource.mastodon
 
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.mastodon.api.AccountResources
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiProfile
@@ -12,25 +13,39 @@ internal class MastodonFansPagingSource(
     private val accountKey: MicroBlogKey?,
     private val host: String,
     private val userKey: MicroBlogKey,
-) : BasePagingSource<String, UiProfile>() {
-    override fun getRefreshKey(state: PagingState<String, UiProfile>): String? = null
-
-    override suspend fun doLoad(params: LoadParams<String>): LoadResult<String, UiProfile> {
-        val maxId = params.key
-        val limit = params.loadSize
+) : RemoteLoader<UiProfile> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiProfile> {
         val response =
-            service
-                .followers(
-                    id = userKey.id,
-                    limit = limit,
-                    max_id = maxId,
-                )
-        return LoadResult.Page(
-            data =
-                response.map {
-                    it.render(accountKey = accountKey, host = host)
-                },
-            prevKey = null,
+            when (request) {
+                PagingRequest.Refresh -> {
+                    service
+                        .followers(
+                            id = userKey.id,
+                            limit = pageSize,
+                        )
+                }
+
+                is PagingRequest.Prepend -> {
+                    return PagingResult(
+                        endOfPaginationReached = true,
+                    )
+                }
+
+                is PagingRequest.Append -> {
+                    service.followers(
+                        id = userKey.id,
+                        limit = pageSize,
+                        max_id = request.nextKey,
+                    )
+                }
+            }
+
+        return PagingResult(
+            endOfPaginationReached = response.isEmpty() || response.next == null,
+            data = response.map { it.render(accountKey = accountKey, host = host) },
             nextKey = response.next,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonFollowingPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonFollowingPagingSource.kt
index 8931fae45..aa30046b9 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonFollowingPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonFollowingPagingSource.kt
@@ -1,7 +1,8 @@
 package dev.dimension.flare.data.datasource.mastodon
 
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.mastodon.api.AccountResources
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiProfile
@@ -12,25 +13,39 @@ internal class MastodonFollowingPagingSource(
     private val accountKey: MicroBlogKey?,
     private val host: String,
     private val userKey: MicroBlogKey,
-) : BasePagingSource<String, UiProfile>() {
-    override fun getRefreshKey(state: PagingState<String, UiProfile>): String? = null
-
-    override suspend fun doLoad(params: LoadParams<String>): LoadResult<String, UiProfile> {
-        val maxId = params.key
-        val limit = params.loadSize
+) : RemoteLoader<UiProfile> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiProfile> {
         val response =
-            service
-                .following(
-                    id = userKey.id,
-                    limit = limit,
-                    max_id = maxId,
-                )
-        return LoadResult.Page(
-            data =
-                response.map {
-                    it.render(accountKey = accountKey, host = host)
-                },
-            prevKey = null,
+            when (request) {
+                PagingRequest.Refresh -> {
+                    service
+                        .following(
+                            id = userKey.id,
+                            limit = pageSize,
+                        )
+                }
+
+                is PagingRequest.Prepend -> {
+                    return PagingResult(
+                        endOfPaginationReached = true,
+                    )
+                }
+
+                is PagingRequest.Append -> {
+                    service.following(
+                        id = userKey.id,
+                        limit = pageSize,
+                        max_id = request.nextKey,
+                    )
+                }
+            }
+
+        return PagingResult(
+            endOfPaginationReached = response.isEmpty() || response.next == null,
+            data = response.map { it.render(accountKey = accountKey, host = host) },
             nextKey = response.next,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MentionRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MentionRemoteMediator.kt
index 1d1b32614..03fd15e28 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MentionRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MentionRemoteMediator.kt
@@ -1,30 +1,26 @@
 package dev.dimension.flare.data.datasource.mastodon
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDb
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.mastodon.MastodonService
 import dev.dimension.flare.data.network.mastodon.api.model.NotificationTypes
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class MentionRemoteMediator(
     private val service: MastodonService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String = "mention_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
@@ -54,11 +50,7 @@ internal class MentionRemoteMediator(
 
         return PagingResult(
             endOfPaginationReached = response.isEmpty(),
-            data =
-                response.toDb(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+            data = response.map { it.render(accountKey) },
             nextKey = response.next,
             previousKey = response.prev,
         )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/NotificationRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/NotificationRemoteMediator.kt
index 71a596eec..abec22367 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/NotificationRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/NotificationRemoteMediator.kt
@@ -1,32 +1,28 @@
 package dev.dimension.flare.data.datasource.mastodon
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDb
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.mastodon.MastodonService
 import dev.dimension.flare.data.network.mastodon.api.model.MarkerUpdate
 import dev.dimension.flare.data.network.mastodon.api.model.UpdateContent
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class NotificationRemoteMediator(
     private val service: MastodonService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
     private val onClearMarker: () -> Unit,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String = "notification_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
@@ -58,11 +54,7 @@ internal class NotificationRemoteMediator(
 
         return PagingResult(
             endOfPaginationReached = response.isEmpty(),
-            data =
-                response.toDb(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+            data = response.map { it.render(accountKey) },
             nextKey = response.next,
             previousKey = response.prev,
         )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/PublicTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/PublicTimelineRemoteMediator.kt
index a2856540a..7512df474 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/PublicTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/PublicTimelineRemoteMediator.kt
@@ -1,24 +1,20 @@
 package dev.dimension.flare.data.datasource.mastodon
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.mastodon.MastodonService
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class PublicTimelineRemoteMediator(
     private val service: MastodonService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
     private val local: Boolean,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String =
         buildString {
             append("public_timeline")
@@ -28,10 +24,10 @@ internal class PublicTimelineRemoteMediator(
             append("_$accountKey")
         }
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
@@ -59,11 +55,7 @@ internal class PublicTimelineRemoteMediator(
 
         return PagingResult(
             endOfPaginationReached = response.isEmpty(),
-            data =
-                response.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+            data = response.render(accountKey),
             nextKey = response.next,
             previousKey = response.prev,
         )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/SearchStatusPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/SearchStatusPagingSource.kt
index 2ffdc03b5..fd5023ad6 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/SearchStatusPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/SearchStatusPagingSource.kt
@@ -1,24 +1,20 @@
 package dev.dimension.flare.data.datasource.mastodon
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.mastodon.MastodonService
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class SearchStatusPagingSource(
     private val service: MastodonService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
     private val query: String,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String =
         buildString {
             append("search_")
@@ -26,10 +22,10 @@ internal class SearchStatusPagingSource(
             append(accountKey.toString())
         }
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 is PagingRequest.Prepend -> {
@@ -75,11 +71,7 @@ internal class SearchStatusPagingSource(
 
         return PagingResult(
             endOfPaginationReached = response.isEmpty(),
-            data =
-                response.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+            data = response.render(accountKey),
             nextKey = response.lastOrNull()?.id,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/SearchUserPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/SearchUserPagingSource.kt
index 50082516b..2be760878 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/SearchUserPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/SearchUserPagingSource.kt
@@ -1,7 +1,8 @@
 package dev.dimension.flare.data.datasource.mastodon
 
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.mastodon.api.SearchResources
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiProfile
@@ -14,27 +15,49 @@ internal class SearchUserPagingSource(
     private val query: String,
     private val following: Boolean = false,
     private val resolve: Boolean? = null,
-) : BasePagingSource<String, UiProfile>() {
-    override fun getRefreshKey(state: PagingState<String, UiProfile>): String? = null
+) : RemoteLoader<UiProfile> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiProfile> {
+        val response =
+            when (request) {
+                is PagingRequest.Prepend -> {
+                    return PagingResult(
+                        endOfPaginationReached = true,
+                    )
+                }
 
-    override suspend fun doLoad(params: LoadParams<String>): LoadResult<String, UiProfile> {
-        service
-            .searchV2(
-                query = query,
-                limit = params.loadSize,
-                max_id = params.key,
-                type = "accounts",
-                following = following,
-                resolve = resolve,
-            ).accounts
-            ?.let { accounts ->
-                return LoadResult.Page(
-                    data = accounts.map { it.render(accountKey = accountKey, host = host) },
-                    prevKey = null,
-                    nextKey = accounts.lastOrNull()?.id?.takeIf { it != params.key && accounts.size == params.loadSize },
-                )
-            } ?: run {
-            return LoadResult.Error(Exception("No data"))
-        }
+                PagingRequest.Refresh -> {
+                    service
+                        .searchV2(
+                            query = query,
+                            limit = pageSize,
+                            type = "accounts",
+                            following = following,
+                            resolve = resolve,
+                        ).accounts ?: emptyList()
+                }
+
+                is PagingRequest.Append -> {
+                    service
+                        .searchV2(
+                            query = query,
+                            limit = pageSize,
+                            max_id = request.nextKey,
+                            type = "accounts",
+                            following = following,
+                            resolve = resolve,
+                        ).accounts ?: emptyList()
+                }
+            }
+
+        return PagingResult(
+            data = response.map { it.render(accountKey = accountKey, host = host) },
+            nextKey =
+                response.lastOrNull()?.id?.takeIf {
+                    (request !is PagingRequest.Append || it != request.nextKey) && response.size == pageSize
+                },
+        )
     }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/StatusDetailRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/StatusDetailRemoteMediator.kt
index bb6b09f3c..535fb25a5 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/StatusDetailRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/StatusDetailRemoteMediator.kt
@@ -3,15 +3,15 @@ package dev.dimension.flare.data.datasource.mastodon
 import androidx.paging.ExperimentalPagingApi
 import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.connect
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
 import dev.dimension.flare.data.database.cache.model.DbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.mastodon.MastodonService
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 import kotlinx.coroutines.flow.firstOrNull
 
 @OptIn(ExperimentalPagingApi::class)
@@ -21,9 +21,7 @@ internal class StatusDetailRemoteMediator(
     private val database: CacheDatabase,
     private val accountKey: MicroBlogKey,
     private val statusOnly: Boolean,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String =
         buildString {
             append("status_detail_")
@@ -35,10 +33,10 @@ internal class StatusDetailRemoteMediator(
             append(accountKey.toString())
         }
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val result =
             when (request) {
                 is PagingRequest.Append -> {
@@ -73,7 +71,6 @@ internal class StatusDetailRemoteMediator(
                                     .insertAll(
                                         listOf(
                                             DbPagingTimeline(
-                                                accountType = AccountType.Specific(accountKey),
                                                 statusKey = statusKey,
                                                 pagingKey = pagingKey,
                                                 sortId = 0,
@@ -94,13 +91,7 @@ internal class StatusDetailRemoteMediator(
 
         return PagingResult(
             endOfPaginationReached = !shouldLoadMore,
-            data =
-                result.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ) {
-                    -result.indexOf(it).toLong()
-                },
+            data = result.render(accountKey),
             nextKey = if (shouldLoadMore) pagingKey else null,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/TrendHashtagPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/TrendHashtagPagingSource.kt
index 49d84c185..72c18f96f 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/TrendHashtagPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/TrendHashtagPagingSource.kt
@@ -1,30 +1,41 @@
 package dev.dimension.flare.data.datasource.mastodon
 
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.mastodon.api.TrendsResources
 import dev.dimension.flare.ui.model.UiHashtag
 
 internal class TrendHashtagPagingSource(
     private val service: TrendsResources,
-) : BasePagingSource<Int, UiHashtag>() {
-    override fun getRefreshKey(state: PagingState<Int, UiHashtag>): Int? = null
+) : RemoteLoader<UiHashtag> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiHashtag> {
+        val response =
+            when (request) {
+                is PagingRequest.Prepend, is PagingRequest.Append -> {
+                    return PagingResult(
+                        endOfPaginationReached = true,
+                    )
+                }
 
-    override suspend fun doLoad(params: LoadParams<Int>): LoadResult<Int, UiHashtag> {
-        service
-            .trendsTags()
-            .map {
-                UiHashtag(
-                    hashtag = it.name ?: "",
-                    description = null,
-                    searchContent = "#${it.name}",
-                )
-            }.let {
-                return LoadResult.Page(
-                    data = it,
-                    prevKey = null,
-                    nextKey = null,
-                )
+                PagingRequest.Refresh -> {
+                    service
+                        .trendsTags()
+                        .map {
+                            UiHashtag(
+                                hashtag = it.name ?: "",
+                                description = null,
+                                searchContent = "#${it.name}",
+                            )
+                        }
+                }
             }
+
+        return PagingResult(
+            data = response,
+        )
     }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/TrendsUserLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/TrendsUserLoader.kt
new file mode 100644
index 000000000..ffdcb6d5d
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/TrendsUserLoader.kt
@@ -0,0 +1,39 @@
+package dev.dimension.flare.data.datasource.mastodon
+
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
+import dev.dimension.flare.data.network.mastodon.api.TrendsResources
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiProfile
+import dev.dimension.flare.ui.model.mapper.render
+
+internal class TrendsUserLoader(
+    private val service: TrendsResources,
+    private val accountKey: MicroBlogKey?,
+    private val host: String,
+) : RemoteLoader<UiProfile> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiProfile> {
+        if (request !is PagingRequest.Refresh) {
+            return PagingResult(
+                data = emptyList(),
+                nextKey = null,
+                previousKey = null,
+            )
+        }
+        val data =
+            service
+                .suggestionsUsers()
+                .mapNotNull {
+                    it.account?.render(accountKey = accountKey, host = host)
+                }
+        return PagingResult(
+            data = data,
+            nextKey = null,
+            previousKey = null,
+        )
+    }
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/TrendsUserPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/TrendsUserPagingSource.kt
deleted file mode 100644
index 1715e1dba..000000000
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/TrendsUserPagingSource.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package dev.dimension.flare.data.datasource.mastodon
-
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
-import dev.dimension.flare.data.network.mastodon.api.TrendsResources
-import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.ui.model.UiProfile
-import dev.dimension.flare.ui.model.mapper.render
-
-internal class TrendsUserPagingSource(
-    private val service: TrendsResources,
-    private val accountKey: MicroBlogKey?,
-    private val host: String,
-) : BasePagingSource<Int, UiProfile>() {
-    override fun getRefreshKey(state: PagingState<Int, UiProfile>): Int? = null
-
-    override suspend fun doLoad(params: LoadParams<Int>): LoadResult<Int, UiProfile> {
-        service
-            .suggestionsUsers()
-            .mapNotNull {
-                it.account?.render(accountKey = accountKey, host = host)
-            }.let {
-                return LoadResult.Page(
-                    data = it,
-                    prevKey = null,
-                    nextKey = null,
-                )
-            }
-    }
-}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/UserTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/UserTimelineRemoteMediator.kt
index 8e38aa7aa..043112bda 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/UserTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/UserTimelineRemoteMediator.kt
@@ -1,27 +1,23 @@
 package dev.dimension.flare.data.datasource.mastodon
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.mastodon.MastodonService
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class UserTimelineRemoteMediator(
     private val service: MastodonService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
     private val userKey: MicroBlogKey,
     private val onlyMedia: Boolean = false,
     private val withReplies: Boolean = false,
     private val withPinned: Boolean = false,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey =
         buildString {
             append("user_timeline")
@@ -38,10 +34,10 @@ internal class UserTimelineRemoteMediator(
             append(userKey.toString())
         }
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
@@ -83,18 +79,7 @@ internal class UserTimelineRemoteMediator(
 
         return PagingResult(
             endOfPaginationReached = response.isEmpty(),
-            data =
-                response.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                    sortIdProvider = {
-                        if (it.pinned == true) {
-                            Long.MAX_VALUE
-                        } else {
-                            it.createdAt?.toEpochMilliseconds() ?: 0
-                        }
-                    },
-                ),
+            data = response.render(accountKey),
             nextKey = response.next,
             previousKey = response.prev,
         )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ActionMenu.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ActionMenu.kt
index 0c6b232f4..e4b6b2aca 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ActionMenu.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ActionMenu.kt
@@ -11,7 +11,6 @@ import dev.dimension.flare.ui.route.DeeplinkRoute
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
 
 @Serializable
 @Immutable
@@ -41,9 +40,7 @@ public sealed class ActionMenu {
         val text: Text? = null,
         val count: UiNumber? = null,
         val color: Color? = null,
-        private val clickEvent: ClickEvent? = null,
-        @Transient
-        private val clickAction: (ClickContext.() -> Unit)? = null,
+        private val clickEvent: ClickEvent = ClickEvent.Noop,
     ) : ActionMenu() {
         init {
             require(icon != null || text != null) {
@@ -51,8 +48,8 @@ public sealed class ActionMenu {
             }
         }
 
-        val onClicked: (ClickContext.() -> Unit)? by lazy {
-            clickAction ?: clickEvent?.onClicked
+        val onClicked: ClickContext.() -> Unit by lazy {
+            clickEvent.onClicked
         }
 
         @Serializable
@@ -103,6 +100,8 @@ public sealed class ActionMenu {
                     UnBlock,
                     BlockWithHandleParameter,
                     MuteWithHandleParameter,
+                    AcceptFollowRequest,
+                    RejectFollowRequest,
                 }
             }
         }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/AuthenticatedMicroblogDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/AuthenticatedMicroblogDataSource.kt
index ad266e993..c018772e5 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/AuthenticatedMicroblogDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/AuthenticatedMicroblogDataSource.kt
@@ -1,54 +1,47 @@
 package dev.dimension.flare.data.datasource.microblog
 
-import androidx.paging.PagingData
-import dev.dimension.flare.common.CacheData
-import dev.dimension.flare.common.Cacheable
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiRelation
-import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.UiTimeline
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flowOf
-
-internal interface AuthenticatedMicroblogDataSource :
-    MicroblogDataSource,
-    StatusEvent {
-    fun notification(
-        type: NotificationFilter = NotificationFilter.All,
-        pageSize: Int = 20,
-        scope: CoroutineScope,
-    ): Flow<PagingData<UiTimeline>>
+import dev.dimension.flare.ui.model.UiTimelineV2
 
-    val supportedNotificationFilter: List<NotificationFilter>
+internal interface AuthenticatedMicroblogDataSource : MicroblogDataSource {
+    val accountKey: MicroBlogKey
+
+    fun notification(type: NotificationFilter = NotificationFilter.All): RemoteLoader<UiTimelineV2>
 
-    fun relation(userKey: MicroBlogKey): Flow<UiState<UiRelation>>
+    val supportedNotificationFilter: List<NotificationFilter>
 
     suspend fun compose(
         data: ComposeData,
         progress: (ComposeProgress) -> Unit,
     )
 
-    suspend fun deleteStatus(statusKey: MicroBlogKey)
+    fun deleteStatus(statusKey: MicroBlogKey)
 
     fun composeConfig(type: ComposeType): ComposeConfig
 
-    fun profileActions(): List<ProfileAction>
-
-    suspend fun follow(
-        userKey: MicroBlogKey,
-        relation: UiRelation,
-    )
+    fun profileActions(): List<ActionMenu>
 
-    fun notificationBadgeCount(): CacheData<Int> = Cacheable({ }, { flowOf(0) })
+    suspend fun notificationBadgeCount(): Int
 
     fun handleEvent(event: PostEvent)
 }
 
 internal interface RelationDataSource {
-    suspend fun block(userKey: MicroBlogKey)
+    suspend fun relation(userKey: MicroBlogKey): UiRelation
+
+    fun follow(userKey: MicroBlogKey)
+
+    fun unfollow(userKey: MicroBlogKey)
+
+    fun block(userKey: MicroBlogKey)
+
+    fun unblock(userKey: MicroBlogKey)
+
+    fun mute(userKey: MicroBlogKey)
 
-    suspend fun mute(userKey: MicroBlogKey)
+    fun unmute(userKey: MicroBlogKey)
 }
 
 internal enum class ComposeType {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/MicroblogDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/MicroblogDataSource.kt
index dbd5e612c..d0795d43c 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/MicroblogDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/MicroblogDataSource.kt
@@ -1,56 +1,46 @@
 package dev.dimension.flare.data.datasource.microblog
 
-import androidx.paging.PagingData
-import dev.dimension.flare.common.CacheData
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiHashtag
 import dev.dimension.flare.ui.model.UiProfile
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import kotlinx.collections.immutable.ImmutableList
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
 
 internal interface MicroblogDataSource {
-    fun homeTimeline(): BaseTimelineLoader
+    fun homeTimeline(): RemoteLoader<UiTimelineV2>
 
-    fun userByAcct(acct: String): CacheData<UiProfile>
+//    suspend fun userByAcct(acct: String): UiProfile
 
-    fun userById(id: String): CacheData<UiProfile>
+    suspend fun userByNameAndHost(
+        name: String,
+        host: String,
+    ): UiProfile
+
+    suspend fun userById(id: String): UiProfile
 
     fun userTimeline(
         userKey: MicroBlogKey,
         mediaOnly: Boolean = false,
-    ): BaseTimelineLoader
+    ): RemoteLoader<UiTimelineV2>
 
-    fun context(statusKey: MicroBlogKey): BaseTimelineLoader
+    fun context(statusKey: MicroBlogKey): RemoteLoader<UiTimelineV2>
 
-    fun status(statusKey: MicroBlogKey): CacheData<UiTimeline>
+    suspend fun status(statusKey: MicroBlogKey): UiTimelineV2
 
-    fun searchStatus(query: String): BaseTimelineLoader
+    fun searchStatus(query: String): RemoteLoader<UiTimelineV2>
 
-    fun searchUser(
-        query: String,
-        pageSize: Int = 20,
-    ): Flow<PagingData<UiProfile>>
+    fun searchUser(query: String): RemoteLoader<UiProfile>
 
-    fun discoverUsers(pageSize: Int = 20): Flow<PagingData<UiProfile>>
+    fun discoverUsers(): RemoteLoader<UiProfile>
 
-    fun discoverStatuses(): BaseTimelineLoader
+    fun discoverStatuses(): RemoteLoader<UiTimelineV2>
 
-    fun discoverHashtags(pageSize: Int = 20): Flow<PagingData<UiHashtag>>
+    fun discoverHashtags(): RemoteLoader<UiHashtag>
 
-    fun following(
-        userKey: MicroBlogKey,
-        scope: CoroutineScope,
-        pageSize: Int = 20,
-    ): Flow<PagingData<UiProfile>>
+    fun following(userKey: MicroBlogKey): RemoteLoader<UiProfile>
 
-    fun fans(
-        userKey: MicroBlogKey,
-        scope: CoroutineScope,
-        pageSize: Int = 20,
-    ): Flow<PagingData<UiProfile>>
+    fun fans(userKey: MicroBlogKey): RemoteLoader<UiProfile>
 
     fun profileTabs(userKey: MicroBlogKey): ImmutableList<ProfileTab>
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediator.kt
index d6b1ddecb..a784ce166 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediator.kt
@@ -1,22 +1,20 @@
 package dev.dimension.flare.data.datasource.microblog
 
-import SnowflakeIdGenerator
 import androidx.paging.ExperimentalPagingApi
 import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.connect
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.ui.model.UiTimelineV2
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
-import kotlin.uuid.Uuid
 
 internal class MixedRemoteMediator(
     private val database: CacheDatabase,
-    private val mediators: List<BaseTimelineRemoteMediator>,
-) : BaseTimelineRemoteMediator(database = database) {
+    private val mediators: List<CacheableRemoteLoader<UiTimelineV2>>,
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey =
         buildString {
             append("mixed_timeline")
@@ -27,10 +25,10 @@ internal class MixedRemoteMediator(
     private var currentMediators = mediators
 
     @OptIn(ExperimentalPagingApi::class)
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> =
+    ): PagingResult<UiTimelineV2> =
         coroutineScope {
             if (request is PagingRequest.Prepend) {
                 PagingResult(endOfPaginationReached = true)
@@ -59,17 +57,7 @@ internal class MixedRemoteMediator(
                 val mixedTimelineResult =
                     timelineResult
                         .sortedByDescending {
-                            it.status.status.data.createdAt
-                                .toEpochMilliseconds()
-                        }.map {
-                            it.copy(
-                                timeline =
-                                    it.timeline.copy(
-                                        pagingKey = pagingKey,
-                                        sortId = -SnowflakeIdGenerator.nextId(),
-                                        _id = Uuid.random().toString(),
-                                    ),
-                            )
+                            it.createdAt.value.toEpochMilliseconds()
                         }
 
                 database.connect {
@@ -98,7 +86,7 @@ internal class MixedRemoteMediator(
 
     private suspend fun getSubRequest(
         request: PagingRequest,
-        mediator: BaseTimelineRemoteMediator,
+        mediator: CacheableRemoteLoader<UiTimelineV2>,
     ): SubRequest? =
         when (request) {
             is PagingRequest.Append -> {
@@ -149,14 +137,14 @@ internal class MixedRemoteMediator(
     }
 
     private data class SubRequest(
-        val mediator: BaseTimelineRemoteMediator,
+        val mediator: CacheableRemoteLoader<UiTimelineV2>,
         val request: PagingRequest,
     ) {
-        suspend fun load(pageSize: Int) = mediator.timeline(pageSize, request)
+        suspend fun load(pageSize: Int) = mediator.load(pageSize, request)
     }
 
     private data class SubResponse(
-        val mediator: BaseTimelineRemoteMediator,
-        val result: PagingResult<DbPagingTimelineWithStatus>,
+        val mediator: CacheableRemoteLoader<UiTimelineV2>,
+        val result: PagingResult<UiTimelineV2>,
     )
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/Paging.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/Paging.kt
index 46bd26409..272523d87 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/Paging.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/Paging.kt
@@ -1,83 +1,56 @@
 package dev.dimension.flare.data.datasource.microblog
 
-import androidx.paging.ExperimentalPagingApi
-import androidx.paging.Pager
 import androidx.paging.PagingConfig
-import androidx.paging.PagingData
-import androidx.paging.PagingState
-import androidx.paging.cachedIn
-import androidx.paging.filter
-import androidx.paging.map
-import dev.dimension.flare.common.BasePagingSource
-import dev.dimension.flare.common.BaseRemoteMediator
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
-import dev.dimension.flare.data.repository.AccountRepository
-import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.ui.model.UiTimeline
-import dev.dimension.flare.ui.model.mapper.render
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toImmutableList
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.IO
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import kotlin.coroutines.CoroutineContext
 
 internal val pagingConfig: PagingConfig =
     PagingConfig(
         pageSize = 20,
     )
 
-@OptIn(ExperimentalPagingApi::class)
-internal fun timelinePager(
-    pageSize: Int,
-    database: CacheDatabase,
-    scope: CoroutineScope,
-    filterFlow: Flow<List<String>>,
-    mediator: BaseTimelineRemoteMediator,
-    accountRepository: AccountRepository,
-): Flow<PagingData<UiTimeline>> {
-    val pagerFlow =
-        Pager(
-            config = pagingConfig,
-            remoteMediator = mediator,
-            pagingSourceFactory = {
-                database.pagingTimelineDao().getPagingSource(
-                    pagingKey = mediator.pagingKey,
-                )
-            },
-        ).flow.cachedIn(scope)
-    return combine(
-        pagerFlow,
-        filterFlow,
-        accountRepository.allAccounts,
-    ) { pagingData, filters, accounts ->
-        pagingData
-            .map { data ->
-                withContext(Dispatchers.IO) {
-                    val dataSource =
-                        when (data.timeline.accountType) {
-                            AccountType.Guest -> null
-                            is AccountType.Specific -> {
-                                accounts.first {
-                                    it.accountKey == data.timeline.accountType.accountKey
-                                }
-                            }
-                        }?.dataSource
-                    data.render(dataSource)
-                }
-            }.filter {
-                !it.contains(filters)
-            }
-    }.cachedIn(scope)
-}
+// @OptIn(ExperimentalPagingApi::class)
+// internal fun timelinePager(
+//    pageSize: Int,
+//    database: CacheDatabase,
+//    scope: CoroutineScope,
+//    filterFlow: Flow<List<String>>,
+//    mediator: BaseTimelineRemoteMediator,
+//    accountRepository: AccountRepository,
+// ): Flow<PagingData<UiTimeline>> {
+//    val pagerFlow =
+//        Pager(
+//            config = pagingConfig,
+//            remoteMediator = mediator,
+//            pagingSourceFactory = {
+//                database.pagingTimelineDao().getPagingSource(
+//                    pagingKey = mediator.pagingKey,
+//                )
+//            },
+//        ).flow.cachedIn(scope)
+//    return combine(
+//        pagerFlow,
+//        filterFlow,
+//        accountRepository.allAccounts,
+//    ) { pagingData, filters, accounts ->
+//        pagingData
+//            .map { data ->
+//                withContext(Dispatchers.IO) {
+//                    val dataSource =
+//                        when (data.timeline.accountType) {
+//                            AccountType.Guest -> null
+//                            is AccountType.Specific -> {
+//                                accounts.first {
+//                                    it.accountKey == data.timeline.accountType.accountKey
+//                                }
+//                            }
+//                        }?.dataSource
+//                    data.render(dataSource)
+//                }
+//            }.filter {
+//                !it.contains(filters)
+//            }
+//    }.cachedIn(scope)
+// }
 
 internal fun UiTimeline.contains(keywords: List<String>): Boolean {
     val text =
@@ -94,112 +67,112 @@ internal fun UiTimeline.contains(keywords: List<String>): Boolean {
     }
 }
 
-internal class MemoryPagingSource<T : Any>(
-    private val key: String,
-    private val context: CoroutineContext,
-) : BasePagingSource<Int, T>() {
-    companion object {
-        private val caches = mutableMapOf<String, MutableStateFlow<ImmutableList<Any>>>()
-
-        fun <T : Any> update(
-            key: String,
-            value: ImmutableList<T>,
-        ) {
-            caches[key]?.value = value
-        }
-
-        fun <T : Any> append(
-            key: String,
-            value: ImmutableList<T>,
-        ) {
-            @Suppress("UNCHECKED_CAST")
-            caches[key]?.value = ((caches[key]?.value as? ImmutableList<T> ?: persistentListOf()) + value).toImmutableList()
-        }
-
-        fun <T : Any> updateWith(
-            key: String,
-            update: (ImmutableList<T>) -> ImmutableList<T>,
-        ) {
-            @Suppress("UNCHECKED_CAST")
-            val value = caches[key]?.value as? ImmutableList<T> ?: persistentListOf()
-            caches[key]?.value = update(value)
-        }
-
-        @Suppress("UNCHECKED_CAST")
-        fun <T : Any> get(key: String): ImmutableList<T>? = caches[key]?.value as? ImmutableList<T>
-
-        fun clear(key: String) {
-            caches.remove(key)
-        }
-
-        @Suppress("UNCHECKED_CAST")
-        fun <T : Any> getFlow(key: String): Flow<ImmutableList<T>> =
-            caches
-                .getOrPut(key) {
-                    MutableStateFlow(persistentListOf<T>())
-                } as Flow<ImmutableList<T>>
-    }
-
-    // TODO: workaround for skip first invalidation to avoid loading infinite loop
-    private var skiped = false
-
-    private val job =
-        caches
-            .getOrPut(key) {
-                MutableStateFlow(persistentListOf<T>())
-            }.let {
-                CoroutineScope(context).launch {
-                    it.collectLatest {
-                        if (!skiped) {
-                            skiped = true
-                            return@collectLatest
-                        }
-                        invalidate()
-                    }
-                }
-            }
-
-    init {
-        registerInvalidatedCallback {
-            job.cancel()
-        }
-    }
-
-    override fun getRefreshKey(state: PagingState<Int, T>): Int? =
-        state.anchorPosition?.let {
-            maxOf(0, it - (state.config.initialLoadSize / 2))
-        }
-
-    override suspend fun doLoad(params: LoadParams<Int>): LoadResult<Int, T> {
-        val page = params.key ?: 0
-
-        @Suppress("UNCHECKED_CAST")
-        val list = caches[key]?.value as? ImmutableList<T> ?: return LoadResult.Error(Exception("No data"))
-        val data = list.subList(page, (page + params.loadSize).coerceIn(0, list.size))
-        val prevKey = (page - params.loadSize).takeIf { it in list.indices }
-        val nextKey = (page + params.loadSize).takeIf { it in list.indices }
-        return LoadResult.Page(
-            data = data,
-            prevKey = prevKey,
-            nextKey = nextKey,
-        )
-    }
-}
-
-@OptIn(ExperimentalPagingApi::class)
-internal fun <T : Any> memoryPager(
-    pageSize: Int,
-    pagingKey: String,
-    scope: CoroutineScope,
-    mediator: BaseRemoteMediator<Int, T>,
-): Flow<PagingData<T>> =
-    Pager(
-        config = pagingConfig,
-        remoteMediator = mediator,
-        pagingSourceFactory = {
-            MemoryPagingSource(
-                key = pagingKey,
-                context = Dispatchers.IO,
-            )
-        },
-    ).flow.cachedIn(scope)
+// internal class MemoryPagingSource<T : Any>(
+//    private val key: String,
+//    private val context: CoroutineContext,
+// ) : BasePagingSource<Int, T>() {
+//    companion object {
+//        private val caches = mutableMapOf<String, MutableStateFlow<ImmutableList<Any>>>()
+//
+//        fun <T : Any> update(
+//            key: String,
+//            value: ImmutableList<T>,
+//        ) {
+//            caches[key]?.value = value
+//        }
+//
+//        fun <T : Any> append(
+//            key: String,
+//            value: ImmutableList<T>,
+//        ) {
+//            @Suppress("UNCHECKED_CAST")
+//            caches[key]?.value = ((caches[key]?.value as? ImmutableList<T> ?: persistentListOf()) + value).toImmutableList()
+//        }
+//
+//        fun <T : Any> updateWith(
+//            key: String,
+//            update: (ImmutableList<T>) -> ImmutableList<T>,
+//        ) {
+//            @Suppress("UNCHECKED_CAST")
+//            val value = caches[key]?.value as? ImmutableList<T> ?: persistentListOf()
+//            caches[key]?.value = update(value)
+//        }
+//
+//        @Suppress("UNCHECKED_CAST")
+//        fun <T : Any> get(key: String): ImmutableList<T>? = caches[key]?.value as? ImmutableList<T>
+//
+//        fun clear(key: String) {
+//            caches.remove(key)
+//        }
+//
+//        @Suppress("UNCHECKED_CAST")
+//        fun <T : Any> getFlow(key: String): Flow<ImmutableList<T>> =
+//            caches
+//                .getOrPut(key) {
+//                    MutableStateFlow(persistentListOf<T>())
+//                } as Flow<ImmutableList<T>>
+//    }
+//
+//    // TODO: workaround for skip first invalidation to avoid loading infinite loop
+//    private var skiped = false
+//
+//    private val job =
+//        caches
+//            .getOrPut(key) {
+//                MutableStateFlow(persistentListOf<T>())
+//            }.let {
+//                CoroutineScope(context).launch {
+//                    it.collectLatest {
+//                        if (!skiped) {
+//                            skiped = true
+//                            return@collectLatest
+//                        }
+//                        invalidate()
+//                    }
+//                }
+//            }
+//
+//    init {
+//        registerInvalidatedCallback {
+//            job.cancel()
+//        }
+//    }
+//
+//    override fun getRefreshKey(state: PagingState<Int, T>): Int? =
+//        state.anchorPosition?.let {
+//            maxOf(0, it - (state.config.initialLoadSize / 2))
+//        }
+//
+//    override suspend fun doLoad(params: LoadParams<Int>): LoadResult<Int, T> {
+//        val page = params.key ?: 0
+//
+//        @Suppress("UNCHECKED_CAST")
+//        val list = caches[key]?.value as? ImmutableList<T> ?: return LoadResult.Error(Exception("No data"))
+//        val data = list.subList(page, (page + params.loadSize).coerceIn(0, list.size))
+//        val prevKey = (page - params.loadSize).takeIf { it in list.indices }
+//        val nextKey = (page + params.loadSize).takeIf { it in list.indices }
+//        return LoadResult.Page(
+//            data = data,
+//            prevKey = prevKey,
+//            nextKey = nextKey,
+//        )
+//    }
+// }
+//
+// @OptIn(ExperimentalPagingApi::class)
+// internal fun <T : Any> memoryPager(
+//    pageSize: Int,
+//    pagingKey: String,
+//    scope: CoroutineScope,
+//    mediator: BaseRemoteMediator<Int, T>,
+// ): Flow<PagingData<T>> =
+//    Pager(
+//        config = pagingConfig,
+//        remoteMediator = mediator,
+//        pagingSourceFactory = {
+//            MemoryPagingSource(
+//                key = pagingKey,
+//                context = Dispatchers.IO,
+//            )
+//        },
+//    ).flow.cachedIn(scope)
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/PostEvent.kt
similarity index 57%
rename from shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/StatusEvent.kt
rename to shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt
index 6f0836e1e..4576bb229 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/StatusEvent.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt
@@ -2,146 +2,145 @@ package dev.dimension.flare.data.datasource.microblog
 
 import dev.dimension.flare.model.MicroBlogKey
 import kotlinx.collections.immutable.ImmutableList
-import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.Serializable
 
-internal sealed interface StatusEvent {
-    val accountKey: MicroBlogKey
-
-    interface Mastodon : StatusEvent {
-        fun reblog(
-            statusKey: MicroBlogKey,
-            reblogged: Boolean,
-        )
-
-        fun like(
-            statusKey: MicroBlogKey,
-            liked: Boolean,
-        )
-
-        fun bookmark(
-            statusKey: MicroBlogKey,
-            bookmarked: Boolean,
-        )
-
-        fun vote(
-            statusKey: MicroBlogKey,
-            id: String,
-            options: List<Int>,
-        )
-
-        fun acceptFollowRequest(
-            userKey: MicroBlogKey,
-            notificationStatusKey: MicroBlogKey,
-        )
-
-        fun rejectFollowRequest(
-            userKey: MicroBlogKey,
-            notificationStatusKey: MicroBlogKey,
-        )
-    }
-
-    interface Pleroma : Mastodon {
-        fun react(
-            statusKey: MicroBlogKey,
-            hasReacted: Boolean,
-            reaction: String,
-        )
-    }
-
-    interface Misskey : StatusEvent {
-        fun react(
-            statusKey: MicroBlogKey,
-            hasReacted: Boolean,
-            reaction: String,
-        )
-
-        fun renote(statusKey: MicroBlogKey)
-
-        fun vote(
-            statusKey: MicroBlogKey,
-            options: List<Int>,
-        )
-
-        fun favourite(
-            statusKey: MicroBlogKey,
-            favourited: Boolean,
-        )
-
-        fun favouriteState(statusKey: MicroBlogKey): Flow<Boolean>
-
-        fun acceptFollowRequest(
-            userKey: MicroBlogKey,
-            notificationStatusKey: MicroBlogKey,
-        )
-
-        fun rejectFollowRequest(
-            userKey: MicroBlogKey,
-            notificationStatusKey: MicroBlogKey,
-        )
-    }
-
-    interface Bluesky : StatusEvent {
-        fun reblog(
-            statusKey: MicroBlogKey,
-            cid: String,
-            uri: String,
-            repostUri: String?,
-        )
-
-        fun like(
-            statusKey: MicroBlogKey,
-            cid: String,
-            uri: String,
-            likedUri: String?,
-        )
-
-        fun bookmark(
-            statusKey: MicroBlogKey,
-            uri: String,
-            cid: String,
-        )
-
-        fun unbookmark(
-            statusKey: MicroBlogKey,
-            uri: String,
-        )
-    }
-
-    interface XQT : StatusEvent {
-        fun retweet(
-            statusKey: MicroBlogKey,
-            retweeted: Boolean,
-        )
-
-        fun like(
-            statusKey: MicroBlogKey,
-            liked: Boolean,
-        )
-
-        fun bookmark(
-            statusKey: MicroBlogKey,
-            bookmarked: Boolean,
-        )
-    }
-
-    interface VVO : StatusEvent {
-        fun like(
-            statusKey: MicroBlogKey,
-            liked: Boolean,
-        )
-
-        fun likeComment(
-            statusKey: MicroBlogKey,
-            liked: Boolean,
-        )
-
-        fun favorite(
-            statusKey: MicroBlogKey,
-            favorited: Boolean,
-        )
-    }
-}
+// internal sealed interface StatusEvent {
+//    val accountKey: MicroBlogKey
+//
+//    interface Mastodon : StatusEvent {
+//        fun reblog(
+//            statusKey: MicroBlogKey,
+//            reblogged: Boolean,
+//        )
+//
+//        fun like(
+//            statusKey: MicroBlogKey,
+//            liked: Boolean,
+//        )
+//
+//        fun bookmark(
+//            statusKey: MicroBlogKey,
+//            bookmarked: Boolean,
+//        )
+//
+//        fun vote(
+//            statusKey: MicroBlogKey,
+//            id: String,
+//            options: List<Int>,
+//        )
+//
+//        fun acceptFollowRequest(
+//            userKey: MicroBlogKey,
+//            notificationStatusKey: MicroBlogKey,
+//        )
+//
+//        fun rejectFollowRequest(
+//            userKey: MicroBlogKey,
+//            notificationStatusKey: MicroBlogKey,
+//        )
+//    }
+//
+//    interface Pleroma : Mastodon {
+//        fun react(
+//            statusKey: MicroBlogKey,
+//            hasReacted: Boolean,
+//            reaction: String,
+//        )
+//    }
+//
+//    interface Misskey : StatusEvent {
+//        fun react(
+//            statusKey: MicroBlogKey,
+//            hasReacted: Boolean,
+//            reaction: String,
+//        )
+//
+//        fun renote(statusKey: MicroBlogKey)
+//
+//        fun vote(
+//            statusKey: MicroBlogKey,
+//            options: List<Int>,
+//        )
+//
+//        fun favourite(
+//            statusKey: MicroBlogKey,
+//            favourited: Boolean,
+//        )
+//
+//        fun favouriteState(statusKey: MicroBlogKey): Flow<Boolean>
+//
+//        fun acceptFollowRequest(
+//            userKey: MicroBlogKey,
+//            notificationStatusKey: MicroBlogKey,
+//        )
+//
+//        fun rejectFollowRequest(
+//            userKey: MicroBlogKey,
+//            notificationStatusKey: MicroBlogKey,
+//        )
+//    }
+//
+//    interface Bluesky : StatusEvent {
+//        fun reblog(
+//            statusKey: MicroBlogKey,
+//            cid: String,
+//            uri: String,
+//            repostUri: String?,
+//        )
+//
+//        fun like(
+//            statusKey: MicroBlogKey,
+//            cid: String,
+//            uri: String,
+//            likedUri: String?,
+//        )
+//
+//        fun bookmark(
+//            statusKey: MicroBlogKey,
+//            uri: String,
+//            cid: String,
+//        )
+//
+//        fun unbookmark(
+//            statusKey: MicroBlogKey,
+//            uri: String,
+//        )
+//    }
+//
+//    interface XQT : StatusEvent {
+//        fun retweet(
+//            statusKey: MicroBlogKey,
+//            retweeted: Boolean,
+//        )
+//
+//        fun like(
+//            statusKey: MicroBlogKey,
+//            liked: Boolean,
+//        )
+//
+//        fun bookmark(
+//            statusKey: MicroBlogKey,
+//            bookmarked: Boolean,
+//        )
+//    }
+//
+//    interface VVO : StatusEvent {
+//        fun like(
+//            statusKey: MicroBlogKey,
+//            liked: Boolean,
+//        )
+//
+//        fun likeComment(
+//            statusKey: MicroBlogKey,
+//            liked: Boolean,
+//        )
+//
+//        fun favorite(
+//            statusKey: MicroBlogKey,
+//            favorited: Boolean,
+//        )
+//    }
+// }
 
 @Serializable
 internal sealed interface PostEvent {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ProfileAction.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ProfileAction.kt
index 2d785f470..72b9e72f3 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ProfileAction.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ProfileAction.kt
@@ -1,17 +1,14 @@
 package dev.dimension.flare.data.datasource.microblog
 
-import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.ui.model.UiRelation
-
-public sealed interface ProfileAction {
-    public suspend operator fun invoke(
-        userKey: MicroBlogKey,
-        relation: UiRelation,
-    )
-
-    public fun relationState(relation: UiRelation): Boolean
-
-    public interface Block : ProfileAction
-
-    public interface Mute : ProfileAction
-}
+// public sealed interface ProfileAction {
+//    public suspend operator fun invoke(
+//        userKey: MicroBlogKey,
+//        relation: UiRelation,
+//    )
+//
+//    public fun relationState(relation: UiRelation): Boolean
+//
+//    public interface Block : ProfileAction
+//
+//    public interface Mute : ProfileAction
+// }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ProfileTab.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ProfileTab.kt
index 81b5475c4..ebf772d05 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ProfileTab.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ProfileTab.kt
@@ -1,14 +1,15 @@
 package dev.dimension.flare.data.datasource.microblog
 
 import androidx.compose.runtime.Immutable
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
+import dev.dimension.flare.ui.model.UiTimelineV2
 
 @Immutable
 public sealed interface ProfileTab {
     @Immutable
     public data class Timeline internal constructor(
         internal val type: Type,
-        internal val loader: BaseTimelineLoader,
+        internal val loader: RemoteLoader<UiTimelineV2>,
     ) : ProfileTab {
         @Immutable
         public enum class Type {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListDataSource.kt
index c7b454834..b28f34bc3 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListDataSource.kt
@@ -1,9 +1,10 @@
 package dev.dimension.flare.data.datasource.microblog.list
 
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
+import dev.dimension.flare.ui.model.UiTimelineV2
 
 internal interface ListDataSource {
-    fun listTimeline(listId: String): BaseTimelineLoader
+    fun listTimeline(listId: String): RemoteLoader<UiTimelineV2>
 
     val listHandler: ListHandler
     val listMemberHandler: ListMemberHandler
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/BaseTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/BaseTimelineRemoteMediator.kt
deleted file mode 100644
index 74cc588b9..000000000
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/BaseTimelineRemoteMediator.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package dev.dimension.flare.data.datasource.microblog.paging
-
-import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.common.BasePagingSource
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.saveToDatabase
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.ui.model.UiTimeline
-
-internal sealed interface BaseTimelineLoader {
-    data object NotSupported : BaseTimelineLoader
-}
-
-internal fun interface BaseTimelinePagingSourceFactory<T : Any> : BaseTimelineLoader {
-    abstract fun create(): BasePagingSource<T, UiTimeline>
-}
-
-@OptIn(ExperimentalPagingApi::class)
-internal abstract class BaseTimelineRemoteMediator(
-    private val database: CacheDatabase,
-) : BasePagingRemoteMediator<DbPagingTimelineWithStatus, DbPagingTimelineWithStatus>(
-        database = database,
-    ),
-    BaseTimelineLoader {
-    override suspend fun load(
-        pageSize: Int,
-        request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> =
-        timeline(
-            pageSize = pageSize,
-            request = request,
-        )
-
-    abstract suspend fun timeline(
-        pageSize: Int,
-        request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus>
-
-    override suspend fun onSaveCache(
-        request: PagingRequest,
-        data: List<DbPagingTimelineWithStatus>,
-    ) {
-        if (request is PagingRequest.Refresh) {
-            data.groupBy { it.timeline.pagingKey }.keys.forEach { key ->
-                database
-                    .pagingTimelineDao()
-                    .delete(pagingKey = key)
-            }
-        }
-        saveToDatabase(database, data)
-    }
-}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/CacheableRemoteLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/CacheableRemoteLoader.kt
new file mode 100644
index 000000000..25e5842a9
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/CacheableRemoteLoader.kt
@@ -0,0 +1,5 @@
+package dev.dimension.flare.data.datasource.microblog.paging
+
+internal interface CacheableRemoteLoader<T : Any> : RemoteLoader<T> {
+    val pagingKey: String
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/RemoteLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/RemoteLoader.kt
new file mode 100644
index 000000000..c29e8db8e
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/RemoteLoader.kt
@@ -0,0 +1,39 @@
+package dev.dimension.flare.data.datasource.microblog.paging
+
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+
+internal interface RemoteLoader<T : Any> {
+    suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<T>
+}
+
+internal fun <T : Any> RemoteLoader<T>.toPagingSource() =
+    object : PagingSource<String, T>() {
+        override suspend fun load(params: LoadParams<String>): LoadResult<String, T> {
+            val request =
+                when (params) {
+                    is LoadParams.Refresh -> PagingRequest.Refresh
+                    is LoadParams.Prepend -> PagingRequest.Prepend(previousKey = params.key)
+                    is LoadParams.Append -> PagingRequest.Append(nextKey = params.key)
+                }
+            return try {
+                val result =
+                    load(
+                        pageSize = params.loadSize,
+                        request = request,
+                    )
+                LoadResult.Page(
+                    data = result.data,
+                    prevKey = result.previousKey,
+                    nextKey = result.nextKey,
+                )
+            } catch (e: Exception) {
+                LoadResult.Error(e)
+            }
+        }
+
+        override fun getRefreshKey(state: PagingState<String, T>): String? = null
+    }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelineRemoteMediator.kt
new file mode 100644
index 000000000..c5d39d778
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelineRemoteMediator.kt
@@ -0,0 +1,178 @@
+package dev.dimension.flare.data.datasource.microblog.paging
+
+import SnowflakeIdGenerator
+import androidx.paging.ExperimentalPagingApi
+import dev.dimension.flare.data.database.cache.CacheDatabase
+import dev.dimension.flare.data.database.cache.mapper.saveToDatabase
+import dev.dimension.flare.data.database.cache.model.DbPagingTimeline
+import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
+import dev.dimension.flare.data.database.cache.model.DbStatus
+import dev.dimension.flare.data.database.cache.model.DbStatusReference
+import dev.dimension.flare.data.database.cache.model.DbStatusReferenceWithStatus
+import dev.dimension.flare.data.database.cache.model.DbStatusUserReference
+import dev.dimension.flare.data.database.cache.model.DbStatusUserReferenceWithUser
+import dev.dimension.flare.data.database.cache.model.DbStatusWithReference
+import dev.dimension.flare.data.database.cache.model.DbStatusWithUser
+import dev.dimension.flare.data.database.cache.model.DbUser
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.model.ReferenceType
+import dev.dimension.flare.ui.model.UiTimelineV2
+import kotlin.uuid.Uuid
+
+@OptIn(ExperimentalPagingApi::class)
+internal class TimelineRemoteMediator(
+    private val loader: CacheableRemoteLoader<UiTimelineV2>,
+    private val database: CacheDatabase,
+) : BasePagingRemoteMediator<DbPagingTimelineWithStatus, DbPagingTimelineWithStatus>(
+        database = database,
+    ),
+    RemoteLoader<DbPagingTimelineWithStatus> {
+    override val pagingKey: String
+        get() = loader.pagingKey
+
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<DbPagingTimelineWithStatus> {
+        val result =
+            timeline(
+                pageSize = pageSize,
+                request = request,
+            )
+        val data =
+            result.data.map {
+                mapping(it)
+            }
+        return PagingResult(
+            data = data,
+            nextKey = result.nextKey,
+            previousKey = result.previousKey,
+        )
+    }
+
+    private suspend fun mapping(data: UiTimelineV2): DbPagingTimelineWithStatus =
+        DbPagingTimelineWithStatus(
+            timeline =
+                DbPagingTimeline(
+                    pagingKey = pagingKey,
+                    statusKey = data.statusKey,
+                    sortId = -SnowflakeIdGenerator.nextId(),
+                ),
+            status =
+                DbStatusWithReference(
+                    status = mappingDbStatusWithUser(data),
+                    references =
+                        when (data) {
+                            is UiTimelineV2.Feed -> emptyList()
+                            is UiTimelineV2.Message -> emptyList()
+                            is UiTimelineV2.Post ->
+                                data.quote.map {
+                                    mappingDbStatusReferenceWithStatus(
+                                        data = it,
+                                        referenceType = ReferenceType.Quote,
+                                        rootStatusKey = data.statusKey,
+                                    )
+                                } +
+                                    data.parents.map {
+                                        mappingDbStatusReferenceWithStatus(
+                                            data = it,
+                                            referenceType = ReferenceType.Reply,
+                                            rootStatusKey = data.statusKey,
+                                        )
+                                    }
+
+                            is UiTimelineV2.User -> emptyList()
+                            is UiTimelineV2.UserList ->
+                                listOfNotNull(
+                                    data.post?.let {
+                                        mappingDbStatusReferenceWithStatus(
+                                            data = it,
+                                            referenceType = ReferenceType.Quote,
+                                            rootStatusKey = data.statusKey,
+                                        )
+                                    },
+                                )
+                        },
+                ),
+        )
+
+    private fun mappingDbStatusReferenceWithStatus(
+        data: UiTimelineV2,
+        referenceType: ReferenceType,
+        rootStatusKey: MicroBlogKey,
+    ) = DbStatusReferenceWithStatus(
+        reference =
+            DbStatusReference(
+                referenceType = referenceType,
+                statusKey = rootStatusKey,
+                referenceStatusKey = data.statusKey,
+                _id = Uuid.random().toString(),
+            ),
+        status = mappingDbStatusWithUser(data),
+    )
+
+    private fun mappingDbStatusWithUser(data: UiTimelineV2): DbStatusWithUser {
+        val user =
+            if (data is UiTimelineV2.Post) {
+                listOfNotNull(data.user)
+            } else if (data is UiTimelineV2.User) {
+                listOfNotNull(data.value)
+            } else if (data is UiTimelineV2.UserList) {
+                data.users
+            } else {
+                emptyList()
+            }
+        return DbStatusWithUser(
+            data =
+                DbStatus(
+                    statusKey = data.statusKey,
+                    content = data,
+                    pagingKey = pagingKey,
+                    text = data.searchText,
+                ),
+            references =
+                user.map {
+                    DbStatusUserReferenceWithUser(
+                        reference =
+                            DbStatusUserReference(
+                                statusKey = data.statusKey,
+                                referenceUserKey = it.key,
+                                _id = Uuid.random().toString(),
+                            ),
+                        user =
+                            DbUser(
+                                userKey = it.key,
+                                platformType = it.platformType,
+                                name = it.name.raw,
+                                handle = it.handle,
+                                host = it.host ?: it.key.host,
+                                content = it,
+                            ),
+                    )
+                },
+        )
+    }
+
+    suspend fun timeline(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiTimelineV2> =
+        loader.load(
+            pageSize = pageSize,
+            request = request,
+        )
+
+    override suspend fun onSaveCache(
+        request: PagingRequest,
+        data: List<DbPagingTimelineWithStatus>,
+    ) {
+        if (request is PagingRequest.Refresh) {
+            data.groupBy { it.timeline.pagingKey }.keys.forEach { key ->
+                database
+                    .pagingTimelineDao()
+                    .delete(pagingKey = key)
+            }
+        }
+        saveToDatabase(database, data)
+    }
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/rss/RssTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/rss/RssTimelineRemoteMediator.kt
index ad664fce1..f5dbbf15e 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/rss/RssTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/rss/RssTimelineRemoteMediator.kt
@@ -3,23 +3,14 @@ package dev.dimension.flare.data.datasource.rss
 import androidx.paging.ExperimentalPagingApi
 import dev.dimension.flare.data.database.app.model.DbRssSources
 import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.createDbPagingTimelineWithStatus
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.database.cache.model.DbStatus
-import dev.dimension.flare.data.database.cache.model.DbStatusWithUser
-import dev.dimension.flare.data.database.cache.model.StatusContent
 import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.rss.RssService
 import dev.dimension.flare.data.network.rss.model.Feed
-import dev.dimension.flare.model.AccountType
-import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.ui.model.mapper.fromRss
-import dev.dimension.flare.ui.model.mapper.parseRssDateToInstant
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 import dev.dimension.flare.ui.model.mapper.title
-import dev.dimension.flare.ui.render.parseHtml
-import kotlin.time.Clock
 
 @OptIn(ExperimentalPagingApi::class)
 internal class RssTimelineRemoteMediator(
@@ -41,7 +32,7 @@ internal class RssTimelineRemoteMediator(
     override suspend fun timeline(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val rssSource = fetchSource(url)
         val response = fetchFeed(url)
         val title = rssSource?.title ?: response.title
@@ -49,117 +40,31 @@ internal class RssTimelineRemoteMediator(
         val content =
             when (response) {
                 is Feed.Atom ->
-                    response.entries
-                        .map {
-                            StatusContent.Rss.RssContent.Atom(
-                                it,
-                                source = title,
-                                icon = icon,
-                                openInBrowser = rssSource?.openInBrowser ?: false,
-                            )
-                        }.map {
-                            DbStatusWithUser(
-                                user = null,
-                                data =
-                                    DbStatus(
-                                        statusKey =
-                                            MicroBlogKey.fromRss(
-                                                it.data.links
-                                                    .first()
-                                                    .href,
-                                            ),
-                                        accountType = AccountType.Guest,
-                                        userKey = null,
-                                        content = StatusContent.Rss(it),
-                                        text =
-                                            it.data.content
-                                                ?.value
-                                                ?.let { html -> parseHtml(html) }
-                                                ?.wholeText(),
-                                        createdAt =
-                                            (it.data.published ?: it.data.updated)
-                                                ?.let { parseRssDateToInstant(it) }
-                                                ?: Clock.System.now(),
-                                    ),
-                            )
-                        }
+                    response.entries.map {
+                        it.render(
+                            sourceName = title,
+                            sourceIcon = icon,
+                            openInBrowser = rssSource?.openInBrowser ?: false,
+                        )
+                    }
 
                 is Feed.RDF ->
-                    response.items
-                        .map {
-                            StatusContent.Rss.RssContent.RDF(
-                                it,
-                                source = title,
-                                icon = icon,
-                                openInBrowser = rssSource?.openInBrowser ?: false,
-                            )
-                        }.map {
-                            DbStatusWithUser(
-                                user = null,
-                                data =
-                                    DbStatus(
-                                        statusKey =
-                                            MicroBlogKey.fromRss(
-                                                it.data.link,
-                                            ),
-                                        accountType = AccountType.Guest,
-                                        userKey = null,
-                                        content = StatusContent.Rss(it),
-                                        text =
-                                            it.data.description
-                                                ?.let { html -> parseHtml(html) }
-                                                ?.wholeText(),
-                                        createdAt =
-                                            it.data.date?.let { parseRssDateToInstant(it) }
-                                                ?: Clock.System.now(),
-                                    ),
-                            )
-                        }
+                    response.items.map {
+                        it.render(
+                            sourceName = title,
+                            sourceIcon = icon,
+                            openInBrowser = rssSource?.openInBrowser ?: false,
+                        )
+                    }
 
                 is Feed.Rss20 ->
-                    response.channel.items
-                        .map {
-                            StatusContent.Rss.RssContent.Rss20(
-                                it,
-                                source = title,
-                                icon = icon,
-                                openInBrowser = rssSource?.openInBrowser ?: false,
-                            )
-                        }.map {
-                            DbStatusWithUser(
-                                user = null,
-                                data =
-                                    DbStatus(
-                                        statusKey =
-                                            MicroBlogKey.fromRss(
-                                                it.data.link,
-                                            ),
-                                        accountType = AccountType.Guest,
-                                        userKey = null,
-                                        content = StatusContent.Rss(it),
-                                        text =
-                                            it.data.description
-                                                ?.let { html -> parseHtml(html) }
-                                                ?.wholeText(),
-                                        createdAt =
-                                            it.data.pubDate
-                                                ?.let {
-                                                    parseRssDateToInstant(
-                                                        it,
-                                                    )
-                                                }
-                                                ?: Clock.System.now(),
-                                    ),
-                            )
-                        }
-            }.mapIndexed { index, status ->
-                createDbPagingTimelineWithStatus(
-                    accountType = AccountType.Guest,
-                    pagingKey = pagingKey,
-                    sortId = status.data.createdAt.toEpochMilliseconds(),
-                    status = status,
-                    references = mapOf(),
-                )
+                    response.channel.items.map {
+                        it.render(
+                            sourceName = title,
+                            sourceIcon = icon,
+                            openInBrowser = rssSource?.openInBrowser ?: false,
+                        )
+                    }
             }
 
         return PagingResult(
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/ClickContext.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/ClickContext.kt
index 29e274431..d2bb5e092 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/ClickContext.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/ClickContext.kt
@@ -1,5 +1,7 @@
 package dev.dimension.flare.ui.model
 
+import dev.dimension.flare.data.datasource.microblog.PostEvent
+import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.route.DeeplinkRoute
 import dev.dimension.flare.ui.route.toUri
 import kotlinx.serialization.Serializable
@@ -18,6 +20,23 @@ internal sealed interface ClickEvent {
         val url: String,
     ) : ClickEvent {
         constructor(route: DeeplinkRoute) : this(route.toUri())
+        constructor(route: DeeplinkEvent) : this(route.toUri())
+    }
+
+    companion object {
+        fun event(
+            accountKey: MicroBlogKey?,
+            postEvent: PostEvent,
+        ) = if (accountKey == null) {
+            Noop
+        } else {
+            Deeplink(
+                DeeplinkEvent(
+                    accountKey = accountKey,
+                    postEvent = postEvent,
+                ),
+            )
+        }
     }
 }
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiIcon.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiIcon.kt
index 64608f6be..bc2f5a209 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiIcon.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiIcon.kt
@@ -36,4 +36,5 @@ public enum class UiIcon {
     Edit,
     Info,
     Pin,
+    Check,
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiMedia.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiMedia.kt
index 2e331e4e5..c3a24d149 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiMedia.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiMedia.kt
@@ -22,6 +22,16 @@ public sealed interface UiMedia {
         val sensitive: Boolean,
         override val customHeaders: SerializableImmutableMap<String, String>? = null,
     ) : UiMedia {
+        internal constructor(url: String, customHeaders: SerializableImmutableMap<String, String>? = null) : this(
+            url = url,
+            previewUrl = url,
+            description = null,
+            height = 0f,
+            width = 0f,
+            sensitive = false,
+            customHeaders = customHeaders,
+        )
+
         val aspectRatio: Float
             get() = (width / (height.takeUnless { it == 0f } ?: 1f)).takeUnless { it == 0f } ?: 1f
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiPoll.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiPoll.kt
index d4a2b857b..651bdf80b 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiPoll.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiPoll.kt
@@ -2,7 +2,6 @@ package dev.dimension.flare.ui.model
 
 import androidx.compose.runtime.Immutable
 import dev.dimension.flare.common.SerializableImmutableList
-import dev.dimension.flare.data.datasource.microblog.PostEvent
 import dev.dimension.flare.ui.humanizer.humanizePercentage
 import dev.dimension.flare.ui.render.UiDateTime
 import dev.dimension.flare.ui.render.toUi
@@ -17,7 +16,7 @@ public data class UiPoll internal constructor(
     val options: SerializableImmutableList<Option>,
     val multiple: Boolean,
     val ownVotes: SerializableImmutableList<Int>,
-    private val voteEvent: PostEvent.PollEvent,
+//    private val voteEvent: PostEvent.PollEvent,
     // null indicates no expiration
     private val expiresAt: Instant?,
     private val enabled: Boolean = true,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiProfile.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiProfile.kt
index f4f6a81bb..54c44827c 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiProfile.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiProfile.kt
@@ -76,6 +76,13 @@ public data class UiProfile internal constructor(
         }
     }
 
+    val host: String? by lazy {
+        handle
+            .removePrefix("@")
+            .split("@")
+            .getOrNull(1)
+    }
+
     @Serializable
     public sealed interface BottomContent {
         @Serializable
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
index 196a5bcfa..cf91a3d05 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
@@ -5,6 +5,7 @@ import dev.dimension.flare.common.SerializableImmutableList
 import dev.dimension.flare.data.datasource.microblog.ActionMenu
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
+import dev.dimension.flare.ui.model.mapper.fromRss
 import dev.dimension.flare.ui.render.UiDateTime
 import dev.dimension.flare.ui.render.UiRichText
 import dev.dimension.flare.ui.route.DeeplinkRoute
@@ -18,32 +19,47 @@ public sealed class UiTimelineV2 {
         itemKey
     }
 
+    internal abstract val extraKey: String?
+
+    internal abstract val searchText: String?
+    internal abstract val statusKey: MicroBlogKey
+    internal abstract val createdAt: UiDateTime
+
     public abstract val itemKey: String
 
-    public val itemType: String
-        get() =
-            when (this) {
-                is Feed -> "feed"
-                is Post -> "post"
-                is User -> "user"
-                is UserList -> "user_list"
-                is Message -> "message"
-            }
+    public val itemType: String =
+        when (this) {
+            is Feed -> "feed"
+            is Post -> "post"
+            is User -> "user"
+            is UserList -> "user_list"
+            is Message -> "message"
+        }
 
     @Serializable
     @Immutable
     public data class Message internal constructor(
-        private val _id: String,
         val user: UiProfile? = null,
-        val statusKey: MicroBlogKey? = null,
+        override val statusKey: MicroBlogKey,
         val icon: UiIcon,
         val type: Type,
+        override val createdAt: UiDateTime,
         private val clickEvent: ClickEvent,
+        override val extraKey: String? = null,
     ) : UiTimelineV2() {
+        override val searchText: String? = null
         val onClicked: ClickContext.() -> Unit by lazy {
             clickEvent.onClicked
         }
-        override val itemKey: String = "Message_${_id}"
+        override val itemKey: String =
+            buildString {
+                append("Message_")
+                append(statusKey)
+                if (extraKey != null) {
+                    append("_")
+                    append(extraKey)
+                }
+            }
 
         @Serializable
         @Immutable
@@ -85,8 +101,6 @@ public sealed class UiTimelineV2 {
                     App,
                     StarterpackJoined,
                     Pinned,
-                    AcceptFollowRequest,
-                    RejectFollowRequest,
                 }
             }
         }
@@ -98,7 +112,7 @@ public sealed class UiTimelineV2 {
         val title: String?,
         val description: String?,
         val url: String,
-        val createdAt: UiDateTime?,
+        override val createdAt: UiDateTime,
         val source: Source,
         val openInBrowser: Boolean,
         val media: UiMedia.Image? = null,
@@ -108,16 +122,31 @@ public sealed class UiTimelineV2 {
             } else {
                 ClickEvent.Deeplink(DeeplinkRoute.Rss.Detail(url))
             },
+        override val extraKey: String? = null,
     ) : UiTimelineV2() {
+        override val statusKey: MicroBlogKey = MicroBlogKey.fromRss(url)
+        override val searchText: String =
+            buildString {
+                title?.let {
+                    append(it)
+                    append(" ")
+                }
+                description?.let {
+                    append(it)
+                }
+            }
         val onClicked: ClickContext.() -> Unit by lazy {
             clickEvent.onClicked
         }
-        override val itemKey: String
-            get() =
-                buildString {
-                    append("Feed_")
-                    append(url)
+        override val itemKey: String =
+            buildString {
+                append("Feed_")
+                append(url)
+                if (extraKey != null) {
+                    append("_")
+                    append(extraKey)
                 }
+            }
 
         @Serializable
         @Immutable
@@ -140,30 +169,55 @@ public sealed class UiTimelineV2 {
         val content: UiRichText,
         val actions: SerializableImmutableList<ActionMenu>,
         val poll: UiPoll?,
-        val statusKey: MicroBlogKey,
+        override val statusKey: MicroBlogKey,
         val card: UiCard?,
-        val createdAt: UiDateTime,
+        override val createdAt: UiDateTime,
         val emojiReactions: SerializableImmutableList<EmojiReaction> = persistentListOf(),
         val sourceChannel: SourceChannel? = null,
         val visibility: Visibility? = null,
         val replyToHandle: String? = null,
         val parents: SerializableImmutableList<Post> = persistentListOf(),
         private val clickEvent: ClickEvent,
+        override val extraKey: String? = null,
     ) : UiTimelineV2() {
+        override val searchText: String =
+            buildString {
+                user?.name?.raw?.let {
+                    append(it)
+                    append(" ")
+                }
+                contentWarning?.raw?.let {
+                    append(it)
+                    append(" ")
+                }
+                content.raw.let {
+                    append(it)
+                    append(" ")
+                }
+                quote.forEach { post ->
+                    post.content.raw.let { quoteContent ->
+                        append(quoteContent)
+                        append(" ")
+                    }
+                }
+            }
         val onClicked: ClickContext.() -> Unit by lazy {
             clickEvent.onClicked
         }
-        override val itemKey: String
-            get() =
-                buildString {
-                    append(platformType.name)
+        override val itemKey: String =
+            buildString {
+                append(platformType.name)
+                append("_")
+                append(statusKey)
+                message?.let {
                     append("_")
-                    append(statusKey)
-                    message?.let {
-                        append("_")
-                        append(it.itemKey)
-                    }
+                    append(it.itemKey)
+                }
+                if (extraKey != null) {
+                    append("_")
+                    append(extraKey)
                 }
+            }
 
         val shouldExpandTextByDefault: Boolean by lazy {
             (contentWarning == null || contentWarning.isEmpty) && !content.isLongText
@@ -209,29 +263,25 @@ public sealed class UiTimelineV2 {
     public data class User internal constructor(
         val message: Message? = null,
         val value: UiProfile,
-        val button: SerializableImmutableList<Button> = persistentListOf(),
+        override val createdAt: UiDateTime,
+        override val statusKey: MicroBlogKey,
+        val button: SerializableImmutableList<ActionMenu.Item> = persistentListOf(),
+        override val extraKey: String? = null,
     ) : UiTimelineV2() {
-        override val itemKey: String
-            get() =
-                buildString {
-                    append("User_")
-                    append(value.key)
-                    message?.let {
-                        append("_")
-                        append(it.itemKey)
-                    }
+        override val searchText: String? = null
+        override val itemKey: String =
+            buildString {
+                append("User_")
+                append(value.key)
+                message?.let {
+                    append("_")
+                    append(it.itemKey)
+                }
+                if (extraKey != null) {
+                    append("_")
+                    append(extraKey)
                 }
-
-        @Serializable
-        @Immutable
-        public data class Button internal constructor(
-            val messageId: Message.Type.Localized.MessageId,
-            private val clickEvent: ClickEvent,
-        ) {
-            val onClicked: ClickContext.() -> Unit by lazy {
-                clickEvent.onClicked
             }
-        }
     }
 
     @Serializable
@@ -239,21 +289,28 @@ public sealed class UiTimelineV2 {
     public data class UserList internal constructor(
         val message: Message? = null,
         val users: SerializableImmutableList<UiProfile>,
-        val status: Post? = null,
+        override val createdAt: UiDateTime,
+        override val statusKey: MicroBlogKey,
+        val post: Post? = null,
+        override val extraKey: String? = null,
     ) : UiTimelineV2() {
-        override val itemKey: String
-            get() =
-                buildString {
-                    append("UserList_")
-                    append(users.hashCode())
-                    status?.let {
-                        append("_")
-                        append(it.itemKey)
-                    }
-                    message?.let {
-                        append("_")
-                        append(it.itemKey)
-                    }
+        override val searchText: String? = null
+        override val itemKey: String =
+            buildString {
+                append("UserList_")
+                append(users.hashCode())
+                post?.let {
+                    append("_")
+                    append(it.itemKey)
                 }
+                message?.let {
+                    append("_")
+                    append(it.itemKey)
+                }
+                if (extraKey != null) {
+                    append("_")
+                    append(extraKey)
+                }
+            }
     }
 }
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
index 58de7dd56..deff6bb8b 100644
--- 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
@@ -4,9 +4,8 @@ import com.fleeksoft.ksoup.nodes.Element
 import com.fleeksoft.ksoup.nodes.Node
 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.microblog.ActionMenu
-import dev.dimension.flare.data.datasource.microblog.StatusEvent
+import dev.dimension.flare.data.datasource.microblog.PostEvent
 import dev.dimension.flare.data.datasource.microblog.userActionsMenu
 import dev.dimension.flare.data.network.mastodon.api.model.Account
 import dev.dimension.flare.data.network.mastodon.api.model.Attachment
@@ -23,10 +22,10 @@ import dev.dimension.flare.data.network.mastodon.api.model.Visibility
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
-import dev.dimension.flare.model.ReferenceType
 import dev.dimension.flare.ui.model.ClickEvent
 import dev.dimension.flare.ui.model.UiCard
 import dev.dimension.flare.ui.model.UiEmoji
+import dev.dimension.flare.ui.model.UiIcon
 import dev.dimension.flare.ui.model.UiInstance
 import dev.dimension.flare.ui.model.UiInstanceMetadata
 import dev.dimension.flare.ui.model.UiList
@@ -35,7 +34,7 @@ import dev.dimension.flare.ui.model.UiNumber
 import dev.dimension.flare.ui.model.UiPoll
 import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.UiRelation
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.render.parseHtml
 import dev.dimension.flare.ui.render.toUi
 import dev.dimension.flare.ui.route.DeeplinkRoute
@@ -56,199 +55,200 @@ private val mastodonParser by lazy {
     )
 }
 
-internal fun Notification.render(
-    accountKey: MicroBlogKey,
-    event: StatusEvent.Mastodon,
-    references: Map<ReferenceType, List<StatusContent>>,
-): UiTimeline {
+internal fun Notification.render(accountKey: MicroBlogKey): UiTimelineV2 {
     requireNotNull(account) { "account is null" }
     val user = account.render(accountKey, host = accountKey.host)
-    val status =
-        (references[ReferenceType.Notification]?.firstOrNull() as? StatusContent.Mastodon)
-            ?.data
-            ?.renderStatus(
-                host = accountKey.host,
-                accountKey = accountKey,
-                dataSource = event,
-            )
-    val topMessageType =
-        when (type) {
-            NotificationTypes.Follow ->
-                UiTimeline.TopMessage.MessageType.Mastodon
-                    .Follow(id = id.orEmpty())
-
-            NotificationTypes.Favourite ->
-                UiTimeline.TopMessage.MessageType.Mastodon
-                    .Favourite(id = id.orEmpty())
+    val messageType =
+        if (type == null) {
+            UiTimelineV2.Message.Type.Unknown(rawType = "")
+        } else {
+            when (type) {
+                NotificationTypes.Follow ->
+                    UiTimelineV2.Message.Type.Localized.MessageId.Follow
 
-            NotificationTypes.Reblog ->
-                UiTimeline.TopMessage.MessageType.Mastodon
-                    .Reblogged(id = id.orEmpty())
+                NotificationTypes.Favourite ->
+                    UiTimelineV2.Message.Type.Localized.MessageId
+                        .Favourite
 
-            NotificationTypes.Mention ->
-                UiTimeline.TopMessage.MessageType.Mastodon
-                    .Mention(id = id.orEmpty())
+                NotificationTypes.Reblog ->
+                    UiTimelineV2.Message.Type.Localized.MessageId
+                        .Repost
 
-            NotificationTypes.Poll ->
-                UiTimeline.TopMessage.MessageType.Mastodon
-                    .Poll(id = id.orEmpty())
+                NotificationTypes.Mention ->
+                    UiTimelineV2.Message.Type.Localized.MessageId
+                        .Mention
 
-            NotificationTypes.FollowRequest ->
-                UiTimeline.TopMessage.MessageType.Mastodon
-                    .FollowRequest(id = id.orEmpty())
+                NotificationTypes.Poll ->
+                    UiTimelineV2.Message.Type.Localized.MessageId
+                        .PollEnded
 
-            NotificationTypes.Status ->
-                UiTimeline.TopMessage.MessageType.Mastodon
-                    .Status(id = id.orEmpty())
+                NotificationTypes.FollowRequest ->
+                    UiTimelineV2.Message.Type.Localized.MessageId
+                        .FollowRequest
 
-            NotificationTypes.Update ->
-                UiTimeline.TopMessage.MessageType.Mastodon
-                    .Update(id = id.orEmpty())
+                NotificationTypes.Status ->
+                    UiTimelineV2.Message.Type.Localized.MessageId
+                        .NewPost
 
-            null ->
-                UiTimeline.TopMessage.MessageType.Mastodon
-                    .UnKnown(id = id.orEmpty())
+                NotificationTypes.Update ->
+                    UiTimelineV2.Message.Type.Localized.MessageId
+                        .PostUpdated
+            }.let {
+                UiTimelineV2.Message.Type.Localized(it)
+            }
         }
-    val topMessage =
-        topMessageType.let {
-            UiTimeline.TopMessage(
-                user = user,
-                icon =
-                    when (type) {
-                        NotificationTypes.Follow -> UiTimeline.TopMessage.Icon.Follow
-                        NotificationTypes.Favourite -> UiTimeline.TopMessage.Icon.Favourite
-                        NotificationTypes.Reblog -> UiTimeline.TopMessage.Icon.Retweet
-                        NotificationTypes.Mention -> UiTimeline.TopMessage.Icon.Mention
-                        NotificationTypes.Poll -> UiTimeline.TopMessage.Icon.Poll
-                        NotificationTypes.FollowRequest -> UiTimeline.TopMessage.Icon.Follow
-                        NotificationTypes.Status -> UiTimeline.TopMessage.Icon.Edit
-                        NotificationTypes.Update -> UiTimeline.TopMessage.Icon.Edit
-                        null -> UiTimeline.TopMessage.Icon.Info
-                    },
-                type = it,
-                onClicked = {
-                    launcher.launch(
-                        DeeplinkRoute.Profile
-                            .User(
-                                accountType = AccountType.Specific(accountKey),
-                                userKey = user.key,
-                            ).toUri(),
-                    )
+    val message =
+        UiTimelineV2.Message(
+            user = user,
+            icon =
+                when (type) {
+                    NotificationTypes.Follow -> UiIcon.Follow
+                    NotificationTypes.Favourite -> UiIcon.Favourite
+                    NotificationTypes.Reblog -> UiIcon.Retweet
+                    NotificationTypes.Mention -> UiIcon.Mention
+                    NotificationTypes.Poll -> UiIcon.Poll
+                    NotificationTypes.FollowRequest -> UiIcon.Follow
+                    NotificationTypes.Status -> UiIcon.Edit
+                    NotificationTypes.Update -> UiIcon.Edit
+                    null -> UiIcon.Info
                 },
-                statusKey = MicroBlogKey(id ?: "", accountKey.host),
-            )
-        }
-    return UiTimeline(
-        topMessage = topMessage,
-        content =
-            when (type) {
-                in listOf(NotificationTypes.Follow) -> UiTimeline.ItemContent.User(user)
-                NotificationTypes.FollowRequest ->
-                    UiTimeline.ItemContent.User(
-                        user,
-                        button =
-                            persistentListOf(
-                                UiTimeline.ItemContent.User.Button.AcceptFollowRequest(
-                                    onClicked = {
-                                        event.acceptFollowRequest(
-                                            userKey = user.key,
-                                            notificationStatusKey =
-                                                MicroBlogKey(
-                                                    id ?: "",
-                                                    accountKey.host,
-                                                ),
-                                        )
-                                    },
+            type = messageType,
+            statusKey = MicroBlogKey(id ?: "", accountKey.host),
+            createdAt = createdAt?.toUi() ?: Instant.DISTANT_PAST.toUi(),
+            clickEvent =
+                ClickEvent.Deeplink(
+                    DeeplinkRoute.Profile
+                        .User(
+                            accountType = AccountType.Specific(accountKey),
+                            userKey = user.key,
+                        ),
+                ),
+        )
+    if (type in listOf(NotificationTypes.FollowRequest)) {
+        return UiTimelineV2.User(
+            value = user,
+            message = message,
+            button =
+                persistentListOf(
+                    ActionMenu.Item(
+                        text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.AcceptFollowRequest),
+                        clickEvent =
+                            ClickEvent.event(
+                                accountKey,
+                                PostEvent.Mastodon.AcceptFollowRequest(
+                                    userKey = user.key,
+                                    notificationStatusKey =
+                                        MicroBlogKey(
+                                            id ?: "",
+                                            accountKey.host,
+                                        ),
                                 ),
-                                UiTimeline.ItemContent.User.Button.RejectFollowRequest(
-                                    onClicked = {
-                                        event.rejectFollowRequest(
-                                            userKey = user.key,
-                                            notificationStatusKey =
-                                                MicroBlogKey(
-                                                    id ?: "",
-                                                    accountKey.host,
-                                                ),
-                                        )
-                                    },
+                            ),
+                        color = ActionMenu.Item.Color.PrimaryColor,
+                        icon = UiIcon.Check,
+                    ),
+                    ActionMenu.Item(
+                        text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.RejectFollowRequest),
+                        clickEvent =
+                            ClickEvent.event(
+                                accountKey,
+                                PostEvent.Mastodon.RejectFollowRequest(
+                                    userKey = user.key,
+                                    notificationStatusKey =
+                                        MicroBlogKey(
+                                            id ?: "",
+                                            accountKey.host,
+                                        ),
                                 ),
                             ),
-                    )
-
-                else -> status ?: UiTimeline.ItemContent.User(user)
-            },
-    )
+                        color = ActionMenu.Item.Color.Red,
+                    ),
+                ),
+            createdAt = createdAt?.toUi() ?: Instant.DISTANT_PAST.toUi(),
+            statusKey = MicroBlogKey(id ?: "", accountKey.host),
+        )
+    } else if (status != null) {
+        return status
+            .renderStatus(
+                host = accountKey.host,
+                accountKey = accountKey,
+            ).copy(
+                message = message,
+            )
+    } else {
+        return UiTimelineV2.User(
+            value = user,
+            message = message,
+            createdAt = createdAt?.toUi() ?: Instant.DISTANT_PAST.toUi(),
+            statusKey = MicroBlogKey(id ?: "", accountKey.host),
+        )
+    }
 }
 
-internal fun Status.renderGuest(host: String) =
-    render(
-        host = host,
-        event = null,
-        references =
-            reblog
-                ?.let { reblog ->
-                    mapOf(
-                        ReferenceType.Retweet to listOfNotNull(StatusContent.Mastodon(reblog)),
-                    )
-                }.orEmpty(),
-    )
+internal fun List<Status>.render(accountKey: MicroBlogKey) = this.map { it.render(host = accountKey.host, accountKey = accountKey) }
 
 internal fun Status.render(
     host: String,
-    event: StatusEvent.Mastodon?,
-    references: Map<ReferenceType, List<StatusContent>> = mapOf(),
-): UiTimeline {
-    val accountKey = event?.accountKey
+    accountKey: MicroBlogKey?,
+): UiTimelineV2 {
     requireNotNull(account) { "account is null" }
-    val user = account.render(accountKey, host)
-    val currentStatus = this.renderStatus(host, accountKey, event)
-    val actualStatus =
-        (references[ReferenceType.Retweet]?.firstOrNull() as? StatusContent.Mastodon)?.data ?: this
     val topMessage =
         if (pinned == true) {
-            UiTimeline.TopMessage(
+            val currentStatus = this.renderStatus(host, accountKey)
+            UiTimelineV2.Message(
                 user = null,
-                icon = UiTimeline.TopMessage.Icon.Pin,
+                icon = UiIcon.Pin,
                 type =
-                    UiTimeline.TopMessage.MessageType.Mastodon
-                        .Pinned(id = id.orEmpty()),
-                onClicked = { },
+                    UiTimelineV2.Message.Type.Localized(
+                        UiTimelineV2.Message.Type.Localized.MessageId.Pinned,
+                    ),
                 statusKey = currentStatus.statusKey,
+                createdAt = currentStatus.createdAt,
+                clickEvent = ClickEvent.Noop,
             )
-        } else if (reblog == null) {
-            null
-        } else {
-            UiTimeline.TopMessage(
-                user = user,
-                icon = UiTimeline.TopMessage.Icon.Retweet,
+        } else if (reblog != null) {
+            val currentStatus = this.renderStatus(host, accountKey)
+            val userKey = currentStatus.user?.key
+            UiTimelineV2.Message(
+                user = currentStatus.user,
+                icon = UiIcon.Retweet,
                 type =
-                    UiTimeline.TopMessage.MessageType.Mastodon
-                        .Reblogged(id = id.orEmpty()),
-                onClicked = {
-                    launcher.launch(
-                        DeeplinkRoute.Profile
-                            .User(
-                                accountType =
-                                    accountKey?.let { AccountType.Specific(it) }
-                                        ?: AccountType.Guest,
-                                userKey = user.key,
-                            ).toUri(),
-                    )
-                },
+                    UiTimelineV2.Message.Type.Localized(
+                        UiTimelineV2.Message.Type.Localized.MessageId.Repost,
+                    ),
                 statusKey = currentStatus.statusKey,
+                createdAt = currentStatus.createdAt,
+                clickEvent =
+                    if (userKey != null) {
+                        ClickEvent.Deeplink(
+                            DeeplinkRoute.Profile
+                                .User(
+                                    accountType =
+                                        accountKey?.let { AccountType.Specific(it) }
+                                            ?: AccountType.Guest,
+                                    userKey = userKey,
+                                ),
+                        )
+                    } else {
+                        ClickEvent.Noop
+                    },
             )
+        } else {
+            null
         }
-    return UiTimeline(
-        topMessage = topMessage,
-        content = actualStatus.renderStatus(host, accountKey, event),
-    )
+    return (this.reblog ?: this)
+        .renderStatus(
+            host = host,
+            accountKey = accountKey,
+        ).copy(
+            message = topMessage,
+        )
 }
 
 private fun Status.renderStatus(
     host: String,
     accountKey: MicroBlogKey?,
-    dataSource: StatusEvent.Mastodon?,
-): UiTimeline.ItemContent.Status {
+): UiTimelineV2.Post {
     requireNotNull(account) { "actualStatus.account is null" }
     val actualUser = account.render(accountKey, host)
     val isFromMe = actualUser.key == accountKey
@@ -260,7 +260,7 @@ private fun Status.renderStatus(
             ) ||
             (isFromMe && visibility != Visibility.Direct)
     val canQuote =
-        if (dataSource is StatusEvent.Pleroma) {
+        if (emojiReactions != null) { // assuming that is pleroma
             canReblog
         } else if (quoteApproval != null && quoteApproval.currentUser != null) {
             when (quoteApproval.currentUser) {
@@ -296,36 +296,35 @@ private fun Status.renderStatus(
         )
     val renderedVisibility =
         when (visibility) {
-            Visibility.Public -> UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Public
-            Visibility.Unlisted -> UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Home
-            Visibility.Private -> UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Followers
-            Visibility.Direct -> UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Specified
-            Visibility.List -> UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Followers
-            Visibility.Local -> UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Home
+            Visibility.Public -> UiTimelineV2.Post.Visibility.Public
+            Visibility.Unlisted -> UiTimelineV2.Post.Visibility.Home
+            Visibility.Private -> UiTimelineV2.Post.Visibility.Followers
+            Visibility.Direct -> UiTimelineV2.Post.Visibility.Specified
+            Visibility.List -> UiTimelineV2.Post.Visibility.Followers
+            Visibility.Local -> UiTimelineV2.Post.Visibility.Home
             null -> null
         }
-    val bottomContent =
-        if (!emojiReactions.isNullOrEmpty()) {
-            UiTimeline.ItemContent.Status.BottomContent.Reaction(
-                emojiReactions
-                    .map {
-                        UiTimeline.ItemContent.Status.BottomContent.Reaction.EmojiReaction(
-                            name = it.name.orEmpty(),
-                            count = UiNumber(it.count ?: 0),
-                            me = it.me ?: false,
-                            url = it.url.orEmpty(),
-                            isUnicode = it.url.isNullOrEmpty(),
-                            onClicked = {
-                                if (dataSource is StatusEvent.Pleroma) {
-                                    dataSource.react(statusKey, true, it.name.orEmpty())
-                                }
-                            },
-                        )
-                    }.toImmutableList(),
-            )
-        } else {
-            null
-        }
+    val reactions =
+        emojiReactions
+            .orEmpty()
+            .map {
+                UiTimelineV2.Post.EmojiReaction(
+                    name = it.name.orEmpty(),
+                    count = UiNumber(it.count ?: 0),
+                    me = it.me ?: false,
+                    url = it.url.orEmpty(),
+                    isUnicode = it.url.isNullOrEmpty(),
+                    clickEvent =
+                        ClickEvent.event(
+                            accountKey = accountKey,
+                            PostEvent.Pleroma.React(
+                                statusKey = statusKey,
+                                hasReacted = true,
+                                reaction = it.name.orEmpty(),
+                            ),
+                        ),
+                )
+            }.toImmutableList()
     val postUrl =
         buildString {
             if (!url.isNullOrEmpty()) {
@@ -336,8 +335,8 @@ private fun Status.renderStatus(
                 append("https://$host/@${account.acct}/$id")
             }
         }
-    val quoteStatus = quote?.renderStatus(host, accountKey, dataSource)
-    return UiTimeline.ItemContent.Status(
+    val quoteStatus = quote?.renderStatus(host, accountKey)
+    return UiTimelineV2.Post(
         images =
             mediaAttachments
                 ?.mapNotNull { attachment ->
@@ -376,20 +375,21 @@ private fun Status.renderStatus(
             buildList {
                 add(
                     ActionMenu.Item(
-                        icon = ActionMenu.Item.Icon.Reply,
+                        icon = UiIcon.Reply,
                         text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Reply),
                         count = UiNumber(repliesCount ?: 0),
-                        onClicked = {
-                            if (accountKey != null) {
-                                launcher.launch(
+                        clickEvent =
+                            if (accountKey == null) {
+                                ClickEvent.Noop
+                            } else {
+                                ClickEvent.Deeplink(
                                     DeeplinkRoute.Compose
                                         .Reply(
                                             accountKey = accountKey,
                                             statusKey = statusKey,
-                                        ).toUri(),
+                                        ),
                                 )
-                            }
-                        },
+                            },
                     ),
                 )
                 if (canReblog && canQuote && accountKey != null) {
@@ -397,7 +397,7 @@ private fun Status.renderStatus(
                         ActionMenu.Group(
                             displayItem =
                                 ActionMenu.Item(
-                                    icon = if (reblogged == true) ActionMenu.Item.Icon.Unretweet else ActionMenu.Item.Icon.Retweet,
+                                    icon = if (reblogged == true) UiIcon.Unretweet else UiIcon.Retweet,
                                     text =
                                         ActionMenu.Item.Text.Localized(
                                             if (reblogged ==
@@ -416,24 +416,23 @@ private fun Status.renderStatus(
                                     if (canQuote) {
                                         add(
                                             ActionMenu.Item(
-                                                icon = ActionMenu.Item.Icon.Quote,
+                                                icon = UiIcon.Quote,
                                                 text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Quote),
                                                 count = UiNumber(quotesCount ?: 0),
-                                                onClicked = {
-                                                    launcher.launch(
+                                                clickEvent =
+                                                    ClickEvent.Deeplink(
                                                         DeeplinkRoute.Compose
                                                             .Quote(
                                                                 accountKey = accountKey,
                                                                 statusKey = statusKey,
-                                                            ).toUri(),
-                                                    )
-                                                },
+                                                            ),
+                                                    ),
                                             ),
                                         )
                                     }
                                     add(
                                         ActionMenu.Item(
-                                            icon = if (reblogged == true) ActionMenu.Item.Icon.Unretweet else ActionMenu.Item.Icon.Retweet,
+                                            icon = if (reblogged == true) UiIcon.Unretweet else UiIcon.Retweet,
                                             text =
                                                 ActionMenu.Item.Text.Localized(
                                                     if (reblogged ==
@@ -446,9 +445,17 @@ private fun Status.renderStatus(
                                                 ),
                                             count = UiNumber(reblogsCount ?: 0),
                                             color = if (reblogged == true) ActionMenu.Item.Color.PrimaryColor else null,
-                                            onClicked = {
-                                                dataSource?.reblog(statusKey, reblogged ?: false)
-                                            },
+//                                            onClicked = {
+//                                                dataSource?.reblog(statusKey, reblogged ?: false)
+//                                            },
+                                            clickEvent =
+                                                ClickEvent.event(
+                                                    accountKey,
+                                                    PostEvent.Mastodon.Reblog(
+                                                        statusKey = statusKey,
+                                                        reblogged = reblogged ?: false,
+                                                    ),
+                                                ),
                                         ),
                                     )
                                 }.toImmutableList(),
@@ -457,26 +464,27 @@ private fun Status.renderStatus(
                 } else if (canQuote) {
                     add(
                         ActionMenu.Item(
-                            icon = ActionMenu.Item.Icon.Quote,
+                            icon = UiIcon.Quote,
                             text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Quote),
                             count = UiNumber(quotesCount ?: 0),
-                            onClicked = {
-                                if (accountKey != null) {
-                                    launcher.launch(
+                            clickEvent =
+                                if (accountKey == null) {
+                                    ClickEvent.Noop
+                                } else {
+                                    ClickEvent.Deeplink(
                                         DeeplinkRoute.Compose
                                             .Quote(
                                                 accountKey = accountKey,
                                                 statusKey = statusKey,
-                                            ).toUri(),
+                                            ),
                                     )
-                                }
-                            },
+                                },
                         ),
                     )
                 } else if (canReblog) {
                     add(
                         ActionMenu.Item(
-                            icon = if (reblogged == true) ActionMenu.Item.Icon.Unretweet else ActionMenu.Item.Icon.Retweet,
+                            icon = if (reblogged == true) UiIcon.Unretweet else UiIcon.Retweet,
                             text =
                                 ActionMenu.Item.Text.Localized(
                                     if (reblogged ==
@@ -489,15 +497,20 @@ private fun Status.renderStatus(
                                 ),
                             count = UiNumber(reblogsCount ?: 0),
                             color = if (reblogged == true) ActionMenu.Item.Color.PrimaryColor else null,
-                            onClicked = {
-                                dataSource?.reblog(statusKey, reblogged ?: false)
-                            },
+                            clickEvent =
+                                ClickEvent.event(
+                                    accountKey,
+                                    PostEvent.Mastodon.Reblog(
+                                        statusKey = statusKey,
+                                        reblogged = reblogged ?: false,
+                                    ),
+                                ),
                         ),
                     )
                 } else if (accountKey == null) {
                     add(
                         ActionMenu.Item(
-                            icon = if (reblogged == true) ActionMenu.Item.Icon.Unretweet else ActionMenu.Item.Icon.Retweet,
+                            icon = if (reblogged == true) UiIcon.Unretweet else UiIcon.Retweet,
                             text =
                                 ActionMenu.Item.Text.Localized(
                                     if (reblogged ==
@@ -515,7 +528,7 @@ private fun Status.renderStatus(
                 }
                 add(
                     ActionMenu.Item(
-                        icon = if (favourited == true) ActionMenu.Item.Icon.Unlike else ActionMenu.Item.Icon.Like,
+                        icon = if (favourited == true) UiIcon.Unlike else UiIcon.Like,
                         text =
                             ActionMenu.Item.Text.Localized(
                                 if (favourited ==
@@ -528,27 +541,33 @@ private fun Status.renderStatus(
                             ),
                         count = UiNumber(favouritesCount ?: 0),
                         color = if (favourited == true) ActionMenu.Item.Color.Red else null,
-                        onClicked = {
-                            dataSource?.like(statusKey, favourited ?: false)
-                        },
+                        clickEvent =
+                            ClickEvent.event(
+                                accountKey,
+                                PostEvent.Mastodon.Like(
+                                    statusKey = statusKey,
+                                    liked = favourited ?: false,
+                                ),
+                            ),
                     ),
                 )
                 if (canReact) {
                     add(
                         ActionMenu.Item(
-                            icon = ActionMenu.Item.Icon.React,
+                            icon = UiIcon.React,
                             text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.React),
-                            onClicked = {
-                                if (accountKey != null) {
-                                    launcher.launch(
+                            clickEvent =
+                                if (accountKey == null) {
+                                    ClickEvent.Noop
+                                } else {
+                                    ClickEvent.Deeplink(
                                         DeeplinkRoute.Status
                                             .AddReaction(
                                                 statusKey = statusKey,
                                                 accountType = AccountType.Specific(accountKey),
-                                            ).toUri(),
+                                            ),
                                     )
-                                }
-                            },
+                                },
                         ),
                     )
                 }
@@ -556,7 +575,7 @@ private fun Status.renderStatus(
                     ActionMenu.Group(
                         displayItem =
                             ActionMenu.Item(
-                                icon = ActionMenu.Item.Icon.More,
+                                icon = UiIcon.More,
                                 text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.More),
                             ),
                         actions =
@@ -568,9 +587,9 @@ private fun Status.renderStatus(
                                                 if (bookmarked ==
                                                     true
                                                 ) {
-                                                    ActionMenu.Item.Icon.Unbookmark
+                                                    UiIcon.Unbookmark
                                                 } else {
-                                                    ActionMenu.Item.Icon.Bookmark
+                                                    UiIcon.Bookmark
                                                 },
                                             text =
                                                 ActionMenu.Item.Text.Localized(
@@ -583,18 +602,38 @@ private fun Status.renderStatus(
                                                     },
                                                 ),
                                             count = UiNumber(0),
-                                            onClicked = {
-                                                dataSource?.bookmark(statusKey, bookmarked ?: false)
-                                            },
+                                            clickEvent =
+                                                ClickEvent.event(
+                                                    accountKey,
+                                                    PostEvent.Mastodon.Bookmark(
+                                                        statusKey = statusKey,
+                                                        bookmarked = bookmarked ?: false,
+                                                    ),
+                                                ),
                                         ),
                                     )
                                 }
                                 add(
                                     ActionMenu.Item(
-                                        icon = ActionMenu.Item.Icon.Share,
+                                        icon = UiIcon.Share,
                                         text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Share),
-                                        onClicked = {
-                                            launcher.launch(
+//                                        onClicked = {
+//                                            launcher.launch(
+//                                                DeeplinkRoute.Status
+//                                                    .ShareSheet(
+//                                                        statusKey = statusKey,
+//                                                        accountType =
+//                                                            if (accountKey != null) {
+//                                                                AccountType.Specific(accountKey)
+//                                                            } else {
+//                                                                AccountType.Guest
+//                                                            },
+//                                                        shareUrl = postUrl,
+//                                                    ).toUri(),
+//                                            )
+//                                        },
+                                        clickEvent =
+                                            ClickEvent.Deeplink(
                                                 DeeplinkRoute.Status
                                                     .ShareSheet(
                                                         statusKey = statusKey,
@@ -605,20 +644,19 @@ private fun Status.renderStatus(
                                                                 AccountType.Guest
                                                             },
                                                         shareUrl = postUrl,
-                                                    ).toUri(),
-                                            )
-                                        },
+                                                    ),
+                                            ),
                                     ),
                                 )
 
                                 if (isFromMe) {
                                     add(
                                         ActionMenu.Item(
-                                            icon = ActionMenu.Item.Icon.Delete,
+                                            icon = UiIcon.Delete,
                                             text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Delete),
                                             color = ActionMenu.Item.Color.Red,
-                                            onClicked = {
-                                                launcher.launch(
+                                            clickEvent =
+                                                ClickEvent.Deeplink(
                                                     DeeplinkRoute.Status
                                                         .DeleteConfirm(
                                                             accountType =
@@ -626,9 +664,8 @@ private fun Status.renderStatus(
                                                                     accountKey,
                                                                 ),
                                                             statusKey = statusKey,
-                                                        ).toUri(),
-                                                )
-                                            },
+                                                        ),
+                                                ),
                                         ),
                                     )
                                 } else {
@@ -643,39 +680,23 @@ private fun Status.renderStatus(
                                     add(ActionMenu.Divider)
                                     add(
                                         ActionMenu.Item(
-                                            icon = ActionMenu.Item.Icon.Report,
+                                            icon = UiIcon.Report,
                                             text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Report),
                                             color = ActionMenu.Item.Color.Red,
-                                            onClicked = {
-                                                if (accountKey != null) {
-                                                    launcher.launch(
-                                                        DeeplinkRoute.Status
-                                                            .MastodonReport(
-                                                                statusKey = statusKey,
-                                                                userKey = actualUser.key,
-                                                                accountType =
-                                                                    AccountType.Specific(
-                                                                        accountKey,
-                                                                    ),
-                                                            ).toUri(),
-                                                    )
-                                                } else {
-                                                    launcher.launch(
-                                                        DeeplinkRoute.Status
-                                                            .MastodonReport(
-                                                                statusKey = statusKey,
-                                                                userKey = actualUser.key,
-                                                                accountType =
-                                                                    AccountType.Specific(
-                                                                        MicroBlogKey(
-                                                                            "",
-                                                                            "",
-                                                                        ),
-                                                                    ),
-                                                            ).toUri(),
-                                                    )
-                                                }
-                                            },
+                                            clickEvent =
+                                                ClickEvent.Deeplink(
+                                                    DeeplinkRoute.Status
+                                                        .MastodonReport(
+                                                            statusKey = statusKey,
+                                                            userKey = actualUser.key,
+                                                            accountType =
+                                                                if (accountKey != null) {
+                                                                    AccountType.Specific(accountKey)
+                                                                } else {
+                                                                    AccountType.Guest
+                                                                },
+                                                        ),
+                                                ),
                                         ),
                                     )
                                 }
@@ -708,55 +729,30 @@ private fun Status.renderStatus(
                     expiresAt = it.expiresAt,
                     multiple = it.multiple ?: false,
                     ownVotes = it.ownVotes?.toPersistentList() ?: persistentListOf(),
-                    onVote = { options ->
-                        if (it.id != null && dataSource != null) {
-                            dataSource.vote(statusKey, it.id, options)
-                        }
-                    },
-                    enabled = dataSource != null && !isFromMe,
+//                    onVote = { options ->
+//                        if (it.id != null && dataSource != null) {
+//                            dataSource.vote(statusKey, it.id, options)
+//                        }
+//                    },
+                    enabled = accountKey != null && !isFromMe,
                 )
             },
         statusKey = statusKey,
         createdAt = createdAt?.toUi() ?: Instant.DISTANT_PAST.toUi(),
-        topEndContent =
-            renderedVisibility?.let {
-                UiTimeline.ItemContent.Status.TopEndContent
-                    .Visibility(it)
-            },
+        visibility = renderedVisibility,
         sensitive = sensitive ?: false,
-        onClicked = {
-            launcher.launch(
+        clickEvent =
+            ClickEvent.Deeplink(
                 DeeplinkRoute.Status
                     .Detail(
                         statusKey = statusKey,
                         accountType =
                             accountKey?.let { AccountType.Specific(it) }
                                 ?: AccountType.Guest,
-                    ).toUri(),
-            )
-        },
+                    ),
+            ),
         platformType = PlatformType.Mastodon,
-        onMediaClicked = { media, index ->
-            launcher.launch(
-                DeeplinkRoute.Media
-                    .StatusMedia(
-                        accountType =
-                            accountKey?.let { AccountType.Specific(it) }
-                                ?: AccountType.Guest,
-                        statusKey = statusKey,
-                        index = index,
-                        preview =
-                            when (media) {
-                                is UiMedia.Image -> media.previewUrl
-                                is UiMedia.Video -> media.thumbnailUrl
-                                is UiMedia.Audio -> null
-                                is UiMedia.Gif -> media.previewUrl
-                            },
-                    ).toUri(),
-            )
-        },
-        bottomContent = bottomContent,
-        url = postUrl,
+        emojiReactions = reactions,
     )
 }
 
@@ -883,7 +879,7 @@ internal fun Account.render(
                                 )
                             } ?: AccountType.Guest,
                         userKey = userKey,
-                    ).toUri(),
+                    ),
             ),
     )
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Rss.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Rss.kt
index d8548b819..414dcdb4c 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Rss.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Rss.kt
@@ -1,10 +1,10 @@
 package dev.dimension.flare.ui.model.mapper
 
 import com.fleeksoft.ksoup.Ksoup
-import dev.dimension.flare.data.database.cache.model.StatusContent
 import dev.dimension.flare.data.network.rss.model.Feed
 import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiMedia
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.render.toUi
 import io.ktor.http.Url
 import kotlinx.collections.immutable.persistentMapOf
@@ -15,12 +15,12 @@ import kotlinx.datetime.toInstant
 import kotlin.io.encoding.Base64
 import kotlin.time.Instant
 
-internal fun StatusContent.Rss.RssContent.render(): UiTimeline =
-    when (this) {
-        is StatusContent.Rss.RssContent.Atom -> this.render()
-        is StatusContent.Rss.RssContent.Rss20 -> this.render()
-        is StatusContent.Rss.RssContent.RDF -> this.render()
-    }
+// internal fun StatusContent.Rss.RssContent.render(): UiTimelineV2 =
+//    when (this) {
+//        is StatusContent.Rss.RssContent.Atom -> this.render()
+//        is StatusContent.Rss.RssContent.Rss20 -> this.render()
+//        is StatusContent.Rss.RssContent.RDF -> this.render()
+//    }
 
 internal val Feed.title: String
     get() =
@@ -38,97 +38,118 @@ internal val Feed.link: String?
             is Feed.RDF -> this.channel.link
         }
 
-internal fun StatusContent.Rss.RssContent.Atom.render(): UiTimeline =
-    with(data) {
-        val descHtml =
-            content?.value?.let {
-                Ksoup.parse(it)
-            } ?: summary?.value?.let {
-                Ksoup.parse(it)
-            }
-        val img = descHtml?.select("img")?.firstOrNull()?.attr("src") ?: media?.thumbnail?.url
-        return UiTimeline(
-            topMessage = null,
-            content =
-                UiTimeline.ItemContent.Feed(
-                    title = title?.value?.takeIf { it.isNotEmpty() && it.isNotBlank() },
-                    description = descHtml?.text(),
-                    url = links.first().href.replace("http://", "https://"),
-                    image = img,
-                    source = this@render.source,
-                    sourceIcon = this@render.icon,
-                    openInBrowser = this@render.openInBrowser,
-                    createdAt =
-                        (published ?: updated)
-                            ?.let { input -> parseRssDateToInstant(input) }
-                            ?.toUi(),
-                    imageHeaders =
+internal fun Feed.Atom.Entry.render(
+    sourceName: String,
+    sourceIcon: String?,
+    openInBrowser: Boolean,
+): UiTimelineV2 {
+    val descHtml =
+        content?.value?.let {
+            Ksoup.parse(it)
+        } ?: summary?.value?.let {
+            Ksoup.parse(it)
+        }
+    val img = descHtml?.select("img")?.firstOrNull()?.attr("src") ?: media?.thumbnail?.url
+    return UiTimelineV2.Feed(
+        title = title?.value?.takeIf { it.isNotEmpty() && it.isNotBlank() },
+        description = descHtml?.text(),
+        url = links.first().href.replace("http://", "https://"),
+        source =
+            UiTimelineV2.Feed.Source(
+                name = sourceName,
+                icon = sourceIcon,
+            ),
+        media =
+            img?.let {
+                UiMedia.Image(
+                    url = it,
+                    customHeaders =
                         persistentMapOf(
                             "Referer" to "https://${Url(links.first().href).host}/",
                         ),
-                ),
-        )
-    }
+                )
+            },
+        openInBrowser = openInBrowser,
+        createdAt =
+            (published ?: updated)
+                ?.let { input -> parseRssDateToInstant(input) }
+                ?.toUi() ?: Instant.fromEpochMilliseconds(0L).toUi(),
+    )
+}
 
-internal fun StatusContent.Rss.RssContent.Rss20.render(): UiTimeline =
-    with(data) {
-        val descHtml =
-            description?.let {
-                Ksoup.parse(it)
-            }
-        val img = descHtml?.select("img")?.firstOrNull()
-        return UiTimeline(
-            topMessage = null,
-            content =
-                UiTimeline.ItemContent.Feed(
-                    title = title,
-                    description = descHtml?.text(),
-                    url = link.replace("http://", "https://"),
-                    image = img?.attr("src"),
-                    source = this@render.source,
-                    sourceIcon = this@render.icon,
-                    openInBrowser = this@render.openInBrowser,
-                    createdAt =
-                        pubDate
-                            ?.let { input -> parseRssDateToInstant(input) }
-                            ?.toUi(),
-                    imageHeaders =
+internal fun Feed.Rss20.Item.render(
+    sourceName: String,
+    sourceIcon: String?,
+    openInBrowser: Boolean,
+): UiTimelineV2 {
+    val descHtml =
+        description?.let {
+            Ksoup.parse(it)
+        }
+    val img = descHtml?.select("img")?.firstOrNull()?.attr("src")
+    return UiTimelineV2.Feed(
+        title = title,
+        description = descHtml?.text(),
+        url = link.replace("http://", "https://"),
+        source =
+            UiTimelineV2.Feed.Source(
+                name = sourceName,
+                icon = sourceIcon,
+            ),
+        media =
+            img?.let {
+                UiMedia.Image(
+                    url = it,
+                    customHeaders =
                         persistentMapOf(
                             "Referer" to "https://${Url(link).host}/",
                         ),
-                ),
-        )
-    }
+                )
+            },
+        openInBrowser = openInBrowser,
+        createdAt =
+            pubDate
+                ?.let { input -> parseRssDateToInstant(input) }
+                ?.toUi() ?: Instant.fromEpochMilliseconds(0L).toUi(),
+    )
+}
 
-internal fun StatusContent.Rss.RssContent.RDF.render(): UiTimeline =
-    with(data) {
-        val descHtml =
-            description?.let {
-                Ksoup.parse(it)
-            }
-        val img = descHtml?.select("img")?.firstOrNull()
-        return UiTimeline(
-            topMessage = null,
-            content =
-                UiTimeline.ItemContent.Feed(
-                    title = title,
-                    description = descHtml?.text(),
-                    url = link.replace("http://", "https://"),
-                    image = img?.attr("src"),
-                    source = source,
-                    sourceIcon = this@render.icon,
-                    openInBrowser = this@render.openInBrowser,
-                    createdAt =
-                        date
-                            ?.let { input -> parseRssDateToInstant(input) }
-                            ?.toUi(),
-                    imageHeaders =
+internal fun Feed.RDF.Item.render(
+    sourceName: String,
+    sourceIcon: String?,
+    openInBrowser: Boolean,
+): UiTimelineV2 {
+    val descHtml =
+        description?.let {
+            Ksoup.parse(it)
+        }
+    val img = descHtml?.select("img")?.firstOrNull()?.attr("src")
+    return UiTimelineV2.Feed(
+        title = title,
+        description = descHtml?.text(),
+        url = link.replace("http://", "https://"),
+        source =
+            UiTimelineV2.Feed.Source(
+                name = sourceName,
+                icon = sourceIcon,
+            ),
+        media =
+            img?.let {
+                UiMedia.Image(
+                    url = it,
+                    customHeaders =
                         persistentMapOf(
                             "Referer" to "https://${Url(link).host}/",
                         ),
-                ),
-        )
-    }
+                )
+            },
+        openInBrowser = openInBrowser,
+        createdAt =
+            date
+                ?.let { input -> parseRssDateToInstant(input) }
+                ?.toUi() ?: Instant.fromEpochMilliseconds(0L).toUi(),
+    )
+}
 
 internal fun MicroBlogKey.Companion.fromRss(url: String) =
     MicroBlogKey(
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/DiscoverStatusTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/DiscoverStatusTimelinePresenter.kt
index 9c8e33812..b91790dcb 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/DiscoverStatusTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/DiscoverStatusTimelinePresenter.kt
@@ -1,8 +1,11 @@
 package dev.dimension.flare.ui.presenter.home
 
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 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.model.UiTimelineV2
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
@@ -12,7 +15,7 @@ public class DiscoverStatusTimelinePresenter(
 ) : TimelinePresenter(),
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
-    override val loader by lazy {
+    override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
         accountServiceFlow(
             accountType = accountType,
             repository = accountRepository,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/HomeTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/HomeTimelinePresenter.kt
index 93cf941e9..d6faa7285 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/HomeTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/HomeTimelinePresenter.kt
@@ -1,9 +1,10 @@
 package dev.dimension.flare.ui.presenter.home
 
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 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.model.UiTimelineV2
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import org.koin.core.component.KoinComponent
@@ -15,7 +16,7 @@ public class HomeTimelinePresenter(
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
 
-    override val loader: Flow<BaseTimelineLoader> by lazy {
+    override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
         accountServiceFlow(
             accountType = accountType,
             repository = accountRepository,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/MixedTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/MixedTimelinePresenter.kt
index 4ca072041..35e21344f 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/MixedTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/MixedTimelinePresenter.kt
@@ -2,8 +2,9 @@ package dev.dimension.flare.ui.presenter.home
 
 import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.datasource.microblog.MixedRemoteMediator
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
+import dev.dimension.flare.ui.model.UiTimelineV2
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import org.koin.core.component.KoinComponent
@@ -15,12 +16,12 @@ public class MixedTimelinePresenter(
     KoinComponent {
     private val database: CacheDatabase by inject()
     override val useDbKeyInItemKey: Boolean = true
-    override val loader: Flow<BaseTimelineLoader>
+    override val loader: Flow<RemoteLoader<UiTimelineV2>>
         get() =
             combine(subTimelinePresenter.map { it.loader }) {
                 MixedRemoteMediator(
                     database = database,
-                    mediators = it.filterIsInstance<BaseTimelineRemoteMediator>(),
+                    mediators = it.filterIsInstance<CacheableRemoteLoader<UiTimelineV2>>(),
                 )
             }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/SearchStatusTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/SearchStatusTimelinePresenter.kt
index 692d4d8a7..7c3877be1 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/SearchStatusTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/SearchStatusTimelinePresenter.kt
@@ -1,9 +1,11 @@
 package dev.dimension.flare.ui.presenter.home
 
 import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 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.model.UiTimelineV2
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -28,7 +30,7 @@ public class SearchStatusTimelinePresenter(
     private val accountRepository: AccountRepository by inject()
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    override val loader: Flow<BaseTimelineLoader> by lazy {
+    override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
         accountServiceFlow(
             accountType = accountType,
             repository = accountRepository,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt
index 6e5c1dca8..90ac6e162 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt
@@ -17,26 +17,24 @@ import dev.dimension.flare.common.onEmpty
 import dev.dimension.flare.common.onError
 import dev.dimension.flare.common.onSuccess
 import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.datasource.microblog.contains
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelinePagingSourceFactory
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
+import dev.dimension.flare.data.database.cache.model.DbStatusWithUser
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
+import dev.dimension.flare.data.datasource.microblog.paging.TimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.toPagingSource
 import dev.dimension.flare.data.datasource.microblog.pagingConfig
-import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.LocalFilterRepository
-import dev.dimension.flare.model.AccountType
-import dev.dimension.flare.ui.model.UiTimeline
-import dev.dimension.flare.ui.model.mapper.render
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.PresenterBase
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.IO
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.withContext
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
@@ -46,90 +44,135 @@ public abstract class TimelinePresenter :
     KoinComponent {
     private val database: CacheDatabase by inject()
 
-    private val accountRepository: AccountRepository by inject()
-
     private val localFilterRepository: LocalFilterRepository by inject()
 
     private val filterFlow by lazy {
         localFilterRepository.getFlow(forTimeline = true)
     }
 
-//    internal val pagerFlow: Flow<PagingData<UiTimeline>> by lazy {
-//        createPager()
-//    }
-
     @OptIn(ExperimentalCoroutinesApi::class)
-    internal fun createPager(scope: CoroutineScope): Flow<PagingData<UiTimeline>> =
+    internal fun createPager(scope: CoroutineScope): Flow<PagingData<UiTimelineV2>> =
         loader
-            .catch {
-                emit(BaseTimelineLoader.NotSupported)
-            }.flatMapLatest {
-                when (it) {
-                    is BaseTimelinePagingSourceFactory<*> ->
-                        networkPager(
-                            pagingSource = it,
-                        ).cachedIn(scope)
-
-                    is BaseTimelineRemoteMediator ->
-                        cachePager(
-                            mediator = it,
-                            scope = scope,
-                        )
-
-                    BaseTimelineLoader.NotSupported -> PagingData.emptyFlow(isError = true)
+            .flatMapLatest {
+                if (it is CacheableRemoteLoader<UiTimelineV2>) {
+                    cachePager(
+                        loader = it,
+                    ).cachedIn(scope)
+                } else {
+                    networkPager(
+                        loader = it,
+                    ).cachedIn(scope)
                 }.flatMapLatest { pager ->
                     filterFlow.map { filterList ->
-                        pager.filter {
-                            !it.contains(filterList)
+                        pager.filter { item ->
+                            filterList.any { filter ->
+                                item.searchText.orEmpty().contains(filter, ignoreCase = true)
+                            }
                         }
                     }
                 }
+            }.catch {
+                emitAll(PagingData.emptyFlow(isError = true))
             }
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    private fun cachePager(
-        mediator: BaseTimelineRemoteMediator,
-        scope: CoroutineScope,
-    ): Flow<PagingData<UiTimeline>> =
+    private fun cachePager(loader: CacheableRemoteLoader<UiTimelineV2>): Flow<PagingData<UiTimelineV2>> =
         Pager(
             config = pagingConfig,
-            remoteMediator = mediator,
+            remoteMediator =
+                TimelineRemoteMediator(
+                    loader = loader,
+                    database = database,
+                ),
             pagingSourceFactory = {
                 database.pagingTimelineDao().getPagingSource(
-                    pagingKey = mediator.pagingKey,
+                    pagingKey = loader.pagingKey,
                 )
             },
-        ).flow
-            .cachedIn(scope)
-            .flatMapLatest { pagingData ->
-                accountRepository.allAccounts.map { accounts ->
-                    pagingData
-                        .map { data ->
-                            withContext(Dispatchers.IO) {
-                                val dataSource =
-                                    when (data.timeline.accountType) {
-                                        AccountType.Guest -> null
-                                        is AccountType.Specific -> {
-                                            accounts.firstOrNull {
-                                                it.accountKey == data.timeline.accountType.accountKey
-                                            }
-                                        }
-                                    }?.dataSource
-                                data
-                                    .render(dataSource, useDbKeyInItemKey)
-                                    .let { transform(it) }
-                            }
-                        }
-                }
+        ).flow.map { pagingData ->
+            pagingData.map { item ->
+                mapping(item, loader.pagingKey)
             }
+        }
+
+    private fun mapping(
+        item: DbPagingTimelineWithStatus,
+        pagingKey: String,
+    ): UiTimelineV2 {
+        val root = mappingDbStatusWithUser(item.status.status, pagingKey)
+        val references =
+            item.status.references
+                .mapNotNull { it.status }
+                .map { mappingDbStatusWithUser(it, pagingKey) }
+        return when (root) {
+            is UiTimelineV2.Feed -> root
+            is UiTimelineV2.Message -> root
+            is UiTimelineV2.Post ->
+                root.copy(
+                    parents =
+                        root.parents
+                            .map { parent ->
+                                references.find { it.statusKey == parent.statusKey } as? UiTimelineV2.Post ?: parent
+                            }.toImmutableList(),
+                    quote =
+                        root.quote
+                            .map { quote ->
+                                references.find { it.statusKey == quote.statusKey } as? UiTimelineV2.Post ?: quote
+                            }.toImmutableList(),
+                )
+            is UiTimelineV2.User -> root
+            is UiTimelineV2.UserList ->
+                root.copy(
+                    post =
+                        root.post?.let { post ->
+                            references.find { it.statusKey == post.statusKey } as? UiTimelineV2.Post ?: post
+                        },
+                )
+        }
+    }
+
+    private fun mappingDbStatusWithUser(
+        data: DbStatusWithUser,
+        pagingKey: String,
+    ): UiTimelineV2 {
+        val root = data.data.content
+        val users = data.references.mapNotNull { it.user?.content }
+        return when (root) {
+            is UiTimelineV2.Feed -> root
+            is UiTimelineV2.Message ->
+                root.copy(
+                    user = users.find { root.user?.key == it.key },
+                    extraKey = if (useDbKeyInItemKey) pagingKey else null,
+                )
+            is UiTimelineV2.Post ->
+                root.copy(
+                    user = users.find { root.user?.key == it.key },
+                    extraKey = if (useDbKeyInItemKey) pagingKey else null,
+                )
+            is UiTimelineV2.User ->
+                root.copy(
+                    value = users.find { root.value.key == it.key } ?: root.value,
+                    extraKey = if (useDbKeyInItemKey) pagingKey else null,
+                )
+            is UiTimelineV2.UserList ->
+                root.copy(
+                    users =
+                        root.users
+                            .map { user ->
+                                users.find { user.key == it.key } ?: user
+                            }.toImmutableList(),
+                    extraKey = if (useDbKeyInItemKey) pagingKey else null,
+                )
+        }
+    }
 
-    protected open suspend fun transform(data: UiTimeline): UiTimeline = data
+    protected open suspend fun transform(data: UiTimelineV2): UiTimelineV2 = data
 
-    private fun networkPager(pagingSource: BaseTimelinePagingSourceFactory<*>): Flow<PagingData<UiTimeline>> =
+    private fun networkPager(loader: RemoteLoader<UiTimelineV2>): Flow<PagingData<UiTimelineV2>> =
         Pager(
             config = pagingConfig,
             pagingSourceFactory = {
-                pagingSource.create()
+                loader.toPagingSource()
             },
         ).flow
 
@@ -156,13 +199,13 @@ public abstract class TimelinePresenter :
         }
     }
 
-    internal abstract val loader: Flow<BaseTimelineLoader>
+    internal abstract val loader: Flow<RemoteLoader<UiTimelineV2>>
     protected open val useDbKeyInItemKey: Boolean = false
 }
 
 @Immutable
 public interface TimelineState {
-    public val listState: PagingState<UiTimeline>
+    public val listState: PagingState<UiTimelineV2>
 
     public suspend fun refresh()
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/bluesky/BlueskyBookmarkTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/bluesky/BlueskyBookmarkTimelinePresenter.kt
index 0469e671a..048e529a9 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/bluesky/BlueskyBookmarkTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/bluesky/BlueskyBookmarkTimelinePresenter.kt
@@ -1,10 +1,11 @@
 package dev.dimension.flare.ui.presenter.home.bluesky
 
 import dev.dimension.flare.data.datasource.bluesky.BlueskyDataSource
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 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.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -16,7 +17,7 @@ public class BlueskyBookmarkTimelinePresenter(
 ) : TimelinePresenter(),
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
-    override val loader: Flow<BaseTimelineLoader> by lazy {
+    override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
         accountServiceFlow(
             accountType = accountType,
             repository = accountRepository,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/bluesky/BlueskyFeedPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/bluesky/BlueskyFeedPresenter.kt
index 25e2d7bf6..777705b7b 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/bluesky/BlueskyFeedPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/bluesky/BlueskyFeedPresenter.kt
@@ -8,6 +8,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import dev.dimension.flare.common.PagingState
 import dev.dimension.flare.common.refreshSuspend
 import dev.dimension.flare.data.datasource.bluesky.BlueskyDataSource
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceFlow
 import dev.dimension.flare.data.repository.accountServiceProvider
@@ -15,6 +16,7 @@ import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.ui.model.UiList
 import dev.dimension.flare.ui.model.UiState
 import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.collectAsUiState
 import dev.dimension.flare.ui.model.flatMap
 import dev.dimension.flare.ui.model.flattenUiState
@@ -25,6 +27,7 @@ import dev.dimension.flare.ui.model.toUi
 import dev.dimension.flare.ui.presenter.PresenterBase
 import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
@@ -40,7 +43,7 @@ public class BlueskyFeedPresenter(
 
     private val timelinePresenter by lazy {
         object : TimelinePresenter() {
-            override val loader by lazy {
+            override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
                 accountServiceFlow(accountType, accountRepository)
                     .map {
                         require(it is BlueskyDataSource)
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/bluesky/BlueskyFeedTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/bluesky/BlueskyFeedTimelinePresenter.kt
index a9e1f72b0..c96d4f5c7 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/bluesky/BlueskyFeedTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/bluesky/BlueskyFeedTimelinePresenter.kt
@@ -1,10 +1,11 @@
 package dev.dimension.flare.ui.presenter.home.bluesky
 
 import dev.dimension.flare.data.datasource.bluesky.BlueskyDataSource
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 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.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -18,7 +19,7 @@ public class BlueskyFeedTimelinePresenter(
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
 
-    override val loader: Flow<BaseTimelineLoader> by lazy {
+    override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
         accountServiceFlow(
             accountType = accountType,
             repository = accountRepository,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/mastodon/MastodonBookmarkTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/mastodon/MastodonBookmarkTimelinePresenter.kt
index d5240fc34..faea386c5 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/mastodon/MastodonBookmarkTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/mastodon/MastodonBookmarkTimelinePresenter.kt
@@ -1,10 +1,11 @@
 package dev.dimension.flare.ui.presenter.home.mastodon
 
 import dev.dimension.flare.data.datasource.mastodon.MastodonDataSource
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 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.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -17,7 +18,7 @@ public class MastodonBookmarkTimelinePresenter(
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
 
-    override val loader: Flow<BaseTimelineLoader> by lazy {
+    override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
         accountServiceFlow(
             accountType = accountType,
             repository = accountRepository,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/mastodon/MastodonFavouriteTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/mastodon/MastodonFavouriteTimelinePresenter.kt
index 76445ec03..8c1dcdd93 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/mastodon/MastodonFavouriteTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/mastodon/MastodonFavouriteTimelinePresenter.kt
@@ -1,10 +1,11 @@
 package dev.dimension.flare.ui.presenter.home.mastodon
 
 import dev.dimension.flare.data.datasource.mastodon.MastodonDataSource
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 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.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -17,7 +18,7 @@ public class MastodonFavouriteTimelinePresenter(
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
 
-    override val loader: Flow<BaseTimelineLoader> by lazy {
+    override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
         accountServiceFlow(
             accountType = accountType,
             repository = accountRepository,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/mastodon/MastodonLocalTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/mastodon/MastodonLocalTimelinePresenter.kt
index a7d7a52ac..56901d793 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/mastodon/MastodonLocalTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/mastodon/MastodonLocalTimelinePresenter.kt
@@ -1,10 +1,11 @@
 package dev.dimension.flare.ui.presenter.home.mastodon
 
 import dev.dimension.flare.data.datasource.mastodon.MastodonDataSource
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 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.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -17,7 +18,7 @@ public class MastodonLocalTimelinePresenter(
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
 
-    override val loader: Flow<BaseTimelineLoader> by lazy {
+    override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
         accountServiceFlow(
             accountType = accountType,
             repository = accountRepository,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/mastodon/MastodonPublicTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/mastodon/MastodonPublicTimelinePresenter.kt
index 406d35b51..87bcbe56c 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/mastodon/MastodonPublicTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/mastodon/MastodonPublicTimelinePresenter.kt
@@ -1,10 +1,11 @@
 package dev.dimension.flare.ui.presenter.home.mastodon
 
 import dev.dimension.flare.data.datasource.mastodon.MastodonDataSource
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 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.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -17,7 +18,7 @@ public class MastodonPublicTimelinePresenter(
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
 
-    override val loader: Flow<BaseTimelineLoader> by lazy {
+    override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
         accountServiceFlow(
             accountType = accountType,
             repository = accountRepository,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MissKeyLocalTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MissKeyLocalTimelinePresenter.kt
index 6457ab242..d8b6adc6d 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MissKeyLocalTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MissKeyLocalTimelinePresenter.kt
@@ -1,10 +1,11 @@
 package dev.dimension.flare.ui.presenter.home.misskey
 
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.datasource.misskey.MisskeyDataSource
 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.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -17,7 +18,7 @@ public class MissKeyLocalTimelinePresenter(
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
 
-    override val loader: Flow<BaseTimelineLoader> by lazy {
+    override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
         accountServiceFlow(
             accountType = accountType,
             repository = accountRepository,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MissKeyPublicTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MissKeyPublicTimelinePresenter.kt
index 27e1538c4..9abeb3711 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MissKeyPublicTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MissKeyPublicTimelinePresenter.kt
@@ -1,10 +1,11 @@
 package dev.dimension.flare.ui.presenter.home.misskey
 
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.datasource.misskey.MisskeyDataSource
 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.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -17,7 +18,7 @@ public class MissKeyPublicTimelinePresenter(
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
 
-    override val loader: Flow<BaseTimelineLoader> by lazy {
+    override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
         accountServiceFlow(
             accountType = accountType,
             repository = accountRepository,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MisskeyChannelPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MisskeyChannelPresenter.kt
index 56c3b4a67..7552c3abe 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MisskeyChannelPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MisskeyChannelPresenter.kt
@@ -7,6 +7,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import dev.dimension.flare.common.PagingState
 import dev.dimension.flare.common.refreshSuspend
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.datasource.misskey.MisskeyDataSource
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceFlow
@@ -15,6 +16,7 @@ import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.ui.model.UiList
 import dev.dimension.flare.ui.model.UiState
 import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.collectAsUiState
 import dev.dimension.flare.ui.model.flatMap
 import dev.dimension.flare.ui.model.flattenUiState
@@ -25,6 +27,7 @@ import dev.dimension.flare.ui.model.toUi
 import dev.dimension.flare.ui.presenter.PresenterBase
 import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
@@ -40,7 +43,7 @@ public class MisskeyChannelPresenter(
 
     private val timelinePresenter by lazy {
         object : TimelinePresenter() {
-            override val loader by lazy {
+            override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
                 accountServiceFlow(accountType, accountRepository)
                     .map {
                         require(it is MisskeyDataSource)
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MisskeyChannelTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MisskeyChannelTimelinePresenter.kt
index 07e081242..a57d089e2 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MisskeyChannelTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MisskeyChannelTimelinePresenter.kt
@@ -1,10 +1,11 @@
 package dev.dimension.flare.ui.presenter.home.misskey
 
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.datasource.misskey.MisskeyDataSource
 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.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -18,7 +19,7 @@ public class MisskeyChannelTimelinePresenter(
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
 
-    override val loader: Flow<BaseTimelineLoader> by lazy {
+    override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
         accountServiceFlow(
             accountType = accountType,
             repository = accountRepository,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MisskeyFavouriteTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MisskeyFavouriteTimelinePresenter.kt
index d17697092..ab8ae55fe 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MisskeyFavouriteTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MisskeyFavouriteTimelinePresenter.kt
@@ -1,10 +1,11 @@
 package dev.dimension.flare.ui.presenter.home.misskey
 
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.datasource.misskey.MisskeyDataSource
 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.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -17,7 +18,7 @@ public class MisskeyFavouriteTimelinePresenter(
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
 
-    override val loader: Flow<BaseTimelineLoader> by lazy {
+    override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
         accountServiceFlow(
             accountType = accountType,
             repository = accountRepository,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MisskeyHybridTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MisskeyHybridTimelinePresenter.kt
index 50e0e30c5..d312a6d9e 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MisskeyHybridTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MisskeyHybridTimelinePresenter.kt
@@ -1,10 +1,11 @@
 package dev.dimension.flare.ui.presenter.home.misskey
 
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.datasource.misskey.MisskeyDataSource
 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.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -17,7 +18,7 @@ public class MisskeyHybridTimelinePresenter(
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
 
-    override val loader: Flow<BaseTimelineLoader> by lazy {
+    override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
         accountServiceFlow(
             accountType = accountType,
             repository = accountRepository,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/rss/RssTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/rss/RssTimelinePresenter.kt
index c8998e2e5..c34c6c5d4 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/rss/RssTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/rss/RssTimelinePresenter.kt
@@ -6,10 +6,11 @@ import androidx.compose.runtime.remember
 import dev.dimension.flare.data.database.app.AppDatabase
 import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.datasource.microblog.MixedRemoteMediator
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.datasource.rss.RssDataSource
 import dev.dimension.flare.ui.model.UiRssSource
 import dev.dimension.flare.ui.model.UiState
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.collectAsUiState
 import dev.dimension.flare.ui.model.map
 import dev.dimension.flare.ui.model.mapper.render
@@ -25,7 +26,7 @@ import org.koin.core.component.inject
 public class RssTimelinePresenter(
     private val url: String,
 ) : TimelinePresenter() {
-    override val loader: Flow<BaseTimelineLoader> by lazy {
+    override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
         flowOf(RssDataSource.fetchLoader(url))
     }
 }
@@ -36,7 +37,7 @@ public class AllRssTimelinePresenter :
     private val appDatabase by inject<AppDatabase>()
     private val database: CacheDatabase by inject()
 
-    override val loader: Flow<BaseTimelineLoader> by lazy {
+    override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
         appDatabase
             .rssSourceDao()
             .getAll()
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/vvo/VVOFavouriteTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/vvo/VVOFavouriteTimelinePresenter.kt
index aefa5e8cf..34936b00b 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/vvo/VVOFavouriteTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/vvo/VVOFavouriteTimelinePresenter.kt
@@ -1,10 +1,11 @@
 package dev.dimension.flare.ui.presenter.home.vvo
 
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.datasource.vvo.VVODataSource
 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.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -17,7 +18,7 @@ public class VVOFavouriteTimelinePresenter(
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
 
-    override val loader: Flow<BaseTimelineLoader> by lazy {
+    override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
         accountServiceFlow(
             accountType = accountType,
             repository = accountRepository,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/vvo/VVOLikeTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/vvo/VVOLikeTimelinePresenter.kt
index 29123a8dc..148e87b46 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/vvo/VVOLikeTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/vvo/VVOLikeTimelinePresenter.kt
@@ -1,10 +1,11 @@
 package dev.dimension.flare.ui.presenter.home.vvo
 
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.datasource.vvo.VVODataSource
 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.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -17,7 +18,7 @@ public class VVOLikeTimelinePresenter(
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
 
-    override val loader: Flow<BaseTimelineLoader> by lazy {
+    override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
         accountServiceFlow(
             accountType = accountType,
             repository = accountRepository,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/xqt/XQTBookmarkTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/xqt/XQTBookmarkTimelinePresenter.kt
index ea74eda26..2e3d33b6c 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/xqt/XQTBookmarkTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/xqt/XQTBookmarkTimelinePresenter.kt
@@ -1,10 +1,11 @@
 package dev.dimension.flare.ui.presenter.home.xqt
 
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.datasource.xqt.XQTDataSource
 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.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -17,7 +18,7 @@ public class XQTBookmarkTimelinePresenter(
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
 
-    override val loader: Flow<BaseTimelineLoader> by lazy {
+    override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
         accountServiceFlow(
             accountType = accountType,
             repository = accountRepository,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/xqt/XQTDeviceFollowTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/xqt/XQTDeviceFollowTimelinePresenter.kt
index 3a5554f80..2f9ce38f9 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/xqt/XQTDeviceFollowTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/xqt/XQTDeviceFollowTimelinePresenter.kt
@@ -1,10 +1,11 @@
 package dev.dimension.flare.ui.presenter.home.xqt
 
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.datasource.xqt.XQTDataSource
 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.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -17,7 +18,7 @@ public class XQTDeviceFollowTimelinePresenter(
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
 
-    override val loader: Flow<BaseTimelineLoader> by lazy {
+    override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
         accountServiceFlow(
             accountType = accountType,
             repository = accountRepository,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/xqt/XQTFeaturedTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/xqt/XQTFeaturedTimelinePresenter.kt
index 710a3ec02..b158d759c 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/xqt/XQTFeaturedTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/xqt/XQTFeaturedTimelinePresenter.kt
@@ -1,10 +1,11 @@
 package dev.dimension.flare.ui.presenter.home.xqt
 
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.datasource.xqt.XQTDataSource
 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.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -17,7 +18,7 @@ public class XQTFeaturedTimelinePresenter(
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
 
-    override val loader: Flow<BaseTimelineLoader> by lazy {
+    override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
         accountServiceFlow(
             accountType = accountType,
             repository = accountRepository,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/AntennasTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/AntennasTimelinePresenter.kt
index 5962c897c..71530f917 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/AntennasTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/AntennasTimelinePresenter.kt
@@ -1,10 +1,11 @@
 package dev.dimension.flare.ui.presenter.list
 
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.datasource.misskey.MisskeyDataSource
 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.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -18,7 +19,7 @@ public class AntennasTimelinePresenter(
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
 
-    override val loader: Flow<BaseTimelineLoader> by lazy {
+    override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
         accountServiceFlow(
             accountType = accountType,
             repository = accountRepository,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ChannelTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ChannelTimelinePresenter.kt
index 687ccbec6..adaf6cc3e 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ChannelTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ChannelTimelinePresenter.kt
@@ -1,10 +1,11 @@
 package dev.dimension.flare.ui.presenter.list
 
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.datasource.misskey.MisskeyDataSource
 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.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -18,7 +19,7 @@ public class ChannelTimelinePresenter(
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
 
-    override val loader: Flow<BaseTimelineLoader> by lazy {
+    override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
         accountServiceFlow(
             accountType = accountType,
             repository = accountRepository,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ListTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ListTimelinePresenter.kt
index 57b128992..7292f6768 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ListTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ListTimelinePresenter.kt
@@ -1,10 +1,11 @@
 package dev.dimension.flare.ui.presenter.list
 
 import dev.dimension.flare.data.datasource.microblog.list.ListDataSource
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 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.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -21,7 +22,7 @@ public class ListTimelinePresenter(
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
 
-    override val loader: Flow<BaseTimelineLoader> by lazy {
+    override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
         accountServiceFlow(
             accountType = accountType,
             repository = accountRepository,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfileMediaPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfileMediaPresenter.kt
index ee5720f40..77facc1c1 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfileMediaPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfileMediaPresenter.kt
@@ -10,7 +10,7 @@ import androidx.paging.flatMap
 import dev.dimension.flare.common.PagingState
 import dev.dimension.flare.common.toPagingState
 import dev.dimension.flare.data.datasource.microblog.AuthenticatedMicroblogDataSource
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.NoActiveAccountException
 import dev.dimension.flare.data.repository.accountServiceFlow
@@ -18,6 +18,7 @@ import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiMedia
 import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.PresenterBase
 import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import kotlinx.coroutines.CoroutineScope
@@ -55,7 +56,7 @@ private class MediaTimelinePresenter(
 ) : TimelinePresenter(),
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
-    override val loader: Flow<BaseTimelineLoader>
+    override val loader: Flow<RemoteLoader<UiTimelineV2>>
         get() =
             accountServiceFlow(accountType, accountRepository).map { service ->
                 val actualUserKey =
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt
index bf1ecf650..93e36a097 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt
@@ -12,7 +12,7 @@ import dev.dimension.flare.data.datasource.microblog.DirectMessageDataSource
 import dev.dimension.flare.data.datasource.microblog.ProfileAction
 import dev.dimension.flare.data.datasource.microblog.ProfileTab
 import dev.dimension.flare.data.datasource.microblog.list.ListDataSource
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.NoActiveAccountException
 import dev.dimension.flare.data.repository.accountServiceFlow
@@ -22,6 +22,7 @@ import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.UiRelation
 import dev.dimension.flare.ui.model.UiState
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.collectAsUiState
 import dev.dimension.flare.ui.model.flatMap
 import dev.dimension.flare.ui.model.flattenUiState
@@ -154,7 +155,7 @@ public class ProfilePresenter(
                                 type = it.type,
                                 presenter =
                                     object : TimelinePresenter() {
-                                        override val loader: Flow<BaseTimelineLoader>
+                                        override val loader: Flow<RemoteLoader<UiTimelineV2>>
                                             get() = flowOf(it.loader)
                                     },
                             )
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
index 06da54523..fc4caaf76 100644
--- 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
@@ -4,13 +4,14 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceFlow
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiState
 import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.collectAsUiState
 import dev.dimension.flare.ui.model.onSuccess
 import dev.dimension.flare.ui.model.takeSuccess
@@ -58,7 +59,7 @@ public class StatusContextPresenter(
 
     private val timelinePresenter by lazy {
         object : TimelinePresenter() {
-            override val loader: Flow<BaseTimelineLoader> by lazy {
+            override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
                 currentStatusFlow
                     .map {
                         it.statusKey

From dfa4d46fa7f3a4f3dacea6b363e624b588e10a07 Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Fri, 27 Feb 2026 18:11:59 +0900
Subject: [PATCH 04/33] add more loader/handler

---
 .../database/adapter/AccountTypeConverter.kt  |   7 +
 .../data/database/cache/CacaheDatabase.kt     |   1 +
 .../data/database/cache/dao/StatusDao.kt      |   4 +-
 .../flare/data/database/cache/dao/UserDao.kt  |  23 +-
 .../data/database/cache/model/DbStatus.kt     |   7 +-
 .../flare/data/database/cache/model/DbUser.kt |  16 +-
 .../data/database/cache/model/EmojiContent.kt |  35 +-
 .../datasource/bluesky/BlueskyDataSource.kt   |  14 +-
 .../datasource/bluesky/BlueskyFeedLoader.kt   |   2 +-
 .../datasource/bluesky/BlueskyListLoader.kt   |   2 +-
 .../bluesky/BlueskyListMemberLoader.kt        |   2 +-
 .../datasource/mastodon/MastodonDataSource.kt | 926 +++++-------------
 .../datasource/mastodon/MastodonListLoader.kt |   2 +-
 .../mastodon/MastodonListMemberLoader.kt      |   2 +-
 .../datasource/mastodon/MastodonLoader.kt     | 124 +++
 .../mastodon/StatusDetailRemoteMediator.kt    |   7 +-
 .../data/datasource/microblog/ActionMenu.kt   |   1 +
 .../AuthenticatedMicroblogDataSource.kt       |  48 -
 .../datasource/microblog/ComposeProgress.kt   |   9 +
 .../data/datasource/microblog/ComposeType.kt  |   7 +
 .../datasource/microblog/DatabaseUpdater.kt   |  13 +
 .../microblog/MicroblogDataSource.kt          |  11 -
 .../microblog/NotificationFilter.kt           |   8 +
 .../flare/data/datasource/microblog/Paging.kt |  29 +-
 .../data/datasource/microblog/PostEvent.kt    | 207 +---
 .../{list => datasource}/ListDataSource.kt    |   4 +-
 .../datasource/NotificationDataSource.kt      |   7 +
 .../microblog/datasource/PostDataSource.kt    |   9 +
 .../datasource/RelationDataSource.kt          |   7 +
 .../microblog/datasource/UserDataSource.kt    |   7 +
 .../microblog/handler/EmojiHandler.kt         |  45 +
 .../{list => handler}/ListHandler.kt          |   5 +-
 .../{list => handler}/ListMemberHandler.kt    |   3 +-
 .../microblog/handler/NotificationHandler.kt  |  27 +
 .../microblog/handler/PostEventHandler.kt     |  96 ++
 .../microblog/handler/PostHandler.kt          |  75 ++
 .../microblog/handler/RelationHandler.kt      | 234 +++++
 .../microblog/handler/UserHandler.kt          |  70 ++
 .../microblog/loader/EmojiLoader.kt           |   9 +
 .../microblog/{list => loader}/ListLoader.kt  |   4 +-
 .../{list => loader}/ListMemberLoader.kt      |   2 +-
 .../microblog/loader/NotificationLoader.kt    |   5 +
 .../datasource/microblog/loader/PostLoader.kt |  10 +
 .../microblog/loader/RelationLoader.kt        |  22 +
 .../datasource/microblog/loader/UserLoader.kt |  12 +
 .../paging/TimelineRemoteMediator.kt          | 195 ++--
 .../misskey/MisskeyChannelLoader.kt           |   2 +-
 .../datasource/misskey/MisskeyDataSource.kt   |  14 +-
 .../datasource/misskey/MisskeyListLoader.kt   |   2 +-
 .../misskey/MisskeyListMemberLoader.kt        |   2 +-
 .../data/datasource/xqt/XQTDataSource.kt      |  10 +-
 .../data/datasource/xqt/XQTListLoader.kt      |   2 +-
 .../datasource/xqt/XQTListMemberLoader.kt     |   2 +-
 .../dev/dimension/flare/model/AccountType.kt  |   8 +
 .../dev/dimension/flare/ui/model/UiEmoji.kt   |   4 +-
 .../dev/dimension/flare/ui/model/UiPoll.kt    |  18 +-
 .../dimension/flare/ui/model/UiRelation.kt    |   2 +
 .../dimension/flare/ui/model/UiTimelineV2.kt  |   7 +
 .../flare/ui/model/mapper/Mastodon.kt         | 274 +++---
 .../ui/presenter/home/DeepLinkPresenter.kt    |   2 +-
 .../flare/ui/presenter/home/UserPresenter.kt  |   5 +-
 .../ui/presenter/list/AllListPresenter.kt     |   2 +-
 .../ui/presenter/list/CreateListPresenter.kt  |   2 +-
 .../ui/presenter/list/DeleteListPresenter.kt  |   2 +-
 .../list/EditAccountListPresenter.kt          |   2 +-
 .../presenter/list/EditListMemberPresenter.kt |   2 +-
 .../ui/presenter/list/ListEditPresenter.kt    |   2 +-
 .../ui/presenter/list/ListInfoPresenter.kt    |   2 +-
 .../ui/presenter/list/ListMembersPresenter.kt |   2 +-
 .../presenter/list/ListTimelinePresenter.kt   |   2 +-
 .../list/PinnableTimelineTabPresenter.kt      |   2 +-
 .../presenter/profile/BlockUserPresenter.kt   |   4 +-
 .../ui/presenter/profile/MuteUserPresenter.kt |   4 +-
 .../ui/presenter/profile/ProfilePresenter.kt  |   2 +-
 .../microblog/list/ListHandlerTest.kt         |   2 +
 .../microblog/list/ListMemberHandlerTest.kt   |   2 +
 76 files changed, 1490 insertions(+), 1253 deletions(-)
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonLoader.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ComposeProgress.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ComposeType.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/DatabaseUpdater.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/NotificationFilter.kt
 rename shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/{list => datasource}/ListDataSource.kt (58%)
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/datasource/NotificationDataSource.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/datasource/PostDataSource.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/datasource/RelationDataSource.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/datasource/UserDataSource.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/EmojiHandler.kt
 rename shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/{list => handler}/ListHandler.kt (96%)
 rename shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/{list => handler}/ListMemberHandler.kt (97%)
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/NotificationHandler.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostEventHandler.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandler.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/RelationHandler.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandler.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/EmojiLoader.kt
 rename shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/{list => loader}/ListLoader.kt (76%)
 rename shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/{list => loader}/ListMemberLoader.kt (92%)
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/NotificationLoader.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/PostLoader.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/RelationLoader.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/UserLoader.kt

diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/adapter/AccountTypeConverter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/adapter/AccountTypeConverter.kt
index 3ded9eeb1..b933368f7 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/adapter/AccountTypeConverter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/adapter/AccountTypeConverter.kt
@@ -5,6 +5,7 @@ import dev.dimension.flare.common.decodeJson
 import dev.dimension.flare.common.encodeJson
 import dev.dimension.flare.model.DbAccountType
 import dev.dimension.flare.ui.model.UiProfile
+import dev.dimension.flare.ui.model.UiRelation
 import dev.dimension.flare.ui.model.UiTimelineV2
 
 internal class AccountTypeConverter {
@@ -25,4 +26,10 @@ internal class AccountTypeConverter {
 
     @TypeConverter
     fun toUiTimelineV2(value: String): UiTimelineV2 = value.decodeJson()
+
+    @TypeConverter
+    fun fromUiRelation(value: UiRelation): String = value.encodeJson()
+
+    @TypeConverter
+    fun toUiRelation(value: String): UiRelation = value.decodeJson()
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/CacaheDatabase.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/CacaheDatabase.kt
index 4ed78b09f..815ea9e29 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/CacaheDatabase.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/CacaheDatabase.kt
@@ -28,6 +28,7 @@ internal const val CACHE_DATABASE_VERSION = 24
         dev.dimension.flare.data.database.cache.model.DbList::class,
         dev.dimension.flare.data.database.cache.model.DbListPaging::class,
         dev.dimension.flare.data.database.cache.model.DbListMember::class,
+        dev.dimension.flare.data.database.cache.model.DbUserRelation::class,
     ],
     version = CACHE_DATABASE_VERSION,
     exportSchema = false,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/StatusDao.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/StatusDao.kt
index 0c12d5ccf..470c0dbfd 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/StatusDao.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/StatusDao.kt
@@ -5,9 +5,9 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import dev.dimension.flare.data.database.cache.model.DbStatus
-import dev.dimension.flare.data.database.cache.model.StatusContent
 import dev.dimension.flare.model.DbAccountType
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
 import kotlinx.coroutines.flow.Flow
 
 @Dao
@@ -28,7 +28,7 @@ internal interface StatusDao {
     suspend fun update(
         statusKey: MicroBlogKey,
         accountType: DbAccountType,
-        content: StatusContent,
+        content: UiTimelineV2,
     )
 
     @Query("DELETE FROM DbStatus WHERE statusKey = :statusKey AND accountType = :accountType")
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt
index c7514a0fc..e3495359e 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt
@@ -10,10 +10,10 @@ import dev.dimension.flare.data.database.cache.model.DbStatusUserReference
 import dev.dimension.flare.data.database.cache.model.DbUser
 import dev.dimension.flare.data.database.cache.model.DbUserHistory
 import dev.dimension.flare.data.database.cache.model.DbUserHistoryWithUser
+import dev.dimension.flare.data.database.cache.model.DbUserRelation
 import dev.dimension.flare.data.database.cache.model.UserContent
 import dev.dimension.flare.model.DbAccountType
 import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.model.PlatformType
 import kotlinx.coroutines.flow.Flow
 
 @Dao
@@ -39,11 +39,10 @@ internal interface UserDao {
     @Query("SELECT * FROM DbUser WHERE userKey = :userKey")
     fun findByKey(userKey: MicroBlogKey): Flow<DbUser?>
 
-    @Query("SELECT * FROM DbUser WHERE handle = :handle AND host = :host AND platformType = :platformType")
+    @Query("SELECT * FROM DbUser WHERE handle = :handle AND host = :host")
     fun findByHandleAndHost(
         handle: String,
         host: String,
-        platformType: PlatformType,
     ): Flow<DbUser?>
 
     @Query("SELECT COUNT(*) FROM DbUser")
@@ -68,4 +67,22 @@ internal interface UserDao {
 
     @Query("DELETE FROM DbUserHistory WHERE accountType = :accountType")
     suspend fun deleteHistoryByAccountType(accountType: DbAccountType)
+
+    @Query("SELECT * FROM DbUserRelation WHERE accountKey = :accountKey AND userKey = :userKey")
+    fun getUserRelation(
+        accountKey: MicroBlogKey,
+        userKey: MicroBlogKey,
+    ): Flow<DbUserRelation?>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertUserRelation(relation: DbUserRelation)
+
+    @Query("DELETE FROM DbUserRelation WHERE accountKey = :accountKey AND userKey = :userKey")
+    suspend fun deleteUserRelation(
+        accountKey: MicroBlogKey,
+        userKey: MicroBlogKey,
+    )
+
+    @Query("DELETE FROM DbUserRelation")
+    suspend fun clearUserRelations()
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbStatus.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbStatus.kt
index 7e51233bf..5a60756a7 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbStatus.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbStatus.kt
@@ -3,17 +3,18 @@ package dev.dimension.flare.data.database.cache.model
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
+import dev.dimension.flare.model.DbAccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiTimelineV2
 
 @Entity(
-    indices = [Index(value = ["statusKey", "pagingKey"], unique = true)],
+    indices = [Index(value = ["statusKey", "accountType"], unique = true)],
 )
 internal data class DbStatus(
     val statusKey: MicroBlogKey,
-    val pagingKey: String,
+    val accountType: DbAccountType,
     val content: UiTimelineV2,
     val text: String?, // For Searching
     @PrimaryKey
-    val id: String = "${pagingKey}_$statusKey",
+    val id: String = "${accountType}_$statusKey",
 )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbUser.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbUser.kt
index e3e499182..2eb5147d1 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbUser.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbUser.kt
@@ -4,20 +4,30 @@ import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
 import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.model.PlatformType
 import dev.dimension.flare.ui.model.UiProfile
+import dev.dimension.flare.ui.model.UiRelation
 
 @Entity(
     indices = [
-        Index(value = ["handle", "host", "platformType"], unique = true),
+        Index(value = ["handle", "host"], unique = true),
     ],
 )
 internal data class DbUser(
     @PrimaryKey
     val userKey: MicroBlogKey,
-    val platformType: PlatformType,
     val name: String,
     val handle: String,
     val host: String,
     val content: UiProfile,
 )
+
+@Entity(
+    indices = [
+        Index(value = ["accountKey", "userKey"], unique = true),
+    ],
+)
+internal data class DbUserRelation(
+    val accountKey: MicroBlogKey,
+    val userKey: MicroBlogKey,
+    val relation: UiRelation,
+)
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/EmojiContent.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/EmojiContent.kt
index 2a416d6fd..ce8b5bac4 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/EmojiContent.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/EmojiContent.kt
@@ -1,34 +1,11 @@
 package dev.dimension.flare.data.database.cache.model
 
-import dev.dimension.flare.data.network.mastodon.api.model.Emoji
-import dev.dimension.flare.data.network.misskey.api.model.EmojiSimple
-import dev.dimension.flare.data.network.vvo.model.EmojiData
-import kotlinx.serialization.SerialName
+import dev.dimension.flare.common.SerializableImmutableList
+import dev.dimension.flare.common.SerializableImmutableMap
+import dev.dimension.flare.ui.model.UiEmoji
 import kotlinx.serialization.Serializable
 
 @Serializable
-internal sealed interface EmojiContent {
-    @Serializable
-    @SerialName("Mastodon")
-    data class Mastodon internal constructor(
-        internal val data: List<Emoji>,
-    ) : EmojiContent
-
-    @Serializable
-    @SerialName("Misskey")
-    data class Misskey internal constructor(
-        internal val data: List<EmojiSimple>,
-    ) : EmojiContent
-
-    @Serializable
-    @SerialName("VVO")
-    data class VVO internal constructor(
-        internal val data: EmojiData,
-    ) : EmojiContent
-
-    @Serializable
-    @SerialName("FavIcon")
-    data class FavIcon internal constructor(
-        internal val data: String,
-    ) : EmojiContent
-}
+internal data class EmojiContent(
+    val data: SerializableImmutableMap<String, SerializableImmutableList<UiEmoji>>,
+)
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
index ce00d3ab2..e68cf8f85 100644
--- 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
@@ -67,14 +67,14 @@ import dev.dimension.flare.data.datasource.microblog.DirectMessageDataSource
 import dev.dimension.flare.data.datasource.microblog.NotificationFilter
 import dev.dimension.flare.data.datasource.microblog.ProfileAction
 import dev.dimension.flare.data.datasource.microblog.ProfileTab
-import dev.dimension.flare.data.datasource.microblog.RelationDataSource
 import dev.dimension.flare.data.datasource.microblog.StatusEvent
 import dev.dimension.flare.data.datasource.microblog.createSendingDirectMessage
-import dev.dimension.flare.data.datasource.microblog.list.ListDataSource
-import dev.dimension.flare.data.datasource.microblog.list.ListHandler
-import dev.dimension.flare.data.datasource.microblog.list.ListLoader
-import dev.dimension.flare.data.datasource.microblog.list.ListMemberHandler
-import dev.dimension.flare.data.datasource.microblog.list.ListMemberLoader
+import dev.dimension.flare.data.datasource.microblog.datasource.ListDataSource
+import dev.dimension.flare.data.datasource.microblog.handler.ListHandler
+import dev.dimension.flare.data.datasource.microblog.handler.ListMemberHandler
+import dev.dimension.flare.data.datasource.microblog.loader.ListLoader
+import dev.dimension.flare.data.datasource.microblog.loader.ListMemberLoader
+import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
 import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
 import dev.dimension.flare.data.datasource.microblog.pagingConfig
 import dev.dimension.flare.data.datasource.microblog.relationKeyWithUserKey
@@ -136,7 +136,7 @@ internal class BlueskyDataSource(
     StatusEvent.Bluesky,
     ListDataSource,
     DirectMessageDataSource,
-    RelationDataSource {
+    RelationLoader {
     private val database: CacheDatabase by inject()
     private val appDatabase: AppDatabase by inject()
     private val localFilterRepository: LocalFilterRepository by inject()
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyFeedLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyFeedLoader.kt
index 933f46f00..6200706a7 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyFeedLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyFeedLoader.kt
@@ -9,9 +9,9 @@ import app.bsky.feed.GetFeedGeneratorsQueryParams
 import com.atproto.repo.CreateRecordRequest
 import com.atproto.repo.DeleteRecordRequest
 import com.atproto.repo.StrongRef
-import dev.dimension.flare.data.datasource.microblog.list.ListLoader
 import dev.dimension.flare.data.datasource.microblog.list.ListMetaData
 import dev.dimension.flare.data.datasource.microblog.list.ListMetaDataType
+import dev.dimension.flare.data.datasource.microblog.loader.ListLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.bluesky.BlueskyService
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyListLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyListLoader.kt
index 1de8baf62..1066c98b3 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyListLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyListLoader.kt
@@ -8,9 +8,9 @@ import com.atproto.repo.ApplyWritesRequestWriteUnion
 import com.atproto.repo.CreateRecordRequest
 import com.atproto.repo.PutRecordRequest
 import dev.dimension.flare.common.FileItem
-import dev.dimension.flare.data.datasource.microblog.list.ListLoader
 import dev.dimension.flare.data.datasource.microblog.list.ListMetaData
 import dev.dimension.flare.data.datasource.microblog.list.ListMetaDataType
+import dev.dimension.flare.data.datasource.microblog.loader.ListLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.bluesky.BlueskyService
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyListMemberLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyListMemberLoader.kt
index 19a904134..748f763e2 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyListMemberLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyListMemberLoader.kt
@@ -9,7 +9,7 @@ import com.atproto.repo.DeleteRecordRequest
 import com.atproto.repo.ListRecordsQueryParams
 import dev.dimension.flare.data.database.cache.mapper.toDbUser
 import dev.dimension.flare.data.database.cache.model.DbUser
-import dev.dimension.flare.data.datasource.microblog.list.ListMemberLoader
+import dev.dimension.flare.data.datasource.microblog.loader.ListMemberLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.bluesky.BlueskyService
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt
index a0e569ef3..7c197962e 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt
@@ -1,31 +1,33 @@
 package dev.dimension.flare.data.datasource.mastodon
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.common.Cacheable
 import dev.dimension.flare.common.FileType
-import dev.dimension.flare.common.MemCacheable
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.connect
-import dev.dimension.flare.data.database.cache.mapper.toDb
-import dev.dimension.flare.data.database.cache.model.StatusContent
-import dev.dimension.flare.data.database.cache.model.updateStatusUseCase
+import dev.dimension.flare.data.datasource.microblog.ActionMenu
 import dev.dimension.flare.data.datasource.microblog.AuthenticatedMicroblogDataSource
 import dev.dimension.flare.data.datasource.microblog.ComposeConfig
 import dev.dimension.flare.data.datasource.microblog.ComposeData
 import dev.dimension.flare.data.datasource.microblog.ComposeProgress
 import dev.dimension.flare.data.datasource.microblog.ComposeType
+import dev.dimension.flare.data.datasource.microblog.DatabaseUpdater
 import dev.dimension.flare.data.datasource.microblog.NotificationFilter
 import dev.dimension.flare.data.datasource.microblog.PostEvent
-import dev.dimension.flare.data.datasource.microblog.ProfileAction
 import dev.dimension.flare.data.datasource.microblog.ProfileTab
-import dev.dimension.flare.data.datasource.microblog.RelationDataSource
-import dev.dimension.flare.data.datasource.microblog.list.ListDataSource
-import dev.dimension.flare.data.datasource.microblog.list.ListHandler
-import dev.dimension.flare.data.datasource.microblog.list.ListLoader
-import dev.dimension.flare.data.datasource.microblog.list.ListMemberHandler
-import dev.dimension.flare.data.datasource.microblog.list.ListMemberLoader
+import dev.dimension.flare.data.datasource.microblog.datasource.ListDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.NotificationDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.PostDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.RelationDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.UserDataSource
+import dev.dimension.flare.data.datasource.microblog.handler.EmojiHandler
+import dev.dimension.flare.data.datasource.microblog.handler.ListHandler
+import dev.dimension.flare.data.datasource.microblog.handler.ListMemberHandler
+import dev.dimension.flare.data.datasource.microblog.handler.NotificationHandler
+import dev.dimension.flare.data.datasource.microblog.handler.PostEventHandler
+import dev.dimension.flare.data.datasource.microblog.handler.PostHandler
+import dev.dimension.flare.data.datasource.microblog.handler.RelationHandler
+import dev.dimension.flare.data.datasource.microblog.handler.UserHandler
+import dev.dimension.flare.data.datasource.microblog.loader.ListLoader
+import dev.dimension.flare.data.datasource.microblog.loader.ListMemberLoader
 import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
-import dev.dimension.flare.data.datasource.microblog.relationKeyWithUserKey
 import dev.dimension.flare.data.datasource.pleroma.PleromaDataSource
 import dev.dimension.flare.data.network.mastodon.MastodonService
 import dev.dimension.flare.data.network.mastodon.api.model.PostPoll
@@ -39,25 +41,19 @@ import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.shared.image.ImageCompressor
 import dev.dimension.flare.ui.model.UiAccount
-import dev.dimension.flare.ui.model.UiEmoji
 import dev.dimension.flare.ui.model.UiHashtag
+import dev.dimension.flare.ui.model.UiNumber
 import dev.dimension.flare.ui.model.UiProfile
-import dev.dimension.flare.ui.model.UiRelation
 import dev.dimension.flare.ui.model.UiTimeline
 import dev.dimension.flare.ui.model.UiTimelineV2
-import dev.dimension.flare.ui.model.mapper.render
-import dev.dimension.flare.ui.model.mapper.toUi
+import dev.dimension.flare.ui.model.mapper.mastodonBookmark
+import dev.dimension.flare.ui.model.mapper.mastodonLike
+import dev.dimension.flare.ui.model.mapper.mastodonRepost
 import dev.dimension.flare.ui.presenter.compose.ComposeStatus
 import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.collections.immutable.toImmutableList
-import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.collections.immutable.toPersistentList
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.mapNotNull
-import kotlinx.coroutines.launch
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import kotlin.uuid.Uuid
@@ -67,11 +63,13 @@ internal open class MastodonDataSource(
     override val accountKey: MicroBlogKey,
     val instance: String,
 ) : AuthenticatedMicroblogDataSource,
+    NotificationDataSource,
+    UserDataSource,
+    PostDataSource,
     KoinComponent,
     ListDataSource,
-    RelationDataSource {
-    private val database: CacheDatabase by inject()
-    private val coroutineScope: CoroutineScope by inject()
+    RelationDataSource,
+    PostEventHandler.Handler {
     private val accountRepository: AccountRepository by inject()
     private val imageCompressor: ImageCompressor by inject()
     private val service by lazy {
@@ -84,7 +82,73 @@ internal open class MastodonDataSource(
         )
     }
 
-    override fun handleEvent(event: PostEvent) {
+    val loader by lazy {
+        MastodonLoader(
+            accountKey = accountKey,
+            service = service,
+        )
+    }
+
+    val emojiHandler by lazy {
+        EmojiHandler(
+            host = accountKey.host,
+            loader = loader,
+        )
+    }
+
+    override val notificationHandler by lazy {
+        NotificationHandler(
+            accountKey = accountKey,
+            loader = loader,
+        )
+    }
+
+    override val userHandler by lazy {
+        UserHandler(
+            accountKey = accountKey,
+            loader = loader,
+        )
+    }
+
+    override val postHandler by lazy {
+        PostHandler(
+            accountType = AccountType.Specific(accountKey),
+            loader = loader,
+        )
+    }
+
+    override val relationHandler by lazy {
+        RelationHandler(
+            dataSource = loader,
+        )
+    }
+
+    override val postEventHandler by lazy {
+        PostEventHandler(
+            accountKey = accountKey,
+            handler = this,
+        )
+    }
+
+    override suspend fun handle(
+        event: PostEvent,
+        updater: DatabaseUpdater,
+    ) {
+        require(event is PostEvent.Mastodon)
+        when (event) {
+            is PostEvent.Mastodon.AcceptFollowRequest ->
+                acceptFollowRequest(event, updater)
+            is PostEvent.Mastodon.Bookmark ->
+                bookmark(event, updater)
+            is PostEvent.Mastodon.Like ->
+                like(event, updater)
+            is PostEvent.Mastodon.Reblog ->
+                reblog(event, updater)
+            is PostEvent.Mastodon.RejectFollowRequest ->
+                rejectFollowRequest(event, updater)
+            is PostEvent.Mastodon.Vote ->
+                vote(event, updater)
+        }
     }
 
     override fun homeTimeline() =
@@ -126,7 +190,7 @@ internal open class MastodonDataSource(
                     service,
                     accountKey,
                     onClearMarker = {
-                        MemCacheable.update(notificationMarkerKey, 0)
+                        notificationHandler.clear()
                     },
                 )
 
@@ -146,71 +210,6 @@ internal open class MastodonDataSource(
                 NotificationFilter.Mention,
             )
 
-    override suspend fun userByNameAndHost(
-        name: String,
-        host: String,
-    ): UiProfile =
-        service
-            .lookupUserByAcct("$name@$host")
-            ?.render(
-                accountKey = accountKey,
-                host = accountKey.host,
-            ) ?: throw Exception("User not found")
-
-//    override fun userByAcct(acct: String): CacheData<UiProfile> {
-//        val (name, host) = MicroBlogKey.valueOf(acct)
-//        return Cacheable(
-//            fetchSource = {
-//                val user =
-//                    service
-//                        .lookupUserByAcct("$name@$host")
-//                        ?.toDbUser(accountKey.host) ?: throw Exception("User not found")
-//                database.userDao().insert(user)
-//            },
-//            cacheSource = {
-//                database
-//                    .userDao()
-//                    .findByHandleAndHost(name, host, PlatformType.Mastodon)
-//                    .distinctUntilChanged()
-//                    .mapNotNull { it?.render(accountKey) }
-//            },
-//        )
-//    }
-
-    override suspend fun userById(id: String): UiProfile =
-        service
-            .lookupUser(id)
-            .render(
-                accountKey = accountKey,
-                host = accountKey.host,
-            )
-
-//    override fun userById(id: String): CacheData<UiProfile> {
-//        val userKey = MicroBlogKey(id, accountKey.host)
-//        return Cacheable(
-//            fetchSource = {
-//                val user = service.lookupUser(id).toDbUser(accountKey.host)
-//                database.userDao().insert(user)
-//            },
-//            cacheSource = {
-//                database
-//                    .userDao()
-//                    .findByKey(userKey)
-//                    .distinctUntilChanged()
-//                    .mapNotNull { it?.render(accountKey) }
-//            },
-//        )
-//    }
-
-    override suspend fun relation(userKey: MicroBlogKey): UiRelation = service.showFriendships(listOf(userKey.id)).first().toUi()
-
-//    override fun relation(userKey: MicroBlogKey): Flow<UiState<UiRelation>> =
-//        MemCacheable<UiRelation>(
-//            relationKeyWithUserKey(userKey),
-//        ) {
-//            service.showFriendships(listOf(userKey.id)).first().toUi()
-//        }.toUi()
-
     override fun userTimeline(
         userKey: MicroBlogKey,
         mediaOnly: Boolean,
@@ -225,42 +224,10 @@ internal open class MastodonDataSource(
         StatusDetailRemoteMediator(
             statusKey,
             service,
-            database,
             accountKey,
             statusOnly = false,
         )
 
-    override suspend fun status(statusKey: MicroBlogKey): UiTimelineV2 =
-        service
-            .lookupStatus(
-                statusKey.id,
-            ).render(
-                accountKey = accountKey,
-                host = accountKey.host,
-            )
-
-    fun emoji(): Cacheable<ImmutableMap<String, ImmutableList<UiEmoji>>> =
-        Cacheable(
-            fetchSource = {
-                val emojis = service.emojis()
-                database.emojiDao().insert(emojis.toDb(accountKey.host))
-            },
-            cacheSource = {
-                database
-                    .emojiDao()
-                    .get(accountKey.host)
-                    .distinctUntilChanged()
-                    .mapNotNull {
-                        it
-                            ?.toUi()
-                            ?.groupBy { it.category }
-                            ?.map { it.key to it.value.toImmutableList() }
-                            ?.toMap()
-                            ?.toImmutableMap()
-                    }
-            },
-        )
-
     override suspend fun compose(
         data: ComposeData,
         progress: (ComposeProgress) -> Unit,
@@ -349,201 +316,122 @@ internal open class MastodonDataSource(
 //        progress(ComposeProgress(maxProgress, maxProgress))
     }
 
-    override fun like(
-        statusKey: MicroBlogKey,
-        liked: Boolean,
+    suspend fun like(
+        event: PostEvent.Mastodon.Like,
+        updater: DatabaseUpdater,
     ) {
-        coroutineScope.launch {
-            updateStatusUseCase<StatusContent.Mastodon>(
-                statusKey = statusKey,
+        val statusKey = event.postKey
+        val liked = event.liked
+        val newButton =
+            ActionMenu.mastodonLike(
+                favourited = !liked,
+                favouritesCount = 0,
                 accountKey = accountKey,
-                cacheDatabase = database,
-                update = {
-                    it.copy(
-                        data =
-                            it.data.copy(
-                                favourited = !liked,
-                                favouritesCount =
-                                    if (liked) {
-                                        it.data.favouritesCount?.minus(1)
-                                    } else {
-                                        it.data.favouritesCount?.plus(1)
-                                    },
-                            ),
-                    )
-                },
+                statusKey = statusKey,
             )
-
-            tryRun {
-                if (liked) {
-                    service.unfavourite(statusKey.id)
-                } else {
-                    service.favourite(statusKey.id)
-                }
-            }.onFailure {
-                updateStatusUseCase<StatusContent.Mastodon>(
-                    statusKey = statusKey,
-                    accountKey = accountKey,
-                    cacheDatabase = database,
-                    update = {
-                        it.copy(
-                            data =
-                                it.data.copy(
-                                    favourited = liked,
-                                    favouritesCount =
+        updater.updateCache(event.postKey) { item ->
+            require(item is UiTimelineV2.Post)
+            item.copy(
+                actions =
+                    item.actions
+                        .map {
+                            if (it is ActionMenu.Item && it.updateKey == newButton.updateKey) {
+                                newButton.copy(
+                                    count =
                                         if (!liked) {
-                                            it.data.favouritesCount?.minus(1)
+                                            it.count?.value?.plus(1)
                                         } else {
-                                            it.data.favouritesCount?.plus(1)
+                                            it.count?.value?.minus(1)
+                                        }.let {
+                                            UiNumber(it ?: 0)
                                         },
-                                ),
-                        )
-                    },
-                )
-            }.onSuccess { result ->
-                updateStatusUseCase<StatusContent.Mastodon>(
-                    statusKey = statusKey,
-                    accountKey = accountKey,
-                    cacheDatabase = database,
-                    update = {
-                        it.copy(data = result)
-                    },
-                )
-            }
+                                )
+                            } else {
+                                it
+                            }
+                        }.toImmutableList(),
+            )
+        }
+        if (liked) {
+            service.unfavourite(statusKey.id)
+        } else {
+            service.favourite(statusKey.id)
         }
     }
 
-    override fun reblog(
-        statusKey: MicroBlogKey,
-        reblogged: Boolean,
+    suspend fun reblog(
+        event: PostEvent.Mastodon.Reblog,
+        updater: DatabaseUpdater,
     ) {
-        coroutineScope.launch {
-            updateStatusUseCase<StatusContent.Mastodon>(
-                statusKey = statusKey,
+        val statusKey = event.postKey
+        val reblogged = event.reblogged
+        val newButton =
+            ActionMenu.mastodonRepost(
+                reblogged = !reblogged,
+                reblogsCount = 0,
                 accountKey = accountKey,
-                cacheDatabase = database,
-                update = {
-                    it.copy(
-                        data =
-                            it.data.copy(
-                                reblogged = !reblogged,
-                                reblogsCount =
-                                    if (reblogged) {
-                                        it.data.reblogsCount?.minus(1)
-                                    } else {
-                                        it.data.reblogsCount?.plus(1)
-                                    },
-                            ),
-                    )
-                },
+                statusKey = statusKey,
             )
-
-            tryRun {
-                if (reblogged) {
-                    service.unreblog(statusKey.id)
-                } else {
-                    service.reblog(statusKey.id)
-                }
-            }.onFailure {
-                updateStatusUseCase<StatusContent.Mastodon>(
-                    statusKey = statusKey,
-                    accountKey = accountKey,
-                    cacheDatabase = database,
-                    update = {
-                        it.copy(
-                            data =
-                                it.data.copy(
-                                    reblogged = reblogged,
-                                    reblogsCount =
+        updater.updateCache(event.postKey) { item ->
+            require(item is UiTimelineV2.Post)
+            item.copy(
+                actions =
+                    item.actions
+                        .map {
+                            if (it is ActionMenu.Item && it.updateKey == newButton.updateKey) {
+                                newButton.copy(
+                                    count =
                                         if (!reblogged) {
-                                            it.data.reblogsCount?.minus(1)
+                                            it.count?.value?.plus(1)
                                         } else {
-                                            it.data.reblogsCount?.plus(1)
+                                            it.count?.value?.minus(1)
+                                        }.let {
+                                            UiNumber(it ?: 0)
                                         },
-                                ),
-                        )
-                    },
-                )
-            }.onSuccess { result ->
-                updateStatusUseCase<StatusContent.Mastodon>(
-                    statusKey = statusKey,
-                    accountKey = accountKey,
-                    cacheDatabase = database,
-                    update = {
-                        result.reblog?.let { StatusContent.Mastodon(it) } ?: it
-                    },
-                )
-            }
+                                )
+                            } else {
+                                it
+                            }
+                        }.toImmutableList(),
+            )
         }
-    }
-
-    override suspend fun deleteStatus(statusKey: MicroBlogKey) {
-        tryRun {
-            service.delete(statusKey.id)
-            // delete status from cache
-            database.connect {
-                database.statusDao().delete(
-                    statusKey = statusKey,
-                    accountType = AccountType.Specific(accountKey),
-                )
-                database.statusReferenceDao().delete(statusKey)
-                database.pagingTimelineDao().deleteStatus(
-                    accountKey = accountKey,
-                    statusKey = statusKey,
-                )
-            }
+        if (reblogged) {
+            service.unreblog(statusKey.id)
+        } else {
+            service.reblog(statusKey.id)
         }
     }
 
-    override fun bookmark(
-        statusKey: MicroBlogKey,
-        bookmarked: Boolean,
+    suspend fun bookmark(
+        event: PostEvent.Mastodon.Bookmark,
+        updater: DatabaseUpdater,
     ) {
-        coroutineScope.launch {
-            updateStatusUseCase<StatusContent.Mastodon>(
-                statusKey = statusKey,
+        val statusKey = event.postKey
+        val bookmarked = event.bookmarked
+        val newBookmark =
+            ActionMenu.mastodonBookmark(
+                bookmarked = !bookmarked,
                 accountKey = accountKey,
-                cacheDatabase = database,
-                update = {
-                    it.copy(
-                        data =
-                            it.data.copy(
-                                bookmarked = !bookmarked,
-                            ),
-                    )
-                },
+                statusKey = statusKey,
+            )
+        updater.updateCache(event.postKey) { item ->
+            require(item is UiTimelineV2.Post)
+            item.copy(
+                actions =
+                    item.actions
+                        .map {
+                            if (it is ActionMenu.Item && it.updateKey == newBookmark.updateKey) {
+                                newBookmark
+                            } else {
+                                it
+                            }
+                        }.toImmutableList(),
             )
-
-            tryRun {
-                if (bookmarked) {
-                    service.unbookmark(statusKey.id)
-                } else {
-                    service.bookmark(statusKey.id)
-                }
-            }.onFailure {
-                updateStatusUseCase<StatusContent.Mastodon>(
-                    statusKey = statusKey,
-                    accountKey = accountKey,
-                    cacheDatabase = database,
-                    update = {
-                        it.copy(
-                            data =
-                                it.data.copy(
-                                    bookmarked = bookmarked,
-                                ),
-                        )
-                    },
-                )
-            }.onSuccess { result ->
-                updateStatusUseCase<StatusContent.Mastodon>(
-                    statusKey = statusKey,
-                    accountKey = accountKey,
-                    cacheDatabase = database,
-                    update = {
-                        it.copy(data = result)
-                    },
-                )
-            }
+        }
+        if (bookmarked) {
+            service.unbookmark(statusKey.id)
+        } else {
+            service.bookmark(statusKey.id)
         }
     }
 
@@ -561,138 +449,6 @@ internal open class MastodonDataSource(
         }
     }
 
-    suspend fun unfollow(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                following = false,
-            )
-        }
-        tryRun {
-            service.unfollow(userKey.id)
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    following = true,
-                )
-            }
-        }
-    }
-
-    suspend fun follow(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                following = true,
-            )
-        }
-        tryRun {
-            service.follow(userKey.id)
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    following = false,
-                )
-            }
-        }
-    }
-
-    override suspend fun block(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                blocking = true,
-            )
-        }
-        tryRun {
-            service.block(userKey.id)
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    blocking = false,
-                )
-            }
-        }
-    }
-
-    suspend fun unblock(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                blocking = false,
-            )
-        }
-        tryRun {
-            service.unblock(userKey.id)
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    blocking = true,
-                )
-            }
-        }
-    }
-
-    override suspend fun mute(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                muted = true,
-            )
-        }
-        tryRun {
-            service.muteUser(userKey.id)
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    muted = false,
-                )
-            }
-        }
-    }
-
-    suspend fun unmute(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                muted = false,
-            )
-        }
-        tryRun {
-            service.unmuteUser(userKey.id)
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    muted = true,
-                )
-            }
-        }
-    }
-
     override fun discoverUsers(): RemoteLoader<UiProfile> =
         TrendsUserLoader(
             service = service,
@@ -718,21 +474,6 @@ internal open class MastodonDataSource(
             query,
         )
 
-//    override fun searchUser(
-//        query: String,
-//        pageSize: Int,
-//    ): Flow<PagingData<UiProfile>> =
-//        Pager(
-//            config = pagingConfig,
-//        ) {
-//            SearchUserPagingSource(
-//                service = service,
-//                accountKey = accountKey,
-//                query = query,
-//                host = accountKey.host,
-//            )
-//        }.flow
-
     override fun searchUser(query: String): RemoteLoader<UiProfile> =
         SearchUserPagingSource(
             service = service,
@@ -761,56 +502,12 @@ internal open class MastodonDataSource(
                 } else {
                     ComposeConfig.Poll(4)
                 },
-            emoji = ComposeConfig.Emoji(emoji(), mergeTag = "mastodon@${accountKey.host}"),
+            emoji = ComposeConfig.Emoji(emojiHandler.emoji, mergeTag = "mastodon@${accountKey.host}"),
             contentWarning = ComposeConfig.ContentWarning,
             visibility = ComposeConfig.Visibility,
             language = ComposeConfig.Language(1),
         )
 
-    override suspend fun follow(
-        userKey: MicroBlogKey,
-        relation: UiRelation,
-    ) {
-        when {
-            relation.following -> unfollow(userKey)
-            relation.blocking -> unblock(userKey)
-            relation.hasPendingFollowRequestFromYou -> Unit // you can't cancel follow request on mastodon
-            else -> follow(userKey)
-        }
-    }
-
-    override fun profileActions(): List<ProfileAction> =
-        listOf(
-            object : ProfileAction.Mute {
-                override suspend fun invoke(
-                    userKey: MicroBlogKey,
-                    relation: UiRelation,
-                ) {
-                    if (relation.muted) {
-                        unmute(userKey)
-                    } else {
-                        mute(userKey)
-                    }
-                }
-
-                override fun relationState(relation: UiRelation): Boolean = relation.muted
-            },
-            object : ProfileAction.Block {
-                override suspend fun invoke(
-                    userKey: MicroBlogKey,
-                    relation: UiRelation,
-                ) {
-                    if (relation.blocking) {
-                        unblock(userKey)
-                    } else {
-                        block(userKey)
-                    }
-                }
-
-                override fun relationState(relation: UiRelation): Boolean = relation.blocking
-            },
-        )
-
     val listLoader: ListLoader by lazy {
         MastodonListLoader(
             service = service,
@@ -841,147 +538,38 @@ internal open class MastodonDataSource(
         )
     }
 
-    private val notificationMarkerKey: String
-        get() = "notificationBadgeCount_$accountKey"
-
-//    override fun notificationBadgeCount(): CacheData<Int> {
-//        return MemCacheable(
-//            key = notificationMarkerKey,
-//            fetchSource = {
-//                val marker =
-//                    service.notificationMarkers().notifications?.lastReadID ?: return@MemCacheable 0
-//                val timeline = service.notification(min_id = marker)
-//                timeline.size
-//            },
-//        )
-//    }
-
-    override suspend fun notificationBadgeCount(): Int {
-        val marker =
-            service.notificationMarkers().notifications?.lastReadID ?: return 0
-        val timeline = service.notification(min_id = marker)
-        return timeline.size
-    }
-
-    override fun vote(
-        statusKey: MicroBlogKey,
-        id: String,
-        options: List<Int>,
+    suspend fun vote(
+        event: PostEvent.Mastodon.Vote,
+        updater: DatabaseUpdater,
     ) {
-        coroutineScope.launch {
-            updateStatusUseCase<StatusContent.Mastodon>(
-                statusKey = statusKey,
-                accountKey = accountKey,
-                cacheDatabase = database,
-                update = {
-                    it.copy(
-                        data =
-                            it.data.copy(
-                                poll =
-                                    it.data.poll?.copy(
-                                        voted = true,
-                                        ownVotes = options,
-                                        options =
-                                            it.data.poll.options?.mapIndexed { index, option ->
-                                                if (options.contains(index)) {
-                                                    option.copy(
-                                                        votesCount =
-                                                            option.votesCount?.plus(
-                                                                1,
-                                                            ),
-                                                    )
-                                                } else {
-                                                    option
-                                                }
-                                            } ?: emptyList(),
-                                    ),
-                            ),
-                    )
-                },
+        val options = event.options
+        val postKey = event.postKey
+        updater.updateCache(postKey) {
+            require(it is UiTimelineV2.Post)
+            it.copy(
+                poll =
+                    it.poll?.copy(
+                        ownVotes = options,
+                        options =
+                            it.poll.options
+                                .mapIndexed { index, option ->
+                                    if (options.contains(index)) {
+                                        option.copy(
+                                            votesCount =
+                                                option.votesCount.plus(
+                                                    1,
+                                                ),
+                                        )
+                                    } else {
+                                        option
+                                    }
+                                }.toImmutableList(),
+                    ),
             )
-
-            tryRun {
-                service.vote(id = id, data = PostVote(choices = options.map { it.toString() }))
-            }.onFailure {
-                updateStatusUseCase<StatusContent.Mastodon>(
-                    statusKey = statusKey,
-                    accountKey = accountKey,
-                    cacheDatabase = database,
-                    update = {
-                        it.copy(
-                            data =
-                                it.data.copy(
-                                    poll =
-                                        it.data.poll?.copy(
-                                            voted = false,
-                                            ownVotes = null,
-                                            options =
-                                                it.data.poll.options?.mapIndexed { index, option ->
-                                                    if (options.contains(index)) {
-                                                        option.copy(
-                                                            votesCount =
-                                                                option.votesCount?.minus(
-                                                                    1,
-                                                                ),
-                                                        )
-                                                    } else {
-                                                        option
-                                                    }
-                                                } ?: emptyList(),
-                                        ),
-                                ),
-                        )
-                    },
-                )
-            }.onSuccess { result ->
-                updateStatusUseCase<StatusContent.Mastodon>(
-                    statusKey = statusKey,
-                    accountKey = accountKey,
-                    cacheDatabase = database,
-                    update = {
-                        it.copy(
-                            data =
-                                it.data.copy(
-                                    poll = result,
-                                ),
-                        )
-                    },
-                )
-            }
         }
-    }
 
-//    override fun following(
-//        userKey: MicroBlogKey,
-//        scope: CoroutineScope,
-//        pageSize: Int,
-//    ): Flow<PagingData<UiProfile>> =
-//        Pager(
-//            config = pagingConfig,
-//        ) {
-//            MastodonFollowingPagingSource(
-//                service = service,
-//                host = accountKey.host,
-//                userKey = userKey,
-//                accountKey = accountKey,
-//            )
-//        }.flow.cachedIn(scope)
-//
-//    override fun fans(
-//        userKey: MicroBlogKey,
-//        scope: CoroutineScope,
-//        pageSize: Int,
-//    ): Flow<PagingData<UiProfile>> =
-//        Pager(
-//            config = pagingConfig,
-//        ) {
-//            MastodonFansPagingSource(
-//                service = service,
-//                host = accountKey.host,
-//                userKey = userKey,
-//                accountKey = accountKey,
-//            )
-//        }.flow.cachedIn(scope)
+        service.vote(id = event.id, data = PostVote(choices = options.map { it.toString() }))
+    }
 
     override fun fans(userKey: MicroBlogKey): RemoteLoader<UiProfile> =
         MastodonFansPagingSource(
@@ -1024,73 +612,25 @@ internal open class MastodonDataSource(
             ProfileTab.Media,
         ).toPersistentList()
 
-    override fun acceptFollowRequest(
-        userKey: MicroBlogKey,
-        notificationStatusKey: MicroBlogKey,
+    suspend fun acceptFollowRequest(
+        event: PostEvent.Mastodon.AcceptFollowRequest,
+        updater: DatabaseUpdater,
     ) {
-        coroutineScope.launch {
-            tryRun {
-                MemCacheable.updateWith<UiRelation>(
-                    key = relationKeyWithUserKey(userKey),
-                ) {
-                    it.copy(
-                        hasPendingFollowRequestToYou = false,
-                        isFans = true,
-                    )
-                }
-                service.authorizeFollowRequest(
-                    id = userKey.id,
-                )
-            }.onFailure {
-                MemCacheable.updateWith<UiRelation>(
-                    key = relationKeyWithUserKey(userKey),
-                ) {
-                    it.copy(
-                        hasPendingFollowRequestToYou = true,
-                        isFans = false,
-                    )
-                }
-            }.onSuccess {
-                database.pagingTimelineDao().deleteStatus(
-                    accountKey = accountKey,
-                    statusKey = notificationStatusKey,
-                )
-            }
-        }
+        service.authorizeFollowRequest(
+            id = event.userKey.id,
+        )
+        updater.deleteFromCache(event.postKey)
+        relationHandler.approveFollowRequest(event.userKey)
     }
 
-    override fun rejectFollowRequest(
-        userKey: MicroBlogKey,
-        notificationStatusKey: MicroBlogKey,
+    suspend fun rejectFollowRequest(
+        event: PostEvent.Mastodon.RejectFollowRequest,
+        updater: DatabaseUpdater,
     ) {
-        coroutineScope.launch {
-            tryRun {
-                MemCacheable.updateWith<UiRelation>(
-                    key = relationKeyWithUserKey(userKey),
-                ) {
-                    it.copy(
-                        hasPendingFollowRequestToYou = false,
-                        isFans = false,
-                    )
-                }
-                service.rejectFollowRequest(
-                    id = userKey.id,
-                )
-            }.onFailure {
-                MemCacheable.updateWith<UiRelation>(
-                    key = relationKeyWithUserKey(userKey),
-                ) {
-                    it.copy(
-                        hasPendingFollowRequestToYou = true,
-                        isFans = false,
-                    )
-                }
-            }.onSuccess {
-                database.pagingTimelineDao().deleteStatus(
-                    accountKey = accountKey,
-                    statusKey = notificationStatusKey,
-                )
-            }
-        }
+        service.rejectFollowRequest(
+            id = event.userKey.id,
+        )
+        updater.deleteFromCache(event.postKey)
+        relationHandler.rejectFollowRequest(event.userKey)
     }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonListLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonListLoader.kt
index 8b4f180ea..c41cea3c5 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonListLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonListLoader.kt
@@ -1,8 +1,8 @@
 package dev.dimension.flare.data.datasource.mastodon
 
-import dev.dimension.flare.data.datasource.microblog.list.ListLoader
 import dev.dimension.flare.data.datasource.microblog.list.ListMetaData
 import dev.dimension.flare.data.datasource.microblog.list.ListMetaDataType
+import dev.dimension.flare.data.datasource.microblog.loader.ListLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.mastodon.MastodonService
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonListMemberLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonListMemberLoader.kt
index 5dda7a782..228a7eca9 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonListMemberLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonListMemberLoader.kt
@@ -2,7 +2,7 @@ package dev.dimension.flare.data.datasource.mastodon
 
 import dev.dimension.flare.data.database.cache.mapper.toDbUser
 import dev.dimension.flare.data.database.cache.model.DbUser
-import dev.dimension.flare.data.datasource.microblog.list.ListMemberLoader
+import dev.dimension.flare.data.datasource.microblog.loader.ListMemberLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.mastodon.MastodonService
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonLoader.kt
new file mode 100644
index 000000000..adb9dfedf
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonLoader.kt
@@ -0,0 +1,124 @@
+package dev.dimension.flare.data.datasource.mastodon
+
+import dev.dimension.flare.data.datasource.microblog.loader.EmojiLoader
+import dev.dimension.flare.data.datasource.microblog.loader.NotificationLoader
+import dev.dimension.flare.data.datasource.microblog.loader.PostLoader
+import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
+import dev.dimension.flare.data.datasource.microblog.loader.UserLoader
+import dev.dimension.flare.data.network.mastodon.MastodonService
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiEmoji
+import dev.dimension.flare.ui.model.UiProfile
+import dev.dimension.flare.ui.model.UiRelation
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
+import dev.dimension.flare.ui.model.mapper.toUi
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.collections.immutable.toImmutableMap
+
+internal class MastodonLoader(
+    override val accountKey: MicroBlogKey,
+    private val service: MastodonService,
+) : NotificationLoader,
+    UserLoader,
+    PostLoader,
+    RelationLoader,
+    EmojiLoader {
+    override suspend fun userByHandleAndHost(
+        handle: String,
+        host: String,
+    ): UiProfile =
+        service
+            .lookupUserByAcct("$handle@$host")
+            ?.render(
+                accountKey = accountKey,
+                host = accountKey.host,
+            ) ?: throw Exception("User not found")
+
+    override suspend fun userById(id: String): UiProfile =
+        service
+            .lookupUser(id)
+            .render(
+                accountKey = accountKey,
+                host = accountKey.host,
+            )
+
+    override suspend fun relation(userKey: MicroBlogKey): UiRelation = service.showFriendships(listOf(userKey.id)).first().toUi()
+
+    override suspend fun unfollow(userKey: MicroBlogKey) {
+        service.unfollow(userKey.id)
+    }
+
+    override suspend fun follow(userKey: MicroBlogKey) {
+        service.follow(userKey.id)
+    }
+
+    override suspend fun block(userKey: MicroBlogKey) {
+        service.block(userKey.id)
+    }
+
+    override suspend fun unblock(userKey: MicroBlogKey) {
+        service.unblock(userKey.id)
+    }
+
+    override suspend fun mute(userKey: MicroBlogKey) {
+        service.muteUser(userKey.id)
+    }
+
+    override suspend fun unmute(userKey: MicroBlogKey) {
+        service.unmuteUser(userKey.id)
+    }
+
+    override suspend fun status(statusKey: MicroBlogKey): UiTimelineV2 =
+        service
+            .lookupStatus(
+                statusKey.id,
+            ).render(
+                accountKey = accountKey,
+                host = accountKey.host,
+            )
+
+    override suspend fun deleteStatus(statusKey: MicroBlogKey) {
+        service.delete(statusKey.id)
+    }
+
+    override suspend fun notificationBadgeCount(): Int {
+        val marker =
+            service.notificationMarkers().notifications?.lastReadID ?: return 0
+        val timeline = service.notification(min_id = marker)
+        return timeline.size
+    }
+
+    override suspend fun emojis(): ImmutableMap<String, ImmutableList<UiEmoji>> {
+        return service
+            .emojis()
+            .filter { it.visibleInPicker == true }
+            .groupBy { it.category }
+            .mapNotNull {
+                val category = it.key ?: return@mapNotNull null
+                category to it.value
+            }.map { (category, value) ->
+                category to
+                    value
+                        .map {
+                            val shortCode =
+                                it.shortcode
+                                    .orEmpty()
+                                    .let { if (!it.startsWith(':') && !it.endsWith(':')) ":$it:" else it }
+                            UiEmoji(
+                                shortcode = shortCode,
+                                url = it.url.orEmpty(),
+                                category = it.category.orEmpty(),
+                                searchKeywords =
+                                    listOfNotNull(
+                                        it.shortcode,
+                                    ).toImmutableList(),
+                                insertText = " $shortCode ",
+                            )
+                        }.toImmutableList()
+            }.toMap()
+            .toImmutableMap()
+    }
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/StatusDetailRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/StatusDetailRemoteMediator.kt
index 535fb25a5..a8abb9d95 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/StatusDetailRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/StatusDetailRemoteMediator.kt
@@ -13,15 +13,18 @@ import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.mapper.render
 import kotlinx.coroutines.flow.firstOrNull
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 
 @OptIn(ExperimentalPagingApi::class)
 internal class StatusDetailRemoteMediator(
     private val statusKey: MicroBlogKey,
     private val service: MastodonService,
-    private val database: CacheDatabase,
     private val accountKey: MicroBlogKey,
     private val statusOnly: Boolean,
-) : CacheableRemoteLoader<UiTimelineV2> {
+) : CacheableRemoteLoader<UiTimelineV2>,
+    KoinComponent {
+    private val database: CacheDatabase by inject()
     override val pagingKey: String =
         buildString {
             append("status_detail_")
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ActionMenu.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ActionMenu.kt
index e4b6b2aca..30d248ff2 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ActionMenu.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ActionMenu.kt
@@ -36,6 +36,7 @@ public sealed class ActionMenu {
     @Immutable
     @Serializable
     public data class Item internal constructor(
+        internal val updateKey: String = "",
         val icon: UiIcon? = null,
         val text: Text? = null,
         val count: UiNumber? = null,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/AuthenticatedMicroblogDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/AuthenticatedMicroblogDataSource.kt
index c018772e5..6eebbbf10 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/AuthenticatedMicroblogDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/AuthenticatedMicroblogDataSource.kt
@@ -2,7 +2,6 @@ package dev.dimension.flare.data.datasource.microblog
 
 import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.ui.model.UiRelation
 import dev.dimension.flare.ui.model.UiTimelineV2
 
 internal interface AuthenticatedMicroblogDataSource : MicroblogDataSource {
@@ -17,52 +16,5 @@ internal interface AuthenticatedMicroblogDataSource : MicroblogDataSource {
         progress: (ComposeProgress) -> Unit,
     )
 
-    fun deleteStatus(statusKey: MicroBlogKey)
-
     fun composeConfig(type: ComposeType): ComposeConfig
-
-    fun profileActions(): List<ActionMenu>
-
-    suspend fun notificationBadgeCount(): Int
-
-    fun handleEvent(event: PostEvent)
 }
-
-internal interface RelationDataSource {
-    suspend fun relation(userKey: MicroBlogKey): UiRelation
-
-    fun follow(userKey: MicroBlogKey)
-
-    fun unfollow(userKey: MicroBlogKey)
-
-    fun block(userKey: MicroBlogKey)
-
-    fun unblock(userKey: MicroBlogKey)
-
-    fun mute(userKey: MicroBlogKey)
-
-    fun unmute(userKey: MicroBlogKey)
-}
-
-internal enum class ComposeType {
-    New,
-    Quote,
-    Reply,
-}
-
-internal data class ComposeProgress(
-    val progress: Int,
-    val total: Int,
-) {
-    val percent: Double
-        get() = progress.toDouble() / total.toDouble()
-}
-
-public enum class NotificationFilter {
-    All,
-    Mention,
-    Comment,
-    Like,
-}
-
-internal fun AuthenticatedMicroblogDataSource.relationKeyWithUserKey(userKey: MicroBlogKey) = "relation:$accountKey:$userKey"
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ComposeProgress.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ComposeProgress.kt
new file mode 100644
index 000000000..9f0319217
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ComposeProgress.kt
@@ -0,0 +1,9 @@
+package dev.dimension.flare.data.datasource.microblog
+
+internal data class ComposeProgress(
+    val progress: Int,
+    val total: Int,
+) {
+    val percent: Double
+        get() = progress.toDouble() / total.toDouble()
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ComposeType.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ComposeType.kt
new file mode 100644
index 000000000..7cdde3615
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ComposeType.kt
@@ -0,0 +1,7 @@
+package dev.dimension.flare.data.datasource.microblog
+
+internal enum class ComposeType {
+    New,
+    Quote,
+    Reply,
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/DatabaseUpdater.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/DatabaseUpdater.kt
new file mode 100644
index 000000000..028c4b019
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/DatabaseUpdater.kt
@@ -0,0 +1,13 @@
+package dev.dimension.flare.data.datasource.microblog
+
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+
+internal interface DatabaseUpdater {
+    suspend fun updateCache(
+        postKey: MicroBlogKey,
+        update: suspend (UiTimelineV2) -> UiTimelineV2,
+    )
+
+    suspend fun deleteFromCache(postKey: MicroBlogKey)
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/MicroblogDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/MicroblogDataSource.kt
index d0795d43c..01bba94c2 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/MicroblogDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/MicroblogDataSource.kt
@@ -10,15 +10,6 @@ import kotlinx.collections.immutable.ImmutableList
 internal interface MicroblogDataSource {
     fun homeTimeline(): RemoteLoader<UiTimelineV2>
 
-//    suspend fun userByAcct(acct: String): UiProfile
-
-    suspend fun userByNameAndHost(
-        name: String,
-        host: String,
-    ): UiProfile
-
-    suspend fun userById(id: String): UiProfile
-
     fun userTimeline(
         userKey: MicroBlogKey,
         mediaOnly: Boolean = false,
@@ -26,8 +17,6 @@ internal interface MicroblogDataSource {
 
     fun context(statusKey: MicroBlogKey): RemoteLoader<UiTimelineV2>
 
-    suspend fun status(statusKey: MicroBlogKey): UiTimelineV2
-
     fun searchStatus(query: String): RemoteLoader<UiTimelineV2>
 
     fun searchUser(query: String): RemoteLoader<UiProfile>
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/NotificationFilter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/NotificationFilter.kt
new file mode 100644
index 000000000..3aa7f8f52
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/NotificationFilter.kt
@@ -0,0 +1,8 @@
+package dev.dimension.flare.data.datasource.microblog
+
+public enum class NotificationFilter {
+    All,
+    Mention,
+    Comment,
+    Like,
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/Paging.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/Paging.kt
index 272523d87..e7d35487d 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/Paging.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/Paging.kt
@@ -1,7 +1,6 @@
 package dev.dimension.flare.data.datasource.microblog
 
 import androidx.paging.PagingConfig
-import dev.dimension.flare.ui.model.UiTimeline
 
 internal val pagingConfig: PagingConfig =
     PagingConfig(
@@ -52,20 +51,20 @@ internal val pagingConfig: PagingConfig =
 //    }.cachedIn(scope)
 // }
 
-internal fun UiTimeline.contains(keywords: List<String>): Boolean {
-    val text =
-        if (content is UiTimeline.ItemContent.Status) {
-            listOfNotNull(
-                content.content.raw,
-                content.contentWarning?.raw,
-            )
-        } else {
-            emptyList()
-        }
-    return keywords.any { keyword ->
-        text.any { it.contains(keyword, ignoreCase = true) }
-    }
-}
+// internal fun UiTimeline.contains(keywords: List<String>): Boolean {
+//    val text =
+//        if (content is UiTimeline.ItemContent.Status) {
+//            listOfNotNull(
+//                content.content.raw,
+//                content.contentWarning?.raw,
+//            )
+//        } else {
+//            emptyList()
+//        }
+//    return keywords.any { keyword ->
+//        text.any { it.contains(keyword, ignoreCase = true) }
+//    }
+// }
 
 // internal class MemoryPagingSource<T : Any>(
 //    private val key: String,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt
index 4576bb229..7be4d2b1a 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt
@@ -1,191 +1,63 @@
 package dev.dimension.flare.data.datasource.microblog
 
+import dev.dimension.flare.common.SerializableImmutableList
 import dev.dimension.flare.model.MicroBlogKey
-import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.serialization.Serializable
 
-// internal sealed interface StatusEvent {
-//    val accountKey: MicroBlogKey
-//
-//    interface Mastodon : StatusEvent {
-//        fun reblog(
-//            statusKey: MicroBlogKey,
-//            reblogged: Boolean,
-//        )
-//
-//        fun like(
-//            statusKey: MicroBlogKey,
-//            liked: Boolean,
-//        )
-//
-//        fun bookmark(
-//            statusKey: MicroBlogKey,
-//            bookmarked: Boolean,
-//        )
-//
-//        fun vote(
-//            statusKey: MicroBlogKey,
-//            id: String,
-//            options: List<Int>,
-//        )
-//
-//        fun acceptFollowRequest(
-//            userKey: MicroBlogKey,
-//            notificationStatusKey: MicroBlogKey,
-//        )
-//
-//        fun rejectFollowRequest(
-//            userKey: MicroBlogKey,
-//            notificationStatusKey: MicroBlogKey,
-//        )
-//    }
-//
-//    interface Pleroma : Mastodon {
-//        fun react(
-//            statusKey: MicroBlogKey,
-//            hasReacted: Boolean,
-//            reaction: String,
-//        )
-//    }
-//
-//    interface Misskey : StatusEvent {
-//        fun react(
-//            statusKey: MicroBlogKey,
-//            hasReacted: Boolean,
-//            reaction: String,
-//        )
-//
-//        fun renote(statusKey: MicroBlogKey)
-//
-//        fun vote(
-//            statusKey: MicroBlogKey,
-//            options: List<Int>,
-//        )
-//
-//        fun favourite(
-//            statusKey: MicroBlogKey,
-//            favourited: Boolean,
-//        )
-//
-//        fun favouriteState(statusKey: MicroBlogKey): Flow<Boolean>
-//
-//        fun acceptFollowRequest(
-//            userKey: MicroBlogKey,
-//            notificationStatusKey: MicroBlogKey,
-//        )
-//
-//        fun rejectFollowRequest(
-//            userKey: MicroBlogKey,
-//            notificationStatusKey: MicroBlogKey,
-//        )
-//    }
-//
-//    interface Bluesky : StatusEvent {
-//        fun reblog(
-//            statusKey: MicroBlogKey,
-//            cid: String,
-//            uri: String,
-//            repostUri: String?,
-//        )
-//
-//        fun like(
-//            statusKey: MicroBlogKey,
-//            cid: String,
-//            uri: String,
-//            likedUri: String?,
-//        )
-//
-//        fun bookmark(
-//            statusKey: MicroBlogKey,
-//            uri: String,
-//            cid: String,
-//        )
-//
-//        fun unbookmark(
-//            statusKey: MicroBlogKey,
-//            uri: String,
-//        )
-//    }
-//
-//    interface XQT : StatusEvent {
-//        fun retweet(
-//            statusKey: MicroBlogKey,
-//            retweeted: Boolean,
-//        )
-//
-//        fun like(
-//            statusKey: MicroBlogKey,
-//            liked: Boolean,
-//        )
-//
-//        fun bookmark(
-//            statusKey: MicroBlogKey,
-//            bookmarked: Boolean,
-//        )
-//    }
-//
-//    interface VVO : StatusEvent {
-//        fun like(
-//            statusKey: MicroBlogKey,
-//            liked: Boolean,
-//        )
-//
-//        fun likeComment(
-//            statusKey: MicroBlogKey,
-//            liked: Boolean,
-//        )
-//
-//        fun favorite(
-//            statusKey: MicroBlogKey,
-//            favorited: Boolean,
-//        )
-//    }
-// }
-
 @Serializable
 internal sealed interface PostEvent {
+    val postKey: MicroBlogKey
+
     @Serializable
     sealed interface PollEvent : PostEvent {
-        val options: ImmutableList<Int>
+        val accountKey: MicroBlogKey
+        val options: SerializableImmutableList<Int>
+
+        fun copyWithOptions(options: List<Int>): PollEvent
     }
 
     @Serializable
     sealed interface Mastodon : PostEvent {
         @Serializable
         data class Reblog(
-            val statusKey: MicroBlogKey,
+            override val postKey: MicroBlogKey,
             val reblogged: Boolean,
         ) : Mastodon
 
         @Serializable
         data class Like(
-            val statusKey: MicroBlogKey,
+            override val postKey: MicroBlogKey,
             val liked: Boolean,
         ) : Mastodon
 
         @Serializable
         data class Bookmark(
-            val statusKey: MicroBlogKey,
+            override val postKey: MicroBlogKey,
             val bookmarked: Boolean,
         ) : Mastodon
 
         @Serializable
         data class Vote(
-            val statusKey: MicroBlogKey,
-            override val options: ImmutableList<Int>,
+            val id: String,
+            override val accountKey: MicroBlogKey,
+            override val postKey: MicroBlogKey,
+            override val options: SerializableImmutableList<Int>,
         ) : Mastodon,
-            PollEvent
+            PollEvent {
+            override fun copyWithOptions(options: List<Int>): PollEvent = copy(options = options.toImmutableList())
+        }
 
         @Serializable
         data class AcceptFollowRequest(
+            override val postKey: MicroBlogKey,
             val userKey: MicroBlogKey,
-            val notificationStatusKey: MicroBlogKey,
         ) : Mastodon
 
         @Serializable
         data class RejectFollowRequest(
+            override val postKey: MicroBlogKey,
             val userKey: MicroBlogKey,
-            val notificationStatusKey: MicroBlogKey,
         ) : Mastodon
     }
 
@@ -193,7 +65,7 @@ internal sealed interface PostEvent {
     sealed interface Pleroma : PostEvent {
         @Serializable
         data class React(
-            val statusKey: MicroBlogKey,
+            override val postKey: MicroBlogKey,
             val hasReacted: Boolean,
             val reaction: String,
         ) : Pleroma
@@ -203,37 +75,42 @@ internal sealed interface PostEvent {
     sealed interface Misskey : PostEvent {
         @Serializable
         data class React(
-            val statusKey: MicroBlogKey,
+            override val postKey: MicroBlogKey,
             val hasReacted: Boolean,
             val reaction: String,
         ) : Misskey
 
         @Serializable
         data class Renote(
-            val statusKey: MicroBlogKey,
+            override val postKey: MicroBlogKey,
         ) : Misskey
 
         @Serializable
         data class Vote(
-            val statusKey: MicroBlogKey,
-            override val options: ImmutableList<Int>,
+            override val accountKey: MicroBlogKey,
+            override val postKey: MicroBlogKey,
+            override val options: SerializableImmutableList<Int>,
         ) : Misskey,
-            PollEvent
+            PollEvent {
+            override fun copyWithOptions(options: List<Int>): PollEvent = copy(options = options.toImmutableList())
+        }
 
         @Serializable
         data class Favourite(
-            val statusKey: MicroBlogKey,
+            override val postKey: MicroBlogKey,
             val favourited: Boolean,
         ) : Misskey
 
         @Serializable
         data class AcceptFollowRequest(
+            override val postKey: MicroBlogKey,
             val userKey: MicroBlogKey,
             val notificationStatusKey: MicroBlogKey,
         ) : Misskey
 
         @Serializable
         data class RejectFollowRequest(
+            override val postKey: MicroBlogKey,
             val userKey: MicroBlogKey,
             val notificationStatusKey: MicroBlogKey,
         ) : Misskey
@@ -243,25 +120,25 @@ internal sealed interface PostEvent {
     sealed interface Bluesky : PostEvent {
         @Serializable
         data class Reblog(
-            val statusKey: MicroBlogKey,
+            override val postKey: MicroBlogKey,
             val reblogged: Boolean,
         ) : Bluesky
 
         @Serializable
         data class Like(
-            val statusKey: MicroBlogKey,
+            override val postKey: MicroBlogKey,
             val liked: Boolean,
         ) : Bluesky
 
         @Serializable
         data class Bookmark(
-            val statusKey: MicroBlogKey,
+            override val postKey: MicroBlogKey,
             val bookmarked: Boolean,
         ) : Bluesky
 
         @Serializable
         data class Unbookmark(
-            val statusKey: MicroBlogKey,
+            override val postKey: MicroBlogKey,
         ) : Bluesky
     }
 
@@ -269,19 +146,19 @@ internal sealed interface PostEvent {
     sealed interface XQT : PostEvent {
         @Serializable
         data class Retweet(
-            val statusKey: MicroBlogKey,
+            override val postKey: MicroBlogKey,
             val retweeted: Boolean,
         ) : XQT
 
         @Serializable
         data class Like(
-            val statusKey: MicroBlogKey,
+            override val postKey: MicroBlogKey,
             val liked: Boolean,
         ) : XQT
 
         @Serializable
         data class Bookmark(
-            val statusKey: MicroBlogKey,
+            override val postKey: MicroBlogKey,
             val bookmarked: Boolean,
         ) : XQT
     }
@@ -290,19 +167,19 @@ internal sealed interface PostEvent {
     sealed interface VVO : PostEvent {
         @Serializable
         data class Like(
-            val statusKey: MicroBlogKey,
+            override val postKey: MicroBlogKey,
             val liked: Boolean,
         ) : VVO
 
         @Serializable
         data class LikeComment(
-            val statusKey: MicroBlogKey,
+            override val postKey: MicroBlogKey,
             val liked: Boolean,
         ) : VVO
 
         @Serializable
         data class Favorite(
-            val statusKey: MicroBlogKey,
+            override val postKey: MicroBlogKey,
             val favorited: Boolean,
         ) : VVO
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/datasource/ListDataSource.kt
similarity index 58%
rename from shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListDataSource.kt
rename to shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/datasource/ListDataSource.kt
index b28f34bc3..595ee7850 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/datasource/ListDataSource.kt
@@ -1,5 +1,7 @@
-package dev.dimension.flare.data.datasource.microblog.list
+package dev.dimension.flare.data.datasource.microblog.datasource
 
+import dev.dimension.flare.data.datasource.microblog.handler.ListHandler
+import dev.dimension.flare.data.datasource.microblog.handler.ListMemberHandler
 import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.ui.model.UiTimelineV2
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/datasource/NotificationDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/datasource/NotificationDataSource.kt
new file mode 100644
index 000000000..5be5b9972
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/datasource/NotificationDataSource.kt
@@ -0,0 +1,7 @@
+package dev.dimension.flare.data.datasource.microblog.datasource
+
+import dev.dimension.flare.data.datasource.microblog.handler.NotificationHandler
+
+internal interface NotificationDataSource {
+    val notificationHandler: NotificationHandler
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/datasource/PostDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/datasource/PostDataSource.kt
new file mode 100644
index 000000000..c228b446d
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/datasource/PostDataSource.kt
@@ -0,0 +1,9 @@
+package dev.dimension.flare.data.datasource.microblog.datasource
+
+import dev.dimension.flare.data.datasource.microblog.handler.PostEventHandler
+import dev.dimension.flare.data.datasource.microblog.handler.PostHandler
+
+internal interface PostDataSource {
+    val postHandler: PostHandler
+    val postEventHandler: PostEventHandler
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/datasource/RelationDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/datasource/RelationDataSource.kt
new file mode 100644
index 000000000..708942a52
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/datasource/RelationDataSource.kt
@@ -0,0 +1,7 @@
+package dev.dimension.flare.data.datasource.microblog.datasource
+
+import dev.dimension.flare.data.datasource.microblog.handler.RelationHandler
+
+internal interface RelationDataSource {
+    val relationHandler: RelationHandler
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/datasource/UserDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/datasource/UserDataSource.kt
new file mode 100644
index 000000000..90d9be9eb
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/datasource/UserDataSource.kt
@@ -0,0 +1,7 @@
+package dev.dimension.flare.data.datasource.microblog.datasource
+
+import dev.dimension.flare.data.datasource.microblog.handler.UserHandler
+
+internal interface UserDataSource {
+    val userHandler: UserHandler
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/EmojiHandler.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/EmojiHandler.kt
new file mode 100644
index 000000000..ac636c646
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/EmojiHandler.kt
@@ -0,0 +1,45 @@
+package dev.dimension.flare.data.datasource.microblog.handler
+
+import dev.dimension.flare.common.Cacheable
+import dev.dimension.flare.data.database.cache.CacheDatabase
+import dev.dimension.flare.data.database.cache.model.DbEmoji
+import dev.dimension.flare.data.database.cache.model.EmojiContent
+import dev.dimension.flare.data.datasource.microblog.loader.EmojiLoader
+import dev.dimension.flare.ui.model.UiEmoji
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.mapNotNull
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+
+internal class EmojiHandler(
+    private val host: String,
+    private val loader: EmojiLoader,
+) : KoinComponent {
+    private val database: CacheDatabase by inject()
+    val emoji: Cacheable<ImmutableMap<String, ImmutableList<UiEmoji>>> =
+        Cacheable(
+            fetchSource = {
+                val emojis = loader.emojis()
+                database.emojiDao().insert(
+                    DbEmoji(
+                        host = host,
+                        content =
+                            EmojiContent(
+                                emojis,
+                            ),
+                    ),
+                )
+            },
+            cacheSource = {
+                database
+                    .emojiDao()
+                    .get(host)
+                    .distinctUntilChanged()
+                    .mapNotNull {
+                        it?.content?.data
+                    }
+            },
+        )
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListHandler.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/ListHandler.kt
similarity index 96%
rename from shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListHandler.kt
rename to shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/ListHandler.kt
index 40c110017..d1e662a9c 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListHandler.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/ListHandler.kt
@@ -1,4 +1,4 @@
-package dev.dimension.flare.data.datasource.microblog.list
+package dev.dimension.flare.data.datasource.microblog.handler
 
 import androidx.paging.ExperimentalPagingApi
 import androidx.paging.Pager
@@ -9,6 +9,9 @@ import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.connect
 import dev.dimension.flare.data.database.cache.model.DbList
 import dev.dimension.flare.data.database.cache.model.DbListPaging
+import dev.dimension.flare.data.datasource.microblog.list.ListMetaData
+import dev.dimension.flare.data.datasource.microblog.list.ListMetaDataType
+import dev.dimension.flare.data.datasource.microblog.loader.ListLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.createPagingRemoteMediator
 import dev.dimension.flare.data.datasource.microblog.pagingConfig
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListMemberHandler.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/ListMemberHandler.kt
similarity index 97%
rename from shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListMemberHandler.kt
rename to shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/ListMemberHandler.kt
index 342068e42..c3e0cc85c 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListMemberHandler.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/ListMemberHandler.kt
@@ -1,4 +1,4 @@
-package dev.dimension.flare.data.datasource.microblog.list
+package dev.dimension.flare.data.datasource.microblog.handler
 
 import androidx.paging.ExperimentalPagingApi
 import androidx.paging.Pager
@@ -8,6 +8,7 @@ import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.connect
 import dev.dimension.flare.data.database.cache.model.DbList
 import dev.dimension.flare.data.database.cache.model.DbListMember
+import dev.dimension.flare.data.datasource.microblog.loader.ListMemberLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.createPagingRemoteMediator
 import dev.dimension.flare.data.datasource.microblog.pagingConfig
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/NotificationHandler.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/NotificationHandler.kt
new file mode 100644
index 000000000..8268592c5
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/NotificationHandler.kt
@@ -0,0 +1,27 @@
+package dev.dimension.flare.data.datasource.microblog.handler
+
+import dev.dimension.flare.common.MemCacheable
+import dev.dimension.flare.data.datasource.microblog.loader.NotificationLoader
+import dev.dimension.flare.model.MicroBlogKey
+
+internal class NotificationHandler(
+    val accountKey: MicroBlogKey,
+    val loader: NotificationLoader,
+) {
+    private val key by lazy {
+        "notificationHandler_$accountKey"
+    }
+
+    val notificationBadgeCount by lazy {
+        MemCacheable(
+            key = key,
+            fetchSource = {
+                loader.notificationBadgeCount()
+            },
+        )
+    }
+
+    fun clear() {
+        MemCacheable.update(key, 0)
+    }
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostEventHandler.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostEventHandler.kt
new file mode 100644
index 000000000..0a8ad5495
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostEventHandler.kt
@@ -0,0 +1,96 @@
+package dev.dimension.flare.data.datasource.microblog.handler
+
+import dev.dimension.flare.data.database.cache.CacheDatabase
+import dev.dimension.flare.data.database.cache.connect
+import dev.dimension.flare.data.datasource.microblog.DatabaseUpdater
+import dev.dimension.flare.data.datasource.microblog.PostEvent
+import dev.dimension.flare.data.repository.tryRun
+import dev.dimension.flare.model.AccountType
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+
+internal class PostEventHandler(
+    private val accountKey: MicroBlogKey,
+    private val handler: Handler,
+) : KoinComponent,
+    DatabaseUpdater {
+    private val coroutineScope: CoroutineScope by inject()
+    private val database: CacheDatabase by inject()
+
+    interface Handler {
+        suspend fun handle(
+            event: PostEvent,
+            updater: DatabaseUpdater,
+        )
+    }
+
+    fun handleEvent(event: PostEvent) {
+        coroutineScope.launch {
+            val originalData =
+                database
+                    .statusDao()
+                    .get(
+                        statusKey = event.postKey,
+                        accountType = AccountType.Specific(accountKey),
+                    ).firstOrNull()
+                    ?.content
+            tryRun {
+                handler.handle(
+                    event = event,
+                    updater = this@PostEventHandler,
+                )
+            }.onFailure {
+                // revert cache to original data if handling fails
+                if (originalData != null) {
+                    database.statusDao().update(
+                        statusKey = event.postKey,
+                        accountType = AccountType.Specific(accountKey),
+                        content = originalData,
+                    )
+                }
+            }
+        }
+    }
+
+    override suspend fun deleteFromCache(postKey: MicroBlogKey) {
+        database.connect {
+            database.statusDao().delete(
+                statusKey = postKey,
+                accountType = AccountType.Specific(accountKey),
+            )
+            database.pagingTimelineDao().deleteStatus(
+                accountKey = accountKey,
+                statusKey = postKey,
+            )
+        }
+    }
+
+    override suspend fun updateCache(
+        postKey: MicroBlogKey,
+        update: suspend (UiTimelineV2) -> UiTimelineV2,
+    ) {
+        database.connect {
+            val currentData =
+                database
+                    .statusDao()
+                    .get(
+                        statusKey = postKey,
+                        accountType = AccountType.Specific(accountKey),
+                    ).firstOrNull()
+                    ?.content
+            if (currentData != null) {
+                val updatedData = update(currentData)
+                database.statusDao().update(
+                    statusKey = postKey,
+                    accountType = AccountType.Specific(accountKey),
+                    content = updatedData,
+                )
+            }
+        }
+    }
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandler.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandler.kt
new file mode 100644
index 000000000..5f3473874
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandler.kt
@@ -0,0 +1,75 @@
+package dev.dimension.flare.data.datasource.microblog.handler
+
+import dev.dimension.flare.common.Cacheable
+import dev.dimension.flare.data.database.cache.CacheDatabase
+import dev.dimension.flare.data.database.cache.connect
+import dev.dimension.flare.data.database.cache.mapper.saveToDatabase
+import dev.dimension.flare.data.datasource.microblog.loader.PostLoader
+import dev.dimension.flare.data.datasource.microblog.paging.TimelineRemoteMediator
+import dev.dimension.flare.data.repository.tryRun
+import dev.dimension.flare.model.AccountType
+import dev.dimension.flare.model.DbAccountType
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.mapper.render
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.mapNotNull
+import kotlinx.coroutines.launch
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+
+internal class PostHandler(
+    val accountType: AccountType,
+    val loader: PostLoader,
+) : KoinComponent {
+    private val database: CacheDatabase by inject()
+    private val coroutineScope: CoroutineScope by inject()
+
+    fun post(postKey: MicroBlogKey): Cacheable<UiTimeline> {
+        val pagingKey = "post_only_$postKey"
+        return Cacheable(
+            fetchSource = {
+                val result = loader.status(postKey)
+                database.connect {
+                    val item =
+                        TimelineRemoteMediator.mapping(
+                            result,
+                            pagingKey,
+                            accountType = accountType as DbAccountType,
+                        )
+                    saveToDatabase(database, listOf(item))
+                }
+            },
+            cacheSource = {
+                database
+                    .pagingTimelineDao()
+                    .get(pagingKey, accountType = accountType as DbAccountType)
+                    .distinctUntilChanged()
+                    .mapNotNull {
+                        it?.render(this)
+                    }
+            },
+        )
+    }
+
+    fun delete(postKey: MicroBlogKey) {
+        coroutineScope.launch {
+            tryRun {
+                loader.deleteStatus(postKey)
+            }.onSuccess {
+                database.connect {
+                    database.statusDao().delete(
+                        statusKey = postKey,
+                        accountType = accountType as DbAccountType,
+                    )
+                    database.statusReferenceDao().delete(postKey)
+                    database.pagingTimelineDao().deleteStatus(
+                        accountType = accountType as DbAccountType,
+                        statusKey = postKey,
+                    )
+                }
+            }
+        }
+    }
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/RelationHandler.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/RelationHandler.kt
new file mode 100644
index 000000000..91fda1dd8
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/RelationHandler.kt
@@ -0,0 +1,234 @@
+package dev.dimension.flare.data.datasource.microblog.handler
+
+import dev.dimension.flare.common.Cacheable
+import dev.dimension.flare.data.database.cache.CacheDatabase
+import dev.dimension.flare.data.database.cache.model.DbUserRelation
+import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
+import dev.dimension.flare.data.repository.tryRun
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiRelation
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.mapNotNull
+import kotlinx.coroutines.launch
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+
+internal class RelationHandler(
+    val dataSource: RelationLoader,
+) : KoinComponent {
+    private val database: CacheDatabase by inject()
+    private val coroutineScope: CoroutineScope by inject()
+
+    fun relation(userKey: MicroBlogKey) =
+        Cacheable(
+            fetchSource = {
+                val result = dataSource.relation(userKey)
+                database.userDao().insertUserRelation(
+                    DbUserRelation(
+                        accountKey = dataSource.accountKey,
+                        userKey = userKey,
+                        relation = result,
+                    ),
+                )
+            },
+            cacheSource = {
+                database
+                    .userDao()
+                    .getUserRelation(
+                        accountKey = dataSource.accountKey,
+                        userKey = userKey,
+                    ).mapNotNull { it?.relation }
+            },
+        )
+
+    fun follow(userKey: MicroBlogKey) =
+        coroutineScope.launch {
+            tryRun {
+                updateRelation(
+                    userKey = userKey,
+                    update = { relation ->
+                        relation.copy(
+                            following = true,
+                        )
+                    },
+                )
+                dataSource.follow(userKey)
+            }.onFailure {
+                updateRelation(
+                    userKey = userKey,
+                    update = { relation ->
+                        relation.copy(
+                            following = false,
+                        )
+                    },
+                )
+            }
+        }
+
+    fun unfollow(userKey: MicroBlogKey) =
+        coroutineScope.launch {
+            tryRun {
+                updateRelation(
+                    userKey = userKey,
+                    update = { relation ->
+                        relation.copy(
+                            following = false,
+                        )
+                    },
+                )
+                dataSource.unfollow(userKey)
+            }.onFailure {
+                updateRelation(
+                    userKey = userKey,
+                    update = { relation ->
+                        relation.copy(
+                            following = true,
+                        )
+                    },
+                )
+            }
+        }
+
+    fun block(userKey: MicroBlogKey) =
+        coroutineScope.launch {
+            tryRun {
+                updateRelation(
+                    userKey = userKey,
+                    update = { relation ->
+                        relation.copy(
+                            blocking = true,
+                        )
+                    },
+                )
+                dataSource.block(userKey)
+            }.onFailure {
+                updateRelation(
+                    userKey = userKey,
+                    update = { relation ->
+                        relation.copy(
+                            blocking = false,
+                        )
+                    },
+                )
+            }
+        }
+
+    fun unblock(userKey: MicroBlogKey) =
+        coroutineScope.launch {
+            tryRun {
+                updateRelation(
+                    userKey = userKey,
+                    update = { relation ->
+                        relation.copy(
+                            blocking = false,
+                        )
+                    },
+                )
+                dataSource.unblock(userKey)
+            }.onFailure {
+                updateRelation(
+                    userKey = userKey,
+                    update = { relation ->
+                        relation.copy(
+                            blocking = true,
+                        )
+                    },
+                )
+            }
+        }
+
+    fun mute(userKey: MicroBlogKey) =
+        coroutineScope.launch {
+            tryRun {
+                updateRelation(
+                    userKey = userKey,
+                    update = { relation ->
+                        relation.copy(
+                            muted = true,
+                        )
+                    },
+                )
+                dataSource.mute(userKey)
+            }.onFailure {
+                updateRelation(
+                    userKey = userKey,
+                    update = { relation ->
+                        relation.copy(
+                            muted = false,
+                        )
+                    },
+                )
+            }
+        }
+
+    fun unmute(userKey: MicroBlogKey) =
+        coroutineScope.launch {
+            tryRun {
+                updateRelation(
+                    userKey = userKey,
+                    update = { relation ->
+                        relation.copy(
+                            muted = false,
+                        )
+                    },
+                )
+                dataSource.unmute(userKey)
+            }.onFailure {
+                updateRelation(
+                    userKey = userKey,
+                    update = { relation ->
+                        relation.copy(
+                            muted = true,
+                        )
+                    },
+                )
+            }
+        }
+
+    suspend fun approveFollowRequest(userKey: MicroBlogKey) {
+        updateRelation(
+            userKey = userKey,
+            update = { relation ->
+                relation.copy(
+                    hasPendingFollowRequestToYou = false,
+                    isFans = true,
+                )
+            },
+        )
+    }
+
+    suspend fun rejectFollowRequest(userKey: MicroBlogKey) {
+        updateRelation(
+            userKey = userKey,
+            update = { relation ->
+                relation.copy(
+                    hasPendingFollowRequestToYou = false,
+                    isFans = false,
+                )
+            },
+        )
+    }
+
+    private suspend fun updateRelation(
+        userKey: MicroBlogKey,
+        update: (UiRelation) -> UiRelation,
+    ) {
+        val currentRelation =
+            database
+                .userDao()
+                .getUserRelation(
+                    accountKey = dataSource.accountKey,
+                    userKey = userKey,
+                ).mapNotNull { it?.relation }
+                .firstOrNull() ?: return
+        val newRelation = update(currentRelation)
+        database.userDao().insertUserRelation(
+            DbUserRelation(
+                accountKey = dataSource.accountKey,
+                userKey = userKey,
+                relation = newRelation,
+            ),
+        )
+    }
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandler.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandler.kt
new file mode 100644
index 000000000..009c84141
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandler.kt
@@ -0,0 +1,70 @@
+package dev.dimension.flare.data.datasource.microblog.handler
+
+import dev.dimension.flare.common.Cacheable
+import dev.dimension.flare.data.database.cache.CacheDatabase
+import dev.dimension.flare.data.database.cache.model.DbUser
+import dev.dimension.flare.data.datasource.microblog.loader.UserLoader
+import dev.dimension.flare.model.MicroBlogKey
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.mapNotNull
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+
+internal class UserHandler(
+    val accountKey: MicroBlogKey,
+    val loader: UserLoader,
+) : KoinComponent {
+    private val database: CacheDatabase by inject()
+
+    fun userByHandleAndHost(
+        handle: String,
+        host: String,
+    ) = Cacheable(
+        fetchSource = {
+            val user = loader.userByHandleAndHost(handle, host)
+            database.userDao().insert(
+                DbUser(
+                    userKey = user.key,
+                    name = user.name.raw,
+                    handle = user.handle,
+                    host = user.key.host,
+                    content = user,
+                ),
+            )
+        },
+        cacheSource = {
+            database
+                .userDao()
+                .findByHandleAndHost(handle, host)
+                .distinctUntilChanged()
+                .mapNotNull { it?.content }
+        },
+    )
+
+    fun userById(id: String) =
+        Cacheable(
+            fetchSource = {
+                val user = loader.userById(id)
+                database.userDao().insert(
+                    DbUser(
+                        userKey = user.key,
+                        name = user.name.raw,
+                        handle = user.handle,
+                        host = user.key.host,
+                        content = user,
+                    ),
+                )
+            },
+            cacheSource = {
+                database
+                    .userDao()
+                    .findByKey(
+                        MicroBlogKey(
+                            id = id,
+                            host = accountKey.host,
+                        ),
+                    ).distinctUntilChanged()
+                    .mapNotNull { it?.content }
+            },
+        )
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/EmojiLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/EmojiLoader.kt
new file mode 100644
index 000000000..e1e0efd06
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/EmojiLoader.kt
@@ -0,0 +1,9 @@
+package dev.dimension.flare.data.datasource.microblog.loader
+
+import dev.dimension.flare.ui.model.UiEmoji
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.ImmutableMap
+
+internal interface EmojiLoader {
+    suspend fun emojis(): ImmutableMap<String, ImmutableList<UiEmoji>>
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/ListLoader.kt
similarity index 76%
rename from shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListLoader.kt
rename to shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/ListLoader.kt
index 5e3cabfd2..10b31d792 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/ListLoader.kt
@@ -1,5 +1,7 @@
-package dev.dimension.flare.data.datasource.microblog.list
+package dev.dimension.flare.data.datasource.microblog.loader
 
+import dev.dimension.flare.data.datasource.microblog.list.ListMetaData
+import dev.dimension.flare.data.datasource.microblog.list.ListMetaDataType
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.ui.model.UiList
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListMemberLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/ListMemberLoader.kt
similarity index 92%
rename from shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListMemberLoader.kt
rename to shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/ListMemberLoader.kt
index 1dee97911..ca8fd3b80 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListMemberLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/ListMemberLoader.kt
@@ -1,4 +1,4 @@
-package dev.dimension.flare.data.datasource.microblog.list
+package dev.dimension.flare.data.datasource.microblog.loader
 
 import dev.dimension.flare.data.database.cache.model.DbUser
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/NotificationLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/NotificationLoader.kt
new file mode 100644
index 000000000..c95d37796
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/NotificationLoader.kt
@@ -0,0 +1,5 @@
+package dev.dimension.flare.data.datasource.microblog.loader
+
+internal interface NotificationLoader {
+    suspend fun notificationBadgeCount(): Int
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/PostLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/PostLoader.kt
new file mode 100644
index 000000000..9ac4794fb
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/PostLoader.kt
@@ -0,0 +1,10 @@
+package dev.dimension.flare.data.datasource.microblog.loader
+
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+
+internal interface PostLoader {
+    suspend fun status(statusKey: MicroBlogKey): UiTimelineV2
+
+    suspend fun deleteStatus(statusKey: MicroBlogKey)
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/RelationLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/RelationLoader.kt
new file mode 100644
index 000000000..cdcced3f6
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/RelationLoader.kt
@@ -0,0 +1,22 @@
+package dev.dimension.flare.data.datasource.microblog.loader
+
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiRelation
+
+internal interface RelationLoader {
+    val accountKey: MicroBlogKey
+
+    suspend fun relation(userKey: MicroBlogKey): UiRelation
+
+    suspend fun follow(userKey: MicroBlogKey)
+
+    suspend fun unfollow(userKey: MicroBlogKey)
+
+    suspend fun block(userKey: MicroBlogKey)
+
+    suspend fun unblock(userKey: MicroBlogKey)
+
+    suspend fun mute(userKey: MicroBlogKey)
+
+    suspend fun unmute(userKey: MicroBlogKey)
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/UserLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/UserLoader.kt
new file mode 100644
index 000000000..05f784180
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/UserLoader.kt
@@ -0,0 +1,12 @@
+package dev.dimension.flare.data.datasource.microblog.loader
+
+import dev.dimension.flare.ui.model.UiProfile
+
+internal interface UserLoader {
+    suspend fun userByHandleAndHost(
+        handle: String,
+        host: String,
+    ): UiProfile
+
+    suspend fun userById(id: String): UiProfile
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelineRemoteMediator.kt
index c5d39d778..e712cc77f 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelineRemoteMediator.kt
@@ -14,6 +14,7 @@ import dev.dimension.flare.data.database.cache.model.DbStatusUserReferenceWithUs
 import dev.dimension.flare.data.database.cache.model.DbStatusWithReference
 import dev.dimension.flare.data.database.cache.model.DbStatusWithUser
 import dev.dimension.flare.data.database.cache.model.DbUser
+import dev.dimension.flare.model.DbAccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.ReferenceType
 import dev.dimension.flare.ui.model.UiTimelineV2
@@ -41,7 +42,10 @@ internal class TimelineRemoteMediator(
             )
         val data =
             result.data.map {
-                mapping(it)
+                mapping(
+                    data = it,
+                    pagingKey = pagingKey,
+                )
             }
         return PagingResult(
             data = data,
@@ -50,107 +54,112 @@ internal class TimelineRemoteMediator(
         )
     }
 
-    private suspend fun mapping(data: UiTimelineV2): DbPagingTimelineWithStatus =
-        DbPagingTimelineWithStatus(
-            timeline =
-                DbPagingTimeline(
-                    pagingKey = pagingKey,
-                    statusKey = data.statusKey,
-                    sortId = -SnowflakeIdGenerator.nextId(),
-                ),
-            status =
-                DbStatusWithReference(
-                    status = mappingDbStatusWithUser(data),
-                    references =
-                        when (data) {
-                            is UiTimelineV2.Feed -> emptyList()
-                            is UiTimelineV2.Message -> emptyList()
-                            is UiTimelineV2.Post ->
-                                data.quote.map {
-                                    mappingDbStatusReferenceWithStatus(
-                                        data = it,
-                                        referenceType = ReferenceType.Quote,
-                                        rootStatusKey = data.statusKey,
-                                    )
-                                } +
-                                    data.parents.map {
-                                        mappingDbStatusReferenceWithStatus(
-                                            data = it,
-                                            referenceType = ReferenceType.Reply,
-                                            rootStatusKey = data.statusKey,
-                                        )
-                                    }
-
-                            is UiTimelineV2.User -> emptyList()
-                            is UiTimelineV2.UserList ->
-                                listOfNotNull(
-                                    data.post?.let {
+    companion object {
+        suspend fun mapping(
+            data: UiTimelineV2,
+            pagingKey: String,
+        ): DbPagingTimelineWithStatus =
+            DbPagingTimelineWithStatus(
+                timeline =
+                    DbPagingTimeline(
+                        pagingKey = pagingKey,
+                        statusKey = data.statusKey,
+                        sortId = -SnowflakeIdGenerator.nextId(),
+                    ),
+                status =
+                    DbStatusWithReference(
+                        status = mappingDbStatusWithUser(data),
+                        references =
+                            when (data) {
+                                is UiTimelineV2.Feed -> emptyList()
+                                is UiTimelineV2.Message -> emptyList()
+                                is UiTimelineV2.Post ->
+                                    data.quote.map {
                                         mappingDbStatusReferenceWithStatus(
                                             data = it,
                                             referenceType = ReferenceType.Quote,
                                             rootStatusKey = data.statusKey,
                                         )
-                                    },
-                                )
-                        },
-                ),
-        )
+                                    } +
+                                        data.parents.map {
+                                            mappingDbStatusReferenceWithStatus(
+                                                data = it,
+                                                referenceType = ReferenceType.Reply,
+                                                rootStatusKey = data.statusKey,
+                                            )
+                                        }
 
-    private fun mappingDbStatusReferenceWithStatus(
-        data: UiTimelineV2,
-        referenceType: ReferenceType,
-        rootStatusKey: MicroBlogKey,
-    ) = DbStatusReferenceWithStatus(
-        reference =
-            DbStatusReference(
-                referenceType = referenceType,
-                statusKey = rootStatusKey,
-                referenceStatusKey = data.statusKey,
-                _id = Uuid.random().toString(),
-            ),
-        status = mappingDbStatusWithUser(data),
-    )
+                                is UiTimelineV2.User -> emptyList()
+                                is UiTimelineV2.UserList ->
+                                    listOfNotNull(
+                                        data.post?.let {
+                                            mappingDbStatusReferenceWithStatus(
+                                                data = it,
+                                                referenceType = ReferenceType.Quote,
+                                                rootStatusKey = data.statusKey,
+                                            )
+                                        },
+                                    )
+                            },
+                    ),
+            )
 
-    private fun mappingDbStatusWithUser(data: UiTimelineV2): DbStatusWithUser {
-        val user =
-            if (data is UiTimelineV2.Post) {
-                listOfNotNull(data.user)
-            } else if (data is UiTimelineV2.User) {
-                listOfNotNull(data.value)
-            } else if (data is UiTimelineV2.UserList) {
-                data.users
-            } else {
-                emptyList()
-            }
-        return DbStatusWithUser(
-            data =
-                DbStatus(
-                    statusKey = data.statusKey,
-                    content = data,
-                    pagingKey = pagingKey,
-                    text = data.searchText,
+        private fun mappingDbStatusReferenceWithStatus(
+            data: UiTimelineV2,
+            referenceType: ReferenceType,
+            rootStatusKey: MicroBlogKey,
+        ) = DbStatusReferenceWithStatus(
+            reference =
+                DbStatusReference(
+                    referenceType = referenceType,
+                    statusKey = rootStatusKey,
+                    referenceStatusKey = data.statusKey,
+                    _id = Uuid.random().toString(),
                 ),
-            references =
-                user.map {
-                    DbStatusUserReferenceWithUser(
-                        reference =
-                            DbStatusUserReference(
-                                statusKey = data.statusKey,
-                                referenceUserKey = it.key,
-                                _id = Uuid.random().toString(),
-                            ),
-                        user =
-                            DbUser(
-                                userKey = it.key,
-                                platformType = it.platformType,
-                                name = it.name.raw,
-                                handle = it.handle,
-                                host = it.host ?: it.key.host,
-                                content = it,
-                            ),
-                    )
-                },
+            status = mappingDbStatusWithUser(data),
         )
+
+        private fun mappingDbStatusWithUser(data: UiTimelineV2): DbStatusWithUser {
+            val user =
+                if (data is UiTimelineV2.Post) {
+                    listOfNotNull(data.user)
+                } else if (data is UiTimelineV2.User) {
+                    listOfNotNull(data.value)
+                } else if (data is UiTimelineV2.UserList) {
+                    data.users
+                } else {
+                    emptyList()
+                }
+            return DbStatusWithUser(
+                data =
+                    DbStatus(
+                        statusKey = data.statusKey,
+                        content = data,
+                        accountType = data.accountType as DbAccountType,
+                        text = data.searchText,
+                    ),
+                references =
+                    user.map {
+                        DbStatusUserReferenceWithUser(
+                            reference =
+                                DbStatusUserReference(
+                                    statusKey = data.statusKey,
+                                    referenceUserKey = it.key,
+                                    _id = Uuid.random().toString(),
+                                ),
+                            user =
+                                DbUser(
+                                    userKey = it.key,
+                                    platformType = it.platformType,
+                                    name = it.name.raw,
+                                    handle = it.handle,
+                                    host = it.host ?: it.key.host,
+                                    content = it,
+                                ),
+                        )
+                    },
+            )
+        }
     }
 
     suspend fun timeline(
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyChannelLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyChannelLoader.kt
index 8b414bb61..0760cc53e 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyChannelLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyChannelLoader.kt
@@ -1,8 +1,8 @@
 package dev.dimension.flare.data.datasource.misskey
 
-import dev.dimension.flare.data.datasource.microblog.list.ListLoader
 import dev.dimension.flare.data.datasource.microblog.list.ListMetaData
 import dev.dimension.flare.data.datasource.microblog.list.ListMetaDataType
+import dev.dimension.flare.data.datasource.microblog.loader.ListLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.misskey.MisskeyService
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
index 063f884cf..49dc7141a 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
@@ -27,13 +27,13 @@ import dev.dimension.flare.data.datasource.microblog.NotificationFilter
 import dev.dimension.flare.data.datasource.microblog.ProfileAction
 import dev.dimension.flare.data.datasource.microblog.ProfileTab
 import dev.dimension.flare.data.datasource.microblog.ReactionDataSource
-import dev.dimension.flare.data.datasource.microblog.RelationDataSource
 import dev.dimension.flare.data.datasource.microblog.StatusEvent
-import dev.dimension.flare.data.datasource.microblog.list.ListDataSource
-import dev.dimension.flare.data.datasource.microblog.list.ListHandler
-import dev.dimension.flare.data.datasource.microblog.list.ListLoader
-import dev.dimension.flare.data.datasource.microblog.list.ListMemberHandler
-import dev.dimension.flare.data.datasource.microblog.list.ListMemberLoader
+import dev.dimension.flare.data.datasource.microblog.datasource.ListDataSource
+import dev.dimension.flare.data.datasource.microblog.handler.ListHandler
+import dev.dimension.flare.data.datasource.microblog.handler.ListMemberHandler
+import dev.dimension.flare.data.datasource.microblog.loader.ListLoader
+import dev.dimension.flare.data.datasource.microblog.loader.ListMemberLoader
+import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
 import dev.dimension.flare.data.datasource.microblog.pagingConfig
 import dev.dimension.flare.data.datasource.microblog.relationKeyWithUserKey
 import dev.dimension.flare.data.datasource.microblog.timelinePager
@@ -91,7 +91,7 @@ internal class MisskeyDataSource(
     StatusEvent.Misskey,
     ListDataSource,
     ReactionDataSource,
-    RelationDataSource {
+    RelationLoader {
     private val database: CacheDatabase by inject()
     private val localFilterRepository: LocalFilterRepository by inject()
     private val coroutineScope: CoroutineScope by inject()
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyListLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyListLoader.kt
index 4a48ef8b4..d34a13aef 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyListLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyListLoader.kt
@@ -1,8 +1,8 @@
 package dev.dimension.flare.data.datasource.misskey
 
-import dev.dimension.flare.data.datasource.microblog.list.ListLoader
 import dev.dimension.flare.data.datasource.microblog.list.ListMetaData
 import dev.dimension.flare.data.datasource.microblog.list.ListMetaDataType
+import dev.dimension.flare.data.datasource.microblog.loader.ListLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.misskey.MisskeyService
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyListMemberLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyListMemberLoader.kt
index 3b7fc3f42..87edd3077 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyListMemberLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyListMemberLoader.kt
@@ -2,7 +2,7 @@ package dev.dimension.flare.data.datasource.misskey
 
 import dev.dimension.flare.data.database.cache.mapper.toDbUser
 import dev.dimension.flare.data.database.cache.model.DbUser
-import dev.dimension.flare.data.datasource.microblog.list.ListMemberLoader
+import dev.dimension.flare.data.datasource.microblog.loader.ListMemberLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.misskey.MisskeyService
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt
index 8bf7b76ad..74b4d61c3 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt
@@ -31,12 +31,12 @@ import dev.dimension.flare.data.datasource.microblog.DirectMessageDataSource
 import dev.dimension.flare.data.datasource.microblog.NotificationFilter
 import dev.dimension.flare.data.datasource.microblog.ProfileAction
 import dev.dimension.flare.data.datasource.microblog.ProfileTab
-import dev.dimension.flare.data.datasource.microblog.RelationDataSource
 import dev.dimension.flare.data.datasource.microblog.StatusEvent
 import dev.dimension.flare.data.datasource.microblog.createSendingDirectMessage
-import dev.dimension.flare.data.datasource.microblog.list.ListDataSource
-import dev.dimension.flare.data.datasource.microblog.list.ListHandler
-import dev.dimension.flare.data.datasource.microblog.list.ListMemberHandler
+import dev.dimension.flare.data.datasource.microblog.datasource.ListDataSource
+import dev.dimension.flare.data.datasource.microblog.handler.ListHandler
+import dev.dimension.flare.data.datasource.microblog.handler.ListMemberHandler
+import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
 import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
 import dev.dimension.flare.data.datasource.microblog.pagingConfig
 import dev.dimension.flare.data.datasource.microblog.relationKeyWithUserKey
@@ -119,7 +119,7 @@ internal class XQTDataSource(
     StatusEvent.XQT,
     ListDataSource,
     DirectMessageDataSource,
-    RelationDataSource {
+    RelationLoader {
     private val database: CacheDatabase by inject()
     private val localFilterRepository: LocalFilterRepository by inject()
     private val coroutineScope: CoroutineScope by inject()
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTListLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTListLoader.kt
index fe6b95286..a4464589d 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTListLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTListLoader.kt
@@ -1,9 +1,9 @@
 package dev.dimension.flare.data.datasource.xqt
 
 import dev.dimension.flare.data.database.cache.mapper.cursor
-import dev.dimension.flare.data.datasource.microblog.list.ListLoader
 import dev.dimension.flare.data.datasource.microblog.list.ListMetaData
 import dev.dimension.flare.data.datasource.microblog.list.ListMetaDataType
+import dev.dimension.flare.data.datasource.microblog.loader.ListLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.xqt.XQTService
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTListMemberLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTListMemberLoader.kt
index f35b3eb9a..5aa88dbc0 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTListMemberLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTListMemberLoader.kt
@@ -4,7 +4,7 @@ import dev.dimension.flare.data.database.cache.mapper.cursor
 import dev.dimension.flare.data.database.cache.mapper.toDbUser
 import dev.dimension.flare.data.database.cache.mapper.users
 import dev.dimension.flare.data.database.cache.model.DbUser
-import dev.dimension.flare.data.datasource.microblog.list.ListMemberLoader
+import dev.dimension.flare.data.datasource.microblog.loader.ListMemberLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.xqt.XQTService
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/model/AccountType.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/model/AccountType.kt
index 85beb33ea..a3e28bf71 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/model/AccountType.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/model/AccountType.kt
@@ -18,6 +18,7 @@ public sealed class AccountType {
         override fun toString(): String = "specific_$accountKey"
     }
 
+    @Deprecated("Use Specific with the current account's key instead")
     @Serializable
     @Immutable
     public data object Active : AccountType() {
@@ -30,3 +31,10 @@ public sealed class AccountType {
         override fun toString(): String = "guest"
     }
 }
+
+internal fun MicroBlogKey?.toAccountType(): AccountType =
+    if (this == null) {
+        AccountType.Guest
+    } else {
+        AccountType.Specific(this)
+    }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiEmoji.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiEmoji.kt
index 98ae5d4ad..d887cbb97 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiEmoji.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiEmoji.kt
@@ -3,13 +3,15 @@ package dev.dimension.flare.ui.model
 import androidx.compose.runtime.Immutable
 import dev.dimension.flare.common.SerializableImmutableList
 import dev.dimension.flare.common.SerializableImmutableMap
+import kotlinx.serialization.Serializable
 
+@Serializable
 @Immutable
 public data class UiEmoji internal constructor(
     val shortcode: String,
     val url: String,
     val category: String,
-    val searchKeywords: List<String>,
+    val searchKeywords: SerializableImmutableList<String>,
     val insertText: String,
 )
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiPoll.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiPoll.kt
index 651bdf80b..3d9ea5f8f 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiPoll.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiPoll.kt
@@ -2,9 +2,11 @@ package dev.dimension.flare.ui.model
 
 import androidx.compose.runtime.Immutable
 import dev.dimension.flare.common.SerializableImmutableList
+import dev.dimension.flare.data.datasource.microblog.PostEvent
 import dev.dimension.flare.ui.humanizer.humanizePercentage
 import dev.dimension.flare.ui.render.UiDateTime
 import dev.dimension.flare.ui.render.toUi
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.serialization.Serializable
 import kotlin.time.Clock
 import kotlin.time.Instant
@@ -16,7 +18,7 @@ public data class UiPoll internal constructor(
     val options: SerializableImmutableList<Option>,
     val multiple: Boolean,
     val ownVotes: SerializableImmutableList<Int>,
-//    private val voteEvent: PostEvent.PollEvent,
+    private val voteEvent: PostEvent.PollEvent?,
     // null indicates no expiration
     private val expiresAt: Instant?,
     private val enabled: Boolean = true,
@@ -30,6 +32,20 @@ public data class UiPoll internal constructor(
     }
     val voted: Boolean by lazy { ownVotes.isNotEmpty() }
     val expiredAt: UiDateTime? by lazy { expiresAt?.toUi() }
+    val onVote: ClickContext.(
+        options: ImmutableList<Int>,
+    ) -> Unit by lazy {
+        { options ->
+            if (voteEvent != null) {
+                ClickEvent
+                    .event(
+                        accountKey = voteEvent.accountKey,
+                        postEvent = voteEvent.copyWithOptions(options = options),
+                    ).onClicked
+                    .invoke(this)
+            }
+        }
+    }
 
     val canVote: Boolean by lazy { !expired && !voted && enabled }
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiRelation.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiRelation.kt
index 4b11abe4e..1b60368dd 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiRelation.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiRelation.kt
@@ -1,7 +1,9 @@
 package dev.dimension.flare.ui.model
 
 import androidx.compose.runtime.Immutable
+import kotlinx.serialization.Serializable
 
+@Serializable
 @Immutable
 public data class UiRelation internal constructor(
     val following: Boolean = false,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
index cf91a3d05..722298798 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
@@ -3,6 +3,7 @@ package dev.dimension.flare.ui.model
 import androidx.compose.runtime.Immutable
 import dev.dimension.flare.common.SerializableImmutableList
 import dev.dimension.flare.data.datasource.microblog.ActionMenu
+import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
 import dev.dimension.flare.ui.model.mapper.fromRss
@@ -24,6 +25,7 @@ public sealed class UiTimelineV2 {
     internal abstract val searchText: String?
     internal abstract val statusKey: MicroBlogKey
     internal abstract val createdAt: UiDateTime
+    internal abstract val accountType: AccountType
 
     public abstract val itemKey: String
 
@@ -46,6 +48,7 @@ public sealed class UiTimelineV2 {
         override val createdAt: UiDateTime,
         private val clickEvent: ClickEvent,
         override val extraKey: String? = null,
+        override val accountType: AccountType,
     ) : UiTimelineV2() {
         override val searchText: String? = null
         val onClicked: ClickContext.() -> Unit by lazy {
@@ -123,6 +126,7 @@ public sealed class UiTimelineV2 {
                 ClickEvent.Deeplink(DeeplinkRoute.Rss.Detail(url))
             },
         override val extraKey: String? = null,
+        override val accountType: AccountType,
     ) : UiTimelineV2() {
         override val statusKey: MicroBlogKey = MicroBlogKey.fromRss(url)
         override val searchText: String =
@@ -179,6 +183,7 @@ public sealed class UiTimelineV2 {
         val parents: SerializableImmutableList<Post> = persistentListOf(),
         private val clickEvent: ClickEvent,
         override val extraKey: String? = null,
+        override val accountType: AccountType,
     ) : UiTimelineV2() {
         override val searchText: String =
             buildString {
@@ -267,6 +272,7 @@ public sealed class UiTimelineV2 {
         override val statusKey: MicroBlogKey,
         val button: SerializableImmutableList<ActionMenu.Item> = persistentListOf(),
         override val extraKey: String? = null,
+        override val accountType: AccountType,
     ) : UiTimelineV2() {
         override val searchText: String? = null
         override val itemKey: String =
@@ -293,6 +299,7 @@ public sealed class UiTimelineV2 {
         override val statusKey: MicroBlogKey,
         val post: Post? = null,
         override val extraKey: String? = null,
+        override val accountType: AccountType,
     ) : UiTimelineV2() {
         override val searchText: String? = null
         override val itemKey: String =
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
index deff6bb8b..236e53f31 100644
--- 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
@@ -22,6 +22,7 @@ import dev.dimension.flare.data.network.mastodon.api.model.Visibility
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
+import dev.dimension.flare.model.toAccountType
 import dev.dimension.flare.ui.model.ClickEvent
 import dev.dimension.flare.ui.model.UiCard
 import dev.dimension.flare.ui.model.UiEmoji
@@ -119,10 +120,11 @@ internal fun Notification.render(accountKey: MicroBlogKey): UiTimelineV2 {
                 ClickEvent.Deeplink(
                     DeeplinkRoute.Profile
                         .User(
-                            accountType = AccountType.Specific(accountKey),
+                            accountType = accountKey.toAccountType(),
                             userKey = user.key,
                         ),
                 ),
+            accountType = accountKey.toAccountType(),
         )
     if (type in listOf(NotificationTypes.FollowRequest)) {
         return UiTimelineV2.User(
@@ -137,7 +139,7 @@ internal fun Notification.render(accountKey: MicroBlogKey): UiTimelineV2 {
                                 accountKey,
                                 PostEvent.Mastodon.AcceptFollowRequest(
                                     userKey = user.key,
-                                    notificationStatusKey =
+                                    postKey =
                                         MicroBlogKey(
                                             id ?: "",
                                             accountKey.host,
@@ -154,7 +156,7 @@ internal fun Notification.render(accountKey: MicroBlogKey): UiTimelineV2 {
                                 accountKey,
                                 PostEvent.Mastodon.RejectFollowRequest(
                                     userKey = user.key,
-                                    notificationStatusKey =
+                                    postKey =
                                         MicroBlogKey(
                                             id ?: "",
                                             accountKey.host,
@@ -166,6 +168,7 @@ internal fun Notification.render(accountKey: MicroBlogKey): UiTimelineV2 {
                 ),
             createdAt = createdAt?.toUi() ?: Instant.DISTANT_PAST.toUi(),
             statusKey = MicroBlogKey(id ?: "", accountKey.host),
+            accountType = accountKey.toAccountType(),
         )
     } else if (status != null) {
         return status
@@ -181,6 +184,7 @@ internal fun Notification.render(accountKey: MicroBlogKey): UiTimelineV2 {
             message = message,
             createdAt = createdAt?.toUi() ?: Instant.DISTANT_PAST.toUi(),
             statusKey = MicroBlogKey(id ?: "", accountKey.host),
+            accountType = accountKey.toAccountType(),
         )
     }
 }
@@ -205,6 +209,7 @@ internal fun Status.render(
                 statusKey = currentStatus.statusKey,
                 createdAt = currentStatus.createdAt,
                 clickEvent = ClickEvent.Noop,
+                accountType = accountKey.toAccountType(),
             )
         } else if (reblog != null) {
             val currentStatus = this.renderStatus(host, accountKey)
@@ -223,15 +228,14 @@ internal fun Status.render(
                         ClickEvent.Deeplink(
                             DeeplinkRoute.Profile
                                 .User(
-                                    accountType =
-                                        accountKey?.let { AccountType.Specific(it) }
-                                            ?: AccountType.Guest,
+                                    accountType = accountKey.toAccountType(),
                                     userKey = userKey,
                                 ),
                         )
                     } else {
                         ClickEvent.Noop
                     },
+                accountType = accountKey.toAccountType(),
             )
         } else {
             null
@@ -318,7 +322,7 @@ private fun Status.renderStatus(
                         ClickEvent.event(
                             accountKey = accountKey,
                             PostEvent.Pleroma.React(
-                                statusKey = statusKey,
+                                postKey = statusKey,
                                 hasReacted = true,
                                 reaction = it.name.orEmpty(),
                             ),
@@ -396,20 +400,11 @@ private fun Status.renderStatus(
                     add(
                         ActionMenu.Group(
                             displayItem =
-                                ActionMenu.Item(
-                                    icon = if (reblogged == true) UiIcon.Unretweet else UiIcon.Retweet,
-                                    text =
-                                        ActionMenu.Item.Text.Localized(
-                                            if (reblogged ==
-                                                true
-                                            ) {
-                                                ActionMenu.Item.Text.Localized.Type.Unretweet
-                                            } else {
-                                                ActionMenu.Item.Text.Localized.Type.Retweet
-                                            },
-                                        ),
-                                    count = UiNumber(reblogsCount ?: 0),
-                                    color = if (reblogged == true) ActionMenu.Item.Color.PrimaryColor else null,
+                                ActionMenu.mastodonRepost(
+                                    reblogged = reblogged ?: false,
+                                    reblogsCount = reblogsCount ?: 0,
+                                    accountKey = accountKey,
+                                    statusKey = statusKey,
                                 ),
                             actions =
                                 buildList {
@@ -431,31 +426,11 @@ private fun Status.renderStatus(
                                         )
                                     }
                                     add(
-                                        ActionMenu.Item(
-                                            icon = if (reblogged == true) UiIcon.Unretweet else UiIcon.Retweet,
-                                            text =
-                                                ActionMenu.Item.Text.Localized(
-                                                    if (reblogged ==
-                                                        true
-                                                    ) {
-                                                        ActionMenu.Item.Text.Localized.Type.Unretweet
-                                                    } else {
-                                                        ActionMenu.Item.Text.Localized.Type.Retweet
-                                                    },
-                                                ),
-                                            count = UiNumber(reblogsCount ?: 0),
-                                            color = if (reblogged == true) ActionMenu.Item.Color.PrimaryColor else null,
-//                                            onClicked = {
-//                                                dataSource?.reblog(statusKey, reblogged ?: false)
-//                                            },
-                                            clickEvent =
-                                                ClickEvent.event(
-                                                    accountKey,
-                                                    PostEvent.Mastodon.Reblog(
-                                                        statusKey = statusKey,
-                                                        reblogged = reblogged ?: false,
-                                                    ),
-                                                ),
+                                        ActionMenu.mastodonRepost(
+                                            reblogged = reblogged ?: false,
+                                            reblogsCount = reblogsCount ?: 0,
+                                            accountKey = accountKey,
+                                            statusKey = statusKey,
                                         ),
                                     )
                                 }.toImmutableList(),
@@ -483,72 +458,29 @@ private fun Status.renderStatus(
                     )
                 } else if (canReblog) {
                     add(
-                        ActionMenu.Item(
-                            icon = if (reblogged == true) UiIcon.Unretweet else UiIcon.Retweet,
-                            text =
-                                ActionMenu.Item.Text.Localized(
-                                    if (reblogged ==
-                                        true
-                                    ) {
-                                        ActionMenu.Item.Text.Localized.Type.Unretweet
-                                    } else {
-                                        ActionMenu.Item.Text.Localized.Type.Retweet
-                                    },
-                                ),
-                            count = UiNumber(reblogsCount ?: 0),
-                            color = if (reblogged == true) ActionMenu.Item.Color.PrimaryColor else null,
-                            clickEvent =
-                                ClickEvent.event(
-                                    accountKey,
-                                    PostEvent.Mastodon.Reblog(
-                                        statusKey = statusKey,
-                                        reblogged = reblogged ?: false,
-                                    ),
-                                ),
+                        ActionMenu.mastodonRepost(
+                            reblogged = reblogged ?: false,
+                            reblogsCount = reblogsCount ?: 0,
+                            accountKey = accountKey,
+                            statusKey = statusKey,
                         ),
                     )
                 } else if (accountKey == null) {
                     add(
-                        ActionMenu.Item(
-                            icon = if (reblogged == true) UiIcon.Unretweet else UiIcon.Retweet,
-                            text =
-                                ActionMenu.Item.Text.Localized(
-                                    if (reblogged ==
-                                        true
-                                    ) {
-                                        ActionMenu.Item.Text.Localized.Type.Unretweet
-                                    } else {
-                                        ActionMenu.Item.Text.Localized.Type.Retweet
-                                    },
-                                ),
-                            count = UiNumber(reblogsCount ?: 0),
-                            color = if (reblogged == true) ActionMenu.Item.Color.PrimaryColor else null,
+                        ActionMenu.mastodonRepost(
+                            reblogged = reblogged ?: false,
+                            reblogsCount = reblogsCount ?: 0,
+                            accountKey = accountKey,
+                            statusKey = statusKey,
                         ),
                     )
                 }
                 add(
-                    ActionMenu.Item(
-                        icon = if (favourited == true) UiIcon.Unlike else UiIcon.Like,
-                        text =
-                            ActionMenu.Item.Text.Localized(
-                                if (favourited ==
-                                    true
-                                ) {
-                                    ActionMenu.Item.Text.Localized.Type.Unlike
-                                } else {
-                                    ActionMenu.Item.Text.Localized.Type.Like
-                                },
-                            ),
-                        count = UiNumber(favouritesCount ?: 0),
-                        color = if (favourited == true) ActionMenu.Item.Color.Red else null,
-                        clickEvent =
-                            ClickEvent.event(
-                                accountKey,
-                                PostEvent.Mastodon.Like(
-                                    statusKey = statusKey,
-                                    liked = favourited ?: false,
-                                ),
-                            ),
+                    ActionMenu.mastodonLike(
+                        favourited = favourited ?: false,
+                        favouritesCount = favouritesCount ?: 0,
+                        accountKey = accountKey,
+                        statusKey = statusKey,
                     ),
                 )
                 if (canReact) {
@@ -582,34 +514,10 @@ private fun Status.renderStatus(
                             buildList {
                                 if (accountKey != null) {
                                     add(
-                                        ActionMenu.Item(
-                                            icon =
-                                                if (bookmarked ==
-                                                    true
-                                                ) {
-                                                    UiIcon.Unbookmark
-                                                } else {
-                                                    UiIcon.Bookmark
-                                                },
-                                            text =
-                                                ActionMenu.Item.Text.Localized(
-                                                    if (bookmarked ==
-                                                        true
-                                                    ) {
-                                                        ActionMenu.Item.Text.Localized.Type.Unbookmark
-                                                    } else {
-                                                        ActionMenu.Item.Text.Localized.Type.Bookmark
-                                                    },
-                                                ),
-                                            count = UiNumber(0),
-                                            clickEvent =
-                                                ClickEvent.event(
-                                                    accountKey,
-                                                    PostEvent.Mastodon.Bookmark(
-                                                        statusKey = statusKey,
-                                                        bookmarked = bookmarked ?: false,
-                                                    ),
-                                                ),
+                                        ActionMenu.mastodonBookmark(
+                                            bookmarked ?: false,
+                                            accountKey,
+                                            statusKey,
                                         ),
                                     )
                                 }
@@ -735,6 +643,17 @@ private fun Status.renderStatus(
 //                        }
 //                    },
                     enabled = accountKey != null && !isFromMe,
+                    voteEvent =
+                        if (accountKey != null) {
+                            PostEvent.Mastodon.Vote(
+                                id = it.id ?: "",
+                                postKey = statusKey,
+                                accountKey = accountKey,
+                                options = persistentListOf(),
+                            )
+                        } else {
+                            null
+                        },
                 )
             },
         statusKey = statusKey,
@@ -753,9 +672,100 @@ private fun Status.renderStatus(
             ),
         platformType = PlatformType.Mastodon,
         emojiReactions = reactions,
+        accountType = accountKey.toAccountType(),
     )
 }
 
+internal fun ActionMenu.Companion.mastodonLike(
+    favourited: Boolean,
+    favouritesCount: Long,
+    accountKey: MicroBlogKey?,
+    statusKey: MicroBlogKey,
+): ActionMenu.Item =
+    ActionMenu.Item(
+        updateKey = "like",
+        icon = if (favourited) UiIcon.Unlike else UiIcon.Like,
+        text =
+            ActionMenu.Item.Text.Localized(
+                if (favourited) {
+                    ActionMenu.Item.Text.Localized.Type.Unlike
+                } else {
+                    ActionMenu.Item.Text.Localized.Type.Like
+                },
+            ),
+        count = UiNumber(favouritesCount),
+        color = if (favourited) ActionMenu.Item.Color.Red else null,
+        clickEvent =
+            ClickEvent.event(
+                accountKey,
+                PostEvent.Mastodon.Like(
+                    postKey = statusKey,
+                    liked = favourited,
+                ),
+            ),
+    )
+
+internal fun ActionMenu.Companion.mastodonRepost(
+    reblogged: Boolean,
+    reblogsCount: Long,
+    accountKey: MicroBlogKey?,
+    statusKey: MicroBlogKey,
+): ActionMenu.Item =
+    ActionMenu.Item(
+        updateKey = "reblog",
+        icon = if (reblogged) UiIcon.Unretweet else UiIcon.Retweet,
+        text =
+            ActionMenu.Item.Text.Localized(
+                if (reblogged) {
+                    ActionMenu.Item.Text.Localized.Type.Unretweet
+                } else {
+                    ActionMenu.Item.Text.Localized.Type.Retweet
+                },
+            ),
+        count = UiNumber(reblogsCount),
+        color = if (reblogged) ActionMenu.Item.Color.PrimaryColor else null,
+        clickEvent =
+            ClickEvent.event(
+                accountKey,
+                PostEvent.Mastodon.Reblog(
+                    postKey = statusKey,
+                    reblogged = reblogged,
+                ),
+            ),
+    )
+
+internal fun ActionMenu.Companion.mastodonBookmark(
+    bookmarked: Boolean,
+    accountKey: MicroBlogKey?,
+    statusKey: MicroBlogKey,
+): ActionMenu.Item =
+    ActionMenu.Item(
+        updateKey = "bookmark",
+        icon =
+            if (bookmarked) {
+                UiIcon.Unbookmark
+            } else {
+                UiIcon.Bookmark
+            },
+        text =
+            ActionMenu.Item.Text.Localized(
+                if (bookmarked) {
+                    ActionMenu.Item.Text.Localized.Type.Unbookmark
+                } else {
+                    ActionMenu.Item.Text.Localized.Type.Bookmark
+                },
+            ),
+        count = UiNumber(0),
+        clickEvent =
+            ClickEvent.event(
+                accountKey,
+                PostEvent.Mastodon.Bookmark(
+                    postKey = statusKey,
+                    bookmarked = bookmarked,
+                ),
+            ),
+    )
+
 private fun Attachment.toUi(sensitive: Boolean): UiMedia? =
     when (type) {
         MediaType.Image ->
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/DeepLinkPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/DeepLinkPresenter.kt
index d08238799..4a69618a7 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/DeepLinkPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/DeepLinkPresenter.kt
@@ -63,7 +63,7 @@ public class DeepLinkPresenter(
                             repository = accountRepository,
                         ).collect { service ->
                             if (service is AuthenticatedMicroblogDataSource) {
-                                service.handleEvent(event.postEvent)
+                                service.postEventHandler.handleEvent(event.postEvent)
                             }
                         }
                     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/UserPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/UserPresenter.kt
index b5851e2fc..5d5791486 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/UserPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/UserPresenter.kt
@@ -3,6 +3,7 @@ package dev.dimension.flare.ui.presenter.home
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import dev.dimension.flare.data.datasource.microblog.AuthenticatedMicroblogDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.UserDataSource
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.NoActiveAccountException
 import dev.dimension.flare.data.repository.accountServiceFlow
@@ -36,10 +37,10 @@ public open class UserPresenter(
                         } else {
                             null
                         }
-                if (userId == null) {
+                if (userId == null || service !is UserDataSource) {
                     flowOf(UiState.Error(NoActiveAccountException))
                 } else {
-                    service.userById(userId).toUi()
+                    service.userHandler.userById(userId).toUi()
                 }
             }
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/AllListPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/AllListPresenter.kt
index e4ce16a00..71b2d704b 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/AllListPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/AllListPresenter.kt
@@ -10,7 +10,7 @@ import dev.dimension.flare.common.PagingState
 import dev.dimension.flare.common.isRefreshing
 import dev.dimension.flare.common.refreshSuspend
 import dev.dimension.flare.common.toPagingState
-import dev.dimension.flare.data.datasource.microblog.list.ListDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.ListDataSource
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceProvider
 import dev.dimension.flare.model.AccountType
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/CreateListPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/CreateListPresenter.kt
index 95496aef7..c01de920f 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/CreateListPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/CreateListPresenter.kt
@@ -2,7 +2,7 @@ package dev.dimension.flare.ui.presenter.list
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
-import dev.dimension.flare.data.datasource.microblog.list.ListDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.ListDataSource
 import dev.dimension.flare.data.datasource.microblog.list.ListMetaData
 import dev.dimension.flare.data.datasource.microblog.list.ListMetaDataType
 import dev.dimension.flare.data.repository.AccountRepository
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/DeleteListPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/DeleteListPresenter.kt
index 67264ae0d..c4879c6d2 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/DeleteListPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/DeleteListPresenter.kt
@@ -2,7 +2,7 @@ package dev.dimension.flare.ui.presenter.list
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
-import dev.dimension.flare.data.datasource.microblog.list.ListDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.ListDataSource
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceFlow
 import dev.dimension.flare.model.AccountType
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/EditAccountListPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/EditAccountListPresenter.kt
index 315f7eb88..8e5aa7a0d 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/EditAccountListPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/EditAccountListPresenter.kt
@@ -10,7 +10,7 @@ import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.filter
 import dev.dimension.flare.common.PagingState
 import dev.dimension.flare.common.toPagingState
-import dev.dimension.flare.data.datasource.microblog.list.ListDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.ListDataSource
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceFlow
 import dev.dimension.flare.data.repository.accountServiceProvider
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/EditListMemberPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/EditListMemberPresenter.kt
index 4020fde5d..ae581fbfb 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/EditListMemberPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/EditListMemberPresenter.kt
@@ -11,7 +11,7 @@ import androidx.paging.map
 import dev.dimension.flare.common.PagingState
 import dev.dimension.flare.common.emptyFlow
 import dev.dimension.flare.common.toPagingState
-import dev.dimension.flare.data.datasource.microblog.list.ListDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.ListDataSource
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceFlow
 import dev.dimension.flare.data.repository.accountServiceProvider
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ListEditPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ListEditPresenter.kt
index 198fba132..d21617367 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ListEditPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ListEditPresenter.kt
@@ -5,7 +5,7 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import dev.dimension.flare.common.refreshSuspend
-import dev.dimension.flare.data.datasource.microblog.list.ListDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.ListDataSource
 import dev.dimension.flare.data.datasource.microblog.list.ListMetaData
 import dev.dimension.flare.data.datasource.microblog.list.ListMetaDataType
 import dev.dimension.flare.data.repository.AccountRepository
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ListInfoPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ListInfoPresenter.kt
index 600ef0fc0..4e78a2e56 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ListInfoPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ListInfoPresenter.kt
@@ -4,7 +4,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.remember
 import dev.dimension.flare.common.collectAsState
-import dev.dimension.flare.data.datasource.microblog.list.ListDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.ListDataSource
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceProvider
 import dev.dimension.flare.model.AccountType
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ListMembersPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ListMembersPresenter.kt
index 37a8ce2ce..18895a33f 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ListMembersPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ListMembersPresenter.kt
@@ -8,7 +8,7 @@ import androidx.paging.cachedIn
 import androidx.paging.compose.collectAsLazyPagingItems
 import dev.dimension.flare.common.PagingState
 import dev.dimension.flare.common.toPagingState
-import dev.dimension.flare.data.datasource.microblog.list.ListDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.ListDataSource
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceProvider
 import dev.dimension.flare.model.AccountType
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ListTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ListTimelinePresenter.kt
index 7292f6768..68f7ea91b 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ListTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ListTimelinePresenter.kt
@@ -1,6 +1,6 @@
 package dev.dimension.flare.ui.presenter.list
 
-import dev.dimension.flare.data.datasource.microblog.list.ListDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.ListDataSource
 import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceFlow
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/PinnableTimelineTabPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/PinnableTimelineTabPresenter.kt
index 2c41b29df..d20c47477 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/PinnableTimelineTabPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/PinnableTimelineTabPresenter.kt
@@ -11,7 +11,7 @@ import dev.dimension.flare.common.PagingState
 import dev.dimension.flare.common.toImmutableListWrapper
 import dev.dimension.flare.common.toPagingState
 import dev.dimension.flare.data.datasource.bluesky.BlueskyDataSource
-import dev.dimension.flare.data.datasource.microblog.list.ListDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.ListDataSource
 import dev.dimension.flare.data.datasource.misskey.MisskeyDataSource
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceProvider
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/BlockUserPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/BlockUserPresenter.kt
index 617ce9f4d..be0620210 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/BlockUserPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/BlockUserPresenter.kt
@@ -2,7 +2,7 @@ package dev.dimension.flare.ui.presenter.profile
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
-import dev.dimension.flare.data.datasource.microblog.RelationDataSource
+import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceFlow
 import dev.dimension.flare.model.AccountType
@@ -36,7 +36,7 @@ public class BlockUserPresenter(
                         accountServiceFlow(accountType, repository = accountRepository)
                             .firstOrNull()
                             ?.let {
-                                if (it is RelationDataSource) {
+                                if (it is RelationLoader) {
                                     it.block(userKey)
                                 }
                             }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/MuteUserPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/MuteUserPresenter.kt
index abddb52cb..66135dc48 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/MuteUserPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/MuteUserPresenter.kt
@@ -2,7 +2,7 @@ package dev.dimension.flare.ui.presenter.profile
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
-import dev.dimension.flare.data.datasource.microblog.RelationDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.RelationDataSource
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceFlow
 import dev.dimension.flare.model.AccountType
@@ -37,7 +37,7 @@ public class MuteUserPresenter(
                             .firstOrNull()
                             ?.let {
                                 if (it is RelationDataSource) {
-                                    it.mute(userKey)
+                                    it.relationHandler.mute(userKey)
                                 }
                             }
                     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt
index 93e36a097..5fe4facd1 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt
@@ -11,7 +11,7 @@ import dev.dimension.flare.data.datasource.microblog.AuthenticatedMicroblogDataS
 import dev.dimension.flare.data.datasource.microblog.DirectMessageDataSource
 import dev.dimension.flare.data.datasource.microblog.ProfileAction
 import dev.dimension.flare.data.datasource.microblog.ProfileTab
-import dev.dimension.flare.data.datasource.microblog.list.ListDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.ListDataSource
 import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.NoActiveAccountException
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListHandlerTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListHandlerTest.kt
index e2e56f726..23b3e04e9 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListHandlerTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListHandlerTest.kt
@@ -5,6 +5,8 @@ import androidx.room.Room
 import androidx.sqlite.driver.bundled.BundledSQLiteDriver
 import dev.dimension.flare.RobolectricTest
 import dev.dimension.flare.data.database.cache.CacheDatabase
+import dev.dimension.flare.data.datasource.microblog.handler.ListHandler
+import dev.dimension.flare.data.datasource.microblog.loader.ListLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.memoryDatabaseBuilder
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListMemberHandlerTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListMemberHandlerTest.kt
index dccba8635..fce5d520c 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListMemberHandlerTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListMemberHandlerTest.kt
@@ -7,6 +7,8 @@ import dev.dimension.flare.RobolectricTest
 import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.model.DbUser
 import dev.dimension.flare.data.database.cache.model.UserContent
+import dev.dimension.flare.data.datasource.microblog.handler.ListMemberHandler
+import dev.dimension.flare.data.datasource.microblog.loader.ListMemberLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.mastodon.api.model.Account

From 46e47a2ab8cdd33b859e8bd208bb3e9df54a7f5c Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Tue, 3 Mar 2026 17:27:20 +0900
Subject: [PATCH 05/33] fix db model

---
 .../database/cache/dao/PagingTimelineDao.kt   | 52 ++++++++++++++++---
 .../flare/data/database/cache/dao/UserDao.kt  |  4 +-
 .../database/cache/model/DbPagingTimeline.kt  |  2 +-
 .../flare/data/database/cache/model/DbUser.kt |  1 +
 4 files changed, 50 insertions(+), 9 deletions(-)

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
index 807b64edc..33c05bba6 100644
--- 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
@@ -21,7 +21,10 @@ import kotlinx.coroutines.flow.Flow
 internal interface PagingTimelineDao {
     @Transaction
     @Query(
-        "SELECT * FROM DbPagingTimeline WHERE pagingKey = :pagingKey AND accountType = :accountType ORDER BY sortId DESC",
+        "SELECT DbPagingTimeline.* FROM DbPagingTimeline " +
+            "INNER JOIN DbStatus ON DbStatus.statusKey = DbPagingTimeline.statusKey " +
+            "WHERE DbPagingTimeline.pagingKey = :pagingKey AND DbStatus.accountType = :accountType " +
+            "ORDER BY DbPagingTimeline.sortId DESC",
     )
     fun getPagingSource(
         pagingKey: String,
@@ -43,7 +46,12 @@ internal interface PagingTimelineDao {
     fun searchHistoryPagingSource(query: String): PagingSource<Int, DbStatusWithReference>
 
     @Transaction
-    @Query("SELECT * FROM DbPagingTimeline WHERE pagingKey = :pagingKey AND accountType = :accountType LIMIT 1")
+    @Query(
+        "SELECT DbPagingTimeline.* FROM DbPagingTimeline " +
+            "INNER JOIN DbStatus ON DbStatus.statusKey = DbPagingTimeline.statusKey " +
+            "WHERE DbPagingTimeline.pagingKey = :pagingKey AND DbStatus.accountType = :accountType " +
+            "LIMIT 1",
+    )
     fun get(
         pagingKey: String,
         accountType: DbAccountType,
@@ -59,7 +67,14 @@ internal interface PagingTimelineDao {
     @Delete
     suspend fun delete(timeline: List<DbPagingTimeline>)
 
-    @Query("DELETE FROM DbPagingTimeline WHERE pagingKey = :pagingKey AND accountType = :accountType")
+    @Query(
+        "DELETE FROM DbPagingTimeline WHERE pagingKey = :pagingKey " +
+            "AND EXISTS(" +
+            "SELECT 1 FROM DbStatus " +
+            "WHERE DbStatus.statusKey = DbPagingTimeline.statusKey " +
+            "AND DbStatus.accountType = :accountType" +
+            ")",
+    )
     suspend fun delete(
         pagingKey: String,
         accountType: DbAccountType,
@@ -78,10 +93,25 @@ internal interface PagingTimelineDao {
     @Query("DELETE FROM DbPagingTimeline WHERE pagingKey = :pagingKey")
     suspend fun delete(pagingKey: String)
 
-    @Query("DELETE FROM DbPagingTimeline WHERE accountType = :accountType")
+    @Query(
+        "DELETE FROM DbPagingTimeline " +
+            "WHERE EXISTS(" +
+            "SELECT 1 FROM DbStatus " +
+            "WHERE DbStatus.statusKey = DbPagingTimeline.statusKey " +
+            "AND DbStatus.accountType = :accountType" +
+            ")",
+    )
     suspend fun deleteByAccountType(accountType: DbAccountType)
 
-    @Query("DELETE FROM DbPagingTimeline WHERE accountType = :accountType AND statusKey = :statusKey")
+    @Query(
+        "DELETE FROM DbPagingTimeline " +
+            "WHERE statusKey = :statusKey " +
+            "AND EXISTS(" +
+            "SELECT 1 FROM DbStatus " +
+            "WHERE DbStatus.statusKey = DbPagingTimeline.statusKey " +
+            "AND DbStatus.accountType = :accountType" +
+            ")",
+    )
     suspend fun deleteStatus(
         accountType: DbAccountType,
         statusKey: MicroBlogKey,
@@ -95,7 +125,17 @@ internal interface PagingTimelineDao {
         statusKey = statusKey,
     )
 
-    @Query("SELECT EXISTS(SELECT 1 FROM DbPagingTimeline WHERE accountType = :accountType AND pagingKey = :paging_key)")
+    @Query(
+        "SELECT EXISTS(" +
+            "SELECT 1 FROM DbPagingTimeline " +
+            "WHERE pagingKey = :paging_key " +
+            "AND EXISTS(" +
+            "SELECT 1 FROM DbStatus " +
+            "WHERE DbStatus.statusKey = DbPagingTimeline.statusKey " +
+            "AND DbStatus.accountType = :accountType" +
+            ")" +
+            ")",
+    )
     suspend fun existsPaging(
         accountType: DbAccountType,
         paging_key: String,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt
index e3495359e..b6498b321 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt
@@ -11,9 +11,9 @@ import dev.dimension.flare.data.database.cache.model.DbUser
 import dev.dimension.flare.data.database.cache.model.DbUserHistory
 import dev.dimension.flare.data.database.cache.model.DbUserHistoryWithUser
 import dev.dimension.flare.data.database.cache.model.DbUserRelation
-import dev.dimension.flare.data.database.cache.model.UserContent
 import dev.dimension.flare.model.DbAccountType
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiProfile
 import kotlinx.coroutines.flow.Flow
 
 @Dao
@@ -30,7 +30,7 @@ internal interface UserDao {
     @Query("UPDATE DbUser SET content = :content WHERE userKey = :userKey")
     suspend fun update(
         userKey: MicroBlogKey,
-        content: UserContent,
+        content: UiProfile,
     )
 
     @Query("SELECT * FROM DbUser WHERE userKey IN (:userKeys)")
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbPagingTimeline.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbPagingTimeline.kt
index 25986d591..4ede9de4b 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbPagingTimeline.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbPagingTimeline.kt
@@ -54,7 +54,7 @@ internal data class DbStatusWithUser(
     @Relation(
         parentColumn = "statusKey",
         entityColumn = "statusKey",
-        entity = DbStatusReference::class,
+        entity = DbStatusUserReference::class,
     )
     val references: List<DbStatusUserReferenceWithUser>,
 )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbUser.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbUser.kt
index 2eb5147d1..a4ad8d6b3 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbUser.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbUser.kt
@@ -22,6 +22,7 @@ internal data class DbUser(
 )
 
 @Entity(
+    primaryKeys = ["accountKey", "userKey"],
     indices = [
         Index(value = ["accountKey", "userKey"], unique = true),
     ],

From 5a2654ff86abd31c028174fd03724c623ab66775 Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Wed, 4 Mar 2026 01:16:59 +0900
Subject: [PATCH 06/33] [WIP] migrate bsky

---
 .../data/database/cache/mapper/Bluesky.kt     | 769 -----------------
 .../data/database/cache/mapper/Mastodon.kt    | 195 -----
 .../database/cache/model/DbPagingTimeline.kt  |   8 -
 .../database/cache/model/StatusContent.kt     | 162 ----
 .../data/database/cache/model/UserContent.kt  |  59 --
 .../datasource/bluesky/BlueskyDataSource.kt   | 590 +++----------
 .../data/datasource/bluesky/BlueskyLoader.kt  | 191 ++++
 .../bluesky/BookmarkTimelineRemoteMediator.kt |  22 +-
 .../datasource/bluesky/FansPagingSource.kt    |  63 +-
 .../bluesky/FeedTimelineRemoteMediator.kt     |  22 +-
 .../bluesky/FollowingPagingSource.kt          |  63 +-
 .../bluesky/HomeTimelineRemoteMediator.kt     |  41 +-
 .../bluesky/ListTimelineRemoteMediator.kt     |  22 +-
 .../bluesky/NotificationRemoteMediator.kt     |  23 +-
 .../bluesky/SearchStatusRemoteMediator.kt     |  22 +-
 .../bluesky/SearchUserPagingSource.kt         |  54 +-
 .../bluesky/StatusDetailRemoteMediator.kt     |  23 +-
 .../bluesky/TrendsUserPagingSource.kt         |  46 +-
 .../UserLikesTimelineRemoteMediator.kt        |  22 +-
 .../bluesky/UserTimelineRemoteMediator.kt     |  22 +-
 .../data/datasource/microblog/PostEvent.kt    |  15 +-
 .../microblog/ReactionDataSource.kt           |   6 -
 .../datasource/pleroma/PleromaDataSource.kt   |   4 +-
 .../dimension/flare/ui/model/UiTimelineV2.kt  |   4 +-
 .../flare/ui/model/mapper/Bluesky.kt          | 814 ++++++++++--------
 .../flare/ui/model/mapper/Mastodon.kt         | 107 ++-
 26 files changed, 1024 insertions(+), 2345 deletions(-)
 delete mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Mastodon.kt
 delete mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/StatusContent.kt
 delete mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/UserContent.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyLoader.kt

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
index 8e7949853..13dd09ff8 100644
--- 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
@@ -1,19 +1,5 @@
 package dev.dimension.flare.data.database.cache.mapper
 
-import SnowflakeIdGenerator
-import app.bsky.actor.ProfileView
-import app.bsky.actor.ProfileViewBasic
-import app.bsky.actor.ProfileViewDetailed
-import app.bsky.bookmark.BookmarkView
-import app.bsky.bookmark.BookmarkViewItemUnion
-import app.bsky.feed.FeedViewPost
-import app.bsky.feed.FeedViewPostReasonUnion
-import app.bsky.feed.Like
-import app.bsky.feed.PostView
-import app.bsky.feed.ReplyRefParentUnion
-import app.bsky.feed.Repost
-import app.bsky.notification.ListNotificationsNotification
-import app.bsky.notification.ListNotificationsNotificationReason
 import chat.bsky.convo.ConvoView
 import chat.bsky.convo.ConvoViewLastMessageUnion
 import chat.bsky.convo.MessageView
@@ -22,24 +8,10 @@ import dev.dimension.flare.data.database.cache.model.DbDirectMessageTimeline
 import dev.dimension.flare.data.database.cache.model.DbMessageItem
 import dev.dimension.flare.data.database.cache.model.DbMessageRoom
 import dev.dimension.flare.data.database.cache.model.DbMessageRoomReference
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.database.cache.model.DbStatus
-import dev.dimension.flare.data.database.cache.model.DbStatusWithUser
-import dev.dimension.flare.data.database.cache.model.DbUser
 import dev.dimension.flare.data.database.cache.model.MessageContent
-import dev.dimension.flare.data.database.cache.model.StatusContent
-import dev.dimension.flare.data.database.cache.model.StatusContent.BlueskyNotification.Post
-import dev.dimension.flare.data.database.cache.model.StatusContent.BlueskyNotification.UserList
-import dev.dimension.flare.data.database.cache.model.UserContent
 import dev.dimension.flare.model.AccountType
-import dev.dimension.flare.model.AccountType.Specific
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
-import dev.dimension.flare.model.ReferenceType
-import dev.dimension.flare.ui.model.mapper.parseBlueskyJson
-import kotlinx.collections.immutable.ImmutableMap
-import kotlinx.coroutines.flow.firstOrNull
-import sh.christian.ozone.api.AtUri
 
 internal object Bluesky {
     suspend fun saveDM(
@@ -78,749 +50,8 @@ internal object Bluesky {
         database.messageDao().insertMessages(messages)
 //        database.messageDao().insert(room)
     }
-
-    suspend fun savePost(
-        accountKey: MicroBlogKey,
-        pagingKey: String,
-        database: CacheDatabase,
-        data: List<PostView>,
-        sortIdProvider: (PostView) -> Long = {
-            it.indexedAt.toEpochMilliseconds()
-        },
-    ) {
-        save(database, data.toDb(accountKey, pagingKey, sortIdProvider))
-    }
-
-    private suspend fun save(
-        database: CacheDatabase,
-        timeline: List<DbPagingTimelineWithStatus>,
-    ) {
-        (
-            timeline.mapNotNull { it.status.status.user } +
-                timeline
-                    .flatMap { it.status.references }
-                    .mapNotNull { it.status?.user }
-        ).let { allUsers ->
-            val exsitingUsers =
-                database
-                    .userDao()
-                    .findByKeys(allUsers.map { it.userKey })
-                    .firstOrNull()
-                    .orEmpty()
-                    .filter {
-                        it.content is UserContent.Bluesky
-                    }.map {
-                        val content = it.content as UserContent.Bluesky
-                        val user =
-                            allUsers.find { user ->
-                                user.userKey == it.userKey
-                            }
-
-                        if (user != null && user.content is UserContent.BlueskyLite) {
-                            it.copy(
-                                content =
-                                    content.copy(
-                                        data =
-                                            content.data.copy(
-                                                handle = user.content.data.handle,
-                                                displayName = user.content.data.displayName,
-                                                avatar = user.content.data.avatar,
-                                            ),
-                                    ),
-                            )
-                        } else {
-                            it
-                        }
-                    }
-
-            val result = (exsitingUsers + allUsers).distinctBy { it.userKey }
-            database.userDao().insertAll(result)
-        }
-        (
-            timeline.map { it.status.status.data } +
-                timeline
-                    .flatMap { it.status.references }
-                    .mapNotNull { it.status?.data }
-        ).let {
-            database.statusDao().insertAll(it)
-        }
-        timeline.flatMap { it.status.references }.map { it.reference }.let {
-            database.statusReferenceDao().delete(it.map { it.statusKey })
-            database.statusReferenceDao().insertAll(it)
-        }
-        database.pagingTimelineDao().insertAll(timeline.map { it.timeline })
-    }
-}
-
-internal suspend fun List<BookmarkView>.toDb(
-    accountKey: MicroBlogKey,
-    pagingKey: String,
-    sortIdProvider: suspend (BookmarkView) -> Long = {
-        it.createdAt?.toEpochMilliseconds() ?: SnowflakeIdGenerator.nextId()
-    },
-): List<DbPagingTimelineWithStatus> =
-    this.mapNotNull {
-        it.toDbStatusWithUser(accountKey)?.let { status ->
-            createDbPagingTimelineWithStatus(
-                accountKey = accountKey,
-                pagingKey = pagingKey,
-                sortId = sortIdProvider(it),
-                status = status,
-                references = mapOf(),
-            )
-        }
-    }
-
-internal fun List<PostView>.toDb(
-    accountKey: MicroBlogKey,
-    pagingKey: String,
-    sortIdProvider: (PostView) -> Long = { it.indexedAt.toEpochMilliseconds() },
-): List<DbPagingTimelineWithStatus> =
-    this.map {
-        createDbPagingTimelineWithStatus(
-            accountKey = accountKey,
-            pagingKey = pagingKey,
-            sortId = sortIdProvider(it),
-            status = it.toDbStatusWithUser(accountKey),
-            references = mapOf(),
-        )
-    }
-
-internal fun List<ListNotificationsNotification>.toDb(
-    accountKey: MicroBlogKey,
-    pagingKey: String,
-    references: ImmutableMap<AtUri, PostView>,
-): List<DbPagingTimelineWithStatus> {
-    // merge same type
-    val grouped = this.groupBy { it.reason }.filter { it.value.any() }
-    return grouped.flatMap { (reason, items) ->
-        when (reason) {
-            is ListNotificationsNotificationReason.Unknown,
-            ListNotificationsNotificationReason.StarterpackJoined,
-            ListNotificationsNotificationReason.Verified,
-            ListNotificationsNotificationReason.Unverified,
-            ->
-                items.map {
-                    createDbPagingTimelineWithStatus(
-                        accountKey = accountKey,
-                        pagingKey = pagingKey,
-                        sortId = it.indexedAt.toEpochMilliseconds(),
-                        status = it.toDbStatusWithUser(accountKey),
-                        references = mapOf(),
-                    )
-                }
-
-            ListNotificationsNotificationReason.Repost, ListNotificationsNotificationReason.Like -> {
-                val post =
-                    items
-                        .first()
-                        .record
-                        .let {
-                            when (reason) {
-                                ListNotificationsNotificationReason.Repost -> it.decodeAs<Repost>().subject
-                                ListNotificationsNotificationReason.Like -> it.decodeAs<Like>().subject
-                            }
-                        }.uri
-                        .let {
-                            references[it]
-                        }
-                val content =
-                    UserList(
-                        data = items,
-                        post = post,
-                    )
-                val idSuffix =
-                    when (reason) {
-                        ListNotificationsNotificationReason.Repost -> "_repost"
-                        ListNotificationsNotificationReason.Like -> "_like"
-                    }
-                val data =
-                    DbStatusWithUser(
-                        user = null,
-                        data =
-                            DbStatus(
-                                statusKey =
-                                    MicroBlogKey(
-                                        id = items.joinToString("_") { it.uri.atUri } + idSuffix,
-                                        host = accountKey.host,
-                                    ),
-                                accountType = Specific(accountKey),
-                                userKey = null,
-                                content = content,
-                                text = null,
-                                createdAt = items.first().indexedAt,
-                            ),
-                    )
-                listOf(
-                    createDbPagingTimelineWithStatus(
-                        accountKey = accountKey,
-                        pagingKey = pagingKey,
-                        sortId =
-                            items
-                                .first()
-                                .indexedAt
-                                .toEpochMilliseconds(),
-                        status = data,
-                        references =
-                            listOfNotNull(
-                                post,
-                            ).associate {
-                                ReferenceType.Notification to
-                                    listOfNotNull(
-                                        it.toDbStatusWithUser(
-                                            accountKey = accountKey,
-                                        ),
-                                    )
-                            },
-                    ),
-                )
-            }
-
-            ListNotificationsNotificationReason.Follow -> {
-                val content = UserList(data = items, post = null)
-                val data =
-                    DbStatusWithUser(
-                        user = null,
-                        data =
-                            DbStatus(
-                                statusKey =
-                                    MicroBlogKey(
-                                        id = items.joinToString("_") { it.uri.atUri } + "_follow",
-                                        host = accountKey.host,
-                                    ),
-                                accountType = Specific(accountKey),
-                                userKey = null,
-                                content = content,
-                                text = null,
-                                createdAt = items.first().indexedAt,
-                            ),
-                    )
-                listOfNotNull(
-                    createDbPagingTimelineWithStatus(
-                        accountKey = accountKey,
-                        pagingKey = pagingKey,
-                        sortId =
-                            items
-                                .first()
-                                .indexedAt
-                                .toEpochMilliseconds(),
-                        status = data,
-                        references = mapOf(),
-                    ),
-                )
-            }
-
-            ListNotificationsNotificationReason.Mention,
-            ListNotificationsNotificationReason.Reply,
-            ListNotificationsNotificationReason.Quote,
-            -> {
-                items.mapNotNull {
-                    val post = references[it.uri] ?: return@mapNotNull null
-                    val content = Post(post = post)
-                    val user = post.author.toDbUser(accountKey.host)
-                    val data =
-                        DbStatusWithUser(
-                            user = user,
-                            data =
-                                DbStatus(
-                                    statusKey =
-                                        MicroBlogKey(
-                                            id = it.uri.atUri,
-                                            host = accountKey.host,
-                                        ),
-                                    accountType = Specific(accountKey),
-                                    userKey = user.userKey,
-                                    content = content,
-                                    text = null,
-                                    createdAt = it.indexedAt,
-                                ),
-                        )
-                    createDbPagingTimelineWithStatus(
-                        accountKey = accountKey,
-                        pagingKey = pagingKey,
-                        sortId = it.indexedAt.toEpochMilliseconds(),
-                        status = data,
-                        references =
-                            mapOf(
-                                ReferenceType.Notification to
-                                    listOfNotNull(
-                                        post.toDbStatusWithUser(
-                                            accountKey,
-                                        ),
-                                    ),
-                            ),
-                    )
-                }
-            }
-
-            ListNotificationsNotificationReason.LikeViaRepost ->
-                items.mapNotNull {
-                    val post = references[it.uri] ?: return@mapNotNull null
-                    val content = Post(post = post)
-                    val user = post.author.toDbUser(accountKey.host)
-                    val data =
-                        DbStatusWithUser(
-                            user = user,
-                            data =
-                                DbStatus(
-                                    statusKey =
-                                        MicroBlogKey(
-                                            id = it.uri.atUri,
-                                            host = accountKey.host,
-                                        ),
-                                    accountType = Specific(accountKey),
-                                    userKey = user.userKey,
-                                    content = content,
-                                    text = null,
-                                    createdAt = it.indexedAt,
-                                ),
-                        )
-                    createDbPagingTimelineWithStatus(
-                        accountKey = accountKey,
-                        pagingKey = pagingKey,
-                        sortId = it.indexedAt.toEpochMilliseconds(),
-                        status = data,
-                        references =
-                            mapOf(
-                                ReferenceType.Notification to
-                                    listOfNotNull(
-                                        post.toDbStatusWithUser(
-                                            accountKey,
-                                        ),
-                                    ),
-                            ),
-                    )
-                }
-
-            ListNotificationsNotificationReason.RepostViaRepost ->
-                items.mapNotNull {
-                    val post = references[it.uri] ?: return@mapNotNull null
-                    val content = Post(post = post)
-                    val user = post.author.toDbUser(accountKey.host)
-                    val data =
-                        DbStatusWithUser(
-                            user = user,
-                            data =
-                                DbStatus(
-                                    statusKey =
-                                        MicroBlogKey(
-                                            id = it.uri.atUri,
-                                            host = accountKey.host,
-                                        ),
-                                    accountType = Specific(accountKey),
-                                    userKey = user.userKey,
-                                    content = content,
-                                    text = null,
-                                    createdAt = it.indexedAt,
-                                ),
-                        )
-                    createDbPagingTimelineWithStatus(
-                        accountKey = accountKey,
-                        pagingKey = pagingKey,
-                        sortId = it.indexedAt.toEpochMilliseconds(),
-                        status = data,
-                        references =
-                            mapOf(
-                                ReferenceType.Notification to
-                                    listOfNotNull(
-                                        post.toDbStatusWithUser(
-                                            accountKey,
-                                        ),
-                                    ),
-                            ),
-                    )
-                }
-
-            ListNotificationsNotificationReason.SubscribedPost -> {
-                items.mapNotNull {
-                    val post = references[it.uri] ?: return@mapNotNull null
-                    val content = Post(post = post)
-                    val user = post.author.toDbUser(accountKey.host)
-                    val data =
-                        DbStatusWithUser(
-                            user = user,
-                            data =
-                                DbStatus(
-                                    statusKey =
-                                        MicroBlogKey(
-                                            id = it.uri.atUri,
-                                            host = accountKey.host,
-                                        ),
-                                    accountType = Specific(accountKey),
-                                    userKey = user.userKey,
-                                    content = content,
-                                    text = null,
-                                    createdAt = it.indexedAt,
-                                ),
-                        )
-                    createDbPagingTimelineWithStatus(
-                        accountKey = accountKey,
-                        pagingKey = pagingKey,
-                        sortId = it.indexedAt.toEpochMilliseconds(),
-                        status = data,
-                        references =
-                            mapOf(
-                                ReferenceType.Notification to
-                                    listOfNotNull(
-                                        post.toDbStatusWithUser(
-                                            accountKey,
-                                        ),
-                                    ),
-                            ),
-                    )
-                }
-            }
-
-            ListNotificationsNotificationReason.ContactMatch -> {
-                items.mapNotNull {
-                    val post = references[it.uri] ?: return@mapNotNull null
-                    val content = Post(post = post)
-                    val user = post.author.toDbUser(accountKey.host)
-                    val data =
-                        DbStatusWithUser(
-                            user = user,
-                            data =
-                                DbStatus(
-                                    statusKey =
-                                        MicroBlogKey(
-                                            id = it.uri.atUri,
-                                            host = accountKey.host,
-                                        ),
-                                    accountType = Specific(accountKey),
-                                    userKey = user.userKey,
-                                    content = content,
-                                    text = null,
-                                    createdAt = it.indexedAt,
-                                ),
-                        )
-                    createDbPagingTimelineWithStatus(
-                        accountKey = accountKey,
-                        pagingKey = pagingKey,
-                        sortId = it.indexedAt.toEpochMilliseconds(),
-                        status = data,
-                        references =
-                            mapOf(
-                                ReferenceType.Notification to
-                                    listOfNotNull(
-                                        post.toDbStatusWithUser(
-                                            accountKey,
-                                        ),
-                                    ),
-                            ),
-                    )
-                }
-            }
-        }
-    }
-}
-
-private fun BookmarkView.toDbStatusWithUser(accountKey: MicroBlogKey): DbStatusWithUser? =
-    when (val content = item) {
-        is BookmarkViewItemUnion.BlockedPost -> null
-        is BookmarkViewItemUnion.NotFoundPost -> null
-        is BookmarkViewItemUnion.PostView -> content.value.toDbStatusWithUser(accountKey)
-        is BookmarkViewItemUnion.Unknown -> null
-    }
-
-private fun ListNotificationsNotification.toDbStatusWithUser(accountKey: MicroBlogKey): DbStatusWithUser {
-    val user = this.author.toDbUser(accountKey.host)
-    val status = this.toDbStatus(accountKey)
-    return DbStatusWithUser(
-        data = status,
-        user = user,
-    )
-}
-
-private fun ListNotificationsNotification.toDbStatus(accountKey: MicroBlogKey): DbStatus {
-    val user = this.author.toDbUser(accountKey.host)
-    return DbStatus(
-        statusKey =
-            MicroBlogKey(
-                uri.atUri + "_" + user.userKey,
-                accountKey.host,
-            ),
-        userKey = user.userKey,
-        content = StatusContent.BlueskyNotification.Normal(this),
-        accountType = AccountType.Specific(accountKey),
-        text = null,
-        createdAt = indexedAt,
-    )
-}
-
-internal suspend fun List<FeedViewPost>.toDbPagingTimeline(
-    accountKey: MicroBlogKey,
-    pagingKey: String,
-    sortIdProvider: suspend (FeedViewPost) -> Long = {
-        when (val reason = it.reason) {
-//            is FeedViewPostReasonUnion.ReasonRepost -> {
-//                reason.value.indexedAt
-//
-//                    .toEpochMilliseconds()
-//            }
-
-            is FeedViewPostReasonUnion.ReasonPin -> {
-                Long.MAX_VALUE
-            }
-
-            else -> {
-                -SnowflakeIdGenerator.nextId()
-//                it.post.indexedAt
-//
-//                    .toEpochMilliseconds()
-            }
-        }
-    },
-): List<DbPagingTimelineWithStatus> {
-    // Build a map of all posts by URI for quick lookup
-    val postUriMap = mutableMapOf<String, FeedViewPost>()
-    for (item in this) {
-        postUriMap[item.post.uri.atUri] = item
-    }
-
-    // Identify which posts are parents of other posts in this feed
-    val parentUrisInFeed = mutableSetOf<String>()
-    for (item in this) {
-        val parentUri =
-            when (val parent = item.reply?.parent) {
-                is ReplyRefParentUnion.PostView -> parent.value.uri.atUri
-                else -> null
-            }
-        if (parentUri != null) {
-            val inFeed = postUriMap.containsKey(parentUri)
-            if (inFeed) {
-                parentUrisInFeed.add(parentUri)
-            }
-        }
-    }
-
-    // Build complete parent chains for each post
-    val parentChainMap = mutableMapOf<String, List<PostView>>()
-    for (item in this) {
-        val parentChain = mutableListOf<PostView>()
-        var currentPostUri: String? = item.post.uri.atUri
-        val visitedUris = mutableSetOf<String>() // prevent infinite loops
-
-        while (currentPostUri != null && !visitedUris.contains(currentPostUri) && parentChain.size < 1000) {
-            visitedUris.add(currentPostUri)
-            val currentFeedItem = postUriMap[currentPostUri]
-            if (currentFeedItem != null) {
-                val parentPostView =
-                    when (val reply = currentFeedItem.reply?.parent) {
-                        is ReplyRefParentUnion.PostView -> reply.value
-                        else -> null
-                    }
-                if (parentPostView != null) {
-                    parentChain.add(parentPostView)
-                    currentPostUri = parentPostView.uri.atUri
-                } else {
-                    currentPostUri = null
-                }
-            } else {
-                currentPostUri = null
-            }
-        }
-
-        if (parentChain.isNotEmpty()) {
-            parentChainMap[item.post.uri.atUri] = parentChain
-        }
-    }
-
-    // Filter out posts that are parents of other posts, keeping only leaves/endpoints
-    val result =
-        this.flatMap { item ->
-            if (parentUrisInFeed.contains(item.post.uri.atUri)) {
-                emptyList()
-            } else {
-                processBlueskyFeedItem(item, accountKey, pagingKey, sortIdProvider, parentChainMap)
-            }
-        }
-    return result
 }
 
-private suspend fun processBlueskyFeedItem(
-    it: FeedViewPost,
-    accountKey: MicroBlogKey,
-    pagingKey: String,
-    sortIdProvider: suspend (FeedViewPost) -> Long,
-    parentChainMap: Map<String, List<PostView>>,
-): List<DbPagingTimelineWithStatus> {
-    val parentChain = parentChainMap[it.post.uri.atUri].orEmpty()
-
-    val status =
-        when (val data = it.reason) {
-            is FeedViewPostReasonUnion.ReasonRepost -> {
-                val user = data.value.by.toDbUser(accountKey.host)
-                DbStatusWithUser(
-                    user = user,
-                    data =
-                        DbStatus(
-                            statusKey =
-                                MicroBlogKey(
-                                    it.post.uri.atUri + "_reblog_${user.userKey}",
-                                    accountKey.host,
-                                ),
-                            userKey =
-                                data.value.by
-                                    .toDbUser(accountKey.host)
-                                    .userKey,
-                            content = StatusContent.BlueskyReason(data),
-                            accountType = AccountType.Specific(accountKey),
-                            text = null,
-                            createdAt = it.post.indexedAt,
-                        ),
-                )
-            }
-
-            is FeedViewPostReasonUnion.ReasonPin -> {
-                val status = it.post.toDbStatusWithUser(accountKey)
-                DbStatusWithUser(
-                    user = status.user,
-                    data =
-                        DbStatus(
-                            statusKey =
-                                MicroBlogKey(
-                                    it.post.uri.atUri + "_pin_${status.user?.userKey}",
-                                    accountKey.host,
-                                ),
-                            userKey = status.user?.userKey,
-                            content = StatusContent.BlueskyReason(data),
-                            accountType = AccountType.Specific(accountKey),
-                            text = status.data.text,
-                            createdAt = it.post.indexedAt,
-                        ),
-                )
-            }
-
-            else -> {
-                // bluesky doesn't have "quote" and "retweet" as the same as the other platforms
-                it.post.toDbStatusWithUser(accountKey)
-            }
-        }
-    val references =
-        listOfNotNull(
-            if (parentChain.isNotEmpty()) {
-                val convertedParents = parentChain.mapNotNull { it.toDbStatusWithUser(accountKey) }
-                if (convertedParents.isNotEmpty()) {
-                    ReferenceType.Reply to convertedParents
-                } else {
-                    null
-                }
-            } else {
-                null
-            },
-            if (it.reason != null) {
-                ReferenceType.Retweet to listOfNotNull(it.post.toDbStatusWithUser(accountKey))
-            } else {
-                null
-            },
-        ).toMap()
-    return listOfNotNull(
-        createDbPagingTimelineWithStatus(
-            accountKey = accountKey,
-            pagingKey = pagingKey,
-            sortId = sortIdProvider(it),
-            status = status,
-            references = references,
-        ),
-    )
-}
-
-private fun PostView.toDbStatusWithUser(accountKey: MicroBlogKey): DbStatusWithUser {
-    val user = author.toDbUser(accountKey.host)
-    val status =
-        DbStatus(
-            statusKey =
-                MicroBlogKey(
-                    uri.atUri,
-                    host = user.userKey.host,
-                ),
-            content = StatusContent.Bluesky(this),
-            userKey = user.userKey,
-            accountType = AccountType.Specific(accountKey),
-            text = parseBlueskyJson(record, accountKey).raw,
-            createdAt = indexedAt,
-        )
-    return DbStatusWithUser(
-        data = status,
-        user = user,
-    )
-}
-
-internal fun ProfileView.toDbUser(host: String) =
-    DbUser(
-        userKey =
-            MicroBlogKey(
-                id = did.did,
-                host = host,
-            ),
-        platformType = PlatformType.Bluesky,
-        name = displayName.orEmpty(),
-        handle = handle.handle,
-        host = host,
-        content =
-            UserContent.BlueskyLite(
-                ProfileViewBasic(
-                    did = did,
-                    handle = handle,
-                    displayName = displayName,
-                    avatar = avatar,
-                ),
-            ),
-    )
-
-internal fun ProfileViewBasic.toDbUser(host: String) =
-    DbUser(
-        userKey =
-            MicroBlogKey(
-                id = did.did,
-                host = host,
-            ),
-        platformType = PlatformType.Bluesky,
-        name = displayName.orEmpty(),
-        handle = handle.handle,
-        host = host,
-        content = UserContent.BlueskyLite(this),
-    )
-
-internal fun chat.bsky.actor.ProfileViewBasic.toDbUser(host: String) =
-    DbUser(
-        userKey =
-            MicroBlogKey(
-                id = did.did,
-                host = host,
-            ),
-        platformType = PlatformType.Bluesky,
-        name = displayName.orEmpty(),
-        handle = handle.handle,
-        host = host,
-        content =
-            UserContent.BlueskyLite(
-                ProfileViewBasic(
-                    did = did,
-                    handle = handle,
-                    displayName = displayName,
-                    avatar = avatar,
-                    associated = associated,
-                    viewer = viewer,
-                    labels = labels,
-                ),
-            ),
-    )
-
-internal fun ProfileViewDetailed.toDbUser(host: String) =
-    DbUser(
-        userKey =
-            MicroBlogKey(
-                id = did.did,
-                host = host,
-            ),
-        platformType = PlatformType.Bluesky,
-        name = displayName.orEmpty(),
-        handle = handle.handle,
-        host = host,
-        content = UserContent.Bluesky(this),
-    )
-
 private fun ConvoView.toDbDirectMessageTimeline(accountKey: MicroBlogKey): DbDirectMessageTimeline {
     val roomKey = toDbMessageRoom(accountKey.host).roomKey
     return DbDirectMessageTimeline(
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Mastodon.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Mastodon.kt
deleted file mode 100644
index 9e16aa1ac..000000000
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Mastodon.kt
+++ /dev/null
@@ -1,195 +0,0 @@
-package dev.dimension.flare.data.database.cache.mapper
-
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.model.DbEmoji
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.database.cache.model.DbStatus
-import dev.dimension.flare.data.database.cache.model.DbStatusWithUser
-import dev.dimension.flare.data.database.cache.model.DbUser
-import dev.dimension.flare.data.database.cache.model.StatusContent
-import dev.dimension.flare.data.network.mastodon.api.model.Account
-import dev.dimension.flare.data.network.mastodon.api.model.Emoji
-import dev.dimension.flare.data.network.mastodon.api.model.Notification
-import dev.dimension.flare.data.network.mastodon.api.model.Status
-import dev.dimension.flare.model.AccountType
-import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.model.PlatformType
-import dev.dimension.flare.model.ReferenceType
-import dev.dimension.flare.ui.model.mapper.parseMastodonContent
-import dev.dimension.flare.ui.render.toUi
-import kotlin.time.Clock
-
-internal object Mastodon {
-    suspend fun save(
-        accountKey: MicroBlogKey,
-        pagingKey: String,
-        database: CacheDatabase,
-        data: List<Status>,
-        sortIdProvider: (Status) -> Long = {
-            if (it.pinned == true) {
-                Long.MAX_VALUE
-            } else {
-                it.createdAt?.toEpochMilliseconds() ?: 0
-            }
-        },
-    ) {
-        val items = data.toDbPagingTimeline(accountKey, pagingKey, sortIdProvider)
-        saveToDatabase(database, items)
-    }
-
-    suspend fun save(
-        accountKey: MicroBlogKey,
-        pagingKey: String,
-        database: CacheDatabase,
-        data: List<Notification>,
-    ) {
-        val items = data.toDb(accountKey, pagingKey)
-        saveToDatabase(database, items)
-    }
-}
-
-internal fun List<Notification>.toDb(
-    accountKey: MicroBlogKey,
-    pagingKey: String,
-): List<DbPagingTimelineWithStatus> =
-    this.map {
-        createDbPagingTimelineWithStatus(
-            accountKey = accountKey,
-            pagingKey = pagingKey,
-            sortId = it.createdAt?.toEpochMilliseconds() ?: 0,
-            status = it.toDbStatusWithUser(accountKey),
-            references =
-                listOfNotNull(
-                    if (it.status != null) {
-                        ReferenceType.Notification to listOfNotNull(it.status.toDbStatusWithUser(accountKey))
-                    } else {
-                        null
-                    },
-                ).toMap(),
-        )
-    }
-
-private fun Notification.toDbStatusWithUser(accountKey: MicroBlogKey): DbStatusWithUser {
-    val user =
-        this.account?.toDbUser(accountKey.host) ?: throw IllegalStateException("account is null")
-    val status = this.toDbStatus(accountKey)
-    return DbStatusWithUser(
-        data = status,
-        user = user,
-    )
-}
-
-private fun Notification.toDbStatus(accountKey: MicroBlogKey): DbStatus {
-    val user =
-        this.account?.toDbUser(accountKey.host) ?: throw IllegalStateException("account is null")
-    return DbStatus(
-        statusKey =
-            MicroBlogKey(
-                this.id ?: throw IllegalStateException("id is null"),
-                user.userKey.host,
-            ),
-        userKey = user.userKey,
-        content = StatusContent.MastodonNotification(this),
-        accountType = AccountType.Specific(accountKey),
-        text = null,
-        createdAt = createdAt ?: Clock.System.now(),
-    )
-}
-
-internal suspend fun List<Status>.toDbPagingTimeline(
-    accountKey: MicroBlogKey,
-    pagingKey: String,
-    sortIdProvider: suspend (Status) -> Long = {
-        it.createdAt?.toEpochMilliseconds() ?: 0
-    },
-): List<DbPagingTimelineWithStatus> =
-    this.map {
-        createDbPagingTimelineWithStatus(
-            accountKey = accountKey,
-            pagingKey = pagingKey,
-            sortId = sortIdProvider(it),
-            status = it.toDbStatusWithUser(accountKey),
-            references =
-                listOfNotNull(
-                    if (it.reblog != null) {
-                        ReferenceType.Retweet to listOfNotNull(it.reblog.toDbStatusWithUser(accountKey))
-                    } else {
-                        null
-                    },
-                ).toMap(),
-        )
-    }
-
-private fun Status.toDbStatusWithUser(accountKey: MicroBlogKey): DbStatusWithUser {
-    val user =
-        account?.toDbUser(accountKey.host)
-            ?: throw IllegalArgumentException("mastodon Status.user should not be null")
-    val status =
-        DbStatus(
-            statusKey =
-                MicroBlogKey(
-                    id
-                        ?: throw IllegalArgumentException("mastodon Status.idStr should not be null"),
-                    host = user.userKey.host,
-                ),
-            content =
-                dev.dimension.flare.data.database.cache.model.StatusContent
-                    .Mastodon(this),
-            userKey = user.userKey,
-            accountType = AccountType.Specific(accountKey),
-            text =
-                buildString {
-                    if (spoilerText != null) {
-                        append(spoilerText)
-                        append("\n\n")
-                    }
-                    append(
-                        parseMastodonContent(
-                            this@toDbStatusWithUser,
-                            accountKey,
-                            accountKey.host,
-                        ).toUi().raw,
-                    )
-                },
-            createdAt = createdAt ?: Clock.System.now(),
-        )
-    return DbStatusWithUser(
-        data = status,
-        user = user,
-    )
-}
-
-internal fun Account.toDbUser(host: String): DbUser {
-    val remoteHost =
-        if (acct != null && acct.contains('@')) {
-            acct.substring(acct.indexOf('@') + 1)
-        } else {
-            host
-        }
-    return DbUser(
-        userKey =
-            MicroBlogKey(
-                id = id ?: throw IllegalArgumentException("mastodon Account.id should not be null"),
-                host = host,
-            ),
-        platformType = PlatformType.Mastodon,
-        name =
-            displayName
-                ?: throw IllegalArgumentException("mastodon Account.displayName should not be null"),
-        handle =
-            username
-                ?: throw IllegalArgumentException("mastodon Account.username should not be null"),
-        content =
-            dev.dimension.flare.data.database.cache.model.UserContent
-                .Mastodon(this),
-        host = remoteHost,
-    )
-}
-
-internal fun List<Emoji>.toDb(host: String): DbEmoji =
-    DbEmoji(
-        host = host,
-        content =
-            dev.dimension.flare.data.database.cache.model.EmojiContent
-                .Mastodon(this),
-    )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbPagingTimeline.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbPagingTimeline.kt
index 4ede9de4b..5551979f0 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbPagingTimeline.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbPagingTimeline.kt
@@ -6,8 +6,6 @@ import androidx.room.Index
 import androidx.room.PrimaryKey
 import androidx.room.Relation
 import androidx.room.TypeConverter
-import dev.dimension.flare.common.decodeJson
-import dev.dimension.flare.common.encodeJson
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.ReferenceType
 import kotlin.time.Instant
@@ -115,12 +113,6 @@ internal data class DbStatusWithReference(
 )
 
 internal class StatusConverter {
-    @TypeConverter
-    fun fromStatusContent(value: StatusContent): String = value.encodeJson()
-
-    @TypeConverter
-    fun toStatusContent(value: String): StatusContent = value.decodeJson()
-
     @TypeConverter
     fun fromReferenceType(value: ReferenceType): String = value.name
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/StatusContent.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/StatusContent.kt
deleted file mode 100644
index 7b86175fd..000000000
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/StatusContent.kt
+++ /dev/null
@@ -1,162 +0,0 @@
-package dev.dimension.flare.data.database.cache.model
-
-import app.bsky.feed.FeedViewPostReasonUnion
-import app.bsky.feed.PostView
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.network.rss.model.Feed
-import dev.dimension.flare.model.AccountType
-import dev.dimension.flare.model.MicroBlogKey
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-internal sealed interface StatusContent {
-    @Serializable
-    @SerialName("mastodon")
-    data class Mastodon internal constructor(
-        internal val data: dev.dimension.flare.data.network.mastodon.api.model.Status,
-    ) : StatusContent
-
-    @Serializable
-    @SerialName("mastodon-notification")
-    data class MastodonNotification internal constructor(
-        internal val data: dev.dimension.flare.data.network.mastodon.api.model.Notification,
-    ) : StatusContent
-
-    @Serializable
-    @SerialName("misskey")
-    data class Misskey internal constructor(
-        internal val data: dev.dimension.flare.data.network.misskey.api.model.Note,
-        val pinned: Boolean = false,
-    ) : StatusContent
-
-    @Serializable
-    @SerialName("misskey-notification")
-    data class MisskeyNotification internal constructor(
-        internal val data: dev.dimension.flare.data.network.misskey.api.model.Notification,
-    ) : StatusContent
-
-    @Serializable
-    @SerialName("bluesky")
-    data class Bluesky internal constructor(
-        val data: PostView,
-    ) : StatusContent
-
-    @Serializable
-    @SerialName("bluesky-reason")
-    data class BlueskyReason internal constructor(
-        val reason: FeedViewPostReasonUnion,
-    ) : StatusContent
-
-    @Serializable
-    sealed interface BlueskyNotification : StatusContent {
-        @Serializable
-        @SerialName("bluesky-notification-user-list")
-        data class UserList internal constructor(
-            val data: List<app.bsky.notification.ListNotificationsNotification>,
-            val post: PostView?,
-        ) : BlueskyNotification
-
-        @Serializable
-        @SerialName("bluesky-notification-post")
-        data class Post internal constructor(
-            val post: PostView,
-        ) : BlueskyNotification
-
-        @Serializable
-        @SerialName("bluesky-notification-normal")
-        data class Normal internal constructor(
-            val data: app.bsky.notification.ListNotificationsNotification,
-        ) : BlueskyNotification
-    }
-
-    @Serializable
-    @SerialName("XQT")
-    data class XQT internal constructor(
-        internal val data: dev.dimension.flare.data.network.xqt.model.Tweet,
-    ) : StatusContent
-
-    @Serializable
-    @SerialName("vvo")
-    data class VVO internal constructor(
-        internal val data: dev.dimension.flare.data.network.vvo.model.Status,
-    ) : StatusContent
-
-    @Serializable
-    @SerialName("vvo-comment")
-    data class VVOComment internal constructor(
-        internal val data: dev.dimension.flare.data.network.vvo.model.Comment,
-    ) : StatusContent
-
-    @Serializable
-    data class Rss(
-        val data: RssContent,
-    ) : StatusContent {
-        @Serializable
-        sealed interface RssContent {
-            @Serializable
-            @SerialName("atom")
-            data class Atom internal constructor(
-                internal val data: Feed.Atom.Entry,
-                internal val source: String,
-                internal val icon: String?,
-                internal val openInBrowser: Boolean,
-            ) : RssContent
-
-            @Serializable
-            @SerialName("rss20")
-            data class Rss20 internal constructor(
-                internal val data: Feed.Rss20.Item,
-                internal val source: String,
-                internal val icon: String?,
-                internal val openInBrowser: Boolean,
-            ) : RssContent
-
-            @Serializable
-            @SerialName("rdf")
-            data class RDF internal constructor(
-                internal val data: Feed.RDF.Item,
-                internal val source: String,
-                internal val icon: String?,
-                internal val openInBrowser: Boolean,
-            ) : RssContent
-        }
-    }
-
-    @Serializable
-    @SerialName("Test")
-    data class Test internal constructor(
-        internal val data: String,
-    ) : StatusContent
-}
-
-internal suspend inline fun <reified T : StatusContent> updateStatusUseCase(
-    statusKey: MicroBlogKey,
-    accountKey: MicroBlogKey,
-    cacheDatabase: CacheDatabase,
-    update: (content: T) -> T,
-) {
-    val status = cacheDatabase.statusDao().get(statusKey, accountType = AccountType.Specific(accountKey)).firstOrNull()
-    if (status != null && status.content is T) {
-        cacheDatabase.statusDao().update(
-            statusKey = statusKey,
-            accountType = AccountType.Specific(accountKey),
-            content = update(status.content),
-        )
-    }
-}
-
-internal suspend inline fun <reified T : UserContent> updateUserUseCase(
-    userKey: MicroBlogKey,
-    cacheDatabase: CacheDatabase,
-    update: (content: T) -> T,
-) {
-    val user = cacheDatabase.userDao().findByKey(userKey).firstOrNull()
-    if (user != null && user.content is T) {
-        cacheDatabase.userDao().update(
-            userKey = userKey,
-            content = update(user.content),
-        )
-    }
-}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/UserContent.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/UserContent.kt
deleted file mode 100644
index 117a64b94..000000000
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/UserContent.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package dev.dimension.flare.data.database.cache.model
-
-import app.bsky.actor.ProfileViewBasic
-import app.bsky.actor.ProfileViewDetailed
-import dev.dimension.flare.data.network.xqt.model.User
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-// https://github.com/cashapp/sqldelight/issues/1333
-@Serializable
-internal sealed interface UserContent {
-    @Serializable
-    @SerialName("Mastodon")
-    data class Mastodon internal constructor(
-        internal val data: dev.dimension.flare.data.network.mastodon.api.model.Account,
-    ) : UserContent
-
-    @Serializable
-    @SerialName("Misskey")
-    data class Misskey internal constructor(
-        internal val data: dev.dimension.flare.data.network.misskey.api.model.User,
-    ) : UserContent
-
-    @Serializable
-    @SerialName("MisskeyLite")
-    data class MisskeyLite internal constructor(
-        internal val data: dev.dimension.flare.data.network.misskey.api.model.UserLite,
-    ) : UserContent
-
-    @Serializable
-    @SerialName("Bluesky")
-    data class Bluesky(
-        val data: ProfileViewDetailed,
-    ) : UserContent
-
-    @Serializable
-    @SerialName("BlueskyLite")
-    data class BlueskyLite(
-        val data: ProfileViewBasic,
-    ) : UserContent
-
-    @Serializable
-    @SerialName("XQT")
-    data class XQT internal constructor(
-        internal val data: User,
-    ) : UserContent
-
-    @Serializable
-    @SerialName("VVO")
-    data class VVO internal constructor(
-        internal val data: dev.dimension.flare.data.network.vvo.model.User,
-    ) : UserContent
-
-    @Serializable
-    @SerialName("Test")
-    data class Test internal constructor(
-        internal val data: String,
-    ) : UserContent
-}
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
index e68cf8f85..4248fdd59 100644
--- 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
@@ -17,9 +17,6 @@ import app.bsky.feed.Post
 import app.bsky.feed.PostEmbedUnion
 import app.bsky.feed.PostReplyRef
 import app.bsky.feed.ViewerState
-import app.bsky.graph.MuteActorRequest
-import app.bsky.graph.UnmuteActorRequest
-import app.bsky.notification.ListNotificationsQueryParams
 import app.bsky.unspecced.GetPopularFeedGeneratorsQueryParams
 import chat.bsky.convo.DeleteMessageForSelfRequest
 import chat.bsky.convo.DeletedMessageView
@@ -35,7 +32,6 @@ 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
@@ -47,14 +43,10 @@ import dev.dimension.flare.common.BasePagingSource
 import dev.dimension.flare.common.CacheData
 import dev.dimension.flare.common.Cacheable
 import dev.dimension.flare.common.FileType
-import dev.dimension.flare.common.InAppNotification
-import dev.dimension.flare.common.MemCacheable
 import dev.dimension.flare.common.encodeJson
 import dev.dimension.flare.data.database.app.AppDatabase
 import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.connect
 import dev.dimension.flare.data.database.cache.mapper.Bluesky
-import dev.dimension.flare.data.database.cache.mapper.toDbUser
 import dev.dimension.flare.data.database.cache.model.MessageContent
 import dev.dimension.flare.data.database.cache.model.StatusContent
 import dev.dimension.flare.data.database.cache.model.updateStatusUseCase
@@ -63,22 +55,28 @@ import dev.dimension.flare.data.datasource.microblog.ComposeConfig
 import dev.dimension.flare.data.datasource.microblog.ComposeData
 import dev.dimension.flare.data.datasource.microblog.ComposeProgress
 import dev.dimension.flare.data.datasource.microblog.ComposeType
+import dev.dimension.flare.data.datasource.microblog.DatabaseUpdater
 import dev.dimension.flare.data.datasource.microblog.DirectMessageDataSource
 import dev.dimension.flare.data.datasource.microblog.NotificationFilter
-import dev.dimension.flare.data.datasource.microblog.ProfileAction
+import dev.dimension.flare.data.datasource.microblog.PostEvent
 import dev.dimension.flare.data.datasource.microblog.ProfileTab
-import dev.dimension.flare.data.datasource.microblog.StatusEvent
 import dev.dimension.flare.data.datasource.microblog.createSendingDirectMessage
 import dev.dimension.flare.data.datasource.microblog.datasource.ListDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.NotificationDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.PostDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.RelationDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.UserDataSource
 import dev.dimension.flare.data.datasource.microblog.handler.ListHandler
 import dev.dimension.flare.data.datasource.microblog.handler.ListMemberHandler
+import dev.dimension.flare.data.datasource.microblog.handler.NotificationHandler
+import dev.dimension.flare.data.datasource.microblog.handler.PostEventHandler
+import dev.dimension.flare.data.datasource.microblog.handler.PostHandler
+import dev.dimension.flare.data.datasource.microblog.handler.RelationHandler
+import dev.dimension.flare.data.datasource.microblog.handler.UserHandler
 import dev.dimension.flare.data.datasource.microblog.loader.ListLoader
 import dev.dimension.flare.data.datasource.microblog.loader.ListMemberLoader
-import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.datasource.microblog.pagingConfig
-import dev.dimension.flare.data.datasource.microblog.relationKeyWithUserKey
-import dev.dimension.flare.data.datasource.microblog.timelinePager
 import dev.dimension.flare.data.network.bluesky.BlueskyService
 import dev.dimension.flare.data.network.bluesky.model.DidDoc
 import dev.dimension.flare.data.repository.AccountRepository
@@ -86,7 +84,6 @@ import dev.dimension.flare.data.repository.LocalFilterRepository
 import dev.dimension.flare.data.repository.tryRun
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.model.PlatformType
 import dev.dimension.flare.shared.image.ImageCompressor
 import dev.dimension.flare.ui.model.UiAccount
 import dev.dimension.flare.ui.model.UiDMItem
@@ -94,13 +91,11 @@ import dev.dimension.flare.ui.model.UiDMRoom
 import dev.dimension.flare.ui.model.UiHashtag
 import dev.dimension.flare.ui.model.UiList
 import dev.dimension.flare.ui.model.UiProfile
-import dev.dimension.flare.ui.model.UiRelation
 import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.mapper.bskyJson
 import dev.dimension.flare.ui.model.mapper.parseBskyFacets
 import dev.dimension.flare.ui.model.mapper.render
-import dev.dimension.flare.ui.model.toUi
 import dev.dimension.flare.ui.presenter.compose.ComposeStatus
 import dev.dimension.flare.ui.presenter.status.action.BlueskyReportStatusState
 import kotlinx.collections.immutable.ImmutableList
@@ -132,17 +127,19 @@ import kotlin.time.Clock
 internal class BlueskyDataSource(
     override val accountKey: MicroBlogKey,
 ) : AuthenticatedMicroblogDataSource,
+    NotificationDataSource,
+    UserDataSource,
+    PostDataSource,
     KoinComponent,
-    StatusEvent.Bluesky,
     ListDataSource,
+    RelationDataSource,
     DirectMessageDataSource,
-    RelationLoader {
+    PostEventHandler.Handler {
     private val database: CacheDatabase by inject()
     private val appDatabase: AppDatabase by inject()
     private val localFilterRepository: LocalFilterRepository by inject()
     private val coroutineScope: CoroutineScope by inject()
     private val accountRepository: AccountRepository by inject()
-    private val inAppNotification: InAppNotification by inject()
     private val imageCompressor: ImageCompressor by inject()
     private val credentialFlow by lazy {
         accountRepository.credentialFlow<UiAccount.Bluesky.Credential>(accountKey)
@@ -180,99 +177,75 @@ internal class BlueskyDataSource(
         } ?: service
     }
 
-    override fun homeTimeline() =
-        HomeTimelineRemoteMediator(
-            service,
-            accountKey,
-            database,
-            inAppNotification = inAppNotification,
+    val loader by lazy {
+        BlueskyLoader(
+            accountKey = accountKey,
+            service = service,
         )
+    }
 
-    override fun notification(
-        type: NotificationFilter,
-        pageSize: Int,
-        scope: CoroutineScope,
-    ): Flow<PagingData<UiTimeline>> =
-        timelinePager(
-            pageSize = pageSize,
-            database = database,
-            scope = scope,
-            filterFlow = localFilterRepository.getFlow(forNotification = true),
-            accountRepository = accountRepository,
-            mediator =
-                when (type) {
-                    NotificationFilter.All ->
-                        NotificationRemoteMediator(
-                            service,
-                            accountKey,
-                            database,
-                            onClearMarker = {
-                                MemCacheable.update(notificationMarkerKey, 0)
-                            },
-                        )
+    override val notificationHandler by lazy {
+        NotificationHandler(
+            accountKey = accountKey,
+            loader = loader,
+        )
+    }
 
-                    else -> throw IllegalArgumentException("Unsupported notification filter")
-                },
+    override val userHandler by lazy {
+        UserHandler(
+            accountKey = accountKey,
+            loader = loader,
         )
+    }
 
-    override val supportedNotificationFilter: List<NotificationFilter>
-        get() = listOf(NotificationFilter.All)
+    override val postHandler by lazy {
+        PostHandler(
+            accountType = AccountType.Specific(accountKey),
+            loader = loader,
+        )
+    }
 
-    override fun userByAcct(acct: String): CacheData<UiProfile> {
-        val (name, host) = MicroBlogKey.valueOf(acct)
-        return Cacheable(
-            fetchSource = {
-                val user =
-                    service
-                        .getProfile(GetProfileQueryParams(actor = Handle(handle = name)))
-                        .requireResponse()
-                        .toDbUser(accountKey.host)
-                database.userDao().insert(user)
-            },
-            cacheSource = {
-                database
-                    .userDao()
-                    .findByHandleAndHost(name, host, PlatformType.Bluesky)
-                    .distinctUntilChanged()
-                    .mapNotNull { it?.render(accountKey) }
-            },
+    override val relationHandler by lazy {
+        RelationHandler(
+            dataSource = loader,
         )
     }
 
-    override fun userById(id: String): CacheData<UiProfile> =
-        Cacheable(
-            fetchSource = {
-                val user =
-                    service
-                        .getProfile(GetProfileQueryParams(actor = Did(did = id)))
-                        .requireResponse()
-                        .toDbUser(accountKey.host)
-                database.userDao().insert(user)
-            },
-            cacheSource = {
-                database
-                    .userDao()
-                    .findByKey(MicroBlogKey(id, accountKey.host))
-                    .distinctUntilChanged()
-                    .mapNotNull { it?.render(accountKey) }
-            },
+    override val postEventHandler by lazy {
+        PostEventHandler(
+            accountKey = accountKey,
+            handler = this,
         )
+    }
 
-    override fun relation(userKey: MicroBlogKey): Flow<UiState<UiRelation>> =
-        MemCacheable(
-            relationKeyWithUserKey(userKey),
-        ) {
-            val user =
-                service
-                    .getProfile(GetProfileQueryParams(actor = Did(did = userKey.id)))
-                    .requireResponse()
-            UiRelation(
-                following = user.viewer?.following?.atUri != null,
-                isFans = user.viewer?.followedBy?.atUri != null,
-                blocking = user.viewer?.blockedBy ?: false,
-                muted = user.viewer?.muted ?: false,
-            )
-        }.toUi()
+    override suspend fun handle(
+        event: PostEvent,
+        updater: DatabaseUpdater,
+    ) {
+    }
+
+    override fun homeTimeline() =
+        HomeTimelineRemoteMediator(
+            service,
+            accountKey,
+        )
+
+    override fun notification(type: NotificationFilter): RemoteLoader<UiTimelineV2> =
+        when (type) {
+            NotificationFilter.All ->
+                NotificationRemoteMediator(
+                    service,
+                    accountKey,
+                    onClearMarker = {
+                        notificationHandler.clear()
+                    },
+                )
+
+            else -> throw IllegalArgumentException("Unsupported notification filter")
+        }
+
+    override val supportedNotificationFilter: List<NotificationFilter>
+        get() = listOf(NotificationFilter.All)
 
     override fun userTimeline(
         userKey: MicroBlogKey,
@@ -280,7 +253,6 @@ internal class BlueskyDataSource(
     ) = UserTimelineRemoteMediator(
         service,
         accountKey,
-        database,
         userKey,
         onlyMedia = mediaOnly,
     )
@@ -294,69 +266,6 @@ internal class BlueskyDataSource(
             statusOnly = false,
         )
 
-    override fun status(statusKey: MicroBlogKey): CacheData<UiTimeline> {
-        val pagingKey = "status_only_$statusKey"
-        return Cacheable(
-            fetchSource = {
-                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
-                    .pagingTimelineDao()
-                    .get(pagingKey, accountType = AccountType.Specific(accountKey))
-                    .mapNotNull { it?.render(this) }
-            },
-        )
-    }
-
     override suspend fun compose(
         data: ComposeData,
         progress: (ComposeProgress) -> Unit,
@@ -762,245 +671,27 @@ internal class BlueskyDataSource(
             ),
         )
 
-    override suspend fun deleteStatus(statusKey: MicroBlogKey) {
-        tryRun {
-            service.deleteRecord(
-                DeleteRecordRequest(
-                    repo = Did(did = accountKey.id),
-                    collection = Nsid("app.bsky.feed.post"),
-                    rkey = RKey(statusKey.id.substringAfterLast('/')),
-                ),
-            )
-            // delete status from cache
-            database.connect {
-                database.statusDao().delete(
-                    statusKey = statusKey,
-                    accountType = AccountType.Specific(accountKey),
-                )
-                database.statusReferenceDao().delete(statusKey)
-                database.pagingTimelineDao().deleteStatus(
-                    accountKey = accountKey,
-                    statusKey = statusKey,
-                )
-            }
-        }
-    }
-
-    suspend fun unfollow(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                following = false,
-            )
-        }
-        tryRun {
-            val user =
-                service
-                    .getProfile(GetProfileQueryParams(actor = Did(did = userKey.id)))
-                    .requireResponse()
-
-            val followRepo = user.viewer?.following?.atUri
-            if (followRepo != null) {
-                service.deleteRecord(
-                    DeleteRecordRequest(
-                        repo = Did(did = accountKey.id),
-                        collection = Nsid("app.bsky.graph.follow"),
-                        rkey = RKey(followRepo.substringAfterLast('/')),
-                    ),
-                )
-            }
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    following = true,
-                )
-            }
-        }
-    }
-
-    suspend fun follow(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                following = true,
-            )
-        }
-        tryRun {
-            service.createRecord(
-                CreateRecordRequest(
-                    repo = Did(did = accountKey.id),
-                    collection = Nsid("app.bsky.graph.follow"),
-                    record =
-                        app.bsky.graph
-                            .Follow(
-                                subject = Did(userKey.id),
-                                createdAt = Clock.System.now(),
-                            ).bskyJson(),
-                ),
-            )
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    following = false,
-                )
-            }
-        }
-    }
-
-    override suspend fun block(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                blocking = true,
-            )
-        }
-        tryRun {
-            service.createRecord(
-                CreateRecordRequest(
-                    repo = Did(did = accountKey.id),
-                    collection = Nsid("app.bsky.graph.block"),
-                    record =
-                        app.bsky.graph
-                            .Block(
-                                subject = Did(userKey.id),
-                                createdAt = Clock.System.now(),
-                            ).bskyJson(),
-                ),
-            )
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    blocking = false,
-                )
-            }
-        }
-    }
-
-    suspend fun unblock(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                blocking = false,
-            )
-        }
-        tryRun {
-            val user =
-                service
-                    .getProfile(GetProfileQueryParams(actor = Did(did = userKey.id)))
-                    .requireResponse()
-
-            val blockRepo = user.viewer?.blocking?.atUri
-            if (blockRepo != null) {
-                service.deleteRecord(
-                    DeleteRecordRequest(
-                        repo = Did(did = accountKey.id),
-                        collection = Nsid("app.bsky.graph.block"),
-                        rkey = RKey(blockRepo.substringAfterLast('/')),
-                    ),
-                )
-            }
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    blocking = true,
-                )
-            }
-        }
-    }
-
-    override suspend fun mute(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                muted = true,
-            )
-        }
-        tryRun {
-            service.muteActor(MuteActorRequest(actor = Did(did = userKey.id)))
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    muted = false,
-                )
-            }
-        }
-    }
-
-    suspend fun unmute(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                muted = false,
-            )
-        }
-        tryRun {
-            service.unmuteActor(UnmuteActorRequest(actor = Did(did = userKey.id)))
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    muted = true,
-                )
-            }
-        }
-    }
-
     override fun searchStatus(query: String) =
         SearchStatusRemoteMediator(
             service,
-            database,
             accountKey,
             query,
         )
 
-    override fun searchUser(
-        query: String,
-        pageSize: Int,
-    ): Flow<PagingData<UiProfile>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            SearchUserPagingSource(
-                service,
-                accountKey,
-                query,
-            )
-        }.flow
+    override fun searchUser(query: String): RemoteLoader<UiProfile> =
+        SearchUserPagingSource(
+            service,
+            accountKey,
+            query,
+        )
 
-    override fun discoverUsers(pageSize: Int): Flow<PagingData<UiProfile>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            TrendsUserPagingSource(
-                service,
-                accountKey,
-            )
-        }.flow
+    override fun discoverUsers(): RemoteLoader<UiProfile> =
+        TrendsUserPagingSource(
+            service,
+            accountKey,
+        )
 
-    override fun discoverHashtags(pageSize: Int): Flow<PagingData<UiHashtag>> =
+    override fun discoverHashtags(): RemoteLoader<UiHashtag> =
         throw UnsupportedOperationException("Bluesky does not support discover hashtags")
 
     override fun discoverStatuses() = throw UnsupportedOperationException("Bluesky does not support discover statuses")
@@ -1018,49 +709,6 @@ internal class BlueskyDataSource(
             language = ComposeConfig.Language(3),
         )
 
-    override suspend fun follow(
-        userKey: MicroBlogKey,
-        relation: UiRelation,
-    ) {
-        when {
-            relation.following -> unfollow(userKey)
-            relation.blocking -> unblock(userKey)
-            else -> follow(userKey)
-        }
-    }
-
-    override fun profileActions(): List<ProfileAction> =
-        listOf(
-            object : ProfileAction.Mute {
-                override suspend fun invoke(
-                    userKey: MicroBlogKey,
-                    relation: UiRelation,
-                ) {
-                    if (relation.muted) {
-                        unmute(userKey)
-                    } else {
-                        mute(userKey)
-                    }
-                }
-
-                override fun relationState(relation: UiRelation): Boolean = relation.muted
-            },
-            object : ProfileAction.Block {
-                override suspend fun invoke(
-                    userKey: MicroBlogKey,
-                    relation: UiRelation,
-                ) {
-                    if (relation.blocking) {
-                        unblock(userKey)
-                    } else {
-                        block(userKey)
-                    }
-                }
-
-                override fun relationState(relation: UiRelation): Boolean = relation.blocking
-            },
-        )
-
     private val myFeedsKey = "my_feeds_$accountKey"
 
     internal val feedLoader by lazy {
@@ -1127,7 +775,6 @@ internal class BlueskyDataSource(
         FeedTimelineRemoteMediator(
             service = service,
             accountKey = accountKey,
-            database = database,
             uri = uri,
         )
 
@@ -1162,7 +809,6 @@ internal class BlueskyDataSource(
         ListTimelineRemoteMediator(
             service = service,
             accountKey = accountKey,
-            database = database,
             uri = listId,
         )
 
@@ -1201,20 +847,6 @@ internal class BlueskyDataSource(
     private val notificationMarkerKey: String
         get() = "notificationBadgeCount_$accountKey"
 
-    override fun notificationBadgeCount(): CacheData<Int> =
-        MemCacheable(
-            key = notificationMarkerKey,
-            fetchSource = {
-                val notifications =
-                    service
-                        .listNotifications(
-                            params = ListNotificationsQueryParams(limit = 40),
-                        ).requireResponse()
-                        .notifications
-                notifications.count { !it.isRead }
-            },
-        )
-
     override fun directMessageList(scope: CoroutineScope): Flow<PagingData<UiDMRoom>> =
         Pager(
             config = pagingConfig,
@@ -1573,35 +1205,19 @@ internal class BlueskyDataSource(
                 ).requireResponse()
         }.isSuccess
 
-    override fun following(
-        userKey: MicroBlogKey,
-        scope: CoroutineScope,
-        pageSize: Int,
-    ): Flow<PagingData<UiProfile>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            FollowingPagingSource(
-                service = service,
-                userKey = userKey,
-                accountKey = accountKey,
-            )
-        }.flow.cachedIn(scope)
+    override fun following(userKey: MicroBlogKey): RemoteLoader<UiProfile> =
+        FollowingPagingSource(
+            service = service,
+            userKey = userKey,
+            accountKey = accountKey,
+        )
 
-    override fun fans(
-        userKey: MicroBlogKey,
-        scope: CoroutineScope,
-        pageSize: Int,
-    ): Flow<PagingData<UiProfile>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            FansPagingSource(
-                service = service,
-                userKey = userKey,
-                accountKey = accountKey,
-            )
-        }.flow.cachedIn(scope)
+    override fun fans(userKey: MicroBlogKey): RemoteLoader<UiProfile> =
+        FansPagingSource(
+            service = service,
+            userKey = userKey,
+            accountKey = accountKey,
+        )
 
     override fun profileTabs(userKey: MicroBlogKey): ImmutableList<ProfileTab> =
         listOfNotNull(
@@ -1611,7 +1227,6 @@ internal class BlueskyDataSource(
                     UserTimelineRemoteMediator(
                         service = service,
                         accountKey = accountKey,
-                        database = database,
                         userKey = userKey,
                         onlyMedia = false,
                         withReplies = false,
@@ -1623,7 +1238,6 @@ internal class BlueskyDataSource(
                     UserTimelineRemoteMediator(
                         service,
                         accountKey,
-                        database,
                         userKey,
                         withReplies = true,
                     ),
@@ -1636,7 +1250,6 @@ internal class BlueskyDataSource(
                         UserLikesTimelineRemoteMediator(
                             service,
                             accountKey,
-                            database,
                         ),
                 )
             } else {
@@ -1644,11 +1257,10 @@ internal class BlueskyDataSource(
             },
         ).toPersistentList()
 
-    fun bookmarkTimeline(): BaseTimelineLoader =
+    fun bookmarkTimeline(): RemoteLoader<UiTimelineV2> =
         BookmarkTimelineRemoteMediator(
             service = service,
             accountKey = accountKey,
-            database = database,
         )
 
     override fun bookmark(
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyLoader.kt
new file mode 100644
index 000000000..e128c6538
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyLoader.kt
@@ -0,0 +1,191 @@
+package dev.dimension.flare.data.datasource.bluesky
+
+import app.bsky.actor.GetProfileQueryParams
+import app.bsky.feed.GetPostsQueryParams
+import app.bsky.graph.MuteActorRequest
+import app.bsky.graph.UnmuteActorRequest
+import app.bsky.notification.ListNotificationsQueryParams
+import com.atproto.identity.ResolveHandleQueryParams
+import com.atproto.repo.CreateRecordRequest
+import com.atproto.repo.DeleteRecordRequest
+import dev.dimension.flare.data.datasource.microblog.loader.NotificationLoader
+import dev.dimension.flare.data.datasource.microblog.loader.PostLoader
+import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
+import dev.dimension.flare.data.datasource.microblog.loader.UserLoader
+import dev.dimension.flare.data.network.bluesky.BlueskyService
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiProfile
+import dev.dimension.flare.ui.model.UiRelation
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
+import kotlinx.collections.immutable.persistentListOf
+import sh.christian.ozone.api.AtUri
+import sh.christian.ozone.api.Did
+import sh.christian.ozone.api.Handle
+import sh.christian.ozone.api.Nsid
+import sh.christian.ozone.api.RKey
+import kotlin.time.Clock
+
+internal class BlueskyLoader(
+    override val accountKey: MicroBlogKey,
+    private val service: BlueskyService,
+) : NotificationLoader,
+    UserLoader,
+    PostLoader,
+    RelationLoader {
+    override suspend fun userByHandleAndHost(
+        handle: String,
+        host: String,
+    ): UiProfile =
+        service
+            .getProfile(GetProfileQueryParams(actor = Handle(handle = handle)))
+            .requireResponse()
+            .render(accountKey)
+
+    override suspend fun userById(id: String): UiProfile =
+        service
+            .getProfile(GetProfileQueryParams(actor = Did(did = id)))
+            .requireResponse()
+            .render(accountKey)
+
+    override suspend fun relation(userKey: MicroBlogKey): UiRelation {
+        val user =
+            service
+                .getProfile(GetProfileQueryParams(actor = Did(did = userKey.id)))
+                .requireResponse()
+        return UiRelation(
+            following = user.viewer?.following?.atUri != null,
+            isFans = user.viewer?.followedBy?.atUri != null,
+            blocking = user.viewer?.blockedBy ?: false,
+            muted = user.viewer?.muted ?: false,
+        )
+    }
+
+    override suspend fun status(statusKey: MicroBlogKey): UiTimelineV2 {
+        val isDid = statusKey.id.startsWith("at://did:")
+        if (isDid) {
+            return service
+                .getPosts(
+                    GetPostsQueryParams(
+                        persistentListOf(AtUri(statusKey.id)),
+                    ),
+                ).requireResponse()
+                .posts
+                .first()
+                .render(accountKey)
+        } 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")
+            return service
+                .getPosts(
+                    GetPostsQueryParams(
+                        persistentListOf(actualAtUri),
+                    ),
+                ).requireResponse()
+                .posts
+                .first()
+                .render(accountKey)
+        }
+    }
+
+    override suspend fun deleteStatus(statusKey: MicroBlogKey) {
+        service.deleteRecord(
+            DeleteRecordRequest(
+                repo = Did(did = accountKey.id),
+                collection = Nsid("app.bsky.feed.post"),
+                rkey = RKey(statusKey.id.substringAfterLast('/')),
+            ),
+        )
+    }
+
+    override suspend fun follow(userKey: MicroBlogKey) {
+        service.createRecord(
+            CreateRecordRequest(
+                repo = Did(did = accountKey.id),
+                collection = Nsid("app.bsky.graph.follow"),
+                record =
+                    app.bsky.graph
+                        .Follow(
+                            subject = Did(userKey.id),
+                            createdAt = Clock.System.now(),
+                        ).bskyJson(),
+            ),
+        )
+    }
+
+    override suspend fun unfollow(userKey: MicroBlogKey) {
+        val user =
+            service
+                .getProfile(GetProfileQueryParams(actor = Did(did = userKey.id)))
+                .requireResponse()
+
+        val followRepo = user.viewer?.following?.atUri
+        if (followRepo != null) {
+            service.deleteRecord(
+                DeleteRecordRequest(
+                    repo = Did(did = accountKey.id),
+                    collection = Nsid("app.bsky.graph.follow"),
+                    rkey = RKey(followRepo.substringAfterLast('/')),
+                ),
+            )
+        }
+    }
+
+    override suspend fun block(userKey: MicroBlogKey) {
+        service.createRecord(
+            CreateRecordRequest(
+                repo = Did(did = accountKey.id),
+                collection = Nsid("app.bsky.graph.block"),
+                record =
+                    app.bsky.graph
+                        .Block(
+                            subject = Did(userKey.id),
+                            createdAt = Clock.System.now(),
+                        ).bskyJson(),
+            ),
+        )
+    }
+
+    override suspend fun unblock(userKey: MicroBlogKey) {
+        val user =
+            service
+                .getProfile(GetProfileQueryParams(actor = Did(did = userKey.id)))
+                .requireResponse()
+
+        val blockRepo = user.viewer?.blocking?.atUri
+        if (blockRepo != null) {
+            service.deleteRecord(
+                DeleteRecordRequest(
+                    repo = Did(did = accountKey.id),
+                    collection = Nsid("app.bsky.graph.block"),
+                    rkey = RKey(blockRepo.substringAfterLast('/')),
+                ),
+            )
+        }
+    }
+
+    override suspend fun mute(userKey: MicroBlogKey) {
+        service.muteActor(MuteActorRequest(actor = Did(did = userKey.id)))
+    }
+
+    override suspend fun unmute(userKey: MicroBlogKey) {
+        service.unmuteActor(UnmuteActorRequest(actor = Did(did = userKey.id)))
+    }
+
+    override suspend fun notificationBadgeCount(): Int {
+        val notifications =
+            service
+                .listNotifications(
+                    params = ListNotificationsQueryParams(limit = 40),
+                ).requireResponse()
+                .notifications
+        return notifications.count { !it.isRead }
+    }
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BookmarkTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BookmarkTimelineRemoteMediator.kt
index 67dbbdf14..09d756c53 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BookmarkTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BookmarkTimelineRemoteMediator.kt
@@ -2,29 +2,25 @@ package dev.dimension.flare.data.datasource.bluesky
 
 import androidx.paging.ExperimentalPagingApi
 import app.bsky.bookmark.GetBookmarksQueryParams
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDb
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.bluesky.BlueskyService
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class BookmarkTimelineRemoteMediator(
     private val service: BlueskyService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String = "bookmark_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
@@ -55,11 +51,7 @@ internal class BookmarkTimelineRemoteMediator(
 
         return PagingResult(
             endOfPaginationReached = response.bookmarks.isEmpty() || response.cursor == null,
-            data =
-                response.bookmarks.toDb(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+            data = response.bookmarks.mapNotNull { it.render(accountKey) },
             nextKey = response.cursor,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/FansPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/FansPagingSource.kt
index 074a1c19f..e3d46503a 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/FansPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/FansPagingSource.kt
@@ -1,8 +1,9 @@
 package dev.dimension.flare.data.datasource.bluesky
 
-import androidx.paging.PagingState
 import app.bsky.graph.GetFollowersQueryParams
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.bluesky.BlueskyService
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiProfile
@@ -13,28 +14,44 @@ internal class FansPagingSource(
     private val service: BlueskyService,
     private val accountKey: MicroBlogKey,
     private val userKey: MicroBlogKey,
-) : BasePagingSource<String, UiProfile>() {
-    override fun getRefreshKey(state: PagingState<String, UiProfile>): String? = null
-
-    override suspend fun doLoad(params: LoadParams<String>): LoadResult<String, UiProfile> {
-        val cursor = params.key
-        val limit = params.loadSize
+) : RemoteLoader<UiProfile> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiProfile> {
         val response =
-            service
-                .getFollowers(
-                    params =
-                        GetFollowersQueryParams(
-                            actor = Did(userKey.id),
-                            limit = limit.toLong(),
-                            cursor = cursor,
-                        ),
-                ).requireResponse()
-        return LoadResult.Page(
-            data =
-                response.followers.map {
-                    it.render(accountKey = accountKey)
-                },
-            prevKey = null,
+            when (request) {
+                is PagingRequest.Prepend -> {
+                    return PagingResult(
+                        endOfPaginationReached = true,
+                    )
+                }
+
+                PagingRequest.Refresh ->
+                    service
+                        .getFollowers(
+                            params =
+                                GetFollowersQueryParams(
+                                    actor = Did(userKey.id),
+                                    limit = pageSize.toLong(),
+                                ),
+                        ).requireResponse()
+
+                is PagingRequest.Append ->
+                    service
+                        .getFollowers(
+                            params =
+                                GetFollowersQueryParams(
+                                    actor = Did(userKey.id),
+                                    limit = pageSize.toLong(),
+                                    cursor = request.nextKey,
+                                ),
+                        ).requireResponse()
+            }
+
+        return PagingResult(
+            endOfPaginationReached = response.cursor == null,
+            data = response.followers.map { it.render(accountKey = accountKey) },
             nextKey = response.cursor,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/FeedTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/FeedTimelineRemoteMediator.kt
index c9a575767..d6c996043 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/FeedTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/FeedTimelineRemoteMediator.kt
@@ -2,31 +2,27 @@ package dev.dimension.flare.data.datasource.bluesky
 
 import androidx.paging.ExperimentalPagingApi
 import app.bsky.feed.GetFeedQueryParams
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.bluesky.BlueskyService
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 import sh.christian.ozone.api.AtUri
 
 @OptIn(ExperimentalPagingApi::class)
 internal class FeedTimelineRemoteMediator(
     private val service: BlueskyService,
     private val accountKey: MicroBlogKey,
-    private val database: CacheDatabase,
     private val uri: String,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey = "feed_timeline_$uri"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh ->
@@ -60,11 +56,7 @@ internal class FeedTimelineRemoteMediator(
 
         return PagingResult(
             endOfPaginationReached = response.cursor == null,
-            data =
-                response.feed.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+            data = response.feed.render(accountKey),
             nextKey = response.cursor,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/FollowingPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/FollowingPagingSource.kt
index 2bcbcf649..4c39a9171 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/FollowingPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/FollowingPagingSource.kt
@@ -1,8 +1,9 @@
 package dev.dimension.flare.data.datasource.bluesky
 
-import androidx.paging.PagingState
 import app.bsky.graph.GetFollowsQueryParams
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.bluesky.BlueskyService
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiProfile
@@ -13,28 +14,44 @@ internal class FollowingPagingSource(
     private val service: BlueskyService,
     private val accountKey: MicroBlogKey,
     private val userKey: MicroBlogKey,
-) : BasePagingSource<String, UiProfile>() {
-    override fun getRefreshKey(state: PagingState<String, UiProfile>): String? = null
-
-    override suspend fun doLoad(params: LoadParams<String>): LoadResult<String, UiProfile> {
-        val cursor = params.key
-        val limit = params.loadSize
+) : RemoteLoader<UiProfile> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiProfile> {
         val response =
-            service
-                .getFollows(
-                    params =
-                        GetFollowsQueryParams(
-                            actor = Did(userKey.id),
-                            limit = limit.toLong(),
-                            cursor = cursor,
-                        ),
-                ).requireResponse()
-        return LoadResult.Page(
-            data =
-                response.follows.map {
-                    it.render(accountKey = accountKey)
-                },
-            prevKey = null,
+            when (request) {
+                is PagingRequest.Prepend -> {
+                    return PagingResult(
+                        endOfPaginationReached = true,
+                    )
+                }
+
+                PagingRequest.Refresh ->
+                    service
+                        .getFollows(
+                            params =
+                                GetFollowsQueryParams(
+                                    actor = Did(userKey.id),
+                                    limit = pageSize.toLong(),
+                                ),
+                        ).requireResponse()
+
+                is PagingRequest.Append ->
+                    service
+                        .getFollows(
+                            params =
+                                GetFollowsQueryParams(
+                                    actor = Did(userKey.id),
+                                    limit = pageSize.toLong(),
+                                    cursor = request.nextKey,
+                                ),
+                        ).requireResponse()
+            }
+
+        return PagingResult(
+            endOfPaginationReached = response.cursor == null,
+            data = response.follows.map { it.render(accountKey = accountKey) },
             nextKey = response.cursor,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/HomeTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/HomeTimelineRemoteMediator.kt
index 24e5eaffb..241150c37 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/HomeTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/HomeTimelineRemoteMediator.kt
@@ -2,36 +2,25 @@ package dev.dimension.flare.data.datasource.bluesky
 
 import androidx.paging.ExperimentalPagingApi
 import app.bsky.feed.GetTimelineQueryParams
-import dev.dimension.flare.common.InAppNotification
-import dev.dimension.flare.common.Message
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.bluesky.BlueskyService
-import dev.dimension.flare.data.repository.LoginExpiredException
 import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.model.PlatformType
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class HomeTimelineRemoteMediator(
     private val service: BlueskyService,
     private val accountKey: MicroBlogKey,
-    private val database: CacheDatabase,
-    private val inAppNotification: InAppNotification,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String = "home_$accountKey"
 
-    override suspend fun initialize(): InitializeAction = InitializeAction.SKIP_INITIAL_REFRESH
-
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 is PagingRequest.Prepend -> return PagingResult(
@@ -61,24 +50,8 @@ internal class HomeTimelineRemoteMediator(
             )
         return PagingResult(
             endOfPaginationReached = response.cursor == null,
-            data =
-                response.feed.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+            data = response.feed.render(accountKey),
             nextKey = response.cursor,
         )
     }
-
-    override fun onError(e: Throwable) {
-        if (e is LoginExpiredException) {
-            inAppNotification.onError(
-                Message.LoginExpired,
-                LoginExpiredException(
-                    accountKey = accountKey,
-                    platformType = PlatformType.Bluesky,
-                ),
-            )
-        }
-    }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/ListTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/ListTimelineRemoteMediator.kt
index ca81b15fa..26d4a32ea 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/ListTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/ListTimelineRemoteMediator.kt
@@ -2,31 +2,27 @@ package dev.dimension.flare.data.datasource.bluesky
 
 import androidx.paging.ExperimentalPagingApi
 import app.bsky.feed.GetListFeedQueryParams
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.bluesky.BlueskyService
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 import sh.christian.ozone.api.AtUri
 
 @OptIn(ExperimentalPagingApi::class)
 internal class ListTimelineRemoteMediator(
     private val service: BlueskyService,
     private val accountKey: MicroBlogKey,
-    private val database: CacheDatabase,
     private val uri: String,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey = "list_timeline_${uri}_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh ->
@@ -60,11 +56,7 @@ internal class ListTimelineRemoteMediator(
 
         return PagingResult(
             endOfPaginationReached = response.cursor == null,
-            data =
-                response.feed.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+            data = response.feed.render(accountKey),
             nextKey = response.cursor,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/NotificationRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/NotificationRemoteMediator.kt
index 0ccc8f05d..0d7eb62b2 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/NotificationRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/NotificationRemoteMediator.kt
@@ -7,14 +7,13 @@ import app.bsky.feed.Repost
 import app.bsky.notification.ListNotificationsNotificationReason
 import app.bsky.notification.ListNotificationsQueryParams
 import app.bsky.notification.UpdateSeenRequest
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDb
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.bluesky.BlueskyService
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableMap
 import kotlin.time.Clock
@@ -23,21 +22,18 @@ import kotlin.time.Clock
 internal class NotificationRemoteMediator(
     private val service: BlueskyService,
     private val accountKey: MicroBlogKey,
-    private val database: CacheDatabase,
     private val onClearMarker: () -> Unit,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String =
         buildString {
             append("notification_")
             append(accountKey.toString())
         }
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
@@ -116,12 +112,7 @@ internal class NotificationRemoteMediator(
                 .toImmutableMap()
         return PagingResult(
             endOfPaginationReached = response.cursor == null,
-            data =
-                response.notifications.toDb(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                    references = references,
-                ),
+            data = response.notifications.render(accountKey, references),
             nextKey = response.cursor,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/SearchStatusRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/SearchStatusRemoteMediator.kt
index c43ce26bb..775bb14f8 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/SearchStatusRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/SearchStatusRemoteMediator.kt
@@ -2,24 +2,20 @@ package dev.dimension.flare.data.datasource.bluesky
 
 import androidx.paging.ExperimentalPagingApi
 import app.bsky.feed.SearchPostsQueryParams
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDb
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.bluesky.BlueskyService
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class SearchStatusRemoteMediator(
     private val service: BlueskyService,
-    private val database: CacheDatabase,
     private val accountKey: MicroBlogKey,
     private val query: String,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String =
         buildString {
             append("search_")
@@ -27,10 +23,10 @@ internal class SearchStatusRemoteMediator(
             append(accountKey.toString())
         }
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 is PagingRequest.Prepend -> {
@@ -60,11 +56,7 @@ internal class SearchStatusRemoteMediator(
 
         return PagingResult(
             endOfPaginationReached = response.cursor == null,
-            data =
-                response.posts.toDb(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+            data = response.posts.map { it.render(accountKey) },
             nextKey = response.cursor,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/SearchUserPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/SearchUserPagingSource.kt
index 93dad5e1c..17e22f083 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/SearchUserPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/SearchUserPagingSource.kt
@@ -1,8 +1,9 @@
 package dev.dimension.flare.data.datasource.bluesky
 
-import androidx.paging.PagingState
 import app.bsky.actor.SearchActorsQueryParams
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.bluesky.BlueskyService
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiProfile
@@ -12,20 +13,43 @@ internal class SearchUserPagingSource(
     private val service: BlueskyService,
     private val accountKey: MicroBlogKey,
     private val query: String,
-) : BasePagingSource<String, UiProfile>() {
-    override fun getRefreshKey(state: PagingState<String, UiProfile>): String? = null
+) : RemoteLoader<UiProfile> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiProfile> {
+        val response =
+            when (request) {
+                is PagingRequest.Prepend -> {
+                    return PagingResult(
+                        endOfPaginationReached = true,
+                    )
+                }
 
-    override suspend fun doLoad(params: LoadParams<String>): LoadResult<String, UiProfile> {
-        service
-            .searchActors(
-                SearchActorsQueryParams(q = query, limit = params.loadSize.toLong(), cursor = params.key),
-            ).requireResponse()
-            .let {
-                return LoadResult.Page(
-                    data = it.actors.map { it.render(accountKey) },
-                    prevKey = null,
-                    nextKey = it.cursor,
-                )
+                PagingRequest.Refresh ->
+                    service
+                        .searchActors(
+                            SearchActorsQueryParams(
+                                q = query,
+                                limit = pageSize.toLong(),
+                            ),
+                        ).requireResponse()
+
+                is PagingRequest.Append ->
+                    service
+                        .searchActors(
+                            SearchActorsQueryParams(
+                                q = query,
+                                limit = pageSize.toLong(),
+                                cursor = request.nextKey,
+                            ),
+                        ).requireResponse()
             }
+
+        return PagingResult(
+            endOfPaginationReached = response.cursor == null,
+            data = response.actors.map { it.render(accountKey) },
+            nextKey = response.cursor,
+        )
     }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/StatusDetailRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/StatusDetailRemoteMediator.kt
index 9dd7b3e6a..66953a151 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/StatusDetailRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/StatusDetailRemoteMediator.kt
@@ -12,15 +12,15 @@ import app.bsky.feed.ThreadViewPost
 import app.bsky.feed.ThreadViewPostParentUnion
 import app.bsky.feed.ThreadViewPostReplieUnion
 import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
 import dev.dimension.flare.data.database.cache.model.DbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.bluesky.BlueskyService
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.flow.firstOrNull
 import sh.christian.ozone.api.AtUri
@@ -32,9 +32,7 @@ internal class StatusDetailRemoteMediator(
     private val accountKey: MicroBlogKey,
     private val database: CacheDatabase,
     private val statusOnly: Boolean,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String =
         buildString {
             append("status_detail_")
@@ -46,10 +44,10 @@ internal class StatusDetailRemoteMediator(
             append(accountKey.toString())
         }
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val result =
             when (request) {
                 is PagingRequest.Append -> {
@@ -145,7 +143,6 @@ internal class StatusDetailRemoteMediator(
                                 .insertAll(
                                     listOf(
                                         DbPagingTimeline(
-                                            accountType = AccountType.Specific(accountKey),
                                             statusKey = statusKey,
                                             pagingKey = pagingKey,
                                             sortId = 0,
@@ -171,13 +168,7 @@ internal class StatusDetailRemoteMediator(
         val shouldLoadMore = !(request is PagingRequest.Append || statusOnly)
         return PagingResult(
             endOfPaginationReached = !shouldLoadMore,
-            data =
-                result.toDbPagingTimeline(
-                    accountKey,
-                    pagingKey,
-                ) {
-                    -result.indexOf(it).toLong()
-                },
+            data = result.render(accountKey),
             nextKey = if (shouldLoadMore) pagingKey else null,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/TrendsUserPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/TrendsUserPagingSource.kt
index bafea783d..6f8ce6f61 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/TrendsUserPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/TrendsUserPagingSource.kt
@@ -1,8 +1,9 @@
 package dev.dimension.flare.data.datasource.bluesky
 
-import androidx.paging.PagingState
 import app.bsky.actor.GetSuggestionsQueryParams
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.bluesky.BlueskyService
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiProfile
@@ -11,17 +12,40 @@ import dev.dimension.flare.ui.model.mapper.render
 internal class TrendsUserPagingSource(
     private val service: BlueskyService,
     private val accountKey: MicroBlogKey,
-) : BasePagingSource<String, UiProfile>() {
-    override fun getRefreshKey(state: PagingState<String, UiProfile>): String? = null
-
-    override suspend fun doLoad(params: LoadParams<String>): LoadResult<String, UiProfile> {
+) : RemoteLoader<UiProfile> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiProfile> {
         val response =
-            service
-                .getSuggestions(GetSuggestionsQueryParams(limit = params.loadSize.toLong(), cursor = params.key))
-                .requireResponse()
-        return LoadResult.Page(
+            when (request) {
+                is PagingRequest.Prepend -> {
+                    return PagingResult(
+                        endOfPaginationReached = true,
+                    )
+                }
+
+                PagingRequest.Refresh ->
+                    service
+                        .getSuggestions(
+                            GetSuggestionsQueryParams(
+                                limit = pageSize.toLong(),
+                            ),
+                        ).requireResponse()
+
+                is PagingRequest.Append ->
+                    service
+                        .getSuggestions(
+                            GetSuggestionsQueryParams(
+                                limit = pageSize.toLong(),
+                                cursor = request.nextKey,
+                            ),
+                        ).requireResponse()
+            }
+
+        return PagingResult(
+            endOfPaginationReached = response.cursor == null,
             data = response.actors.map { it.render(accountKey) },
-            prevKey = null,
             nextKey = response.cursor,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/UserLikesTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/UserLikesTimelineRemoteMediator.kt
index 76041f6c0..dd8c2d349 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/UserLikesTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/UserLikesTimelineRemoteMediator.kt
@@ -2,30 +2,26 @@ package dev.dimension.flare.data.datasource.bluesky
 
 import androidx.paging.ExperimentalPagingApi
 import app.bsky.feed.GetActorLikesQueryParams
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.bluesky.BlueskyService
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 import sh.christian.ozone.api.Did
 
 @OptIn(ExperimentalPagingApi::class)
 internal class UserLikesTimelineRemoteMediator(
     private val service: BlueskyService,
     private val accountKey: MicroBlogKey,
-    private val database: CacheDatabase,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey = "user_timeline_likes_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh ->
@@ -59,11 +55,7 @@ internal class UserLikesTimelineRemoteMediator(
 
         return PagingResult(
             endOfPaginationReached = response.cursor == null,
-            data =
-                response.feed.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+            data = response.feed.render(accountKey),
             nextKey = response.cursor,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/UserTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/UserTimelineRemoteMediator.kt
index 593e16555..1e71894fe 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/UserTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/UserTimelineRemoteMediator.kt
@@ -3,27 +3,23 @@ package dev.dimension.flare.data.datasource.bluesky
 import androidx.paging.ExperimentalPagingApi
 import app.bsky.feed.GetAuthorFeedFilter
 import app.bsky.feed.GetAuthorFeedQueryParams
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.bluesky.BlueskyService
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 import sh.christian.ozone.api.Did
 
 @OptIn(ExperimentalPagingApi::class)
 internal class UserTimelineRemoteMediator(
     private val service: BlueskyService,
     private val accountKey: MicroBlogKey,
-    private val database: CacheDatabase,
     private val userKey: MicroBlogKey,
     private val onlyMedia: Boolean = false,
     private val withReplies: Boolean = false,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey =
         buildString {
             append("user_timeline")
@@ -37,10 +33,10 @@ internal class UserTimelineRemoteMediator(
             append(userKey.toString())
         }
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val filter =
             when {
                 onlyMedia -> GetAuthorFeedFilter.PostsWithMedia
@@ -84,11 +80,7 @@ internal class UserTimelineRemoteMediator(
 
         return PagingResult(
             endOfPaginationReached = response.cursor == null,
-            data =
-                response.feed.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+            data = response.feed.render(accountKey),
             nextKey = response.cursor,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt
index 7be4d2b1a..fccf60ed4 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt
@@ -121,25 +121,26 @@ internal sealed interface PostEvent {
         @Serializable
         data class Reblog(
             override val postKey: MicroBlogKey,
-            val reblogged: Boolean,
+            val cid: String,
+            val uri: String,
+            val repostUri: String?,
         ) : Bluesky
 
         @Serializable
         data class Like(
             override val postKey: MicroBlogKey,
-            val liked: Boolean,
+            val cid: String,
+            val uri: String,
+            val likedUri: String?,
         ) : Bluesky
 
         @Serializable
         data class Bookmark(
             override val postKey: MicroBlogKey,
+            val uri: String,
+            val cid: String,
             val bookmarked: Boolean,
         ) : Bluesky
-
-        @Serializable
-        data class Unbookmark(
-            override val postKey: MicroBlogKey,
-        ) : Bluesky
     }
 
     @Serializable
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ReactionDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ReactionDataSource.kt
index c6073c0bc..ed005b9db 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ReactionDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ReactionDataSource.kt
@@ -1,10 +1,6 @@
 package dev.dimension.flare.data.datasource.microblog
 
-import dev.dimension.flare.common.Cacheable
 import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.ui.model.UiEmoji
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.ImmutableMap
 
 internal interface ReactionDataSource : AuthenticatedMicroblogDataSource {
     fun react(
@@ -12,6 +8,4 @@ internal interface ReactionDataSource : AuthenticatedMicroblogDataSource {
         hasReacted: Boolean,
         reaction: String,
     )
-
-    fun emoji(): Cacheable<ImmutableMap<String, ImmutableList<UiEmoji>>>
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/pleroma/PleromaDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/pleroma/PleromaDataSource.kt
index 1d6279ed4..4b7be6477 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/pleroma/PleromaDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/pleroma/PleromaDataSource.kt
@@ -2,7 +2,6 @@ package dev.dimension.flare.data.datasource.pleroma
 
 import dev.dimension.flare.data.datasource.mastodon.MastodonDataSource
 import dev.dimension.flare.data.datasource.microblog.ReactionDataSource
-import dev.dimension.flare.data.datasource.microblog.StatusEvent
 import dev.dimension.flare.model.MicroBlogKey
 
 internal class PleromaDataSource(
@@ -12,8 +11,7 @@ internal class PleromaDataSource(
         accountKey = accountKey,
         instance = instance,
     ),
-    ReactionDataSource,
-    StatusEvent.Pleroma {
+    ReactionDataSource {
     override fun react(
         statusKey: MicroBlogKey,
         hasReacted: Boolean,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
index 722298798..8b85cddd3 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
@@ -293,11 +293,11 @@ public sealed class UiTimelineV2 {
     @Serializable
     @Immutable
     public data class UserList internal constructor(
-        val message: Message? = null,
+        val message: Message?,
         val users: SerializableImmutableList<UiProfile>,
         override val createdAt: UiDateTime,
         override val statusKey: MicroBlogKey,
-        val post: Post? = null,
+        val post: Post?,
         override val extraKey: String? = null,
         override val accountType: AccountType,
     ) : UiTimelineV2() {
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
index fa6d0c456..421ff4fb3 100644
--- 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
@@ -3,16 +3,23 @@ package dev.dimension.flare.ui.model.mapper
 import app.bsky.actor.ProfileView
 import app.bsky.actor.ProfileViewBasic
 import app.bsky.actor.ProfileViewDetailed
+import app.bsky.bookmark.BookmarkView
+import app.bsky.bookmark.BookmarkViewItemUnion
 import app.bsky.embed.ExternalView
 import app.bsky.embed.RecordViewRecordEmbedUnion
 import app.bsky.embed.RecordViewRecordUnion
 import app.bsky.embed.RecordWithMediaViewMediaUnion
+import app.bsky.feed.FeedViewPost
 import app.bsky.feed.FeedViewPostReasonUnion
 import app.bsky.feed.GeneratorView
+import app.bsky.feed.Like
 import app.bsky.feed.Post
 import app.bsky.feed.PostView
 import app.bsky.feed.PostViewEmbedUnion
+import app.bsky.feed.ReplyRefParentUnion
+import app.bsky.feed.Repost
 import app.bsky.graph.ListView
+import app.bsky.notification.ListNotificationsNotification
 import app.bsky.notification.ListNotificationsNotificationReason
 import app.bsky.richtext.Facet
 import app.bsky.richtext.FacetByteSlice
@@ -23,23 +30,24 @@ import app.bsky.richtext.FacetTag
 import chat.bsky.convo.MessageView
 import com.fleeksoft.ksoup.nodes.Element
 import com.fleeksoft.ksoup.nodes.TextNode
+import dev.dimension.flare.common.SerializableImmutableList
 import dev.dimension.flare.data.database.cache.model.MessageContent
-import dev.dimension.flare.data.database.cache.model.StatusContent
 import dev.dimension.flare.data.datasource.microblog.ActionMenu
-import dev.dimension.flare.data.datasource.microblog.StatusEvent
+import dev.dimension.flare.data.datasource.microblog.PostEvent
 import dev.dimension.flare.data.datasource.microblog.userActionsMenu
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
-import dev.dimension.flare.model.ReferenceType
+import dev.dimension.flare.model.toAccountType
 import dev.dimension.flare.ui.model.ClickEvent
 import dev.dimension.flare.ui.model.UiCard
 import dev.dimension.flare.ui.model.UiDMItem
+import dev.dimension.flare.ui.model.UiIcon
 import dev.dimension.flare.ui.model.UiList
 import dev.dimension.flare.ui.model.UiMedia
 import dev.dimension.flare.ui.model.UiNumber
 import dev.dimension.flare.ui.model.UiProfile
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.toHtml
 import dev.dimension.flare.ui.render.UiRichText
 import dev.dimension.flare.ui.render.toUi
@@ -48,6 +56,7 @@ import dev.dimension.flare.ui.route.toUri
 import io.ktor.http.Url
 import io.ktor.utils.io.charsets.Charsets
 import io.ktor.utils.io.core.toByteArray
+import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
@@ -62,6 +71,7 @@ import moe.tlaster.twitter.parser.HashTagToken
 import moe.tlaster.twitter.parser.TwitterParser
 import moe.tlaster.twitter.parser.UrlToken
 import moe.tlaster.twitter.parser.UserNameToken
+import sh.christian.ozone.api.AtUri
 import sh.christian.ozone.api.Did
 import sh.christian.ozone.api.Uri
 import sh.christian.ozone.api.model.JsonContent
@@ -92,6 +102,14 @@ internal val bskyJson by lazy {
 
 private fun List<Byte>.stringify(): String = this.toByteArray().decodeToString()
 
+internal fun BookmarkView.render(accountKey: MicroBlogKey): UiTimelineV2? =
+    when (val content = item) {
+        is BookmarkViewItemUnion.BlockedPost -> null
+        is BookmarkViewItemUnion.NotFoundPost -> null
+        is BookmarkViewItemUnion.PostView -> content.value.render(accountKey)
+        is BookmarkViewItemUnion.Unknown -> null
+    }
+
 private fun Element.appendTextWithBr(text: String) {
     val parts = text.split("\n")
     for (i in parts.indices) {
@@ -304,197 +322,329 @@ private fun parseBluesky(
     return element.toUi()
 }
 
-internal fun FeedViewPostReasonUnion.render(
-    accountKey: MicroBlogKey,
-    event: StatusEvent.Bluesky,
-    references: Map<ReferenceType, List<StatusContent>>,
-): UiTimeline {
-    val data = (references[ReferenceType.Retweet]?.firstOrNull() as? StatusContent.Bluesky)?.data
-    val topMessage =
+private val ListNotificationsNotificationReason.icon: UiIcon
+    get() =
         when (this) {
-            is FeedViewPostReasonUnion.ReasonPin -> {
-                val user = data?.author?.render(accountKey = accountKey)
-                UiTimeline.TopMessage(
-                    user = user,
-                    icon = UiTimeline.TopMessage.Icon.Pin,
-                    type = UiTimeline.TopMessage.MessageType.Bluesky.Pinned,
-                    onClicked = { },
+            ListNotificationsNotificationReason.Like -> UiIcon.Favourite
+            ListNotificationsNotificationReason.Repost -> UiIcon.Retweet
+            ListNotificationsNotificationReason.Follow -> UiIcon.Follow
+            ListNotificationsNotificationReason.Mention -> UiIcon.Mention
+            ListNotificationsNotificationReason.Reply -> UiIcon.Reply
+            ListNotificationsNotificationReason.Quote -> UiIcon.Reply
+            is ListNotificationsNotificationReason.Unknown -> UiIcon.Info
+            ListNotificationsNotificationReason.StarterpackJoined -> UiIcon.Info
+            ListNotificationsNotificationReason.Unverified -> UiIcon.Info
+            ListNotificationsNotificationReason.Verified -> UiIcon.Info
+            ListNotificationsNotificationReason.LikeViaRepost -> UiIcon.Favourite
+            ListNotificationsNotificationReason.RepostViaRepost -> UiIcon.Retweet
+            ListNotificationsNotificationReason.SubscribedPost -> UiIcon.Info
+            ListNotificationsNotificationReason.ContactMatch -> UiIcon.Info
+        }
+
+private val ListNotificationsNotificationReason.type: UiTimelineV2.Message.Type
+    get() =
+        when (this) {
+            ListNotificationsNotificationReason.Like ->
+                UiTimelineV2.Message.Type.Localized(
+                    UiTimelineV2.Message.Type.Localized.MessageId.Favourite,
+                )
+
+            ListNotificationsNotificationReason.Repost ->
+                UiTimelineV2.Message.Type.Localized(
+                    UiTimelineV2.Message.Type.Localized.MessageId.Repost,
+                )
+
+            ListNotificationsNotificationReason.Follow ->
+                UiTimelineV2.Message.Type.Localized(
+                    UiTimelineV2.Message.Type.Localized.MessageId.Follow,
+                )
+
+            ListNotificationsNotificationReason.Mention ->
+                UiTimelineV2.Message.Type.Localized(
+                    UiTimelineV2.Message.Type.Localized.MessageId.Mention,
+                )
+
+            ListNotificationsNotificationReason.Reply ->
+                UiTimelineV2.Message.Type.Localized(
+                    UiTimelineV2.Message.Type.Localized.MessageId.Reply,
+                )
+
+            ListNotificationsNotificationReason.Quote ->
+                UiTimelineV2.Message.Type.Localized(
+                    UiTimelineV2.Message.Type.Localized.MessageId.Quote,
+                )
+
+            is ListNotificationsNotificationReason.Unknown ->
+                UiTimelineV2.Message.Type.Unknown(
+                    rawType = rawValue,
+                )
+
+            ListNotificationsNotificationReason.StarterpackJoined ->
+                UiTimelineV2.Message.Type.Localized(
+                    UiTimelineV2.Message.Type.Localized.MessageId.StarterpackJoined,
+                )
+
+            ListNotificationsNotificationReason.Unverified ->
+                UiTimelineV2.Message.Type.Unknown(
+                    rawType = "Unverified",
+                )
+
+            ListNotificationsNotificationReason.Verified ->
+                UiTimelineV2.Message.Type.Unknown(
+                    rawType = "Verified",
+                )
+
+            ListNotificationsNotificationReason.LikeViaRepost ->
+                UiTimelineV2.Message.Type.Localized(
+                    UiTimelineV2.Message.Type.Localized.MessageId.Favourite,
+                )
+
+            ListNotificationsNotificationReason.RepostViaRepost ->
+                UiTimelineV2.Message.Type.Localized(
+                    UiTimelineV2.Message.Type.Localized.MessageId.Repost,
+                )
+
+            ListNotificationsNotificationReason.SubscribedPost ->
+                UiTimelineV2.Message.Type.Unknown(
+                    rawType = "SubscribedPost",
+                )
+
+            ListNotificationsNotificationReason.ContactMatch ->
+                UiTimelineV2.Message.Type.Unknown(
+                    rawType = "ContactMatch",
+                )
+        }
+
+internal fun List<FeedViewPost>.render(accountKey: MicroBlogKey): List<UiTimelineV2> {
+    // TODO: https://github.com/DimensionDev/Flare/issues/1671
+    return this.map { it.render(accountKey) }
+}
+
+internal fun List<ListNotificationsNotification>.render(
+    accountKey: MicroBlogKey,
+    references: ImmutableMap<AtUri, PostView>,
+): List<UiTimelineV2> {
+    val grouped = this.groupBy { it.reason }.filter { it.value.any() }
+    return grouped.flatMap { (reason, items) ->
+        when (reason) {
+            ListNotificationsNotificationReason.Repost, ListNotificationsNotificationReason.Like -> {
+                val post =
+                    items
+                        .first()
+                        .record
+                        .let {
+                            when (reason) {
+                                ListNotificationsNotificationReason.Repost -> it.decodeAs<Repost>().subject
+                                ListNotificationsNotificationReason.Like -> it.decodeAs<Like>().subject
+                            }
+                        }.uri
+                        .let {
+                            references[it]
+                        }
+                val idSuffix =
+                    when (reason) {
+                        ListNotificationsNotificationReason.Repost -> "_repost"
+                        ListNotificationsNotificationReason.Like -> "_like"
+                    }
+                listOf(
+                    UiTimelineV2.UserList(
+                        message =
+                            UiTimelineV2.Message(
+                                user = null,
+                                icon = reason.icon,
+                                type = reason.type,
+                                statusKey =
+                                    MicroBlogKey(
+                                        id = items.joinToString("_") { it.uri.atUri } + idSuffix,
+                                        host = accountKey.host,
+                                    ),
+                                clickEvent = ClickEvent.Noop,
+                                createdAt = items.first().indexedAt.toUi(),
+                                accountType = accountKey.toAccountType(),
+                            ),
+                        users =
+                            items
+                                .map {
+                                    it.author.render(accountKey)
+                                }.toImmutableList(),
+                        createdAt = items.first().indexedAt.toUi(),
+                        post = post?.render(accountKey),
+                        statusKey =
+                            MicroBlogKey(
+                                id = items.joinToString("_") { it.uri.atUri } + idSuffix,
+                                host = accountKey.host,
+                            ),
+                        accountType = accountKey.toAccountType(),
+                    ),
+                )
+            }
+
+            ListNotificationsNotificationReason.Follow -> {
+                listOf(
+                    UiTimelineV2.UserList(
+                        message =
+                            UiTimelineV2.Message(
+                                user = null,
+                                icon = reason.icon,
+                                type = reason.type,
+                                statusKey =
+                                    MicroBlogKey(
+                                        id = items.joinToString("_") { it.uri.atUri } + "_follow",
+                                        host = accountKey.host,
+                                    ),
+                                clickEvent = ClickEvent.Noop,
+                                createdAt = items.first().indexedAt.toUi(),
+                                accountType = accountKey.toAccountType(),
+                            ),
+                        users =
+                            items
+                                .map {
+                                    it.author.render(accountKey)
+                                }.toImmutableList(),
+                        createdAt = items.first().indexedAt.toUi(),
+                        post = null,
+                        statusKey =
+                            MicroBlogKey(
+                                id = items.joinToString("_") { it.uri.atUri } + "_follow",
+                                host = accountKey.host,
+                            ),
+                        accountType = accountKey.toAccountType(),
+                    ),
+                )
+            }
+
+            ListNotificationsNotificationReason.LikeViaRepost,
+            ListNotificationsNotificationReason.RepostViaRepost,
+            ListNotificationsNotificationReason.SubscribedPost,
+            ListNotificationsNotificationReason.ContactMatch,
+            ListNotificationsNotificationReason.Mention,
+            ListNotificationsNotificationReason.Reply,
+            ListNotificationsNotificationReason.Quote,
+            -> {
+                items.mapNotNull {
+                    references[it.uri]
+                        ?.render(
+                            accountKey,
+                        )?.copy(
+                            message =
+                                UiTimelineV2.Message(
+                                    user = it.author.render(accountKey),
+                                    icon = reason.icon,
+                                    type = reason.type,
+                                    statusKey =
+                                        MicroBlogKey(
+                                            id = it.uri.atUri,
+                                            host = accountKey.host,
+                                        ),
+                                    clickEvent = ClickEvent.Noop,
+                                    createdAt = it.indexedAt.toUi(),
+                                    accountType = accountKey.toAccountType(),
+                                ),
+                        )
+                }
+            }
+
+            else -> {
+                items.map {
+                    UiTimelineV2.User(
+                        message =
+                            UiTimelineV2.Message(
+                                user = it.author.render(accountKey),
+                                icon = reason.icon,
+                                type = reason.type,
+                                statusKey =
+                                    MicroBlogKey(
+                                        id = it.uri.atUri,
+                                        host = accountKey.host,
+                                    ),
+                                clickEvent = ClickEvent.Noop,
+                                createdAt = it.indexedAt.toUi(),
+                                accountType = accountKey.toAccountType(),
+                            ),
+                        value = it.author.render(accountKey),
+                        statusKey =
+                            MicroBlogKey(
+                                id = it.uri.atUri,
+                                host = accountKey.host,
+                            ),
+                        createdAt = it.indexedAt.toUi(),
+                        accountType = accountKey.toAccountType(),
+                    )
+                }
+            }
+        }
+    }
+}
+
+private fun FeedViewPost.render(accountKey: MicroBlogKey): UiTimelineV2 {
+    val renderedPost = post.render(accountKey)
+    val message =
+        when (val reason = reason) {
+            is FeedViewPostReasonUnion.ReasonPin ->
+                UiTimelineV2.Message(
+                    user = renderedPost.user,
+                    icon = UiIcon.Pin,
+                    type = UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.Pinned),
                     statusKey =
                         MicroBlogKey(
-                            id = data?.uri?.atUri.orEmpty(),
+                            id = post.uri.atUri + "_pin_${renderedPost.user?.key}",
                             host = accountKey.host,
                         ),
+                    createdAt = renderedPost.createdAt,
+                    accountType = accountKey.toAccountType(),
+                    clickEvent =
+                        ClickEvent.Deeplink(
+                            DeeplinkRoute.Status.Detail(
+                                statusKey = renderedPost.statusKey,
+                                accountType = accountKey.toAccountType(),
+                            ),
+                        ),
                 )
-            }
 
             is FeedViewPostReasonUnion.ReasonRepost -> {
-                val user = value.by.render(accountKey)
-                UiTimeline.TopMessage(
+                val user = reason.value.by.render(accountKey)
+                UiTimelineV2.Message(
                     user = user,
-                    icon = UiTimeline.TopMessage.Icon.Retweet,
-                    type = UiTimeline.TopMessage.MessageType.Bluesky.Repost,
-                    onClicked = {
-                        launcher.launch(
-                            DeeplinkRoute.Profile
-                                .User(
-                                    accountType = AccountType.Specific(accountKey),
-                                    userKey = user.key,
-                                ).toUri(),
-                        )
-                    },
+                    icon = UiIcon.Retweet,
+                    type = UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.Repost),
                     statusKey =
                         MicroBlogKey(
-                            id = data?.uri?.atUri.orEmpty(),
+                            id = post.uri.atUri + "_reblog_${user.key}",
                             host = accountKey.host,
                         ),
+                    createdAt = renderedPost.createdAt,
+                    accountType = accountKey.toAccountType(),
+                    clickEvent =
+                        ClickEvent.Deeplink(
+                            DeeplinkRoute.Profile.User(
+                                accountType = AccountType.Specific(accountKey),
+                                userKey = user.key,
+                            ),
+                        ),
                 )
             }
 
-            is FeedViewPostReasonUnion.Unknown -> null
+            else -> null
         }
-    return UiTimeline(
-        topMessage = topMessage,
-        content = data?.renderStatus(accountKey, event),
-    )
-}
 
-internal fun StatusContent.BlueskyNotification.renderBlueskyNotification(
-    accountKey: MicroBlogKey,
-    event: StatusEvent.Bluesky,
-    references: Map<ReferenceType, List<StatusContent>> = emptyMap(),
-): UiTimeline {
-    return when (this) {
-        is StatusContent.BlueskyNotification.Normal -> {
-            val user = data.author.render(accountKey = accountKey)
-            val topMessage =
-                UiTimeline.TopMessage(
-                    user = user,
-                    icon = data.reason.icon,
-                    type = data.reason.type,
-                    onClicked = {
-                        launcher.launch(
-                            DeeplinkRoute.Profile
-                                .User(
-                                    accountType = AccountType.Specific(accountKey),
-                                    userKey = user.key,
-                                ).toUri(),
-                        )
-                    },
-                    statusKey = MicroBlogKey(id = data.uri.atUri, host = accountKey.host),
-                )
-            val content =
-                UiTimeline.ItemContent.User(
-                    value = user,
-                )
-            UiTimeline(
-                topMessage = topMessage,
-                content = content,
-            )
-        }
-
-        is StatusContent.BlueskyNotification.Post ->
-            references[ReferenceType.Notification]?.firstOrNull()?.render(event) ?: post.render(
-                accountKey,
-                event = event,
-            )
-
-        is StatusContent.BlueskyNotification.UserList -> {
-            val reason = this.data.firstOrNull()?.reason
-            val uri =
-                this.data
-                    .firstOrNull()
-                    ?.uri
-                    ?.atUri ?: ""
-            val topMessage =
-                if (reason != null) {
-                    UiTimeline.TopMessage(
-                        user = null,
-                        icon = reason.icon,
-                        type = reason.type,
-                        onClicked = {
-//                        launcher.launch(AppDeepLink.Profile(accountKey = accountKey, userKey = user.key))
-                        },
-                        statusKey = MicroBlogKey(id = uri, host = accountKey.host),
-                    )
+    val reply =
+        when (val reply = reply?.parent) {
+            is ReplyRefParentUnion.PostView ->
+                if (reply.value.uri != post.uri) {
+                    reply.value
                 } else {
                     null
                 }
-            val content =
-                UiTimeline.ItemContent.UserList(
-                    users =
-                        this.data
-                            .map { it.author.render(accountKey = accountKey) }
-                            .toImmutableList(),
-                    status =
-                        references[ReferenceType.Notification]
-                            ?.firstOrNull()
-                            ?.let { it as? StatusContent.Bluesky }
-                            ?.data
-                            ?.renderStatus(
-                                accountKey,
-                                event,
-                            ),
-                )
-            return UiTimeline(
-                topMessage = topMessage,
-                content = content,
-            )
-        }
-    }
-}
-
-private val ListNotificationsNotificationReason.icon: UiTimeline.TopMessage.Icon
-    get() =
-        when (this) {
-            ListNotificationsNotificationReason.Like -> UiTimeline.TopMessage.Icon.Favourite
-            ListNotificationsNotificationReason.Repost -> UiTimeline.TopMessage.Icon.Retweet
-            ListNotificationsNotificationReason.Follow -> UiTimeline.TopMessage.Icon.Follow
-            ListNotificationsNotificationReason.Mention -> UiTimeline.TopMessage.Icon.Mention
-            ListNotificationsNotificationReason.Reply -> UiTimeline.TopMessage.Icon.Reply
-            ListNotificationsNotificationReason.Quote -> UiTimeline.TopMessage.Icon.Reply
-            is ListNotificationsNotificationReason.Unknown -> UiTimeline.TopMessage.Icon.Info
-            ListNotificationsNotificationReason.StarterpackJoined -> UiTimeline.TopMessage.Icon.Info
-            ListNotificationsNotificationReason.Unverified -> UiTimeline.TopMessage.Icon.Info
-            ListNotificationsNotificationReason.Verified -> UiTimeline.TopMessage.Icon.Info
-            ListNotificationsNotificationReason.LikeViaRepost -> UiTimeline.TopMessage.Icon.Favourite
-            ListNotificationsNotificationReason.RepostViaRepost -> UiTimeline.TopMessage.Icon.Retweet
-            ListNotificationsNotificationReason.SubscribedPost -> UiTimeline.TopMessage.Icon.Info
-            ListNotificationsNotificationReason.ContactMatch -> UiTimeline.TopMessage.Icon.Info
-        }
 
-private val ListNotificationsNotificationReason.type: UiTimeline.TopMessage.MessageType
-    get() =
-        when (this) {
-            ListNotificationsNotificationReason.Like -> UiTimeline.TopMessage.MessageType.Bluesky.Like
-            ListNotificationsNotificationReason.Repost -> UiTimeline.TopMessage.MessageType.Bluesky.Repost
-            ListNotificationsNotificationReason.Follow -> UiTimeline.TopMessage.MessageType.Bluesky.Follow
-            ListNotificationsNotificationReason.Mention -> UiTimeline.TopMessage.MessageType.Bluesky.Mention
-            ListNotificationsNotificationReason.Reply -> UiTimeline.TopMessage.MessageType.Bluesky.Reply
-            ListNotificationsNotificationReason.Quote -> UiTimeline.TopMessage.MessageType.Bluesky.Quote
-            is ListNotificationsNotificationReason.Unknown -> UiTimeline.TopMessage.MessageType.Bluesky.UnKnown
-            ListNotificationsNotificationReason.StarterpackJoined -> UiTimeline.TopMessage.MessageType.Bluesky.StarterpackJoined
-            ListNotificationsNotificationReason.Unverified -> UiTimeline.TopMessage.MessageType.Bluesky.UnKnown
-            ListNotificationsNotificationReason.Verified -> UiTimeline.TopMessage.MessageType.Bluesky.UnKnown
-            ListNotificationsNotificationReason.LikeViaRepost -> UiTimeline.TopMessage.MessageType.Bluesky.Like
-            ListNotificationsNotificationReason.RepostViaRepost -> UiTimeline.TopMessage.MessageType.Bluesky.Repost
-            ListNotificationsNotificationReason.SubscribedPost -> UiTimeline.TopMessage.MessageType.Bluesky.UnKnown
-            ListNotificationsNotificationReason.ContactMatch -> UiTimeline.TopMessage.MessageType.Bluesky.UnKnown
-        }
+            else -> null
+        }?.render(accountKey)
+    return renderedPost.copy(
+        message = message,
+        parents = listOfNotNull(reply).toImmutableList(),
+    )
+}
 
-internal fun PostView.render(
-    accountKey: MicroBlogKey,
-    event: StatusEvent.Bluesky,
-    references: Map<ReferenceType, List<StatusContent>> = mapOf(),
-) = UiTimeline(
-    topMessage = null,
-    content = renderStatus(accountKey, event, references),
-)
-
-internal fun PostView.renderStatus(
-    accountKey: MicroBlogKey,
-    event: StatusEvent.Bluesky,
-    references: Map<ReferenceType, List<StatusContent>> = mapOf(),
-): UiTimeline.ItemContent.Status {
+internal fun PostView.render(accountKey: MicroBlogKey): UiTimelineV2.Post {
     val user = author.render(accountKey)
     val isFromMe = user.key == accountKey
     val statusKey =
@@ -502,13 +652,6 @@ internal fun PostView.renderStatus(
             id = uri.atUri,
             host = accountKey.host,
         )
-    val parent =
-        references[ReferenceType.Reply]?.firstOrNull()?.let {
-            when (it) {
-                is StatusContent.Bluesky -> it.data
-                else -> null
-            }
-        }
 
     val sensitive =
         this.labels.orEmpty().any {
@@ -529,15 +672,7 @@ internal fun PostView.renderStatus(
             append(uri.atUri.substringAfterLast("/"))
         }
 
-    val parents =
-        references[ReferenceType.Reply]
-            ?.mapNotNull { it as? StatusContent.Bluesky }
-            ?.reversed()
-            ?.map { it.data.renderStatus(accountKey, event) }
-            ?.toPersistentList()
-            ?: persistentListOf()
-
-    return UiTimeline.ItemContent.Status(
+    return UiTimelineV2.Post(
         platformType = PlatformType.Bluesky,
         user = user,
         images = findMedias(this),
@@ -545,29 +680,28 @@ internal fun PostView.renderStatus(
         statusKey = statusKey,
         content = parseBlueskyJson(record, accountKey),
         poll = null,
-        quote = listOfNotNull(findQuote(accountKey, this, event)).toImmutableList(),
+        quote = listOfNotNull(findQuote(accountKey, this)).toImmutableList(),
         contentWarning = null,
-        parents = parents,
+        parents = persistentListOf(),
         actions =
             listOfNotNull(
                 ActionMenu.Item(
-                    icon = ActionMenu.Item.Icon.Reply,
+                    icon = UiIcon.Reply,
                     text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Reply),
                     count = UiNumber(replyCount ?: 0),
-                    onClicked = {
-                        launcher.launch(
+                    clickEvent =
+                        ClickEvent.Deeplink(
                             DeeplinkRoute.Compose
                                 .Reply(
                                     accountKey = accountKey,
                                     statusKey = statusKey,
-                                ).toUri(),
-                        )
-                    },
+                                ),
+                        ),
                 ),
                 ActionMenu.Group(
                     displayItem =
                         ActionMenu.Item(
-                            icon = if (viewer?.repost?.atUri != null) ActionMenu.Item.Icon.Unretweet else ActionMenu.Item.Icon.Retweet,
+                            icon = if (viewer?.repost?.atUri != null) UiIcon.Unretweet else UiIcon.Retweet,
                             text =
                                 ActionMenu.Item.Text.Localized(
                                     if (viewer?.repost?.atUri !=
@@ -588,9 +722,9 @@ internal fun PostView.renderStatus(
                                     if (viewer?.repost?.atUri !=
                                         null
                                     ) {
-                                        ActionMenu.Item.Icon.Unretweet
+                                        UiIcon.Unretweet
                                     } else {
-                                        ActionMenu.Item.Icon.Retweet
+                                        UiIcon.Retweet
                                     },
                                 text =
                                     ActionMenu.Item.Text.Localized(
@@ -604,33 +738,34 @@ internal fun PostView.renderStatus(
                                     ),
                                 count = UiNumber(repostCount ?: 0),
                                 color = if (viewer?.repost?.atUri != null) ActionMenu.Item.Color.PrimaryColor else null,
-                                onClicked = {
-                                    event.reblog(
-                                        statusKey = statusKey,
-                                        cid = cid.cid,
-                                        uri = uri.atUri,
-                                        repostUri = viewer?.repost?.atUri,
-                                    )
-                                },
+                                clickEvent =
+                                    ClickEvent.event(
+                                        accountKey,
+                                        PostEvent.Bluesky.Reblog(
+                                            postKey = statusKey,
+                                            cid = cid.cid,
+                                            uri = uri.atUri,
+                                            repostUri = viewer?.repost?.atUri,
+                                        ),
+                                    ),
                             ),
                             ActionMenu.Item(
-                                icon = ActionMenu.Item.Icon.Quote,
+                                icon = UiIcon.Quote,
                                 text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Quote),
                                 count = UiNumber(quoteCount ?: 0),
-                                onClicked = {
-                                    launcher.launch(
+                                clickEvent =
+                                    ClickEvent.Deeplink(
                                         DeeplinkRoute.Compose
                                             .Quote(
                                                 accountKey = accountKey,
                                                 statusKey = statusKey,
-                                            ).toUri(),
-                                    )
-                                },
+                                            ),
+                                    ),
                             ),
                         ).toImmutableList(),
                 ),
                 ActionMenu.Item(
-                    icon = if (viewer?.like?.atUri != null) ActionMenu.Item.Icon.Unlike else ActionMenu.Item.Icon.Like,
+                    icon = if (viewer?.like?.atUri != null) UiIcon.Unlike else UiIcon.Like,
                     text =
                         ActionMenu.Item.Text.Localized(
                             if (viewer?.like?.atUri !=
@@ -643,19 +778,21 @@ internal fun PostView.renderStatus(
                         ),
                     count = UiNumber(likeCount ?: 0),
                     color = if (viewer?.like?.atUri != null) ActionMenu.Item.Color.Red else null,
-                    onClicked = {
-                        event.like(
-                            statusKey = statusKey,
-                            cid = cid.cid,
-                            uri = uri.atUri,
-                            likedUri = viewer?.like?.atUri,
-                        )
-                    },
+                    clickEvent =
+                        ClickEvent.event(
+                            accountKey,
+                            PostEvent.Bluesky.Like(
+                                postKey = statusKey,
+                                cid = cid.cid,
+                                uri = uri.atUri,
+                                likedUri = viewer?.like?.atUri,
+                            ),
+                        ),
                 ),
                 ActionMenu.Group(
                     displayItem =
                         ActionMenu.Item(
-                            icon = ActionMenu.Item.Icon.More,
+                            icon = UiIcon.More,
                             text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.More),
                         ),
                     actions =
@@ -666,9 +803,9 @@ internal fun PostView.renderStatus(
                                         if (viewer?.bookmarked ==
                                             true
                                         ) {
-                                            ActionMenu.Item.Icon.Unbookmark
+                                            UiIcon.Unbookmark
                                         } else {
-                                            ActionMenu.Item.Icon.Bookmark
+                                            UiIcon.Bookmark
                                         },
                                     text =
                                         ActionMenu.Item.Text.Localized(
@@ -681,48 +818,43 @@ internal fun PostView.renderStatus(
                                             },
                                         ),
                                     count = UiNumber(bookmarkCount ?: 0),
-                                    onClicked = {
-                                        if (viewer?.bookmarked == true) {
-                                            event.unbookmark(
-                                                statusKey = statusKey,
-                                                uri = uri.atUri,
-                                            )
-                                        } else {
-                                            event.bookmark(
-                                                statusKey = statusKey,
+                                    clickEvent =
+                                        ClickEvent.event(
+                                            accountKey,
+                                            PostEvent.Bluesky.Bookmark(
+                                                postKey = statusKey,
                                                 uri = uri.atUri,
                                                 cid = cid.cid,
-                                            )
-                                        }
-                                    },
+                                                bookmarked = viewer?.bookmarked == true,
+                                            ),
+                                        ),
                                 ),
                             )
                             add(
                                 ActionMenu.Item(
-                                    icon = ActionMenu.Item.Icon.Share,
+                                    icon = UiIcon.Share,
                                     text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Share),
-                                    onClicked = {
-                                        launcher.launch(
+                                    clickEvent =
+                                        ClickEvent.Deeplink(
                                             DeeplinkRoute.Status
                                                 .ShareSheet(
                                                     statusKey = statusKey,
                                                     accountType = AccountType.Specific(accountKey),
                                                     shareUrl = url,
                                                     fxShareUrl = fxUrl,
-                                                ).toUri(),
-                                        )
-                                    },
+                                                ),
+                                        ),
                                 ),
                             )
 
                             if (isFromMe) {
                                 add(
                                     ActionMenu.Item(
-                                        icon = ActionMenu.Item.Icon.Delete,
+                                        icon = UiIcon.Delete,
                                         text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Delete),
                                         color = ActionMenu.Item.Color.Red,
-                                        onClicked = {
-                                            launcher.launch(
+                                        clickEvent =
+                                            ClickEvent.Deeplink(
                                                 DeeplinkRoute.Status
                                                     .DeleteConfirm(
                                                         accountType =
@@ -730,9 +862,8 @@ internal fun PostView.renderStatus(
                                                                 accountKey,
                                                             ),
                                                         statusKey = statusKey,
-                                                    ).toUri(),
-                                            )
-                                        },
+                                                    ),
+                                            ),
                                     ),
                                 )
                             } else {
@@ -747,11 +878,11 @@ internal fun PostView.renderStatus(
                                 add(ActionMenu.Divider)
                                 add(
                                     ActionMenu.Item(
-                                        icon = ActionMenu.Item.Icon.Report,
+                                        icon = UiIcon.Report,
                                         text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Report),
                                         color = ActionMenu.Item.Color.Red,
-                                        onClicked = {
-                                            launcher.launch(
+                                        clickEvent =
+                                            ClickEvent.Deeplink(
                                                 DeeplinkRoute.Status
                                                     .BlueskyReport(
                                                         statusKey = statusKey,
@@ -759,9 +890,8 @@ internal fun PostView.renderStatus(
                                                             AccountType.Specific(
                                                                 accountKey,
                                                             ),
-                                                    ).toUri(),
-                                            )
-                                        },
+                                                    ),
+                                            ),
                                     ),
                                 )
                             }
@@ -770,33 +900,15 @@ internal fun PostView.renderStatus(
             ).toImmutableList(),
         createdAt = indexedAt.toUi(),
         sensitive = sensitive,
-        onClicked = {
-            launcher.launch(
+        accountType = AccountType.Specific(accountKey),
+        clickEvent =
+            ClickEvent.Deeplink(
                 DeeplinkRoute.Status
                     .Detail(
                         statusKey = statusKey,
                         accountType = AccountType.Specific(accountKey),
-                    ).toUri(),
-            )
-        },
-        onMediaClicked = { media, index ->
-            launcher.launch(
-                DeeplinkRoute.Media
-                    .StatusMedia(
-                        accountType = AccountType.Specific(accountKey),
-                        statusKey = statusKey,
-                        index = index,
-                        preview =
-                            when (media) {
-                                is UiMedia.Image -> media.previewUrl
-                                is UiMedia.Video -> media.thumbnailUrl
-                                is UiMedia.Audio -> null
-                                is UiMedia.Gif -> media.previewUrl
-                            },
-                    ).toUri(),
-            )
-        },
-        url = url,
+                    ),
+            ),
     )
 }
 
@@ -832,7 +944,7 @@ internal fun ProfileViewBasic.render(accountKey: MicroBlogKey): UiProfile {
                     .User(
                         accountType = AccountType.Specific(accountKey),
                         userKey = userKey,
-                    ).toUri(),
+                    ),
             ),
     )
 }
@@ -869,7 +981,7 @@ internal fun ProfileView.render(accountKey: MicroBlogKey): UiProfile {
                     .User(
                         accountType = AccountType.Specific(accountKey),
                         userKey = userKey,
-                    ).toUri(),
+                    ),
             ),
     )
 }
@@ -906,7 +1018,7 @@ internal fun ProfileViewDetailed.render(accountKey: MicroBlogKey): UiProfile {
                     .User(
                         accountType = AccountType.Specific(accountKey),
                         userKey = userKey,
-                    ).toUri(),
+                    ),
             ),
     )
 }
@@ -1067,15 +1179,13 @@ private fun findMediaFromExternal(value: ExternalView): PersistentList<UiMedia>
 private fun findQuote(
     accountKey: MicroBlogKey,
     postView: PostView,
-    event: StatusEvent.Bluesky,
-): UiTimeline.ItemContent.Status? =
+): UiTimelineV2.Post? =
     when (val embed = postView.embed) {
-        is PostViewEmbedUnion.RecordView -> render(accountKey, embed.value.record, event)
+        is PostViewEmbedUnion.RecordView -> render(accountKey, embed.value.record)
         is PostViewEmbedUnion.RecordWithMediaView ->
             render(
                 accountKey,
                 embed.value.record.record,
-                event = event,
             )
 
         else -> null
@@ -1084,8 +1194,7 @@ private fun findQuote(
 private fun render(
     accountKey: MicroBlogKey,
     record: RecordViewRecordUnion,
-    event: StatusEvent.Bluesky,
-): UiTimeline.ItemContent.Status? =
+): UiTimelineV2.Post? =
     when (record) {
         is RecordViewRecordUnion.ViewRecord -> {
             val user = record.value.author.render(accountKey)
@@ -1115,7 +1224,7 @@ private fun render(
                             .substringAfterLast("/"),
                     )
                 }
-            UiTimeline.ItemContent.Status(
+            UiTimelineV2.Post(
                 user = user,
                 images =
                     record.value.embeds
@@ -1203,99 +1312,100 @@ private fun render(
                 actions =
                     listOfNotNull(
                         ActionMenu.Item(
-                            icon = ActionMenu.Item.Icon.Reply,
+                            icon = UiIcon.Reply,
                             text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Reply),
                             count = UiNumber(record.value.replyCount ?: 0),
-                            onClicked = {
-                                launcher.launch(
+                            clickEvent =
+                                ClickEvent.Deeplink(
                                     DeeplinkRoute.Compose
                                         .Reply(
                                             accountKey = accountKey,
                                             statusKey = statusKey,
-                                        ).toUri(),
-                                )
-                            },
+                                        ),
+                                ),
                         ),
                         ActionMenu.Group(
                             displayItem =
                                 ActionMenu.Item(
-                                    icon = ActionMenu.Item.Icon.Retweet,
+                                    icon = UiIcon.Retweet,
                                     text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Retweet),
                                     count = UiNumber(record.value.repostCount ?: 0),
                                 ),
                             actions =
                                 listOfNotNull(
                                     ActionMenu.Item(
-                                        icon = ActionMenu.Item.Icon.Retweet,
+                                        icon = UiIcon.Retweet,
                                         text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Retweet),
                                         count = UiNumber(record.value.repostCount ?: 0),
-                                        onClicked = {
-                                            event.reblog(
-                                                statusKey = statusKey,
-                                                cid = record.value.cid.cid,
-                                                uri = record.value.uri.atUri,
-                                                repostUri = null,
-                                            )
-                                        },
+                                        clickEvent =
+                                            ClickEvent.event(
+                                                accountKey,
+                                                PostEvent.Bluesky.Reblog(
+                                                    postKey = statusKey,
+                                                    cid = record.value.cid.cid,
+                                                    uri = record.value.uri.atUri,
+                                                    repostUri = null,
+                                                ),
+                                            ),
                                     ),
                                     ActionMenu.Item(
-                                        icon = ActionMenu.Item.Icon.Quote,
+                                        icon = UiIcon.Quote,
                                         text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Quote),
                                         count = UiNumber(record.value.quoteCount ?: 0),
-                                        onClicked = {
-                                            launcher.launch(
+                                        clickEvent =
+                                            ClickEvent.Deeplink(
                                                 DeeplinkRoute.Compose
                                                     .Quote(
                                                         accountKey = accountKey,
                                                         statusKey = statusKey,
-                                                    ).toUri(),
-                                            )
-                                        },
+                                                    ),
+                                            ),
                                     ),
                                 ).toImmutableList(),
                         ),
                         ActionMenu.Item(
-                            icon = ActionMenu.Item.Icon.Like,
+                            icon = UiIcon.Like,
                             text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Like),
                             count = UiNumber(record.value.likeCount ?: 0),
-                            onClicked = {
-                                event.like(
-                                    statusKey = statusKey,
-                                    cid = record.value.cid.cid,
-                                    uri = record.value.uri.atUri,
-                                    likedUri = null,
-                                )
-                            },
+                            clickEvent =
+                                ClickEvent.event(
+                                    accountKey,
+                                    PostEvent.Bluesky.Like(
+                                        postKey = statusKey,
+                                        cid = record.value.cid.cid,
+                                        uri = record.value.uri.atUri,
+                                        likedUri = null,
+                                    ),
+                                ),
                         ),
                         ActionMenu.Group(
                             displayItem =
                                 ActionMenu.Item(
-                                    icon = ActionMenu.Item.Icon.More,
+                                    icon = UiIcon.More,
                                     text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.More),
                                 ),
                             actions =
                                 listOfNotNull(
                                     ActionMenu.Item(
-                                        icon = ActionMenu.Item.Icon.Share,
+                                        icon = UiIcon.Share,
                                         text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Share),
-                                        onClicked = {
-                                            launcher.launch(
+                                        clickEvent =
+                                            ClickEvent.Deeplink(
                                                 DeeplinkRoute.Status
                                                     .ShareSheet(
                                                         statusKey = statusKey,
                                                         accountType = AccountType.Specific(accountKey),
                                                         shareUrl = url,
                                                         fxShareUrl = fxUrl,
-                                                    ).toUri(),
-                                            )
-                                        },
+                                                    ),
+                                            ),
                                     ),
                                     if (isFromMe) {
                                         ActionMenu.Item(
-                                            icon = ActionMenu.Item.Icon.Delete,
+                                            icon = UiIcon.Delete,
                                             text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Delete),
-                                            onClicked = {
-                                                launcher.launch(
+                                            clickEvent =
+                                                ClickEvent.Deeplink(
                                                     DeeplinkRoute.Status
                                                         .DeleteConfirm(
                                                             accountType =
@@ -1303,16 +1413,15 @@ private fun render(
                                                                     accountKey,
                                                                 ),
                                                             statusKey = statusKey,
-                                                        ).toUri(),
-                                                )
-                                            },
+                                                        ),
+                                                ),
                                         )
                                     } else {
                                         ActionMenu.Item(
-                                            icon = ActionMenu.Item.Icon.Report,
+                                            icon = UiIcon.Report,
                                             text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Report),
-                                            onClicked = {
-                                                launcher.launch(
+                                            clickEvent =
+                                                ClickEvent.Deeplink(
                                                     DeeplinkRoute.Status
                                                         .BlueskyReport(
                                                             statusKey = statusKey,
@@ -1320,9 +1429,8 @@ private fun render(
                                                                 AccountType.Specific(
                                                                     accountKey,
                                                                 ),
-                                                        ).toUri(),
-                                                )
-                                            },
+                                                        ),
+                                                ),
                                         )
                                     },
                                 ).toImmutableList(),
@@ -1338,34 +1446,16 @@ private fun render(
                     record.value.labels.orEmpty().any {
                         it.`val` in sensitiveLabels
                     },
-                onClicked = {
-                    launcher.launch(
+                platformType = PlatformType.Bluesky,
+                accountType = AccountType.Specific(accountKey),
+                clickEvent =
+                    ClickEvent.Deeplink(
                         DeeplinkRoute.Status
                             .Detail(
                                 statusKey = statusKey,
                                 accountType = AccountType.Specific(accountKey),
-                            ).toUri(),
-                    )
-                },
-                platformType = PlatformType.Bluesky,
-                onMediaClicked = { media, index ->
-                    launcher.launch(
-                        DeeplinkRoute.Media
-                            .StatusMedia(
-                                accountType = AccountType.Specific(accountKey),
-                                statusKey = statusKey,
-                                index = index,
-                                preview =
-                                    when (media) {
-                                        is UiMedia.Image -> media.previewUrl
-                                        is UiMedia.Video -> media.thumbnailUrl
-                                        is UiMedia.Audio -> null
-                                        is UiMedia.Gif -> media.previewUrl
-                                    },
-                            ).toUri(),
-                    )
-                },
-                url = url,
+                            ),
+                    ),
             )
         }
 
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
index 236e53f31..d7ef95434 100644
--- 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
@@ -2,8 +2,6 @@ package dev.dimension.flare.ui.model.mapper
 
 import com.fleeksoft.ksoup.nodes.Element
 import com.fleeksoft.ksoup.nodes.Node
-import dev.dimension.flare.data.database.cache.model.DbEmoji
-import dev.dimension.flare.data.database.cache.model.EmojiContent
 import dev.dimension.flare.data.datasource.microblog.ActionMenu
 import dev.dimension.flare.data.datasource.microblog.PostEvent
 import dev.dimension.flare.data.datasource.microblog.userActionsMenu
@@ -25,7 +23,6 @@ import dev.dimension.flare.model.PlatformType
 import dev.dimension.flare.model.toAccountType
 import dev.dimension.flare.ui.model.ClickEvent
 import dev.dimension.flare.ui.model.UiCard
-import dev.dimension.flare.ui.model.UiEmoji
 import dev.dimension.flare.ui.model.UiIcon
 import dev.dimension.flare.ui.model.UiInstance
 import dev.dimension.flare.ui.model.UiInstanceMetadata
@@ -974,58 +971,58 @@ internal fun RelationshipResponse.toUi(): UiRelation =
         muted = muting ?: false,
         hasPendingFollowRequestFromYou = requested ?: false,
     )
-
-internal fun DbEmoji.toUi(): List<UiEmoji> =
-    when (content) {
-        is EmojiContent.Mastodon -> {
-            content.data.filter { it.visibleInPicker == true }.map {
-                val shortCode =
-                    it.shortcode
-                        .orEmpty()
-                        .let { if (!it.startsWith(':') && !it.endsWith(':')) ":$it:" else it }
-                UiEmoji(
-                    shortcode = shortCode,
-                    url = it.url.orEmpty(),
-                    category = it.category.orEmpty(),
-                    searchKeywords =
-                        listOfNotNull(
-                            it.shortcode,
-                        ),
-                    insertText = " $shortCode ",
-                )
-            }
-        }
-
-        is EmojiContent.Misskey -> {
-            content.data.map {
-                it.toUi()
-            }
-        }
-
-        is EmojiContent.VVO ->
-            content.data.data
-                ?.emoticon
-                ?.zhCN
-                ?.flatMap { (category, items) ->
-                    items.mapNotNull { item ->
-                        if (item.phrase.isNullOrEmpty() || item.url.isNullOrEmpty()) {
-                            return@mapNotNull null
-                        }
-                        UiEmoji(
-                            shortcode = item.phrase,
-                            url = item.url,
-                            category = category,
-                            searchKeywords =
-                                listOfNotNull(
-                                    item.phrase,
-                                ),
-                            insertText = item.phrase,
-                        )
-                    }
-                }.orEmpty()
-
-        is EmojiContent.FavIcon -> emptyList()
-    }
+//
+// internal fun DbEmoji.toUi(): List<UiEmoji> =
+//    when (content) {
+//        is EmojiContent.Mastodon -> {
+//            content.data.filter { it.visibleInPicker == true }.map {
+//                val shortCode =
+//                    it.shortcode
+//                        .orEmpty()
+//                        .let { if (!it.startsWith(':') && !it.endsWith(':')) ":$it:" else it }
+//                UiEmoji(
+//                    shortcode = shortCode,
+//                    url = it.url.orEmpty(),
+//                    category = it.category.orEmpty(),
+//                    searchKeywords =
+//                        listOfNotNull(
+//                            it.shortcode,
+//                        ),
+//                    insertText = " $shortCode ",
+//                )
+//            }
+//        }
+//
+//        is EmojiContent.Misskey -> {
+//            content.data.map {
+//                it.toUi()
+//            }
+//        }
+//
+//        is EmojiContent.VVO ->
+//            content.data.data
+//                ?.emoticon
+//                ?.zhCN
+//                ?.flatMap { (category, items) ->
+//                    items.mapNotNull { item ->
+//                        if (item.phrase.isNullOrEmpty() || item.url.isNullOrEmpty()) {
+//                            return@mapNotNull null
+//                        }
+//                        UiEmoji(
+//                            shortcode = item.phrase,
+//                            url = item.url,
+//                            category = category,
+//                            searchKeywords =
+//                                listOfNotNull(
+//                                    item.phrase,
+//                                ),
+//                            insertText = item.phrase,
+//                        )
+//                    }
+//                }.orEmpty()
+//
+//        is EmojiContent.FavIcon -> emptyList()
+//    }
 
 private fun parseName(status: Account): Element {
     val emoji = status.emojis.orEmpty()

From a15ccdf9afce61c04293e10cb8612101ad2cffad Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Wed, 4 Mar 2026 12:38:24 +0900
Subject: [PATCH 07/33] migrate bsky

---
 .../data/database/cache/mapper/Bluesky.kt     |  16 +-
 .../datasource/bluesky/BlueskyDataSource.kt   | 384 +++++-------------
 .../datasource/mastodon/MastodonDataSource.kt | 111 -----
 .../datasource/microblog/DatabaseUpdater.kt   |   5 +
 .../data/datasource/microblog/PostEvent.kt    | 102 ++++-
 .../microblog/handler/PostEventHandler.kt     |  95 +++++
 .../dimension/flare/ui/model/ClickContext.kt  |  14 +
 .../flare/ui/model/mapper/Bluesky.kt          | 292 +++++++------
 .../flare/ui/model/mapper/Mastodon.kt         |  26 +-
 .../dimension/flare/ui/model/mapper/Render.kt | 259 ++++++------
 10 files changed, 652 insertions(+), 652 deletions(-)

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
index 13dd09ff8..07cf31ede 100644
--- 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
@@ -8,10 +8,12 @@ import dev.dimension.flare.data.database.cache.model.DbDirectMessageTimeline
 import dev.dimension.flare.data.database.cache.model.DbMessageItem
 import dev.dimension.flare.data.database.cache.model.DbMessageRoom
 import dev.dimension.flare.data.database.cache.model.DbMessageRoomReference
+import dev.dimension.flare.data.database.cache.model.DbUser
 import dev.dimension.flare.data.database.cache.model.MessageContent
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
+import dev.dimension.flare.ui.model.mapper.render
 
 internal object Bluesky {
     suspend fun saveDM(
@@ -26,7 +28,19 @@ internal object Bluesky {
                 it.lastMessage?.toDbMessageItem(it.toDbMessageRoom(accountKey.host).roomKey)
             }
         val timeline = data.map { it.toDbDirectMessageTimeline(accountKey) }
-        val users = data.flatMap { it.members }.map { it.toDbUser(accountKey.host) }
+        val users =
+            data
+                .flatMap { it.members }
+                .map {
+                    val data = it.render(accountKey)
+                    DbUser(
+                        userKey = data.key,
+                        name = data.name.raw,
+                        handle = data.handle,
+                        host = accountKey.host,
+                        content = data,
+                    )
+                }
         database.userDao().insertAll(users)
         database.messageDao().insertMessages(messages)
         database.messageDao().insertReferences(references)
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
index 4248fdd59..0a6911744 100644
--- 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
@@ -16,7 +16,6 @@ import app.bsky.feed.GetPostsQueryParams
 import app.bsky.feed.Post
 import app.bsky.feed.PostEmbedUnion
 import app.bsky.feed.PostReplyRef
-import app.bsky.feed.ViewerState
 import app.bsky.unspecced.GetPopularFeedGeneratorsQueryParams
 import chat.bsky.convo.DeleteMessageForSelfRequest
 import chat.bsky.convo.DeletedMessageView
@@ -48,8 +47,7 @@ import dev.dimension.flare.data.database.app.AppDatabase
 import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.mapper.Bluesky
 import dev.dimension.flare.data.database.cache.model.MessageContent
-import dev.dimension.flare.data.database.cache.model.StatusContent
-import dev.dimension.flare.data.database.cache.model.updateStatusUseCase
+import dev.dimension.flare.data.datasource.microblog.ActionMenu
 import dev.dimension.flare.data.datasource.microblog.AuthenticatedMicroblogDataSource
 import dev.dimension.flare.data.datasource.microblog.ComposeConfig
 import dev.dimension.flare.data.datasource.microblog.ComposeData
@@ -93,6 +91,8 @@ import dev.dimension.flare.ui.model.UiList
 import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.UiState
 import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.blueskyLike
+import dev.dimension.flare.ui.model.mapper.blueskyReblog
 import dev.dimension.flare.ui.model.mapper.bskyJson
 import dev.dimension.flare.ui.model.mapper.parseBskyFacets
 import dev.dimension.flare.ui.model.mapper.render
@@ -222,6 +222,15 @@ internal class BlueskyDataSource(
         event: PostEvent,
         updater: DatabaseUpdater,
     ) {
+        require(event is PostEvent.Bluesky)
+        when (event) {
+            is PostEvent.Bluesky.Bookmark ->
+                bookmark(event, updater)
+            is PostEvent.Bluesky.Like ->
+                like(event, updater)
+            is PostEvent.Bluesky.Reblog ->
+                reblog(event, updater)
+        }
     }
 
     override fun homeTimeline() =
@@ -433,207 +442,112 @@ internal class BlueskyDataSource(
         }
     }
 
-    override fun reblog(
-        statusKey: MicroBlogKey,
-        cid: String,
-        uri: String,
-        repostUri: String?,
+    suspend fun reblog(
+        event: PostEvent.Bluesky.Reblog,
+        updater: DatabaseUpdater,
     ) {
-        coroutineScope.launch {
-            updateStatusUseCase<StatusContent.Bluesky>(
-                statusKey = statusKey,
-                accountKey = accountKey,
-                cacheDatabase = database,
-            ) { content ->
-                val newUri =
-                    if (repostUri != null) {
-                        null
-                    } else {
-                        AtUri("")
-                    }
-                val count =
-                    if (repostUri != null) {
-                        (content.data.repostCount ?: 0) - 1
-                    } else {
-                        (content.data.repostCount ?: 0) + 1
-                    }.coerceAtLeast(0)
-                content.copy(
-                    data =
-                        content.data.copy(
-                            viewer =
-                                content.data.viewer?.copy(
-                                    repost = newUri,
-                                ) ?: ViewerState(
-                                    repost = newUri,
-                                ),
-                            repostCount = count,
-                        ),
+        val cid = event.cid
+        val uri = event.uri
+        val repostUri = event.repostUri
+        if (repostUri != null) {
+            if (repostUri.isEmpty()) {
+                // pending event, do nothing
+            } else {
+                service.deleteRecord(
+                    DeleteRecordRequest(
+                        repo = Did(did = accountKey.id),
+                        collection = Nsid("app.bsky.feed.repost"),
+                        rkey = RKey(repostUri.substringAfterLast('/')),
+                    ),
                 )
             }
-            tryRun {
-                if (repostUri != null) {
-                    service.deleteRecord(
-                        DeleteRecordRequest(
+        } else {
+            val response =
+                service
+                    .createRecord(
+                        CreateRecordRequest(
                             repo = Did(did = accountKey.id),
                             collection = Nsid("app.bsky.feed.repost"),
-                            rkey = RKey(repostUri.substringAfterLast('/')),
+                            record =
+                                app.bsky.feed
+                                    .Repost(
+                                        subject =
+                                            StrongRef(
+                                                uri = AtUri(uri),
+                                                cid = Cid(cid),
+                                            ),
+                                        createdAt =
+                                            Clock.System
+                                                .now(),
+                                    ).bskyJson(),
                         ),
-                    )
-                } else {
-                    val result =
-                        service
-                            .createRecord(
-                                CreateRecordRequest(
-                                    repo = Did(did = accountKey.id),
-                                    collection = Nsid("app.bsky.feed.repost"),
-                                    record =
-                                        app.bsky.feed
-                                            .Repost(
-                                                subject =
-                                                    StrongRef(
-                                                        uri = AtUri(uri),
-                                                        cid = Cid(cid),
-                                                    ),
-                                                createdAt =
-                                                    Clock.System
-                                                        .now(),
-                                            ).bskyJson(),
-                                ),
-                            ).requireResponse()
-                    updateStatusUseCase<StatusContent.Bluesky>(
-                        statusKey = statusKey,
+                    ).requireResponse()
+            updater.updateActionMenu(
+                postKey = event.postKey,
+                newActionMenu =
+                    ActionMenu.blueskyReblog(
                         accountKey = accountKey,
-                        cacheDatabase = database,
-                    ) { content ->
-                        content.copy(
-                            data =
-                                content.data.copy(
-                                    viewer =
-                                        content.data.viewer?.copy(
-                                            repost = AtUri(result.uri.atUri),
-                                        ) ?: ViewerState(
-                                            repost = AtUri(result.uri.atUri),
-                                        ),
-                                ),
-                        )
-                    }
-                }
-            }.onFailure {
-                updateStatusUseCase<StatusContent.Bluesky>(
-                    statusKey = statusKey,
-                    accountKey = accountKey,
-                    cacheDatabase = database,
-                ) { content ->
-                    val count =
-                        if (repostUri != null) {
-                            (content.data.repostCount ?: 0) + 1
-                        } else {
-                            (content.data.repostCount ?: 0) - 1
-                        }.coerceAtLeast(0)
-                    content.copy(
-                        data =
-                            content.data.copy(
-                                viewer =
-                                    content.data.viewer?.copy(
-                                        repost = repostUri?.let { it1 -> AtUri(it1) },
-                                    ) ?: ViewerState(
-                                        repost = repostUri?.let { it1 -> AtUri(it1) },
-                                    ),
-                                repostCount = count,
-                            ),
-                    )
-                }
-            }
+                        postKey = event.postKey,
+                        cid = cid,
+                        uri = uri,
+                        count = event.count + 1,
+                        repostUri = response.uri.atUri,
+                    ),
+            )
         }
     }
 
-    override fun like(
-        statusKey: MicroBlogKey,
-        cid: String,
-        uri: String,
-        likedUri: String?,
+    suspend fun like(
+        event: PostEvent.Bluesky.Like,
+        updater: DatabaseUpdater,
     ) {
-        coroutineScope.launch {
-            updateStatusUseCase<StatusContent.Bluesky>(
-                statusKey = statusKey,
-                accountKey = accountKey,
-                cacheDatabase = database,
-            ) { content ->
-                val newUri =
-                    if (likedUri != null) {
-                        null
-                    } else {
-                        AtUri("")
-                    }
-                val count =
-                    if (likedUri != null) {
-                        (content.data.likeCount ?: 0) - 1
-                    } else {
-                        (content.data.likeCount ?: 0) + 1
-                    }.coerceAtLeast(0)
-                content.copy(
-                    data =
-                        content.data.copy(
-                            viewer =
-                                content.data.viewer?.copy(
-                                    like = newUri,
-                                ) ?: ViewerState(
-                                    like = newUri,
-                                ),
-                            likeCount = count,
-                        ),
-                )
+        val cid = event.cid
+        val uri = event.uri
+        val likedUri = event.likedUri
+        if (likedUri != null) {
+            if (likedUri.isEmpty()) {
+                // pending event, do nothing
+            } else {
+                deleteLikeRecord(likedUri)
             }
-            tryRun {
-                if (likedUri != null) {
-                    deleteLikeRecord(likedUri)
-                } else {
-                    val result =
-                        createLikeRecord(cid, uri)
-                    updateStatusUseCase<StatusContent.Bluesky>(
-                        statusKey = statusKey,
+        } else {
+            val response = createLikeRecord(cid, uri)
+            updater.updateActionMenu(
+                postKey = event.postKey,
+                newActionMenu =
+                    ActionMenu.blueskyLike(
                         accountKey = accountKey,
-                        cacheDatabase = database,
-                    ) { content ->
-                        content.copy(
-                            data =
-                                content.data.copy(
-                                    viewer =
-                                        content.data.viewer?.copy(
-                                            like = AtUri(result.uri.atUri),
-                                        ) ?: ViewerState(
-                                            like = AtUri(result.uri.atUri),
-                                        ),
-                                ),
-                        )
-                    }
-                }
-            }.onFailure {
-                updateStatusUseCase<StatusContent.Bluesky>(
-                    statusKey = statusKey,
-                    accountKey = accountKey,
-                    cacheDatabase = database,
-                ) { content ->
-                    val count =
-                        if (likedUri != null) {
-                            (content.data.likeCount ?: 0) + 1
-                        } else {
-                            (content.data.likeCount ?: 0) - 1
-                        }.coerceAtLeast(0)
-                    content.copy(
-                        data =
-                            content.data.copy(
-                                viewer =
-                                    content.data.viewer?.copy(
-                                        like = likedUri?.let { it1 -> AtUri(it1) },
-                                    ) ?: ViewerState(
-                                        like = likedUri?.let { it1 -> AtUri(it1) },
-                                    ),
-                                likeCount = count,
-                            ),
-                    )
-                }
-            }
+                        postKey = event.postKey,
+                        cid = cid,
+                        uri = uri,
+                        count = event.count + 1,
+                        likedUri = response.uri.atUri,
+                    ),
+            )
+        }
+    }
+
+    suspend fun bookmark(
+        event: PostEvent.Bluesky.Bookmark,
+        updater: DatabaseUpdater,
+    ) {
+        val cid = event.cid
+        val uri = event.uri
+        if (event.bookmarked) {
+            service
+                .deleteBookmark(
+                    DeleteBookmarkRequest(
+                        uri = AtUri(uri),
+                    ),
+                ).requireResponse()
+        } else {
+            service
+                .createBookmark(
+                    CreateBookmarkRequest(
+                        uri = AtUri(uri),
+                        cid = Cid(cid),
+                    ),
+                ).requireResponse()
         }
     }
 
@@ -1262,94 +1176,6 @@ internal class BlueskyDataSource(
             service = service,
             accountKey = accountKey,
         )
-
-    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)
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt
index 7c197962e..e374a6055 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt
@@ -2,7 +2,6 @@ package dev.dimension.flare.data.datasource.mastodon
 
 import androidx.paging.ExperimentalPagingApi
 import dev.dimension.flare.common.FileType
-import dev.dimension.flare.data.datasource.microblog.ActionMenu
 import dev.dimension.flare.data.datasource.microblog.AuthenticatedMicroblogDataSource
 import dev.dimension.flare.data.datasource.microblog.ComposeConfig
 import dev.dimension.flare.data.datasource.microblog.ComposeData
@@ -42,16 +41,11 @@ import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.shared.image.ImageCompressor
 import dev.dimension.flare.ui.model.UiAccount
 import dev.dimension.flare.ui.model.UiHashtag
-import dev.dimension.flare.ui.model.UiNumber
 import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.UiTimeline
 import dev.dimension.flare.ui.model.UiTimelineV2
-import dev.dimension.flare.ui.model.mapper.mastodonBookmark
-import dev.dimension.flare.ui.model.mapper.mastodonLike
-import dev.dimension.flare.ui.model.mapper.mastodonRepost
 import dev.dimension.flare.ui.presenter.compose.ComposeStatus
 import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toPersistentList
 import kotlinx.coroutines.flow.map
 import org.koin.core.component.KoinComponent
@@ -322,36 +316,6 @@ internal open class MastodonDataSource(
     ) {
         val statusKey = event.postKey
         val liked = event.liked
-        val newButton =
-            ActionMenu.mastodonLike(
-                favourited = !liked,
-                favouritesCount = 0,
-                accountKey = accountKey,
-                statusKey = statusKey,
-            )
-        updater.updateCache(event.postKey) { item ->
-            require(item is UiTimelineV2.Post)
-            item.copy(
-                actions =
-                    item.actions
-                        .map {
-                            if (it is ActionMenu.Item && it.updateKey == newButton.updateKey) {
-                                newButton.copy(
-                                    count =
-                                        if (!liked) {
-                                            it.count?.value?.plus(1)
-                                        } else {
-                                            it.count?.value?.minus(1)
-                                        }.let {
-                                            UiNumber(it ?: 0)
-                                        },
-                                )
-                            } else {
-                                it
-                            }
-                        }.toImmutableList(),
-            )
-        }
         if (liked) {
             service.unfavourite(statusKey.id)
         } else {
@@ -365,36 +329,6 @@ internal open class MastodonDataSource(
     ) {
         val statusKey = event.postKey
         val reblogged = event.reblogged
-        val newButton =
-            ActionMenu.mastodonRepost(
-                reblogged = !reblogged,
-                reblogsCount = 0,
-                accountKey = accountKey,
-                statusKey = statusKey,
-            )
-        updater.updateCache(event.postKey) { item ->
-            require(item is UiTimelineV2.Post)
-            item.copy(
-                actions =
-                    item.actions
-                        .map {
-                            if (it is ActionMenu.Item && it.updateKey == newButton.updateKey) {
-                                newButton.copy(
-                                    count =
-                                        if (!reblogged) {
-                                            it.count?.value?.plus(1)
-                                        } else {
-                                            it.count?.value?.minus(1)
-                                        }.let {
-                                            UiNumber(it ?: 0)
-                                        },
-                                )
-                            } else {
-                                it
-                            }
-                        }.toImmutableList(),
-            )
-        }
         if (reblogged) {
             service.unreblog(statusKey.id)
         } else {
@@ -408,26 +342,6 @@ internal open class MastodonDataSource(
     ) {
         val statusKey = event.postKey
         val bookmarked = event.bookmarked
-        val newBookmark =
-            ActionMenu.mastodonBookmark(
-                bookmarked = !bookmarked,
-                accountKey = accountKey,
-                statusKey = statusKey,
-            )
-        updater.updateCache(event.postKey) { item ->
-            require(item is UiTimelineV2.Post)
-            item.copy(
-                actions =
-                    item.actions
-                        .map {
-                            if (it is ActionMenu.Item && it.updateKey == newBookmark.updateKey) {
-                                newBookmark
-                            } else {
-                                it
-                            }
-                        }.toImmutableList(),
-            )
-        }
         if (bookmarked) {
             service.unbookmark(statusKey.id)
         } else {
@@ -543,31 +457,6 @@ internal open class MastodonDataSource(
         updater: DatabaseUpdater,
     ) {
         val options = event.options
-        val postKey = event.postKey
-        updater.updateCache(postKey) {
-            require(it is UiTimelineV2.Post)
-            it.copy(
-                poll =
-                    it.poll?.copy(
-                        ownVotes = options,
-                        options =
-                            it.poll.options
-                                .mapIndexed { index, option ->
-                                    if (options.contains(index)) {
-                                        option.copy(
-                                            votesCount =
-                                                option.votesCount.plus(
-                                                    1,
-                                                ),
-                                        )
-                                    } else {
-                                        option
-                                    }
-                                }.toImmutableList(),
-                    ),
-            )
-        }
-
         service.vote(id = event.id, data = PostVote(choices = options.map { it.toString() }))
     }
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/DatabaseUpdater.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/DatabaseUpdater.kt
index 028c4b019..3bbb57ab4 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/DatabaseUpdater.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/DatabaseUpdater.kt
@@ -10,4 +10,9 @@ internal interface DatabaseUpdater {
     )
 
     suspend fun deleteFromCache(postKey: MicroBlogKey)
+
+    suspend fun updateActionMenu(
+        postKey: MicroBlogKey,
+        newActionMenu: ActionMenu.Item,
+    )
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt
index fccf60ed4..c5c857925 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt
@@ -2,6 +2,12 @@ package dev.dimension.flare.data.datasource.microblog
 
 import dev.dimension.flare.common.SerializableImmutableList
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.mapper.blueskyBookmark
+import dev.dimension.flare.ui.model.mapper.blueskyLike
+import dev.dimension.flare.ui.model.mapper.blueskyReblog
+import dev.dimension.flare.ui.model.mapper.mastodonBookmark
+import dev.dimension.flare.ui.model.mapper.mastodonLike
+import dev.dimension.flare.ui.model.mapper.mastodonRepost
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.serialization.Serializable
 
@@ -23,19 +29,50 @@ internal sealed interface PostEvent {
         data class Reblog(
             override val postKey: MicroBlogKey,
             val reblogged: Boolean,
-        ) : Mastodon
+            val count: Long,
+            val accountKey: MicroBlogKey,
+        ) : Mastodon,
+            UpdatePostActionMenuEvent {
+            override fun nextActionMenu(): ActionMenu.Item =
+                ActionMenu.mastodonRepost(
+                    reblogged = !reblogged,
+                    reblogsCount = count + if (!reblogged) 1 else -1,
+                    accountKey = accountKey,
+                    statusKey = postKey,
+                )
+        }
 
         @Serializable
         data class Like(
             override val postKey: MicroBlogKey,
             val liked: Boolean,
-        ) : Mastodon
+            val accountKey: MicroBlogKey,
+            val count: Long,
+        ) : Mastodon,
+            UpdatePostActionMenuEvent {
+            override fun nextActionMenu(): ActionMenu.Item =
+                ActionMenu.mastodonLike(
+                    favourited = !liked,
+                    favouritesCount = count + if (!liked) 1 else -1,
+                    accountKey = accountKey,
+                    statusKey = postKey,
+                )
+        }
 
         @Serializable
         data class Bookmark(
             override val postKey: MicroBlogKey,
             val bookmarked: Boolean,
-        ) : Mastodon
+            val accountKey: MicroBlogKey,
+        ) : Mastodon,
+            UpdatePostActionMenuEvent {
+            override fun nextActionMenu(): ActionMenu.Item =
+                ActionMenu.mastodonBookmark(
+                    bookmarked = !bookmarked,
+                    accountKey = accountKey,
+                    statusKey = postKey,
+                )
+        }
 
         @Serializable
         data class Vote(
@@ -121,10 +158,28 @@ internal sealed interface PostEvent {
         @Serializable
         data class Reblog(
             override val postKey: MicroBlogKey,
+            val count: Long,
             val cid: String,
             val uri: String,
             val repostUri: String?,
-        ) : Bluesky
+            val accountKey: MicroBlogKey,
+        ) : Bluesky,
+            UpdatePostActionMenuEvent {
+            override fun nextActionMenu(): ActionMenu.Item =
+                ActionMenu.blueskyReblog(
+                    accountKey = accountKey,
+                    postKey = postKey,
+                    cid = cid,
+                    uri = uri,
+                    count = count + if (repostUri == null) 1 else -1,
+                    repostUri =
+                        if (repostUri == null) {
+                            ""
+                        } else {
+                            null
+                        },
+                )
+        }
 
         @Serializable
         data class Like(
@@ -132,7 +187,25 @@ internal sealed interface PostEvent {
             val cid: String,
             val uri: String,
             val likedUri: String?,
-        ) : Bluesky
+            val count: Long,
+            val accountKey: MicroBlogKey,
+        ) : Bluesky,
+            UpdatePostActionMenuEvent {
+            override fun nextActionMenu(): ActionMenu.Item =
+                ActionMenu.blueskyLike(
+                    accountKey = accountKey,
+                    postKey = postKey,
+                    cid = cid,
+                    uri = uri,
+                    count = count + if (likedUri == null) 1 else -1,
+                    likedUri =
+                        if (likedUri == null) {
+                            ""
+                        } else {
+                            null
+                        },
+                )
+        }
 
         @Serializable
         data class Bookmark(
@@ -140,7 +213,20 @@ internal sealed interface PostEvent {
             val uri: String,
             val cid: String,
             val bookmarked: Boolean,
-        ) : Bluesky
+            val accountKey: MicroBlogKey,
+            val count: Long,
+        ) : Bluesky,
+            UpdatePostActionMenuEvent {
+            override fun nextActionMenu(): ActionMenu.Item =
+                ActionMenu.blueskyBookmark(
+                    accountKey = accountKey,
+                    postKey = postKey,
+                    cid = cid,
+                    uri = uri,
+                    bookmarked = !bookmarked,
+                    count = count + if (!bookmarked) 1 else -1,
+                )
+        }
     }
 
     @Serializable
@@ -185,3 +271,7 @@ internal sealed interface PostEvent {
         ) : VVO
     }
 }
+
+internal interface UpdatePostActionMenuEvent : PostEvent {
+    fun nextActionMenu(): ActionMenu.Item
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostEventHandler.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostEventHandler.kt
index 0a8ad5495..72796f0c8 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostEventHandler.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostEventHandler.kt
@@ -2,12 +2,16 @@ package dev.dimension.flare.data.datasource.microblog.handler
 
 import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.connect
+import dev.dimension.flare.data.datasource.microblog.ActionMenu
 import dev.dimension.flare.data.datasource.microblog.DatabaseUpdater
 import dev.dimension.flare.data.datasource.microblog.PostEvent
+import dev.dimension.flare.data.datasource.microblog.UpdatePostActionMenuEvent
 import dev.dimension.flare.data.repository.tryRun
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiTimelineV2
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
@@ -39,6 +43,49 @@ internal class PostEventHandler(
                         accountType = AccountType.Specific(accountKey),
                     ).firstOrNull()
                     ?.content
+            if (event is UpdatePostActionMenuEvent && originalData is UiTimelineV2.Post) {
+                val updatedData =
+                    originalData.copy(
+                        actions =
+                            findAndReplaceActionMenu(
+                                actions = originalData.actions,
+                                newActionMenu = event.nextActionMenu(),
+                            ),
+                    )
+                database.statusDao().update(
+                    statusKey = event.postKey,
+                    accountType = AccountType.Specific(accountKey),
+                    content = updatedData,
+                )
+            }
+            if (event is PostEvent.PollEvent && originalData is UiTimelineV2.Post) {
+                val updatedData =
+                    originalData.copy(
+                        poll =
+                            originalData.poll?.copy(
+                                ownVotes = event.options,
+                                options =
+                                    originalData.poll.options
+                                        .mapIndexed { index, option ->
+                                            if (event.options.contains(index)) {
+                                                option.copy(
+                                                    votesCount =
+                                                        option.votesCount.plus(
+                                                            1,
+                                                        ),
+                                                )
+                                            } else {
+                                                option
+                                            }
+                                        }.toImmutableList(),
+                            ),
+                    )
+                database.statusDao().update(
+                    statusKey = event.postKey,
+                    accountType = AccountType.Specific(accountKey),
+                    content = updatedData,
+                )
+            }
             tryRun {
                 handler.handle(
                     event = event,
@@ -93,4 +140,52 @@ internal class PostEventHandler(
             }
         }
     }
+
+    override suspend fun updateActionMenu(
+        postKey: MicroBlogKey,
+        newActionMenu: ActionMenu.Item,
+    ) {
+        database.connect {
+            val currentData =
+                database
+                    .statusDao()
+                    .get(
+                        statusKey = postKey,
+                        accountType = AccountType.Specific(accountKey),
+                    ).firstOrNull()
+                    ?.content
+            if (currentData != null && currentData is UiTimelineV2.Post) {
+                val updatedData =
+                    currentData.copy(
+                        actions =
+                            findAndReplaceActionMenu(
+                                actions = currentData.actions,
+                                newActionMenu = newActionMenu,
+                            ),
+                    )
+                database.statusDao().update(
+                    statusKey = postKey,
+                    accountType = AccountType.Specific(accountKey),
+                    content = updatedData,
+                )
+            }
+        }
+    }
+
+    private fun findAndReplaceActionMenu(
+        actions: ImmutableList<ActionMenu>,
+        newActionMenu: ActionMenu.Item,
+    ): ImmutableList<ActionMenu> =
+        actions
+            .map {
+                if (it is ActionMenu.Item && it.updateKey.isNotEmpty() && it.updateKey == newActionMenu.updateKey) {
+                    newActionMenu
+                } else if (it is ActionMenu.Group) {
+                    it.copy(
+                        actions = findAndReplaceActionMenu(it.actions, newActionMenu),
+                    )
+                } else {
+                    it
+                }
+            }.toImmutableList()
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/ClickContext.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/ClickContext.kt
index d2bb5e092..e72b2e851 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/ClickContext.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/ClickContext.kt
@@ -37,6 +37,20 @@ internal sealed interface ClickEvent {
                 ),
             )
         }
+
+        inline fun event(
+            accountKey: MicroBlogKey?,
+            eventCreator: (accountKey: MicroBlogKey) -> PostEvent,
+        ) = if (accountKey == null) {
+            Noop
+        } else {
+            Deeplink(
+                DeeplinkEvent(
+                    accountKey = accountKey,
+                    postEvent = eventCreator.invoke(accountKey),
+                ),
+            )
+        }
     }
 }
 
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
index 421ff4fb3..e597695bc 100644
--- 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
@@ -717,37 +717,13 @@ internal fun PostView.render(accountKey: MicroBlogKey): UiTimelineV2.Post {
                         ),
                     actions =
                         listOfNotNull(
-                            ActionMenu.Item(
-                                icon =
-                                    if (viewer?.repost?.atUri !=
-                                        null
-                                    ) {
-                                        UiIcon.Unretweet
-                                    } else {
-                                        UiIcon.Retweet
-                                    },
-                                text =
-                                    ActionMenu.Item.Text.Localized(
-                                        if (viewer?.repost?.atUri !=
-                                            null
-                                        ) {
-                                            ActionMenu.Item.Text.Localized.Type.Unretweet
-                                        } else {
-                                            ActionMenu.Item.Text.Localized.Type.Retweet
-                                        },
-                                    ),
-                                count = UiNumber(repostCount ?: 0),
-                                color = if (viewer?.repost?.atUri != null) ActionMenu.Item.Color.PrimaryColor else null,
-                                clickEvent =
-                                    ClickEvent.event(
-                                        accountKey,
-                                        PostEvent.Bluesky.Reblog(
-                                            postKey = statusKey,
-                                            cid = cid.cid,
-                                            uri = uri.atUri,
-                                            repostUri = viewer?.repost?.atUri,
-                                        ),
-                                    ),
+                            ActionMenu.blueskyReblog(
+                                accountKey = accountKey,
+                                postKey = statusKey,
+                                cid = cid.cid,
+                                uri = uri.atUri,
+                                count = repostCount ?: 0,
+                                repostUri = viewer?.repost?.atUri,
                             ),
                             ActionMenu.Item(
                                 icon = UiIcon.Quote,
@@ -764,30 +740,13 @@ internal fun PostView.render(accountKey: MicroBlogKey): UiTimelineV2.Post {
                             ),
                         ).toImmutableList(),
                 ),
-                ActionMenu.Item(
-                    icon = if (viewer?.like?.atUri != null) UiIcon.Unlike else UiIcon.Like,
-                    text =
-                        ActionMenu.Item.Text.Localized(
-                            if (viewer?.like?.atUri !=
-                                null
-                            ) {
-                                ActionMenu.Item.Text.Localized.Type.Unlike
-                            } else {
-                                ActionMenu.Item.Text.Localized.Type.Like
-                            },
-                        ),
-                    count = UiNumber(likeCount ?: 0),
-                    color = if (viewer?.like?.atUri != null) ActionMenu.Item.Color.Red else null,
-                    clickEvent =
-                        ClickEvent.event(
-                            accountKey,
-                            PostEvent.Bluesky.Like(
-                                postKey = statusKey,
-                                cid = cid.cid,
-                                uri = uri.atUri,
-                                likedUri = viewer?.like?.atUri,
-                            ),
-                        ),
+                ActionMenu.blueskyLike(
+                    accountKey = accountKey,
+                    postKey = statusKey,
+                    cid = cid.cid,
+                    uri = uri.atUri,
+                    count = likeCount ?: 0,
+                    likedUri = viewer?.like?.atUri,
                 ),
                 ActionMenu.Group(
                     displayItem =
@@ -798,36 +757,13 @@ internal fun PostView.render(accountKey: MicroBlogKey): UiTimelineV2.Post {
                     actions =
                         buildList {
                             add(
-                                ActionMenu.Item(
-                                    icon =
-                                        if (viewer?.bookmarked ==
-                                            true
-                                        ) {
-                                            UiIcon.Unbookmark
-                                        } else {
-                                            UiIcon.Bookmark
-                                        },
-                                    text =
-                                        ActionMenu.Item.Text.Localized(
-                                            if (viewer?.bookmarked ==
-                                                true
-                                            ) {
-                                                ActionMenu.Item.Text.Localized.Type.Unbookmark
-                                            } else {
-                                                ActionMenu.Item.Text.Localized.Type.Bookmark
-                                            },
-                                        ),
-                                    count = UiNumber(bookmarkCount ?: 0),
-                                    clickEvent =
-                                        ClickEvent.event(
-                                            accountKey,
-                                            PostEvent.Bluesky.Bookmark(
-                                                postKey = statusKey,
-                                                uri = uri.atUri,
-                                                cid = cid.cid,
-                                                bookmarked = viewer?.bookmarked == true,
-                                            ),
-                                        ),
+                                ActionMenu.blueskyBookmark(
+                                    accountKey = accountKey,
+                                    postKey = statusKey,
+                                    cid = cid.cid,
+                                    uri = uri.atUri,
+                                    count = bookmarkCount ?: 0,
+                                    bookmarked = viewer?.bookmarked == true,
                                 ),
                             )
                             add(
@@ -912,6 +848,150 @@ internal fun PostView.render(accountKey: MicroBlogKey): UiTimelineV2.Post {
     )
 }
 
+internal fun ActionMenu.Companion.blueskyReblog(
+    accountKey: MicroBlogKey,
+    postKey: MicroBlogKey,
+    count: Long,
+    cid: String,
+    uri: String,
+    repostUri: String?,
+): ActionMenu.Item =
+    ActionMenu.Item(
+        updateKey = "bluesky_reblog_$postKey",
+        icon = if (repostUri != null) UiIcon.Unretweet else UiIcon.Retweet,
+        text =
+            ActionMenu.Item.Text.Localized(
+                if (repostUri != null) {
+                    ActionMenu.Item.Text.Localized.Type.Unretweet
+                } else {
+                    ActionMenu.Item.Text.Localized.Type.Retweet
+                },
+            ),
+        count = UiNumber(count),
+        color = if (repostUri != null) ActionMenu.Item.Color.PrimaryColor else null,
+        clickEvent =
+            ClickEvent.event(
+                accountKey,
+            ) { accountKey ->
+                PostEvent.Bluesky.Reblog(
+                    postKey = postKey,
+                    cid = cid,
+                    uri = uri,
+                    repostUri = repostUri,
+                    count = count,
+                    accountKey = accountKey,
+                )
+            },
+    )
+
+internal fun ActionMenu.Companion.blueskyLike(
+    accountKey: MicroBlogKey,
+    postKey: MicroBlogKey,
+    count: Long,
+    cid: String,
+    uri: String,
+    likedUri: String?,
+): ActionMenu.Item =
+    ActionMenu.Item(
+        updateKey = "bluesky_like_$postKey",
+        icon = if (likedUri != null) UiIcon.Unlike else UiIcon.Like,
+        text =
+            ActionMenu.Item.Text.Localized(
+                if (likedUri != null) {
+                    ActionMenu.Item.Text.Localized.Type.Unlike
+                } else {
+                    ActionMenu.Item.Text.Localized.Type.Like
+                },
+            ),
+        color = if (likedUri != null) ActionMenu.Item.Color.Red else null,
+        count = UiNumber(count), // like count is updated via websocket, so we don't update it here
+        clickEvent =
+            ClickEvent.event(
+                accountKey,
+            ) { accountKey ->
+                PostEvent.Bluesky.Like(
+                    postKey = postKey,
+                    cid = cid,
+                    uri = uri,
+                    likedUri = likedUri,
+                    count = count,
+                    accountKey = accountKey,
+                )
+            },
+    )
+
+internal fun ActionMenu.Companion.blueskyBookmark(
+    accountKey: MicroBlogKey,
+    postKey: MicroBlogKey,
+    uri: String,
+    cid: String,
+    count: Long,
+    bookmarked: Boolean,
+): ActionMenu.Item =
+    ActionMenu.Item(
+        updateKey = "bluesky_bookmark_$postKey",
+        icon = if (bookmarked) UiIcon.Unbookmark else UiIcon.Bookmark,
+        text =
+            ActionMenu.Item.Text.Localized(
+                if (bookmarked) {
+                    ActionMenu.Item.Text.Localized.Type.Unbookmark
+                } else {
+                    ActionMenu.Item.Text.Localized.Type.Bookmark
+                },
+            ),
+        count = UiNumber(count),
+        clickEvent =
+            ClickEvent.event(
+                accountKey,
+            ) { accountKey ->
+                PostEvent.Bluesky.Bookmark(
+                    postKey = postKey,
+                    uri = uri,
+                    cid = cid,
+                    bookmarked = bookmarked,
+                    accountKey = accountKey,
+                    count = count,
+                )
+            },
+    )
+
+internal fun chat.bsky.actor.ProfileViewBasic.render(accountKey: MicroBlogKey): UiProfile {
+    val userKey =
+        MicroBlogKey(
+            id = did.did,
+            host = accountKey.host,
+        )
+    return UiProfile(
+        avatar = avatar?.uri.orEmpty(),
+        nameInternal =
+            Element("span")
+                .apply {
+                    addChildren(TextNode(displayName.orEmpty()))
+                }.toUi(),
+        handle = "@${handle.handle}",
+        key = userKey,
+        banner = null,
+        description = null,
+        matrices =
+            UiProfile.Matrices(
+                fansCount = 0,
+                followsCount = 0,
+                statusesCount = 0,
+            ),
+        mark = persistentListOf(),
+        bottomContent = null,
+        platformType = PlatformType.Bluesky,
+        clickEvent =
+            ClickEvent.Deeplink(
+                DeeplinkRoute.Profile
+                    .User(
+                        accountType = AccountType.Specific(accountKey),
+                        userKey = userKey,
+                    ),
+            ),
+    )
+}
+
 internal fun ProfileViewBasic.render(accountKey: MicroBlogKey): UiProfile {
     val userKey =
         MicroBlogKey(
@@ -1333,20 +1413,13 @@ private fun render(
                                 ),
                             actions =
                                 listOfNotNull(
-                                    ActionMenu.Item(
-                                        icon = UiIcon.Retweet,
-                                        text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Retweet),
-                                        count = UiNumber(record.value.repostCount ?: 0),
-                                        clickEvent =
-                                            ClickEvent.event(
-                                                accountKey,
-                                                PostEvent.Bluesky.Reblog(
-                                                    postKey = statusKey,
-                                                    cid = record.value.cid.cid,
-                                                    uri = record.value.uri.atUri,
-                                                    repostUri = null,
-                                                ),
-                                            ),
+                                    ActionMenu.blueskyReblog(
+                                        accountKey = accountKey,
+                                        postKey = statusKey,
+                                        cid = record.value.cid.cid,
+                                        uri = record.value.uri.atUri,
+                                        count = record.value.repostCount ?: 0,
+                                        repostUri = null,
                                     ),
                                     ActionMenu.Item(
                                         icon = UiIcon.Quote,
@@ -1363,20 +1436,13 @@ private fun render(
                                     ),
                                 ).toImmutableList(),
                         ),
-                        ActionMenu.Item(
-                            icon = UiIcon.Like,
-                            text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Like),
-                            count = UiNumber(record.value.likeCount ?: 0),
-                            clickEvent =
-                                ClickEvent.event(
-                                    accountKey,
-                                    PostEvent.Bluesky.Like(
-                                        postKey = statusKey,
-                                        cid = record.value.cid.cid,
-                                        uri = record.value.uri.atUri,
-                                        likedUri = null,
-                                    ),
-                                ),
+                        ActionMenu.blueskyLike(
+                            accountKey = accountKey,
+                            postKey = statusKey,
+                            cid = record.value.cid.cid,
+                            uri = record.value.uri.atUri,
+                            count = record.value.likeCount ?: 0,
+                            likedUri = null,
                         ),
                         ActionMenu.Group(
                             displayItem =
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
index d7ef95434..caed3d17d 100644
--- 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
@@ -680,7 +680,7 @@ internal fun ActionMenu.Companion.mastodonLike(
     statusKey: MicroBlogKey,
 ): ActionMenu.Item =
     ActionMenu.Item(
-        updateKey = "like",
+        updateKey = "mastodon_like_$statusKey",
         icon = if (favourited) UiIcon.Unlike else UiIcon.Like,
         text =
             ActionMenu.Item.Text.Localized(
@@ -695,11 +695,14 @@ internal fun ActionMenu.Companion.mastodonLike(
         clickEvent =
             ClickEvent.event(
                 accountKey,
+            ) { accountKey ->
                 PostEvent.Mastodon.Like(
                     postKey = statusKey,
                     liked = favourited,
-                ),
-            ),
+                    accountKey = accountKey,
+                    count = favouritesCount,
+                )
+            },
     )
 
 internal fun ActionMenu.Companion.mastodonRepost(
@@ -709,7 +712,7 @@ internal fun ActionMenu.Companion.mastodonRepost(
     statusKey: MicroBlogKey,
 ): ActionMenu.Item =
     ActionMenu.Item(
-        updateKey = "reblog",
+        updateKey = "mastodon_repost_$statusKey",
         icon = if (reblogged) UiIcon.Unretweet else UiIcon.Retweet,
         text =
             ActionMenu.Item.Text.Localized(
@@ -724,11 +727,14 @@ internal fun ActionMenu.Companion.mastodonRepost(
         clickEvent =
             ClickEvent.event(
                 accountKey,
+            ) { accountKey ->
                 PostEvent.Mastodon.Reblog(
                     postKey = statusKey,
                     reblogged = reblogged,
-                ),
-            ),
+                    count = reblogsCount,
+                    accountKey = accountKey,
+                )
+            },
     )
 
 internal fun ActionMenu.Companion.mastodonBookmark(
@@ -737,7 +743,7 @@ internal fun ActionMenu.Companion.mastodonBookmark(
     statusKey: MicroBlogKey,
 ): ActionMenu.Item =
     ActionMenu.Item(
-        updateKey = "bookmark",
+        updateKey = "mastodon_bookmark_$statusKey",
         icon =
             if (bookmarked) {
                 UiIcon.Unbookmark
@@ -756,11 +762,13 @@ internal fun ActionMenu.Companion.mastodonBookmark(
         clickEvent =
             ClickEvent.event(
                 accountKey,
+            ) { accountKey ->
                 PostEvent.Mastodon.Bookmark(
                     postKey = statusKey,
                     bookmarked = bookmarked,
-                ),
-            ),
+                    accountKey = accountKey,
+                )
+            },
     )
 
 private fun Attachment.toUi(sensitive: Boolean): UiMedia? =
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Render.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Render.kt
index 4318d42e8..b3cd3dd24 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Render.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Render.kt
@@ -4,150 +4,143 @@ import com.fleeksoft.ksoup.nodes.Element
 import dev.dimension.flare.data.database.app.model.DbRssSources
 import dev.dimension.flare.data.database.cache.model.DbDirectMessageTimelineWithRoom
 import dev.dimension.flare.data.database.cache.model.DbMessageItemWithUser
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.database.cache.model.DbStatusWithReference
-import dev.dimension.flare.data.database.cache.model.DbUser
 import dev.dimension.flare.data.database.cache.model.MessageContent
-import dev.dimension.flare.data.database.cache.model.StatusContent
-import dev.dimension.flare.data.database.cache.model.UserContent
 import dev.dimension.flare.data.datasource.microblog.StatusEvent
 import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.model.ReferenceType
 import dev.dimension.flare.ui.model.UiAccount
 import dev.dimension.flare.ui.model.UiDMItem
 import dev.dimension.flare.ui.model.UiDMRoom
 import dev.dimension.flare.ui.model.UiRssSource
-import dev.dimension.flare.ui.model.UiTimeline
 import dev.dimension.flare.ui.render.toUi
 import kotlinx.collections.immutable.toImmutableList
 import kotlin.time.Instant
 
-internal fun DbPagingTimelineWithStatus.render(
-    event: StatusEvent?,
-    useDbKey: Boolean = false,
-): UiTimeline =
-    status.status.data.content
-        .render(
-            event,
-            references =
-                status.references
-                    .groupBy {
-                        it.reference.referenceType
-                    }.mapValues { (_, references) ->
-                        references.mapNotNull { it.status?.data?.content }
-                    },
-        ).let {
-            if (useDbKey) {
-                it.copy(dbKey = timeline.accountType.toString())
-            } else {
-                it
-            }
-        }
-
-internal fun DbStatusWithReference.render(event: StatusEvent?): UiTimeline =
-    status.data.content.render(
-        event,
-        references =
-            references
-                .groupBy { it.reference.referenceType }
-                .mapValues { (_, references) ->
-                    references.mapNotNull { it.status?.data?.content }
-                },
-    )
-
-internal fun StatusContent.render(
-    event: StatusEvent?,
-    references: Map<ReferenceType, List<StatusContent>> = emptyMap(),
-) = when (this) {
-    is StatusContent.Mastodon ->
-        data.render(
-            event = event as StatusEvent.Mastodon,
-            references = references,
-            host = event.accountKey.host,
-        )
-
-    is StatusContent.MastodonNotification ->
-        data.render(
-            event = event as StatusEvent.Mastodon,
-            accountKey = event.accountKey,
-            references = references,
-        )
-
-    is StatusContent.Misskey ->
-        data.render(
-            event = event as StatusEvent.Misskey,
-            accountKey = event.accountKey,
-            references = references,
-            pinned = pinned,
-        )
-
-    is StatusContent.MisskeyNotification ->
-        data.render(
-            event = event as StatusEvent.Misskey,
-            accountKey = event.accountKey,
-            references = references,
-        )
-
-    is StatusContent.BlueskyReason ->
-        reason.render(
-            event = event as StatusEvent.Bluesky,
-            accountKey = event.accountKey,
-            references = references,
-        )
-
-    is StatusContent.Bluesky ->
-        data.render(
-            event = event as StatusEvent.Bluesky,
-            accountKey = event.accountKey,
-            references = references,
-        )
-
-    is StatusContent.BlueskyNotification ->
-        renderBlueskyNotification(
-            event = event as StatusEvent.Bluesky,
-            accountKey = event.accountKey,
-            references = references,
-        )
-
-    is StatusContent.XQT ->
-        data.render(
-            event = event as StatusEvent.XQT,
-            accountKey = event.accountKey,
-            references = references,
-        )
-
-    is StatusContent.VVO ->
-        data.render(
-            event = event as StatusEvent.VVO,
-            accountKey = event.accountKey,
-        )
-
-    is StatusContent.VVOComment ->
-        data.render(
-            event = event as StatusEvent.VVO,
-            accountKey = event.accountKey,
-        )
-
-    is StatusContent.Rss -> data.render()
-    is StatusContent.Test -> error("Test content cannot be rendered")
-}
-
-internal fun DbUser.render(accountKey: MicroBlogKey) =
-    when (content) {
-        is UserContent.Bluesky -> content.data.render(accountKey = accountKey)
-        is UserContent.BlueskyLite -> content.data.render(accountKey = accountKey)
-        is UserContent.Mastodon ->
-            content.data.render(
-                accountKey = accountKey,
-                host = accountKey.host,
-            )
-
-        is UserContent.Misskey -> content.data.render(accountKey = accountKey)
-        is UserContent.MisskeyLite -> content.data.render(accountKey = accountKey)
-        is UserContent.VVO -> content.data.render(accountKey = accountKey)
-        is UserContent.XQT -> content.data.render(accountKey = accountKey)
-        is UserContent.Test -> error("Test content cannot be rendered")
-    }
+// internal fun DbPagingTimelineWithStatus.render(
+//    event: StatusEvent?,
+//    useDbKey: Boolean = false,
+// ): UiTimeline =
+//    status.status.data.content
+//        .render(
+//            event,
+//            references =
+//                status.references
+//                    .groupBy {
+//                        it.reference.referenceType
+//                    }.mapValues { (_, references) ->
+//                        references.mapNotNull { it.status?.data?.content }
+//                    },
+//        ).let {
+//            if (useDbKey) {
+//                it.copy(dbKey = timeline.accountType.toString())
+//            } else {
+//                it
+//            }
+//        }
+//
+// internal fun DbStatusWithReference.render(event: StatusEvent?): UiTimeline =
+//    status.data.content.render(
+//        event,
+//        references =
+//            references
+//                .groupBy { it.reference.referenceType }
+//                .mapValues { (_, references) ->
+//                    references.mapNotNull { it.status?.data?.content }
+//                },
+//    )
+//
+// internal fun StatusContent.render(
+//    event: StatusEvent?,
+//    references: Map<ReferenceType, List<StatusContent>> = emptyMap(),
+// ) = when (this) {
+//    is StatusContent.Mastodon ->
+//        data.render(
+//            event = event as StatusEvent.Mastodon,
+//            references = references,
+//            host = event.accountKey.host,
+//        )
+//
+//    is StatusContent.MastodonNotification ->
+//        data.render(
+//            event = event as StatusEvent.Mastodon,
+//            accountKey = event.accountKey,
+//            references = references,
+//        )
+//
+//    is StatusContent.Misskey ->
+//        data.render(
+//            event = event as StatusEvent.Misskey,
+//            accountKey = event.accountKey,
+//            references = references,
+//            pinned = pinned,
+//        )
+//
+//    is StatusContent.MisskeyNotification ->
+//        data.render(
+//            event = event as StatusEvent.Misskey,
+//            accountKey = event.accountKey,
+//            references = references,
+//        )
+//
+//    is StatusContent.BlueskyReason ->
+//        reason.render(
+//            event = event as StatusEvent.Bluesky,
+//            accountKey = event.accountKey,
+//            references = references,
+//        )
+//
+//    is StatusContent.Bluesky ->
+//        data.render(
+//            event = event as StatusEvent.Bluesky,
+//            accountKey = event.accountKey,
+//            references = references,
+//        )
+//
+//    is StatusContent.BlueskyNotification ->
+//        renderBlueskyNotification(
+//            event = event as StatusEvent.Bluesky,
+//            accountKey = event.accountKey,
+//            references = references,
+//        )
+//
+//    is StatusContent.XQT ->
+//        data.render(
+//            event = event as StatusEvent.XQT,
+//            accountKey = event.accountKey,
+//            references = references,
+//        )
+//
+//    is StatusContent.VVO ->
+//        data.render(
+//            event = event as StatusEvent.VVO,
+//            accountKey = event.accountKey,
+//        )
+//
+//    is StatusContent.VVOComment ->
+//        data.render(
+//            event = event as StatusEvent.VVO,
+//            accountKey = event.accountKey,
+//        )
+//
+//    is StatusContent.Rss -> data.render()
+//    is StatusContent.Test -> error("Test content cannot be rendered")
+// }
+//
+// internal fun DbUser.render(accountKey: MicroBlogKey) =
+//    when (content) {
+//        is UserContent.Bluesky -> content.data.render(accountKey = accountKey)
+//        is UserContent.BlueskyLite -> content.data.render(accountKey = accountKey)
+//        is UserContent.Mastodon ->
+//            content.data.render(
+//                accountKey = accountKey,
+//                host = accountKey.host,
+//            )
+//
+//        is UserContent.Misskey -> content.data.render(accountKey = accountKey)
+//        is UserContent.MisskeyLite -> content.data.render(accountKey = accountKey)
+//        is UserContent.VVO -> content.data.render(accountKey = accountKey)
+//        is UserContent.XQT -> content.data.render(accountKey = accountKey)
+//        is UserContent.Test -> error("Test content cannot be rendered")
+//    }
 
 internal fun DbDirectMessageTimelineWithRoom.render(
     accountKey: MicroBlogKey,

From 86b5087271917b50feab2f5c957a1ec93fe9c40a Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Wed, 4 Mar 2026 13:59:01 +0900
Subject: [PATCH 08/33] migrate misskey

---
 .../data/database/cache/mapper/Misskey.kt     |  180 ---
 .../data/datasource/microblog/PostEvent.kt    |   40 +-
 .../microblog/ReactionDataSource.kt           |   12 +-
 .../misskey/AntennasListPagingSource.kt       |   44 +-
 .../misskey/AntennasTimelineRemoteMediator.kt |   21 +-
 .../misskey/ChannelTimelineRemoteMediator.kt  |   21 +-
 .../misskey/DiscoverStatusRemoteMediator.kt   |   21 +-
 .../datasource/misskey/FansPagingSource.kt    |   35 +-
 .../FavouriteTimelineRemoteMediator.kt        |   27 +-
 .../misskey/FollowingPagingSource.kt          |   36 +-
 .../misskey/HomeTimelineRemoteMediator.kt     |   23 +-
 .../misskey/HybridTimelineRemoteMediator.kt   |   21 +-
 .../misskey/ListTimelineRemoteMediator.kt     |   21 +-
 .../misskey/LocalTimelineRemoteMediator.kt    |   21 +-
 .../misskey/MentionTimelineRemoteMediator.kt  |   21 +-
 .../datasource/misskey/MisskeyDataSource.kt   | 1083 +++++------------
 .../data/datasource/misskey/MisskeyLoader.kt  |  111 ++
 .../misskey/NotificationRemoteMediator.kt     |   21 +-
 .../misskey/PublicTimelineRemoteMediator.kt   |   21 +-
 .../misskey/SearchStatusRemoteMediator.kt     |   21 +-
 .../misskey/SearchUserPagingSource.kt         |   49 +-
 .../misskey/StatusDetailRemoteMediator.kt     |   29 +-
 .../misskey/TrendHashtagPagingSource.kt       |   34 +-
 .../misskey/TrendsUserPagingSource.kt         |   34 +-
 .../misskey/UserTimelineRemoteMediator.kt     |   32 +-
 .../flare/ui/model/mapper/Misskey.kt          |  679 +++++------
 26 files changed, 1006 insertions(+), 1652 deletions(-)
 delete mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Misskey.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyLoader.kt

diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Misskey.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Misskey.kt
deleted file mode 100644
index e06011326..000000000
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Misskey.kt
+++ /dev/null
@@ -1,180 +0,0 @@
-
-package dev.dimension.flare.data.database.cache.mapper
-
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.model.DbEmoji
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.database.cache.model.DbStatus
-import dev.dimension.flare.data.database.cache.model.DbStatusWithUser
-import dev.dimension.flare.data.database.cache.model.DbUser
-import dev.dimension.flare.data.database.cache.model.EmojiContent
-import dev.dimension.flare.data.database.cache.model.StatusContent
-import dev.dimension.flare.data.database.cache.model.UserContent
-import dev.dimension.flare.data.network.misskey.api.model.EmojiSimple
-import dev.dimension.flare.data.network.misskey.api.model.Note
-import dev.dimension.flare.data.network.misskey.api.model.Notification
-import dev.dimension.flare.data.network.misskey.api.model.User
-import dev.dimension.flare.data.network.misskey.api.model.UserLite
-import dev.dimension.flare.model.AccountType
-import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.model.PlatformType
-import dev.dimension.flare.model.ReferenceType
-import kotlin.time.Instant
-
-internal object Misskey {
-    suspend fun save(
-        accountKey: MicroBlogKey,
-        pagingKey: String,
-        database: CacheDatabase,
-        data: List<Note>,
-        sortIdProvider: (Note) -> Long = { Instant.parse(it.createdAt).toEpochMilliseconds() },
-    ) {
-        saveToDatabase(database, data.toDbPagingTimeline(accountKey, pagingKey, sortIdProvider))
-    }
-}
-
-internal fun List<Notification>.toDb(
-    accountKey: MicroBlogKey,
-    pagingKey: String,
-): List<DbPagingTimelineWithStatus> =
-    this.map {
-        createDbPagingTimelineWithStatus(
-            accountKey = accountKey,
-            pagingKey = pagingKey,
-            sortId = Instant.parse(it.createdAt).toEpochMilliseconds(),
-            status = it.toDbStatusWithUser(accountKey),
-            references =
-                listOfNotNull(
-                    if (it.note != null) {
-                        ReferenceType.Notification to listOfNotNull(it.note.toDbStatusWithUser(accountKey))
-                    } else {
-                        null
-                    },
-                ).toMap(),
-        )
-    }
-
-private fun Notification.toDbStatusWithUser(accountKey: MicroBlogKey): DbStatusWithUser {
-    val user = this.user?.toDbUser(accountKey.host)
-    val status = this.toDbStatus(accountKey)
-    return DbStatusWithUser(
-        data = status,
-        user = user,
-    )
-}
-
-private fun Notification.toDbStatus(accountKey: MicroBlogKey): DbStatus {
-    val user = this.user?.toDbUser(accountKey.host)
-    return DbStatus(
-        statusKey =
-            MicroBlogKey(
-                this.id,
-                accountKey.host,
-            ),
-        userKey = user?.userKey,
-        content = StatusContent.MisskeyNotification(this),
-        accountType = AccountType.Specific(accountKey),
-        text = null,
-        createdAt = Instant.parse(createdAt),
-    )
-}
-
-internal suspend fun List<Note>.toDbPagingTimeline(
-    accountKey: MicroBlogKey,
-    pagingKey: String,
-    sortIdProvider: suspend (Note) -> Long = { Instant.parse(it.createdAt).toEpochMilliseconds() },
-    pinnedProvider: suspend (Note) -> Boolean = { false },
-): List<DbPagingTimelineWithStatus> =
-    this.map {
-        createDbPagingTimelineWithStatus(
-            accountKey = accountKey,
-            pagingKey = pagingKey,
-            sortId = sortIdProvider(it),
-            status = it.toDbStatusWithUser(accountKey, pinnedProvider(it)),
-            references =
-                listOfNotNull(
-                    if (it.renote != null) {
-                        if (it.text.isNullOrEmpty() && it.files.isNullOrEmpty() && it.poll == null) {
-                            ReferenceType.Retweet to listOfNotNull(it.renote.toDbStatusWithUser(accountKey))
-                        } else {
-                            ReferenceType.Quote to listOfNotNull(it.renote.toDbStatusWithUser(accountKey))
-                        }
-                    } else {
-                        null
-                    },
-                    if (it.reply != null) {
-                        ReferenceType.Reply to listOfNotNull(it.reply.toDbStatusWithUser(accountKey))
-                    } else {
-                        null
-                    },
-                ).toMap(),
-        )
-    }
-
-private fun Note.toDbStatusWithUser(
-    accountKey: MicroBlogKey,
-    pinned: Boolean = false,
-): DbStatusWithUser {
-    val user = user.toDbUser(accountKey.host)
-    val status =
-        DbStatus(
-            statusKey =
-                MicroBlogKey(
-                    id = id,
-                    host = user.userKey.host,
-                ),
-            content = StatusContent.Misskey(this, pinned),
-            userKey = user.userKey,
-            accountType = AccountType.Specific(accountKey),
-            text = text,
-            createdAt = Instant.parse(createdAt),
-        )
-    return DbStatusWithUser(
-        data = status,
-        user = user,
-    )
-}
-
-internal fun UserLite.toDbUser(accountHost: String) =
-    DbUser(
-        userKey =
-            MicroBlogKey(
-                id = id,
-                host = accountHost,
-            ),
-        platformType = PlatformType.Misskey,
-        name = name ?: "",
-        handle = username,
-        content = UserContent.MisskeyLite(this),
-        host =
-            if (host.isNullOrEmpty()) {
-                accountHost
-            } else {
-                host
-            },
-    )
-
-internal fun User.toDbUser(accountHost: String) =
-    DbUser(
-        userKey =
-            MicroBlogKey(
-                id = id,
-                host = accountHost,
-            ),
-        platformType = dev.dimension.flare.model.PlatformType.Misskey,
-        name = name ?: "",
-        handle = username,
-        content = UserContent.Misskey(this),
-        host =
-            if (host.isNullOrEmpty()) {
-                accountHost
-            } else {
-                host
-            },
-    )
-
-internal fun List<EmojiSimple>.toDb(host: String): DbEmoji =
-    DbEmoji(
-        host = host,
-        content = EmojiContent.Misskey(this),
-    )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt
index c5c857925..09b1c315c 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt
@@ -8,6 +8,9 @@ import dev.dimension.flare.ui.model.mapper.blueskyReblog
 import dev.dimension.flare.ui.model.mapper.mastodonBookmark
 import dev.dimension.flare.ui.model.mapper.mastodonLike
 import dev.dimension.flare.ui.model.mapper.mastodonRepost
+import dev.dimension.flare.ui.model.mapper.misskeyFavourite
+import dev.dimension.flare.ui.model.mapper.misskeyReact
+import dev.dimension.flare.ui.model.mapper.misskeyRenote
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.serialization.Serializable
 
@@ -115,12 +118,34 @@ internal sealed interface PostEvent {
             override val postKey: MicroBlogKey,
             val hasReacted: Boolean,
             val reaction: String,
-        ) : Misskey
+            val count: Long = 0,
+            val accountKey: MicroBlogKey? = null,
+        ) : Misskey,
+            UpdatePostActionMenuEvent {
+            override fun nextActionMenu(): ActionMenu.Item =
+                ActionMenu.misskeyReact(
+                    postKey = postKey,
+                    hasReacted = !hasReacted,
+                    reaction = reaction,
+                    count = (count + if (!hasReacted) 1 else -1).coerceAtLeast(0),
+                    accountKey = accountKey,
+                )
+        }
 
         @Serializable
         data class Renote(
             override val postKey: MicroBlogKey,
-        ) : Misskey
+            val count: Long = 0,
+            val accountKey: MicroBlogKey? = null,
+        ) : Misskey,
+            UpdatePostActionMenuEvent {
+            override fun nextActionMenu(): ActionMenu.Item =
+                ActionMenu.misskeyRenote(
+                    postKey = postKey,
+                    count = count + 1,
+                    accountKey = accountKey,
+                )
+        }
 
         @Serializable
         data class Vote(
@@ -136,7 +161,16 @@ internal sealed interface PostEvent {
         data class Favourite(
             override val postKey: MicroBlogKey,
             val favourited: Boolean,
-        ) : Misskey
+            val accountKey: MicroBlogKey? = null,
+        ) : Misskey,
+            UpdatePostActionMenuEvent {
+            override fun nextActionMenu(): ActionMenu.Item =
+                ActionMenu.misskeyFavourite(
+                    postKey = postKey,
+                    favourited = !favourited,
+                    accountKey = accountKey,
+                )
+        }
 
         @Serializable
         data class AcceptFollowRequest(
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ReactionDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ReactionDataSource.kt
index ed005b9db..61bf4bd58 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ReactionDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ReactionDataSource.kt
@@ -1,11 +1,9 @@
 package dev.dimension.flare.data.datasource.microblog
 
-import dev.dimension.flare.model.MicroBlogKey
-
 internal interface ReactionDataSource : AuthenticatedMicroblogDataSource {
-    fun react(
-        statusKey: MicroBlogKey,
-        hasReacted: Boolean,
-        reaction: String,
-    )
+//    fun react(
+//        statusKey: MicroBlogKey,
+//        hasReacted: Boolean,
+//        reaction: String,
+//    )
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/AntennasListPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/AntennasListPagingSource.kt
index e403b1c9e..b540fbf37 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/AntennasListPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/AntennasListPagingSource.kt
@@ -1,7 +1,8 @@
 package dev.dimension.flare.data.datasource.misskey
 
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.misskey.MisskeyService
 import dev.dimension.flare.data.repository.tryRun
 import dev.dimension.flare.ui.model.UiList
@@ -9,24 +10,25 @@ import dev.dimension.flare.ui.model.mapper.render
 
 internal class AntennasListPagingSource(
     private val service: MisskeyService,
-) : BasePagingSource<Int, UiList>() {
-    override suspend fun doLoad(params: LoadParams<Int>): LoadResult<Int, UiList> =
-        tryRun {
-            service.antennasList().map {
-                it.render()
-            }
-        }.fold(
-            onSuccess = { antennas ->
-                LoadResult.Page(
-                    data = antennas,
-                    prevKey = null,
-                    nextKey = null,
-                )
-            },
-            onFailure = { error ->
-                LoadResult.Error(error)
-            },
+) : RemoteLoader<UiList> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiList> {
+        if (request is PagingRequest.Prepend || request is PagingRequest.Append) {
+            return PagingResult(
+                endOfPaginationReached = true,
+            )
+        }
+        val data =
+            tryRun {
+                service.antennasList().map {
+                    it.render()
+                }
+            }.getOrThrow()
+        return PagingResult(
+            endOfPaginationReached = true,
+            data = data,
         )
-
-    override fun getRefreshKey(state: PagingState<Int, UiList>): Int? = null
+    }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/AntennasTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/AntennasTimelineRemoteMediator.kt
index c0dfadbbb..26779526e 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/AntennasTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/AntennasTimelineRemoteMediator.kt
@@ -1,31 +1,27 @@
 package dev.dimension.flare.data.datasource.misskey
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.misskey.MisskeyService
 import dev.dimension.flare.data.network.misskey.api.model.AntennasNotesRequest
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class AntennasTimelineRemoteMediator(
     private val service: MisskeyService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
     private val id: String,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey = "antennas_${id}_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
@@ -59,10 +55,7 @@ internal class AntennasTimelineRemoteMediator(
         return PagingResult(
             endOfPaginationReached = response.isEmpty(),
             data =
-                response.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+                response.render(accountKey),
             nextKey = response.lastOrNull()?.id,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/ChannelTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/ChannelTimelineRemoteMediator.kt
index dd103d3d4..5adef84db 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/ChannelTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/ChannelTimelineRemoteMediator.kt
@@ -1,29 +1,25 @@
 package dev.dimension.flare.data.datasource.misskey
 
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.misskey.MisskeyService
 import dev.dimension.flare.data.network.misskey.api.model.ChannelsTimelineRequest
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 internal class ChannelTimelineRemoteMediator(
     private val service: MisskeyService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
     private val id: String,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey = "channel_${id}_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
@@ -59,10 +55,7 @@ internal class ChannelTimelineRemoteMediator(
         return PagingResult(
             endOfPaginationReached = response.isEmpty(),
             data =
-                response.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+                response.render(accountKey),
             nextKey = response.lastOrNull()?.id,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/DiscoverStatusRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/DiscoverStatusRemoteMediator.kt
index c7002f0d8..450f71690 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/DiscoverStatusRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/DiscoverStatusRemoteMediator.kt
@@ -1,30 +1,26 @@
 package dev.dimension.flare.data.datasource.misskey
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.misskey.MisskeyService
 import dev.dimension.flare.data.network.misskey.api.model.NotesFeaturedRequest
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class DiscoverStatusRemoteMediator(
     private val service: MisskeyService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String = "discover_status_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
@@ -50,10 +46,7 @@ internal class DiscoverStatusRemoteMediator(
         return PagingResult(
             endOfPaginationReached = true,
             data =
-                response.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+                response.render(accountKey),
             nextKey = response.lastOrNull()?.id,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/FansPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/FansPagingSource.kt
index cca6dfacd..10e9459c3 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/FansPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/FansPagingSource.kt
@@ -1,7 +1,8 @@
 package dev.dimension.flare.data.datasource.misskey
 
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.misskey.MisskeyService
 import dev.dimension.flare.data.network.misskey.api.model.UsersFollowersRequest
 import dev.dimension.flare.model.MicroBlogKey
@@ -12,28 +13,36 @@ internal class FansPagingSource(
     private val service: MisskeyService,
     private val accountKey: MicroBlogKey,
     private val userKey: MicroBlogKey,
-) : BasePagingSource<String, UiProfile>() {
-    override fun getRefreshKey(state: PagingState<String, UiProfile>): String? = null
-
-    override suspend fun doLoad(params: LoadParams<String>): LoadResult<String, UiProfile> {
-        val maxId = params.key
-        val limit = params.loadSize
+) : RemoteLoader<UiProfile> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiProfile> {
+        val maxId =
+            when (request) {
+                PagingRequest.Refresh -> null
+                is PagingRequest.Prepend -> {
+                    return PagingResult(
+                        endOfPaginationReached = true,
+                    )
+                }
+                is PagingRequest.Append -> request.nextKey
+            }
         val response =
             service
                 .usersFollowers(
                     usersFollowersRequest =
                         UsersFollowersRequest(
                             untilId = maxId,
-                            limit = limit,
+                            limit = pageSize,
                             userId = userKey.id,
                         ),
-                )
-        return LoadResult.Page(
+                ).orEmpty()
+        return PagingResult(
             data =
-                response.orEmpty().mapNotNull {
+                response.mapNotNull {
                     it.follower?.render(accountKey = accountKey)
                 },
-            prevKey = null,
             nextKey = response.lastOrNull()?.id,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/FavouriteTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/FavouriteTimelineRemoteMediator.kt
index 4b835565a..2b8a9b88b 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/FavouriteTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/FavouriteTimelineRemoteMediator.kt
@@ -1,25 +1,20 @@
 package dev.dimension.flare.data.datasource.misskey
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.misskey.MisskeyService
 import dev.dimension.flare.data.network.misskey.api.model.AdminAdListRequest
 import dev.dimension.flare.model.MicroBlogKey
-import kotlin.time.Instant
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class FavouriteTimelineRemoteMediator(
     private val accountKey: MicroBlogKey,
     private val service: MisskeyService,
-    database: CacheDatabase,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String
         get() =
             buildString {
@@ -27,10 +22,10 @@ internal class FavouriteTimelineRemoteMediator(
                 append(accountKey.toString())
             }
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 is PagingRequest.Prepend -> return PagingResult(
@@ -57,15 +52,7 @@ internal class FavouriteTimelineRemoteMediator(
 
         val notes = response.map { it.note }
         val data =
-            notes.toDbPagingTimeline(
-                accountKey = accountKey,
-                pagingKey = pagingKey,
-                sortIdProvider = {
-                    response.find { note -> note.noteId == it.id }?.createdAt?.let {
-                        Instant.parse(it).toEpochMilliseconds()
-                    } ?: 0
-                },
-            )
+            notes.render(accountKey)
 
         return PagingResult(
             endOfPaginationReached = response.isEmpty(),
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/FollowingPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/FollowingPagingSource.kt
index cd7c15e0c..6d2e3ab02 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/FollowingPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/FollowingPagingSource.kt
@@ -1,7 +1,8 @@
 package dev.dimension.flare.data.datasource.misskey
 
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.misskey.MisskeyService
 import dev.dimension.flare.data.network.misskey.api.model.UsersFollowersRequest
 import dev.dimension.flare.model.MicroBlogKey
@@ -12,29 +13,36 @@ internal class FollowingPagingSource(
     private val service: MisskeyService,
     private val accountKey: MicroBlogKey,
     private val userKey: MicroBlogKey,
-) : BasePagingSource<String, UiProfile>() {
-    override fun getRefreshKey(state: PagingState<String, UiProfile>): String? = null
-
-    override suspend fun doLoad(params: LoadParams<String>): LoadResult<String, UiProfile> {
-        val maxId = params.key
-        val limit = params.loadSize
+) : RemoteLoader<UiProfile> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiProfile> {
+        val maxId =
+            when (request) {
+                PagingRequest.Refresh -> null
+                is PagingRequest.Prepend -> {
+                    return PagingResult(
+                        endOfPaginationReached = true,
+                    )
+                }
+                is PagingRequest.Append -> request.nextKey
+            }
         val response =
             service
                 .usersFollowing(
                     usersFollowersRequest =
                         UsersFollowersRequest(
                             untilId = maxId,
-                            limit = limit,
+                            limit = pageSize,
                             userId = userKey.id,
                         ),
-                )
-        return LoadResult.Page(
+                ).orEmpty()
+        return PagingResult(
             data =
-                response.orEmpty().mapNotNull {
-                    // TODO: isn't followee a typo?
+                response.mapNotNull {
                     it.followee?.render(accountKey = accountKey)
                 },
-            prevKey = null,
             nextKey = response.lastOrNull()?.id,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/HomeTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/HomeTimelineRemoteMediator.kt
index 7f27bfdda..95d17fb61 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/HomeTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/HomeTimelineRemoteMediator.kt
@@ -1,32 +1,26 @@
 package dev.dimension.flare.data.datasource.misskey
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.misskey.MisskeyService
 import dev.dimension.flare.data.network.misskey.api.model.NotesHybridTimelineRequest
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class HomeTimelineRemoteMediator(
     private val accountKey: MicroBlogKey,
     private val service: MisskeyService,
-    database: CacheDatabase,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey = "home_$accountKey"
 
-    override suspend fun initialize(): InitializeAction = InitializeAction.SKIP_INITIAL_REFRESH
-
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 is PagingRequest.Prepend -> return PagingResult(
@@ -54,10 +48,7 @@ internal class HomeTimelineRemoteMediator(
         return PagingResult(
             endOfPaginationReached = response.isEmpty(),
             data =
-                response.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+                response.render(accountKey),
             nextKey = response.lastOrNull()?.id,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/HybridTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/HybridTimelineRemoteMediator.kt
index 5cd2f29e9..b31023aad 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/HybridTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/HybridTimelineRemoteMediator.kt
@@ -1,28 +1,24 @@
 package dev.dimension.flare.data.datasource.misskey
 
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.misskey.MisskeyService
 import dev.dimension.flare.data.network.misskey.api.model.NotesHybridTimelineRequest
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 internal class HybridTimelineRemoteMediator(
     private val accountKey: MicroBlogKey,
     private val service: MisskeyService,
-    database: CacheDatabase,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey = "hybrid_timeline_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 is PagingRequest.Prepend -> return PagingResult(
@@ -49,10 +45,7 @@ internal class HybridTimelineRemoteMediator(
         return PagingResult(
             endOfPaginationReached = response.isEmpty(),
             data =
-                response.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+                response.render(accountKey),
             nextKey = response.lastOrNull()?.id,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/ListTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/ListTimelineRemoteMediator.kt
index f06b9a4a4..093c894a3 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/ListTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/ListTimelineRemoteMediator.kt
@@ -1,31 +1,27 @@
 package dev.dimension.flare.data.datasource.misskey
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.misskey.MisskeyService
 import dev.dimension.flare.data.network.misskey.api.model.NotesUserListTimelineRequest
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class ListTimelineRemoteMediator(
     private val listId: String,
     private val service: MisskeyService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey = "list_${accountKey}_$listId"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
@@ -63,10 +59,7 @@ internal class ListTimelineRemoteMediator(
         return PagingResult(
             endOfPaginationReached = response.isEmpty(),
             data =
-                response.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+                response.render(accountKey),
             nextKey = response.lastOrNull()?.id,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/LocalTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/LocalTimelineRemoteMediator.kt
index 9ba41549c..425aa56d5 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/LocalTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/LocalTimelineRemoteMediator.kt
@@ -1,30 +1,26 @@
 package dev.dimension.flare.data.datasource.misskey
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.misskey.MisskeyService
 import dev.dimension.flare.data.network.misskey.api.model.NotesLocalTimelineRequest
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class LocalTimelineRemoteMediator(
     private val accountKey: MicroBlogKey,
     private val service: MisskeyService,
-    database: CacheDatabase,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey = "local_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 is PagingRequest.Prepend -> return PagingResult(
@@ -51,10 +47,7 @@ internal class LocalTimelineRemoteMediator(
         return PagingResult(
             endOfPaginationReached = response.isEmpty(),
             data =
-                response.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+                response.render(accountKey),
             nextKey = response.lastOrNull()?.id,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MentionTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MentionTimelineRemoteMediator.kt
index 596559a4f..886ce40d0 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MentionTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MentionTimelineRemoteMediator.kt
@@ -1,30 +1,26 @@
 package dev.dimension.flare.data.datasource.misskey
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.misskey.MisskeyService
 import dev.dimension.flare.data.network.misskey.api.model.NotesMentionsRequest
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class MentionTimelineRemoteMediator(
     private val accountKey: MicroBlogKey,
     private val service: MisskeyService,
-    database: CacheDatabase,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey = "mention_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 is PagingRequest.Prepend -> return PagingResult(
@@ -51,10 +47,7 @@ internal class MentionTimelineRemoteMediator(
         return PagingResult(
             endOfPaginationReached = response.isEmpty(),
             data =
-                response.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+                response.render(accountKey),
             nextKey = response.lastOrNull()?.id,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
index 49dc7141a..b9db9c793 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
@@ -3,82 +3,70 @@ package dev.dimension.flare.data.datasource.misskey
 import androidx.paging.ExperimentalPagingApi
 import androidx.paging.Pager
 import androidx.paging.PagingData
-import androidx.paging.PagingState
 import androidx.paging.cachedIn
 import androidx.paging.map
-import dev.dimension.flare.common.BasePagingSource
-import dev.dimension.flare.common.CacheData
-import dev.dimension.flare.common.Cacheable
 import dev.dimension.flare.common.FileType
-import dev.dimension.flare.common.MemCacheable
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.connect
-import dev.dimension.flare.data.database.cache.mapper.Misskey
-import dev.dimension.flare.data.database.cache.mapper.toDb
-import dev.dimension.flare.data.database.cache.mapper.toDbUser
-import dev.dimension.flare.data.database.cache.model.StatusContent
-import dev.dimension.flare.data.database.cache.model.updateStatusUseCase
 import dev.dimension.flare.data.datasource.microblog.AuthenticatedMicroblogDataSource
 import dev.dimension.flare.data.datasource.microblog.ComposeConfig
 import dev.dimension.flare.data.datasource.microblog.ComposeData
 import dev.dimension.flare.data.datasource.microblog.ComposeProgress
 import dev.dimension.flare.data.datasource.microblog.ComposeType
+import dev.dimension.flare.data.datasource.microblog.DatabaseUpdater
 import dev.dimension.flare.data.datasource.microblog.NotificationFilter
-import dev.dimension.flare.data.datasource.microblog.ProfileAction
+import dev.dimension.flare.data.datasource.microblog.PostEvent
 import dev.dimension.flare.data.datasource.microblog.ProfileTab
 import dev.dimension.flare.data.datasource.microblog.ReactionDataSource
-import dev.dimension.flare.data.datasource.microblog.StatusEvent
 import dev.dimension.flare.data.datasource.microblog.datasource.ListDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.NotificationDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.PostDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.RelationDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.UserDataSource
+import dev.dimension.flare.data.datasource.microblog.handler.EmojiHandler
 import dev.dimension.flare.data.datasource.microblog.handler.ListHandler
 import dev.dimension.flare.data.datasource.microblog.handler.ListMemberHandler
+import dev.dimension.flare.data.datasource.microblog.handler.NotificationHandler
+import dev.dimension.flare.data.datasource.microblog.handler.PostEventHandler
+import dev.dimension.flare.data.datasource.microblog.handler.PostHandler
+import dev.dimension.flare.data.datasource.microblog.handler.RelationHandler
+import dev.dimension.flare.data.datasource.microblog.handler.UserHandler
 import dev.dimension.flare.data.datasource.microblog.loader.ListLoader
 import dev.dimension.flare.data.datasource.microblog.loader.ListMemberLoader
-import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
+import dev.dimension.flare.data.datasource.microblog.paging.toPagingSource
 import dev.dimension.flare.data.datasource.microblog.pagingConfig
-import dev.dimension.flare.data.datasource.microblog.relationKeyWithUserKey
-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.ChannelsFeaturedRequest
 import dev.dimension.flare.data.network.misskey.api.model.ChannelsFollowRequest
 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.NotesCreateRequest
 import dev.dimension.flare.data.network.misskey.api.model.NotesCreateRequestPoll
 import dev.dimension.flare.data.network.misskey.api.model.NotesPollsVoteRequest
 import dev.dimension.flare.data.network.misskey.api.model.NotesReactionsCreateRequest
-import dev.dimension.flare.data.network.misskey.api.model.UsersShowRequest
 import dev.dimension.flare.data.repository.AccountRepository
-import dev.dimension.flare.data.repository.LocalFilterRepository
 import dev.dimension.flare.data.repository.tryRun
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.model.PlatformType
 import dev.dimension.flare.shared.image.ImageCompressor
+import dev.dimension.flare.ui.model.ClickEvent
 import dev.dimension.flare.ui.model.UiAccount
-import dev.dimension.flare.ui.model.UiEmoji
 import dev.dimension.flare.ui.model.UiHashtag
 import dev.dimension.flare.ui.model.UiList
+import dev.dimension.flare.ui.model.UiNumber
 import dev.dimension.flare.ui.model.UiProfile
-import dev.dimension.flare.ui.model.UiRelation
-import dev.dimension.flare.ui.model.UiState
 import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.mapper.render
-import dev.dimension.flare.ui.model.mapper.toUi
-import dev.dimension.flare.ui.model.toUi
 import dev.dimension.flare.ui.presenter.compose.ComposeStatus
 import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.collections.immutable.toImmutableList
-import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.collections.immutable.toPersistentList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.mapNotNull
-import kotlinx.coroutines.launch
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
@@ -87,14 +75,14 @@ internal class MisskeyDataSource(
     override val accountKey: MicroBlogKey,
     private val host: String,
 ) : AuthenticatedMicroblogDataSource,
+    NotificationDataSource,
+    UserDataSource,
+    PostDataSource,
     KoinComponent,
-    StatusEvent.Misskey,
     ListDataSource,
     ReactionDataSource,
-    RelationLoader {
-    private val database: CacheDatabase by inject()
-    private val localFilterRepository: LocalFilterRepository by inject()
-    private val coroutineScope: CoroutineScope by inject()
+    RelationDataSource,
+    PostEventHandler.Handler {
     private val accountRepository: AccountRepository by inject()
     private val imageCompressor: ImageCompressor by inject()
     private val service by lazy {
@@ -108,86 +96,256 @@ internal class MisskeyDataSource(
         )
     }
 
+    private val loader by lazy {
+        MisskeyLoader(
+            accountKey = accountKey,
+            service = service,
+        )
+    }
+
+    private val emojiHandler by lazy {
+        EmojiHandler(
+            host = accountKey.host,
+            loader = loader,
+        )
+    }
+
+    override val notificationHandler by lazy {
+        NotificationHandler(
+            accountKey = accountKey,
+            loader = loader,
+        )
+    }
+
+    override val userHandler by lazy {
+        UserHandler(
+            accountKey = accountKey,
+            loader = loader,
+        )
+    }
+
+    override val postHandler by lazy {
+        PostHandler(
+            accountType = AccountType.Specific(accountKey),
+            loader = loader,
+        )
+    }
+
+    override val relationHandler by lazy {
+        RelationHandler(
+            dataSource = loader,
+        )
+    }
+
+    override val postEventHandler by lazy {
+        PostEventHandler(
+            accountKey = accountKey,
+            handler = this,
+        )
+    }
+
+    override suspend fun handle(
+        event: PostEvent,
+        updater: DatabaseUpdater,
+    ) {
+        require(event is PostEvent.Misskey)
+        when (event) {
+            is PostEvent.Misskey.React -> {
+                val reacted = !event.hasReacted
+                val nextActionCount = (event.count + if (reacted) 1 else -1).coerceAtLeast(0)
+                updater.updateCache(event.postKey) { current ->
+                    if (current !is UiTimelineV2.Post) {
+                        return@updateCache current
+                    }
+                    val updatedReactions =
+                        current.emojiReactions
+                            .toMutableList()
+                            .let { reactions ->
+                                val index = reactions.indexOfFirst { it.name == event.reaction }
+                                if (reacted) {
+                                    if (index >= 0) {
+                                        val original = reactions[index]
+                                        reactions[index] =
+                                            original.copy(
+                                                count = UiNumber(original.count.value + 1),
+                                                me = true,
+                                                clickEvent =
+                                                    ClickEvent.event(
+                                                        accountKey,
+                                                        PostEvent.Misskey.React(
+                                                            postKey = event.postKey,
+                                                            hasReacted = true,
+                                                            reaction = event.reaction,
+                                                            count = nextActionCount,
+                                                            accountKey = accountKey,
+                                                        ),
+                                                    ),
+                                            )
+                                    } else {
+                                        reactions.add(
+                                            UiTimelineV2.Post.EmojiReaction(
+                                                name = event.reaction,
+                                                url = "",
+                                                count = UiNumber(1),
+                                                clickEvent =
+                                                    ClickEvent.event(
+                                                        accountKey,
+                                                        PostEvent.Misskey.React(
+                                                            postKey = event.postKey,
+                                                            hasReacted = true,
+                                                            reaction = event.reaction,
+                                                            count = nextActionCount,
+                                                            accountKey = accountKey,
+                                                        ),
+                                                    ),
+                                                isUnicode = !event.reaction.startsWith(':') && !event.reaction.endsWith(':'),
+                                                me = true,
+                                            ),
+                                        )
+                                    }
+                                } else if (index >= 0) {
+                                    val original = reactions[index]
+                                    val newCount = (original.count.value - 1).coerceAtLeast(0)
+                                    if (newCount == 0L) {
+                                        reactions.removeAt(index)
+                                    } else {
+                                        reactions[index] =
+                                            original.copy(
+                                                count = UiNumber(newCount),
+                                                me = false,
+                                                clickEvent =
+                                                    ClickEvent.event(
+                                                        accountKey,
+                                                        PostEvent.Misskey.React(
+                                                            postKey = event.postKey,
+                                                            hasReacted = false,
+                                                            reaction = event.reaction,
+                                                            count = nextActionCount,
+                                                            accountKey = accountKey,
+                                                        ),
+                                                    ),
+                                            )
+                                    }
+                                }
+                                reactions
+                            }.sortedByDescending { it.count.value }
+                            .toImmutableList()
+                    current.copy(
+                        emojiReactions = updatedReactions,
+                    )
+                }
+                if (event.hasReacted) {
+                    service.notesReactionsDelete(IPinRequest(noteId = event.postKey.id))
+                } else {
+                    service.notesReactionsCreate(
+                        NotesReactionsCreateRequest(
+                            noteId = event.postKey.id,
+                            reaction = event.reaction,
+                        ),
+                    )
+                }
+            }
+
+            is PostEvent.Misskey.Renote ->
+                service.notesCreate(
+                    NotesCreateRequest(
+                        renoteId = event.postKey.id,
+                    ),
+                )
+
+            is PostEvent.Misskey.Vote ->
+                event.options.forEach {
+                    service.notesPollsVote(
+                        notesPollsVoteRequest =
+                            NotesPollsVoteRequest(
+                                noteId = event.postKey.id,
+                                choice = it,
+                            ),
+                    )
+                }
+
+            is PostEvent.Misskey.Favourite -> {
+                if (event.favourited) {
+                    service.notesFavoritesDelete(IPinRequest(noteId = event.postKey.id))
+                } else {
+                    service.notesFavoritesCreate(IPinRequest(noteId = event.postKey.id))
+                }
+            }
+
+            is PostEvent.Misskey.AcceptFollowRequest -> {
+                service.followingRequestsAccept(
+                    adminAccountsDeleteRequest = AdminAccountsDeleteRequest(userId = event.userKey.id),
+                )
+                updater.deleteFromCache(event.notificationStatusKey)
+                relationHandler.approveFollowRequest(event.userKey)
+            }
+
+            is PostEvent.Misskey.RejectFollowRequest -> {
+                service.followingRequestsReject(
+                    adminAccountsDeleteRequest = AdminAccountsDeleteRequest(userId = event.userKey.id),
+                )
+                updater.deleteFromCache(event.notificationStatusKey)
+                relationHandler.rejectFollowRequest(event.userKey)
+            }
+        }
+    }
+
     override fun homeTimeline() =
         HomeTimelineRemoteMediator(
             accountKey,
             service,
-            database,
-        )
-
-    fun localTimeline(
-        pageSize: Int = 20,
-        scope: CoroutineScope,
-    ): Flow<PagingData<UiTimeline>> =
-        timelinePager(
-            pageSize = pageSize,
-            database = database,
-            scope = scope,
-            filterFlow = localFilterRepository.getFlow(forTimeline = true),
-            accountRepository = accountRepository,
-            mediator = localTimelineLoader(),
         )
 
     fun localTimelineLoader() =
         LocalTimelineRemoteMediator(
             accountKey,
             service,
-            database,
         )
 
     fun hybridTimelineLoader() =
         HybridTimelineRemoteMediator(
             accountKey,
             service,
-            database,
-        )
-
-    fun publicTimeline(
-        pageSize: Int = 20,
-        scope: CoroutineScope,
-    ): Flow<PagingData<UiTimeline>> =
-        timelinePager(
-            pageSize = pageSize,
-            database = database,
-            scope = scope,
-            filterFlow = localFilterRepository.getFlow(forTimeline = true),
-            accountRepository = accountRepository,
-            mediator = publicTimelineLoader(),
         )
 
     fun publicTimelineLoader() =
         PublicTimelineRemoteMediator(
             accountKey,
             service,
-            database,
         )
 
     fun featuredChannels(scope: CoroutineScope): Flow<PagingData<UiList>> =
         Pager(
             config = pagingConfig,
         ) {
-            object : BasePagingSource<String, UiList>() {
-                override fun getRefreshKey(state: PagingState<String, UiList>): String? = null
-
-                override suspend fun doLoad(params: LoadParams<String>): LoadResult<String, UiList> {
-                    val result =
-                        service
-                            .channelsFeatured(
-                                request =
-                                    ChannelsFeaturedRequest(
-                                        limit = params.loadSize,
-                                    ),
+            object : RemoteLoader<UiList> {
+                override suspend fun load(
+                    pageSize: Int,
+                    request: PagingRequest,
+                ): PagingResult<UiList> =
+                    when (request) {
+                        is PagingRequest.Prepend,
+                        is PagingRequest.Append,
+                        ->
+                            PagingResult<UiList>(
+                                endOfPaginationReached = true,
                             )
-                    return LoadResult.Page(
-                        data =
-                            result.map {
-                                it.render(accountKey)
-                            },
-                        prevKey = null,
-                        nextKey = null,
-                    )
-                }
-            }
+                        PagingRequest.Refresh ->
+                            PagingResult(
+                                endOfPaginationReached = true,
+                                data =
+                                    service
+                                        .channelsFeatured(
+                                            request =
+                                                ChannelsFeaturedRequest(
+                                                    limit = pageSize,
+                                                ),
+                                        ).map {
+                                            it.render(accountKey)
+                                        },
+                            )
+                    }
+            }.toPagingSource()
         }.flow
             .cachedIn(scope)
             .let { channels ->
@@ -207,36 +365,22 @@ internal class MisskeyDataSource(
                 }
             }.cachedIn(scope)
 
-    override fun notification(
-        type: NotificationFilter,
-        pageSize: Int,
-        scope: CoroutineScope,
-    ): Flow<PagingData<UiTimeline>> =
-        timelinePager(
-            pageSize = pageSize,
-            database = database,
-            scope = scope,
-            filterFlow = localFilterRepository.getFlow(forNotification = true),
-            accountRepository = accountRepository,
-            mediator =
-                when (type) {
-                    NotificationFilter.All ->
-                        NotificationRemoteMediator(
-                            accountKey,
-                            service,
-                            database,
-                        )
+    override fun notification(type: NotificationFilter): RemoteLoader<UiTimelineV2> =
+        when (type) {
+            NotificationFilter.All ->
+                NotificationRemoteMediator(
+                    accountKey,
+                    service,
+                )
 
-                    NotificationFilter.Mention ->
-                        MentionTimelineRemoteMediator(
-                            accountKey,
-                            service,
-                            database,
-                        )
+            NotificationFilter.Mention ->
+                MentionTimelineRemoteMediator(
+                    accountKey,
+                    service,
+                )
 
-                    else -> throw IllegalStateException("Unsupported notification type")
-                },
-        )
+            else -> throw IllegalStateException("Unsupported notification type")
+        }
 
     override val supportedNotificationFilter: List<NotificationFilter>
         get() =
@@ -245,63 +389,6 @@ internal class MisskeyDataSource(
                 NotificationFilter.Mention,
             )
 
-    override fun userByAcct(acct: String): CacheData<UiProfile> {
-        val (name, host) = MicroBlogKey.valueOf(acct)
-        return Cacheable(
-            fetchSource = {
-                val user =
-                    service
-                        .usersShow(UsersShowRequest(username = name, host = host))
-                        .toDbUser(accountKey.host)
-                database.userDao().insert(user)
-            },
-            cacheSource = {
-                database
-                    .userDao()
-                    .findByHandleAndHost(name, host, PlatformType.Misskey)
-                    .distinctUntilChanged()
-                    .mapNotNull { it?.render(accountKey) }
-            },
-        )
-    }
-
-    override fun userById(id: String): CacheData<UiProfile> {
-        val userKey = MicroBlogKey(id, accountKey.host)
-        return Cacheable(
-            fetchSource = {
-                val user =
-                    service
-                        .usersShow(UsersShowRequest(userId = id))
-                        .toDbUser(accountKey.host)
-                database.userDao().insert(user)
-            },
-            cacheSource = {
-                database
-                    .userDao()
-                    .findByKey(userKey)
-                    .distinctUntilChanged()
-                    .mapNotNull { it?.render(accountKey) }
-            },
-        )
-    }
-
-    override fun relation(userKey: MicroBlogKey): Flow<UiState<UiRelation>> =
-        MemCacheable<UiRelation>(
-            relationKeyWithUserKey(userKey),
-        ) {
-            val user =
-                service
-                    .usersShow(UsersShowRequest(userId = userKey.id))
-            UiRelation(
-                following = user.isFollowing ?: false,
-                isFans = user.isFollowed ?: false,
-                blocking = user.isBlocking ?: false,
-                muted = user.isMuted ?: false,
-                hasPendingFollowRequestFromYou = user.hasPendingFollowRequestFromYou ?: false,
-                hasPendingFollowRequestToYou = user.hasPendingFollowRequestToYou ?: false,
-            )
-        }.toUi()
-
     override fun userTimeline(
         userKey: MicroBlogKey,
         mediaOnly: Boolean,
@@ -309,74 +396,17 @@ internal class MisskeyDataSource(
         accountKey,
         service,
         userKey,
-        database,
         onlyMedia = mediaOnly,
     )
 
     override fun context(statusKey: MicroBlogKey) =
         StatusDetailRemoteMediator(
             statusKey,
-            database,
             accountKey,
             service,
             statusOnly = false,
         )
 
-    override fun status(statusKey: MicroBlogKey): CacheData<UiTimeline> {
-        val pagingKey = "status_only_$statusKey"
-        return Cacheable(
-            fetchSource = {
-                val result =
-                    service
-                        .notesShow(
-                            IPinRequest(noteId = statusKey.id),
-                        )
-                Misskey.save(
-                    database = database,
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                    data = listOfNotNull(result),
-                )
-            },
-            cacheSource = {
-                database
-                    .statusDao()
-                    .get(statusKey, AccountType.Specific(accountKey))
-                    .distinctUntilChanged()
-                    .mapNotNull { it?.content?.render(this) }
-            },
-        )
-    }
-
-    override fun emoji(): Cacheable<ImmutableMap<String, ImmutableList<UiEmoji>>> =
-        Cacheable(
-            fetchSource = {
-                val emojis =
-                    service
-                        .emojis()
-                        .emojis
-                        .orEmpty()
-                        .toImmutableList()
-                database.emojiDao().insert(
-                    emojis.toDb(accountKey.host),
-                )
-            },
-            cacheSource = {
-                database
-                    .emojiDao()
-                    .get(accountKey.host)
-                    .distinctUntilChanged()
-                    .mapNotNull {
-                        it
-                            ?.toUi()
-                            ?.groupBy { it.category }
-                            ?.map { it.key to it.value.toImmutableList() }
-                            ?.toMap()
-                            ?.toImmutableMap()
-                    }
-            },
-        )
-
     override suspend fun compose(
         data: ComposeData,
         progress: (ComposeProgress) -> Unit,
@@ -453,144 +483,6 @@ internal class MisskeyDataSource(
 //        progress(ComposeProgress(maxProgress, maxProgress))
     }
 
-    override fun renote(statusKey: MicroBlogKey) {
-        coroutineScope.launch {
-            updateStatusUseCase<StatusContent.Misskey>(
-                statusKey = statusKey,
-                accountKey = accountKey,
-                cacheDatabase = database,
-                update = {
-                    it.copy(
-                        data =
-                            it.data.copy(
-                                renoteCount = it.data.renoteCount + 1,
-                            ),
-                    )
-                },
-            )
-            tryRun {
-                service.notesCreate(
-                    NotesCreateRequest(
-                        renoteId = statusKey.id,
-                    ),
-                )
-            }.onFailure {
-                updateStatusUseCase<StatusContent.Misskey>(
-                    statusKey = statusKey,
-                    accountKey = accountKey,
-                    cacheDatabase = database,
-                    update = {
-                        it.copy(
-                            data =
-                                it.data.copy(
-                                    renoteCount = it.data.renoteCount - 1,
-                                ),
-                        )
-                    },
-                )
-            }
-        }
-    }
-
-    override suspend fun deleteStatus(statusKey: MicroBlogKey) {
-        tryRun {
-            service.notesDelete(
-                IPinRequest(
-                    noteId = statusKey.id,
-                ),
-            )
-
-            // delete status from cache
-            database.connect {
-                database.statusDao().delete(
-                    statusKey = statusKey,
-                    accountType = AccountType.Specific(accountKey),
-                )
-                database.statusReferenceDao().delete(statusKey)
-                database.pagingTimelineDao().deleteStatus(
-                    accountKey = accountKey,
-                    statusKey = statusKey,
-                )
-            }
-        }
-    }
-
-    override fun react(
-        statusKey: MicroBlogKey,
-        hasReacted: Boolean,
-        reaction: String,
-    ) {
-        coroutineScope.launch {
-            updateStatusUseCase<StatusContent.Misskey>(
-                statusKey,
-                accountKey,
-                database,
-            ) {
-                it.copy(
-                    data =
-                        it.data.copy(
-                            myReaction = if (hasReacted) null else reaction,
-                            reactions =
-                                it.data.reactions.toMutableMap().apply {
-                                    if (hasReacted) {
-                                        val current = it.data.reactions[reaction] ?: 0
-                                        if (current > 1) {
-                                            put(reaction, current - 1)
-                                        } else {
-                                            remove(reaction)
-                                        }
-                                    } else {
-                                        put(reaction, it.data.reactions[reaction]?.plus(1) ?: 1)
-                                    }
-                                },
-                        ),
-                )
-            }
-            tryRun {
-                if (hasReacted) {
-                    service.notesReactionsDelete(
-                        IPinRequest(
-                            noteId = statusKey.id,
-                        ),
-                    )
-                } else {
-                    service.notesReactionsCreate(
-                        NotesReactionsCreateRequest(
-                            noteId = statusKey.id,
-                            reaction = reaction,
-                        ),
-                    )
-                }
-            }.onFailure {
-                updateStatusUseCase<StatusContent.Misskey>(
-                    statusKey,
-                    accountKey,
-                    database,
-                ) {
-                    it.copy(
-                        data =
-                            it.data.copy(
-                                myReaction = if (hasReacted) reaction else null,
-                                reactions =
-                                    it.data.reactions.toMutableMap().apply {
-                                        if (hasReacted) {
-                                            put(reaction, it.data.reactions[reaction]?.plus(1) ?: 1)
-                                        } else {
-                                            val current = it.data.reactions[reaction] ?: 0
-                                            if (current > 1) {
-                                                put(reaction, current - 1)
-                                            } else {
-                                                remove(reaction)
-                                            }
-                                        }
-                                    },
-                            ),
-                    )
-                }
-            }
-        }
-    }
-
     suspend fun report(
         userKey: MicroBlogKey,
         statusKey: MicroBlogKey?,
@@ -629,185 +521,36 @@ internal class MisskeyDataSource(
         }
     }
 
-    suspend fun unfollow(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                following = false,
-            )
-        }
-        tryRun {
-            service.followingDelete(AdminAccountsDeleteRequest(userId = userKey.id))
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    following = true,
-                )
-            }
-        }
-    }
-
-    suspend fun follow(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                following = true,
-            )
-        }
-        tryRun {
-            service.followingCreate(AdminAccountsDeleteRequest(userId = userKey.id))
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    following = false,
-                )
-            }
-        }
-    }
-
-    override suspend fun block(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                blocking = true,
-            )
-        }
-        tryRun {
-            service.blockingCreate(AdminAccountsDeleteRequest(userId = userKey.id))
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    blocking = false,
-                )
-            }
-        }
-    }
-
-    suspend fun unblock(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                blocking = false,
-            )
-        }
-        tryRun {
-            service.blockingDelete(AdminAccountsDeleteRequest(userId = userKey.id))
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    blocking = true,
-                )
-            }
-        }
-    }
-
-    override suspend fun mute(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                muted = true,
-            )
-        }
-        tryRun {
-            service.muteCreate(MuteCreateRequest(userId = userKey.id))
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    muted = false,
-                )
-            }
-        }
-    }
-
-    suspend fun unmute(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                muted = false,
-            )
-        }
-        tryRun {
-            service.muteDelete(AdminAccountsDeleteRequest(userId = userKey.id))
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    muted = true,
-                )
-            }
-        }
-    }
-
     override fun searchStatus(query: String) =
         SearchStatusRemoteMediator(
             service,
-            database,
             accountKey,
             query,
         )
 
-    override fun searchUser(
-        query: String,
-        pageSize: Int,
-    ): Flow<PagingData<UiProfile>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            SearchUserPagingSource(
-                service,
-                accountKey,
-                query,
-            )
-        }.flow
+    override fun searchUser(query: String): RemoteLoader<UiProfile> =
+        SearchUserPagingSource(
+            service,
+            accountKey,
+            query,
+        )
 
-    override fun discoverUsers(pageSize: Int): Flow<PagingData<UiProfile>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            TrendsUserPagingSource(
-                service,
-                accountKey,
-            )
-        }.flow
+    override fun discoverUsers(): RemoteLoader<UiProfile> =
+        TrendsUserPagingSource(
+            service,
+            accountKey,
+        )
 
     override fun discoverStatuses() =
         DiscoverStatusRemoteMediator(
             service,
-            database,
             accountKey,
         )
 
-    override fun discoverHashtags(pageSize: Int): Flow<PagingData<UiHashtag>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            TrendHashtagPagingSource(
-                service,
-            )
-        }.flow
+    override fun discoverHashtags(): RemoteLoader<UiHashtag> =
+        TrendHashtagPagingSource(
+            service,
+        )
 
     override fun composeConfig(type: ComposeType): ComposeConfig =
         ComposeConfig(
@@ -820,149 +563,12 @@ internal class MisskeyDataSource(
                     allowMediaOnly = true,
                 ),
             poll = ComposeConfig.Poll(9),
-            emoji = ComposeConfig.Emoji(emoji(), "misskey@${accountKey.host}"),
+            emoji = ComposeConfig.Emoji(emojiHandler.emoji, "misskey@${accountKey.host}"),
             contentWarning = ComposeConfig.ContentWarning,
             visibility = ComposeConfig.Visibility,
         )
 
-    override suspend fun follow(
-        userKey: MicroBlogKey,
-        relation: UiRelation,
-    ) {
-        when {
-            relation.following -> unfollow(userKey)
-            relation.blocking -> unblock(userKey)
-            relation.hasPendingFollowRequestFromYou -> Unit // TODO: cancel follow request
-            else -> follow(userKey)
-        }
-    }
-
-    override fun profileActions(): List<ProfileAction> =
-        listOf(
-            object : ProfileAction.Mute {
-                override suspend fun invoke(
-                    userKey: MicroBlogKey,
-                    relation: UiRelation,
-                ) {
-                    if (relation.muted) {
-                        unmute(userKey)
-                    } else {
-                        mute(userKey)
-                    }
-                }
-
-                override fun relationState(relation: UiRelation): Boolean = relation.muted
-            },
-            object : ProfileAction.Block {
-                override suspend fun invoke(
-                    userKey: MicroBlogKey,
-                    relation: UiRelation,
-                ) {
-                    if (relation.blocking) {
-                        unblock(userKey)
-                    } else {
-                        block(userKey)
-                    }
-                }
-
-                override fun relationState(relation: UiRelation): Boolean = relation.blocking
-            },
-        )
-
-    override fun vote(
-        statusKey: MicroBlogKey,
-        options: List<Int>,
-    ) {
-        coroutineScope.launch {
-            updateStatusUseCase<StatusContent.Misskey>(
-                statusKey,
-                accountKey,
-                database,
-            ) {
-                it.copy(
-                    data =
-                        it.data.copy(
-                            poll =
-                                it.data.poll?.copy(
-                                    choices =
-                                        it.data.poll.choices.mapIndexed { index, choice ->
-                                            if (options.contains(index)) {
-                                                choice.copy(
-                                                    votes = choice.votes + 1,
-                                                    isVoted = true,
-                                                )
-                                            } else {
-                                                choice
-                                            }
-                                        },
-                                ),
-                        ),
-                )
-            }
-            tryRun {
-                options.forEach {
-                    service.notesPollsVote(
-                        notesPollsVoteRequest =
-                            NotesPollsVoteRequest(
-                                noteId = statusKey.id,
-                                choice = it,
-                            ),
-                    )
-                }
-            }.onFailure {
-                updateStatusUseCase<StatusContent.Misskey>(
-                    statusKey,
-                    accountKey,
-                    database,
-                ) {
-                    it.copy(
-                        data =
-                            it.data.copy(
-                                poll =
-                                    it.data.poll?.copy(
-                                        choices =
-                                            it.data.poll.choices.mapIndexed { index, choice ->
-                                                if (options.contains(index)) {
-                                                    choice.copy(
-                                                        votes = choice.votes - 1,
-                                                        isVoted = false,
-                                                    )
-                                                } else {
-                                                    choice
-                                                }
-                                            },
-                                    ),
-                            ),
-                    )
-                }
-            }
-        }
-    }
-
-    override fun favourite(
-        statusKey: MicroBlogKey,
-        favourited: Boolean,
-    ) {
-        coroutineScope.launch {
-            tryRun {
-                if (favourited) {
-                    service.notesFavoritesDelete(
-                        IPinRequest(
-                            noteId = statusKey.id,
-                        ),
-                    )
-                } else {
-                    service.notesFavoritesCreate(
-                        IPinRequest(
-                            noteId = statusKey.id,
-                        ),
-                    )
-                }
-            }
-        }
-    }
-
-    override fun favouriteState(statusKey: MicroBlogKey): Flow<Boolean> =
+    fun favouriteState(statusKey: MicroBlogKey): Flow<Boolean> =
         flow {
             tryRun {
                 service.notesState(
@@ -980,35 +586,19 @@ internal class MisskeyDataSource(
             )
         }
 
-    override fun following(
-        userKey: MicroBlogKey,
-        scope: CoroutineScope,
-        pageSize: Int,
-    ): Flow<PagingData<UiProfile>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            FollowingPagingSource(
-                service = service,
-                userKey = userKey,
-                accountKey = accountKey,
-            )
-        }.flow.cachedIn(scope)
+    override fun following(userKey: MicroBlogKey): RemoteLoader<UiProfile> =
+        FollowingPagingSource(
+            service = service,
+            userKey = userKey,
+            accountKey = accountKey,
+        )
 
-    override fun fans(
-        userKey: MicroBlogKey,
-        scope: CoroutineScope,
-        pageSize: Int,
-    ): Flow<PagingData<UiProfile>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            FansPagingSource(
-                service = service,
-                userKey = userKey,
-                accountKey = accountKey,
-            )
-        }.flow.cachedIn(scope)
+    override fun fans(userKey: MicroBlogKey): RemoteLoader<UiProfile> =
+        FansPagingSource(
+            service = service,
+            userKey = userKey,
+            accountKey = accountKey,
+        )
 
     override fun profileTabs(userKey: MicroBlogKey): ImmutableList<ProfileTab> =
         listOfNotNull(
@@ -1019,7 +609,6 @@ internal class MisskeyDataSource(
                         accountKey = accountKey,
                         service = service,
                         userKey = userKey,
-                        database = database,
                         withPinned = true,
                     ),
             ),
@@ -1029,7 +618,6 @@ internal class MisskeyDataSource(
                     UserTimelineRemoteMediator(
                         service = service,
                         accountKey = accountKey,
-                        database = database,
                         userKey = userKey,
                         withReplies = true,
                     ),
@@ -1037,23 +625,9 @@ internal class MisskeyDataSource(
             ProfileTab.Media,
         ).toPersistentList()
 
-    fun favouriteTimeline(
-        pageSize: Int = 20,
-        scope: CoroutineScope,
-    ): Flow<PagingData<UiTimeline>> =
-        timelinePager(
-            pageSize = pageSize,
-            database = database,
-            scope = scope,
-            filterFlow = localFilterRepository.getFlow(forTimeline = true),
-            accountRepository = accountRepository,
-            mediator = favouriteTimelineLoader(),
-        )
-
     fun favouriteTimelineLoader() =
         FavouriteTimelineRemoteMediator(
             service = service,
-            database = database,
             accountKey = accountKey,
         )
 
@@ -1064,7 +638,6 @@ internal class MisskeyDataSource(
         ListTimelineRemoteMediator(
             listId,
             service,
-            database,
             accountKey,
         )
 
@@ -1173,95 +746,18 @@ internal class MisskeyDataSource(
         }
     }
 
-    override fun acceptFollowRequest(
-        userKey: MicroBlogKey,
-        notificationStatusKey: MicroBlogKey,
-    ) {
-        coroutineScope.launch {
-            tryRun {
-                MemCacheable.updateWith<UiRelation>(
-                    key = relationKeyWithUserKey(userKey),
-                ) {
-                    it.copy(
-                        hasPendingFollowRequestToYou = false,
-                        isFans = true,
-                    )
-                }
-                service.followingRequestsAccept(
-                    adminAccountsDeleteRequest =
-                        AdminAccountsDeleteRequest(
-                            userId = userKey.id,
-                        ),
-                )
-            }.onFailure {
-                MemCacheable.updateWith<UiRelation>(
-                    key = relationKeyWithUserKey(userKey),
-                ) {
-                    it.copy(
-                        hasPendingFollowRequestToYou = true,
-                        isFans = false,
-                    )
-                }
-            }.onSuccess {
-                database.pagingTimelineDao().deleteStatus(
-                    accountKey = accountKey,
-                    statusKey = notificationStatusKey,
-                )
-            }
-        }
-    }
-
-    override fun rejectFollowRequest(
-        userKey: MicroBlogKey,
-        notificationStatusKey: MicroBlogKey,
-    ) {
-        coroutineScope.launch {
-            tryRun {
-                MemCacheable.updateWith<UiRelation>(
-                    key = relationKeyWithUserKey(userKey),
-                ) {
-                    it.copy(
-                        hasPendingFollowRequestToYou = false,
-                        isFans = false,
-                    )
-                }
-                service.followingRequestsReject(
-                    adminAccountsDeleteRequest =
-                        AdminAccountsDeleteRequest(
-                            userId = userKey.id,
-                        ),
-                )
-            }.onFailure {
-                MemCacheable.updateWith<UiRelation>(
-                    key = relationKeyWithUserKey(userKey),
-                ) {
-                    it.copy(
-                        hasPendingFollowRequestToYou = true,
-                        isFans = false,
-                    )
-                }
-            }.onSuccess {
-                database.pagingTimelineDao().deleteStatus(
-                    accountKey = accountKey,
-                    statusKey = notificationStatusKey,
-                )
-            }
-        }
-    }
-
     fun antennasList(): Flow<PagingData<UiList>> =
         Pager(
             config = pagingConfig,
         ) {
             AntennasListPagingSource(
                 service = service,
-            )
+            ).toPagingSource()
         }.flow
 
     fun antennasTimelineLoader(id: String) =
         AntennasTimelineRemoteMediator(
             service = service,
-            database = database,
             accountKey = accountKey,
             id = id,
         )
@@ -1269,7 +765,6 @@ internal class MisskeyDataSource(
     fun channelTimelineLoader(id: String) =
         ChannelTimelineRemoteMediator(
             service = service,
-            database = database,
             accountKey = accountKey,
             id = id,
         )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyLoader.kt
new file mode 100644
index 000000000..b712cb84d
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyLoader.kt
@@ -0,0 +1,111 @@
+package dev.dimension.flare.data.datasource.misskey
+
+import dev.dimension.flare.data.datasource.microblog.loader.EmojiLoader
+import dev.dimension.flare.data.datasource.microblog.loader.NotificationLoader
+import dev.dimension.flare.data.datasource.microblog.loader.PostLoader
+import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
+import dev.dimension.flare.data.datasource.microblog.loader.UserLoader
+import dev.dimension.flare.data.network.misskey.MisskeyService
+import dev.dimension.flare.data.network.misskey.api.model.AdminAccountsDeleteRequest
+import dev.dimension.flare.data.network.misskey.api.model.INotificationsRequest
+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.UsersShowRequest
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiEmoji
+import dev.dimension.flare.ui.model.UiProfile
+import dev.dimension.flare.ui.model.UiRelation
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
+import dev.dimension.flare.ui.model.mapper.toUi
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.collections.immutable.toImmutableMap
+
+internal class MisskeyLoader(
+    override val accountKey: MicroBlogKey,
+    private val service: MisskeyService,
+) : NotificationLoader,
+    UserLoader,
+    PostLoader,
+    RelationLoader,
+    EmojiLoader {
+    override suspend fun notificationBadgeCount(): Int =
+        service
+            .iNotifications(
+                INotificationsRequest(
+                    limit = 1,
+                ),
+            ).size
+
+    override suspend fun userByHandleAndHost(
+        handle: String,
+        host: String,
+    ): UiProfile = service.usersShow(UsersShowRequest(username = handle, host = host)).render(accountKey)
+
+    override suspend fun userById(id: String): UiProfile = service.usersShow(UsersShowRequest(userId = id)).render(accountKey)
+
+    override suspend fun status(statusKey: MicroBlogKey): UiTimelineV2 =
+        service
+            .notesShow(
+                IPinRequest(noteId = statusKey.id),
+            ).render(accountKey)
+
+    override suspend fun deleteStatus(statusKey: MicroBlogKey) {
+        service.notesDelete(
+            IPinRequest(
+                noteId = statusKey.id,
+            ),
+        )
+    }
+
+    override suspend fun relation(userKey: MicroBlogKey): UiRelation {
+        val user = service.usersShow(UsersShowRequest(userId = userKey.id))
+        return UiRelation(
+            following = user.isFollowing ?: false,
+            isFans = user.isFollowed ?: false,
+            blocking = user.isBlocking ?: false,
+            muted = user.isMuted ?: false,
+            hasPendingFollowRequestFromYou = user.hasPendingFollowRequestFromYou ?: false,
+            hasPendingFollowRequestToYou = user.hasPendingFollowRequestToYou ?: false,
+        )
+    }
+
+    override suspend fun follow(userKey: MicroBlogKey) {
+        service.followingCreate(AdminAccountsDeleteRequest(userId = userKey.id))
+    }
+
+    override suspend fun unfollow(userKey: MicroBlogKey) {
+        service.followingDelete(AdminAccountsDeleteRequest(userId = userKey.id))
+    }
+
+    override suspend fun block(userKey: MicroBlogKey) {
+        service.blockingCreate(AdminAccountsDeleteRequest(userId = userKey.id))
+    }
+
+    override suspend fun unblock(userKey: MicroBlogKey) {
+        service.blockingDelete(AdminAccountsDeleteRequest(userId = userKey.id))
+    }
+
+    override suspend fun mute(userKey: MicroBlogKey) {
+        service.muteCreate(MuteCreateRequest(userId = userKey.id))
+    }
+
+    override suspend fun unmute(userKey: MicroBlogKey) {
+        service.muteDelete(AdminAccountsDeleteRequest(userId = userKey.id))
+    }
+
+    override suspend fun emojis(): ImmutableMap<String, ImmutableList<UiEmoji>> =
+        service
+            .emojis()
+            .emojis
+            .orEmpty()
+            .map {
+                it.toUi()
+            }.groupBy { it.category }
+            .map { (category, value) ->
+                category to value.toImmutableList()
+            }.toMap()
+            .toImmutableMap()
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/NotificationRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/NotificationRemoteMediator.kt
index 7aba2c3d9..993098c26 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/NotificationRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/NotificationRemoteMediator.kt
@@ -1,30 +1,26 @@
 package dev.dimension.flare.data.datasource.misskey
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDb
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.misskey.MisskeyService
 import dev.dimension.flare.data.network.misskey.api.model.INotificationsRequest
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class NotificationRemoteMediator(
     private val accountKey: MicroBlogKey,
     private val service: MisskeyService,
-    database: CacheDatabase,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey = "notification_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 is PagingRequest.Prepend -> return PagingResult(
@@ -51,10 +47,7 @@ internal class NotificationRemoteMediator(
         return PagingResult(
             endOfPaginationReached = response.isEmpty(),
             data =
-                response.toDb(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+                response.render(accountKey),
             nextKey = response.lastOrNull()?.id,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/PublicTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/PublicTimelineRemoteMediator.kt
index 0e54e4601..061600df0 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/PublicTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/PublicTimelineRemoteMediator.kt
@@ -1,30 +1,26 @@
 package dev.dimension.flare.data.datasource.misskey
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.misskey.MisskeyService
 import dev.dimension.flare.data.network.misskey.api.model.NotesGlobalTimelineRequest
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class PublicTimelineRemoteMediator(
     private val accountKey: MicroBlogKey,
     private val service: MisskeyService,
-    database: CacheDatabase,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey = "public_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 is PagingRequest.Prepend -> return PagingResult(
@@ -51,10 +47,7 @@ internal class PublicTimelineRemoteMediator(
         return PagingResult(
             endOfPaginationReached = response.isEmpty(),
             data =
-                response.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+                response.render(accountKey),
             nextKey = response.lastOrNull()?.id,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/SearchStatusRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/SearchStatusRemoteMediator.kt
index ab5f7e6c7..85686a7f3 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/SearchStatusRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/SearchStatusRemoteMediator.kt
@@ -1,25 +1,21 @@
 package dev.dimension.flare.data.datasource.misskey
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.misskey.MisskeyService
 import dev.dimension.flare.data.network.misskey.api.model.NotesSearchRequest
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class SearchStatusRemoteMediator(
     private val service: MisskeyService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
     private val query: String,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String =
         buildString {
             append("search_")
@@ -27,10 +23,10 @@ internal class SearchStatusRemoteMediator(
             append(accountKey.toString())
         }
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 is PagingRequest.Prepend -> {
@@ -63,10 +59,7 @@ internal class SearchStatusRemoteMediator(
         return PagingResult(
             endOfPaginationReached = response.isEmpty(),
             data =
-                response.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                ),
+                response.render(accountKey),
             nextKey = response.lastOrNull()?.id,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/SearchUserPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/SearchUserPagingSource.kt
index e4bd78769..bd0c971da 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/SearchUserPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/SearchUserPagingSource.kt
@@ -1,7 +1,8 @@
 package dev.dimension.flare.data.datasource.misskey
 
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.misskey.MisskeyService
 import dev.dimension.flare.data.network.misskey.api.model.UsersSearchRequest
 import dev.dimension.flare.model.MicroBlogKey
@@ -12,28 +13,32 @@ internal class SearchUserPagingSource(
     private val service: MisskeyService,
     private val accountKey: MicroBlogKey,
     private val query: String,
-) : BasePagingSource<Int, UiProfile>() {
-    override fun getRefreshKey(state: PagingState<Int, UiProfile>): Int? = null
-
-    override suspend fun doLoad(params: LoadParams<Int>): LoadResult<Int, UiProfile> {
-        service
-            .usersSearch(
+) : RemoteLoader<UiProfile> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiProfile> {
+        val offset =
+            when (request) {
+                PagingRequest.Refresh -> 0
+                is PagingRequest.Prepend -> {
+                    return PagingResult(
+                        endOfPaginationReached = true,
+                    )
+                }
+                is PagingRequest.Append -> request.nextKey.toIntOrNull() ?: 0
+            }
+        val response =
+            service.usersSearch(
                 UsersSearchRequest(
                     query = query,
-                    limit = params.loadSize,
-                    offset = params.key ?: 0,
+                    limit = pageSize,
+                    offset = offset,
                 ),
-            ).let {
-                return LoadResult.Page(
-                    data = it.map { it.render(accountKey) },
-                    prevKey = null,
-                    nextKey =
-                        if (it.isEmpty()) {
-                            null
-                        } else {
-                            (params.key ?: 0) + params.loadSize
-                        },
-                )
-            }
+            )
+        return PagingResult(
+            data = response.map { it.render(accountKey) },
+            nextKey = if (response.isEmpty()) null else (offset + pageSize).toString(),
+        )
     }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/StatusDetailRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/StatusDetailRemoteMediator.kt
index 76105d9b9..ad47311cd 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/StatusDetailRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/StatusDetailRemoteMediator.kt
@@ -1,13 +1,10 @@
 package dev.dimension.flare.data.datasource.misskey
 
-import SnowflakeIdGenerator
 import androidx.paging.ExperimentalPagingApi
 import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.connect
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
 import dev.dimension.flare.data.database.cache.model.DbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.misskey.MisskeyService
@@ -15,18 +12,22 @@ import dev.dimension.flare.data.network.misskey.api.model.IPinRequest
 import dev.dimension.flare.data.network.misskey.api.model.NotesChildrenRequest
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 import kotlinx.coroutines.flow.firstOrNull
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+import kotlin.getValue
 
 @OptIn(ExperimentalPagingApi::class)
 internal class StatusDetailRemoteMediator(
     private val statusKey: MicroBlogKey,
-    private val database: CacheDatabase,
     private val accountKey: MicroBlogKey,
     private val service: MisskeyService,
     private val statusOnly: Boolean,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2>,
+    KoinComponent {
+    private val database: CacheDatabase by inject()
     override val pagingKey: String =
         buildString {
             append("status_detail_")
@@ -38,10 +39,10 @@ internal class StatusDetailRemoteMediator(
             append(accountKey.toString())
         }
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val result =
             when (request) {
                 is PagingRequest.Append -> {
@@ -105,13 +106,7 @@ internal class StatusDetailRemoteMediator(
         return PagingResult(
             endOfPaginationReached = statusOnly || result.isEmpty(),
             data =
-                result.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                    sortIdProvider = {
-                        -SnowflakeIdGenerator.nextId()
-                    },
-                ),
+                result.render(accountKey),
             nextKey =
                 if (request == PagingRequest.Refresh) {
                     ""
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/TrendHashtagPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/TrendHashtagPagingSource.kt
index d0812feb4..73fd00ce4 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/TrendHashtagPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/TrendHashtagPagingSource.kt
@@ -1,30 +1,34 @@
 package dev.dimension.flare.data.datasource.misskey
 
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.misskey.MisskeyService
 import dev.dimension.flare.ui.model.UiHashtag
 
 internal class TrendHashtagPagingSource(
     private val service: MisskeyService,
-) : BasePagingSource<Int, UiHashtag>() {
-    override fun getRefreshKey(state: PagingState<Int, UiHashtag>): Int? = null
-
-    override suspend fun doLoad(params: LoadParams<Int>): LoadResult<Int, UiHashtag> {
-        service
-            .hashtagsTrend()
-            .map {
+) : RemoteLoader<UiHashtag> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiHashtag> {
+        if (request is PagingRequest.Prepend || request is PagingRequest.Append) {
+            return PagingResult(
+                endOfPaginationReached = true,
+            )
+        }
+        val data =
+            service.hashtagsTrend().map {
                 UiHashtag(
                     hashtag = it.tag,
                     description = null,
                     searchContent = "#${it.tag}",
                 )
-            }.let {
-                return LoadResult.Page(
-                    data = it,
-                    prevKey = null,
-                    nextKey = null,
-                )
             }
+        return PagingResult(
+            endOfPaginationReached = true,
+            data = data,
+        )
     }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/TrendsUserPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/TrendsUserPagingSource.kt
index e1cdbdf7e..10deabd2c 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/TrendsUserPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/TrendsUserPagingSource.kt
@@ -1,7 +1,8 @@
 package dev.dimension.flare.data.datasource.misskey
 
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.misskey.MisskeyService
 import dev.dimension.flare.data.network.misskey.api.model.PinnedUsersRequest
 import dev.dimension.flare.model.MicroBlogKey
@@ -11,20 +12,23 @@ import dev.dimension.flare.ui.model.mapper.render
 internal class TrendsUserPagingSource(
     private val service: MisskeyService,
     private val accountKey: MicroBlogKey,
-) : BasePagingSource<Int, UiProfile>() {
-    override fun getRefreshKey(state: PagingState<Int, UiProfile>): Int? = null
-
-    override suspend fun doLoad(params: LoadParams<Int>): LoadResult<Int, UiProfile> {
-        service
-            .pinnedUsers(PinnedUsersRequest(limit = params.loadSize))
-            .map {
+) : RemoteLoader<UiProfile> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiProfile> {
+        if (request is PagingRequest.Prepend || request is PagingRequest.Append) {
+            return PagingResult(
+                endOfPaginationReached = true,
+            )
+        }
+        val data =
+            service.pinnedUsers(PinnedUsersRequest(limit = pageSize)).map {
                 it.render(accountKey)
-            }.let {
-                return LoadResult.Page(
-                    data = it,
-                    prevKey = null,
-                    nextKey = null,
-                )
             }
+        return PagingResult(
+            endOfPaginationReached = true,
+            data = data,
+        )
     }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/UserTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/UserTimelineRemoteMediator.kt
index 5eccba686..2df5bc1a2 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/UserTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/UserTimelineRemoteMediator.kt
@@ -1,30 +1,25 @@
 package dev.dimension.flare.data.datasource.misskey
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.misskey.MisskeyService
 import dev.dimension.flare.data.network.misskey.api.model.UsersNotesRequest
 import dev.dimension.flare.data.network.misskey.api.model.UsersShowRequest
 import dev.dimension.flare.model.MicroBlogKey
-import kotlin.time.Instant
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class UserTimelineRemoteMediator(
     private val accountKey: MicroBlogKey,
     private val service: MisskeyService,
     private val userKey: MicroBlogKey,
-    database: CacheDatabase,
     private val onlyMedia: Boolean = false,
     private val withReplies: Boolean = false,
     private val withPinned: Boolean = false,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     var pinnedIds = emptyList<String>()
 
     override val pagingKey: String
@@ -44,10 +39,10 @@ internal class UserTimelineRemoteMediator(
                 append(userKey.toString())
             }
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 is PagingRequest.Prepend -> return PagingResult(
@@ -123,20 +118,7 @@ internal class UserTimelineRemoteMediator(
         return PagingResult(
             endOfPaginationReached = response.isEmpty(),
             data =
-                response.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                    sortIdProvider = {
-                        if (it.id in pinnedIds) {
-                            Long.MAX_VALUE
-                        } else {
-                            Instant.parse(it.createdAt).toEpochMilliseconds()
-                        }
-                    },
-                    pinnedProvider = {
-                        it.id in pinnedIds
-                    },
-                ),
+                response.render(accountKey),
             nextKey = response.lastOrNull()?.id,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt
index 830e04b57..d3a9621a7 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt
@@ -2,9 +2,8 @@ package dev.dimension.flare.ui.model.mapper
 
 import com.fleeksoft.ksoup.nodes.Element
 import com.fleeksoft.ksoup.nodes.TextNode
-import dev.dimension.flare.data.database.cache.model.StatusContent
 import dev.dimension.flare.data.datasource.microblog.ActionMenu
-import dev.dimension.flare.data.datasource.microblog.StatusEvent
+import dev.dimension.flare.data.datasource.microblog.PostEvent
 import dev.dimension.flare.data.datasource.microblog.userActionsMenu
 import dev.dimension.flare.data.network.misskey.api.model.Antenna
 import dev.dimension.flare.data.network.misskey.api.model.Channel
@@ -21,9 +20,10 @@ import dev.dimension.flare.data.network.misskey.api.model.Visibility
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
-import dev.dimension.flare.model.ReferenceType
+import dev.dimension.flare.model.toAccountType
 import dev.dimension.flare.ui.model.ClickEvent
 import dev.dimension.flare.ui.model.UiEmoji
+import dev.dimension.flare.ui.model.UiIcon
 import dev.dimension.flare.ui.model.UiInstance
 import dev.dimension.flare.ui.model.UiInstanceMetadata
 import dev.dimension.flare.ui.model.UiList
@@ -31,7 +31,7 @@ import dev.dimension.flare.ui.model.UiMedia
 import dev.dimension.flare.ui.model.UiNumber
 import dev.dimension.flare.ui.model.UiPoll
 import dev.dimension.flare.ui.model.UiProfile
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.render.toUi
 import dev.dimension.flare.ui.route.DeeplinkRoute
 import dev.dimension.flare.ui.route.toUri
@@ -39,7 +39,6 @@ import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.collections.immutable.toPersistentList
-import kotlinx.coroutines.flow.map
 import moe.tlaster.mfm.parser.MFMParser
 import moe.tlaster.mfm.parser.tree.BoldNode
 import moe.tlaster.mfm.parser.tree.CashNode
@@ -63,166 +62,151 @@ import moe.tlaster.mfm.parser.tree.UrlNode
 import kotlin.math.roundToLong
 import kotlin.time.Instant
 
-internal fun Notification.render(
-    accountKey: MicroBlogKey,
-    event: StatusEvent.Misskey,
-    references: Map<ReferenceType, List<StatusContent>>,
-): UiTimeline {
+internal fun List<Note>.render(accountKey: MicroBlogKey): List<UiTimelineV2> = map { it.render(accountKey) }
+
+internal fun List<Notification>.render(accountKey: MicroBlogKey): List<UiTimelineV2> = map { it.render(accountKey) }
+
+internal fun Notification.render(accountKey: MicroBlogKey): UiTimelineV2 {
     val user = user?.render(accountKey)
     val notificationType =
         runCatching {
             NotificationType.entries.first { it.value == type }
         }.getOrNull()
-    val topMessageType =
+    val createdAt = Instant.parse(createdAt).toUi()
+    val statusKey = MicroBlogKey(id, accountKey.host)
+    val messageType =
         when (notificationType) {
             NotificationType.Follow ->
-                UiTimeline.TopMessage.MessageType.Misskey
-                    .Follow(id = id)
-
+                UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.Follow)
             NotificationType.Mention ->
-                UiTimeline.TopMessage.MessageType.Misskey
-                    .Mention(id = id)
-
+                UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.Mention)
             NotificationType.Reply ->
-                UiTimeline.TopMessage.MessageType.Misskey
-                    .Reply(id = id)
-
+                UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.Reply)
             NotificationType.Renote ->
-                UiTimeline.TopMessage.MessageType.Misskey
-                    .Renote(id = id)
-
+                UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.Repost)
             NotificationType.Quote ->
-                UiTimeline.TopMessage.MessageType.Misskey
-                    .Quote(id = id)
-
+                UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.Quote)
             NotificationType.Reaction ->
-                UiTimeline.TopMessage.MessageType.Misskey
-                    .Reaction(id = id)
-
+                UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.Reaction)
             NotificationType.PollEnded ->
-                UiTimeline.TopMessage.MessageType.Misskey
-                    .PollEnded(id = id)
-
+                UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.PollEnded)
             NotificationType.ReceiveFollowRequest ->
-                UiTimeline.TopMessage.MessageType.Misskey
-                    .ReceiveFollowRequest(id = id)
-
+                UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.FollowRequest)
             NotificationType.FollowRequestAccepted ->
-                UiTimeline.TopMessage.MessageType.Misskey
-                    .FollowRequestAccepted(id = id)
-
+                UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.FollowRequestAccepted)
             NotificationType.AchievementEarned ->
-                UiTimeline.TopMessage.MessageType.Misskey.AchievementEarned(
-                    id = id,
-                    achievement =
-                        achievement?.let {
-                            MisskeyAchievement.fromString(it)
-                        },
+                UiTimelineV2.Message.Type.Localized(
+                    UiTimelineV2.Message.Type.Localized.MessageId.AchievementEarned,
+                    listOfNotNull(achievement).toPersistentList(),
                 )
-
             NotificationType.App ->
-                UiTimeline.TopMessage.MessageType.Misskey
-                    .App(id = id)
-
-            else ->
-                UiTimeline.TopMessage.MessageType.Misskey
-                    .UnKnown(id = id, type = type)
-        }
-    val icon =
-        when (notificationType) {
-            NotificationType.Follow -> UiTimeline.TopMessage.Icon.Follow
-            NotificationType.Mention -> UiTimeline.TopMessage.Icon.Mention
-            NotificationType.Reply -> UiTimeline.TopMessage.Icon.Reply
-            NotificationType.Renote -> UiTimeline.TopMessage.Icon.Retweet
-            NotificationType.Quote -> UiTimeline.TopMessage.Icon.Quote
-            NotificationType.Reaction -> UiTimeline.TopMessage.Icon.Favourite
-            NotificationType.PollEnded -> UiTimeline.TopMessage.Icon.Poll
-            NotificationType.ReceiveFollowRequest -> UiTimeline.TopMessage.Icon.Follow
-            NotificationType.FollowRequestAccepted -> UiTimeline.TopMessage.Icon.Follow
-            NotificationType.AchievementEarned -> UiTimeline.TopMessage.Icon.Info
-            NotificationType.App -> UiTimeline.TopMessage.Icon.Info
-            else -> UiTimeline.TopMessage.Icon.Info
+                UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.App)
+            else -> UiTimelineV2.Message.Type.Unknown(rawType = type)
         }
-    val topMessage =
-        UiTimeline.TopMessage(
+    val message =
+        UiTimelineV2.Message(
             user = user,
-            icon = icon,
-            type = topMessageType,
-            onClicked = {
-                if (user != null) {
-                    launcher.launch(
-                        DeeplinkRoute.Profile
-                            .User(
-                                accountType =
-                                    AccountType.Specific(
-                                        accountKey,
-                                    ),
-                                userKey = user.key,
-                            ).toUri(),
+            icon =
+                when (notificationType) {
+                    NotificationType.Follow -> UiIcon.Follow
+                    NotificationType.Mention -> UiIcon.Mention
+                    NotificationType.Reply -> UiIcon.Reply
+                    NotificationType.Renote -> UiIcon.Retweet
+                    NotificationType.Quote -> UiIcon.Quote
+                    NotificationType.Reaction -> UiIcon.Favourite
+                    NotificationType.PollEnded -> UiIcon.Poll
+                    NotificationType.ReceiveFollowRequest -> UiIcon.Follow
+                    NotificationType.FollowRequestAccepted -> UiIcon.Follow
+                    NotificationType.AchievementEarned -> UiIcon.Info
+                    NotificationType.App -> UiIcon.Info
+                    else -> UiIcon.Info
+                },
+            type = messageType,
+            statusKey = statusKey,
+            createdAt = createdAt,
+            clickEvent =
+                user?.let {
+                    ClickEvent.Deeplink(
+                        DeeplinkRoute.Profile.User(
+                            accountType = accountKey.toAccountType(),
+                            userKey = it.key,
+                        ),
                     )
-                }
-            },
-            statusKey = MicroBlogKey(id, accountKey.host),
+                } ?: ClickEvent.Noop,
+            accountType = accountKey.toAccountType(),
+        )
+
+    if (notificationType in listOf(NotificationType.Follow, NotificationType.FollowRequestAccepted) && user != null) {
+        return UiTimelineV2.User(
+            message = message,
+            value = user,
+            createdAt = createdAt,
+            statusKey = statusKey,
+            accountType = accountKey.toAccountType(),
+        )
+    }
+
+    if (notificationType == NotificationType.ReceiveFollowRequest && user != null) {
+        return UiTimelineV2.User(
+            message = message,
+            value = user,
+            button =
+                persistentListOf(
+                    ActionMenu.Item(
+                        text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.AcceptFollowRequest),
+                        color = ActionMenu.Item.Color.PrimaryColor,
+                        icon = UiIcon.Check,
+                        clickEvent =
+                            ClickEvent.event(
+                                accountKey,
+                                PostEvent.Misskey.AcceptFollowRequest(
+                                    postKey = statusKey,
+                                    userKey = user.key,
+                                    notificationStatusKey = statusKey,
+                                ),
+                            ),
+                    ),
+                    ActionMenu.Item(
+                        text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.RejectFollowRequest),
+                        color = ActionMenu.Item.Color.Red,
+                        clickEvent =
+                            ClickEvent.event(
+                                accountKey,
+                                PostEvent.Misskey.RejectFollowRequest(
+                                    postKey = statusKey,
+                                    userKey = user.key,
+                                    notificationStatusKey = statusKey,
+                                ),
+                            ),
+                    ),
+                ),
+            createdAt = createdAt,
+            statusKey = statusKey,
+            accountType = accountKey.toAccountType(),
         )
+    }
+
     val status =
-        (references[ReferenceType.Notification]?.firstOrNull() as? StatusContent.Misskey)
-            ?.data
+        note
             ?.let {
                 if (notificationType == NotificationType.Renote) {
-                    it.renote
+                    it.renote ?: it
                 } else {
                     it
                 }
-            }?.renderStatus(accountKey, event)
-    return UiTimeline(
-        topMessage = topMessage,
-        content =
-            when {
-                notificationType in
-                    listOf(
-                        NotificationType.Follow,
-                        NotificationType.FollowRequestAccepted,
-                    ) &&
-                    user != null
-                ->
-                    UiTimeline.ItemContent.User(user)
-
-                notificationType == NotificationType.ReceiveFollowRequest && user != null ->
-                    UiTimeline.ItemContent.User(
-                        user,
-                        button =
-                            persistentListOf(
-                                UiTimeline.ItemContent.User.Button.AcceptFollowRequest(
-                                    onClicked = {
-                                        event.acceptFollowRequest(
-                                            userKey = user.key,
-                                            notificationStatusKey =
-                                                MicroBlogKey(
-                                                    id,
-                                                    accountKey.host,
-                                                ),
-                                        )
-                                    },
-                                ),
-                                UiTimeline.ItemContent.User.Button.RejectFollowRequest(
-                                    onClicked = {
-                                        event.rejectFollowRequest(
-                                            userKey = user.key,
-                                            notificationStatusKey =
-                                                MicroBlogKey(
-                                                    id,
-                                                    accountKey.host,
-                                                ),
-                                        )
-                                    },
-                                ),
-                            ),
-                    )
-
-                else ->
-                    status ?: user?.let { UiTimeline.ItemContent.User(it) }
-            },
-    )
+            }?.renderStatus(accountKey)
+    return status?.copy(message = message)
+        ?: if (user != null) {
+            UiTimelineV2.User(
+                message = message,
+                value = user,
+                createdAt = createdAt,
+                statusKey = statusKey,
+                accountType = accountKey.toAccountType(),
+            )
+        } else {
+            message
+        }
 }
 
 public enum class MisskeyAchievement(
@@ -313,67 +297,46 @@ public enum class MisskeyAchievement(
     }
 }
 
-internal fun Note.render(
-    accountKey: MicroBlogKey,
-    event: StatusEvent.Misskey,
-    references: Map<ReferenceType, List<StatusContent>>,
-    pinned: Boolean,
-): UiTimeline {
-    val user = user.render(accountKey)
-    val renote = (references[ReferenceType.Retweet]?.firstOrNull() as? StatusContent.Misskey)?.data
-    val currentStatus = this.renderStatus(accountKey, event)
-    val actualStatus = renote ?: this
+internal fun Note.render(accountKey: MicroBlogKey): UiTimelineV2 {
+    val actualStatus =
+        if (!text.isNullOrEmpty() || !files.isNullOrEmpty() || poll != null || cw != null) {
+            this
+        } else {
+            renote ?: this
+        }
+    val status = actualStatus.renderStatus(accountKey)
     val topMessage =
-        if (pinned) {
-            UiTimeline.TopMessage(
+        if (actualStatus !== this) {
+            val user = user.render(accountKey)
+            UiTimelineV2.Message(
                 user = user,
-                icon = UiTimeline.TopMessage.Icon.Pin,
-                type =
-                    UiTimeline.TopMessage.MessageType.Misskey
-                        .Pinned(id = id),
-                onClicked = {},
-                statusKey = currentStatus.statusKey,
+                icon = UiIcon.Retweet,
+                type = UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.Repost),
+                statusKey = status.statusKey,
+                createdAt = status.createdAt,
+                clickEvent =
+                    ClickEvent.Deeplink(
+                        DeeplinkRoute.Profile.User(
+                            accountType = accountKey.toAccountType(),
+                            userKey = user.key,
+                        ),
+                    ),
+                accountType = accountKey.toAccountType(),
             )
-        } else if ((renote == null && renoteId == null) || !text.isNullOrEmpty()) {
-            null
         } else {
-            UiTimeline.TopMessage(
-                user = user,
-                icon = UiTimeline.TopMessage.Icon.Retweet,
-                type =
-                    UiTimeline.TopMessage.MessageType.Misskey
-                        .Renote(id = id),
-                onClicked = {
-                    launcher.launch(
-                        DeeplinkRoute.Profile
-                            .User(
-                                accountType = AccountType.Specific(accountKey),
-                                userKey = user.key,
-                            ).toUri(),
-                    )
-                },
-                statusKey = currentStatus.statusKey,
-            )
+            null
         }
-    return UiTimeline(
-        topMessage = topMessage,
-        // TODO: show deleted placeholder when renote is deleted
-        content = actualStatus.renderStatus(accountKey, event, references),
-    )
+    return status.copy(message = topMessage)
 }
 
-private fun Note.renderStatus(
-    accountKey: MicroBlogKey,
-    event: StatusEvent.Misskey,
-    references: Map<ReferenceType, List<StatusContent>> = mapOf(),
-): UiTimeline.ItemContent.Status {
+private fun Note.renderStatus(accountKey: MicroBlogKey): UiTimelineV2.Post {
     val remoteHost =
         if (user.host.isNullOrEmpty()) {
             accountKey.host
         } else {
             user.host
         }
-    val parent = references[ReferenceType.Reply]?.firstOrNull() as? StatusContent.Misskey
+    val parent = reply
     val user = user.render(accountKey)
     val isFromMe = user.key == accountKey
     val canReblog =
@@ -384,13 +347,13 @@ private fun Note.renderStatus(
             )
     val renderedVisibility =
         if (channel?.id != null) {
-            UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Channel
+            UiTimelineV2.Post.Visibility.Channel
         } else {
             when (visibility) {
-                Visibility.Public -> UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Public
-                Visibility.Home -> UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Home
-                Visibility.Followers -> UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Followers
-                Visibility.Specified -> UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Specified
+                Visibility.Public -> UiTimelineV2.Post.Visibility.Public
+                Visibility.Home -> UiTimelineV2.Post.Visibility.Home
+                Visibility.Followers -> UiTimelineV2.Post.Visibility.Followers
+                Visibility.Specified -> UiTimelineV2.Post.Visibility.Specified
             }
         }
     val statusKey =
@@ -401,25 +364,27 @@ private fun Note.renderStatus(
     val reaction =
         reactions
             .map { emoji ->
-                UiTimeline.ItemContent.Status.BottomContent.Reaction.EmojiReaction(
+                UiTimelineV2.Post.EmojiReaction(
                     name = emoji.key,
                     count = UiNumber(emoji.value),
                     url = resolveMisskeyEmoji(emoji.key, accountKey.host, emojis),
                     isUnicode = !emoji.key.startsWith(':') && !emoji.key.endsWith(':'),
-                    onClicked = {
-                        event.react(
-                            statusKey = statusKey,
-                            hasReacted = myReaction == emoji.key,
-                            reaction = emoji.key,
-                        )
-                    },
+                    clickEvent =
+                        ClickEvent.event(
+                            accountKey,
+                            PostEvent.Misskey.React(
+                                postKey = statusKey,
+                                hasReacted = myReaction == emoji.key,
+                                reaction = emoji.key,
+                            ),
+                        ),
                     me = myReaction == emoji.key,
                 )
             }.sortedByDescending { it.count.value }
-            .toPersistentList()
+            .toImmutableList()
     val sourceChannel =
         if (channel?.id != null && channel.name != null) {
-            UiTimeline.ItemContent.Status.BottomContent.Reaction.SourceChannel(
+            UiTimelineV2.Post.SourceChannel(
                 id = channel.id,
                 name = channel.name,
             )
@@ -439,13 +404,10 @@ private fun Note.renderStatus(
                 append(id)
             }
         }
-    return UiTimeline.ItemContent.Status(
+    return UiTimelineV2.Post(
         parents =
             listOfNotNull(
-                parent?.data?.renderStatus(
-                    accountKey,
-                    event,
-                ),
+                parent?.renderStatus(accountKey),
             ).toPersistentList(),
         images =
             files
@@ -462,7 +424,7 @@ private fun Note.renderStatus(
         quote =
             listOfNotNull(
                 if (text != null || !files.isNullOrEmpty() || cw != null || poll != null) {
-                    renote?.renderStatus(accountKey, event)
+                    renote?.renderStatus(accountKey)
                 } else {
                     null
                 },
@@ -478,161 +440,102 @@ private fun Note.renderStatus(
         actions =
             listOfNotNull(
                 ActionMenu.Item(
-                    icon = ActionMenu.Item.Icon.Reply,
+                    icon = UiIcon.Reply,
                     text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Reply),
                     count = UiNumber(repliesCount.toLong()),
-                    onClicked = {
-                        launcher.launch(
+                    clickEvent =
+                        ClickEvent.Deeplink(
                             DeeplinkRoute.Compose
                                 .Reply(
                                     accountKey = accountKey,
                                     statusKey = statusKey,
-                                ).toUri(),
-                        )
-                    },
+                                ),
+                        ),
                 ),
                 if (canReblog) {
                     ActionMenu.Group(
                         displayItem =
                             ActionMenu.Item(
-                                icon = ActionMenu.Item.Icon.Retweet,
+                                icon = UiIcon.Retweet,
                                 text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Retweet),
                                 count = UiNumber(renoteCount.toLong()),
                             ),
                         actions =
                             listOfNotNull(
-                                ActionMenu.Item(
-                                    icon = ActionMenu.Item.Icon.Retweet,
-                                    text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Retweet),
-                                    count = UiNumber(renoteCount.toLong()),
-                                    onClicked = {
-                                        event.renote(
-                                            statusKey = statusKey,
-                                        )
-                                    },
+                                ActionMenu.misskeyRenote(
+                                    postKey = statusKey,
+                                    count = renoteCount.toLong(),
+                                    accountKey = accountKey,
                                 ),
                                 ActionMenu.Item(
-                                    icon = ActionMenu.Item.Icon.Quote,
+                                    icon = UiIcon.Quote,
                                     text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Quote),
                                     count = UiNumber(0),
-                                    onClicked = {
-                                        launcher.launch(
+                                    clickEvent =
+                                        ClickEvent.Deeplink(
                                             DeeplinkRoute.Compose
                                                 .Quote(
                                                     accountKey = accountKey,
                                                     statusKey = statusKey,
-                                                ).toUri(),
-                                        )
-                                    },
+                                                ),
+                                        ),
                                 ),
                             ).toImmutableList(),
                     )
                 } else {
                     null
                 },
-                ActionMenu.Item(
-                    icon = if (myReaction != null) ActionMenu.Item.Icon.UnReact else ActionMenu.Item.Icon.React,
-                    text =
-                        ActionMenu.Item.Text.Localized(
-                            if (myReaction !=
-                                null
-                            ) {
-                                ActionMenu.Item.Text.Localized.Type.UnReact
-                            } else {
-                                ActionMenu.Item.Text.Localized.Type.React
-                            },
-                        ),
-                    count = UiNumber(reaction.sumOf { it.count.value }),
-                    color = if (myReaction != null) ActionMenu.Item.Color.Red else null,
-                    onClicked = {
-                        if (myReaction == null) {
-                            launcher.launch(
-                                DeeplinkRoute.Status
-                                    .AddReaction(
-                                        statusKey = statusKey,
-                                        accountType = AccountType.Specific(accountKey),
-                                    ).toUri(),
-                            )
-                        } else {
-                            event.react(
-                                statusKey = statusKey,
-                                hasReacted = true,
-                                reaction = myReaction,
-                            )
-                        }
-                    },
+                ActionMenu.misskeyReact(
+                    postKey = statusKey,
+                    hasReacted = myReaction != null,
+                    reaction = myReaction,
+                    count = reaction.sumOf { it.count.value },
+                    accountKey = accountKey,
                 ),
                 ActionMenu.Group(
                     displayItem =
                         ActionMenu.Item(
-                            icon = ActionMenu.Item.Icon.More,
+                            icon = UiIcon.More,
                             text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.More),
                         ),
                     actions =
                         buildList {
                             add(
-                                ActionMenu.AsyncActionMenuItem(
-                                    flow =
-                                        event
-                                            .favouriteState(
-                                                statusKey = statusKey,
-                                            ).map {
-                                                ActionMenu.Item(
-                                                    icon = if (it) ActionMenu.Item.Icon.Unlike else ActionMenu.Item.Icon.Like,
-                                                    text =
-                                                        ActionMenu.Item.Text.Localized(
-                                                            if (it) {
-                                                                ActionMenu.Item.Text.Localized.Type.Unlike
-                                                            } else {
-                                                                ActionMenu.Item.Text.Localized.Type.Like
-                                                            },
-                                                        ),
-                                                    count = UiNumber(0),
-                                                    color = if (it) ActionMenu.Item.Color.Red else null,
-                                                    onClicked = {
-                                                        event.favourite(
-                                                            statusKey = statusKey,
-                                                            favourited = it,
-                                                        )
-                                                    },
-                                                )
-                                            },
+                                ActionMenu.misskeyFavourite(
+                                    postKey = statusKey,
+                                    favourited = false,
+                                    accountKey = accountKey,
                                 ),
                             )
                             add(
                                 ActionMenu.Item(
-                                    icon = ActionMenu.Item.Icon.Share,
+                                    icon = UiIcon.Share,
                                     text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Share),
-                                    onClicked = {
-                                        launcher.launch(
+                                    clickEvent =
+                                        ClickEvent.Deeplink(
                                             DeeplinkRoute.Status
                                                 .ShareSheet(
                                                     statusKey = statusKey,
                                                     accountType = AccountType.Specific(accountKey),
                                                     shareUrl = postUrl,
-                                                ).toUri(),
-                                        )
-                                    },
+                                                ),
+                                        ),
                                 ),
                             )
                             if (isFromMe) {
                                 add(
                                     ActionMenu.Item(
-                                        icon = ActionMenu.Item.Icon.Delete,
+                                        icon = UiIcon.Delete,
                                         text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Delete),
                                         color = ActionMenu.Item.Color.Red,
-                                        onClicked = {
-                                            launcher.launch(
+                                        clickEvent =
+                                            ClickEvent.Deeplink(
                                                 DeeplinkRoute.Status
                                                     .DeleteConfirm(
-                                                        accountType =
-                                                            AccountType.Specific(
-                                                                accountKey,
-                                                            ),
+                                                        accountType = AccountType.Specific(accountKey),
                                                         statusKey = statusKey,
-                                                    ).toUri(),
-                                            )
-                                        },
+                                                    ),
+                                            ),
                                     ),
                                 )
                             } else {
@@ -647,22 +550,18 @@ private fun Note.renderStatus(
                                 add(ActionMenu.Divider)
                                 add(
                                     ActionMenu.Item(
-                                        icon = ActionMenu.Item.Icon.Report,
+                                        icon = UiIcon.Report,
                                         text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Report),
                                         color = ActionMenu.Item.Color.Red,
-                                        onClicked = {
-                                            launcher.launch(
+                                        clickEvent =
+                                            ClickEvent.Deeplink(
                                                 DeeplinkRoute.Status
                                                     .MisskeyReport(
                                                         statusKey = statusKey,
                                                         userKey = user.key,
-                                                        accountType =
-                                                            AccountType.Specific(
-                                                                accountKey,
-                                                            ),
-                                                    ).toUri(),
-                                            )
-                                        },
+                                                        accountType = AccountType.Specific(accountKey),
+                                                    ),
+                                            ),
                                     ),
                                 )
                             }
@@ -691,56 +590,136 @@ private fun Note.renderStatus(
                     expiresAt = poll.expiresAt ?: Instant.DISTANT_PAST,
                     multiple = poll.multiple,
                     ownVotes = List(poll.choices.filter { it.isVoted }.size) { index -> index }.toPersistentList(),
-                    onVote = { options ->
-                        event.vote(
-                            statusKey = statusKey,
-                            options = options,
-                        )
-                    },
+                    voteEvent =
+                        PostEvent.Misskey.Vote(
+                            accountKey = accountKey,
+                            postKey = statusKey,
+                            options = persistentListOf(),
+                        ),
                     enabled = !isFromMe,
                 )
             },
         statusKey = statusKey,
         card = null,
         createdAt = Instant.parse(createdAt).toUi(),
-        topEndContent =
-            UiTimeline.ItemContent.Status.TopEndContent
-                .Visibility(renderedVisibility),
-        bottomContent =
-            UiTimeline.ItemContent.Status.BottomContent
-                .Reaction(reaction, sourceChannel),
+        visibility = renderedVisibility,
+        emojiReactions = reaction,
+        sourceChannel = sourceChannel,
         sensitive = files?.any { it.isSensitive } ?: false,
-        onClicked = {
-            launcher.launch(
+        clickEvent =
+            ClickEvent.Deeplink(
                 DeeplinkRoute.Status
                     .Detail(
                         statusKey = statusKey,
                         accountType = AccountType.Specific(accountKey),
-                    ).toUri(),
-            )
-        },
+                    ),
+            ),
         platformType = PlatformType.Misskey,
-        onMediaClicked = { media, index ->
-            launcher.launch(
-                DeeplinkRoute.Media
-                    .StatusMedia(
-                        accountType = AccountType.Specific(accountKey),
-                        statusKey = statusKey,
-                        index = index,
-                        preview =
-                            when (media) {
-                                is UiMedia.Image -> media.previewUrl
-                                is UiMedia.Video -> media.thumbnailUrl
-                                is UiMedia.Audio -> null
-                                is UiMedia.Gif -> media.previewUrl
-                            },
-                    ).toUri(),
-            )
-        },
-        url = postUrl,
+        accountType = accountKey.toAccountType(),
+        replyToHandle =
+            parent?.user?.let {
+                val host = it.host?.takeIf { host -> host.isNotEmpty() } ?: accountKey.host
+                "@${it.username}@$host"
+            },
     )
 }
 
+internal fun ActionMenu.Companion.misskeyRenote(
+    postKey: MicroBlogKey,
+    count: Long,
+    accountKey: MicroBlogKey?,
+): ActionMenu.Item =
+    ActionMenu.Item(
+        updateKey = "misskey_renote_$postKey",
+        icon = UiIcon.Retweet,
+        text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Retweet),
+        count = UiNumber(count),
+        clickEvent =
+            ClickEvent.event(
+                accountKey,
+            ) { accountKey ->
+                PostEvent.Misskey.Renote(
+                    postKey = postKey,
+                    count = count,
+                    accountKey = accountKey,
+                )
+            },
+    )
+
+internal fun ActionMenu.Companion.misskeyReact(
+    postKey: MicroBlogKey,
+    hasReacted: Boolean,
+    reaction: String?,
+    count: Long,
+    accountKey: MicroBlogKey?,
+): ActionMenu.Item =
+    ActionMenu.Item(
+        updateKey = "misskey_react_$postKey",
+        icon = if (hasReacted) UiIcon.UnReact else UiIcon.React,
+        text =
+            ActionMenu.Item.Text.Localized(
+                if (hasReacted) {
+                    ActionMenu.Item.Text.Localized.Type.UnReact
+                } else {
+                    ActionMenu.Item.Text.Localized.Type.React
+                },
+            ),
+        count = UiNumber(count),
+        color = if (hasReacted) ActionMenu.Item.Color.Red else null,
+        clickEvent =
+            if (!hasReacted || reaction.isNullOrEmpty()) {
+                ClickEvent.Deeplink(
+                    DeeplinkRoute.Status
+                        .AddReaction(
+                            statusKey = postKey,
+                            accountType = accountKey?.let { AccountType.Specific(it) } ?: AccountType.Guest,
+                        ),
+                )
+            } else {
+                ClickEvent.event(
+                    accountKey,
+                ) { accountKey ->
+                    PostEvent.Misskey.React(
+                        postKey = postKey,
+                        hasReacted = true,
+                        reaction = reaction,
+                        count = count,
+                        accountKey = accountKey,
+                    )
+                }
+            },
+    )
+
+internal fun ActionMenu.Companion.misskeyFavourite(
+    postKey: MicroBlogKey,
+    favourited: Boolean,
+    accountKey: MicroBlogKey?,
+): ActionMenu.Item =
+    ActionMenu.Item(
+        updateKey = "misskey_favourite_$postKey",
+        icon = if (favourited) UiIcon.Unlike else UiIcon.Like,
+        text =
+            ActionMenu.Item.Text.Localized(
+                if (favourited) {
+                    ActionMenu.Item.Text.Localized.Type.Unlike
+                } else {
+                    ActionMenu.Item.Text.Localized.Type.Like
+                },
+            ),
+        count = UiNumber(0),
+        color = if (favourited) ActionMenu.Item.Color.Red else null,
+        clickEvent =
+            ClickEvent.event(
+                accountKey,
+            ) { accountKey ->
+                PostEvent.Misskey.Favourite(
+                    postKey = postKey,
+                    favourited = favourited,
+                    accountKey = accountKey,
+                )
+            },
+    )
+
 private fun DriveFile.toUi(): UiMedia? {
     if (type.startsWith("image/")) {
         return UiMedia.Image(
@@ -800,7 +779,7 @@ internal fun UserLite.render(accountKey: MicroBlogKey): UiProfile {
                     .User(
                         accountType = AccountType.Specific(accountKey),
                         userKey = userKey,
-                    ).toUri(),
+                    ),
             ),
     )
 }
@@ -870,7 +849,7 @@ internal fun User.render(accountKey: MicroBlogKey): UiProfile {
                     .User(
                         accountType = AccountType.Specific(accountKey),
                         userKey = userKey,
-                    ).toUri(),
+                    ),
             ),
     )
 }
@@ -880,7 +859,7 @@ internal fun EmojiSimple.toUi(): UiEmoji =
         shortcode = ":$name:",
         url = url,
         category = category.orEmpty(),
-        searchKeywords = aliases + name,
+        searchKeywords = (aliases + name).toImmutableList(),
         insertText = " :$name: ",
     )
 

From 09fcb59c8f57e649e0bc258e8b87e636afc28208 Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Wed, 4 Mar 2026 14:45:40 +0900
Subject: [PATCH 09/33] migrate vvo

---
 .../data/datasource/microblog/PostEvent.kt    |   40 +-
 .../vvo/CommentChildRemoteMediator.kt         |   40 +-
 .../datasource/vvo/CommentPagingSource.kt     |   49 +-
 .../vvo/DiscoverStatusRemoteMediator.kt       |   50 +-
 .../data/datasource/vvo/FansPagingSource.kt   |   31 +-
 .../datasource/vvo/FavouriteRemoteMediator.kt |   37 +-
 .../datasource/vvo/FollowingPagingSource.kt   |   31 +-
 .../vvo/HomeTimelineRemoteMediator.kt         |   39 +-
 .../data/datasource/vvo/LikePagingSource.kt   |   58 +-
 .../data/datasource/vvo/LikeRemoteMediator.kt |   37 +-
 .../datasource/vvo/MentionRemoteMediator.kt   |   61 +-
 .../vvo/SearchStatusRemoteMediator.kt         |   60 +-
 .../datasource/vvo/SearchUserPagingSource.kt  |   42 +-
 .../vvo/StatusCommentRemoteMediator.kt        |   47 +-
 .../vvo/StatusRepostRemoteMediator.kt         |   60 +-
 .../vvo/TrendHashtagPagingSource.kt           |   74 +-
 .../vvo/UserTimelineRemoteMediator.kt         |   49 +-
 .../data/datasource/vvo/VVODataSource.kt      | 1073 +++++------------
 .../flare/data/datasource/vvo/VVOLoader.kt    |  164 +++
 .../dimension/flare/ui/model/mapper/VVO.kt    |  760 ++++++------
 .../presenter/status/VVOCommentPresenter.kt   |   29 +-
 .../status/VVOStatusDetailPresenter.kt        |   53 +-
 22 files changed, 1191 insertions(+), 1693 deletions(-)
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVOLoader.kt

diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt
index 09b1c315c..fd9397b77 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt
@@ -11,6 +11,9 @@ import dev.dimension.flare.ui.model.mapper.mastodonRepost
 import dev.dimension.flare.ui.model.mapper.misskeyFavourite
 import dev.dimension.flare.ui.model.mapper.misskeyReact
 import dev.dimension.flare.ui.model.mapper.misskeyRenote
+import dev.dimension.flare.ui.model.mapper.vvoFavorite
+import dev.dimension.flare.ui.model.mapper.vvoLike
+import dev.dimension.flare.ui.model.mapper.vvoLikeComment
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.serialization.Serializable
 
@@ -290,19 +293,50 @@ internal sealed interface PostEvent {
         data class Like(
             override val postKey: MicroBlogKey,
             val liked: Boolean,
-        ) : VVO
+            val count: Long = 0,
+            val accountKey: MicroBlogKey,
+        ) : VVO,
+            UpdatePostActionMenuEvent {
+            override fun nextActionMenu(): ActionMenu.Item =
+                ActionMenu.vvoLike(
+                    statusKey = postKey,
+                    liked = !liked,
+                    count = (count + if (!liked) 1 else -1).coerceAtLeast(0),
+                    accountKey = accountKey,
+                )
+        }
 
         @Serializable
         data class LikeComment(
             override val postKey: MicroBlogKey,
             val liked: Boolean,
-        ) : VVO
+            val count: Long = 0,
+            val accountKey: MicroBlogKey,
+        ) : VVO,
+            UpdatePostActionMenuEvent {
+            override fun nextActionMenu(): ActionMenu.Item =
+                ActionMenu.vvoLikeComment(
+                    statusKey = postKey,
+                    liked = !liked,
+                    count = (count + if (!liked) 1 else -1).coerceAtLeast(0),
+                    accountKey = accountKey,
+                )
+        }
 
         @Serializable
         data class Favorite(
             override val postKey: MicroBlogKey,
             val favorited: Boolean,
-        ) : VVO
+            val accountKey: MicroBlogKey,
+        ) : VVO,
+            UpdatePostActionMenuEvent {
+            override fun nextActionMenu(): ActionMenu.Item =
+                ActionMenu.vvoFavorite(
+                    statusKey = postKey,
+                    favorited = !favorited,
+                    accountKey = accountKey,
+                )
+        }
     }
 }
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/CommentChildRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/CommentChildRemoteMediator.kt
index 97c79b417..14dcdca9f 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/CommentChildRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/CommentChildRemoteMediator.kt
@@ -1,33 +1,28 @@
 package dev.dimension.flare.data.datasource.vvo
 
-import SnowflakeIdGenerator
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.vvo.VVOService
 import dev.dimension.flare.data.repository.LoginExpiredException
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class CommentChildRemoteMediator(
     private val service: VVOService,
     private val commentKey: MicroBlogKey,
     private val accountKey: MicroBlogKey,
-    database: CacheDatabase,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String = "status_comments_child_${commentKey}_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val config = service.config()
         if (config.data?.login != true) {
             throw LoginExpiredException(
@@ -35,13 +30,13 @@ internal class CommentChildRemoteMediator(
                 platformType = PlatformType.VVo,
             )
         }
+
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
-                    service
-                        .getHotFlowChild(
-                            cid = commentKey.id,
-                        )
+                    service.getHotFlowChild(
+                        cid = commentKey.id,
+                    )
                 }
 
                 is PagingRequest.Prepend -> {
@@ -59,22 +54,9 @@ internal class CommentChildRemoteMediator(
             }
 
         val maxId = response.maxID?.takeIf { it != 0L }
-        val status = response.data.orEmpty()
-
-        val data =
-            status.map { comment ->
-                comment.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                    sortIdProvider = {
-                        -SnowflakeIdGenerator.nextId()
-                    },
-                )
-            }
-
         return PagingResult(
             endOfPaginationReached = maxId == null,
-            data = data,
+            data = response.data.orEmpty().map { it.render(accountKey) },
             nextKey = maxId?.toString(),
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/CommentPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/CommentPagingSource.kt
index 458abacbf..a18438636 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/CommentPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/CommentPagingSource.kt
@@ -1,51 +1,56 @@
 package dev.dimension.flare.data.datasource.vvo
 
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
-import dev.dimension.flare.data.datasource.microblog.StatusEvent
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.vvo.VVOService
 import dev.dimension.flare.data.repository.LoginExpiredException
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.mapper.render
 
 internal class CommentPagingSource(
     private val service: VVOService,
-    private val event: StatusEvent.VVO,
     private val accountKey: MicroBlogKey,
     private val onClearMarker: () -> Unit,
-) : BasePagingSource<Int, UiTimeline>() {
-    override suspend fun doLoad(params: LoadParams<Int>): LoadResult<Int, UiTimeline> {
+) : RemoteLoader<UiTimelineV2> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiTimelineV2> {
         val config = service.config()
         if (config.data?.login != true) {
-            return LoadResult.Error(
-                LoginExpiredException(
-                    accountKey = accountKey,
-                    platformType = PlatformType.VVo,
-                ),
+            throw LoginExpiredException(
+                accountKey = accountKey,
+                platformType = PlatformType.VVo,
             )
         }
-        if (params.key == null) {
+        val page =
+            when (request) {
+                PagingRequest.Refresh -> 1
+                is PagingRequest.Prepend ->
+                    return PagingResult(
+                        endOfPaginationReached = true,
+                    )
+                is PagingRequest.Append -> request.nextKey.toIntOrNull() ?: 1
+            }
+        if (request == PagingRequest.Refresh) {
             onClearMarker.invoke()
         }
         val response =
             service.getComments(
-                page = params.key ?: 1,
+                page = page,
             )
 
-        val nextPage = params.key?.plus(1) ?: 2
         val data =
             response.data.orEmpty().map {
-                it.render(accountKey, event)
+                it.render(accountKey)
             }
-
-        return LoadResult.Page(
+        return PagingResult(
             data = data,
-            prevKey = null,
-            nextKey = nextPage.takeIf { it != params.key && data.any() },
+            endOfPaginationReached = data.isEmpty(),
+            nextKey = (page + 1).toString(),
         )
     }
-
-    override fun getRefreshKey(state: PagingState<Int, UiTimeline>): Int? = null
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/DiscoverStatusRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/DiscoverStatusRemoteMediator.kt
index d232937de..9e1692b20 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/DiscoverStatusRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/DiscoverStatusRemoteMediator.kt
@@ -1,33 +1,28 @@
 package dev.dimension.flare.data.datasource.vvo
 
-import SnowflakeIdGenerator
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.vvo.VVOService
 import dev.dimension.flare.data.repository.LoginExpiredException
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class DiscoverStatusRemoteMediator(
     private val service: VVOService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String = "discover_status_$accountKey"
     private val containerId = "102803"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val config = service.config()
         if (config.data?.login != true) {
             throw LoginExpiredException(
@@ -39,25 +34,19 @@ internal class DiscoverStatusRemoteMediator(
         val page =
             when (request) {
                 is PagingRequest.Append -> request.nextKey.toIntOrNull() ?: 0
-                is PagingRequest.Prepend -> 0
-                PagingRequest.Refresh -> 0
-            }
-
-        val response =
-            when (request) {
-                PagingRequest.Refresh -> {
-                    service.getContainerIndex(containerId = containerId)
-                }
-
                 is PagingRequest.Prepend -> {
                     return PagingResult(
                         endOfPaginationReached = true,
                     )
                 }
+                PagingRequest.Refresh -> 0
+            }
 
-                is PagingRequest.Append -> {
-                    service.getContainerIndex(containerId = containerId, sinceId = page.toString())
-                }
+        val response =
+            if (request is PagingRequest.Append) {
+                service.getContainerIndex(containerId = containerId, sinceId = page.toString())
+            } else {
+                service.getContainerIndex(containerId = containerId)
             }
 
         val status =
@@ -66,20 +55,9 @@ internal class DiscoverStatusRemoteMediator(
                 ?.mapNotNull { it.mblog }
                 .orEmpty()
 
-        val data =
-            status.map { statusItem ->
-                statusItem.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                    sortIdProvider = {
-                        -SnowflakeIdGenerator.nextId()
-                    },
-                )
-            }
-
         return PagingResult(
             endOfPaginationReached = status.isEmpty(),
-            data = data,
+            data = status.map { it.render(accountKey) },
             nextKey = (page + 1).toString(),
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/FansPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/FansPagingSource.kt
index 02741a4a5..796284c3f 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/FansPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/FansPagingSource.kt
@@ -1,7 +1,8 @@
 package dev.dimension.flare.data.datasource.vvo
 
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.vvo.VVOService
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiProfile
@@ -11,9 +12,7 @@ internal class FansPagingSource(
     private val service: VVOService,
     private val accountKey: MicroBlogKey,
     private val userKey: MicroBlogKey,
-) : BasePagingSource<Int, UiProfile>() {
-    override fun getRefreshKey(state: PagingState<Int, UiProfile>): Int? = null
-
+) : RemoteLoader<UiProfile> {
     private val containerId by lazy {
         if (accountKey == userKey) {
             "231016_-_selffans"
@@ -22,9 +21,20 @@ internal class FansPagingSource(
         }
     }
 
-    override suspend fun doLoad(params: LoadParams<Int>): LoadResult<Int, UiProfile> {
-        val nextPage = params.key ?: 0
-        val limit = params.loadSize
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiProfile> {
+        val nextPage =
+            when (request) {
+                PagingRequest.Refresh -> 0
+                is PagingRequest.Prepend -> {
+                    return PagingResult(
+                        endOfPaginationReached = true,
+                    )
+                }
+                is PagingRequest.Append -> request.nextKey.toIntOrNull() ?: 0
+            }
         val users =
             service
                 .getContainerIndex(containerId = containerId, sinceId = nextPage.toString())
@@ -38,10 +48,9 @@ internal class FansPagingSource(
                 ?.map {
                     it.render(accountKey = accountKey)
                 }.orEmpty()
-        return LoadResult.Page(
+        return PagingResult(
             data = users,
-            prevKey = null,
-            nextKey = if (users.isEmpty()) null else users.size + nextPage,
+            nextKey = if (users.isEmpty()) null else (users.size + nextPage).toString(),
         )
     }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/FavouriteRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/FavouriteRemoteMediator.kt
index f3953ae16..d490f99c8 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/FavouriteRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/FavouriteRemoteMediator.kt
@@ -1,31 +1,26 @@
 package dev.dimension.flare.data.datasource.vvo
 
-import SnowflakeIdGenerator
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.vvo.VVOService
 import dev.dimension.flare.data.repository.LoginExpiredException
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 internal class FavouriteRemoteMediator(
     private val service: VVOService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String = "favourite_$accountKey"
     private val containerId = "230259"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val config = service.config()
         if (config.data?.login != true) {
             throw LoginExpiredException(
@@ -36,8 +31,13 @@ internal class FavouriteRemoteMediator(
 
         val page =
             when (request) {
+                PagingRequest.Refresh -> null
+                is PagingRequest.Prepend -> {
+                    return PagingResult(
+                        endOfPaginationReached = true,
+                    )
+                }
                 is PagingRequest.Append -> request.nextKey.toIntOrNull()
-                else -> null
             }
 
         val response =
@@ -68,21 +68,10 @@ internal class FavouriteRemoteMediator(
                 ?.filter { it.user?.id != null }
                 .orEmpty()
 
-        val data =
-            status.map { statusItem ->
-                statusItem.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                    sortIdProvider = {
-                        -SnowflakeIdGenerator.nextId()
-                    },
-                )
-            }
         val nextKey = response.data?.cardlistInfo?.page
-
         return PagingResult(
             endOfPaginationReached = nextKey == null,
-            data = data,
+            data = status.map { it.render(accountKey) },
             nextKey = nextKey?.toString(),
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/FollowingPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/FollowingPagingSource.kt
index e07644db7..fb32b1770 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/FollowingPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/FollowingPagingSource.kt
@@ -1,7 +1,8 @@
 package dev.dimension.flare.data.datasource.vvo
 
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.vvo.VVOService
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiProfile
@@ -11,9 +12,7 @@ internal class FollowingPagingSource(
     private val service: VVOService,
     private val accountKey: MicroBlogKey,
     private val userKey: MicroBlogKey,
-) : BasePagingSource<Int, UiProfile>() {
-    override fun getRefreshKey(state: PagingState<Int, UiProfile>): Int? = null
-
+) : RemoteLoader<UiProfile> {
     private val containerId by lazy {
         if (accountKey == userKey) {
             "231093_-_selffollowed"
@@ -22,9 +21,20 @@ internal class FollowingPagingSource(
         }
     }
 
-    override suspend fun doLoad(params: LoadParams<Int>): LoadResult<Int, UiProfile> {
-        val nextPage = params.key ?: 1
-        val limit = params.loadSize
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiProfile> {
+        val nextPage =
+            when (request) {
+                PagingRequest.Refresh -> 1
+                is PagingRequest.Prepend -> {
+                    return PagingResult(
+                        endOfPaginationReached = true,
+                    )
+                }
+                is PagingRequest.Append -> request.nextKey.toIntOrNull() ?: 1
+            }
         val users =
             service
                 .getContainerIndex(containerId = containerId, page = nextPage)
@@ -38,10 +48,9 @@ internal class FollowingPagingSource(
                 ?.map {
                     it.render(accountKey = accountKey)
                 }.orEmpty()
-        return LoadResult.Page(
+        return PagingResult(
             data = users,
-            prevKey = null,
-            nextKey = if (users.isEmpty()) null else nextPage + 1,
+            nextKey = if (users.isEmpty()) null else (nextPage + 1).toString(),
         )
     }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/HomeTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/HomeTimelineRemoteMediator.kt
index b4d54c12a..125672ad0 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/HomeTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/HomeTimelineRemoteMediator.kt
@@ -3,34 +3,28 @@ package dev.dimension.flare.data.datasource.vvo
 import androidx.paging.ExperimentalPagingApi
 import dev.dimension.flare.common.InAppNotification
 import dev.dimension.flare.common.Message
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.vvo.VVOService
 import dev.dimension.flare.data.repository.LoginExpiredException
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class HomeTimelineRemoteMediator(
     private val service: VVOService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
     private val inAppNotification: InAppNotification,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
-    override val pagingKey = "home_$accountKey"
+) : CacheableRemoteLoader<UiTimelineV2> {
+    override val pagingKey: String = "home_$accountKey"
 
-    override suspend fun initialize(): InitializeAction = InitializeAction.SKIP_INITIAL_REFRESH
-
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val config = service.config()
         if (config.data?.login != true) {
             inAppNotification.onError(
@@ -48,9 +42,7 @@ internal class HomeTimelineRemoteMediator(
 
         val response =
             when (request) {
-                PagingRequest.Refresh -> {
-                    service.getFriendsTimeline()
-                }
+                PagingRequest.Refresh -> service.getFriendsTimeline()
 
                 is PagingRequest.Prepend -> {
                     return PagingResult(
@@ -65,18 +57,13 @@ internal class HomeTimelineRemoteMediator(
                 }
             }
 
-        val statuses = response.data?.statuses.orEmpty()
-        val data =
-            statuses.map { status ->
-                status.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                )
-            }
-
         return PagingResult(
             endOfPaginationReached = response.data?.nextCursorStr == null,
-            data = data,
+            data =
+                response.data
+                    ?.statuses
+                    .orEmpty()
+                    .map { it.render(accountKey) },
             nextKey = response.data?.nextCursorStr,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/LikePagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/LikePagingSource.kt
index da2cb347c..af121c3d2 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/LikePagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/LikePagingSource.kt
@@ -1,51 +1,55 @@
 package dev.dimension.flare.data.datasource.vvo
 
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
-import dev.dimension.flare.data.datasource.microblog.StatusEvent
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.vvo.VVOService
 import dev.dimension.flare.data.repository.LoginExpiredException
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.mapper.render
 
 internal class LikePagingSource(
     private val service: VVOService,
-    private val event: StatusEvent.VVO,
     private val accountKey: MicroBlogKey,
     private val onClearMarker: () -> Unit,
-) : BasePagingSource<Int, UiTimeline>() {
-    override suspend fun doLoad(params: LoadParams<Int>): LoadResult<Int, UiTimeline> {
+) : RemoteLoader<UiTimelineV2> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiTimelineV2> {
         val config = service.config()
         if (config.data?.login != true) {
-            return LoadResult.Error(
-                LoginExpiredException(
-                    accountKey = accountKey,
-                    platformType = PlatformType.VVo,
-                ),
+            throw LoginExpiredException(
+                accountKey = accountKey,
+                platformType = PlatformType.VVo,
             )
         }
-        if (params.key == null) {
+
+        val page =
+            when (request) {
+                PagingRequest.Refresh -> 1
+                is PagingRequest.Prepend -> {
+                    return PagingResult(
+                        endOfPaginationReached = true,
+                    )
+                }
+                is PagingRequest.Append -> request.nextKey.toIntOrNull() ?: 1
+            }
+        if (request == PagingRequest.Refresh) {
             onClearMarker.invoke()
         }
-        val response =
-            service.getAttitudes(
-                page = params.key ?: 1,
-            )
 
-        val nextPage = params.key?.plus(1) ?: 2
+        val response = service.getAttitudes(page = page)
         val data =
-            response.data.orEmpty().filter { it.idStr != null }.map {
-                it.render(accountKey, event)
-            }
-
-        return LoadResult.Page(
+            response.data
+                .orEmpty()
+                .filter { it.idStr != null }
+                .map { it.render(accountKey) }
+        return PagingResult(
             data = data,
-            prevKey = null,
-            nextKey = nextPage.takeIf { it != params.key && data.any() },
+            nextKey = if (data.isEmpty()) null else (page + 1).toString(),
         )
     }
-
-    override fun getRefreshKey(state: PagingState<Int, UiTimeline>): Int? = null
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/LikeRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/LikeRemoteMediator.kt
index d61610edc..89bf30172 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/LikeRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/LikeRemoteMediator.kt
@@ -1,31 +1,26 @@
 package dev.dimension.flare.data.datasource.vvo
 
-import SnowflakeIdGenerator
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.vvo.VVOService
 import dev.dimension.flare.data.repository.LoginExpiredException
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 internal class LikeRemoteMediator(
     private val service: VVOService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String = "like_$accountKey"
     private val containerId = "2308691748186704_-_mix"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val config = service.config()
         if (config.data?.login != true) {
             throw LoginExpiredException(
@@ -36,8 +31,13 @@ internal class LikeRemoteMediator(
 
         val page =
             when (request) {
+                PagingRequest.Refresh -> null
+                is PagingRequest.Prepend -> {
+                    return PagingResult(
+                        endOfPaginationReached = true,
+                    )
+                }
                 is PagingRequest.Append -> request.nextKey.toIntOrNull()
-                else -> null
             }
 
         val response =
@@ -75,21 +75,10 @@ internal class LikeRemoteMediator(
                 }?.filter { it.user?.id != null }
                 .orEmpty()
 
-        val data =
-            status.map { statusItem ->
-                statusItem.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                    sortIdProvider = {
-                        -SnowflakeIdGenerator.nextId()
-                    },
-                )
-            }
         val nextKey = response.data?.cardlistInfo?.page
-
         return PagingResult(
             endOfPaginationReached = nextKey == null,
-            data = data,
+            data = status.map { it.render(accountKey) },
             nextKey = nextKey?.toString(),
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/MentionRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/MentionRemoteMediator.kt
index 452203a9e..4085a36df 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/MentionRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/MentionRemoteMediator.kt
@@ -1,32 +1,28 @@
 package dev.dimension.flare.data.datasource.vvo
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.vvo.VVOService
 import dev.dimension.flare.data.repository.LoginExpiredException
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class MentionRemoteMediator(
     private val service: VVOService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
     private val onClearMarker: () -> Unit,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
-    override val pagingKey = "mention_$accountKey"
+) : CacheableRemoteLoader<UiTimelineV2> {
+    override val pagingKey: String = "mention_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val config = service.config()
         if (config.data?.login != true) {
             throw LoginExpiredException(
@@ -38,48 +34,25 @@ internal class MentionRemoteMediator(
         val page =
             when (request) {
                 PagingRequest.Refresh -> 0
-                is PagingRequest.Prepend -> return PagingResult(
-                    endOfPaginationReached = true,
-                )
-                is PagingRequest.Append -> request.nextKey.toIntOrNull() ?: 0
-            }
-
-        val response =
-            when (request) {
-                PagingRequest.Refresh -> {
-                    val result =
-                        service
-                            .getMentionsAt(
-                                page = page,
-                            )
-                    onClearMarker.invoke()
-                    result
-                }
-
                 is PagingRequest.Prepend -> {
                     return PagingResult(
                         endOfPaginationReached = true,
                     )
                 }
-
-                is PagingRequest.Append -> {
-                    service.getMentionsAt(
-                        page = page,
-                    )
-                }
+                is PagingRequest.Append -> request.nextKey.toIntOrNull() ?: 0
             }
 
-        val statuses = response.data.orEmpty()
-        val data =
-            statuses.map { status ->
-                status.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                )
-            }
+        val response =
+            service.getMentionsAt(
+                page = page,
+            )
+        if (request == PagingRequest.Refresh) {
+            onClearMarker.invoke()
+        }
 
+        val data = response.data.orEmpty().map { it.render(accountKey) }
         return PagingResult(
-            endOfPaginationReached = response.data.isNullOrEmpty(),
+            endOfPaginationReached = data.isEmpty(),
             data = data,
             nextKey = (page + 1).toString(),
         )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/SearchStatusRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/SearchStatusRemoteMediator.kt
index c272dadbb..6d5a06374 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/SearchStatusRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/SearchStatusRemoteMediator.kt
@@ -1,26 +1,22 @@
 package dev.dimension.flare.data.datasource.vvo
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.vvo.VVOService
 import dev.dimension.flare.data.repository.LoginExpiredException
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class SearchStatusRemoteMediator(
     private val service: VVOService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
     private val query: String,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String =
         buildString {
             append("search_")
@@ -32,10 +28,10 @@ internal class SearchStatusRemoteMediator(
         "100103type=1&q=$query&t="
     }
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val config = service.config()
         if (config.data?.login != true) {
             throw LoginExpiredException(
@@ -47,56 +43,30 @@ internal class SearchStatusRemoteMediator(
         val page =
             when (request) {
                 is PagingRequest.Append -> request.nextKey.toIntOrNull() ?: 1
-                is PagingRequest.Prepend -> 1
-                PagingRequest.Refresh -> 1
-            }
-
-        val response =
-            when (request) {
-                PagingRequest.Refresh -> {
-                    service
-                        .getContainerIndex(
-                            containerId = containerId,
-                            pageType = "searchall",
-                        )
-                }
-
                 is PagingRequest.Prepend -> {
                     return PagingResult(
                         endOfPaginationReached = true,
                     )
                 }
-
-                is PagingRequest.Append -> {
-                    service.getContainerIndex(
-                        containerId = containerId,
-                        pageType = "searchall",
-                        page = page,
-                    )
-                }
+                PagingRequest.Refresh -> 1
             }
 
+        val response =
+            service.getContainerIndex(
+                containerId = containerId,
+                pageType = "searchall",
+                page = page.takeIf { request is PagingRequest.Append },
+            )
+
         val status =
             response.data
                 ?.cards
                 ?.flatMap { card -> listOfNotNull(card.mblog) + card.cardGroup?.mapNotNull { it.mblog }.orEmpty() }
                 .orEmpty()
 
-        val data =
-            status.map { statusItem ->
-                statusItem.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                    sortIdProvider = { item ->
-                        val index = status.indexOf(item)
-                        -(index + page * pageSize).toLong()
-                    },
-                )
-            }
-
         return PagingResult(
             endOfPaginationReached = status.isEmpty(),
-            data = data,
+            data = status.map { it.render(accountKey) },
             nextKey = (page + 1).toString(),
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/SearchUserPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/SearchUserPagingSource.kt
index 542857b23..5d4df4d3b 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/SearchUserPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/SearchUserPagingSource.kt
@@ -1,7 +1,8 @@
 package dev.dimension.flare.data.datasource.vvo
 
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.vvo.VVOService
 import dev.dimension.flare.data.repository.LoginExpiredException
 import dev.dimension.flare.model.MicroBlogKey
@@ -13,28 +14,39 @@ internal class SearchUserPagingSource(
     private val service: VVOService,
     private val accountKey: MicroBlogKey,
     private val query: String,
-) : BasePagingSource<Int, UiProfile>() {
+) : RemoteLoader<UiProfile> {
     private val containerId by lazy {
         "100103type=3&q=$query&t="
     }
 
-    override fun getRefreshKey(state: PagingState<Int, UiProfile>): Int? = null
-
-    override suspend fun doLoad(params: LoadParams<Int>): LoadResult<Int, UiProfile> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiProfile> {
         val config = service.config()
         if (config.data?.login != true) {
-            return LoadResult.Error(
-                LoginExpiredException(
-                    accountKey = accountKey,
-                    platformType = PlatformType.VVo,
-                ),
+            throw LoginExpiredException(
+                accountKey = accountKey,
+                platformType = PlatformType.VVo,
             )
         }
+
+        val page =
+            when (request) {
+                PagingRequest.Refresh -> null
+                is PagingRequest.Prepend -> {
+                    return PagingResult(
+                        endOfPaginationReached = true,
+                    )
+                }
+                is PagingRequest.Append -> request.nextKey?.toIntOrNull()
+            }
+
         val response =
             service.getContainerIndex(
                 containerId = containerId,
                 pageType = "searchall",
-                page = params.key,
+                page = page,
             )
         val users =
             response.data
@@ -44,10 +56,10 @@ internal class SearchUserPagingSource(
                 }?.mapNotNull {
                     it.user
                 }.orEmpty()
-        return LoadResult.Page(
+
+        return PagingResult(
             data = users.map { it.render(accountKey = accountKey) },
-            prevKey = null,
-            nextKey = if (users.isEmpty()) null else params.key?.plus(1),
+            nextKey = if (users.isEmpty()) null else ((page ?: 0) + 1).toString(),
         )
     }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/StatusCommentRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/StatusCommentRemoteMediator.kt
index 7add6deaa..249b1c8f6 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/StatusCommentRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/StatusCommentRemoteMediator.kt
@@ -1,33 +1,28 @@
 package dev.dimension.flare.data.datasource.vvo
 
-import SnowflakeIdGenerator
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.vvo.VVOService
 import dev.dimension.flare.data.repository.LoginExpiredException
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class StatusCommentRemoteMediator(
-    database: CacheDatabase,
     private val service: VVOService,
     private val statusKey: MicroBlogKey,
     private val accountKey: MicroBlogKey,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String = "status_comments_${statusKey}_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val config = service.config()
         if (config.data?.login != true) {
             throw LoginExpiredException(
@@ -39,12 +34,11 @@ internal class StatusCommentRemoteMediator(
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
-                    service
-                        .getHotComments(
-                            id = statusKey.id,
-                            mid = statusKey.id,
-                            maxId = null,
-                        )
+                    service.getHotComments(
+                        id = statusKey.id,
+                        mid = statusKey.id,
+                        maxId = null,
+                    )
                 }
 
                 is PagingRequest.Prepend -> {
@@ -63,22 +57,13 @@ internal class StatusCommentRemoteMediator(
             }
 
         val maxId = response.data?.maxID?.takeIf { it != 0L }
-        val comments = response.data?.data.orEmpty()
-
-        val data =
-            comments.map { comment ->
-                comment.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                    sortIdProvider = { item ->
-                        -SnowflakeIdGenerator.nextId()
-                    },
-                )
-            }
-
         return PagingResult(
             endOfPaginationReached = maxId == null,
-            data = data,
+            data =
+                response.data
+                    ?.data
+                    .orEmpty()
+                    .map { it.render(accountKey) },
             nextKey = maxId?.toString(),
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/StatusRepostRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/StatusRepostRemoteMediator.kt
index 95ea72b06..1f064f5e8 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/StatusRepostRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/StatusRepostRemoteMediator.kt
@@ -1,32 +1,28 @@
 package dev.dimension.flare.data.datasource.vvo
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.vvo.VVOService
 import dev.dimension.flare.data.repository.LoginExpiredException
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class StatusRepostRemoteMediator(
     private val service: VVOService,
     private val statusKey: MicroBlogKey,
     private val accountKey: MicroBlogKey,
-    private val database: CacheDatabase,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String = "status_reposts_${statusKey}_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val config = service.config()
         if (config.data?.login != true) {
             throw LoginExpiredException(
@@ -39,53 +35,23 @@ internal class StatusRepostRemoteMediator(
             when (request) {
                 PagingRequest.Refresh -> 1
                 is PagingRequest.Append -> request.nextKey.toIntOrNull() ?: 1
-                is PagingRequest.Prepend -> return PagingResult(endOfPaginationReached = true)
-            }
-
-        val response =
-            when (request) {
-                PagingRequest.Refresh -> {
-                    service
-                        .getRepostTimeline(
-                            id = statusKey.id,
-                            page = page,
-                        )
-                }
-
                 is PagingRequest.Prepend -> {
                     return PagingResult(
                         endOfPaginationReached = true,
                     )
                 }
-
-                is PagingRequest.Append -> {
-                    service.getRepostTimeline(
-                        id = statusKey.id,
-                        page = page,
-                    )
-                }
             }
 
-        val statuses =
-            response.data
-                ?.data
-                .orEmpty()
-
-        val data =
-            statuses.map { status ->
-                status.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                    sortIdProvider = { item ->
-                        val index = statuses.indexOf(item)
-                        -(index + page * pageSize).toLong()
-                    },
-                )
-            }
+        val response =
+            service.getRepostTimeline(
+                id = statusKey.id,
+                page = page,
+            )
 
+        val statuses = response.data?.data.orEmpty()
         return PagingResult(
             endOfPaginationReached = statuses.isEmpty(),
-            data = data,
+            data = statuses.map { it.render(accountKey) },
             nextKey = (page + 1).toString(),
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/TrendHashtagPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/TrendHashtagPagingSource.kt
index 28949dcdc..cfdc68fab 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/TrendHashtagPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/TrendHashtagPagingSource.kt
@@ -1,7 +1,8 @@
 package dev.dimension.flare.data.datasource.vvo
 
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.vvo.VVOService
 import dev.dimension.flare.data.repository.LoginExpiredException
 import dev.dimension.flare.model.MicroBlogKey
@@ -11,44 +12,49 @@ import dev.dimension.flare.ui.model.UiHashtag
 internal class TrendHashtagPagingSource(
     private val accountKey: MicroBlogKey,
     private val service: VVOService,
-) : BasePagingSource<Int, UiHashtag>() {
+) : RemoteLoader<UiHashtag> {
     private val containerId = "106003type=25&filter_type=realtimehot"
 
-    override fun getRefreshKey(state: PagingState<Int, UiHashtag>): Int? = null
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiHashtag> {
+        if (request is PagingRequest.Prepend || request is PagingRequest.Append) {
+            return PagingResult(
+                endOfPaginationReached = true,
+            )
+        }
 
-    override suspend fun doLoad(params: LoadParams<Int>): LoadResult<Int, UiHashtag> {
         val config = service.config()
         if (config.data?.login != true) {
-            return LoadResult.Error(
-                LoginExpiredException(
-                    accountKey = accountKey,
-                    platformType = PlatformType.VVo,
-                ),
+            throw LoginExpiredException(
+                accountKey = accountKey,
+                platformType = PlatformType.VVo,
             )
         }
-        service
-            .getContainerIndex(containerId = containerId)
-            .data
-            ?.cards
-            ?.flatMap {
-                it.cardGroup.orEmpty()
-            }?.mapNotNull {
-                it.desc
-            }?.map {
-                UiHashtag(
-                    hashtag = it,
-                    description = null,
-                    searchContent = "#$it#",
-                )
-            }?.toList()
-            ?.take(10)
-            .orEmpty()
-            .let {
-                return LoadResult.Page(
-                    data = it,
-                    prevKey = null,
-                    nextKey = null,
-                )
-            }
+
+        val data =
+            service
+                .getContainerIndex(containerId = containerId)
+                .data
+                ?.cards
+                ?.flatMap {
+                    it.cardGroup.orEmpty()
+                }?.mapNotNull {
+                    it.desc
+                }?.map {
+                    UiHashtag(
+                        hashtag = it,
+                        description = null,
+                        searchContent = "#$it#",
+                    )
+                }?.toList()
+                ?.take(10)
+                .orEmpty()
+
+        return PagingResult(
+            data = data,
+            endOfPaginationReached = true,
+        )
     }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/UserTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/UserTimelineRemoteMediator.kt
index 212370de3..c212cf9e5 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/UserTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/UserTimelineRemoteMediator.kt
@@ -1,11 +1,7 @@
 package dev.dimension.flare.data.datasource.vvo
 
-import SnowflakeIdGenerator
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.vvo.VVOService
@@ -13,18 +9,17 @@ import dev.dimension.flare.data.repository.LoginExpiredException
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
 import dev.dimension.flare.model.vvo
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class UserTimelineRemoteMediator(
     private val userKey: MicroBlogKey,
     private val service: VVOService,
-    private val database: CacheDatabase,
     private val accountKey: MicroBlogKey,
     private val mediaOnly: Boolean,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
-    override val pagingKey =
+) : CacheableRemoteLoader<UiTimelineV2> {
+    override val pagingKey: String =
         buildString {
             append("user_timeline")
             if (mediaOnly) {
@@ -33,14 +28,14 @@ internal class UserTimelineRemoteMediator(
             append(accountKey.toString())
             append(userKey.toString())
         }
+
     private var containerid: String? = null
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         if (mediaOnly) {
-            // Not supported yet
             return PagingResult(
                 endOfPaginationReached = true,
             )
@@ -53,6 +48,7 @@ internal class UserTimelineRemoteMediator(
                 platformType = PlatformType.VVo,
             )
         }
+
         if (containerid == null) {
             containerid =
                 service
@@ -64,15 +60,15 @@ internal class UserTimelineRemoteMediator(
                         it.tabType == vvo
                     }?.containerid
         }
+
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
-                    service
-                        .getContainerIndex(
-                            type = "uid",
-                            value = userKey.id,
-                            containerId = containerid,
-                        )
+                    service.getContainerIndex(
+                        type = "uid",
+                        value = userKey.id,
+                        containerId = containerid,
+                    )
                 }
 
                 is PagingRequest.Prepend -> {
@@ -90,22 +86,13 @@ internal class UserTimelineRemoteMediator(
                     )
                 }
             }
-        val status =
+
+        val data =
             response.data
                 ?.cards
                 ?.mapNotNull { it.mblog }
                 .orEmpty()
-
-        val data =
-            status.map { statusItem ->
-                statusItem.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                    sortIdProvider = {
-                        -SnowflakeIdGenerator.nextId()
-                    },
-                )
-            }
+                .map { it.render(accountKey) }
 
         return PagingResult(
             endOfPaginationReached = response.data?.cardlistInfo?.sinceID == null,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt
index 30830af66..01f6e175f 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt
@@ -1,83 +1,67 @@
 package dev.dimension.flare.data.datasource.vvo
 
 import androidx.paging.ExperimentalPagingApi
-import androidx.paging.Pager
-import androidx.paging.PagingData
-import androidx.paging.cachedIn
 import dev.dimension.flare.common.CacheData
-import dev.dimension.flare.common.Cacheable
 import dev.dimension.flare.common.FileItem
 import dev.dimension.flare.common.FileType
 import dev.dimension.flare.common.InAppNotification
 import dev.dimension.flare.common.MemCacheable
 import dev.dimension.flare.common.decodeJson
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.connect
-import dev.dimension.flare.data.database.cache.mapper.VVO
-import dev.dimension.flare.data.database.cache.mapper.toDbUser
-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.database.cache.model.updateStatusUseCase
 import dev.dimension.flare.data.datasource.microblog.AuthenticatedMicroblogDataSource
 import dev.dimension.flare.data.datasource.microblog.ComposeConfig
 import dev.dimension.flare.data.datasource.microblog.ComposeData
 import dev.dimension.flare.data.datasource.microblog.ComposeProgress
 import dev.dimension.flare.data.datasource.microblog.ComposeType
+import dev.dimension.flare.data.datasource.microblog.DatabaseUpdater
 import dev.dimension.flare.data.datasource.microblog.NotificationFilter
-import dev.dimension.flare.data.datasource.microblog.ProfileAction
+import dev.dimension.flare.data.datasource.microblog.PostEvent
 import dev.dimension.flare.data.datasource.microblog.ProfileTab
-import dev.dimension.flare.data.datasource.microblog.StatusEvent
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
-import dev.dimension.flare.data.datasource.microblog.pagingConfig
-import dev.dimension.flare.data.datasource.microblog.relationKeyWithUserKey
-import dev.dimension.flare.data.datasource.microblog.timelinePager
+import dev.dimension.flare.data.datasource.microblog.datasource.NotificationDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.PostDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.RelationDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.UserDataSource
+import dev.dimension.flare.data.datasource.microblog.handler.EmojiHandler
+import dev.dimension.flare.data.datasource.microblog.handler.NotificationHandler
+import dev.dimension.flare.data.datasource.microblog.handler.PostEventHandler
+import dev.dimension.flare.data.datasource.microblog.handler.PostHandler
+import dev.dimension.flare.data.datasource.microblog.handler.RelationHandler
+import dev.dimension.flare.data.datasource.microblog.handler.UserHandler
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.vvo.VVOService
 import dev.dimension.flare.data.network.vvo.model.StatusDetailItem
 import dev.dimension.flare.data.repository.AccountRepository
-import dev.dimension.flare.data.repository.LocalFilterRepository
 import dev.dimension.flare.data.repository.LoginExpiredException
-import dev.dimension.flare.data.repository.tryRun
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
 import dev.dimension.flare.shared.image.ImageCompressor
 import dev.dimension.flare.ui.model.UiAccount
-import dev.dimension.flare.ui.model.UiEmoji
 import dev.dimension.flare.ui.model.UiHashtag
 import dev.dimension.flare.ui.model.UiProfile
-import dev.dimension.flare.ui.model.UiRelation
 import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.mapper.render
-import dev.dimension.flare.ui.model.mapper.toUi
 import dev.dimension.flare.ui.model.toUi
 import dev.dimension.flare.ui.presenter.compose.ComposeStatus
 import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toImmutableList
-import kotlinx.collections.immutable.toImmutableMap
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.mapNotNull
-import kotlinx.coroutines.launch
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
-import kotlin.time.Clock
 
 @OptIn(ExperimentalPagingApi::class)
 internal class VVODataSource(
     override val accountKey: MicroBlogKey,
 ) : AuthenticatedMicroblogDataSource,
     KoinComponent,
-    StatusEvent.VVO {
-    private val database: CacheDatabase by inject()
-    private val localFilterRepository: LocalFilterRepository by inject()
-    private val coroutineScope: CoroutineScope by inject()
+    NotificationDataSource,
+    UserDataSource,
+    RelationDataSource,
+    PostDataSource,
+    PostEventHandler.Handler {
     private val accountRepository: AccountRepository by inject()
     private val inAppNotification: InAppNotification by inject()
     private val imageCompressor: ImageCompressor by inject()
@@ -90,66 +74,103 @@ internal class VVODataSource(
         )
     }
 
+    private val loader by lazy {
+        VVOLoader(
+            accountKey = accountKey,
+            service = service,
+        )
+    }
+
+    private val emojiHandler by lazy {
+        EmojiHandler(
+            host = accountKey.host,
+            loader = loader,
+        )
+    }
+
+    override val notificationHandler by lazy {
+        NotificationHandler(
+            accountKey = accountKey,
+            loader = loader,
+        )
+    }
+
+    override val userHandler by lazy {
+        UserHandler(
+            accountKey = accountKey,
+            loader = loader,
+        )
+    }
+
+    override val postHandler by lazy {
+        PostHandler(
+            accountType = AccountType.Specific(accountKey),
+            loader = loader,
+        )
+    }
+
+    override val relationHandler by lazy {
+        RelationHandler(
+            dataSource = loader,
+        )
+    }
+
+    override val postEventHandler by lazy {
+        PostEventHandler(
+            accountKey = accountKey,
+            handler = this,
+        )
+    }
+
+    override suspend fun handle(
+        event: PostEvent,
+        updater: DatabaseUpdater,
+    ) {
+        require(event is PostEvent.VVO)
+        when (event) {
+            is PostEvent.VVO.Favorite -> favorite(event)
+            is PostEvent.VVO.Like -> like(event)
+            is PostEvent.VVO.LikeComment -> likeComment(event)
+        }
+    }
+
     override fun homeTimeline() =
         HomeTimelineRemoteMediator(
-            service,
-            database,
-            accountKey,
-            inAppNotification,
+            service = service,
+            accountKey = accountKey,
+            inAppNotification = inAppNotification,
         )
 
-    override fun notification(
-        type: NotificationFilter,
-        pageSize: Int,
-        scope: CoroutineScope,
-    ): Flow<PagingData<UiTimeline>> =
+    override fun notification(type: NotificationFilter): RemoteLoader<UiTimelineV2> =
         when (type) {
-            NotificationFilter.All -> TODO()
-            NotificationFilter.Mention ->
-                timelinePager(
-                    pageSize = pageSize,
-                    database = database,
-                    scope = scope,
-                    filterFlow = localFilterRepository.getFlow(forTimeline = true),
-                    accountRepository = accountRepository,
-                    mediator =
-                        MentionRemoteMediator(
-                            service,
-                            database,
-                            accountKey,
-                            onClearMarker = {
-                                MemCacheable.update(notificationMarkerMentionKey, 0)
-                            },
-                        ),
+            NotificationFilter.All,
+            NotificationFilter.Mention,
+            ->
+                MentionRemoteMediator(
+                    service = service,
+                    accountKey = accountKey,
+                    onClearMarker = {
+                        MemCacheable.update(notificationMarkerMentionKey, 0)
+                    },
                 )
 
             NotificationFilter.Comment ->
-                Pager(
-                    config = pagingConfig,
-                ) {
-                    CommentPagingSource(
-                        service = service,
-                        accountKey = accountKey,
-                        event = this,
-                        onClearMarker = {
-                            MemCacheable.update(notificationMarkerCommentKey, 0)
-                        },
-                    )
-                }.flow.cachedIn(scope)
+                CommentPagingSource(
+                    service = service,
+                    accountKey = accountKey,
+                    onClearMarker = {
+                        MemCacheable.update(notificationMarkerCommentKey, 0)
+                    },
+                )
 
             NotificationFilter.Like ->
-                Pager(
-                    config = pagingConfig,
-                ) {
-                    LikePagingSource(
-                        service = service,
-                        accountKey = accountKey,
-                        event = this,
-                        onClearMarker = {
-                            MemCacheable.update(notificationMarkerLikeKey, 0)
-                        },
-                    )
-                }.flow.cachedIn(scope)
+                LikePagingSource(
+                    service = service,
+                    accountKey = accountKey,
+                    onClearMarker = {
+                        MemCacheable.update(notificationMarkerLikeKey, 0)
+                    },
+                )
         }
 
     override val supportedNotificationFilter: List<NotificationFilter>
@@ -160,210 +181,118 @@ internal class VVODataSource(
                 NotificationFilter.Like,
             )
 
-    override fun userByAcct(acct: String): CacheData<UiProfile> {
-        val (name, host) = MicroBlogKey.valueOf(acct.removePrefix("@"))
-        return Cacheable(
-            fetchSource = {
-                val config = service.config()
-                val uid = service.getUid(name)
-                requireNotNull(uid) { "user not found" }
-                val st = config.data?.st
-                requireNotNull(st) { "st is null" }
-                val profile = service.profileInfo(uid, st)
-                val user = profile.data?.user?.toDbUser()
-                requireNotNull(user) { "user not found" }
-                database.userDao().insert(user)
-            },
-            cacheSource = {
-                database
-                    .userDao()
-                    .findByHandleAndHost(name, host, PlatformType.VVo)
-                    .distinctUntilChanged()
-                    .mapNotNull { it?.render(accountKey) }
-            },
-        )
-    }
-
-    override fun userById(id: String): CacheData<UiProfile> {
-        val userKey = MicroBlogKey(id, accountKey.host)
-        return Cacheable(
-            fetchSource = {
-                val config = service.config()
-                if (config.data?.login != true) {
-                    throw LoginExpiredException(
-                        accountKey = accountKey,
-                        platformType = PlatformType.VVo,
-                    )
-                }
-                val st = config.data.st
-                requireNotNull(st) { "st is null" }
-                val profile = service.profileInfo(id, st)
-                val user = profile.data?.user?.toDbUser()
-                requireNotNull(user) { "user not found" }
-                database.userDao().insert(user)
-            },
-            cacheSource = {
-                database
-                    .userDao()
-                    .findByKey(userKey)
-                    .distinctUntilChanged()
-                    .mapNotNull { it?.render(accountKey) }
-            },
-        )
-    }
-
-    override fun relation(userKey: MicroBlogKey): Flow<UiState<UiRelation>> =
-        MemCacheable<UiRelation>(
-            relationKeyWithUserKey(userKey),
-        ) {
-            val config = service.config()
-            if (config.data?.login != true) {
-                throw LoginExpiredException(
-                    accountKey = accountKey,
-                    platformType = PlatformType.VVo,
-                )
-            }
-            val st = config.data.st
-            requireNotNull(st) { "st is null" }
-            val profile = service.profileInfo(userKey.id, st)
-            val user =
-                profile.data
-                    ?.user
-            requireNotNull(user) { "user not found" }
-            UiRelation(
-                following = user.following,
-                isFans = user.followMe ?: false,
-            )
-        }.toUi()
-
     override fun userTimeline(
         userKey: MicroBlogKey,
         mediaOnly: Boolean,
     ) = UserTimelineRemoteMediator(
         userKey = userKey,
         service = service,
-        database = database,
         accountKey = accountKey,
         mediaOnly = mediaOnly,
     )
 
-    override fun context(statusKey: MicroBlogKey): BaseTimelineLoader {
-        TODO("Not yet implemented")
-    }
+    override fun context(statusKey: MicroBlogKey): RemoteLoader<UiTimelineV2> =
+        object : RemoteLoader<UiTimelineV2> {
+            override suspend fun load(
+                pageSize: Int,
+                request: PagingRequest,
+            ): PagingResult<UiTimelineV2> {
+                when (request) {
+                    is PagingRequest.Prepend,
+                    is PagingRequest.Append,
+                    ->
+                        return PagingResult(
+                            endOfPaginationReached = true,
+                        )
 
-    override fun status(statusKey: MicroBlogKey): CacheData<UiTimeline> {
-        val pagingKey = "status_only_$statusKey"
-        val regex =
-            "\\\$render_data\\s*=\\s*(\\[\\{.*?\\}\\])\\[0\\]\\s*\\|\\|\\s*\\{\\};"
-                .toRegex()
-        return Cacheable(
-            fetchSource = {
-                val response =
-                    service
-                        .getStatusDetail(statusKey.id)
-                        .split("\n")
-                        .joinToString("")
-                val json =
-                    regex
-                        .find(response)
-                        ?.groupValues
-                        ?.get(1)
-                        ?.decodeJson<List<StatusDetailItem>>()
-                        ?: throw Exception("status not found")
-                val item = json.firstOrNull()?.status
-
-                if (item != null) {
-                    VVO.saveStatus(
-                        accountKey = accountKey,
-                        pagingKey = pagingKey,
-                        database = database,
-                        statuses = listOf(item),
-                    )
-                } else {
-                    throw Exception("status not found")
+                    PagingRequest.Refresh -> Unit
                 }
-            },
-            cacheSource = {
-                database
-                    .statusDao()
-                    .get(statusKey, accountType = AccountType.Specific(accountKey))
-                    .distinctUntilChanged()
-                    .mapNotNull { it?.content?.render(this) }
-            },
-        )
-    }
 
-    fun comment(statusKey: MicroBlogKey): CacheData<UiTimeline> {
-        val pagingKey = "comment_only_$statusKey"
-        return Cacheable(
-            fetchSource = {
-                val item =
+                val status = loadStatusDetail(statusKey)
+                val comments =
                     service
-                        .getHotFlowChild(statusKey.id)
-                        .rootComment
-                        ?.firstOrNull()
-                if (item != null) {
-                    // prevent overwrite status with empty quote
-//                    VVO.saveComment(
-//                        accountKey = accountKey,
-//                        pagingKey = pagingKey,
-//                        database = database,
-//                        statuses = listOf(item),
-//                    )
-                } else {
-                    throw Exception("status not found")
-                }
-            },
-            cacheSource = {
-                database
-                    .statusDao()
-                    .get(statusKey, accountType = AccountType.Specific(accountKey))
-                    .distinctUntilChanged()
-                    .mapNotNull { it?.content?.render(event = this) }
-            },
+                        .getHotComments(
+                            id = statusKey.id,
+                            mid = statusKey.id,
+                            maxId = null,
+                        ).data
+                        ?.data
+                        .orEmpty()
+                        .map { it.render(accountKey) }
+
+                return PagingResult(
+                    endOfPaginationReached = true,
+                    data = listOf(status) + comments,
+                )
+            }
+        }
+
+    override fun searchStatus(query: String) =
+        SearchStatusRemoteMediator(
+            service = service,
+            accountKey = accountKey,
+            query = query,
         )
-    }
 
-    private suspend fun uploadMedia(
-        fileItem: FileItem,
-        st: String,
-    ): String {
-        val bytes = fileItem.readBytes()
-        val isImage = fileItem.type == FileType.Image
+    override fun searchUser(query: String): RemoteLoader<UiProfile> =
+        SearchUserPagingSource(
+            service = service,
+            accountKey = accountKey,
+            query = query,
+        )
 
-        val finalBytes =
-            if (isImage) {
-                imageCompressor.compress(
-                    imageBytes = bytes,
-                    maxSize = 5 * 1024 * 1024,
-                    maxDimensions = 4096 to 4096,
+    override fun discoverUsers(): RemoteLoader<UiProfile> =
+        object : RemoteLoader<UiProfile> {
+            override suspend fun load(
+                pageSize: Int,
+                request: PagingRequest,
+            ): PagingResult<UiProfile> =
+                PagingResult(
+                    endOfPaginationReached = true,
                 )
-            } else {
-                bytes
-            }
-        val response =
-            service.uploadPic(
-                st = st,
-                bytes = finalBytes,
-                filename = fileItem.name ?: "file",
-            )
-        return response.picID ?: throw Exception("upload failed")
-    }
+        }
+
+    override fun discoverStatuses() =
+        DiscoverStatusRemoteMediator(
+            service = service,
+            accountKey = accountKey,
+        )
+
+    override fun discoverHashtags(): RemoteLoader<UiHashtag> =
+        TrendHashtagPagingSource(
+            accountKey = accountKey,
+            service = service,
+        )
+
+    override fun following(userKey: MicroBlogKey): RemoteLoader<UiProfile> =
+        FollowingPagingSource(
+            service = service,
+            userKey = userKey,
+            accountKey = accountKey,
+        )
+
+    override fun fans(userKey: MicroBlogKey): RemoteLoader<UiProfile> =
+        FansPagingSource(
+            service = service,
+            userKey = userKey,
+            accountKey = accountKey,
+        )
+
+    override fun profileTabs(userKey: MicroBlogKey): ImmutableList<ProfileTab> =
+        persistentListOf(
+            ProfileTab.Timeline(
+                type = ProfileTab.Timeline.Type.Status,
+                loader = userTimeline(userKey, false),
+            ),
+        )
 
     override suspend fun compose(
         data: ComposeData,
         progress: (ComposeProgress) -> Unit,
     ) {
         val maxProgress = data.medias.size + 1
-        val config = service.config()
-        if (config.data?.login != true) {
-            throw LoginExpiredException(
-                accountKey = accountKey,
-                platformType = PlatformType.VVo,
-            )
-        }
-        val st = config.data.st
-        requireNotNull(st) { "st is null" }
+        val st = ensureLogin()
+
         val mediaIds =
             data.medias.mapIndexed { index, (it, _) ->
                 uploadMedia(it, st).also {
@@ -404,76 +333,6 @@ internal class VVODataSource(
         }
     }
 
-    override suspend fun deleteStatus(statusKey: MicroBlogKey) {
-        val config = service.config()
-        if (config.data?.login != true) {
-            throw LoginExpiredException(
-                accountKey = accountKey,
-                platformType = PlatformType.VVo,
-            )
-        }
-        val st = config.data.st
-        requireNotNull(st) { "st is null" }
-        service.deleteStatus(
-            mid = statusKey.id,
-            st = st,
-        )
-        database.connect {
-            database.statusDao().delete(
-                statusKey = statusKey,
-                accountType = AccountType.Specific(accountKey),
-            )
-            database.statusReferenceDao().delete(statusKey)
-            database.pagingTimelineDao().deleteStatus(
-                accountKey = accountKey,
-                statusKey = statusKey,
-            )
-        }
-    }
-
-    override fun searchStatus(query: String) =
-        SearchStatusRemoteMediator(
-            service,
-            database,
-            accountKey,
-            query,
-        )
-
-    override fun searchUser(
-        query: String,
-        pageSize: Int,
-    ): Flow<PagingData<UiProfile>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            SearchUserPagingSource(
-                service = service,
-                accountKey = accountKey,
-                query = query,
-            )
-        }.flow
-
-    override fun discoverUsers(pageSize: Int): Flow<PagingData<UiProfile>> {
-        TODO("Not yet implemented")
-    }
-
-    override fun discoverStatuses() =
-        DiscoverStatusRemoteMediator(
-            service,
-            database,
-            accountKey,
-        )
-
-    override fun discoverHashtags(pageSize: Int): Flow<PagingData<UiHashtag>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            TrendHashtagPagingSource(
-                accountKey = accountKey,
-                service = service,
-            )
-        }.flow
-
     override fun composeConfig(type: ComposeType): ComposeConfig =
         ComposeConfig(
             text = ComposeConfig.Text(2000),
@@ -484,395 +343,142 @@ internal class VVODataSource(
                     altTextMaxLength = -1,
                     allowMediaOnly = false,
                 ),
-            emoji = ComposeConfig.Emoji(emoji = emoji(), mergeTag = "vvo@${accountKey.host}"),
-        )
-
-    fun emoji(): Cacheable<ImmutableMap<String, ImmutableList<UiEmoji>>> =
-        Cacheable(
-            fetchSource = {
-                val emojis = service.emojis()
-                database
-                    .emojiDao()
-                    .insert(
-                        DbEmoji(
-                            accountKey.host,
-                            EmojiContent.VVO(emojis),
-                        ),
-                    )
-            },
-            cacheSource = {
-                database
-                    .emojiDao()
-                    .get(accountKey.host)
-                    .distinctUntilChanged()
-                    .mapNotNull {
-                        it
-                            ?.toUi()
-                            ?.groupBy { it.category }
-                            ?.map { it.key to it.value.toImmutableList() }
-                            ?.toMap()
-                            ?.toImmutableMap()
-                    }
-            },
+            emoji = ComposeConfig.Emoji(emoji = emojiHandler.emoji, mergeTag = "vvo@${accountKey.host}"),
         )
 
-    override suspend fun follow(
-        userKey: MicroBlogKey,
-        relation: UiRelation,
-    ) {
-        if (relation.following) {
-            unfollow(userKey)
+    private suspend fun like(event: PostEvent.VVO.Like) {
+        val st = ensureLogin()
+        if (event.liked) {
+            service.unlikeStatus(id = event.postKey.id, st = st)
         } else {
-            follow(userKey)
+            service.likeStatus(id = event.postKey.id, st = st)
         }
     }
 
-    override fun profileActions(): List<ProfileAction> = emptyList()
-
-    suspend fun follow(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                following = true,
-            )
-        }
-        tryRun {
-            val config = service.config()
-            if (config.data?.login != true) {
-                throw LoginExpiredException(
-                    accountKey = accountKey,
-                    platformType = PlatformType.VVo,
-                )
-            }
-            val st = config.data.st
-            requireNotNull(st) { "st is null" }
-            service.follow(
-                st = st,
-                uid = userKey.id,
-            )
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    following = false,
-                )
-            }
+    private suspend fun likeComment(event: PostEvent.VVO.LikeComment) {
+        val st = ensureLogin()
+        if (event.liked) {
+            service.likesDestroy(id = event.postKey.id, st = st)
+        } else {
+            service.likesUpdate(id = event.postKey.id, st = st)
         }
     }
 
-    suspend fun unfollow(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                following = false,
-            )
-        }
-        tryRun {
-            val config = service.config()
-            if (config.data?.login != true) {
-                throw LoginExpiredException(
-                    accountKey = accountKey,
-                    platformType = PlatformType.VVo,
-                )
-            }
-            val st = config.data.st
-            requireNotNull(st) { "st is null" }
-            service.unfollow(
-                st = st,
-                uid = userKey.id,
-            )
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    following = true,
-                )
-            }
+    private suspend fun favorite(event: PostEvent.VVO.Favorite) {
+        val st = ensureLogin()
+        if (event.favorited) {
+            service.unfavoriteStatus(id = event.postKey.id, st = st)
+        } else {
+            service.favoriteStatus(id = event.postKey.id, st = st)
         }
     }
 
-    fun statusComment(
-        statusKey: MicroBlogKey,
-        scope: CoroutineScope,
-    ): Flow<PagingData<UiTimeline>> {
-        val pagingKey = "status_comment_$statusKey"
-        return timelinePager(
-            pageSize = 20,
-            database = database,
-            scope = scope,
-            filterFlow = localFilterRepository.getFlow(forTimeline = true),
-            accountRepository = accountRepository,
-            mediator =
-                StatusCommentRemoteMediator(
-                    service = service,
-                    accountKey = accountKey,
-                    statusKey = statusKey,
-                    database = database,
-                ),
+    fun favouriteTimeline() =
+        FavouriteRemoteMediator(
+            service = service,
+            accountKey = accountKey,
         )
-    }
 
-    fun statusRepost(
-        statusKey: MicroBlogKey,
-        scope: CoroutineScope,
-    ): Flow<PagingData<UiTimeline>> {
-        val pagingKey = "status_repost_$statusKey"
-        return timelinePager(
-            pageSize = 20,
-            database = database,
-            scope = scope,
-            filterFlow = localFilterRepository.getFlow(forTimeline = true),
-            accountRepository = accountRepository,
-            mediator =
-                StatusRepostRemoteMediator(
-                    service = service,
-                    accountKey = accountKey,
-                    statusKey = statusKey,
-                    database = database,
-                ),
+    fun likeRemoteMediator() =
+        LikeRemoteMediator(
+            service = service,
+            accountKey = accountKey,
         )
-    }
 
-    fun commentChild(
-        commentKey: MicroBlogKey,
-        scope: CoroutineScope,
-    ): Flow<PagingData<UiTimeline>> {
-        val pagingKey = "comment_child_$commentKey"
-        return timelinePager(
-            pageSize = 20,
-            database = database,
-            scope = scope,
-            filterFlow = localFilterRepository.getFlow(forTimeline = true),
-            accountRepository = accountRepository,
-            mediator =
-                CommentChildRemoteMediator(
-                    service = service,
-                    accountKey = accountKey,
-                    commentKey = commentKey,
-                    database = database,
-                ),
+    fun statusComment(statusKey: MicroBlogKey): RemoteLoader<UiTimelineV2> =
+        StatusCommentRemoteMediator(
+            service = service,
+            accountKey = accountKey,
+            statusKey = statusKey,
         )
-    }
+
+    fun statusRepost(statusKey: MicroBlogKey): RemoteLoader<UiTimelineV2> =
+        StatusRepostRemoteMediator(
+            service = service,
+            accountKey = accountKey,
+            statusKey = statusKey,
+        )
+
+    fun commentChild(commentKey: MicroBlogKey): RemoteLoader<UiTimelineV2> =
+        CommentChildRemoteMediator(
+            service = service,
+            accountKey = accountKey,
+            commentKey = commentKey,
+        )
+
+    fun comment(statusKey: MicroBlogKey): CacheData<UiTimelineV2> =
+        MemCacheable("vvo_comment_$accountKey_$statusKey") {
+            service
+                .getHotFlowChild(statusKey.id)
+                .rootComment
+                ?.firstOrNull()
+                ?.render(accountKey)
+                ?: throw Exception("status not found")
+        }
 
     fun statusExtendedText(statusKey: MicroBlogKey): Flow<UiState<String>> =
         MemCacheable(
             "status_extended_text_$statusKey",
         ) {
-            val config = service.config()
-            if (config.data?.login != true) {
-                throw LoginExpiredException(
-                    accountKey = accountKey,
-                    platformType = PlatformType.VVo,
-                )
-            }
-            val st = config.data.st
-            requireNotNull(st) { "st is null" }
+            val st = ensureLogin()
             val response = service.getStatusExtend(statusKey.id, st)
             response.data?.longTextContent.orEmpty()
         }.toUi()
 
-    override fun like(
-        statusKey: MicroBlogKey,
-        liked: Boolean,
-    ) {
-        coroutineScope.launch {
-            updateStatusUseCase<StatusContent.VVO>(
-                statusKey = statusKey,
-                accountKey = accountKey,
-                cacheDatabase = database,
-                update = {
-                    it.copy(
-                        data =
-                            it.data.copy(
-                                liked = !liked,
-                                attitudesCount =
-                                    if (liked) {
-                                        it.data.attitudesCount?.minus(1)
-                                    } else {
-                                        it.data.attitudesCount?.plus(1)
-                                    },
-                            ),
-                    )
-                },
-            )
+    private suspend fun uploadMedia(
+        fileItem: FileItem,
+        st: String,
+    ): String {
+        val bytes = fileItem.readBytes()
+        val isImage = fileItem.type == FileType.Image
 
-            tryRun {
-                val config = service.config()
-                if (config.data?.login != true) {
-                    throw LoginExpiredException(
-                        accountKey = accountKey,
-                        platformType = PlatformType.VVo,
-                    )
-                }
-                val st = config.data.st
-                requireNotNull(st) { "st is null" }
-                if (liked) {
-                    service.unlikeStatus(id = statusKey.id, st = st)
-                } else {
-                    service.likeStatus(id = statusKey.id, st = st)
-                }
-            }.onFailure {
-                updateStatusUseCase<StatusContent.VVO>(
-                    statusKey = statusKey,
-                    accountKey = accountKey,
-                    cacheDatabase = database,
-                    update = {
-                        it.copy(
-                            data =
-                                it.data.copy(
-                                    liked = liked,
-                                    attitudesCount =
-                                        if (liked) {
-                                            it.data.attitudesCount?.plus(1)
-                                        } else {
-                                            it.data.attitudesCount?.minus(1)
-                                        },
-                                ),
-                        )
-                    },
+        val finalBytes =
+            if (isImage) {
+                imageCompressor.compress(
+                    imageBytes = bytes,
+                    maxSize = 5 * 1024 * 1024,
+                    maxDimensions = 4096 to 4096,
                 )
-            }.onSuccess {
+            } else {
+                bytes
             }
-        }
+        val response =
+            service.uploadPic(
+                st = st,
+                bytes = finalBytes,
+                filename = fileItem.name ?: "file",
+            )
+        return response.picID ?: throw Exception("upload failed")
     }
 
-    override fun likeComment(
-        statusKey: MicroBlogKey,
-        liked: Boolean,
-    ) {
-        coroutineScope.launch {
-            updateStatusUseCase<StatusContent.VVOComment>(
-                statusKey = statusKey,
+    private suspend fun ensureLogin(): String {
+        val config = service.config()
+        if (config.data?.login != true) {
+            throw LoginExpiredException(
                 accountKey = accountKey,
-                cacheDatabase = database,
-                update = {
-                    it.copy(
-                        data =
-                            it.data.copy(
-                                liked = !liked,
-                                likeCount =
-                                    if (liked) {
-                                        it.data.likeCount?.minus(1)
-                                    } else {
-                                        it.data.likeCount?.plus(1)
-                                    },
-                            ),
-                    )
-                },
+                platformType = PlatformType.VVo,
             )
-
-            tryRun {
-                val config = service.config()
-                if (config.data?.login != true) {
-                    throw LoginExpiredException(
-                        accountKey = accountKey,
-                        platformType = PlatformType.VVo,
-                    )
-                }
-                val st = config.data.st
-                requireNotNull(st) { "st is null" }
-                if (liked) {
-                    service.likesDestroy(id = statusKey.id, st = st)
-                } else {
-                    service.likesUpdate(id = statusKey.id, st = st)
-                }
-            }.onFailure {
-                updateStatusUseCase<StatusContent.VVOComment>(
-                    statusKey = statusKey,
-                    accountKey = accountKey,
-                    cacheDatabase = database,
-                    update = {
-                        it.copy(
-                            data =
-                                it.data.copy(
-                                    liked = liked,
-                                    likeCount =
-                                        if (liked) {
-                                            it.data.likeCount?.plus(1)
-                                        } else {
-                                            it.data.likeCount?.minus(1)
-                                        },
-                                ),
-                        )
-                    },
-                )
-            }.onSuccess {
-            }
         }
+        return requireNotNull(config.data.st) { "st is null" }
     }
 
-    override fun favorite(
-        statusKey: MicroBlogKey,
-        favorited: Boolean,
-    ) {
-        coroutineScope.launch {
-            updateStatusUseCase<StatusContent.VVO>(
-                statusKey = statusKey,
-                accountKey = accountKey,
-                cacheDatabase = database,
-                update = {
-                    it.copy(
-                        data =
-                            it.data.copy(
-                                favorited = !favorited,
-                            ),
-                    )
-                },
-            )
-
-            tryRun {
-                val config = service.config()
-                if (config.data?.login != true) {
-                    throw LoginExpiredException(
-                        accountKey = accountKey,
-                        platformType = PlatformType.VVo,
-                    )
-                }
-                val st = config.data.st
-                requireNotNull(st) { "st is null" }
-                if (favorited) {
-                    service.unfavoriteStatus(id = statusKey.id, st = st)
-                } else {
-                    service.favoriteStatus(id = statusKey.id, st = st)
-                }
-            }.onFailure {
-                updateStatusUseCase<StatusContent.VVO>(
-                    statusKey = statusKey,
-                    accountKey = accountKey,
-                    cacheDatabase = database,
-                    update = {
-                        it.copy(
-                            data =
-                                it.data.copy(
-                                    favorited = favorited,
-                                ),
-                        )
-                    },
-                )
-            }.onSuccess {
-                if (it.ok != 1L) {
-                    updateStatusUseCase<StatusContent.VVO>(
-                        statusKey = statusKey,
-                        accountKey = accountKey,
-                        cacheDatabase = database,
-                        update = {
-                            it.copy(
-                                data =
-                                    it.data.copy(
-                                        favorited = favorited,
-                                    ),
-                            )
-                        },
-                    )
-                }
-            }
-        }
+    private suspend fun loadStatusDetail(statusKey: MicroBlogKey): UiTimelineV2 {
+        val regex =
+            "\\\$render_data\\s*=\\s*(\\[\\{.*?\\}\\])\\[0\\]\\s*\\|\\|\\s*\\{\\};".toRegex()
+        val response =
+            service
+                .getStatusDetail(statusKey.id)
+                .split("\n")
+                .joinToString("")
+        val json =
+            regex
+                .find(response)
+                ?.groupValues
+                ?.get(1)
+                ?.decodeJson<List<StatusDetailItem>>()
+                ?: throw Exception("status not found")
+
+        return json.firstOrNull()?.status?.render(accountKey) ?: throw Exception("status not found")
     }
 
     private val notificationMarkerMentionKey: String
@@ -883,91 +489,4 @@ internal class VVODataSource(
 
     private val notificationMarkerLikeKey: String
         get() = "notificationBadgeCount_like_$accountKey"
-
-    override fun notificationBadgeCount(): CacheData<Int> =
-        Cacheable(
-            fetchSource = {
-                val config = service.config()
-                if (config.data?.login != true) {
-                    throw LoginExpiredException(
-                        accountKey = accountKey,
-                        platformType = PlatformType.VVo,
-                    )
-                }
-                val st = config.data.st
-                requireNotNull(st) { "st is null" }
-                val response =
-                    service.remindUnread(
-                        time = Clock.System.now().toEpochMilliseconds() / 1000,
-                        st = st,
-                    )
-                val mention = response.data?.mentionStatus ?: 0
-                val comment = response.data?.cmt ?: 0
-                val like = response.data?.attitude ?: 0
-
-                MemCacheable.update(notificationMarkerMentionKey, mention)
-                MemCacheable.update(notificationMarkerCommentKey, comment)
-                MemCacheable.update(notificationMarkerLikeKey, like)
-            },
-            cacheSource = {
-                val mentionFlow = MemCacheable.subscribe<Long>(notificationMarkerMentionKey)
-                val commentFlow = MemCacheable.subscribe<Long>(notificationMarkerCommentKey)
-                val likeFlow = MemCacheable.subscribe<Long>(notificationMarkerLikeKey)
-                combine(mentionFlow, commentFlow, likeFlow) { mention, comment, like ->
-                    (mention + comment + like).toInt()
-                }
-            },
-        )
-
-    override fun following(
-        userKey: MicroBlogKey,
-        scope: CoroutineScope,
-        pageSize: Int,
-    ): Flow<PagingData<UiProfile>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            FollowingPagingSource(
-                service = service,
-                userKey = userKey,
-                accountKey = accountKey,
-            )
-        }.flow.cachedIn(scope)
-
-    override fun fans(
-        userKey: MicroBlogKey,
-        scope: CoroutineScope,
-        pageSize: Int,
-    ): Flow<PagingData<UiProfile>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            FansPagingSource(
-                service = service,
-                userKey = userKey,
-                accountKey = accountKey,
-            )
-        }.flow.cachedIn(scope)
-
-    override fun profileTabs(userKey: MicroBlogKey): ImmutableList<ProfileTab> =
-        persistentListOf(
-            ProfileTab.Timeline(
-                type = ProfileTab.Timeline.Type.Status,
-                loader = userTimeline(userKey, false),
-            ),
-        )
-
-    fun favouriteTimeline() =
-        FavouriteRemoteMediator(
-            service = service,
-            database = database,
-            accountKey = accountKey,
-        )
-
-    fun likeRemoteMediator() =
-        LikeRemoteMediator(
-            service = service,
-            database = database,
-            accountKey = accountKey,
-        )
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVOLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVOLoader.kt
new file mode 100644
index 000000000..b948174c5
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVOLoader.kt
@@ -0,0 +1,164 @@
+package dev.dimension.flare.data.datasource.vvo
+
+import dev.dimension.flare.common.decodeJson
+import dev.dimension.flare.data.datasource.microblog.loader.EmojiLoader
+import dev.dimension.flare.data.datasource.microblog.loader.NotificationLoader
+import dev.dimension.flare.data.datasource.microblog.loader.PostLoader
+import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
+import dev.dimension.flare.data.datasource.microblog.loader.UserLoader
+import dev.dimension.flare.data.network.vvo.VVOService
+import dev.dimension.flare.data.network.vvo.model.StatusDetailItem
+import dev.dimension.flare.data.repository.LoginExpiredException
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.model.PlatformType
+import dev.dimension.flare.ui.model.UiEmoji
+import dev.dimension.flare.ui.model.UiProfile
+import dev.dimension.flare.ui.model.UiRelation
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
+import kotlin.time.Clock
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.collections.immutable.toImmutableMap
+
+internal class VVOLoader(
+    override val accountKey: MicroBlogKey,
+    private val service: VVOService,
+) : NotificationLoader,
+    UserLoader,
+    RelationLoader,
+    EmojiLoader,
+    PostLoader {
+    override suspend fun notificationBadgeCount(): Int {
+        val st = ensureLogin()
+        val response =
+            service.remindUnread(
+                time = Clock.System.now().toEpochMilliseconds() / 1000,
+                st = st,
+            )
+        val mention = response.data?.mentionStatus ?: 0
+        val comment = response.data?.cmt ?: 0
+        val like = response.data?.attitude ?: 0
+        return (mention + comment + like).toInt()
+    }
+
+    override suspend fun userByHandleAndHost(
+        handle: String,
+        host: String,
+    ): UiProfile {
+        val uid = service.getUid(handle) ?: error("user not found")
+        return userById(uid)
+    }
+
+    override suspend fun userById(id: String): UiProfile {
+        val st = ensureLogin()
+        val profile = service.profileInfo(id, st)
+        val user = profile.data?.user ?: error("user not found")
+        return user.render(accountKey)
+    }
+
+    override suspend fun relation(userKey: MicroBlogKey): UiRelation {
+        val st = ensureLogin()
+        val profile = service.profileInfo(userKey.id, st)
+        val user = profile.data?.user ?: error("user not found")
+        return UiRelation(
+            following = user.following,
+            isFans = user.followMe ?: false,
+        )
+    }
+
+    override suspend fun follow(userKey: MicroBlogKey) {
+        val st = ensureLogin()
+        service.follow(
+            st = st,
+            uid = userKey.id,
+        )
+    }
+
+    override suspend fun unfollow(userKey: MicroBlogKey) {
+        val st = ensureLogin()
+        service.unfollow(
+            st = st,
+            uid = userKey.id,
+        )
+    }
+
+    override suspend fun block(userKey: MicroBlogKey) {
+        error("VVO does not support block")
+    }
+
+    override suspend fun unblock(userKey: MicroBlogKey) {
+        error("VVO does not support unblock")
+    }
+
+    override suspend fun mute(userKey: MicroBlogKey) {
+        error("VVO does not support mute")
+    }
+
+    override suspend fun unmute(userKey: MicroBlogKey) {
+        error("VVO does not support unmute")
+    }
+
+    override suspend fun emojis(): ImmutableMap<String, ImmutableList<UiEmoji>> =
+        service
+            .emojis()
+            .data
+            ?.emoticon
+            ?.zhCN
+            .orEmpty()
+            .map { (category, values) ->
+                category to
+                    values
+                        .mapNotNull { emoji ->
+                            val phrase = emoji.phrase ?: return@mapNotNull null
+                            val url = emoji.url ?: return@mapNotNull null
+                            UiEmoji(
+                                shortcode = phrase,
+                                url = url,
+                                category = category,
+                                searchKeywords = listOf(phrase).toImmutableList(),
+                                insertText = "$phrase ",
+                            )
+                        }.toImmutableList()
+            }.toMap()
+            .toImmutableMap()
+
+    override suspend fun status(statusKey: MicroBlogKey): UiTimelineV2 {
+        val regex =
+            "\\\$render_data\\s*=\\s*(\\[\\{.*?\\}\\])\\[0\\]\\s*\\|\\|\\s*\\{\\};".toRegex()
+        val response =
+            service
+                .getStatusDetail(statusKey.id)
+                .split("\n")
+                .joinToString("")
+        val json =
+            regex
+                .find(response)
+                ?.groupValues
+                ?.get(1)
+                ?.decodeJson<List<StatusDetailItem>>()
+                ?: throw Exception("status not found")
+
+        return json.firstOrNull()?.status?.render(accountKey) ?: throw Exception("status not found")
+    }
+
+    override suspend fun deleteStatus(statusKey: MicroBlogKey) {
+        val st = ensureLogin()
+        service.deleteStatus(
+            mid = statusKey.id,
+            st = st,
+        )
+    }
+
+    private suspend fun ensureLogin(): String {
+        val config = service.config()
+        if (config.data?.login != true) {
+            throw LoginExpiredException(
+                accountKey = accountKey,
+                platformType = PlatformType.VVo,
+            )
+        }
+        return requireNotNull(config.data.st) { "st is null" }
+    }
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/VVO.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/VVO.kt
index 7ad0c8e01..a20434a98 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/VVO.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/VVO.kt
@@ -4,7 +4,8 @@ import com.fleeksoft.ksoup.nodes.Element
 import com.fleeksoft.ksoup.nodes.Node
 import com.fleeksoft.ksoup.nodes.TextNode
 import dev.dimension.flare.data.datasource.microblog.ActionMenu
-import dev.dimension.flare.data.datasource.microblog.StatusEvent
+import dev.dimension.flare.data.datasource.microblog.PostEvent
+import dev.dimension.flare.data.datasource.microblog.userActionsMenu
 import dev.dimension.flare.data.network.vvo.model.Attitude
 import dev.dimension.flare.data.network.vvo.model.Comment
 import dev.dimension.flare.data.network.vvo.model.Status
@@ -16,70 +17,80 @@ import dev.dimension.flare.model.vvoHost
 import dev.dimension.flare.model.vvoHostLong
 import dev.dimension.flare.model.vvoHostShort
 import dev.dimension.flare.ui.model.ClickEvent
+import dev.dimension.flare.ui.model.UiIcon
 import dev.dimension.flare.ui.model.UiMedia
 import dev.dimension.flare.ui.model.UiNumber
 import dev.dimension.flare.ui.model.UiProfile
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.render.parseHtml
 import dev.dimension.flare.ui.render.toUi
 import dev.dimension.flare.ui.route.DeeplinkRoute
 import dev.dimension.flare.ui.route.toUri
 import io.ktor.http.decodeURLPart
+import kotlin.time.Clock
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableMap
-import kotlin.time.Clock
 
-internal fun Status.render(
-    accountKey: MicroBlogKey,
-    event: StatusEvent.VVO,
-): UiTimeline {
-    val message = title?.text
-    return UiTimeline(
-        topMessage =
-            message?.let {
-                UiTimeline.TopMessage(
-                    user = null,
-                    icon = UiTimeline.TopMessage.Icon.Info,
-                    type =
-                        UiTimeline.TopMessage.MessageType.VVO
-                            .Custom(it),
-                    onClicked = {
+internal fun Status.render(accountKey: MicroBlogKey): UiTimelineV2 = renderStatusV2(accountKey)
+
+internal fun Comment.render(accountKey: MicroBlogKey): UiTimelineV2 = renderStatusV2(accountKey)
+
+internal fun Attitude.render(accountKey: MicroBlogKey): UiTimelineV2 {
+    val content = status?.renderStatusV2(accountKey)
+    val user = user?.render(accountKey)
+    return UiTimelineV2.UserList(
+        message =
+            UiTimelineV2.Message(
+                user = user,
+                statusKey = MicroBlogKey(id.toString(), vvoHost),
+                icon = UiIcon.Like,
+                type = UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.Favourite),
+                createdAt = createdAt?.toUi() ?: Clock.System.now().toUi(),
+                clickEvent =
+                    if (user != null) {
+                        ClickEvent.Deeplink(
+                            DeeplinkRoute.Profile
+                                .User(
+                                    accountType = AccountType.Specific(accountKey),
+                                    userKey = user.key,
+                                ),
+                        )
+                    } else {
+                        ClickEvent.Noop
                     },
-                    statusKey = MicroBlogKey(id, vvoHost),
-                )
-            },
-        content = renderStatus(accountKey, event),
+                accountType = AccountType.Specific(accountKey),
+            ),
+        users = listOfNotNull(user).toImmutableList(),
+        post = content,
+        createdAt = createdAt?.toUi() ?: Clock.System.now().toUi(),
+        statusKey = MicroBlogKey(id.toString(), vvoHost),
+        accountType = AccountType.Specific(accountKey),
     )
 }
 
-internal fun Status.renderStatus(
-    accountKey: MicroBlogKey,
-    event: StatusEvent.VVO,
-): UiTimeline.ItemContent.Status {
+private fun Status.renderStatusV2(accountKey: MicroBlogKey): UiTimelineV2.Post {
     val media =
         picsList.orEmpty().mapNotNull {
             val url = it.large?.url ?: it.url
             if (url.isNullOrEmpty()) {
                 null
+            } else if (it.type == "video" && it.videoSrc != null) {
+                UiMedia.Video(
+                    url = it.videoSrc,
+                    thumbnailUrl = it.url ?: url,
+                    width = it.large?.geoValue?.widthValue ?: it.geoValue?.widthValue ?: 0f,
+                    height = it.large?.geoValue?.heightValue ?: it.geoValue?.heightValue ?: 0f,
+                    description = null,
+                )
             } else {
-                if (it.type == "video" && it.videoSrc != null) {
-                    UiMedia.Video(
-                        url = it.videoSrc,
-                        thumbnailUrl = it.url ?: url,
-                        width = it.large?.geoValue?.widthValue ?: it.geoValue?.widthValue ?: 0f,
-                        height = it.large?.geoValue?.heightValue ?: it.geoValue?.heightValue ?: 0f,
-                        description = null,
-                    )
-                } else {
-                    UiMedia.Image(
-                        url = url,
-                        width = it.large?.geoValue?.widthValue ?: it.geoValue?.widthValue ?: 0f,
-                        height = it.large?.geoValue?.heightValue ?: it.geoValue?.heightValue ?: 0f,
-                        previewUrl = it.url ?: url,
-                        description = null,
-                        sensitive = false,
-                    )
-                }
+                UiMedia.Image(
+                    url = url,
+                    width = it.large?.geoValue?.widthValue ?: it.geoValue?.widthValue ?: 0f,
+                    height = it.large?.geoValue?.heightValue ?: it.geoValue?.heightValue ?: 0f,
+                    previewUrl = it.url ?: url,
+                    description = null,
+                    sensitive = false,
+                )
             }
         }
     val pageInfoVideo =
@@ -138,184 +149,272 @@ internal fun Status.renderStatus(
         } ?: pageInfoVideo.takeIf {
             it.isNotEmpty()
         } ?: pageInfoImage
+
+    val user = this.user?.render(accountKey)
+    val isFromMe = user?.key == accountKey
+    val displayUser = user?.copy(handle = regionName ?: source ?: user.handle)
+    val statusKey = MicroBlogKey(id = id, host = vvoHost)
     val canReblog = visible?.type == null || visible.type == 0L
-    val rawUser = this.user?.render(accountKey)
-    val isFromMe = rawUser?.key == accountKey
-    val displayUser =
-        rawUser?.copy(
-            handle = regionName ?: source ?: rawUser.handle,
-        )
-    val element = renderVVOText(text.orEmpty(), accountKey)
-    val statusKey =
-        MicroBlogKey(
-            id = id,
-            host = vvoHost,
-        )
     val url =
         buildString {
             append("https://$vvoHostLong/")
-            append(user?.id)
+            append(this@renderStatusV2.user?.id)
             append('/')
             append(bid)
         }
-    return UiTimeline.ItemContent.Status(
-        statusKey = statusKey,
-        content = element.toUi(),
-        user = displayUser,
-        quote =
-            listOfNotNull(
-                retweetedStatus?.renderStatus(
-                    accountKey,
-                    event,
-                ),
-            ).toImmutableList(),
-        card = null,
-        contentWarning = null,
+
+    return UiTimelineV2.Post(
+        platformType = PlatformType.VVo,
         images = actualMedia.toImmutableList(),
+        sensitive = false,
+        contentWarning = null,
+        user = displayUser,
+        quote = listOfNotNull(retweetedStatus?.renderStatusV2(accountKey)).toImmutableList(),
+        content = renderVVOText(text.orEmpty(), accountKey).toUi(),
         actions =
             listOfNotNull(
                 if (canReblog) {
                     ActionMenu.Item(
-                        icon = ActionMenu.Item.Icon.Reply,
-                        text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Reply),
+                        icon = UiIcon.Quote,
+                        text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Quote),
                         count = UiNumber(repostsCount?.content?.toLongOrNull() ?: 0),
-                        onClicked = {
-                            launcher.launch(
-                                DeeplinkRoute.Compose
-                                    .Quote(
-                                        accountKey = accountKey,
-                                        statusKey = statusKey,
-                                    ).toUri(),
-                            )
-                        },
+                        clickEvent =
+                            ClickEvent.Deeplink(
+                                DeeplinkRoute.Compose.Quote(
+                                    accountKey = accountKey,
+                                    statusKey = statusKey,
+                                ),
+                            ),
                     )
                 } else {
                     null
                 },
                 ActionMenu.Item(
-                    icon = ActionMenu.Item.Icon.Comment,
+                    icon = UiIcon.Comment,
                     text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Comment),
                     count = UiNumber(commentsCount ?: 0),
-                    onClicked = {
-                        launcher.launch(
-                            DeeplinkRoute.Compose
-                                .Reply(
-                                    accountKey = accountKey,
-                                    statusKey = statusKey,
-                                ).toUri(),
-                        )
-                    },
-                ),
-                ActionMenu.Item(
-                    icon = if (liked == true) ActionMenu.Item.Icon.Unlike else ActionMenu.Item.Icon.Like,
-                    text =
-                        ActionMenu.Item.Text.Localized(
-                            if (liked == true) ActionMenu.Item.Text.Localized.Type.Unlike else ActionMenu.Item.Text.Localized.Type.Like,
+                    clickEvent =
+                        ClickEvent.Deeplink(
+                            DeeplinkRoute.Compose.Reply(
+                                accountKey = accountKey,
+                                statusKey = statusKey,
+                            ),
                         ),
-                    count = UiNumber(attitudesCount ?: 0),
-                    color = if (liked == true) ActionMenu.Item.Color.Red else null,
-                    onClicked = {
-                        event.like(statusKey, liked ?: false)
-                    },
+                ),
+                ActionMenu.vvoLike(
+                    statusKey = statusKey,
+                    liked = liked == true,
+                    count = attitudesCount ?: 0,
+                    accountKey = accountKey,
                 ),
                 ActionMenu.Group(
                     displayItem =
                         ActionMenu.Item(
-                            icon = ActionMenu.Item.Icon.More,
+                            icon = UiIcon.More,
                             text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.More),
                         ),
                     actions =
                         listOfNotNull(
-                            ActionMenu.Item(
-                                icon = if (favorited == true) ActionMenu.Item.Icon.Unbookmark else ActionMenu.Item.Icon.Bookmark,
-                                text =
-                                    ActionMenu.Item.Text.Localized(
-                                        if (favorited ==
-                                            true
-                                        ) {
-                                            ActionMenu.Item.Text.Localized.Type.Unbookmark
-                                        } else {
-                                            ActionMenu.Item.Text.Localized.Type.Bookmark
-                                        },
-                                    ),
-                                count = UiNumber(0),
-                                onClicked = {
-                                    event.favorite(statusKey, favorited ?: false)
-                                },
+                            ActionMenu.vvoFavorite(
+                                statusKey = statusKey,
+                                favorited = favorited == true,
+                                accountKey = accountKey,
                             ),
                             ActionMenu.Item(
-                                icon = ActionMenu.Item.Icon.Share,
+                                icon = UiIcon.Share,
                                 text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Share),
-                                onClicked = {
-                                    launcher.launch(
-                                        DeeplinkRoute.Status
-                                            .ShareSheet(
-                                                statusKey = statusKey,
-                                                accountType = AccountType.Specific(accountKey),
-                                                shareUrl = url,
-                                            ).toUri(),
-                                    )
-                                },
+                                clickEvent =
+                                    ClickEvent.Deeplink(
+                                        DeeplinkRoute.Status.ShareSheet(
+                                            statusKey = statusKey,
+                                            accountType = AccountType.Specific(accountKey),
+                                            shareUrl = url,
+                                        ),
+                                    ),
                             ),
                             if (isFromMe) {
                                 ActionMenu.Item(
-                                    icon = ActionMenu.Item.Icon.Delete,
+                                    icon = UiIcon.Delete,
                                     text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Delete),
                                     color = ActionMenu.Item.Color.Red,
-                                    onClicked = {
-                                        launcher.launch(
-                                            DeeplinkRoute.Status
-                                                .DeleteConfirm(
-                                                    accountType = AccountType.Specific(accountKey),
-                                                    statusKey = statusKey,
-                                                ).toUri(),
-                                        )
-                                    },
+                                    clickEvent =
+                                        ClickEvent.Deeplink(
+                                            DeeplinkRoute.Status.DeleteConfirm(
+                                                accountType = AccountType.Specific(accountKey),
+                                                statusKey = statusKey,
+                                            ),
+                                        ),
                                 )
                             } else {
+                                null
+                            },
+                            *userActionsMenu(
+                                accountKey = accountKey,
+                                userKey = user?.key ?: statusKey,
+                                handle = user?.handle ?: "",
+                            ).toTypedArray(),
+                        ).toImmutableList(),
+                ),
+            ).toImmutableList(),
+        poll = null,
+        statusKey = statusKey,
+        card = null,
+        createdAt = createdAt?.toUi() ?: Clock.System.now().toUi(),
+        clickEvent =
+            ClickEvent.Deeplink(
+                DeeplinkRoute.Status.VVOStatus(
+                    statusKey = statusKey,
+                    accountType = AccountType.Specific(accountKey),
+                ),
+            ),
+        accountType = AccountType.Specific(accountKey),
+    )
+}
+
+private fun Comment.renderStatusV2(accountKey: MicroBlogKey): UiTimelineV2.Post {
+    val statusKey = MicroBlogKey(id = id, host = vvoHost)
+    val statusMid =
+        status?.mid ?: analysis_extra
+            ?.split('|')
+            ?.mapNotNull {
+                val pair = it.split(':')
+                if (pair.size == 2) pair[0] to pair[1] else null
+            }?.toMap()
+            ?.get("mid")
+    val user = this.user?.render(accountKey)
+    val isFromMe = user?.key == accountKey
+    val displayUser = user?.copy(handle = source ?: user.handle)
+    val url =
+        buildString {
+            append("https://$vvoHostLong/")
+            append(this@renderStatusV2.user?.id)
+            append('/')
+            append(bid)
+        }
+    val media =
+        listOfNotNull(
+            pic?.let {
+                val imageUrl = it.large?.url ?: it.url
+                val previewUrl = it.url ?: imageUrl
+                if (!imageUrl.isNullOrEmpty() && !previewUrl.isNullOrEmpty()) {
+                    UiMedia.Image(
+                        url = imageUrl,
+                        width = it.large?.geoValue?.widthValue ?: it.geoValue?.widthValue ?: 0f,
+                        height = it.large?.geoValue?.heightValue ?: it.geoValue?.heightValue ?: 0f,
+                        previewUrl = previewUrl,
+                        description = null,
+                        sensitive = false,
+                    )
+                } else {
+                    null
+                }
+            },
+        )
+
+    val quote =
+        commentList
+            ?.map {
+                it.renderStatusV2(accountKey).copy(
+                    clickEvent =
+                        ClickEvent.Deeplink(
+                            DeeplinkRoute.Status.VVOComment(
+                                commentKey = statusKey,
+                                accountType = AccountType.Specific(accountKey),
+                            ),
+                        ),
+                )
+            }?.toImmutableList()
+            ?: listOfNotNull(status?.renderStatusV2(accountKey)).toImmutableList()
+
+    return UiTimelineV2.Post(
+        platformType = PlatformType.VVo,
+        images = media.toImmutableList(),
+        sensitive = false,
+        contentWarning = null,
+        user = displayUser,
+        quote = quote,
+        content = renderVVOText(text.orEmpty(), accountKey).toUi(),
+        actions =
+            listOfNotNull(
+                statusMid?.let {
+                    ActionMenu.Item(
+                        icon = UiIcon.Comment,
+                        text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Comment),
+                        count = UiNumber(totalNumber ?: 0),
+                        clickEvent =
+                            ClickEvent.Deeplink(
+                                DeeplinkRoute.Compose.VVOReplyComment(
+                                    accountKey = accountKey,
+                                    replyTo = statusKey,
+                                    rootId = statusMid,
+                                ),
+                            ),
+                    )
+                },
+                ActionMenu.vvoLikeComment(
+                    statusKey = statusKey,
+                    liked = liked == true,
+                    count = likeCount ?: 0,
+                    accountKey = accountKey,
+                ),
+                ActionMenu.Group(
+                    displayItem =
+                        ActionMenu.Item(
+                            icon = UiIcon.More,
+                            text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.More),
+                        ),
+                    actions =
+                        listOfNotNull(
+                            ActionMenu.Item(
+                                icon = UiIcon.Share,
+                                text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Share),
+                                clickEvent =
+                                    ClickEvent.Deeplink(
+                                        DeeplinkRoute.Status.ShareSheet(
+                                            statusKey = statusKey,
+                                            accountType = AccountType.Specific(accountKey),
+                                            shareUrl = url,
+                                        ),
+                                    ),
+                            ),
+                            if (isFromMe) {
                                 ActionMenu.Item(
-                                    icon = ActionMenu.Item.Icon.Report,
-                                    text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Report),
+                                    icon = UiIcon.Delete,
+                                    text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Delete),
                                     color = ActionMenu.Item.Color.Red,
-                                    onClicked = {
-                                        // TODO: Report
-                                    },
+                                    clickEvent =
+                                        ClickEvent.Deeplink(
+                                            DeeplinkRoute.Status.DeleteConfirm(
+                                                accountType = AccountType.Specific(accountKey),
+                                                statusKey = statusKey,
+                                            ),
+                                        ),
                                 )
+                            } else {
+                                null
                             },
                         ).toImmutableList(),
                 ),
             ).toImmutableList(),
         poll = null,
+        statusKey = statusKey,
+        card = null,
         createdAt = createdAt?.toUi() ?: Clock.System.now().toUi(),
-        sensitive = false,
-        onClicked = {
-            launcher.launch(
-                DeeplinkRoute.Status
-                    .VVOStatus(
-                        statusKey = statusKey,
+        clickEvent =
+            ClickEvent.Deeplink(
+                if (status != null) {
+                    DeeplinkRoute.Status.VVOStatus(
+                        statusKey = status.renderStatusV2(accountKey).statusKey,
                         accountType = AccountType.Specific(accountKey),
-                    ).toUri(),
-            )
-        },
-        platformType = PlatformType.VVo,
-        onMediaClicked = { media, index ->
-            launcher.launch(
-                DeeplinkRoute.Media
-                    .StatusMedia(
+                    )
+                } else {
+                    DeeplinkRoute.Status.VVOComment(
+                        commentKey = statusKey,
                         accountType = AccountType.Specific(accountKey),
-                        statusKey = statusKey,
-                        index = index,
-                        preview =
-                            when (media) {
-                                is UiMedia.Image -> media.previewUrl
-                                is UiMedia.Video -> media.thumbnailUrl
-                                is UiMedia.Audio -> null
-                                is UiMedia.Gif -> media.previewUrl
-                            },
-                    ).toUri(),
-            )
-        },
-        url = url,
+                    )
+                },
+            ),
+        accountType = AccountType.Specific(accountKey),
     )
 }
 
@@ -376,266 +475,91 @@ internal fun User.render(accountKey: MicroBlogKey): UiProfile {
         platformType = PlatformType.VVo,
         clickEvent =
             ClickEvent.Deeplink(
-                DeeplinkRoute.Profile.User(accountType = AccountType.Specific(accountKey), userKey = userKey).toUri(),
+                DeeplinkRoute.Profile.User(
+                    accountType = AccountType.Specific(accountKey),
+                    userKey = userKey,
+                ),
             ),
     )
 }
 
-internal fun Comment.render(
+internal fun ActionMenu.Companion.vvoLike(
+    statusKey: MicroBlogKey,
+    liked: Boolean,
+    count: Long,
     accountKey: MicroBlogKey,
-    event: StatusEvent.VVO,
-): UiTimeline =
-    UiTimeline(
-        topMessage = null,
-        content = renderStatus(accountKey, event),
+): ActionMenu.Item =
+    ActionMenu.Item(
+        updateKey = "vvo_like_$statusKey",
+        icon = if (liked) UiIcon.Unlike else UiIcon.Like,
+        text =
+            ActionMenu.Item.Text.Localized(
+                if (liked) ActionMenu.Item.Text.Localized.Type.Unlike else ActionMenu.Item.Text.Localized.Type.Like,
+            ),
+        count = UiNumber(count),
+        color = if (liked) ActionMenu.Item.Color.Red else null,
+        clickEvent =
+            ClickEvent.event(
+                accountKey,
+                PostEvent.VVO.Like(
+                    postKey = statusKey,
+                    liked = liked,
+                    count = count,
+                    accountKey = accountKey,
+                ),
+            ),
     )
 
-internal fun Comment.renderStatus(
+internal fun ActionMenu.Companion.vvoLikeComment(
+    statusKey: MicroBlogKey,
+    liked: Boolean,
+    count: Long,
     accountKey: MicroBlogKey,
-    event: StatusEvent.VVO,
-): UiTimeline.ItemContent.Status {
-    val element = renderVVOText(text.orEmpty(), accountKey)
-    val rawUser = this.user?.render(accountKey)
-    val isFromMe = rawUser?.key == accountKey
-    val displayUser =
-        rawUser?.copy(
-            handle = source ?: rawUser.handle,
-        )
-    val statusKey =
-        MicroBlogKey(
-            id = id,
-            host = vvoHost,
-        )
-    val statusMid =
-        status?.mid ?: run {
-            analysis_extra
-                ?.split('|')
-                ?.mapNotNull {
-                    val pair = it.split(':')
-                    if (pair.size == 2) {
-                        pair[0] to pair[1]
-                    } else {
-                        null
-                    }
-                }?.toMap()
-                ?.get("mid")
-        }
-    val url =
-        buildString {
-            append("https://$vvoHostLong/")
-            append(user?.id)
-            append('/')
-            append(bid)
-        }
-
-    return UiTimeline.ItemContent.Status(
-        statusKey = statusKey,
-        content = element.toUi(),
-        user = displayUser,
-        quote =
-            commentList
-                ?.map {
-                    it
-                        .renderStatus(
-                            accountKey,
-                            event,
-                        ).copy(
-                            onClicked = {
-                                launcher.launch(
-                                    DeeplinkRoute.Status
-                                        .VVOComment(
-                                            commentKey = statusKey,
-                                            accountType = AccountType.Specific(accountKey),
-                                        ).toUri(),
-                                )
-                            },
-                        )
-                }?.toImmutableList() ?: listOfNotNull(status)
-                .map {
-                    it.renderStatus(
-                        accountKey,
-                        event,
-                    )
-                }.toImmutableList(),
-        card = null,
-        contentWarning = null,
-        images =
-            listOfNotNull(
-                pic?.let {
-                    val url = it.large?.url ?: it.url
-                    val previewUrl = it.url ?: url
-                    if (!url.isNullOrEmpty() && !previewUrl.isNullOrEmpty()) {
-                        UiMedia.Image(
-                            url = url,
-                            width = it.large?.geoValue?.widthValue ?: it.geoValue?.widthValue ?: 0f,
-                            height = it.large?.geoValue?.heightValue ?: it.geoValue?.heightValue ?: 0f,
-                            previewUrl = previewUrl,
-                            description = null,
-                            sensitive = false,
-                        )
-                    } else {
-                        null
-                    }
-                },
-            ).toImmutableList(),
-        poll = null,
-        actions =
-            listOfNotNull(
-                statusMid?.let {
-                    ActionMenu.Item(
-                        icon = ActionMenu.Item.Icon.Comment,
-                        text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Comment),
-                        count = UiNumber(totalNumber ?: 0),
-                        onClicked = {
-                            launcher.launch(
-                                DeeplinkRoute.Compose
-                                    .VVOReplyComment(
-                                        accountKey = accountKey,
-                                        replyTo = statusKey,
-                                        rootId = statusMid,
-                                    ).toUri(),
-                            )
-                        },
-                    )
-                },
-                ActionMenu.Item(
-                    icon = if (liked == true) ActionMenu.Item.Icon.Unlike else ActionMenu.Item.Icon.Like,
-                    text =
-                        ActionMenu.Item.Text.Localized(
-                            if (liked == true) ActionMenu.Item.Text.Localized.Type.Unlike else ActionMenu.Item.Text.Localized.Type.Like,
-                        ),
-                    count = UiNumber(likeCount ?: 0),
-                    color = if (liked == true) ActionMenu.Item.Color.Red else null,
-                    onClicked = {
-                        event.likeComment(statusKey, liked ?: false)
-                    },
-                ),
-                ActionMenu.Group(
-                    displayItem =
-                        ActionMenu.Item(
-                            icon = ActionMenu.Item.Icon.More,
-                            text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.More),
-                        ),
-                    actions =
-                        listOfNotNull(
-                            ActionMenu.Item(
-                                icon = ActionMenu.Item.Icon.Share,
-                                text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Share),
-                                onClicked = {
-                                    launcher.launch(
-                                        DeeplinkRoute.Status
-                                            .ShareSheet(
-                                                statusKey = statusKey,
-                                                accountType = AccountType.Specific(accountKey),
-                                                shareUrl = url,
-                                            ).toUri(),
-                                    )
-                                },
-                            ),
-                            if (isFromMe) {
-                                ActionMenu.Item(
-                                    icon = ActionMenu.Item.Icon.Delete,
-                                    text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Delete),
-                                    color = ActionMenu.Item.Color.Red,
-                                    onClicked = {
-                                        launcher.launch(
-                                            DeeplinkRoute.Status
-                                                .DeleteConfirm(
-                                                    accountType = AccountType.Specific(accountKey),
-                                                    statusKey = statusKey,
-                                                ).toUri(),
-                                        )
-                                    },
-                                )
-                            } else {
-                                ActionMenu.Item(
-                                    icon = ActionMenu.Item.Icon.Report,
-                                    text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Report),
-                                    color = ActionMenu.Item.Color.Red,
-                                    onClicked = {
-                                        // TODO: Report
-                                    },
-                                )
-                            },
-                        ).toImmutableList(),
+): ActionMenu.Item =
+    ActionMenu.Item(
+        updateKey = "vvo_like_comment_$statusKey",
+        icon = if (liked) UiIcon.Unlike else UiIcon.Like,
+        text =
+            ActionMenu.Item.Text.Localized(
+                if (liked) ActionMenu.Item.Text.Localized.Type.Unlike else ActionMenu.Item.Text.Localized.Type.Like,
+            ),
+        count = UiNumber(count),
+        color = if (liked) ActionMenu.Item.Color.Red else null,
+        clickEvent =
+            ClickEvent.event(
+                accountKey,
+                PostEvent.VVO.LikeComment(
+                    postKey = statusKey,
+                    liked = liked,
+                    count = count,
+                    accountKey = accountKey,
                 ),
-            ).toImmutableList(),
-        createdAt = createdAt?.toUi() ?: Clock.System.now().toUi(),
-        sensitive = false,
-        onClicked = {
-            if (status != null) {
-                launcher.launch(
-                    DeeplinkRoute.Status
-                        .VVOStatus(
-                            statusKey = status.renderStatus(accountKey, event).statusKey,
-                            accountType = AccountType.Specific(accountKey),
-                        ).toUri(),
-                )
-            } else {
-                launcher.launch(
-                    DeeplinkRoute.Status
-                        .VVOComment(
-                            commentKey = statusKey,
-                            accountType = AccountType.Specific(accountKey),
-                        ).toUri(),
-                )
-            }
-        },
-        platformType = PlatformType.VVo,
-        onMediaClicked = { media, index ->
-            launcher.launch(
-                DeeplinkRoute.Media
-                    .StatusMedia(
-                        accountType = AccountType.Specific(accountKey),
-                        statusKey = statusKey,
-                        index = index,
-                        preview =
-                            when (media) {
-                                is UiMedia.Image -> media.previewUrl
-                                is UiMedia.Video -> media.thumbnailUrl
-                                is UiMedia.Audio -> null
-                                is UiMedia.Gif -> media.previewUrl
-                            },
-                    ).toUri(),
-            )
-        },
-        url = url,
+            ),
     )
-}
 
-internal fun Attitude.render(
+internal fun ActionMenu.Companion.vvoFavorite(
+    statusKey: MicroBlogKey,
+    favorited: Boolean,
     accountKey: MicroBlogKey,
-    event: StatusEvent.VVO,
-): UiTimeline {
-    val content = status?.renderStatus(accountKey, event)
-    val user = user?.render(accountKey)
-    val userListContent =
-        UiTimeline.ItemContent.UserList(
-            users = listOfNotNull(user).toImmutableList(),
-            status = content,
-        )
-    return UiTimeline(
-        topMessage =
-            UiTimeline.TopMessage(
-                user = user,
-                icon = UiTimeline.TopMessage.Icon.Favourite,
-                type = UiTimeline.TopMessage.MessageType.VVO.Like,
-                onClicked = {
-                    if (user != null) {
-                        launcher.launch(
-                            DeeplinkRoute.Profile
-                                .User(
-                                    accountType = AccountType.Specific(accountKey),
-                                    userKey = user.key,
-                                ).toUri(),
-                        )
-                    }
-                },
-                statusKey = MicroBlogKey(id.toString(), vvoHost),
+): ActionMenu.Item =
+    ActionMenu.Item(
+        updateKey = "vvo_favorite_$statusKey",
+        icon = if (favorited) UiIcon.Unbookmark else UiIcon.Bookmark,
+        text =
+            ActionMenu.Item.Text.Localized(
+                if (favorited) ActionMenu.Item.Text.Localized.Type.Unbookmark else ActionMenu.Item.Text.Localized.Type.Bookmark,
+            ),
+        count = UiNumber(0),
+        clickEvent =
+            ClickEvent.event(
+                accountKey,
+                PostEvent.VVO.Favorite(
+                    postKey = statusKey,
+                    favorited = favorited,
+                    accountKey = accountKey,
+                ),
             ),
-        content = userListContent,
     )
-}
 
 internal fun renderVVOText(
     text: String,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/VVOCommentPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/VVOCommentPresenter.kt
index 12093e24b..0b1586056 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/VVOCommentPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/VVOCommentPresenter.kt
@@ -3,19 +3,21 @@ package dev.dimension.flare.ui.presenter.status
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
+import androidx.paging.Pager
 import androidx.paging.compose.collectAsLazyPagingItems
 import dev.dimension.flare.common.PagingState
 import dev.dimension.flare.common.collectAsState
 import dev.dimension.flare.common.onSuccess
 import dev.dimension.flare.common.toPagingState
+import dev.dimension.flare.data.datasource.microblog.paging.toPagingSource
+import dev.dimension.flare.data.datasource.microblog.pagingConfig
 import dev.dimension.flare.data.datasource.vvo.VVODataSource
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceProvider
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.flatMap
 import dev.dimension.flare.ui.model.map
 import dev.dimension.flare.ui.model.toUi
@@ -33,7 +35,6 @@ public class VVOCommentPresenter(
 
     @Composable
     override fun body(): VVOCommentState {
-        val scope = rememberCoroutineScope()
         val serviceState = accountServiceProvider(accountType = accountType, repository = accountRepository)
         val root =
             serviceState
@@ -43,13 +44,13 @@ public class VVOCommentPresenter(
                         service.comment(commentKey)
                     }.collectAsState().toUi().map {
                         remember(it) {
-                            // hide quoted status to avoid confusion
-                            it.copy(
-                                content =
-                                    (it.content as? UiTimeline.ItemContent.Status)?.copy(
-                                        quote = persistentListOf(),
-                                    ),
-                            )
+                            if (it is UiTimelineV2.Post) {
+                                it.copy(
+                                    quote = persistentListOf(),
+                                )
+                            } else {
+                                it
+                            }
                         }
                     }
                 }
@@ -58,7 +59,9 @@ public class VVOCommentPresenter(
                 .map { service ->
                     remember(service) {
                         require(service is VVODataSource)
-                        service.commentChild(scope = scope, commentKey = commentKey)
+                        Pager(config = pagingConfig) {
+                            service.commentChild(commentKey = commentKey).toPagingSource()
+                        }.flow
                     }.collectAsLazyPagingItems()
                 }.toPagingState()
         return object : VVOCommentState {
@@ -76,8 +79,8 @@ public class VVOCommentPresenter(
 
 @Immutable
 public interface VVOCommentState {
-    public val root: UiState<UiTimeline>
-    public val list: PagingState<UiTimeline>
+    public val root: UiState<UiTimelineV2>
+    public val list: PagingState<UiTimelineV2>
 
     public suspend fun refresh()
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/VVOStatusDetailPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/VVOStatusDetailPresenter.kt
index 875c6bf87..a966e1f9e 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/VVOStatusDetailPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/VVOStatusDetailPresenter.kt
@@ -4,19 +4,21 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
+import androidx.paging.Pager
 import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.map
 import dev.dimension.flare.common.PagingState
 import dev.dimension.flare.common.collectAsState
 import dev.dimension.flare.common.toPagingState
+import dev.dimension.flare.data.datasource.microblog.paging.toPagingSource
+import dev.dimension.flare.data.datasource.microblog.pagingConfig
 import dev.dimension.flare.data.datasource.vvo.VVODataSource
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceProvider
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.flatMap
 import dev.dimension.flare.ui.model.map
 import dev.dimension.flare.ui.model.mapper.renderVVOText
@@ -37,13 +39,13 @@ public class VVOStatusDetailPresenter(
 
     @Composable
     override fun body(): VVOStatusDetailState {
-        val scope = rememberCoroutineScope()
         val service = accountServiceProvider(accountType, repository = accountRepository)
         val status =
             service
                 .flatMap {
                     remember(statusKey, accountType) {
-                        it.status(statusKey)
+                        require(it is VVODataSource)
+                        it.postHandler.post(statusKey)
                     }.collectAsState().toUi()
                 }
 
@@ -65,17 +67,13 @@ public class VVOStatusDetailPresenter(
                         is UiState.Error -> item
                         is UiState.Loading -> item
                         is UiState.Success -> {
-                            val content = item.content
-                            if (content is UiTimeline.ItemContent.Status) {
+                            if (item is UiTimelineV2.Post) {
                                 item.copy(
                                     content =
-                                        content.copy(
-                                            content =
-                                                renderVVOText(
-                                                    extendedText.data,
-                                                    service.accountKey,
-                                                ).toUi(),
-                                        ),
+                                        renderVVOText(
+                                            extendedText.data,
+                                            service.accountKey,
+                                        ).toUi(),
                                 )
                             } else {
                                 item
@@ -90,14 +88,17 @@ public class VVOStatusDetailPresenter(
                 .map {
                     require(it is VVODataSource)
                     remember(statusKey, accountType) {
-                        it.statusRepost(statusKey = statusKey, scope = scope).map {
-                            it.map {
-                                it.copy(
-                                    content =
-                                        (it.content as? UiTimeline.ItemContent.Status)?.copy(
-                                            quote = persistentListOf(),
-                                        ) ?: it.content,
-                                )
+                        Pager(config = pagingConfig) {
+                            it.statusRepost(statusKey = statusKey).toPagingSource()
+                        }.flow.map { data ->
+                            data.map { item ->
+                                if (item is UiTimelineV2.Post) {
+                                    item.copy(
+                                        quote = persistentListOf(),
+                                    )
+                                } else {
+                                    item
+                                }
                             }
                         }
                     }.collectAsLazyPagingItems()
@@ -108,7 +109,9 @@ public class VVOStatusDetailPresenter(
                 .map {
                     require(it is VVODataSource)
                     remember(statusKey, accountType) {
-                        it.statusComment(statusKey = statusKey, scope = scope)
+                        Pager(config = pagingConfig) {
+                            it.statusComment(statusKey = statusKey).toPagingSource()
+                        }.flow
                     }.collectAsLazyPagingItems()
                 }.toPagingState()
 
@@ -122,7 +125,7 @@ public class VVOStatusDetailPresenter(
 
 @Immutable
 public interface VVOStatusDetailState {
-    public val status: UiState<UiTimeline>
-    public val comment: PagingState<UiTimeline>
-    public val repost: PagingState<UiTimeline>
+    public val status: UiState<UiTimelineV2>
+    public val comment: PagingState<UiTimelineV2>
+    public val repost: PagingState<UiTimelineV2>
 }

From 26d008b43e3c0abc8c74ee0e26818338eac4b6c6 Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Wed, 4 Mar 2026 17:14:24 +0900
Subject: [PATCH 10/33] migrate x

---
 .../flare/data/database/cache/mapper/VVO.kt   | 138 ---
 .../flare/data/database/cache/mapper/XQT.kt   | 141 +--
 .../data/datasource/microblog/PostEvent.kt    |  42 +-
 .../datasource/pleroma/PleromaDataSource.kt   |  12 +-
 .../data/datasource/rss/RssDataSource.kt      |   3 -
 .../rss/RssTimelineRemoteMediator.kt          |  11 +-
 .../data/datasource/vvo/VVODataSource.kt      |   2 +-
 .../flare/data/datasource/vvo/VVOLoader.kt    |   2 +-
 .../xqt/DeviceFollowRemoteMediator.kt         |  29 +-
 .../data/datasource/xqt/FansPagingSource.kt   |  36 +-
 .../datasource/xqt/FollowingPagingSource.kt   |  36 +-
 .../xqt/HomeTimelineRemoteMediator.kt         | 179 ++--
 .../xqt/ListTimelineRemoteMediator.kt         |  37 +-
 .../datasource/xqt/MentionRemoteMediator.kt   |  29 +-
 .../xqt/NotificationPagingSource.kt           |  43 +-
 .../xqt/SearchStatusPagingSource.kt           |  72 +-
 .../datasource/xqt/SearchUserPagingSource.kt  |  40 +-
 .../xqt/StatusDetailRemoteMediator.kt         |  68 +-
 .../xqt/TrendHashtagPagingSource.kt           |  73 +-
 .../datasource/xqt/TrendsUserPagingSource.kt  |  56 +-
 .../xqt/UserLikesTimelineRemoteMediator.kt    |  37 +-
 .../xqt/UserMediaTimelineRemoteMediator.kt    |  46 +-
 .../xqt/UserRepliesTimelineRemoteMediator.kt  |  37 +-
 .../xqt/UserTimelineRemoteMediator.kt         |  37 +-
 .../data/datasource/xqt/XQTDataSource.kt      | 945 ++++--------------
 .../flare/data/datasource/xqt/XQTLoader.kt    | 144 +++
 .../dimension/flare/ui/model/mapper/Render.kt |  12 +-
 .../dimension/flare/ui/model/mapper/VVO.kt    |   2 +-
 .../dimension/flare/ui/model/mapper/XQT.kt    | 557 ++++++-----
 .../flare/ui/model/mapper/XQTActionMenu.kt    |  88 ++
 30 files changed, 1200 insertions(+), 1754 deletions(-)
 delete mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/VVO.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTLoader.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQTActionMenu.kt

diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/VVO.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/VVO.kt
deleted file mode 100644
index 32ba73d6e..000000000
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/VVO.kt
+++ /dev/null
@@ -1,138 +0,0 @@
-package dev.dimension.flare.data.database.cache.mapper
-
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.database.cache.model.DbStatus
-import dev.dimension.flare.data.database.cache.model.DbStatusWithUser
-import dev.dimension.flare.data.database.cache.model.DbUser
-import dev.dimension.flare.data.database.cache.model.UserContent
-import dev.dimension.flare.data.network.vvo.model.Comment
-import dev.dimension.flare.data.network.vvo.model.Status
-import dev.dimension.flare.data.network.vvo.model.User
-import dev.dimension.flare.model.AccountType
-import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.model.PlatformType
-import dev.dimension.flare.model.ReferenceType
-import dev.dimension.flare.model.vvoHost
-import kotlin.time.Clock
-
-internal object VVO {
-    suspend fun saveStatus(
-        accountKey: MicroBlogKey,
-        pagingKey: String,
-        database: dev.dimension.flare.data.database.cache.CacheDatabase,
-        statuses: List<Status>,
-        sortIdProvider: (Status) -> Long = { it.createdAt?.toEpochMilliseconds() ?: 0L },
-    ) {
-        val items =
-            statuses.map {
-                it.toDbPagingTimeline(accountKey, pagingKey, sortIdProvider)
-            }
-        saveToDatabase(database, items)
-    }
-
-    suspend fun saveComment(
-        accountKey: MicroBlogKey,
-        pagingKey: String,
-        database: dev.dimension.flare.data.database.cache.CacheDatabase,
-        statuses: List<Comment>,
-        sortIdProvider: (Comment) -> Long = { it.createdAt?.toEpochMilliseconds() ?: 0L },
-    ) {
-        val items =
-            statuses.map {
-                it.toDbPagingTimeline(accountKey, pagingKey, sortIdProvider)
-            }
-        saveToDatabase(database, items)
-    }
-}
-
-internal suspend fun Status.toDbPagingTimeline(
-    accountKey: MicroBlogKey,
-    pagingKey: String,
-    sortIdProvider: suspend (Status) -> Long = { it.createdAt?.toEpochMilliseconds() ?: 0L },
-): DbPagingTimelineWithStatus =
-    createDbPagingTimelineWithStatus(
-        accountKey = accountKey,
-        pagingKey = pagingKey,
-        sortId = sortIdProvider(this),
-        status = this.toDbStatusWithUser(accountKey),
-        references =
-            listOfNotNull(
-                if (this.retweetedStatus != null) {
-                    ReferenceType.Retweet to listOfNotNull(this.retweetedStatus.toDbStatusWithUser(accountKey))
-                } else {
-                    null
-                },
-            ).toMap(),
-    )
-
-private fun Status.toDbStatusWithUser(accountKey: MicroBlogKey): DbStatusWithUser {
-    val user = this.user?.toDbUser()
-    val status = this.toDbStatus(accountKey)
-    return DbStatusWithUser(
-        data = status,
-        user = user,
-    )
-}
-
-private fun Status.toDbStatus(accountKey: MicroBlogKey): DbStatus =
-    DbStatus(
-        statusKey = MicroBlogKey(id = id, host = vvoHost),
-        accountType = AccountType.Specific(accountKey),
-        userKey = user?.id?.let { MicroBlogKey(id = it.toString(), host = vvoHost) },
-        content =
-            dev.dimension.flare.data.database.cache.model.StatusContent
-                .VVO(data = this),
-        text = rawText,
-        createdAt = createdAt ?: Clock.System.now(),
-    )
-
-internal suspend fun Comment.toDbPagingTimeline(
-    accountKey: MicroBlogKey,
-    pagingKey: String,
-    sortIdProvider: suspend (Comment) -> Long = { it.createdAt?.toEpochMilliseconds() ?: 0L },
-): DbPagingTimelineWithStatus =
-    createDbPagingTimelineWithStatus(
-        accountKey = accountKey,
-        pagingKey = pagingKey,
-        sortId = sortIdProvider(this),
-        status = this.toDbStatusWithUser(accountKey),
-        references =
-            commentList.orEmpty().associate {
-                ReferenceType.Reply to listOfNotNull(it.toDbStatusWithUser(accountKey))
-            },
-    )
-
-private fun Comment.toDbStatusWithUser(accountKey: MicroBlogKey): DbStatusWithUser {
-    val user = this.user?.toDbUser()
-    val status = this.toDbStatus(accountKey)
-    return DbStatusWithUser(
-        data = status,
-        user = user,
-    )
-}
-
-private fun Comment.toDbStatus(accountKey: MicroBlogKey): DbStatus =
-    DbStatus(
-        statusKey = MicroBlogKey(id = id, host = vvoHost),
-        accountType = AccountType.Specific(accountKey),
-        userKey = user?.id?.let { MicroBlogKey(id = it.toString(), host = vvoHost) },
-        content =
-            dev.dimension.flare.data.database.cache.model.StatusContent
-                .VVOComment(data = this),
-        text = null,
-        createdAt = createdAt ?: Clock.System.now(),
-    )
-
-internal fun User.toDbUser(): DbUser? =
-    screenName?.let {
-        DbUser(
-            handle = it,
-            host = vvoHost,
-            name = screenName,
-            userKey = MicroBlogKey(id = id.toString(), host = vvoHost),
-            platformType = PlatformType.VVo,
-            content =
-                UserContent
-                    .VVO(data = this),
-        )
-    }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/XQT.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/XQT.kt
index b6524e5f2..7c96ad894 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/XQT.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/XQT.kt
@@ -5,13 +5,8 @@ import dev.dimension.flare.data.database.cache.model.DbDirectMessageTimeline
 import dev.dimension.flare.data.database.cache.model.DbMessageItem
 import dev.dimension.flare.data.database.cache.model.DbMessageRoom
 import dev.dimension.flare.data.database.cache.model.DbMessageRoomReference
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.database.cache.model.DbStatus
-import dev.dimension.flare.data.database.cache.model.DbStatusWithUser
 import dev.dimension.flare.data.database.cache.model.DbUser
 import dev.dimension.flare.data.database.cache.model.MessageContent
-import dev.dimension.flare.data.database.cache.model.StatusContent
-import dev.dimension.flare.data.database.cache.model.UserContent
 import dev.dimension.flare.data.network.xqt.model.CursorType
 import dev.dimension.flare.data.network.xqt.model.InboxConversation
 import dev.dimension.flare.data.network.xqt.model.InboxTimelineEntry
@@ -30,7 +25,6 @@ import dev.dimension.flare.data.network.xqt.model.TimelineTweet
 import dev.dimension.flare.data.network.xqt.model.TimelineUser
 import dev.dimension.flare.data.network.xqt.model.Tweet
 import dev.dimension.flare.data.network.xqt.model.TweetTombstone
-import dev.dimension.flare.data.network.xqt.model.TweetUnion
 import dev.dimension.flare.data.network.xqt.model.TweetWithVisibilityResults
 import dev.dimension.flare.data.network.xqt.model.User
 import dev.dimension.flare.data.network.xqt.model.UserLegacy
@@ -41,25 +35,9 @@ import dev.dimension.flare.data.network.xqt.model.legacy.TopLevel
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
-import dev.dimension.flare.model.ReferenceType
-import dev.dimension.flare.ui.model.mapper.name
-import dev.dimension.flare.ui.model.mapper.parseXQTCustomDateTime
-import dev.dimension.flare.ui.model.mapper.screenName
-import kotlin.time.Clock
+import dev.dimension.flare.ui.model.mapper.render
 
 internal object XQT {
-    suspend fun save(
-        accountKey: MicroBlogKey,
-        pagingKey: String,
-        database: CacheDatabase,
-        tweet: List<XQTTimeline>,
-        sortIdProvider: (XQTTimeline) -> Long = { it.sortedIndex },
-    ) {
-        val items =
-            tweet.mapNotNull { it.toDbPagingTimeline(accountKey, pagingKey, sortIdProvider) }
-        saveToDatabase(database, items)
-    }
-
     suspend fun saveDM(
         accountKey: MicroBlogKey,
         database: CacheDatabase,
@@ -180,7 +158,15 @@ private fun List<InboxUser>.toDbUser(accountKey: MicroBlogKey): List<DbUser> {
                 },
             isBlueVerified = it.isBlueVerified == true,
             restId = it.idStr,
-        ).toDbUser(accountKey)
+        ).render(accountKey).let { data ->
+            DbUser(
+                userKey = data.key,
+                name = data.name.raw,
+                handle = data.handle,
+                host = accountKey.host,
+                content = data,
+            )
+        }
     }
 }
 
@@ -201,113 +187,6 @@ private fun InboxTimelineEntry.toDbMessageItem(
     )
 }
 
-private fun TweetUnion.getRetweet(): TweetUnion? =
-    when (this) {
-        is Tweet -> this.legacy?.retweetedStatusResult?.result
-        is TweetTombstone -> null
-        is TweetWithVisibilityResults ->
-            this.tweet.legacy
-                ?.retweetedStatusResult
-                ?.result
-    }
-
-private fun TweetUnion.getQuoted(): TweetUnion? =
-    when (this) {
-        is Tweet -> this.quotedStatusResult?.result
-        is TweetTombstone -> null
-        is TweetWithVisibilityResults -> this.tweet.quotedStatusResult?.result
-    }
-
-internal fun XQTTimeline.toDbPagingTimeline(
-    accountKey: MicroBlogKey,
-    pagingKey: String,
-    sortIdProvider: (XQTTimeline) -> Long = { sortedIndex },
-): DbPagingTimelineWithStatus? =
-    tweets.toDbStatusWithUser(accountKey)?.let { tweet ->
-        createDbPagingTimelineWithStatus(
-            accountKey = accountKey,
-            pagingKey = pagingKey,
-            sortId = sortIdProvider(this),
-            status = tweet,
-            references =
-                listOfNotNull(
-                    tweets.tweetResults.result?.getRetweet()?.toDbStatusWithUser(accountKey)?.let {
-                        ReferenceType.Retweet to listOfNotNull(it)
-                    },
-                    (
-                        tweets.tweetResults.result
-                            ?.getRetweet()
-                            ?.getQuoted() ?: tweets.tweetResults.result?.getQuoted()
-                    )?.toDbStatusWithUser(accountKey)
-                        ?.let {
-                            ReferenceType.Quote to listOfNotNull(it)
-                        },
-                    parents
-                        .mapNotNull { it.tweets.toDbStatusWithUser(accountKey) }
-                        .takeIf { it.isNotEmpty() }
-                        ?.let { ReferenceType.Reply to it },
-                ).toMap(),
-        )
-    }
-
-private fun TimelineTweet.toDbStatusWithUser(accountKey: MicroBlogKey): DbStatusWithUser? =
-    tweetResults.result?.toDbStatusWithUser(accountKey)
-
-private fun TweetUnion.toDbStatusWithUser(accountKey: MicroBlogKey): DbStatusWithUser? =
-    when (this) {
-        is Tweet -> toDbStatusWithUser(this, accountKey)
-        // You’re unable to view this Post because
-        // this account owner limits who can view their Posts. Learn more
-        // throw IllegalStateException("Tweet tombstone should not be saved")
-        is TweetTombstone -> null
-        is TweetWithVisibilityResults -> toDbStatusWithUser(this.tweet, accountKey)
-    }
-
-private fun toDbStatusWithUser(
-    tweet: Tweet,
-    accountKey: MicroBlogKey,
-): DbStatusWithUser? {
-    val user =
-        tweet.core
-            ?.userResults
-            ?.result
-            ?.let {
-                it as? User
-            }?.toDbUser(accountKey) ?: return null
-    return DbStatusWithUser(
-        data =
-            DbStatus(
-                statusKey =
-                    MicroBlogKey(
-                        id = tweet.restId,
-                        host = accountKey.host,
-                    ),
-                content = StatusContent.XQT(tweet),
-                userKey = user.userKey,
-                accountType = AccountType.Specific(accountKey),
-                text = tweet.legacy?.fullText,
-                createdAt =
-                    tweet.legacy?.createdAt?.let { parseXQTCustomDateTime(it) }
-                        ?: Clock.System.now(),
-            ),
-        user = user,
-    )
-}
-
-internal fun User.toDbUser(accountKey: MicroBlogKey) =
-    DbUser(
-        userKey =
-            MicroBlogKey(
-                id = restId,
-                host = accountKey.host,
-            ),
-        platformType = PlatformType.xQt,
-        name = name,
-        handle = screenName,
-        host = accountKey.host,
-        content = UserContent.XQT(this),
-    )
-
 internal data class XQTTimeline(
     val parents: List<XQTTimeline>,
     val tweets: TimelineTweet,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt
index fd9397b77..e3ea5f1da 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt
@@ -14,6 +14,9 @@ import dev.dimension.flare.ui.model.mapper.misskeyRenote
 import dev.dimension.flare.ui.model.mapper.vvoFavorite
 import dev.dimension.flare.ui.model.mapper.vvoLike
 import dev.dimension.flare.ui.model.mapper.vvoLikeComment
+import dev.dimension.flare.ui.model.mapper.xqtBookmark
+import dev.dimension.flare.ui.model.mapper.xqtLike
+import dev.dimension.flare.ui.model.mapper.xqtRetweet
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.serialization.Serializable
 
@@ -272,19 +275,52 @@ internal sealed interface PostEvent {
         data class Retweet(
             override val postKey: MicroBlogKey,
             val retweeted: Boolean,
-        ) : XQT
+            val count: Long = 0,
+            val accountKey: MicroBlogKey,
+        ) : XQT,
+            UpdatePostActionMenuEvent {
+            override fun nextActionMenu(): ActionMenu.Item =
+                ActionMenu.xqtRetweet(
+                    statusKey = postKey,
+                    retweeted = !retweeted,
+                    count = (count + if (!retweeted) 1 else -1).coerceAtLeast(0),
+                    accountKey = accountKey,
+                )
+        }
 
         @Serializable
         data class Like(
             override val postKey: MicroBlogKey,
             val liked: Boolean,
-        ) : XQT
+            val count: Long = 0,
+            val accountKey: MicroBlogKey,
+        ) : XQT,
+            UpdatePostActionMenuEvent {
+            override fun nextActionMenu(): ActionMenu.Item =
+                ActionMenu.xqtLike(
+                    statusKey = postKey,
+                    liked = !liked,
+                    count = (count + if (!liked) 1 else -1).coerceAtLeast(0),
+                    accountKey = accountKey,
+                )
+        }
 
         @Serializable
         data class Bookmark(
             override val postKey: MicroBlogKey,
             val bookmarked: Boolean,
-        ) : XQT
+            val count: Long = 0,
+            val accountKey: MicroBlogKey,
+        ) : XQT,
+            UpdatePostActionMenuEvent {
+            override fun nextActionMenu(): ActionMenu.Item =
+                ActionMenu.xqtBookmark(
+                    statusKey = postKey,
+                    bookmarked = !bookmarked,
+                    count = (count + if (!bookmarked) 1 else -1).coerceAtLeast(0),
+                    accountKey = accountKey,
+                )
+        }
     }
 
     @Serializable
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/pleroma/PleromaDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/pleroma/PleromaDataSource.kt
index 4b7be6477..f03507ad1 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/pleroma/PleromaDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/pleroma/PleromaDataSource.kt
@@ -12,10 +12,10 @@ internal class PleromaDataSource(
         instance = instance,
     ),
     ReactionDataSource {
-    override fun react(
-        statusKey: MicroBlogKey,
-        hasReacted: Boolean,
-        reaction: String,
-    ) {
-    }
+//    override fun react(
+//        statusKey: MicroBlogKey,
+//        hasReacted: Boolean,
+//        reaction: String,
+//    ) {
+//    }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/rss/RssDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/rss/RssDataSource.kt
index c21545017..7be3a7994 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/rss/RssDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/rss/RssDataSource.kt
@@ -1,19 +1,16 @@
 package dev.dimension.flare.data.datasource.rss
 
 import dev.dimension.flare.data.database.app.AppDatabase
-import dev.dimension.flare.data.database.cache.CacheDatabase
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
 internal object RssDataSource :
     KoinComponent {
-    private val database: CacheDatabase by inject()
     private val appDatabase: AppDatabase by inject()
 
     fun fetchLoader(url: String) =
         RssTimelineRemoteMediator(
             url = url,
-            cacheDatabase = database,
             fetchSource = {
                 appDatabase
                     .rssSourceDao()
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/rss/RssTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/rss/RssTimelineRemoteMediator.kt
index f5dbbf15e..456c0c011 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/rss/RssTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/rss/RssTimelineRemoteMediator.kt
@@ -2,8 +2,7 @@ package dev.dimension.flare.data.datasource.rss
 
 import androidx.paging.ExperimentalPagingApi
 import dev.dimension.flare.data.database.app.model.DbRssSources
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.rss.RssService
@@ -12,16 +11,12 @@ import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.mapper.render
 import dev.dimension.flare.ui.model.mapper.title
 
-@OptIn(ExperimentalPagingApi::class)
 internal class RssTimelineRemoteMediator(
     private val url: String,
-    private val cacheDatabase: CacheDatabase,
     private val fetchFeed: suspend (String) -> Feed = RssService::fetch,
     private val fetchIcon: suspend (String) -> String? = RssService::fetchIcon,
     private val fetchSource: suspend (String) -> DbRssSources?,
-) : BaseTimelineRemoteMediator(
-        database = cacheDatabase,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String
         get() =
             buildString {
@@ -29,7 +24,7 @@ internal class RssTimelineRemoteMediator(
                 append(url)
             }
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
     ): PagingResult<UiTimelineV2> {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt
index 01f6e175f..b609c76fc 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt
@@ -407,7 +407,7 @@ internal class VVODataSource(
         )
 
     fun comment(statusKey: MicroBlogKey): CacheData<UiTimelineV2> =
-        MemCacheable("vvo_comment_$accountKey_$statusKey") {
+        MemCacheable("vvo_comment_${accountKey}_$statusKey") {
             service
                 .getHotFlowChild(statusKey.id)
                 .rootComment
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVOLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVOLoader.kt
index b948174c5..a4064e6d4 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVOLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVOLoader.kt
@@ -16,11 +16,11 @@ import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.UiRelation
 import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.mapper.render
-import kotlin.time.Clock
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableMap
+import kotlin.time.Clock
 
 internal class VVOLoader(
     override val accountKey: MicroBlogKey,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/DeviceFollowRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/DeviceFollowRemoteMediator.kt
index 43f8fcabb..a493fa1bb 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/DeviceFollowRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/DeviceFollowRemoteMediator.kt
@@ -1,38 +1,33 @@
 package dev.dimension.flare.data.datasource.xqt
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.mapper.cursor
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
 import dev.dimension.flare.data.database.cache.mapper.tweets
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.xqt.XQTService
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class DeviceFollowRemoteMediator(
     private val service: XQTService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
-    override val pagingKey = "device_follow_$accountKey"
+) : CacheableRemoteLoader<UiTimelineV2> {
+    override val pagingKey: String = "device_follow_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
-                    service
-                        .getNotificationsDeviceFollow(
-                            count = pageSize,
-                        )
+                    service.getNotificationsDeviceFollow(
+                        count = pageSize,
+                    )
                 }
 
                 is PagingRequest.Prepend -> {
@@ -50,11 +45,9 @@ internal class DeviceFollowRemoteMediator(
             }
         val tweets = response.tweets()
 
-        val data = tweets.mapNotNull { it.toDbPagingTimeline(accountKey, pagingKey) }
-
         return PagingResult(
             endOfPaginationReached = tweets.isEmpty(),
-            data = data,
+            data = tweets.mapNotNull { it.render(accountKey) },
             nextKey = response.cursor(),
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/FansPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/FansPagingSource.kt
index 314a116d0..77717b1cd 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/FansPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/FansPagingSource.kt
@@ -1,10 +1,11 @@
 package dev.dimension.flare.data.datasource.xqt
 
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
 import dev.dimension.flare.common.encodeJson
 import dev.dimension.flare.data.database.cache.mapper.cursor
 import dev.dimension.flare.data.database.cache.mapper.users
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.xqt.XQTService
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiProfile
@@ -17,19 +18,28 @@ internal class FansPagingSource(
     private val service: XQTService,
     private val accountKey: MicroBlogKey,
     private val userKey: MicroBlogKey,
-) : BasePagingSource<String, UiProfile>() {
-    override fun getRefreshKey(state: PagingState<String, UiProfile>): String? = null
-
-    override suspend fun doLoad(params: LoadParams<String>): LoadResult<String, UiProfile> {
-        val cursor = params.key
-        val limit = params.loadSize
+) : RemoteLoader<UiProfile> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiProfile> {
+        val cursor =
+            when (request) {
+                PagingRequest.Refresh -> null
+                is PagingRequest.Prepend -> {
+                    return PagingResult(
+                        endOfPaginationReached = true,
+                    )
+                }
+                is PagingRequest.Append -> request.nextKey
+            }
         val response =
             service
                 .getFollowers(
                     variables =
                         FollowVar(
                             userID = userKey.id,
-                            count = limit.toLong(),
+                            count = pageSize.toLong(),
                             cursor = cursor,
                         ).encodeJson(),
                 ).body()
@@ -52,12 +62,8 @@ internal class FansPagingSource(
                 ?.timeline
                 ?.instructions
                 ?.cursor()
-        return LoadResult.Page(
-            data =
-                users.map {
-                    it.render(accountKey = accountKey)
-                },
-            prevKey = null,
+        return PagingResult(
+            data = users.map { it.render(accountKey = accountKey) },
             nextKey = nextCursor,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/FollowingPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/FollowingPagingSource.kt
index 228c8dfcf..b238ddbf8 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/FollowingPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/FollowingPagingSource.kt
@@ -1,10 +1,11 @@
 package dev.dimension.flare.data.datasource.xqt
 
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
 import dev.dimension.flare.common.encodeJson
 import dev.dimension.flare.data.database.cache.mapper.cursor
 import dev.dimension.flare.data.database.cache.mapper.users
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.xqt.XQTService
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiProfile
@@ -14,19 +15,28 @@ internal class FollowingPagingSource(
     private val service: XQTService,
     private val accountKey: MicroBlogKey,
     private val userKey: MicroBlogKey,
-) : BasePagingSource<String, UiProfile>() {
-    override fun getRefreshKey(state: PagingState<String, UiProfile>): String? = null
-
-    override suspend fun doLoad(params: LoadParams<String>): LoadResult<String, UiProfile> {
-        val cursor = params.key
-        val limit = params.loadSize
+) : RemoteLoader<UiProfile> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiProfile> {
+        val cursor =
+            when (request) {
+                PagingRequest.Refresh -> null
+                is PagingRequest.Prepend -> {
+                    return PagingResult(
+                        endOfPaginationReached = true,
+                    )
+                }
+                is PagingRequest.Append -> request.nextKey
+            }
         val response =
             service
                 .getFollowing(
                     variables =
                         FollowVar(
                             userID = userKey.id,
-                            count = limit.toLong(),
+                            count = pageSize.toLong(),
                             cursor = cursor,
                         ).encodeJson(),
                 ).body()
@@ -49,12 +59,8 @@ internal class FollowingPagingSource(
                 ?.timeline
                 ?.instructions
                 ?.cursor()
-        return LoadResult.Page(
-            data =
-                users.map {
-                    it.render(accountKey = accountKey)
-                },
-            prevKey = null,
+        return PagingResult(
+            data = users.map { it.render(accountKey = accountKey) },
             nextKey = nextCursor,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/HomeTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/HomeTimelineRemoteMediator.kt
index 59b4c00a1..f6833b6e8 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/HomeTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/HomeTimelineRemoteMediator.kt
@@ -4,91 +4,82 @@ import androidx.paging.ExperimentalPagingApi
 import dev.dimension.flare.common.InAppNotification
 import dev.dimension.flare.common.Message
 import dev.dimension.flare.common.encodeJson
-import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.mapper.cursor
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
 import dev.dimension.flare.data.database.cache.mapper.tweets
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.xqt.XQTService
 import dev.dimension.flare.data.repository.LoginExpiredException
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 import kotlinx.serialization.Required
 import kotlinx.serialization.Serializable
 
 @OptIn(ExperimentalPagingApi::class)
 internal class HomeTimelineRemoteMediator(
     private val service: XQTService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
     private val inAppNotification: InAppNotification,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
-    override val pagingKey = "home_$accountKey"
+) : CacheableRemoteLoader<UiTimelineV2> {
+    override val pagingKey: String = "home_$accountKey"
 
-    override suspend fun initialize(): InitializeAction = InitializeAction.SKIP_INITIAL_REFRESH
-
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
-        val response =
-            when (request) {
-                PagingRequest.Refresh -> {
-                    service
-                        .getHomeLatestTimeline(
+    ): PagingResult<UiTimelineV2> {
+        return try {
+            val response =
+                when (request) {
+                    PagingRequest.Refresh -> {
+                        service.getHomeLatestTimeline(
                             variables =
                                 HomeTimelineRequest(
                                     count = pageSize.toLong(),
                                 ).encodeJson(),
                         )
-                }
-
-                is PagingRequest.Prepend -> {
-                    return PagingResult(
-                        endOfPaginationReached = true,
-                    )
-                }
-
-                is PagingRequest.Append -> {
-                    service.getHomeLatestTimeline(
-                        variables =
-                            HomeTimelineRequest(
-                                count = pageSize.toLong(),
-                                cursor = request.nextKey,
-                            ).encodeJson(),
-                    )
-                }
-            }.body()
-        val instructions =
-            response
-                ?.data
-                ?.home
-                ?.homeTimelineUrt
-                ?.instructions
-                .orEmpty()
-        val cursor = instructions.cursor()
-        val tweet = instructions.tweets()
-
-        val data = tweet.mapNotNull { it.toDbPagingTimeline(accountKey, pagingKey) }
+                    }
 
-        return PagingResult(
-            endOfPaginationReached = tweet.isEmpty(),
-            data = data,
-            nextKey = cursor,
-        )
-    }
+                    is PagingRequest.Prepend -> {
+                        return PagingResult(
+                            endOfPaginationReached = true,
+                        )
+                    }
 
-    override fun onError(e: Throwable) {
-        super.onError(e)
-        if (e is LoginExpiredException) {
-            inAppNotification.onError(
-                Message.LoginExpired,
-                e,
+                    is PagingRequest.Append -> {
+                        service.getHomeLatestTimeline(
+                            variables =
+                                HomeTimelineRequest(
+                                    count = pageSize.toLong(),
+                                    cursor = request.nextKey,
+                                ).encodeJson(),
+                        )
+                    }
+                }.body()
+            val instructions =
+                response
+                    ?.data
+                    ?.home
+                    ?.homeTimelineUrt
+                    ?.instructions
+                    .orEmpty()
+            val cursor = instructions.cursor()
+            val tweet = instructions.tweets()
+
+            PagingResult(
+                endOfPaginationReached = tweet.isEmpty(),
+                data = tweet.mapNotNull { it.render(accountKey) },
+                nextKey = cursor,
             )
+        } catch (e: Throwable) {
+            if (e is LoginExpiredException) {
+                inAppNotification.onError(
+                    Message.LoginExpired,
+                    e,
+                )
+            }
+            throw e
         }
     }
 }
@@ -96,29 +87,23 @@ internal class HomeTimelineRemoteMediator(
 @OptIn(ExperimentalPagingApi::class)
 internal class FeaturedTimelineRemoteMediator(
     private val service: XQTService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
-    override val pagingKey = "featured_$accountKey"
-
-    override suspend fun initialize(): InitializeAction = InitializeAction.SKIP_INITIAL_REFRESH
+) : CacheableRemoteLoader<UiTimelineV2> {
+    override val pagingKey: String = "featured_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
-                    service
-                        .getHomeTimeline(
-                            variables =
-                                HomeTimelineRequest(
-                                    count = pageSize.toLong(),
-                                ).encodeJson(),
-                        )
+                    service.getHomeTimeline(
+                        variables =
+                            HomeTimelineRequest(
+                                count = pageSize.toLong(),
+                            ).encodeJson(),
+                    )
                 }
 
                 is PagingRequest.Prepend -> {
@@ -146,11 +131,9 @@ internal class FeaturedTimelineRemoteMediator(
                 .orEmpty()
         val tweet = instructions.tweets()
 
-        val data = tweet.mapNotNull { it.toDbPagingTimeline(accountKey, pagingKey) }
-
         return PagingResult(
             endOfPaginationReached = tweet.isEmpty(),
-            data = data,
+            data = tweet.mapNotNull { it.render(accountKey) },
             nextKey = instructions.cursor(),
         )
     }
@@ -159,27 +142,23 @@ internal class FeaturedTimelineRemoteMediator(
 @OptIn(ExperimentalPagingApi::class)
 internal class BookmarkTimelineRemoteMediator(
     private val service: XQTService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
-    override val pagingKey = "bookmark_$accountKey"
+) : CacheableRemoteLoader<UiTimelineV2> {
+    override val pagingKey: String = "bookmark_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
-                    service
-                        .getBookmarks(
-                            variables =
-                                HomeTimelineRequest(
-                                    count = pageSize.toLong(),
-                                ).encodeJson(),
-                        )
+                    service.getBookmarks(
+                        variables =
+                            HomeTimelineRequest(
+                                count = pageSize.toLong(),
+                            ).encodeJson(),
+                    )
                 }
 
                 is PagingRequest.Prepend -> {
@@ -207,11 +186,9 @@ internal class BookmarkTimelineRemoteMediator(
                 .orEmpty()
         val tweet = instructions.tweets()
 
-        val data = tweet.mapNotNull { it.toDbPagingTimeline(accountKey, pagingKey) }
-
         return PagingResult(
             endOfPaginationReached = tweet.isEmpty(),
-            data = data,
+            data = tweet.mapNotNull { it.render(accountKey) },
             nextKey = instructions.cursor(),
         )
     }
@@ -220,10 +197,16 @@ internal class BookmarkTimelineRemoteMediator(
 @Serializable
 internal data class HomeTimelineRequest(
     @Required
-    val count: Long = 20,
+    val count: Long? = null,
     val cursor: String? = null,
     @Required
-    val includePromotedContent: Boolean = false,
+    val includePromotedContent: Boolean = true,
+    @Required
+    val latestControlAvailable: Boolean = true,
+    @Required
+    val requestContext: String = "launch",
+    @Required
+    val withCommunity: Boolean = true,
     @Required
-    val latestControlAvailable: Boolean = false,
+    val seenTweetIds: List<String> = emptyList(),
 )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/ListTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/ListTimelineRemoteMediator.kt
index 896f825ee..f117983bb 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/ListTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/ListTimelineRemoteMediator.kt
@@ -2,16 +2,15 @@ package dev.dimension.flare.data.datasource.xqt
 
 import androidx.paging.ExperimentalPagingApi
 import dev.dimension.flare.common.encodeJson
-import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.mapper.cursor
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
 import dev.dimension.flare.data.database.cache.mapper.tweets
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.xqt.XQTService
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -19,12 +18,9 @@ import kotlinx.serialization.Serializable
 internal class ListTimelineRemoteMediator(
     private val listId: String,
     private val service: XQTService,
-    private val database: CacheDatabase,
     private val accountKey: MicroBlogKey,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
-    override val pagingKey = "list_${listId}_$accountKey"
+) : CacheableRemoteLoader<UiTimelineV2> {
+    override val pagingKey: String = "list_${listId}_$accountKey"
 
     @Serializable
     data class Request(
@@ -34,21 +30,20 @@ internal class ListTimelineRemoteMediator(
         val cursor: String? = null,
     )
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
-                    service
-                        .getListLatestTweetsTimeline(
-                            variables =
-                                Request(
-                                    listID = listId,
-                                    count = pageSize.toLong(),
-                                ).encodeJson(),
-                        )
+                    service.getListLatestTweetsTimeline(
+                        variables =
+                            Request(
+                                listID = listId,
+                                count = pageSize.toLong(),
+                            ).encodeJson(),
+                    )
                 }
 
                 is PagingRequest.Prepend -> {
@@ -70,11 +65,9 @@ internal class ListTimelineRemoteMediator(
             }.body()?.data?.list?.tweetsTimeline?.timeline?.instructions.orEmpty()
         val result = response.tweets()
 
-        val data = result.mapNotNull { it.toDbPagingTimeline(accountKey, pagingKey) }
-
         return PagingResult(
             endOfPaginationReached = response.isEmpty(),
-            data = data,
+            data = result.mapNotNull { it.render(accountKey) },
             nextKey = response.cursor(),
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/MentionRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/MentionRemoteMediator.kt
index d56913f1d..83c3426ed 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/MentionRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/MentionRemoteMediator.kt
@@ -1,38 +1,33 @@
 package dev.dimension.flare.data.datasource.xqt
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.mapper.cursor
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
 import dev.dimension.flare.data.database.cache.mapper.tweets
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.xqt.XQTService
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class MentionRemoteMediator(
     private val service: XQTService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
-    override val pagingKey = "mention_$accountKey"
+) : CacheableRemoteLoader<UiTimelineV2> {
+    override val pagingKey: String = "mention_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
-                    service
-                        .getNotificationsMentions(
-                            count = pageSize,
-                        )
+                    service.getNotificationsMentions(
+                        count = pageSize,
+                    )
                 }
 
                 is PagingRequest.Prepend -> {
@@ -50,11 +45,9 @@ internal class MentionRemoteMediator(
             }
         val tweets = response.tweets()
 
-        val data = tweets.mapNotNull { it.toDbPagingTimeline(accountKey, pagingKey) }
-
         return PagingResult(
             endOfPaginationReached = tweets.isEmpty(),
-            data = data,
+            data = tweets.mapNotNull { it.render(accountKey) },
             nextKey = response.cursor(),
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/NotificationPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/NotificationPagingSource.kt
index f484f209a..bd7201a48 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/NotificationPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/NotificationPagingSource.kt
@@ -1,29 +1,39 @@
 package dev.dimension.flare.data.datasource.xqt
 
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
 import dev.dimension.flare.data.database.cache.mapper.cursor
-import dev.dimension.flare.data.datasource.microblog.StatusEvent
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.xqt.XQTService
 import dev.dimension.flare.data.network.xqt.model.CursorType
 import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.mapper.renderNotifications
 
 internal class NotificationPagingSource(
     private val locale: String,
     private val service: XQTService,
-    private val event: StatusEvent.XQT,
     private val accountKey: MicroBlogKey,
     private val onClearMarker: () -> Unit,
-) : BasePagingSource<String, UiTimeline>() {
-    override fun getRefreshKey(state: PagingState<String, UiTimeline>): String? = null
-
-    override suspend fun doLoad(params: LoadParams<String>): LoadResult<String, UiTimeline> {
+) : RemoteLoader<UiTimelineV2> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiTimelineV2> {
+        val cursor =
+            when (request) {
+                PagingRequest.Refresh -> null
+                is PagingRequest.Prepend -> {
+                    return PagingResult(
+                        endOfPaginationReached = true,
+                    )
+                }
+                is PagingRequest.Append -> request.nextKey
+            }
         val response =
             service.getNotificationsAll(
                 xTwitterClientLanguage = locale,
-                cursor = params.key,
+                cursor = cursor,
             )
 
         val topCursor = response.cursor(type = CursorType.top)
@@ -31,15 +41,16 @@ internal class NotificationPagingSource(
             service.postNotificationsAllLastSeenCursor(topCursor)
         }
 
-        onClearMarker.invoke()
+        if (request == PagingRequest.Refresh) {
+            onClearMarker.invoke()
+        }
 
-        val notifications = response.renderNotifications(accountKey, event)
-        val cursor = response.cursor()
+        val notifications = response.renderNotifications(accountKey)
+        val nextCursor = response.cursor()
 
-        return LoadResult.Page(
+        return PagingResult(
             data = notifications,
-            prevKey = null,
-            nextKey = cursor.takeIf { it != params.key },
+            nextKey = nextCursor.takeIf { it != cursor },
         )
     }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/SearchStatusPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/SearchStatusPagingSource.kt
index 638051d11..5931094fe 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/SearchStatusPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/SearchStatusPagingSource.kt
@@ -1,76 +1,60 @@
 package dev.dimension.flare.data.datasource.xqt
 
-import androidx.paging.ExperimentalPagingApi
 import dev.dimension.flare.common.encodeJson
-import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.mapper.cursor
 import dev.dimension.flare.data.database.cache.mapper.isBottomEnd
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
 import dev.dimension.flare.data.database.cache.mapper.tweets
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.xqt.XQTService
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 import io.ktor.http.encodeURLQueryComponent
 import kotlinx.serialization.Required
 import kotlinx.serialization.Serializable
 
-@OptIn(ExperimentalPagingApi::class)
 internal class SearchStatusPagingSource(
     private val service: XQTService,
-    database: CacheDatabase,
     private val accountKey: MicroBlogKey,
     private val query: String,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
-    override val pagingKey = "search_status_$query"
-
-    override suspend fun timeline(
+) : RemoteLoader<UiTimelineV2> {
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
-        val response =
+    ): PagingResult<UiTimelineV2> {
+        val cursor =
             when (request) {
-                PagingRequest.Refresh -> {
-                    service
-                        .getSearchTimeline(
-                            variables =
-                                SearchRequest(
-                                    rawQuery = query,
-                                    count = pageSize.toLong(),
-                                ).encodeJson(),
-                            referer = "https://${accountKey.host}/search?q=${query.encodeURLQueryComponent()}",
-                        )
-                }
-
+                PagingRequest.Refresh -> null
                 is PagingRequest.Prepend -> {
                     return PagingResult(
                         endOfPaginationReached = true,
                     )
                 }
-
-                is PagingRequest.Append -> {
-                    service.getSearchTimeline(
-                        variables =
-                            SearchRequest(
-                                rawQuery = query,
-                                count = pageSize.toLong(),
-                                cursor = request.nextKey,
-                            ).encodeJson(),
-                        referer = "https://${accountKey.host}/search?q=${query.encodeURLQueryComponent()}",
-                    )
-                }
-            }.body()?.data?.searchByRawQuery?.searchTimeline?.timeline?.instructions.orEmpty()
+                is PagingRequest.Append -> request.nextKey
+            }
+        val response =
+            service
+                .getSearchTimeline(
+                    variables =
+                        SearchRequest(
+                            rawQuery = query,
+                            count = pageSize.toLong(),
+                            cursor = cursor,
+                        ).encodeJson(),
+                    referer = "https://${accountKey.host}/search?q=${query.encodeURLQueryComponent()}",
+                ).body()
+                ?.data
+                ?.searchByRawQuery
+                ?.searchTimeline
+                ?.timeline
+                ?.instructions
+                .orEmpty()
         val tweets = response.tweets()
-
-        val data = tweets.mapNotNull { it.toDbPagingTimeline(accountKey, pagingKey) }
-
         return PagingResult(
             endOfPaginationReached = response.isBottomEnd(),
-            data = data,
+            data = tweets.mapNotNull { it.render(accountKey) },
             nextKey = response.cursor(),
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/SearchUserPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/SearchUserPagingSource.kt
index e75837d14..d459f8d80 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/SearchUserPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/SearchUserPagingSource.kt
@@ -1,11 +1,12 @@
 package dev.dimension.flare.data.datasource.xqt
 
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
 import dev.dimension.flare.common.encodeJson
 import dev.dimension.flare.data.database.cache.mapper.cursor
 import dev.dimension.flare.data.database.cache.mapper.isBottomEnd
 import dev.dimension.flare.data.database.cache.mapper.users
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.xqt.XQTService
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiProfile
@@ -16,18 +17,29 @@ internal class SearchUserPagingSource(
     private val service: XQTService,
     private val accountKey: MicroBlogKey,
     private val query: String,
-) : BasePagingSource<String, UiProfile>() {
-    override fun getRefreshKey(state: PagingState<String, UiProfile>): String? = null
-
-    override suspend fun doLoad(params: LoadParams<String>): LoadResult<String, UiProfile> {
+) : RemoteLoader<UiProfile> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiProfile> {
+        val cursor =
+            when (request) {
+                PagingRequest.Refresh -> null
+                is PagingRequest.Prepend -> {
+                    return PagingResult(
+                        endOfPaginationReached = true,
+                    )
+                }
+                is PagingRequest.Append -> request.nextKey
+            }
         val response =
             service
                 .getSearchTimeline(
                     variables =
                         SearchRequest(
                             rawQuery = query,
-                            count = params.loadSize.toLong(),
-                            cursor = params.key,
+                            count = pageSize.toLong(),
+                            cursor = cursor,
                             product = "People",
                         ).encodeJson(),
                     referer = "https://${accountKey.host}/search?q=${query.encodeURLQueryComponent()}",
@@ -38,17 +50,11 @@ internal class SearchUserPagingSource(
                 ?.timeline
                 ?.instructions
                 .orEmpty()
-        val cursor = response.cursor()
+        val nextKey = response.cursor()
         val users = response.users()
-        return LoadResult.Page(
+        return PagingResult(
             data = users.map { it.render(accountKey = accountKey) },
-            prevKey = null,
-            nextKey =
-                if (response.isBottomEnd() || users.isEmpty()) {
-                    null
-                } else {
-                    cursor
-                },
+            nextKey = if (response.isBottomEnd() || users.isEmpty()) null else nextKey,
         )
     }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/StatusDetailRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/StatusDetailRemoteMediator.kt
index b21bdbf85..6d7979874 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/StatusDetailRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/StatusDetailRemoteMediator.kt
@@ -2,25 +2,19 @@ package dev.dimension.flare.data.datasource.xqt
 
 import androidx.paging.ExperimentalPagingApi
 import dev.dimension.flare.common.encodeJson
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.connect
 import dev.dimension.flare.data.database.cache.mapper.cursor
 import dev.dimension.flare.data.database.cache.mapper.isBottomEnd
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
 import dev.dimension.flare.data.database.cache.mapper.tweets
-import dev.dimension.flare.data.database.cache.model.DbPagingTimeline
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.StatusEvent
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.xqt.XQTService
 import dev.dimension.flare.data.network.xqt.model.Tweet
 import dev.dimension.flare.data.network.xqt.model.TweetTombstone
 import dev.dimension.flare.data.network.xqt.model.TweetWithVisibilityResults
-import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
-import kotlinx.coroutines.flow.firstOrNull
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 import kotlinx.serialization.Required
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -29,13 +23,9 @@ import kotlinx.serialization.Serializable
 internal class StatusDetailRemoteMediator(
     private val statusKey: MicroBlogKey,
     private val service: XQTService,
-    private val database: CacheDatabase,
     private val accountKey: MicroBlogKey,
-    private val event: StatusEvent.XQT,
     private val statusOnly: Boolean,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
+) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String =
         buildString {
             append("status_detail_")
@@ -46,16 +36,17 @@ internal class StatusDetailRemoteMediator(
             append("_")
             append(accountKey.toString())
         }
+
     private var conversationId: String? = null
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> =
         when (request) {
             is PagingRequest.Append -> {
                 if (statusOnly) {
-                    return PagingResult(
+                    PagingResult(
                         endOfPaginationReached = true,
                     )
                 } else {
@@ -108,40 +99,25 @@ internal class StatusDetailRemoteMediator(
                                     is TweetWithVisibilityResults -> result.tweet.legacy?.conversationIdStr == conversationId
                                 }
                             }
-                    val result = actualTweet.mapNotNull { it.toDbPagingTimeline(accountKey, pagingKey) }
 
-                    return PagingResult(
+                    PagingResult(
                         endOfPaginationReached = response.isBottomEnd() || actualTweet.size == 1 || response.cursor() == null,
-                        data = result,
+                        data =
+                            actualTweet.mapNotNull {
+                                it.render(accountKey)
+                            },
                         nextKey = response.cursor(),
                     )
                 }
             }
+
             is PagingRequest.Prepend -> {
-                return PagingResult(
+                PagingResult(
                     endOfPaginationReached = true,
                 )
             }
-            PagingRequest.Refresh -> {
-                if (!database.pagingTimelineDao().existsPaging(accountKey, pagingKey)) {
-                    database.statusDao().get(statusKey, AccountType.Specific(accountKey)).firstOrNull()?.let {
-                        database.connect {
-                            database
-                                .pagingTimelineDao()
-                                .insertAll(
-                                    listOf(
-                                        DbPagingTimeline(
-                                            accountType = AccountType.Specific(accountKey),
-                                            statusKey = statusKey,
-                                            pagingKey = pagingKey,
-                                            sortId = 0,
-                                        ),
-                                    ),
-                                )
-                        }
-                    }
-                }
 
+            PagingRequest.Refresh -> {
                 val response =
                     service
                         .getTweetDetail(
@@ -157,16 +133,17 @@ internal class StatusDetailRemoteMediator(
                         .orEmpty()
                 val tweet = response.tweets()
                 val item = tweet.firstOrNull { it.id == statusKey.id }
-                val result = listOf(item).mapNotNull { it?.toDbPagingTimeline(accountKey, pagingKey) }
 
-                return PagingResult(
+                PagingResult(
                     endOfPaginationReached = statusOnly,
-                    data = result,
-                    nextKey = "",
+                    data =
+                        listOfNotNull(item).mapNotNull {
+                            it.render(accountKey)
+                        },
+                    nextKey = if (statusOnly) null else "",
                 )
             }
         }
-    }
 }
 
 @Serializable
@@ -186,7 +163,6 @@ internal data class TweetDetailRequest(
     @SerialName("focalTweetId")
     val focalTweetID: String,
     val cursor: String? = null,
-    // tweet/profile/home
     @Required
     val referrer: String = "tweet",
     @SerialName("with_rux_injections")
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/TrendHashtagPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/TrendHashtagPagingSource.kt
index d7d0640f5..e2b20152b 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/TrendHashtagPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/TrendHashtagPagingSource.kt
@@ -1,43 +1,48 @@
 package dev.dimension.flare.data.datasource.xqt
 
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.xqt.XQTService
 import dev.dimension.flare.ui.model.UiHashtag
 
 internal class TrendHashtagPagingSource(
     private val service: XQTService,
-) : BasePagingSource<Int, UiHashtag>() {
-    override fun getRefreshKey(state: PagingState<Int, UiHashtag>): Int? = null
-
-    override suspend fun doLoad(params: LoadParams<Int>): LoadResult<Int, UiHashtag> {
-        service
-            .getGuide(count = params.loadSize)
-            .timeline
-            ?.instructions
-            ?.asSequence()
-            ?.mapNotNull {
-                it.addEntries?.entries
-            }?.flatten()
-            ?.mapNotNull {
-                it.content?.timelineModule?.items
-            }?.flatten()
-            ?.mapNotNull {
-                it.item?.content?.trend
-            }?.map {
-                UiHashtag(
-                    hashtag = it.name.orEmpty(),
-                    description = null,
-                    searchContent = it.name.orEmpty(),
-                )
-            }?.toList()
-            .orEmpty()
-            .let {
-                return LoadResult.Page(
-                    data = it,
-                    prevKey = null,
-                    nextKey = null,
-                )
-            }
+) : RemoteLoader<UiHashtag> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiHashtag> {
+        if (request is PagingRequest.Prepend || request is PagingRequest.Append) {
+            return PagingResult(
+                endOfPaginationReached = true,
+            )
+        }
+        val data =
+            service
+                .getGuide(count = pageSize)
+                .timeline
+                ?.instructions
+                ?.asSequence()
+                ?.mapNotNull {
+                    it.addEntries?.entries
+                }?.flatten()
+                ?.mapNotNull {
+                    it.content?.timelineModule?.items
+                }?.flatten()
+                ?.mapNotNull {
+                    it.item?.content?.trend
+                }?.map {
+                    UiHashtag(
+                        hashtag = it.name.orEmpty(),
+                        description = null,
+                        searchContent = it.name.orEmpty(),
+                    )
+                }?.toList()
+                .orEmpty()
+        return PagingResult(
+            data = data,
+            endOfPaginationReached = true,
+        )
     }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/TrendsUserPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/TrendsUserPagingSource.kt
index 3c88d0764..b5cf74830 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/TrendsUserPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/TrendsUserPagingSource.kt
@@ -1,7 +1,8 @@
 package dev.dimension.flare.data.datasource.xqt
 
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.xqt.XQTService
 import dev.dimension.flare.data.network.xqt.model.User
 import dev.dimension.flare.model.MicroBlogKey
@@ -11,29 +12,34 @@ import dev.dimension.flare.ui.model.mapper.render
 internal class TrendsUserPagingSource(
     private val service: XQTService,
     private val accountKey: MicroBlogKey,
-) : BasePagingSource<Int, UiProfile>() {
-    override fun getRefreshKey(state: PagingState<Int, UiProfile>): Int? = null
-
-    override suspend fun doLoad(params: LoadParams<Int>): LoadResult<Int, UiProfile> {
-        service
-            .getUserRecommendations(
-                limit = params.loadSize,
-                userId = accountKey.id,
-            ).mapNotNull {
-                if (it.user != null && it.userID != null) {
-                    User(
-                        legacy = it.user,
-                        restId = it.userID,
-                    ).render(accountKey = accountKey)
-                } else {
-                    null
+) : RemoteLoader<UiProfile> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiProfile> {
+        if (request is PagingRequest.Prepend || request is PagingRequest.Append) {
+            return PagingResult(
+                endOfPaginationReached = true,
+            )
+        }
+        val data =
+            service
+                .getUserRecommendations(
+                    limit = pageSize,
+                    userId = accountKey.id,
+                ).mapNotNull {
+                    if (it.user != null && it.userID != null) {
+                        User(
+                            legacy = it.user,
+                            restId = it.userID,
+                        ).render(accountKey = accountKey)
+                    } else {
+                        null
+                    }
                 }
-            }.let {
-                return LoadResult.Page(
-                    data = it,
-                    prevKey = null,
-                    nextKey = null,
-                )
-            }
+        return PagingResult(
+            data = data,
+            endOfPaginationReached = true,
+        )
     }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/UserLikesTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/UserLikesTimelineRemoteMediator.kt
index 19e3a6fed..9e72f5d35 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/UserLikesTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/UserLikesTimelineRemoteMediator.kt
@@ -2,43 +2,38 @@ package dev.dimension.flare.data.datasource.xqt
 
 import androidx.paging.ExperimentalPagingApi
 import dev.dimension.flare.common.encodeJson
-import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.mapper.cursor
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
 import dev.dimension.flare.data.database.cache.mapper.tweets
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.xqt.XQTService
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class UserLikesTimelineRemoteMediator(
     private val userKey: MicroBlogKey,
     private val service: XQTService,
-    private val database: CacheDatabase,
     private val accountKey: MicroBlogKey,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
-    override val pagingKey = "user_likes_${userKey}_$accountKey"
+) : CacheableRemoteLoader<UiTimelineV2> {
+    override val pagingKey: String = "user_likes_${userKey}_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
-                    service
-                        .getLikes(
-                            variables =
-                                UserTimelineRequest(
-                                    userID = userKey.id,
-                                    count = pageSize.toLong(),
-                                ).encodeJson(),
-                        )
+                    service.getLikes(
+                        variables =
+                            UserTimelineRequest(
+                                userID = userKey.id,
+                                count = pageSize.toLong(),
+                            ).encodeJson(),
+                    )
                 }
 
                 is PagingRequest.Prepend -> {
@@ -72,11 +67,9 @@ internal class UserLikesTimelineRemoteMediator(
                 includePin = request is PagingRequest.Refresh,
             )
 
-        val data = tweet.mapNotNull { it.toDbPagingTimeline(accountKey, pagingKey) }
-
         return PagingResult(
             endOfPaginationReached = tweet.isEmpty(),
-            data = data,
+            data = tweet.mapNotNull { it.render(accountKey) },
             nextKey = instructions.cursor(),
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/UserMediaTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/UserMediaTimelineRemoteMediator.kt
index 865e0d162..604f7c668 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/UserMediaTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/UserMediaTimelineRemoteMediator.kt
@@ -2,43 +2,38 @@ package dev.dimension.flare.data.datasource.xqt
 
 import androidx.paging.ExperimentalPagingApi
 import dev.dimension.flare.common.encodeJson
-import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.mapper.cursor
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
 import dev.dimension.flare.data.database.cache.mapper.tweets
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.xqt.XQTService
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class UserMediaTimelineRemoteMediator(
     private val userKey: MicroBlogKey,
     private val service: XQTService,
-    private val database: CacheDatabase,
     private val accountKey: MicroBlogKey,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
-    override val pagingKey = "user_media_${userKey}_$accountKey"
+) : CacheableRemoteLoader<UiTimelineV2> {
+    override val pagingKey: String = "user_media_${userKey}_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
-                    service
-                        .getUserMedia(
-                            variables =
-                                UserTimelineRequest(
-                                    userID = userKey.id,
-                                    count = pageSize.toLong(),
-                                ).encodeJson(),
-                        )
+                    service.getUserMedia(
+                        variables =
+                            UserTimelineRequest(
+                                userID = userKey.id,
+                                count = pageSize.toLong(),
+                            ).encodeJson(),
+                    )
                 }
 
                 is PagingRequest.Prepend -> {
@@ -72,20 +67,9 @@ internal class UserMediaTimelineRemoteMediator(
                 includePin = request is PagingRequest.Refresh,
             )
 
-        val data =
-            tweet.mapNotNull {
-                it.toDbPagingTimeline(
-                    accountKey = accountKey,
-                    pagingKey = pagingKey,
-                    sortIdProvider = { tweet ->
-                        tweet.id?.toLong() ?: tweet.sortedIndex
-                    },
-                )
-            }
-
         return PagingResult(
             endOfPaginationReached = tweet.isEmpty(),
-            data = data,
+            data = tweet.mapNotNull { it.render(accountKey) },
             nextKey = instructions.cursor(),
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/UserRepliesTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/UserRepliesTimelineRemoteMediator.kt
index fe2897bac..473a828cb 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/UserRepliesTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/UserRepliesTimelineRemoteMediator.kt
@@ -2,43 +2,38 @@ package dev.dimension.flare.data.datasource.xqt
 
 import androidx.paging.ExperimentalPagingApi
 import dev.dimension.flare.common.encodeJson
-import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.mapper.cursor
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
 import dev.dimension.flare.data.database.cache.mapper.tweets
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.xqt.XQTService
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 @OptIn(ExperimentalPagingApi::class)
 internal class UserRepliesTimelineRemoteMediator(
     private val userKey: MicroBlogKey,
     private val service: XQTService,
-    private val database: CacheDatabase,
     private val accountKey: MicroBlogKey,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
-    override val pagingKey = "user_replies_${userKey}_$accountKey"
+) : CacheableRemoteLoader<UiTimelineV2> {
+    override val pagingKey: String = "user_replies_${userKey}_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
-                    service
-                        .getUserTweetsAndReplies(
-                            variables =
-                                UserTimelineRequest(
-                                    userID = userKey.id,
-                                    count = pageSize.toLong(),
-                                ).encodeJson(),
-                        )
+                    service.getUserTweetsAndReplies(
+                        variables =
+                            UserTimelineRequest(
+                                userID = userKey.id,
+                                count = pageSize.toLong(),
+                            ).encodeJson(),
+                    )
                 }
 
                 is PagingRequest.Prepend -> {
@@ -72,11 +67,9 @@ internal class UserRepliesTimelineRemoteMediator(
                 includePin = request is PagingRequest.Refresh,
             )
 
-        val data = tweet.mapNotNull { it.toDbPagingTimeline(accountKey, pagingKey) }
-
         return PagingResult(
             endOfPaginationReached = tweet.isEmpty(),
-            data = data,
+            data = tweet.mapNotNull { it.render(accountKey) },
             nextKey = instructions.cursor(),
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/UserTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/UserTimelineRemoteMediator.kt
index 24ca48625..5e16adc23 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/UserTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/UserTimelineRemoteMediator.kt
@@ -2,16 +2,15 @@ package dev.dimension.flare.data.datasource.xqt
 
 import androidx.paging.ExperimentalPagingApi
 import dev.dimension.flare.common.encodeJson
-import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.mapper.cursor
-import dev.dimension.flare.data.database.cache.mapper.toDbPagingTimeline
 import dev.dimension.flare.data.database.cache.mapper.tweets
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.xqt.XQTService
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 import kotlinx.serialization.Required
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -20,28 +19,24 @@ import kotlinx.serialization.Serializable
 internal class UserTimelineRemoteMediator(
     private val userKey: MicroBlogKey,
     private val service: XQTService,
-    private val database: CacheDatabase,
     private val accountKey: MicroBlogKey,
-) : BaseTimelineRemoteMediator(
-        database = database,
-    ) {
-    override val pagingKey = "user_timeline_${userKey}_$accountKey"
+) : CacheableRemoteLoader<UiTimelineV2> {
+    override val pagingKey: String = "user_timeline_${userKey}_$accountKey"
 
-    override suspend fun timeline(
+    override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
-    ): PagingResult<DbPagingTimelineWithStatus> {
+    ): PagingResult<UiTimelineV2> {
         val response =
             when (request) {
                 PagingRequest.Refresh -> {
-                    service
-                        .getUserTweets(
-                            variables =
-                                UserTimelineRequest(
-                                    userID = userKey.id,
-                                    count = pageSize.toLong(),
-                                ).encodeJson(),
-                        )
+                    service.getUserTweets(
+                        variables =
+                            UserTimelineRequest(
+                                userID = userKey.id,
+                                count = pageSize.toLong(),
+                            ).encodeJson(),
+                    )
                 }
 
                 is PagingRequest.Prepend -> {
@@ -75,11 +70,9 @@ internal class UserTimelineRemoteMediator(
                 includePin = request is PagingRequest.Refresh,
             )
 
-        val data = tweet.mapNotNull { it.toDbPagingTimeline(accountKey, pagingKey) }
-
         return PagingResult(
             endOfPaginationReached = tweet.isEmpty(),
-            data = data,
+            data = tweet.mapNotNull { it.render(accountKey) },
             nextKey = instructions.cursor(),
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt
index 74b4d61c3..86a3fb061 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt
@@ -11,36 +11,36 @@ import dev.dimension.flare.common.FileType
 import dev.dimension.flare.common.InAppNotification
 import dev.dimension.flare.common.MemCacheable
 import dev.dimension.flare.common.decodeJson
-import dev.dimension.flare.common.encodeJson
 import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.connect
 import dev.dimension.flare.data.database.cache.mapper.XQT
-import dev.dimension.flare.data.database.cache.mapper.toDbUser
-import dev.dimension.flare.data.database.cache.mapper.tweets
 import dev.dimension.flare.data.database.cache.model.DbMessageItem
-import dev.dimension.flare.data.database.cache.model.DbPagingTimeline
 import dev.dimension.flare.data.database.cache.model.MessageContent
-import dev.dimension.flare.data.database.cache.model.StatusContent
-import dev.dimension.flare.data.database.cache.model.updateStatusUseCase
 import dev.dimension.flare.data.datasource.microblog.AuthenticatedMicroblogDataSource
 import dev.dimension.flare.data.datasource.microblog.ComposeConfig
 import dev.dimension.flare.data.datasource.microblog.ComposeData
 import dev.dimension.flare.data.datasource.microblog.ComposeProgress
 import dev.dimension.flare.data.datasource.microblog.ComposeType
+import dev.dimension.flare.data.datasource.microblog.DatabaseUpdater
 import dev.dimension.flare.data.datasource.microblog.DirectMessageDataSource
 import dev.dimension.flare.data.datasource.microblog.NotificationFilter
-import dev.dimension.flare.data.datasource.microblog.ProfileAction
+import dev.dimension.flare.data.datasource.microblog.PostEvent
 import dev.dimension.flare.data.datasource.microblog.ProfileTab
-import dev.dimension.flare.data.datasource.microblog.StatusEvent
 import dev.dimension.flare.data.datasource.microblog.createSendingDirectMessage
 import dev.dimension.flare.data.datasource.microblog.datasource.ListDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.NotificationDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.PostDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.RelationDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.UserDataSource
 import dev.dimension.flare.data.datasource.microblog.handler.ListHandler
 import dev.dimension.flare.data.datasource.microblog.handler.ListMemberHandler
-import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.handler.NotificationHandler
+import dev.dimension.flare.data.datasource.microblog.handler.PostEventHandler
+import dev.dimension.flare.data.datasource.microblog.handler.PostHandler
+import dev.dimension.flare.data.datasource.microblog.handler.RelationHandler
+import dev.dimension.flare.data.datasource.microblog.handler.UserHandler
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
+import dev.dimension.flare.data.datasource.microblog.paging.toPagingSource
 import dev.dimension.flare.data.datasource.microblog.pagingConfig
-import dev.dimension.flare.data.datasource.microblog.relationKeyWithUserKey
-import dev.dimension.flare.data.datasource.microblog.timelinePager
 import dev.dimension.flare.data.network.xqt.XQTService
 import dev.dimension.flare.data.network.xqt.model.AddToConversationRequest
 import dev.dimension.flare.data.network.xqt.model.CreateBookmarkRequest
@@ -58,32 +58,24 @@ import dev.dimension.flare.data.network.xqt.model.PostCreateTweetRequestVariable
 import dev.dimension.flare.data.network.xqt.model.PostCreateTweetRequestVariablesReply
 import dev.dimension.flare.data.network.xqt.model.PostDeleteRetweetRequest
 import dev.dimension.flare.data.network.xqt.model.PostDeleteRetweetRequestVariables
-import dev.dimension.flare.data.network.xqt.model.PostDeleteTweetRequest
 import dev.dimension.flare.data.network.xqt.model.PostDmNew2Request
 import dev.dimension.flare.data.network.xqt.model.PostFavoriteTweetRequest
 import dev.dimension.flare.data.network.xqt.model.PostMediaMetadataCreateRequest
 import dev.dimension.flare.data.network.xqt.model.PostUnfavoriteTweetRequest
-import dev.dimension.flare.data.network.xqt.model.User
-import dev.dimension.flare.data.network.xqt.model.UserUnavailable
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.LocalFilterRepository
 import dev.dimension.flare.data.repository.tryRun
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.model.PlatformType
 import dev.dimension.flare.shared.image.ImageCompressor
 import dev.dimension.flare.ui.model.UiAccount
 import dev.dimension.flare.ui.model.UiDMItem
 import dev.dimension.flare.ui.model.UiDMRoom
-import dev.dimension.flare.ui.model.UiHashtag
 import dev.dimension.flare.ui.model.UiPodcast
-import dev.dimension.flare.ui.model.UiProfile
-import dev.dimension.flare.ui.model.UiRelation
 import dev.dimension.flare.ui.model.UiState
 import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.mapper.render
-import dev.dimension.flare.ui.model.mapper.toUi
-import dev.dimension.flare.ui.model.toUi
 import dev.dimension.flare.ui.presenter.compose.ComposeStatus
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
@@ -96,7 +88,6 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
@@ -115,11 +106,14 @@ private const val MAX_ASYNC_UPLOAD_SIZE = 10
 internal class XQTDataSource(
     override val accountKey: MicroBlogKey,
 ) : AuthenticatedMicroblogDataSource,
+    NotificationDataSource,
+    UserDataSource,
+    PostDataSource,
     KoinComponent,
-    StatusEvent.XQT,
     ListDataSource,
     DirectMessageDataSource,
-    RelationLoader {
+    RelationDataSource,
+    PostEventHandler.Handler {
     private val database: CacheDatabase by inject()
     private val localFilterRepository: LocalFilterRepository by inject()
     private val coroutineScope: CoroutineScope by inject()
@@ -139,11 +133,125 @@ internal class XQTDataSource(
                     .map { it.chocolate },
         )
     }
+    private val loader by lazy {
+        XQTLoader(
+            accountKey = accountKey,
+            service = service,
+        )
+    }
 
     private val listLoader = XQTListLoader(service, accountKey)
 
     private val listMemberLoader = XQTListMemberLoader(service, accountKey)
 
+    override val notificationHandler by lazy {
+        NotificationHandler(
+            accountKey = accountKey,
+            loader = loader,
+        )
+    }
+
+    override val userHandler by lazy {
+        UserHandler(
+            accountKey = accountKey,
+            loader = loader,
+        )
+    }
+
+    override val postHandler by lazy {
+        PostHandler(
+            accountType = AccountType.Specific(accountKey),
+            loader = loader,
+        )
+    }
+
+    override val relationHandler by lazy {
+        RelationHandler(
+            dataSource = loader,
+        )
+    }
+
+    override val postEventHandler by lazy {
+        PostEventHandler(
+            accountKey = accountKey,
+            handler = this,
+        )
+    }
+
+    override suspend fun handle(
+        event: PostEvent,
+        updater: DatabaseUpdater,
+    ) {
+        require(event is PostEvent.XQT)
+        when (event) {
+            is PostEvent.XQT.Retweet -> {
+                if (event.retweeted) {
+                    service.postDeleteRetweet(
+                        postDeleteRetweetRequest =
+                            PostDeleteRetweetRequest(
+                                variables = PostDeleteRetweetRequestVariables(sourceTweetId = event.postKey.id),
+                            ),
+                    )
+                } else {
+                    service.postCreateRetweet(
+                        postCreateRetweetRequest =
+                            PostCreateRetweetRequest(
+                                variables =
+                                    PostCreateRetweetRequestVariables(
+                                        tweetId = event.postKey.id,
+                                    ),
+                            ),
+                    )
+                }
+            }
+
+            is PostEvent.XQT.Like -> {
+                if (event.liked) {
+                    service.postUnfavoriteTweet(
+                        postUnfavoriteTweetRequest =
+                            PostUnfavoriteTweetRequest(
+                                variables = PostCreateRetweetRequestVariables(tweetId = event.postKey.id),
+                            ),
+                    )
+                } else {
+                    service.postFavoriteTweet(
+                        postFavoriteTweetRequest =
+                            PostFavoriteTweetRequest(
+                                variables =
+                                    PostCreateRetweetRequestVariables(
+                                        tweetId = event.postKey.id,
+                                    ),
+                            ),
+                    )
+                }
+            }
+
+            is PostEvent.XQT.Bookmark -> {
+                if (event.bookmarked) {
+                    service.postDeleteBookmark(
+                        postDeleteBookmarkRequest =
+                            DeleteBookmarkRequest(
+                                variables =
+                                    DeleteBookmarkRequestVariables(
+                                        tweetId = event.postKey.id,
+                                    ),
+                            ),
+                    )
+                } else {
+                    service.postCreateBookmark(
+                        postCreateBookmarkRequest =
+                            CreateBookmarkRequest(
+                                variables =
+                                    CreateBookmarkRequestVariables(
+                                        tweetId = event.postKey.id,
+                                    ),
+                            ),
+                    )
+                }
+            }
+        }
+    }
+
     override val listHandler =
         ListHandler(
             pagingKey = "list_$accountKey",
@@ -161,7 +269,6 @@ internal class XQTDataSource(
     override fun homeTimeline() =
         HomeTimelineRemoteMediator(
             service,
-            database,
             accountKey,
             inAppNotification,
         )
@@ -170,20 +277,16 @@ internal class XQTDataSource(
         pageSize: Int = 20,
         pagingKey: String = "featured_$accountKey",
         scope: CoroutineScope,
-    ): Flow<PagingData<UiTimeline>> =
-        timelinePager(
-            pageSize = pageSize,
-            database = database,
-            scope = scope,
-            filterFlow = localFilterRepository.getFlow(forTimeline = true),
-            accountRepository = accountRepository,
-            mediator = featuredTimelineLoader(),
-        )
+    ): Flow<PagingData<UiTimelineV2>> =
+        Pager(
+            config = pagingConfig,
+        ) {
+            featuredTimelineLoader().toPagingSource()
+        }.flow.cachedIn(scope)
 
     fun featuredTimelineLoader() =
         FeaturedTimelineRemoteMediator(
             service,
-            database,
             accountKey,
         )
 
@@ -191,152 +294,45 @@ internal class XQTDataSource(
         pageSize: Int = 20,
         pagingKey: String = "bookmark_$accountKey",
         scope: CoroutineScope,
-    ): Flow<PagingData<UiTimeline>> =
-        timelinePager(
-            pageSize = pageSize,
-            database = database,
-            scope = scope,
-            filterFlow = localFilterRepository.getFlow(forTimeline = true),
-            accountRepository = accountRepository,
-            mediator = bookmarkTimelineLoader(),
-        )
+    ): Flow<PagingData<UiTimelineV2>> =
+        Pager(
+            config = pagingConfig,
+        ) {
+            bookmarkTimelineLoader().toPagingSource()
+        }.flow.cachedIn(scope)
 
     fun bookmarkTimelineLoader() =
         BookmarkTimelineRemoteMediator(
             service,
-            database,
             accountKey,
         )
 
     fun deviceFollowTimelineLoader() =
         DeviceFollowRemoteMediator(
             service,
-            database,
             accountKey,
         )
 
-    override fun notification(
-        type: NotificationFilter,
-        pageSize: Int,
-        scope: CoroutineScope,
-    ): Flow<PagingData<UiTimeline>> {
+    override fun notification(type: NotificationFilter): RemoteLoader<UiTimelineV2> =
         if (type == NotificationFilter.All) {
-            return Pager(
-                config = pagingConfig,
-            ) {
-                NotificationPagingSource(
-                    locale = "en",
-                    service = service,
-                    accountKey = accountKey,
-                    event = this,
-                    onClearMarker = {
-                        MemCacheable.update(notificationMarkerKey, 0)
-                    },
-                )
-            }.flow.cachedIn(scope)
+            NotificationPagingSource(
+                locale = "en",
+                service = service,
+                accountKey = accountKey,
+                onClearMarker = {
+                    notificationHandler.clear()
+                },
+            )
         } else {
-            return timelinePager(
-                pageSize = pageSize,
-                database = database,
-                scope = scope,
-                filterFlow = localFilterRepository.getFlow(forNotification = true),
-                accountRepository = accountRepository,
-                mediator =
-                    MentionRemoteMediator(
-                        service,
-                        database,
-                        accountKey,
-                    ),
+            MentionRemoteMediator(
+                service,
+                accountKey,
             )
         }
-    }
 
     override val supportedNotificationFilter: List<NotificationFilter>
         get() = listOf(NotificationFilter.All, NotificationFilter.Mention)
 
-    override fun userByAcct(acct: String): CacheData<UiProfile> {
-        val (name, host) = MicroBlogKey.valueOf(acct.removePrefix("@"))
-        return Cacheable(
-            fetchSource = {
-                val user =
-                    service
-                        .userByScreenName(name)
-                        .body()
-                        ?.data
-                        ?.user
-                        ?.result
-                        ?.let {
-                            when (it) {
-                                is User -> it
-                                is UserUnavailable -> null
-                            }
-                        }?.toDbUser(accountKey) ?: throw Exception("User not found")
-                database.userDao().insert(user)
-            },
-            cacheSource = {
-                database
-                    .userDao()
-                    .findByHandleAndHost(name, host, PlatformType.xQt)
-                    .distinctUntilChanged()
-                    .mapNotNull { it?.render(accountKey) }
-            },
-        )
-    }
-
-    override fun userById(id: String): CacheData<UiProfile> {
-        val userKey = MicroBlogKey(id, accountKey.host)
-        return Cacheable(
-            fetchSource = {
-                val user =
-                    service
-                        .userById(id)
-                        .body()
-                        ?.data
-                        ?.user
-                        ?.result
-                        ?.let {
-                            when (it) {
-                                is User -> it
-                                is UserUnavailable -> null
-                            }
-                        }?.toDbUser(accountKey) ?: throw Exception("User not found")
-                database.userDao().insert(user)
-            },
-            cacheSource = {
-                database
-                    .userDao()
-                    .findByKey(userKey)
-                    .distinctUntilChanged()
-                    .mapNotNull { it?.render(accountKey) }
-            },
-        )
-    }
-
-    override fun relation(userKey: MicroBlogKey): Flow<UiState<UiRelation>> =
-        MemCacheable<UiRelation>(
-            relationKeyWithUserKey(userKey),
-        ) {
-            val userResponse =
-                service
-                    .userById(userKey.id)
-                    .body()
-                    ?.data
-                    ?.user
-                    ?.result
-                    ?.let {
-                        when (it) {
-                            is User -> it
-                            is UserUnavailable -> null
-                        }
-                    } ?: throw Exception("User not found")
-            val user = userResponse.toDbUser(accountKey)
-
-            service
-                .profileSpotlights(user.handle)
-                .body()
-                ?.toUi(muting = userResponse.legacy.muting) ?: throw Exception("User not found")
-        }.toUi()
-
     override fun userTimeline(
         userKey: MicroBlogKey,
         mediaOnly: Boolean,
@@ -344,14 +340,12 @@ internal class XQTDataSource(
         UserMediaTimelineRemoteMediator(
             userKey,
             service,
-            database,
             accountKey,
         )
     } else {
         UserTimelineRemoteMediator(
             userKey,
             service,
-            database,
             accountKey,
         )
     }
@@ -360,72 +354,10 @@ internal class XQTDataSource(
         StatusDetailRemoteMediator(
             statusKey = statusKey,
             service = service,
-            database = database,
             accountKey = accountKey,
             statusOnly = false,
-            event = this,
         )
 
-    override fun status(statusKey: MicroBlogKey): CacheData<UiTimeline> {
-        val pagingKey = "status_only_$statusKey"
-        return Cacheable(
-            fetchSource = {
-                if (!database.pagingTimelineDao().existsPaging(accountKey, pagingKey)) {
-                    database.statusDao().get(statusKey, AccountType.Specific(accountKey)).firstOrNull()?.let {
-                        database.connect {
-                            database
-                                .pagingTimelineDao()
-                                .insertAll(
-                                    listOf(
-                                        DbPagingTimeline(
-                                            accountType = AccountType.Specific(accountKey),
-                                            statusKey = statusKey,
-                                            pagingKey = pagingKey,
-                                            sortId = 0,
-                                        ),
-                                    ),
-                                )
-                        }
-                    }
-                }
-                val response =
-                    service
-                        .getTweetDetail(
-                            variables =
-                                TweetDetailRequest(
-                                    focalTweetID = statusKey.id,
-                                    cursor = null,
-                                ).encodeJson(),
-                        ).body()
-                        ?.data
-                        ?.threadedConversationWithInjectionsV2
-                        ?.instructions
-                        .orEmpty()
-                val tweet = response.tweets()
-                val item = tweet.firstOrNull { it.id == statusKey.id }
-                if (item != null) {
-                    XQT.save(
-                        accountKey = accountKey,
-                        pagingKey = pagingKey,
-                        database = database,
-                        tweet = listOf(item),
-                    )
-                } else {
-                    throw Exception("Status not found")
-                }
-            },
-            cacheSource = {
-                database
-                    .pagingTimelineDao()
-                    .get(pagingKey, accountType = AccountType.Specific(accountKey))
-                    .distinctUntilChanged()
-                    .mapNotNull {
-                        it?.render(this)
-                    }
-            },
-        )
-    }
-
     override suspend fun compose(
         data: ComposeData,
         progress: (ComposeProgress) -> Unit,
@@ -611,77 +543,35 @@ internal class XQTDataSource(
             mediaIdString
         }
 
-    override suspend fun deleteStatus(statusKey: MicroBlogKey) {
-        tryRun {
-            service.postDeleteTweet(
-                postDeleteTweetRequest =
-                    PostDeleteTweetRequest(
-                        variables =
-                            PostCreateRetweetRequestVariables(
-                                tweetId = statusKey.id,
-                            ),
-                    ),
-            )
-            // delete status from cache
-            database.connect {
-                database.statusDao().delete(
-                    statusKey = statusKey,
-                    accountType = AccountType.Specific(accountKey),
-                )
-                database.statusReferenceDao().delete(statusKey)
-                database.pagingTimelineDao().deleteStatus(
-                    accountKey = accountKey,
-                    statusKey = statusKey,
-                )
-            }
-        }
-    }
-
     override fun searchStatus(query: String) =
         SearchStatusPagingSource(
             service,
-            database,
             accountKey,
             query,
         )
 
-    override fun searchUser(
-        query: String,
-        pageSize: Int,
-    ): Flow<PagingData<UiProfile>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            SearchUserPagingSource(
-                service = service,
-                accountKey = accountKey,
-                query = query,
-            )
-        }.flow
+    override fun searchUser(query: String) =
+        SearchUserPagingSource(
+            service = service,
+            accountKey = accountKey,
+            query = query,
+        )
 
-    override fun discoverUsers(pageSize: Int): Flow<PagingData<UiProfile>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            TrendsUserPagingSource(
-                service,
-                accountKey,
-            )
-        }.flow
+    override fun discoverUsers() =
+        TrendsUserPagingSource(
+            service,
+            accountKey,
+        )
 
-    override fun discoverStatuses(): BaseTimelineLoader {
+    override fun discoverStatuses(): RemoteLoader<UiTimelineV2> {
         // not supported
         throw UnsupportedOperationException("XQT does not support discover statuses")
     }
 
-    override fun discoverHashtags(pageSize: Int): Flow<PagingData<UiHashtag>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            TrendHashtagPagingSource(
-                service,
-            )
-        }.flow
+    override fun discoverHashtags() =
+        TrendHashtagPagingSource(
+            service,
+        )
 
     override fun composeConfig(type: ComposeType): ComposeConfig =
         ComposeConfig(
@@ -695,481 +585,20 @@ internal class XQTDataSource(
                 ),
         )
 
-    override suspend fun follow(
-        userKey: MicroBlogKey,
-        relation: UiRelation,
-    ) {
-        when {
-            relation.following -> unfollow(userKey)
-            relation.blocking -> unblock(userKey)
-            else -> follow(userKey)
-        }
-    }
-
-    override fun profileActions(): List<ProfileAction> =
-        listOf(
-            object : ProfileAction.Mute {
-                override suspend fun invoke(
-                    userKey: MicroBlogKey,
-                    relation: UiRelation,
-                ) {
-                    if (relation.muted) {
-                        unmute(userKey)
-                    } else {
-                        mute(userKey)
-                    }
-                }
-
-                override fun relationState(relation: UiRelation): Boolean = relation.muted
-            },
-            object : ProfileAction.Block {
-                override suspend fun invoke(
-                    userKey: MicroBlogKey,
-                    relation: UiRelation,
-                ) {
-                    if (relation.blocking) {
-                        unblock(userKey)
-                    } else {
-                        block(userKey)
-                    }
-                }
-
-                override fun relationState(relation: UiRelation): Boolean = relation.blocking
-            },
+    override fun following(userKey: MicroBlogKey) =
+        FollowingPagingSource(
+            service = service,
+            userKey = userKey,
+            accountKey = accountKey,
         )
 
-    override fun like(
-        statusKey: MicroBlogKey,
-        liked: Boolean,
-    ) {
-        coroutineScope.launch {
-            updateStatusUseCase<StatusContent.XQT>(
-                statusKey = statusKey,
-                accountKey = accountKey,
-                cacheDatabase = database,
-                update = {
-                    it.copy(
-                        data =
-                            it.data.copy(
-                                legacy =
-                                    it.data.legacy?.copy(
-                                        favorited = !liked,
-                                        favoriteCount =
-                                            if (liked) {
-                                                it.data.legacy.favoriteCount
-                                                    .minus(1)
-                                            } else {
-                                                it.data.legacy.favoriteCount
-                                                    .plus(1)
-                                            },
-                                    ),
-                            ),
-                    )
-                },
-            )
-
-            tryRun {
-                if (liked) {
-                    service.postUnfavoriteTweet(
-                        postUnfavoriteTweetRequest =
-                            PostUnfavoriteTweetRequest(
-                                variables = PostCreateRetweetRequestVariables(tweetId = statusKey.id),
-                            ),
-                    )
-                } else {
-                    service.postFavoriteTweet(
-                        postFavoriteTweetRequest =
-                            PostFavoriteTweetRequest(
-                                variables =
-                                    PostCreateRetweetRequestVariables(
-                                        tweetId = statusKey.id,
-                                    ),
-                            ),
-                    )
-                }
-            }.onFailure {
-                updateStatusUseCase<StatusContent.XQT>(
-                    statusKey = statusKey,
-                    accountKey = accountKey,
-                    cacheDatabase = database,
-                    update = {
-                        it.copy(
-                            data =
-                                it.data.copy(
-                                    legacy =
-                                        it.data.legacy?.copy(
-                                            favorited = liked,
-                                            favoriteCount =
-                                                if (liked) {
-                                                    it.data.legacy.favoriteCount
-                                                        .plus(1)
-                                                } else {
-                                                    it.data.legacy.favoriteCount
-                                                        .minus(1)
-                                                },
-                                        ),
-                                ),
-                        )
-                    },
-                )
-            }.onSuccess {
-//            updateStatusUseCase<StatusContent.XQT>(
-//                statusKey = status.statusKey,
-//                accountKey = status.accountKey,
-//                cacheDatabase = database,
-//                update = {
-//                    it.copy(
-//                        data = result,
-//                    )
-//                },
-//            )
-            }
-        }
-    }
-
-    override fun retweet(
-        statusKey: MicroBlogKey,
-        retweeted: Boolean,
-    ) {
-        coroutineScope.launch {
-            updateStatusUseCase<StatusContent.XQT>(
-                statusKey = statusKey,
-                accountKey = accountKey,
-                cacheDatabase = database,
-                update = {
-                    it.copy(
-                        data =
-                            it.data.copy(
-                                legacy =
-                                    it.data.legacy?.copy(
-                                        retweeted = !retweeted,
-                                        retweetCount =
-                                            if (retweeted) {
-                                                it.data.legacy.retweetCount
-                                                    .minus(1)
-                                            } else {
-                                                it.data.legacy.retweetCount
-                                                    .plus(1)
-                                            },
-                                    ),
-                            ),
-                    )
-                },
-            )
-
-            tryRun {
-                if (retweeted) {
-                    service.postDeleteRetweet(
-                        postDeleteRetweetRequest =
-                            PostDeleteRetweetRequest(
-                                variables = PostDeleteRetweetRequestVariables(sourceTweetId = statusKey.id),
-                            ),
-                    )
-                } else {
-                    service.postCreateRetweet(
-                        postCreateRetweetRequest =
-                            PostCreateRetweetRequest(
-                                variables =
-                                    PostCreateRetweetRequestVariables(
-                                        tweetId = statusKey.id,
-                                    ),
-                            ),
-                    )
-                }
-            }.onFailure {
-                updateStatusUseCase<StatusContent.XQT>(
-                    statusKey = statusKey,
-                    accountKey = accountKey,
-                    cacheDatabase = database,
-                    update = {
-                        it.copy(
-                            data =
-                                it.data.copy(
-                                    legacy =
-                                        it.data.legacy?.copy(
-                                            retweeted = retweeted,
-                                            retweetCount =
-                                                if (retweeted) {
-                                                    it.data.legacy.retweetCount
-                                                        .plus(1)
-                                                } else {
-                                                    it.data.legacy.retweetCount
-                                                        .minus(1)
-                                                },
-                                        ),
-                                ),
-                        )
-                    },
-                )
-            }.onSuccess {
-//            updateStatusUseCase<StatusContent.XQT>(
-//                statusKey = status.statusKey,
-//                accountKey = status.accountKey,
-//                cacheDatabase = database,
-//                update = {
-//                    it.copy(
-//                        data = result,
-//                    )
-//                },
-//            )
-            }
-        }
-    }
-
-    override fun bookmark(
-        statusKey: MicroBlogKey,
-        bookmarked: Boolean,
-    ) {
-        coroutineScope.launch {
-            updateStatusUseCase<StatusContent.XQT>(
-                statusKey = statusKey,
-                accountKey = accountKey,
-                cacheDatabase = database,
-                update = {
-                    it.copy(
-                        data =
-                            it.data.copy(
-                                legacy =
-                                    it.data.legacy?.copy(
-                                        bookmarked = !bookmarked,
-                                        bookmarkCount =
-                                            if (bookmarked) {
-                                                maxOf(0, (it.data.legacy.bookmarkCount ?: 1) - 1)
-                                            } else {
-                                                (it.data.legacy.bookmarkCount ?: 0) + 1
-                                            },
-                                    ),
-                            ),
-                    )
-                },
-            )
-
-            tryRun {
-                if (bookmarked) {
-                    service.postDeleteBookmark(
-                        postDeleteBookmarkRequest =
-                            DeleteBookmarkRequest(
-                                variables =
-                                    DeleteBookmarkRequestVariables(
-                                        tweetId = statusKey.id,
-                                    ),
-                            ),
-                    )
-                } else {
-                    service.postCreateBookmark(
-                        postCreateBookmarkRequest =
-                            CreateBookmarkRequest(
-                                variables =
-                                    CreateBookmarkRequestVariables(
-                                        tweetId = statusKey.id,
-                                    ),
-                            ),
-                    )
-                }
-            }.onFailure {
-                updateStatusUseCase<StatusContent.XQT>(
-                    statusKey = statusKey,
-                    accountKey = accountKey,
-                    cacheDatabase = database,
-                    update = {
-                        it.copy(
-                            data =
-                                it.data.copy(
-                                    legacy =
-                                        it.data.legacy?.copy(
-                                            bookmarked = bookmarked,
-                                            bookmarkCount =
-                                                if (bookmarked) {
-                                                    maxOf(
-                                                        0,
-                                                        (it.data.legacy.bookmarkCount ?: 1) - 1,
-                                                    )
-                                                } else {
-                                                    (it.data.legacy.bookmarkCount ?: 0) + 1
-                                                },
-                                        ),
-                                ),
-                        )
-                    },
-                )
-            }.onSuccess {
-            }
-        }
-    }
-
-    suspend fun follow(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                following = true,
-            )
-        }
-        tryRun {
-            service.postCreateFriendships(userId = userKey.id)
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    following = false,
-                )
-            }
-        }
-    }
-
-    suspend fun unfollow(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                following = false,
-            )
-        }
-        tryRun {
-            service.postDestroyFriendships(userId = userKey.id)
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    following = true,
-                )
-            }
-        }
-    }
-
-    override suspend fun mute(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                muted = true,
-            )
-        }
-        tryRun {
-            service.postMutesUsersCreate(userKey.id)
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    muted = false,
-                )
-            }
-        }
-    }
-
-    suspend fun unmute(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                muted = false,
-            )
-        }
-        tryRun {
-            service.postMutesUsersDestroy(userKey.id)
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    muted = true,
-                )
-            }
-        }
-    }
-
-    override suspend fun block(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                blocking = true,
-            )
-        }
-        tryRun {
-            service.postBlocksCreate(userKey.id)
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    blocking = false,
-                )
-            }
-        }
-    }
-
-    suspend fun unblock(userKey: MicroBlogKey) {
-        val key = relationKeyWithUserKey(userKey)
-        MemCacheable.updateWith<UiRelation>(
-            key = key,
-        ) {
-            it.copy(
-                blocking = false,
-            )
-        }
-        tryRun {
-            service.postBlocksDestroy(userKey.id)
-        }.onFailure {
-            MemCacheable.updateWith<UiRelation>(
-                key = key,
-            ) {
-                it.copy(
-                    blocking = true,
-                )
-            }
-        }
-    }
-
-    private val notificationMarkerKey: String
-        get() = "notificationBadgeCount_$accountKey"
-
-    override fun notificationBadgeCount(): CacheData<Int> =
-        MemCacheable(
-            key = notificationMarkerKey,
-            fetchSource = {
-                service.getBadgeCount().ntabUnreadCount?.toInt() ?: 0
-            },
+    override fun fans(userKey: MicroBlogKey) =
+        FansPagingSource(
+            service = service,
+            userKey = userKey,
+            accountKey = accountKey,
         )
 
-    override fun following(
-        userKey: MicroBlogKey,
-        scope: CoroutineScope,
-        pageSize: Int,
-    ): Flow<PagingData<UiProfile>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            FollowingPagingSource(
-                service = service,
-                userKey = userKey,
-                accountKey = accountKey,
-            )
-        }.flow.cachedIn(scope)
-
-    override fun fans(
-        userKey: MicroBlogKey,
-        scope: CoroutineScope,
-        pageSize: Int,
-    ): Flow<PagingData<UiProfile>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            FansPagingSource(
-                service = service,
-                userKey = userKey,
-                accountKey = accountKey,
-            )
-        }.flow.cachedIn(scope)
-
     override fun profileTabs(userKey: MicroBlogKey): ImmutableList<ProfileTab> =
         listOfNotNull(
             ProfileTab.Timeline(
@@ -1182,7 +611,6 @@ internal class XQTDataSource(
                     UserRepliesTimelineRemoteMediator(
                         service = service,
                         accountKey = accountKey,
-                        database = database,
                         userKey = userKey,
                     ),
             ),
@@ -1194,7 +622,6 @@ internal class XQTDataSource(
                         UserLikesTimelineRemoteMediator(
                             service = service,
                             accountKey = accountKey,
-                            database = database,
                             userKey = userKey,
                         ),
                 )
@@ -1207,7 +634,6 @@ internal class XQTDataSource(
         ListTimelineRemoteMediator(
             listId,
             service,
-            database,
             accountKey,
         )
 
@@ -1229,7 +655,7 @@ internal class XQTDataSource(
             .cachedIn(scope)
             .combine(credentialFlow) { paging, credential ->
                 paging.map {
-                    it.render(accountKey = accountKey, credential = credential, statusEvent = this)
+                    it.render(accountKey = accountKey, credential = credential)
                 }
             }.cachedIn(scope)
 
@@ -1256,7 +682,7 @@ internal class XQTDataSource(
             .cachedIn(scope)
             .combine(credentialFlow) { paging, credential ->
                 paging.map {
-                    it.render(accountKey = accountKey, credential = credential, statusEvent = this)
+                    it.render(accountKey = accountKey, credential = credential)
                 }
             }.cachedIn(scope)
 
@@ -1387,7 +813,6 @@ internal class XQTDataSource(
                         room?.render(
                             accountKey = accountKey,
                             credential = credential,
-                            statusEvent = this,
                         )
                     }.mapNotNull { it }
             },
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTLoader.kt
new file mode 100644
index 000000000..3cd97459d
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTLoader.kt
@@ -0,0 +1,144 @@
+package dev.dimension.flare.data.datasource.xqt
+
+import dev.dimension.flare.common.encodeJson
+import dev.dimension.flare.data.database.cache.mapper.tweets
+import dev.dimension.flare.data.datasource.microblog.loader.NotificationLoader
+import dev.dimension.flare.data.datasource.microblog.loader.PostLoader
+import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
+import dev.dimension.flare.data.datasource.microblog.loader.UserLoader
+import dev.dimension.flare.data.network.xqt.XQTService
+import dev.dimension.flare.data.network.xqt.model.PostCreateRetweetRequestVariables
+import dev.dimension.flare.data.network.xqt.model.PostDeleteTweetRequest
+import dev.dimension.flare.data.network.xqt.model.User
+import dev.dimension.flare.data.network.xqt.model.UserUnavailable
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiProfile
+import dev.dimension.flare.ui.model.UiRelation
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
+import dev.dimension.flare.ui.model.mapper.screenName
+import dev.dimension.flare.ui.model.mapper.toUi
+
+internal class XQTLoader(
+    override val accountKey: MicroBlogKey,
+    private val service: XQTService,
+) : NotificationLoader,
+    UserLoader,
+    PostLoader,
+    RelationLoader {
+    override suspend fun notificationBadgeCount(): Int = service.getBadgeCount().ntabUnreadCount?.toInt() ?: 0
+
+    override suspend fun userByHandleAndHost(
+        handle: String,
+        host: String,
+    ): UiProfile {
+        require(host == accountKey.host) {
+            "Cross-host lookup is unsupported for XQT: $host"
+        }
+        val user =
+            service
+                .userByScreenName(handle)
+                .body()
+                ?.data
+                ?.user
+                ?.result
+                ?.let {
+                    when (it) {
+                        is User -> it
+                        is UserUnavailable -> null
+                    }
+                } ?: throw Exception("User not found")
+        return user.render(accountKey)
+    }
+
+    override suspend fun userById(id: String): UiProfile {
+        val user =
+            service
+                .userById(id)
+                .body()
+                ?.data
+                ?.user
+                ?.result
+                ?.let {
+                    when (it) {
+                        is User -> it
+                        is UserUnavailable -> null
+                    }
+                } ?: throw Exception("User not found")
+        return user.render(accountKey)
+    }
+
+    override suspend fun status(statusKey: MicroBlogKey): UiTimelineV2 {
+        val instructions =
+            service
+                .getTweetDetail(
+                    variables =
+                        TweetDetailRequest(
+                            focalTweetID = statusKey.id,
+                            cursor = null,
+                        ).encodeJson(),
+                ).body()
+                ?.data
+                ?.threadedConversationWithInjectionsV2
+                ?.instructions
+                .orEmpty()
+        val item = instructions.tweets().firstOrNull { it.id == statusKey.id }
+        return item?.render(accountKey) ?: throw Exception("Status not found")
+    }
+
+    override suspend fun deleteStatus(statusKey: MicroBlogKey) {
+        service.postDeleteTweet(
+            postDeleteTweetRequest =
+                PostDeleteTweetRequest(
+                    variables =
+                        PostCreateRetweetRequestVariables(
+                            tweetId = statusKey.id,
+                        ),
+                ),
+        )
+    }
+
+    override suspend fun relation(userKey: MicroBlogKey): UiRelation {
+        val userResponse =
+            service
+                .userById(userKey.id)
+                .body()
+                ?.data
+                ?.user
+                ?.result
+                ?.let {
+                    when (it) {
+                        is User -> it
+                        is UserUnavailable -> null
+                    }
+                } ?: throw Exception("User not found")
+        return service
+            .profileSpotlights(userResponse.screenName)
+            .body()
+            ?.toUi(muting = userResponse.legacy.muting) ?: throw Exception("User not found")
+    }
+
+    override suspend fun follow(userKey: MicroBlogKey) {
+        service.postCreateFriendships(userId = userKey.id)
+    }
+
+    override suspend fun unfollow(userKey: MicroBlogKey) {
+        service.postDestroyFriendships(userId = userKey.id)
+    }
+
+    override suspend fun block(userKey: MicroBlogKey) {
+        service.postBlocksCreate(userKey.id)
+    }
+
+    override suspend fun unblock(userKey: MicroBlogKey) {
+        service.postBlocksDestroy(userKey.id)
+    }
+
+    override suspend fun mute(userKey: MicroBlogKey) {
+        service.postMutesUsersCreate(userKey.id)
+    }
+
+    override suspend fun unmute(userKey: MicroBlogKey) {
+        service.postMutesUsersDestroy(userKey.id)
+    }
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Render.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Render.kt
index b3cd3dd24..9665b931a 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Render.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Render.kt
@@ -5,15 +5,14 @@ import dev.dimension.flare.data.database.app.model.DbRssSources
 import dev.dimension.flare.data.database.cache.model.DbDirectMessageTimelineWithRoom
 import dev.dimension.flare.data.database.cache.model.DbMessageItemWithUser
 import dev.dimension.flare.data.database.cache.model.MessageContent
-import dev.dimension.flare.data.datasource.microblog.StatusEvent
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiAccount
 import dev.dimension.flare.ui.model.UiDMItem
 import dev.dimension.flare.ui.model.UiDMRoom
 import dev.dimension.flare.ui.model.UiRssSource
 import dev.dimension.flare.ui.render.toUi
-import kotlinx.collections.immutable.toImmutableList
 import kotlin.time.Instant
+import kotlinx.collections.immutable.toImmutableList
 
 // internal fun DbPagingTimelineWithStatus.render(
 //    event: StatusEvent?,
@@ -145,14 +144,13 @@ import kotlin.time.Instant
 internal fun DbDirectMessageTimelineWithRoom.render(
     accountKey: MicroBlogKey,
     credential: UiAccount.Credential,
-    statusEvent: StatusEvent,
 ) = UiDMRoom(
     key = room.room.roomKey,
-    lastMessage = room.lastMessage?.render(accountKey, credential, statusEvent),
+    lastMessage = room.lastMessage?.render(accountKey, credential),
     users =
         room.users
             .filter { it.reference.userKey != accountKey }
-            .map { it.user.render(accountKey) }
+            .map { it.user.content }
             .toImmutableList(),
     unreadCount = timeline.unreadCount,
 )
@@ -160,10 +158,9 @@ internal fun DbDirectMessageTimelineWithRoom.render(
 internal fun DbMessageItemWithUser.render(
     accountKey: MicroBlogKey,
     credential: UiAccount.Credential,
-    statusEvent: StatusEvent,
 ) = UiDMItem(
     key = message.messageKey,
-    user = user.render(accountKey),
+    user = user.content,
     timestamp = Instant.fromEpochMilliseconds(message.timestamp).toUi(),
     content =
         when (val content = message.content) {
@@ -172,7 +169,6 @@ internal fun DbMessageItemWithUser.render(
                 content.render(
                     accountKey = accountKey,
                     credential = credential,
-                    statusEvent = statusEvent,
                 )
 
             is MessageContent.Local ->
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/VVO.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/VVO.kt
index a20434a98..d4ded9e15 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/VVO.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/VVO.kt
@@ -27,9 +27,9 @@ import dev.dimension.flare.ui.render.toUi
 import dev.dimension.flare.ui.route.DeeplinkRoute
 import dev.dimension.flare.ui.route.toUri
 import io.ktor.http.decodeURLPart
-import kotlin.time.Clock
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableMap
+import kotlin.time.Clock
 
 internal fun Status.render(accountKey: MicroBlogKey): UiTimelineV2 = renderStatusV2(accountKey)
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt
index 4cc207358..7079226b8 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt
@@ -7,10 +7,9 @@ import de.cketti.codepoints.codePointCount
 import de.cketti.codepoints.deluxe.codePointSequence
 import dev.dimension.flare.common.decodeJson
 import dev.dimension.flare.common.encodeJson
+import dev.dimension.flare.data.database.cache.mapper.XQTTimeline
 import dev.dimension.flare.data.database.cache.model.MessageContent
-import dev.dimension.flare.data.database.cache.model.StatusContent
 import dev.dimension.flare.data.datasource.microblog.ActionMenu
-import dev.dimension.flare.data.datasource.microblog.StatusEvent
 import dev.dimension.flare.data.datasource.microblog.userActionsMenu
 import dev.dimension.flare.data.network.xqt.model.Admin
 import dev.dimension.flare.data.network.xqt.model.AudioSpace
@@ -25,6 +24,9 @@ import dev.dimension.flare.data.network.xqt.model.TimelineTwitterList
 import dev.dimension.flare.data.network.xqt.model.Tweet
 import dev.dimension.flare.data.network.xqt.model.TweetCardLegacy
 import dev.dimension.flare.data.network.xqt.model.TweetCardLegacyBindingValueData
+import dev.dimension.flare.data.network.xqt.model.TweetTombstone
+import dev.dimension.flare.data.network.xqt.model.TweetUnion
+import dev.dimension.flare.data.network.xqt.model.TweetWithVisibilityResults
 import dev.dimension.flare.data.network.xqt.model.TwitterList
 import dev.dimension.flare.data.network.xqt.model.User
 import dev.dimension.flare.data.network.xqt.model.UserResultCore
@@ -34,11 +36,11 @@ import dev.dimension.flare.data.network.xqt.model.legacy.TopLevel
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
-import dev.dimension.flare.model.ReferenceType
 import dev.dimension.flare.ui.model.ClickEvent
 import dev.dimension.flare.ui.model.UiAccount
 import dev.dimension.flare.ui.model.UiCard
 import dev.dimension.flare.ui.model.UiDMItem
+import dev.dimension.flare.ui.model.UiIcon
 import dev.dimension.flare.ui.model.UiList
 import dev.dimension.flare.ui.model.UiMedia
 import dev.dimension.flare.ui.model.UiNumber
@@ -47,6 +49,7 @@ import dev.dimension.flare.ui.model.UiPoll
 import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.UiRelation
 import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.toHtml
 import dev.dimension.flare.ui.render.UiRichText
 import dev.dimension.flare.ui.render.toUi
@@ -63,16 +66,33 @@ import moe.tlaster.twitter.parser.TwitterParser
 import moe.tlaster.twitter.parser.UrlToken
 import kotlin.time.Clock
 import kotlin.time.Instant
-import kotlin.uuid.Uuid
 
 private val twitterParser by lazy {
     TwitterParser(enableNonAsciiInUrl = false)
 }
 
-internal fun TopLevel.renderNotifications(
-    accountKey: MicroBlogKey,
-    event: StatusEvent.XQT,
-): List<UiTimeline> {
+private fun TweetUnion.toTweetOrNull(): Tweet? =
+    when (this) {
+        is Tweet -> this
+        is TweetWithVisibilityResults -> tweet
+        is TweetTombstone -> null
+    }
+
+private fun TweetUnion.getRetweet(): TweetUnion? =
+    when (this) {
+        is Tweet -> legacy?.retweetedStatusResult?.result
+        is TweetTombstone -> null
+        is TweetWithVisibilityResults -> tweet.legacy?.retweetedStatusResult?.result
+    }
+
+private fun TweetUnion.getQuoted(): TweetUnion? =
+    when (this) {
+        is Tweet -> quotedStatusResult?.result
+        is TweetTombstone -> null
+        is TweetWithVisibilityResults -> tweet.quotedStatusResult?.result
+    }
+
+internal fun TopLevel.renderNotifications(accountKey: MicroBlogKey): List<UiTimelineV2> {
     return timeline
         ?.instructions
         ?.asSequence()
@@ -110,10 +130,10 @@ internal fun TopLevel.renderNotifications(
                     }
                 val icon =
                     when (data?.icon?.id) {
-                        "person_icon" -> UiTimeline.TopMessage.Icon.Follow
-                        "heart_icon" -> UiTimeline.TopMessage.Icon.Favourite
-                        "bird_icon" -> UiTimeline.TopMessage.Icon.Info
-                        else -> UiTimeline.TopMessage.Icon.Info
+                        "person_icon" -> UiIcon.Follow
+                        "heart_icon" -> UiIcon.Like
+                        "bird_icon" -> UiIcon.Info
+                        else -> UiIcon.Info
                     }
                 val tweet =
                     notificationTweet?.firstOrNull()?.let {
@@ -134,9 +154,9 @@ internal fun TopLevel.renderNotifications(
                                         ),
                                 ),
                             legacy = it,
-                        ).renderStatus(accountKey, event, emptyMap())
+                        ).renderStatus(accountKey)
                     }
-                val itemContent =
+                val itemContent: UiTimeline.ItemContent? =
                     when {
                         data?.icon?.id in listOf("person_icon") && users != null ->
                             if (users.size > 1) {
@@ -155,39 +175,62 @@ internal fun TopLevel.renderNotifications(
                         else -> null
                     }
 
-                UiTimeline(
-                    topMessage =
-                        UiTimeline.TopMessage(
-                            user = null, // users?.firstOrNull(),
-                            icon = icon,
-                            type =
-                                UiTimeline.TopMessage.MessageType.XQT
-                                    .Custom(
-                                        message = message.orEmpty(),
-                                        id = notification.id ?: Uuid.random().toString(),
+                val statusKey =
+                    MicroBlogKey(
+                        id = notification.id.orEmpty(),
+                        host = accountKey.host,
+                    )
+                val clickEvent =
+                    when {
+                        itemContent == null && url == "/2/notifications/device_follow.json" ->
+                            ClickEvent.Deeplink(
+                                DeeplinkRoute.Timeline
+                                    .XQTDeviceFollow(
+                                        accountType = AccountType.Specific(accountKey),
                                     ),
-                            onClicked = {
-                                if (itemContent == null && url != null) {
-                                    if (url == "/2/notifications/device_follow.json") {
-                                        launcher.launch(
-                                            DeeplinkRoute.Timeline
-                                                .XQTDeviceFollow(
-                                                    accountType = AccountType.Specific(accountKey),
-                                                ).toUri(),
-                                        )
-                                    } else if (!url.startsWith("/")) {
-                                        launcher.launch(url)
-                                    }
-                                }
-                            },
-                            statusKey =
-                                MicroBlogKey(
-                                    id = notification.id.orEmpty(),
-                                    host = accountKey.host,
-                                ),
-                        ),
-                    content = itemContent,
-                )
+                            )
+
+                        itemContent == null && !url.isNullOrEmpty() && !url.startsWith("/") ->
+                            ClickEvent.Deeplink(
+                                DeeplinkRoute.OpenLinkDirectly(url),
+                            )
+
+                        else -> ClickEvent.Noop
+                    }
+                val messageItem =
+                    UiTimelineV2.Message(
+                        user = null,
+                        statusKey = statusKey,
+                        icon = icon,
+                        type = UiTimelineV2.Message.Type.Raw(message.orEmpty()),
+                        createdAt = createdAt?.toUi() ?: Clock.System.now().toUi(),
+                        clickEvent = clickEvent,
+                        accountType = AccountType.Specific(accountKey),
+                    )
+                when (itemContent) {
+                    is UiTimeline.ItemContent.Status -> itemContent.toUiTimelineV2(accountKey, messageItem)
+                    is UiTimeline.ItemContent.User ->
+                        UiTimelineV2.User(
+                            message = messageItem,
+                            value = itemContent.value,
+                            createdAt = createdAt?.toUi() ?: Clock.System.now().toUi(),
+                            statusKey = itemContent.value.key,
+                            accountType = AccountType.Specific(accountKey),
+                        )
+
+                    is UiTimeline.ItemContent.UserList ->
+                        UiTimelineV2.UserList(
+                            message = messageItem,
+                            users = itemContent.users,
+                            createdAt = createdAt?.toUi() ?: Clock.System.now().toUi(),
+                            statusKey = statusKey,
+                            post = itemContent.status?.toUiTimelineV2(accountKey, null),
+                            accountType = AccountType.Specific(accountKey),
+                        )
+
+                    null -> messageItem
+                    else -> null
+                }
             } else if (mentionTweet != null) {
                 val tweet = globalObjects?.tweets?.get(mentionTweet.id) ?: return@mapNotNull null
                 if (tweet.userIdStr == null) {
@@ -222,31 +265,33 @@ internal fun TopLevel.renderNotifications(
                                     ),
                             ),
                         legacy = tweet,
-                    ).renderStatus(accountKey, event, emptyMap())
-                UiTimeline(
-                    topMessage =
-                        UiTimeline.TopMessage(
+                    ).renderStatus(accountKey)
+                data.toUiTimelineV2(
+                    accountKey = accountKey,
+                    message =
+                        UiTimelineV2.Message(
                             user = renderedUser,
-                            icon = UiTimeline.TopMessage.Icon.Retweet,
-                            type = UiTimeline.TopMessage.MessageType.XQT.Mention,
-                            onClicked = {
-                                launcher.launch(
-                                    DeeplinkRoute.Profile
-                                        .User(
-                                            accountType =
-                                                dev.dimension.flare.model.AccountType
-                                                    .Specific(accountKey),
-                                            userKey = renderedUser.key,
-                                        ).toUri(),
-                                )
-                            },
                             statusKey =
                                 MicroBlogKey(
                                     id = notification?.id.orEmpty(),
                                     host = accountKey.host,
                                 ),
+                            icon = UiIcon.Retweet,
+                            type =
+                                UiTimelineV2.Message.Type.Localized(
+                                    UiTimelineV2.Message.Type.Localized.MessageId.Mention,
+                                ),
+                            createdAt = data.createdAt,
+                            clickEvent =
+                                ClickEvent.Deeplink(
+                                    DeeplinkRoute.Profile
+                                        .User(
+                                            accountType = AccountType.Specific(accountKey),
+                                            userKey = renderedUser.key,
+                                        ),
+                                ),
+                            accountType = AccountType.Specific(accountKey),
                         ),
-                    content = data,
                 )
             } else {
                 null
@@ -255,65 +300,171 @@ internal fun TopLevel.renderNotifications(
         .orEmpty()
 }
 
-internal fun Tweet.render(
-    accountKey: MicroBlogKey,
-    event: StatusEvent.XQT,
-    references: Map<ReferenceType, List<StatusContent>> = emptyMap(),
-): UiTimeline {
+internal fun Tweet.render(accountKey: MicroBlogKey): UiTimelineV2.Post {
+    val retweetUnion = this.getRetweet()
+    val quoteUnion = retweetUnion?.getQuoted() ?: this.getQuoted()
+    val quote = quoteUnion?.toTweetOrNull()?.renderStatus(accountKey = accountKey)
+    val retweet = retweetUnion?.toTweetOrNull()?.renderStatus(accountKey, quote = quote)
+    val currentTweet = renderStatus(accountKey, quote = quote)
+    val actualTweet = retweet ?: currentTweet
+    val user = currentTweet.user
+    val message =
+        if (retweet != null && user != null) {
+            UiTimelineV2.Message(
+                user = user,
+                icon = UiIcon.Retweet,
+                type =
+                    UiTimelineV2.Message.Type.Localized(
+                        UiTimelineV2.Message.Type.Localized.MessageId.Repost,
+                    ),
+                createdAt = currentTweet.createdAt,
+                clickEvent =
+                    ClickEvent.Deeplink(
+                        DeeplinkRoute.Profile
+                            .User(
+                                accountType = AccountType.Specific(accountKey),
+                                userKey = user.key,
+                            ),
+                    ),
+                statusKey = currentTweet.statusKey,
+                accountType = AccountType.Specific(accountKey),
+            )
+        } else {
+            null
+        }
+    return actualTweet.toUiTimelineV2(accountKey = accountKey, message = message)
+}
+
+internal fun XQTTimeline.render(accountKey: MicroBlogKey): UiTimelineV2? {
+    val result = tweets.tweetResults.result ?: return null
+    val retweetUnion = result.getRetweet()
+    val quoteUnion = retweetUnion?.getQuoted() ?: result.getQuoted()
+    val quote = quoteUnion?.toTweetOrNull()?.renderStatus(accountKey = accountKey)
+    val parentStatuses =
+        parents
+            .mapNotNull {
+                it.tweets.tweetResults.result
+                    ?.toTweetOrNull()
+            }.map { it.renderStatus(accountKey = accountKey) }
+            .toImmutableList()
+
+    val currentTweet =
+        result
+            .toTweetOrNull()
+            ?.renderStatus(
+                accountKey = accountKey,
+                parents = parentStatuses,
+                quote = quote,
+            ) ?: return null
     val retweet =
-        (references[ReferenceType.Retweet]?.firstOrNull() as? StatusContent.XQT)
-            ?.data
+        retweetUnion
+            ?.toTweetOrNull()
             ?.renderStatus(
                 accountKey = accountKey,
-                event = event,
-                references = mapOf(ReferenceType.Quote to references[ReferenceType.Quote].orEmpty()),
+                quote = quote,
             )
-    val currentTweet = renderStatus(accountKey, event, references)
     val actualTweet = retweet ?: currentTweet
     val user = currentTweet.user
-    val topMessage =
+    val message =
         if (retweet != null && user != null) {
-            UiTimeline.TopMessage(
+            UiTimelineV2.Message(
                 user = user,
-                icon = UiTimeline.TopMessage.Icon.Retweet,
-                type = UiTimeline.TopMessage.MessageType.XQT.Retweet,
-                onClicked = {
-                    launcher.launch(
+                icon = UiIcon.Retweet,
+                type =
+                    UiTimelineV2.Message.Type.Localized(
+                        UiTimelineV2.Message.Type.Localized.MessageId.Repost,
+                    ),
+                createdAt = currentTweet.createdAt,
+                clickEvent =
+                    ClickEvent.Deeplink(
                         DeeplinkRoute.Profile
                             .User(
-                                accountType =
-                                    dev.dimension.flare.model.AccountType
-                                        .Specific(accountKey),
+                                accountType = AccountType.Specific(accountKey),
                                 userKey = user.key,
-                            ).toUri(),
-                    )
-                },
+                            ),
+                    ),
                 statusKey = currentTweet.statusKey,
+                accountType = AccountType.Specific(accountKey),
             )
         } else {
             null
         }
-    return UiTimeline(
-        content = actualTweet,
-        topMessage = topMessage,
-    )
+    return actualTweet.toUiTimelineV2(accountKey = accountKey, message = message)
 }
 
+private fun UiTimeline.ItemContent.Status.toUiTimelineV2(
+    accountKey: MicroBlogKey,
+    message: UiTimelineV2.Message?,
+): UiTimelineV2.Post =
+    UiTimelineV2.Post(
+        message = message,
+        platformType = platformType,
+        images = images,
+        sensitive = sensitive,
+        contentWarning = contentWarning,
+        user = user,
+        quote = quote.map { it.toUiTimelineV2(accountKey, null) }.toImmutableList(),
+        content = content,
+        actions = actions,
+        poll = poll,
+        statusKey = statusKey,
+        card = card,
+        createdAt = createdAt,
+        emojiReactions =
+            (bottomContent as? UiTimeline.ItemContent.Status.BottomContent.Reaction)
+                ?.emojiReactions
+                ?.map {
+                    UiTimelineV2.Post.EmojiReaction(
+                        name = it.name,
+                        url = it.url,
+                        count = it.count,
+                        clickEvent = ClickEvent.Noop,
+                        isUnicode = it.isUnicode,
+                        me = it.me,
+                    )
+                }?.toImmutableList() ?: persistentListOf(),
+        sourceChannel =
+            (bottomContent as? UiTimeline.ItemContent.Status.BottomContent.Reaction)
+                ?.channel
+                ?.let {
+                    UiTimelineV2.Post.SourceChannel(
+                        id = it.id,
+                        name = it.name,
+                    )
+                },
+        visibility =
+            (topEndContent as? UiTimeline.ItemContent.Status.TopEndContent.Visibility)
+                ?.visibility
+                ?.let {
+                    when (it) {
+                        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Public -> UiTimelineV2.Post.Visibility.Public
+                        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Home -> UiTimelineV2.Post.Visibility.Home
+                        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Followers -> UiTimelineV2.Post.Visibility.Followers
+                        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Specified -> UiTimelineV2.Post.Visibility.Specified
+                        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Channel -> UiTimelineV2.Post.Visibility.Channel
+                    }
+                },
+        replyToHandle =
+            (aboveTextContent as? UiTimeline.ItemContent.Status.AboveTextContent.ReplyTo)
+                ?.handle,
+        parents = parents.map { it.toUiTimelineV2(accountKey, null) }.toImmutableList(),
+        clickEvent =
+            ClickEvent.Deeplink(
+                DeeplinkRoute.Status.Detail(
+                    statusKey = statusKey,
+                    accountType = AccountType.Specific(accountKey),
+                ),
+            ),
+        accountType = AccountType.Specific(accountKey),
+    )
+
 internal fun Tweet.renderStatus(
     accountKey: MicroBlogKey,
-    event: StatusEvent.XQT,
-    references: Map<ReferenceType, List<StatusContent>>,
+    parents: List<UiTimeline.ItemContent.Status> = emptyList(),
+    quote: UiTimeline.ItemContent.Status? = null,
 ): UiTimeline.ItemContent.Status {
-    val parents =
-        references[ReferenceType.Reply]
-            ?.mapNotNull { it as? StatusContent.XQT }
-            ?.map { it.data.renderStatus(accountKey, event, emptyMap()) }
-            ?.toImmutableList()
-            ?: persistentListOf()
-    val quote =
-        (references[ReferenceType.Quote]?.firstOrNull() as? StatusContent.XQT)
-            ?.data
-            ?.renderStatus(accountKey = accountKey, event = event, references = emptyMap())
+    val actualParents = parents.toImmutableList()
+    val actualQuote = quote ?: quotedStatusResult?.result?.toTweetOrNull()?.renderStatus(accountKey = accountKey)
     val user =
         core
             ?.userResults
@@ -388,21 +539,30 @@ internal fun Tweet.renderStatus(
     val poll =
         card?.legacy?.let { cardLegacy ->
             if (cardLegacy.get("choice1_label") != null) {
-                val max =
-                    (1..4).sumOf { index ->
-                        cardLegacy.get("choice${index}_count")?.stringValue?.toLong() ?: 0
+                val optionData =
+                    (1..4).mapNotNull { index ->
+                        cardLegacy.get("choice${index}_label")?.stringValue?.let { label ->
+                            val count = cardLegacy.get("choice${index}_count")?.stringValue?.toLongOrNull() ?: 0L
+                            Triple(index - 1, label, count)
+                        }
                     }
+                val totalVotes = optionData.sumOf { it.third }.coerceAtLeast(1L)
                 val options =
-                    (1..4)
-                        .mapNotNull { index ->
-                            val count =
-                                cardLegacy.get("choice${index}_count")?.stringValue?.toLong() ?: 0
-                            cardLegacy.get("choice${index}_label")?.stringValue?.let {
-                                UiPoll.Option(
-                                    title = it,
-                                    votesCount = count,
-                                    percentage = count.toFloat() / max.coerceAtLeast(1).toFloat(),
-                                )
+                    optionData
+                        .map { (_, label, count) ->
+                            UiPoll.Option(
+                                title = label,
+                                votesCount = count,
+                                percentage = count.toFloat() / totalVotes.toFloat(),
+                            )
+                        }.toImmutableList()
+                val ownVotes =
+                    optionData
+                        .mapNotNull { (index, _, _) ->
+                            if (cardLegacy.get("choice${index + 1}_selected")?.booleanValue == true) {
+                                index
+                            } else {
+                                null
                             }
                         }.toImmutableList()
                 UiPoll(
@@ -410,15 +570,14 @@ internal fun Tweet.renderStatus(
                     id = "",
                     options = options,
                     multiple = false,
-                    ownVotes = persistentListOf(),
+                    ownVotes = ownVotes,
+                    voteEvent = null,
                     expiresAt =
                         cardLegacy.get("end_datetime_utc")?.stringValue?.let {
                             parseXQTCustomDateTime(
                                 it,
                             )
-                        }
-                            ?: Clock.System.now(),
-                    onVote = { options -> },
+                        },
                     enabled = false,
                 )
             } else {
@@ -510,140 +669,87 @@ internal fun Tweet.renderStatus(
         user = user,
         content = content,
         card = uiCard,
-        quote = listOfNotNull(quote).toImmutableList(),
+        quote = listOfNotNull(actualQuote).toImmutableList(),
         poll = poll,
         images = medias,
         contentWarning = null,
         createdAt = createAt.toUi(),
         aboveTextContent = aboveTextContent,
-        parents = parents,
+        parents = actualParents,
         actions =
             listOfNotNull(
                 ActionMenu.Item(
-                    icon = ActionMenu.Item.Icon.Reply,
+                    icon = UiIcon.Reply,
                     text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Reply),
                     count = UiNumber(legacy?.replyCount?.toLong() ?: 0),
-                    onClicked = {
-                        launcher.launch(
+                    clickEvent =
+                        ClickEvent.Deeplink(
                             DeeplinkRoute.Compose
                                 .Reply(
                                     accountKey = accountKey,
                                     statusKey = statusKey,
-                                ).toUri(),
-                        )
-                    },
+                                ),
+                        ),
                 ),
                 ActionMenu.Group(
                     displayItem =
-                        ActionMenu.Item(
-                            icon = if (legacy?.retweeted == true) ActionMenu.Item.Icon.Unretweet else ActionMenu.Item.Icon.Retweet,
-                            text =
-                                ActionMenu.Item.Text.Localized(
-                                    if (legacy?.retweeted ==
-                                        true
-                                    ) {
-                                        ActionMenu.Item.Text.Localized.Type.Unretweet
-                                    } else {
-                                        ActionMenu.Item.Text.Localized.Type.Retweet
-                                    },
-                                ),
-                            count = UiNumber(legacy?.retweetCount?.toLong() ?: 0),
-                            color = if (legacy?.retweeted == true) ActionMenu.Item.Color.PrimaryColor else null,
+                        ActionMenu.xqtRetweet(
+                            statusKey = statusKey,
+                            retweeted = legacy?.retweeted == true,
+                            count = legacy?.retweetCount?.toLong() ?: 0,
+                            accountKey = accountKey,
                         ),
                     actions =
                         listOfNotNull(
-                            ActionMenu.Item(
-                                icon = if (legacy?.retweeted == true) ActionMenu.Item.Icon.Unretweet else ActionMenu.Item.Icon.Retweet,
-                                text =
-                                    ActionMenu.Item.Text.Localized(
-                                        if (legacy?.retweeted ==
-                                            true
-                                        ) {
-                                            ActionMenu.Item.Text.Localized.Type.Unretweet
-                                        } else {
-                                            ActionMenu.Item.Text.Localized.Type.Retweet
-                                        },
-                                    ),
-                                count = UiNumber(legacy?.retweetCount?.toLong() ?: 0),
-                                color = if (legacy?.retweeted == true) ActionMenu.Item.Color.PrimaryColor else null,
-                                onClicked = {
-                                    event.retweet(statusKey, legacy?.retweeted ?: false)
-                                },
+                            ActionMenu.xqtRetweet(
+                                statusKey = statusKey,
+                                retweeted = legacy?.retweeted == true,
+                                count = legacy?.retweetCount?.toLong() ?: 0,
+                                accountKey = accountKey,
                             ),
                             ActionMenu.Item(
-                                icon = ActionMenu.Item.Icon.Quote,
+                                icon = UiIcon.Quote,
                                 text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Quote),
                                 count = UiNumber(legacy?.quoteCount?.toLong() ?: 0),
-                                onClicked = {
-                                    launcher.launch(
+                                clickEvent =
+                                    ClickEvent.Deeplink(
                                         DeeplinkRoute.Compose
                                             .Quote(
                                                 accountKey = accountKey,
                                                 statusKey = statusKey,
-                                            ).toUri(),
-                                    )
-                                },
+                                            ),
+                                    ),
                             ),
                         ).toImmutableList(),
                 ),
-                ActionMenu.Item(
-                    icon = if (legacy?.favorited == true) ActionMenu.Item.Icon.Unlike else ActionMenu.Item.Icon.Like,
-                    text =
-                        ActionMenu.Item.Text.Localized(
-                            if (legacy?.favorited ==
-                                true
-                            ) {
-                                ActionMenu.Item.Text.Localized.Type.Unlike
-                            } else {
-                                ActionMenu.Item.Text.Localized.Type.Like
-                            },
-                        ),
-                    count = UiNumber(legacy?.favoriteCount?.toLong() ?: 0),
-                    color = if (legacy?.favorited == true) ActionMenu.Item.Color.Red else null,
-                    onClicked = {
-                        event.like(statusKey, legacy?.favorited ?: false)
-                    },
+                ActionMenu.xqtLike(
+                    statusKey = statusKey,
+                    liked = legacy?.favorited == true,
+                    count = legacy?.favoriteCount?.toLong() ?: 0,
+                    accountKey = accountKey,
                 ),
                 ActionMenu.Group(
                     displayItem =
                         ActionMenu.Item(
-                            icon = ActionMenu.Item.Icon.More,
+                            icon = UiIcon.More,
                             text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.More),
                         ),
                     actions =
                         buildList {
                             add(
-                                ActionMenu.Item(
-                                    icon =
-                                        if (legacy?.bookmarked ==
-                                            true
-                                        ) {
-                                            ActionMenu.Item.Icon.Unbookmark
-                                        } else {
-                                            ActionMenu.Item.Icon.Bookmark
-                                        },
-                                    text =
-                                        ActionMenu.Item.Text.Localized(
-                                            if (legacy?.bookmarked ==
-                                                true
-                                            ) {
-                                                ActionMenu.Item.Text.Localized.Type.Unbookmark
-                                            } else {
-                                                ActionMenu.Item.Text.Localized.Type.Bookmark
-                                            },
-                                        ),
-                                    count = UiNumber(legacy?.bookmarkCount?.toLong() ?: 0),
-                                    onClicked = {
-                                        event.bookmark(statusKey, legacy?.bookmarked ?: false)
-                                    },
+                                ActionMenu.xqtBookmark(
+                                    statusKey = statusKey,
+                                    bookmarked = legacy?.bookmarked == true,
+                                    count = legacy?.bookmarkCount?.toLong() ?: 0,
+                                    accountKey = accountKey,
                                 ),
                             )
                             add(
                                 ActionMenu.Item(
-                                    icon = ActionMenu.Item.Icon.Share,
+                                    icon = UiIcon.Share,
                                     text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Share),
-                                    onClicked = {
-                                        launcher.launch(
+                                    clickEvent =
+                                        ClickEvent.Deeplink(
                                             DeeplinkRoute.Status
                                                 .ShareSheet(
                                                     statusKey = statusKey,
@@ -651,29 +757,27 @@ internal fun Tweet.renderStatus(
                                                     shareUrl = url,
                                                     fxShareUrl = fxUrl,
                                                     fixvxShareUrl = fixvxUrl,
-                                                ).toUri(),
-                                        )
-                                    },
+                                                ),
+                                        ),
                                 ),
                             )
 
                             if (isFromMe) {
                                 add(
                                     ActionMenu.Item(
-                                        icon = ActionMenu.Item.Icon.Delete,
+                                        icon = UiIcon.Delete,
                                         text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Delete),
                                         color = ActionMenu.Item.Color.Red,
-                                        onClicked = {
-                                            launcher.launch(
+                                        clickEvent =
+                                            ClickEvent.Deeplink(
                                                 DeeplinkRoute.Status
                                                     .DeleteConfirm(
                                                         statusKey = statusKey,
                                                         accountType =
                                                             dev.dimension.flare.model.AccountType
                                                                 .Specific(accountKey),
-                                                    ).toUri(),
-                                            )
-                                        },
+                                                    ),
+                                            ),
                                     ),
                                 )
                             } else {
@@ -690,12 +794,10 @@ internal fun Tweet.renderStatus(
                                 }
                                 add(
                                     ActionMenu.Item(
-                                        icon = ActionMenu.Item.Icon.Report,
+                                        icon = UiIcon.Report,
                                         text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Report),
                                         color = ActionMenu.Item.Color.Red,
-                                        onClicked = {
-                                            // TODO: implement report
-                                        },
+                                        clickEvent = ClickEvent.Noop,
                                     ),
                                 )
                             }
@@ -846,7 +948,7 @@ internal fun User.render(accountKey: MicroBlogKey): UiProfile {
                             dev.dimension.flare.model.AccountType
                                 .Specific(accountKey),
                         userKey = userKey,
-                    ).toUri(),
+                    ),
             ),
     )
 }
@@ -968,16 +1070,14 @@ internal fun TwitterList.render(accountKey: MicroBlogKey): UiList.List {
 internal fun MessageContent.XQT.render(
     accountKey: MicroBlogKey,
     credential: UiAccount.Credential,
-    statusEvent: StatusEvent,
 ): UiDMItem.Message =
     when (this) {
-        is MessageContent.XQT.Message -> render(accountKey, credential, statusEvent)
+        is MessageContent.XQT.Message -> render(accountKey, credential)
     }
 
 private fun MessageContent.XQT.Message.render(
     accountKey: MicroBlogKey,
     credential: UiAccount.Credential,
-    statusEvent: StatusEvent,
 ): UiDMItem.Message {
     if (!data.attachment
             ?.photo
@@ -1106,8 +1206,7 @@ private fun MessageContent.XQT.Message.render(
         data.text
             .orEmpty()
             .endsWith(data.attachment.tweet.url) &&
-        data.attachment.tweet.status != null &&
-        statusEvent is StatusEvent.XQT
+        data.attachment.tweet.status != null
     ) {
         val tweetLegacy = data.attachment.tweet.status
         val status =
@@ -1128,7 +1227,7 @@ private fun MessageContent.XQT.Message.render(
                         )
                     },
                 legacy = tweetLegacy,
-            ).renderStatus(accountKey, statusEvent, emptyMap())
+            ).renderStatus(accountKey)
         return UiDMItem.Message.Status(
             status = status,
         )
@@ -1204,7 +1303,7 @@ private fun Admin.render(accountKey: MicroBlogKey): UiProfile {
                             dev.dimension.flare.model.AccountType
                                 .Specific(accountKey),
                         userKey = key,
-                    ).toUri(),
+                    ),
             ),
         description = null,
         banner = null,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQTActionMenu.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQTActionMenu.kt
new file mode 100644
index 000000000..8cee55334
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQTActionMenu.kt
@@ -0,0 +1,88 @@
+package dev.dimension.flare.ui.model.mapper
+
+import dev.dimension.flare.data.datasource.microblog.ActionMenu
+import dev.dimension.flare.data.datasource.microblog.PostEvent
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.ClickEvent
+import dev.dimension.flare.ui.model.UiIcon
+import dev.dimension.flare.ui.model.UiNumber
+
+internal fun ActionMenu.Companion.xqtRetweet(
+    statusKey: MicroBlogKey,
+    retweeted: Boolean,
+    count: Long,
+    accountKey: MicroBlogKey,
+): ActionMenu.Item =
+    ActionMenu.Item(
+        updateKey = "xqt_retweet_$statusKey",
+        icon = if (retweeted) UiIcon.Unretweet else UiIcon.Retweet,
+        text =
+            ActionMenu.Item.Text.Localized(
+                if (retweeted) ActionMenu.Item.Text.Localized.Type.Unretweet else ActionMenu.Item.Text.Localized.Type.Retweet,
+            ),
+        count = UiNumber(count),
+        color = if (retweeted) ActionMenu.Item.Color.PrimaryColor else null,
+        clickEvent =
+            ClickEvent.event(
+                accountKey,
+                PostEvent.XQT.Retweet(
+                    postKey = statusKey,
+                    retweeted = retweeted,
+                    count = count,
+                    accountKey = accountKey,
+                ),
+            ),
+    )
+
+internal fun ActionMenu.Companion.xqtLike(
+    statusKey: MicroBlogKey,
+    liked: Boolean,
+    count: Long,
+    accountKey: MicroBlogKey,
+): ActionMenu.Item =
+    ActionMenu.Item(
+        updateKey = "xqt_like_$statusKey",
+        icon = if (liked) UiIcon.Unlike else UiIcon.Like,
+        text =
+            ActionMenu.Item.Text.Localized(
+                if (liked) ActionMenu.Item.Text.Localized.Type.Unlike else ActionMenu.Item.Text.Localized.Type.Like,
+            ),
+        count = UiNumber(count),
+        color = if (liked) ActionMenu.Item.Color.Red else null,
+        clickEvent =
+            ClickEvent.event(
+                accountKey,
+                PostEvent.XQT.Like(
+                    postKey = statusKey,
+                    liked = liked,
+                    count = count,
+                    accountKey = accountKey,
+                ),
+            ),
+    )
+
+internal fun ActionMenu.Companion.xqtBookmark(
+    statusKey: MicroBlogKey,
+    bookmarked: Boolean,
+    count: Long,
+    accountKey: MicroBlogKey,
+): ActionMenu.Item =
+    ActionMenu.Item(
+        updateKey = "xqt_bookmark_$statusKey",
+        icon = if (bookmarked) UiIcon.Unbookmark else UiIcon.Bookmark,
+        text =
+            ActionMenu.Item.Text.Localized(
+                if (bookmarked) ActionMenu.Item.Text.Localized.Type.Unbookmark else ActionMenu.Item.Text.Localized.Type.Bookmark,
+            ),
+        count = UiNumber(count),
+        clickEvent =
+            ClickEvent.event(
+                accountKey,
+                PostEvent.XQT.Bookmark(
+                    postKey = statusKey,
+                    bookmarked = bookmarked,
+                    count = count,
+                    accountKey = accountKey,
+                ),
+            ),
+    )

From 114ebfbad0dbd3a5afbd26cabbd3e3f5ee3350d4 Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Wed, 4 Mar 2026 19:10:44 +0900
Subject: [PATCH 11/33] migrate presenters

---
 .../flare/ui/screen/compose/ComposeScreen.kt  |  26 +-
 .../component/status/CommonStatusComponent.kt |  58 +--
 .../flare/ui/screen/compose/ComposeDialog.kt  |  26 +-
 .../flare/data/database/cache/dao/UserDao.kt  |   2 +-
 .../data/database/cache/mapper/Bluesky.kt     |  10 +-
 .../data/database/cache/mapper/Microblog.kt   |   2 +-
 .../flare/data/database/cache/mapper/User.kt  |  13 +
 .../flare/data/database/cache/mapper/XQT.kt   |  10 +-
 .../datasource/bluesky/BlueskyDataSource.kt   |   4 +-
 .../bluesky/BlueskyListMemberLoader.kt        |  11 +-
 .../GuestDiscoverStatusPagingSource.kt        |  47 +-
 .../guest/mastodon/GuestMastodonDataSource.kt | 247 +++-------
 .../mastodon/GuestSearchStatusPagingSource.kt |  45 +-
 .../mastodon/GuestStatusDetailPagingSource.kt |  49 +-
 .../mastodon/GuestTimelinePagingSource.kt     |  43 +-
 .../mastodon/GuestUserTimelinePagingSource.kt |  44 +-
 .../datasource/mastodon/MastodonDataSource.kt |  11 +-
 .../mastodon/MastodonListMemberLoader.kt      |  12 +-
 .../data/datasource/microblog/ComposeData.kt  |   8 +-
 .../microblog/handler/ListMemberHandler.kt    |  12 +-
 .../microblog/handler/PostHandler.kt          |  11 +-
 .../microblog/handler/UserHandler.kt          |  18 +-
 .../microblog/loader/ListMemberLoader.kt      |   6 +-
 .../paging/TimelineRemoteMediator.kt          |  11 +-
 .../datasource/misskey/MisskeyDataSource.kt   |  11 +-
 .../misskey/MisskeyListMemberLoader.kt        |  11 +-
 .../misskey/StatusDetailRemoteMediator.kt     |   1 -
 .../rss/RssTimelineRemoteMediator.kt          |   1 -
 .../datasource/vvo/SearchUserPagingSource.kt  |   2 +-
 .../data/datasource/vvo/VVODataSource.kt      |   7 +
 .../data/datasource/xqt/XQTDataSource.kt      |   3 +-
 .../datasource/xqt/XQTListMemberLoader.kt     |  13 +-
 .../data/datastore/model/ComposeConfigData.kt |   6 +-
 .../data/repository/AccountRepository.kt      |  29 +-
 .../dev/dimension/flare/model/AccountType.kt  |   7 -
 .../dev/dimension/flare/ui/model/UiDMRoom.kt  |   2 +-
 .../dev/dimension/flare/ui/model/UiStatus.kt  | 118 +++--
 .../dimension/flare/ui/model/UiTimeline.kt    | 461 ------------------
 .../flare/ui/model/mapper/Misskey.kt          |   3 +
 .../dimension/flare/ui/model/mapper/Render.kt |   2 +-
 .../dimension/flare/ui/model/mapper/Rss.kt    |   4 +
 .../dimension/flare/ui/model/mapper/XQT.kt    | 209 ++------
 .../ui/presenter/compose/ComposePresenter.kt  |  39 +-
 .../presenter/home/ActiveAccountPresenter.kt  |  50 +-
 .../home/AllNotificationBadgePresenter.kt     |   3 +-
 .../home/AllNotificationPresenter.kt          |  37 +-
 .../ui/presenter/home/DeepLinkPresenter.kt    |   3 +-
 .../ui/presenter/home/DiscoverPresenter.kt    |  18 +-
 .../ui/presenter/home/FavIconPresenter.kt     |  39 +-
 .../home/NotificationBadgePresenter.kt        |   3 +-
 .../ui/presenter/home/SearchPresenter.kt      |  14 +-
 .../home/SearchStatusTimelinePresenter.kt     |  10 +-
 .../ui/presenter/home/TimelinePresenter.kt    | 138 +++---
 .../home/bluesky/BlueskyFeedPresenter.kt      |   3 +-
 .../home/misskey/MisskeyChannelPresenter.kt   |   3 +-
 .../presenter/list/EditListMemberPresenter.kt | 132 ++---
 .../ui/presenter/list/ListMembersPresenter.kt |  44 +-
 .../presenter/profile/FollowingPresenter.kt   |  28 +-
 .../profile/ProfileMediaPresenter.kt          |  10 +-
 .../ui/presenter/profile/ProfilePresenter.kt  | 226 +++------
 .../presenter/settings/AccountsPresenter.kt   |   3 +-
 .../presenter/settings/AppearancePresenter.kt |   4 +-
 .../settings/LocalCacheSearchPresenter.kt     |  48 +-
 .../status/LogStatusHistoryPresenter.kt       |  42 +-
 .../status/LogUserHistoryPresenter.kt         |  37 +-
 .../status/StatusContextPresenter.kt          |  63 +--
 .../ui/presenter/status/StatusPresenter.kt    |   9 +-
 .../status/VVOStatusDetailPresenter.kt        |   5 +-
 .../status/action/AddReactionPresenter.kt     |  45 +-
 .../action/BlueskyReportStatusPresenter.kt    |  14 +-
 .../status/action/DeleteStatusPresenter.kt    |   5 +-
 71 files changed, 933 insertions(+), 1758 deletions(-)
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/User.kt
 delete mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimeline.kt

diff --git a/app/src/main/java/dev/dimension/flare/ui/screen/compose/ComposeScreen.kt b/app/src/main/java/dev/dimension/flare/ui/screen/compose/ComposeScreen.kt
index d7f5ab79a..2c79aad0f 100644
--- a/app/src/main/java/dev/dimension/flare/ui/screen/compose/ComposeScreen.kt
+++ b/app/src/main/java/dev/dimension/flare/ui/screen/compose/ComposeScreen.kt
@@ -1062,7 +1062,7 @@ private fun composePresenter(
                                 ?.toString(),
                         visibility =
                             state.visibilityState.takeSuccess()?.visibility
-                                ?: UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Public,
+                                ?: UiTimelineV2.Post.Visibility.Public,
                         account = it,
                         referenceStatus =
                             status?.let {
@@ -1286,40 +1286,40 @@ internal enum class PollExpiration(
     Days7(R.string.compose_poll_expiration_7_days, 7.days),
 }
 
-internal val UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.localName: Int
+internal val UiTimelineV2.Post.Visibility.localName: Int
     get() =
         when (this) {
-            UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Public ->
+            UiTimelineV2.Post.Visibility.Public ->
                 R.string.misskey_visibility_public
 
-            UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Home ->
+            UiTimelineV2.Post.Visibility.Home ->
                 R.string.misskey_visibility_home
 
-            UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Followers ->
+            UiTimelineV2.Post.Visibility.Followers ->
                 R.string.misskey_visibility_followers
 
-            UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Specified ->
+            UiTimelineV2.Post.Visibility.Specified ->
                 R.string.misskey_visibility_specified
 
-            UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Channel ->
+            UiTimelineV2.Post.Visibility.Channel ->
                 R.string.misskey_visibility_public
         }
 
-internal val UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.localDescription: Int
+internal val UiTimelineV2.Post.Visibility.localDescription: Int
     get() =
         when (this) {
-            UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Public ->
+            UiTimelineV2.Post.Visibility.Public ->
                 R.string.misskey_visibility_public_description
 
-            UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Home ->
+            UiTimelineV2.Post.Visibility.Home ->
                 R.string.misskey_visibility_home_description
 
-            UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Followers ->
+            UiTimelineV2.Post.Visibility.Followers ->
                 R.string.misskey_visibility_followers_description
 
-            UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Specified ->
+            UiTimelineV2.Post.Visibility.Specified ->
                 R.string.misskey_visibility_specified_description
 
-            UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Channel ->
+            UiTimelineV2.Post.Visibility.Channel ->
                 R.string.misskey_visibility_public_description
         }
diff --git a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusComponent.kt b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusComponent.kt
index fb1b02c41..e09e2ef12 100644
--- a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusComponent.kt
+++ b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusComponent.kt
@@ -758,12 +758,12 @@ private fun TranslationComponent(
 
 @Composable
 public fun StatusVisibilityComponent(
-    visibility: UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type,
+    visibility: UiTimelineV2.Post.Visibility,
     tint: Color = PlatformContentColor.current,
     modifier: Modifier = Modifier,
 ) {
     when (visibility) {
-        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Public ->
+        UiTimelineV2.Post.Visibility.Public ->
             FAIcon(
                 imageVector = FontAwesomeIcons.Solid.Globe,
                 contentDescription = stringResource(resource = Res.string.mastodon_visibility_public),
@@ -771,7 +771,7 @@ public fun StatusVisibilityComponent(
                 tint = tint,
             )
 
-        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Home ->
+        UiTimelineV2.Post.Visibility.Home ->
             FAIcon(
                 imageVector = FontAwesomeIcons.Solid.LockOpen,
                 contentDescription = stringResource(resource = Res.string.mastodon_visibility_unlisted),
@@ -779,7 +779,7 @@ public fun StatusVisibilityComponent(
                 tint = tint,
             )
 
-        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Followers ->
+        UiTimelineV2.Post.Visibility.Followers ->
             FAIcon(
                 imageVector = FontAwesomeIcons.Solid.Lock,
                 contentDescription = stringResource(resource = Res.string.mastodon_visibility_private),
@@ -787,7 +787,7 @@ public fun StatusVisibilityComponent(
                 tint = tint,
             )
 
-        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Specified ->
+        UiTimelineV2.Post.Visibility.Specified ->
             FAIcon(
                 imageVector = FontAwesomeIcons.Solid.At,
                 contentDescription = stringResource(resource = Res.string.mastodon_visibility_direct),
@@ -795,7 +795,7 @@ public fun StatusVisibilityComponent(
                 tint = tint,
             )
 
-        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Channel ->
+        UiTimelineV2.Post.Visibility.Channel ->
             FAIcon(
                 imageVector = FontAwesomeIcons.Solid.Tv,
                 contentDescription = stringResource(resource = Res.string.channel_title),
@@ -1001,30 +1001,30 @@ private fun ActionMenu.Item.Color.toComposeColor(): Color =
         ActionMenu.Item.Color.PrimaryColor -> PlatformTheme.colorScheme.retweetColor
     }
 
-private fun ActionMenu.Item.Icon.toImageVector(): ImageVector =
+private fun UiIcon.toImageVector(): ImageVector =
     when (this) {
-        ActionMenu.Item.Icon.Like -> FontAwesomeIcons.Regular.Heart
-        ActionMenu.Item.Icon.Unlike -> FontAwesomeIcons.Solid.Heart
-        ActionMenu.Item.Icon.Retweet -> FontAwesomeIcons.Solid.Retweet
-        ActionMenu.Item.Icon.Unretweet -> FontAwesomeIcons.Solid.Retweet
-        ActionMenu.Item.Icon.Reply -> FontAwesomeIcons.Solid.Reply
-        ActionMenu.Item.Icon.Comment -> FontAwesomeIcons.Regular.CommentDots
-        ActionMenu.Item.Icon.Quote -> FontAwesomeIcons.Solid.QuoteLeft
-        ActionMenu.Item.Icon.Bookmark -> FontAwesomeIcons.Regular.Bookmark
-        ActionMenu.Item.Icon.Unbookmark -> FontAwesomeIcons.Solid.Bookmark
-        ActionMenu.Item.Icon.More -> FontAwesomeIcons.Solid.Ellipsis
-        ActionMenu.Item.Icon.Delete -> FontAwesomeIcons.Solid.Trash
-        ActionMenu.Item.Icon.Report -> FontAwesomeIcons.Solid.CircleInfo
-        ActionMenu.Item.Icon.React -> FontAwesomeIcons.Solid.Plus
-        ActionMenu.Item.Icon.UnReact -> FontAwesomeIcons.Solid.Minus
-        ActionMenu.Item.Icon.Share -> FontAwesomeIcons.Solid.ShareNodes
-        ActionMenu.Item.Icon.MoreVerticel -> FontAwesomeIcons.Solid.EllipsisVertical
-        ActionMenu.Item.Icon.List -> FontAwesomeIcons.Solid.List
-        ActionMenu.Item.Icon.ChatMessage -> FontAwesomeIcons.Solid.Message
-        ActionMenu.Item.Icon.Mute -> FontAwesomeIcons.Solid.VolumeXmark
-        ActionMenu.Item.Icon.UnMute -> FontAwesomeIcons.Solid.VolumeXmark
-        ActionMenu.Item.Icon.Block -> FontAwesomeIcons.Solid.UserSlash
-        ActionMenu.Item.Icon.UnBlock -> FontAwesomeIcons.Solid.UserSlash
+        UiIcon.Like -> FontAwesomeIcons.Regular.Heart
+        UiIcon.Unlike -> FontAwesomeIcons.Solid.Heart
+        UiIcon.Retweet -> FontAwesomeIcons.Solid.Retweet
+        UiIcon.Unretweet -> FontAwesomeIcons.Solid.Retweet
+        UiIcon.Reply -> FontAwesomeIcons.Solid.Reply
+        UiIcon.Comment -> FontAwesomeIcons.Regular.CommentDots
+        UiIcon.Quote -> FontAwesomeIcons.Solid.QuoteLeft
+        UiIcon.Bookmark -> FontAwesomeIcons.Regular.Bookmark
+        UiIcon.Unbookmark -> FontAwesomeIcons.Solid.Bookmark
+        UiIcon.More -> FontAwesomeIcons.Solid.Ellipsis
+        UiIcon.Delete -> FontAwesomeIcons.Solid.Trash
+        UiIcon.Report -> FontAwesomeIcons.Solid.CircleInfo
+        UiIcon.React -> FontAwesomeIcons.Solid.Plus
+        UiIcon.UnReact -> FontAwesomeIcons.Solid.Minus
+        UiIcon.Share -> FontAwesomeIcons.Solid.ShareNodes
+        UiIcon.MoreVerticel -> FontAwesomeIcons.Solid.EllipsisVertical
+        UiIcon.List -> FontAwesomeIcons.Solid.List
+        UiIcon.ChatMessage -> FontAwesomeIcons.Solid.Message
+        UiIcon.Mute -> FontAwesomeIcons.Solid.VolumeXmark
+        UiIcon.UnMute -> FontAwesomeIcons.Solid.VolumeXmark
+        UiIcon.Block -> FontAwesomeIcons.Solid.UserSlash
+        UiIcon.UnBlock -> FontAwesomeIcons.Solid.UserSlash
     }
 
 @Composable
diff --git a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/compose/ComposeDialog.kt b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/compose/ComposeDialog.kt
index b6f365116..082d643e0 100644
--- a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/compose/ComposeDialog.kt
+++ b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/compose/ComposeDialog.kt
@@ -1023,7 +1023,7 @@ private fun composePresenter(
                                 ?.toString(),
                         visibility =
                             state.visibilityState.takeSuccess()?.visibility
-                                ?: UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Public,
+                                ?: UiTimelineV2.Post.Visibility.Public,
                         account = it,
                         referenceStatus =
                             status?.let {
@@ -1253,40 +1253,40 @@ internal enum class PollExpiration(
     Days7(Res.string.compose_poll_expiration_7_days, 7.days),
 }
 
-internal val UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.localName: StringResource
+internal val UiTimelineV2.Post.Visibility.localName: StringResource
     get() =
         when (this) {
-            UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Public ->
+            UiTimelineV2.Post.Visibility.Public ->
                 Res.string.misskey_visibility_public
 
-            UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Home ->
+            UiTimelineV2.Post.Visibility.Home ->
                 Res.string.misskey_visibility_home
 
-            UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Followers ->
+            UiTimelineV2.Post.Visibility.Followers ->
                 Res.string.misskey_visibility_followers
 
-            UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Specified ->
+            UiTimelineV2.Post.Visibility.Specified ->
                 Res.string.misskey_visibility_specified
 
-            UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Channel ->
+            UiTimelineV2.Post.Visibility.Channel ->
                 Res.string.misskey_visibility_public
         }
 
-internal val UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.localDescription: StringResource
+internal val UiTimelineV2.Post.Visibility.localDescription: StringResource
     get() =
         when (this) {
-            UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Public ->
+            UiTimelineV2.Post.Visibility.Public ->
                 Res.string.misskey_visibility_public_description
 
-            UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Home ->
+            UiTimelineV2.Post.Visibility.Home ->
                 Res.string.misskey_visibility_home_description
 
-            UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Followers ->
+            UiTimelineV2.Post.Visibility.Followers ->
                 Res.string.misskey_visibility_followers_description
 
-            UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Specified ->
+            UiTimelineV2.Post.Visibility.Specified ->
                 Res.string.misskey_visibility_specified_description
 
-            UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Channel ->
+            UiTimelineV2.Post.Visibility.Channel ->
                 Res.string.misskey_visibility_public_description
         }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt
index b6498b321..a6408fe75 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt
@@ -25,7 +25,7 @@ internal interface UserDao {
     suspend fun insertAll(users: List<DbUser>)
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertAll(users: List<DbStatusUserReference>)
+    suspend fun insertAllReferences(references: List<DbStatusUserReference>)
 
     @Query("UPDATE DbUser SET content = :content WHERE userKey = :userKey")
     suspend fun update(
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
index 07cf31ede..585458967 100644
--- 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
@@ -8,7 +8,6 @@ import dev.dimension.flare.data.database.cache.model.DbDirectMessageTimeline
 import dev.dimension.flare.data.database.cache.model.DbMessageItem
 import dev.dimension.flare.data.database.cache.model.DbMessageRoom
 import dev.dimension.flare.data.database.cache.model.DbMessageRoomReference
-import dev.dimension.flare.data.database.cache.model.DbUser
 import dev.dimension.flare.data.database.cache.model.MessageContent
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
@@ -32,14 +31,7 @@ internal object Bluesky {
             data
                 .flatMap { it.members }
                 .map {
-                    val data = it.render(accountKey)
-                    DbUser(
-                        userKey = data.key,
-                        name = data.name.raw,
-                        handle = data.handle,
-                        host = accountKey.host,
-                        content = data,
-                    )
+                    it.render(accountKey).toDbUser(host = accountKey.host)
                 }
         database.userDao().insertAll(users)
         database.messageDao().insertMessages(messages)
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Microblog.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Microblog.kt
index 86eada329..298614afa 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Microblog.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Microblog.kt
@@ -23,7 +23,7 @@ internal suspend fun saveToDatabase(
                 post.references.map { it.reference }
             }
     database.userDao().insertAll(users)
-    database.userDao().insertAll(userReferences)
+    database.userDao().insertAllReferences(userReferences)
 
 //    (
 //            items.flatMap { it.status.status.references.mapNotNull { it.user } } +
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/User.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/User.kt
new file mode 100644
index 000000000..d931600f3
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/User.kt
@@ -0,0 +1,13 @@
+package dev.dimension.flare.data.database.cache.mapper
+
+import dev.dimension.flare.data.database.cache.model.DbUser
+import dev.dimension.flare.ui.model.UiProfile
+
+internal fun UiProfile.toDbUser(host: String = this.host ?: key.host) =
+    DbUser(
+        userKey = key,
+        name = name.raw,
+        handle = handle,
+        host = host,
+        content = this,
+    )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/XQT.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/XQT.kt
index 7c96ad894..974187830 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/XQT.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/XQT.kt
@@ -158,15 +158,7 @@ private fun List<InboxUser>.toDbUser(accountKey: MicroBlogKey): List<DbUser> {
                 },
             isBlueVerified = it.isBlueVerified == true,
             restId = it.idStr,
-        ).render(accountKey).let { data ->
-            DbUser(
-                userKey = data.key,
-                name = data.name.raw,
-                handle = data.handle,
-                host = accountKey.host,
-                content = data,
-            )
-        }
+        ).render(accountKey).toDbUser(host = accountKey.host)
     }
 }
 
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
index 0a6911744..e88c30c54 100644
--- 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
@@ -779,7 +779,7 @@ internal class BlueskyDataSource(
             .cachedIn(scope)
             .combine(credentialFlow) { paging, credential ->
                 paging.map {
-                    it.render(accountKey = accountKey, credential = credential, statusEvent = this)
+                    it.render(accountKey = accountKey, credential = credential)
                 }
             }.cachedIn(scope)
 
@@ -809,7 +809,6 @@ internal class BlueskyDataSource(
                     it.render(
                         accountKey = accountKey,
                         credential = credential,
-                        statusEvent = this,
                     )
                 }
             }.cachedIn(scope)
@@ -840,7 +839,6 @@ internal class BlueskyDataSource(
                         room?.render(
                             accountKey = accountKey,
                             credential = credential,
-                            statusEvent = this,
                         )
                     }.mapNotNull { it }
             },
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyListMemberLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyListMemberLoader.kt
index 748f763e2..3585776e5 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyListMemberLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyListMemberLoader.kt
@@ -7,14 +7,13 @@ import app.bsky.graph.Listitem
 import com.atproto.repo.CreateRecordRequest
 import com.atproto.repo.DeleteRecordRequest
 import com.atproto.repo.ListRecordsQueryParams
-import dev.dimension.flare.data.database.cache.mapper.toDbUser
-import dev.dimension.flare.data.database.cache.model.DbUser
 import dev.dimension.flare.data.datasource.microblog.loader.ListMemberLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.bluesky.BlueskyService
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiList
+import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.mapper.render
 import sh.christian.ozone.api.AtUri
 import sh.christian.ozone.api.Did
@@ -30,7 +29,7 @@ internal class BlueskyListMemberLoader(
         pageSize: Int,
         request: PagingRequest,
         listId: String,
-    ): PagingResult<DbUser> {
+    ): PagingResult<UiProfile> {
         val cursor =
             when (request) {
                 is PagingRequest.Append -> request.nextKey
@@ -50,7 +49,7 @@ internal class BlueskyListMemberLoader(
         val users =
             response.items
                 .map {
-                    it.subject.toDbUser(accountKey.host)
+                    it.subject.render(accountKey)
                 }
         return PagingResult(
             data = users,
@@ -61,7 +60,7 @@ internal class BlueskyListMemberLoader(
     override suspend fun addMember(
         listId: String,
         userKey: MicroBlogKey,
-    ): DbUser {
+    ): UiProfile {
         val user =
             service
                 .getProfile(GetProfileQueryParams(actor = Did(did = userKey.id)))
@@ -80,7 +79,7 @@ internal class BlueskyListMemberLoader(
                         ).bskyJson(),
             ),
         )
-        return user.toDbUser(accountKey.host)
+        return user.render(accountKey)
     }
 
     override suspend fun removeMember(
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestDiscoverStatusPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestDiscoverStatusPagingSource.kt
index 894254ca8..4d3fc7000 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestDiscoverStatusPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestDiscoverStatusPagingSource.kt
@@ -1,34 +1,35 @@
 package dev.dimension.flare.data.datasource.guest.mastodon
 
-import SnowflakeIdGenerator
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.mastodon.api.TrendsResources
-import dev.dimension.flare.ui.model.UiTimeline
-import dev.dimension.flare.ui.model.mapper.renderGuest
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 internal class GuestDiscoverStatusPagingSource(
     private val service: TrendsResources,
     private val host: String,
-) : BasePagingSource<Int, UiTimeline>() {
-    override fun getRefreshKey(state: PagingState<Int, UiTimeline>): Int? = null
+) : RemoteLoader<UiTimelineV2> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiTimelineV2> {
+        if (request is PagingRequest.Prepend) {
+            return PagingResult(endOfPaginationReached = true)
+        }
+        val offset =
+            when (request) {
+                PagingRequest.Refresh -> 0
+                is PagingRequest.Append -> request.nextKey.toIntOrNull() ?: 0
+                is PagingRequest.Prepend -> 0
+            }
 
-    override suspend fun doLoad(params: LoadParams<Int>): LoadResult<Int, UiTimeline> {
-        val result =
-            service.trendsStatuses(
-                limit = params.loadSize,
-                offset = params.key,
-            )
-
-        return LoadResult.Page(
-            data =
-                result.map {
-                    it
-                        .renderGuest(host = host)
-                        .copy(dbKey = "guest_${SnowflakeIdGenerator.nextId()}")
-                },
-            prevKey = null,
-            nextKey = result.size + (params.key ?: 0),
+        val result = service.trendsStatuses(limit = pageSize, offset = offset)
+        return PagingResult(
+            endOfPaginationReached = result.size < pageSize,
+            data = result.map { it.render(host = host, accountKey = null) },
+            nextKey = (offset + result.size).toString(),
         )
     }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestMastodonDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestMastodonDataSource.kt
index 8e93aba32..66189867d 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestMastodonDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestMastodonDataSource.kt
@@ -1,38 +1,22 @@
 package dev.dimension.flare.data.datasource.guest.mastodon
 
-import androidx.paging.Pager
-import androidx.paging.PagingData
-import androidx.paging.cachedIn
-import dev.dimension.flare.common.CacheData
-import dev.dimension.flare.common.Cacheable
-import dev.dimension.flare.common.MemCacheable
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbUser
-import dev.dimension.flare.data.database.cache.model.UserContent
 import dev.dimension.flare.data.datasource.mastodon.MastodonFansPagingSource
 import dev.dimension.flare.data.datasource.mastodon.MastodonFollowingPagingSource
 import dev.dimension.flare.data.datasource.mastodon.SearchUserPagingSource
 import dev.dimension.flare.data.datasource.mastodon.TrendHashtagPagingSource
 import dev.dimension.flare.data.datasource.microblog.MicroblogDataSource
 import dev.dimension.flare.data.datasource.microblog.ProfileTab
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelinePagingSourceFactory
-import dev.dimension.flare.data.datasource.microblog.pagingConfig
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.mastodon.GuestMastodonService
 import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.model.PlatformType
 import dev.dimension.flare.ui.model.UiHashtag
 import dev.dimension.flare.ui.model.UiProfile
-import dev.dimension.flare.ui.model.UiTimeline
-import dev.dimension.flare.ui.model.mapper.render
-import dev.dimension.flare.ui.model.mapper.renderGuest
+import dev.dimension.flare.ui.model.UiTimelineV2
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.mapNotNull
 import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
 
 internal class GuestMastodonDataSource(
     private val host: String,
@@ -42,195 +26,100 @@ internal class GuestMastodonDataSource(
     private val service by lazy {
         GuestMastodonService("https://$host/", locale)
     }
-    private val database: CacheDatabase by inject()
 
-    override fun homeTimeline() =
-        BaseTimelinePagingSourceFactory {
-            GuestTimelinePagingSource(host = host, service = service)
-        }
-
-    override fun userByAcct(acct: String): CacheData<UiProfile> {
-        val (name, host) = MicroBlogKey.valueOf(acct)
-        return Cacheable(
-            fetchSource = {
-                val user =
-                    service
-                        .lookupUserByAcct("$name@$host")
-                        ?.toDbUser(host) ?: throw Exception("User not found")
-                database.userDao().insert(user)
-            },
-            cacheSource = {
-                database
-                    .userDao()
-                    .findByHandleAndHost(name, host, PlatformType.Mastodon)
-                    .distinctUntilChanged()
-                    .mapNotNull {
-                        val content = it?.content
-                        if (content is UserContent.Mastodon) {
-                            content.data.render(null, host = host)
-                        } else {
-                            null
-                        }
-                    }
-            },
-        )
-    }
-
-    override fun userById(id: String): CacheData<UiProfile> {
-        val userKey = MicroBlogKey(id, host)
-        return Cacheable(
-            fetchSource = {
-                val user = service.lookupUser(id).toDbUser(host)
-                database.userDao().insert(user)
-            },
-            cacheSource = {
-                database
-                    .userDao()
-                    .findByKey(userKey)
-                    .distinctUntilChanged()
-                    .mapNotNull {
-                        val content = it?.content
-                        if (content is UserContent.Mastodon) {
-                            content.data.render(null, host = host)
-                        } else {
-                            null
-                        }
-                    }
-            },
-        )
-    }
+    override fun homeTimeline(): RemoteLoader<UiTimelineV2> = GuestTimelinePagingSource(service = service, host = host)
 
     override fun userTimeline(
         userKey: MicroBlogKey,
         mediaOnly: Boolean,
-    ) = BaseTimelinePagingSourceFactory {
+    ): RemoteLoader<UiTimelineV2> =
         GuestUserTimelinePagingSource(
+            service = service,
             host = host,
             userId = userKey.id,
             onlyMedia = mediaOnly,
+        )
+
+    override fun context(statusKey: MicroBlogKey): RemoteLoader<UiTimelineV2> =
+        GuestStatusDetailPagingSource(
             service = service,
+            host = host,
+            statusKey = statusKey,
+            statusOnly = false,
         )
-    }
 
-    override fun context(statusKey: MicroBlogKey) =
-        BaseTimelinePagingSourceFactory {
-            GuestStatusDetailPagingSource(
-                host = host,
-                statusKey = statusKey,
-                statusOnly = false,
-                service = service,
-            )
-        }
+    override fun searchStatus(query: String): RemoteLoader<UiTimelineV2> =
+        GuestSearchStatusPagingSource(
+            service = service,
+            host = host,
+            query = query,
+        )
 
-    override fun status(statusKey: MicroBlogKey): CacheData<UiTimeline> {
-        val pagingKey = "status_only_$statusKey"
-        return MemCacheable(
-            key = pagingKey,
-            fetchSource = {
-                service
-                    .lookupStatus(
-                        statusKey.id,
-                    ).renderGuest(host)
-            },
+    override fun searchUser(query: String): RemoteLoader<UiProfile> =
+        SearchUserPagingSource(
+            service = service,
+            host = host,
+            accountKey = null,
+            query = query,
         )
-    }
 
-    override fun searchStatus(query: String) =
-        BaseTimelinePagingSourceFactory {
-            GuestSearchStatusPagingSource(host = host, query = query, service = service)
+    override fun discoverUsers(): RemoteLoader<UiProfile> =
+        object : RemoteLoader<UiProfile> {
+            override suspend fun load(
+                pageSize: Int,
+                request: PagingRequest,
+            ): PagingResult<UiProfile> =
+                PagingResult(
+                    endOfPaginationReached = true,
+                    data = emptyList(),
+                )
         }
 
-    override fun searchUser(
-        query: String,
-        pageSize: Int,
-    ): Flow<PagingData<UiProfile>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            SearchUserPagingSource(
-                service = service,
-                host = host,
-                accountKey = null,
-                query,
-            )
-        }.flow
-
-    override fun discoverUsers(pageSize: Int): Flow<PagingData<UiProfile>> {
-        // not supported
-        throw UnsupportedOperationException("Discover users not supported")
-    }
-
-    override fun discoverStatuses() = TODO()
-//        Pager(pagingConfig) {
-//            GuestDiscoverStatusPagingSource(host = host, service = service)
-//        }.flow.cachedIn(scope)
+    override fun discoverStatuses(): RemoteLoader<UiTimelineV2> =
+        GuestDiscoverStatusPagingSource(
+            service = service,
+            host = host,
+        )
 
-    override fun discoverHashtags(pageSize: Int): Flow<PagingData<UiHashtag>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            TrendHashtagPagingSource(
-                service,
-            )
-        }.flow
+    override fun discoverHashtags(): RemoteLoader<UiHashtag> = TrendHashtagPagingSource(service)
 
-    override fun following(
-        userKey: MicroBlogKey,
-        scope: CoroutineScope,
-        pageSize: Int,
-    ): Flow<PagingData<UiProfile>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            MastodonFollowingPagingSource(
-                service = service,
-                host = host,
-                userKey = userKey,
-                accountKey = null,
-            )
-        }.flow.cachedIn(scope)
+    override fun following(userKey: MicroBlogKey): RemoteLoader<UiProfile> =
+        MastodonFollowingPagingSource(
+            service = service,
+            accountKey = null,
+            host = host,
+            userKey = userKey,
+        )
 
-    override fun fans(
-        userKey: MicroBlogKey,
-        scope: CoroutineScope,
-        pageSize: Int,
-    ): Flow<PagingData<UiProfile>> =
-        Pager(
-            config = pagingConfig,
-        ) {
-            MastodonFansPagingSource(
-                service = service,
-                host = host,
-                userKey = userKey,
-                accountKey = null,
-            )
-        }.flow.cachedIn(scope)
+    override fun fans(userKey: MicroBlogKey): RemoteLoader<UiProfile> =
+        MastodonFansPagingSource(
+            service = service,
+            accountKey = null,
+            host = host,
+            userKey = userKey,
+        )
 
     override fun profileTabs(userKey: MicroBlogKey): ImmutableList<ProfileTab> =
         persistentListOf(
             ProfileTab.Timeline(
                 type = ProfileTab.Timeline.Type.Status,
                 loader =
-                    BaseTimelinePagingSourceFactory {
-                        GuestUserTimelinePagingSource(
-                            host = host,
-                            userId = userKey.id,
-                            service = service,
-                            withPinned = true,
-                        )
-                    },
+                    GuestUserTimelinePagingSource(
+                        service = service,
+                        host = host,
+                        userId = userKey.id,
+                        withPinned = true,
+                    ),
             ),
             ProfileTab.Timeline(
                 type = ProfileTab.Timeline.Type.StatusWithReplies,
                 loader =
-                    BaseTimelinePagingSourceFactory {
-                        GuestUserTimelinePagingSource(
-                            host = host,
-                            userId = userKey.id,
-                            withReply = true,
-                            service = service,
-                        )
-                    },
+                    GuestUserTimelinePagingSource(
+                        service = service,
+                        host = host,
+                        userId = userKey.id,
+                        withReply = true,
+                    ),
             ),
             ProfileTab.Media,
         )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestSearchStatusPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestSearchStatusPagingSource.kt
index 3a7b7282e..145a3b67f 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestSearchStatusPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestSearchStatusPagingSource.kt
@@ -1,47 +1,48 @@
 package dev.dimension.flare.data.datasource.guest.mastodon
 
-import SnowflakeIdGenerator
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.mastodon.GuestMastodonService
-import dev.dimension.flare.ui.model.UiTimeline
-import dev.dimension.flare.ui.model.mapper.renderGuest
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 internal class GuestSearchStatusPagingSource(
     private val service: GuestMastodonService,
     private val host: String,
     private val query: String,
-) : BasePagingSource<String, UiTimeline>() {
-    override fun getRefreshKey(state: PagingState<String, UiTimeline>): String? = null
+) : RemoteLoader<UiTimelineV2> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiTimelineV2> {
+        if (request is PagingRequest.Prepend) {
+            return PagingResult(endOfPaginationReached = true)
+        }
 
-    override suspend fun doLoad(params: LoadParams<String>): LoadResult<String, UiTimeline> {
+        val maxId = (request as? PagingRequest.Append)?.nextKey
         val result =
             if (query.startsWith("#")) {
                 service.hashtagTimeline(
                     hashtag = query.removePrefix("#"),
-                    limit = params.loadSize,
-                    max_id = params.key,
+                    limit = pageSize,
+                    max_id = maxId,
                 )
             } else {
                 service
                     .searchV2(
                         query = query,
-                        limit = params.loadSize,
+                        limit = pageSize,
                         type = "statuses",
-                        max_id = params.key,
+                        max_id = maxId,
                     ).statuses
             }
 
-        return LoadResult.Page(
-            data =
-                result
-                    ?.map {
-                        it
-                            .renderGuest(host = host)
-                            .copy(dbKey = "guest_${SnowflakeIdGenerator.nextId()}")
-                    }.orEmpty(),
-            prevKey = null,
-            nextKey = result?.lastOrNull()?.id,
+        val data = result.orEmpty()
+        return PagingResult(
+            endOfPaginationReached = data.isEmpty(),
+            data = data.map { it.render(host = host, accountKey = null) },
+            nextKey = data.lastOrNull()?.id,
         )
     }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestStatusDetailPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestStatusDetailPagingSource.kt
index c1b41024a..aadcf5bfe 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestStatusDetailPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestStatusDetailPagingSource.kt
@@ -1,50 +1,39 @@
 package dev.dimension.flare.data.datasource.guest.mastodon
 
-import SnowflakeIdGenerator
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.mastodon.GuestMastodonService
 import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.ui.model.UiTimeline
-import dev.dimension.flare.ui.model.mapper.renderGuest
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 internal class GuestStatusDetailPagingSource(
     private val service: GuestMastodonService,
     private val host: String,
     private val statusKey: MicroBlogKey,
     private val statusOnly: Boolean,
-) : BasePagingSource<Int, UiTimeline>() {
-    override fun getRefreshKey(state: PagingState<Int, UiTimeline>): Int? = null
+) : RemoteLoader<UiTimelineV2> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiTimelineV2> {
+        if (request is PagingRequest.Prepend || request is PagingRequest.Append) {
+            return PagingResult(endOfPaginationReached = true)
+        }
 
-    override suspend fun doLoad(params: LoadParams<Int>): LoadResult<Int, UiTimeline> {
         val result =
             if (statusOnly) {
-                val current =
-                    service.lookupStatus(
-                        statusKey.id,
-                    )
-                listOf(current)
+                listOf(service.lookupStatus(statusKey.id))
             } else {
-                val context =
-                    service.context(
-                        statusKey.id,
-                    )
-                val current =
-                    service.lookupStatus(
-                        statusKey.id,
-                    )
+                val context = service.context(statusKey.id)
+                val current = service.lookupStatus(statusKey.id)
                 context.ancestors.orEmpty() + listOf(current) + context.descendants.orEmpty()
             }
 
-        return LoadResult.Page(
-            data =
-                result.map {
-                    it
-                        .renderGuest(host = host)
-                        .copy(dbKey = "guest_${SnowflakeIdGenerator.nextId()}")
-                },
-            prevKey = null,
-            nextKey = null,
+        return PagingResult(
+            endOfPaginationReached = true,
+            data = result.map { it.render(host = host, accountKey = null) },
         )
     }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestTimelinePagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestTimelinePagingSource.kt
index 544d978bd..98a00483a 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestTimelinePagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestTimelinePagingSource.kt
@@ -1,31 +1,34 @@
 package dev.dimension.flare.data.datasource.guest.mastodon
 
-import SnowflakeIdGenerator
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.mastodon.api.TrendsResources
-import dev.dimension.flare.ui.model.UiTimeline
-import dev.dimension.flare.ui.model.mapper.renderGuest
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 internal class GuestTimelinePagingSource(
     private val service: TrendsResources,
     private val host: String,
-) : BasePagingSource<Int, UiTimeline>() {
-    override fun getRefreshKey(state: PagingState<Int, UiTimeline>): Int? = null
+) : RemoteLoader<UiTimelineV2> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiTimelineV2> {
+        val offset =
+            when (request) {
+                PagingRequest.Refresh -> 0
+                is PagingRequest.Append -> request.nextKey.toIntOrNull() ?: 0
+                is PagingRequest.Prepend -> {
+                    return PagingResult(endOfPaginationReached = true)
+                }
+            }
 
-    override suspend fun doLoad(params: LoadParams<Int>): LoadResult<Int, UiTimeline> {
-        val offset = params.key ?: 0
-        val limit = params.loadSize
-        val statuses = service.trendsStatuses(limit = limit, offset = offset).distinctBy { it.id }
-        return LoadResult.Page(
-            data =
-                statuses.map {
-                    it
-                        .renderGuest(host = host)
-                        .copy(dbKey = "guest_${SnowflakeIdGenerator.nextId()}")
-                },
-            prevKey = null,
-            nextKey = offset + limit,
+        val statuses = service.trendsStatuses(limit = pageSize, offset = offset).distinctBy { it.id }
+        return PagingResult(
+            endOfPaginationReached = statuses.size < pageSize,
+            data = statuses.map { it.render(host = host, accountKey = null) },
+            nextKey = (offset + pageSize).toString(),
         )
     }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestUserTimelinePagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestUserTimelinePagingSource.kt
index d6db53e80..f7d5db7ad 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestUserTimelinePagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestUserTimelinePagingSource.kt
@@ -1,10 +1,11 @@
 package dev.dimension.flare.data.datasource.guest.mastodon
 
-import androidx.paging.PagingState
-import dev.dimension.flare.common.BasePagingSource
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.mastodon.api.TimelineResources
-import dev.dimension.flare.ui.model.UiTimeline
-import dev.dimension.flare.ui.model.mapper.renderGuest
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
 
 internal class GuestUserTimelinePagingSource(
     private val service: TimelineResources,
@@ -13,14 +14,18 @@ internal class GuestUserTimelinePagingSource(
     private val withReply: Boolean = false,
     private val onlyMedia: Boolean = false,
     private val withPinned: Boolean = false,
-) : BasePagingSource<String, UiTimeline>() {
-    override fun getRefreshKey(state: PagingState<String, UiTimeline>): String? = null
+) : RemoteLoader<UiTimelineV2> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiTimelineV2> {
+        val maxId = (request as? PagingRequest.Append)?.nextKey
+        if (request is PagingRequest.Prepend) {
+            return PagingResult(endOfPaginationReached = true)
+        }
 
-    override suspend fun doLoad(params: LoadParams<String>): LoadResult<String, UiTimeline> {
-        val maxId = params.key
-        val limit = params.loadSize
         val pinned =
-            if (withPinned && maxId == null) {
+            if (withPinned && request == PagingRequest.Refresh) {
                 service.userTimeline(
                     user_id = userId,
                     pinned = true,
@@ -28,11 +33,12 @@ internal class GuestUserTimelinePagingSource(
             } else {
                 emptyList()
             }
+
         val statuses =
             service
                 .userTimeline(
                     user_id = userId,
-                    limit = limit,
+                    limit = pageSize,
                     max_id = maxId,
                     only_media = onlyMedia,
                     exclude_replies = !withReply,
@@ -43,17 +49,11 @@ internal class GuestUserTimelinePagingSource(
                     } else {
                         it
                     }
-                }.distinctBy {
-                    it.id
-                }
-        return LoadResult.Page(
-            data =
-                statuses.map {
-                    it
-                        .renderGuest(host = host)
-                        .copy(dbKey = "guest_${SnowflakeIdGenerator.nextId()}")
-                },
-            prevKey = null,
+                }.distinctBy { it.id }
+
+        return PagingResult(
+            endOfPaginationReached = statuses.isEmpty(),
+            data = statuses.map { it.render(host = host, accountKey = null) },
             nextKey = statuses.lastOrNull()?.id,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt
index e374a6055..e40d5b925 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt
@@ -42,7 +42,6 @@ import dev.dimension.flare.shared.image.ImageCompressor
 import dev.dimension.flare.ui.model.UiAccount
 import dev.dimension.flare.ui.model.UiHashtag
 import dev.dimension.flare.ui.model.UiProfile
-import dev.dimension.flare.ui.model.UiTimeline
 import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.compose.ComposeStatus
 import kotlinx.collections.immutable.ImmutableList
@@ -274,11 +273,11 @@ internal open class MastodonDataSource(
                 status = data.content,
                 visibility =
                     when (data.visibility) {
-                        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Public -> Visibility.Public
-                        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Home -> Visibility.Unlisted
-                        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Followers -> Visibility.Private
-                        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Specified -> Visibility.Direct
-                        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Channel -> Visibility.Public
+                        UiTimelineV2.Post.Visibility.Public -> Visibility.Public
+                        UiTimelineV2.Post.Visibility.Home -> Visibility.Unlisted
+                        UiTimelineV2.Post.Visibility.Followers -> Visibility.Private
+                        UiTimelineV2.Post.Visibility.Specified -> Visibility.Direct
+                        UiTimelineV2.Post.Visibility.Channel -> Visibility.Public
                     },
                 inReplyToID = inReplyToID,
                 mediaIDS = mediaIds.takeIf { it.isNotEmpty() },
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonListMemberLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonListMemberLoader.kt
index 228a7eca9..a4c2bf80f 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonListMemberLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonListMemberLoader.kt
@@ -1,7 +1,5 @@
 package dev.dimension.flare.data.datasource.mastodon
 
-import dev.dimension.flare.data.database.cache.mapper.toDbUser
-import dev.dimension.flare.data.database.cache.model.DbUser
 import dev.dimension.flare.data.datasource.microblog.loader.ListMemberLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
@@ -10,6 +8,8 @@ import dev.dimension.flare.data.network.mastodon.api.model.MastodonList
 import dev.dimension.flare.data.network.mastodon.api.model.PostAccounts
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiList
+import dev.dimension.flare.ui.model.UiProfile
+import dev.dimension.flare.ui.model.mapper.render
 
 internal class MastodonListMemberLoader(
     private val service: MastodonService,
@@ -19,7 +19,7 @@ internal class MastodonListMemberLoader(
         pageSize: Int,
         request: PagingRequest,
         listId: String,
-    ): PagingResult<DbUser> {
+    ): PagingResult<UiProfile> {
         val maxId =
             when (request) {
                 is PagingRequest.Append -> request.nextKey
@@ -36,7 +36,7 @@ internal class MastodonListMemberLoader(
 
         val users =
             response.map {
-                it.toDbUser(accountKey.host)
+                it.render(accountKey = accountKey, host = accountKey.host)
             }
 
         return PagingResult(
@@ -48,14 +48,14 @@ internal class MastodonListMemberLoader(
     override suspend fun addMember(
         listId: String,
         userKey: MicroBlogKey,
-    ): DbUser {
+    ): UiProfile {
         service.addMember(
             listId = listId,
             accounts = PostAccounts(listOf(userKey.id)),
         )
         return service
             .lookupUser(userKey.id)
-            .toDbUser(accountKey.host)
+            .render(accountKey = accountKey, host = accountKey.host)
     }
 
     override suspend fun removeMember(
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ComposeData.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ComposeData.kt
index 78db39d66..c11a9e6cb 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ComposeData.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ComposeData.kt
@@ -2,14 +2,14 @@ package dev.dimension.flare.data.datasource.microblog
 
 import dev.dimension.flare.common.FileItem
 import dev.dimension.flare.ui.model.UiAccount
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.compose.ComposeStatus
 
 public data class ComposeData(
     val account: UiAccount,
     val content: String,
-    val visibility: UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type =
-        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Public,
+    val visibility: UiTimelineV2.Post.Visibility =
+        UiTimelineV2.Post.Visibility.Public,
     val language: List<String> = listOf("en"),
     val medias: List<Media> = emptyList(),
     val sensitive: Boolean = false,
@@ -30,7 +30,7 @@ public data class ComposeData(
     )
 
     public data class ReferenceStatus(
-        val data: UiTimeline?,
+        val data: UiTimelineV2?,
         val composeStatus: ComposeStatus,
     )
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/ListMemberHandler.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/ListMemberHandler.kt
index c3e0cc85c..a89783d08 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/ListMemberHandler.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/ListMemberHandler.kt
@@ -6,6 +6,7 @@ import androidx.paging.map
 import dev.dimension.flare.common.Cacheable
 import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.connect
+import dev.dimension.flare.data.database.cache.mapper.toDbUser
 import dev.dimension.flare.data.database.cache.model.DbList
 import dev.dimension.flare.data.database.cache.model.DbListMember
 import dev.dimension.flare.data.datasource.microblog.loader.ListMemberLoader
@@ -16,7 +17,6 @@ import dev.dimension.flare.data.repository.tryRun
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.DbAccountType
 import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.ui.model.mapper.render
 import kotlinx.coroutines.flow.map
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
@@ -55,11 +55,11 @@ internal class ListMemberHandler(
                             data.map { item ->
                                 DbListMember(
                                     listKey = listKey,
-                                    memberKey = item.userKey,
+                                    memberKey = item.key,
                                 )
                             },
                         )
-                        database.userDao().insertAll(data)
+                        database.userDao().insertAll(data.map { it.toDbUser() })
                     },
                 ),
             pagingSourceFactory = {
@@ -69,7 +69,7 @@ internal class ListMemberHandler(
             },
         ).flow.map {
             it.map {
-                it.user.render(accountKey)
+                it.user.content
             }
         }
 
@@ -80,7 +80,7 @@ internal class ListMemberHandler(
                 listKey = MicroBlogKey(listId, accountKey.host),
             ).map { members ->
                 members.map { member ->
-                    member.user.render(accountKey)
+                    member.user.content
                 }
             }
 
@@ -102,7 +102,7 @@ internal class ListMemberHandler(
                     ),
                 )
                 database.userDao().insertAll(
-                    listOf(user),
+                    listOf(user.toDbUser()),
                 )
             }
         }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandler.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandler.kt
index 5f3473874..bbf6a7651 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandler.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandler.kt
@@ -10,8 +10,8 @@ import dev.dimension.flare.data.repository.tryRun
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.DbAccountType
 import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.ui.model.UiTimeline
-import dev.dimension.flare.ui.model.mapper.render
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.mapNotNull
@@ -26,7 +26,7 @@ internal class PostHandler(
     private val database: CacheDatabase by inject()
     private val coroutineScope: CoroutineScope by inject()
 
-    fun post(postKey: MicroBlogKey): Cacheable<UiTimeline> {
+    fun post(postKey: MicroBlogKey): Cacheable<UiTimelineV2> {
         val pagingKey = "post_only_$postKey"
         return Cacheable(
             fetchSource = {
@@ -36,7 +36,6 @@ internal class PostHandler(
                         TimelineRemoteMediator.mapping(
                             result,
                             pagingKey,
-                            accountType = accountType as DbAccountType,
                         )
                     saveToDatabase(database, listOf(item))
                 }
@@ -47,7 +46,9 @@ internal class PostHandler(
                     .get(pagingKey, accountType = accountType as DbAccountType)
                     .distinctUntilChanged()
                     .mapNotNull {
-                        it?.render(this)
+                        it?.let {
+                            TimelinePresenter.mapping(it, pagingKey, false)
+                        }
                     }
             },
         )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandler.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandler.kt
index 009c84141..ff2e3de09 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandler.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandler.kt
@@ -2,7 +2,7 @@ package dev.dimension.flare.data.datasource.microblog.handler
 
 import dev.dimension.flare.common.Cacheable
 import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.model.DbUser
+import dev.dimension.flare.data.database.cache.mapper.toDbUser
 import dev.dimension.flare.data.datasource.microblog.loader.UserLoader
 import dev.dimension.flare.model.MicroBlogKey
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -23,13 +23,7 @@ internal class UserHandler(
         fetchSource = {
             val user = loader.userByHandleAndHost(handle, host)
             database.userDao().insert(
-                DbUser(
-                    userKey = user.key,
-                    name = user.name.raw,
-                    handle = user.handle,
-                    host = user.key.host,
-                    content = user,
-                ),
+                user.toDbUser(),
             )
         },
         cacheSource = {
@@ -46,13 +40,7 @@ internal class UserHandler(
             fetchSource = {
                 val user = loader.userById(id)
                 database.userDao().insert(
-                    DbUser(
-                        userKey = user.key,
-                        name = user.name.raw,
-                        handle = user.handle,
-                        host = user.key.host,
-                        content = user,
-                    ),
+                    user.toDbUser(),
                 )
             },
             cacheSource = {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/ListMemberLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/ListMemberLoader.kt
index ca8fd3b80..d364f1cdd 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/ListMemberLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/ListMemberLoader.kt
@@ -1,22 +1,22 @@
 package dev.dimension.flare.data.datasource.microblog.loader
 
-import dev.dimension.flare.data.database.cache.model.DbUser
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiList
+import dev.dimension.flare.ui.model.UiProfile
 
 internal interface ListMemberLoader {
     suspend fun loadMembers(
         pageSize: Int,
         request: PagingRequest,
         listId: String,
-    ): PagingResult<DbUser>
+    ): PagingResult<UiProfile>
 
     suspend fun addMember(
         listId: String,
         userKey: MicroBlogKey,
-    ): DbUser
+    ): UiProfile
 
     suspend fun removeMember(
         listId: String,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelineRemoteMediator.kt
index e712cc77f..132a71ad9 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelineRemoteMediator.kt
@@ -4,6 +4,7 @@ import SnowflakeIdGenerator
 import androidx.paging.ExperimentalPagingApi
 import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.mapper.saveToDatabase
+import dev.dimension.flare.data.database.cache.mapper.toDbUser
 import dev.dimension.flare.data.database.cache.model.DbPagingTimeline
 import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
 import dev.dimension.flare.data.database.cache.model.DbStatus
@@ -13,7 +14,6 @@ import dev.dimension.flare.data.database.cache.model.DbStatusUserReference
 import dev.dimension.flare.data.database.cache.model.DbStatusUserReferenceWithUser
 import dev.dimension.flare.data.database.cache.model.DbStatusWithReference
 import dev.dimension.flare.data.database.cache.model.DbStatusWithUser
-import dev.dimension.flare.data.database.cache.model.DbUser
 import dev.dimension.flare.model.DbAccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.ReferenceType
@@ -148,14 +148,7 @@ internal class TimelineRemoteMediator(
                                     _id = Uuid.random().toString(),
                                 ),
                             user =
-                                DbUser(
-                                    userKey = it.key,
-                                    platformType = it.platformType,
-                                    name = it.name.raw,
-                                    handle = it.handle,
-                                    host = it.host ?: it.key.host,
-                                    content = it,
-                                ),
+                                it.toDbUser(),
                         )
                     },
             )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
index b9db9c793..0b8516251 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
@@ -55,7 +55,6 @@ import dev.dimension.flare.ui.model.UiHashtag
 import dev.dimension.flare.ui.model.UiList
 import dev.dimension.flare.ui.model.UiNumber
 import dev.dimension.flare.ui.model.UiProfile
-import dev.dimension.flare.ui.model.UiTimeline
 import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.mapper.render
 import dev.dimension.flare.ui.presenter.compose.ComposeStatus
@@ -459,11 +458,11 @@ internal class MisskeyDataSource(
                 text = data.content.takeIf { it.isNotEmpty() && it.isNotBlank() },
                 visibility =
                     when (data.visibility) {
-                        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Public -> "public"
-                        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Home -> "home"
-                        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Followers -> "followers"
-                        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Specified -> "specified"
-                        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Channel -> "public"
+                        UiTimelineV2.Post.Visibility.Public -> "public"
+                        UiTimelineV2.Post.Visibility.Home -> "home"
+                        UiTimelineV2.Post.Visibility.Followers -> "followers"
+                        UiTimelineV2.Post.Visibility.Specified -> "specified"
+                        UiTimelineV2.Post.Visibility.Channel -> "public"
                     },
                 renoteId = renoteId,
                 replyId = inReplyToID,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyListMemberLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyListMemberLoader.kt
index 87edd3077..4ffc8fad5 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyListMemberLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyListMemberLoader.kt
@@ -1,7 +1,5 @@
 package dev.dimension.flare.data.datasource.misskey
 
-import dev.dimension.flare.data.database.cache.mapper.toDbUser
-import dev.dimension.flare.data.database.cache.model.DbUser
 import dev.dimension.flare.data.datasource.microblog.loader.ListMemberLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
@@ -12,6 +10,7 @@ import dev.dimension.flare.data.network.misskey.api.model.UsersListsPullRequest
 import dev.dimension.flare.data.network.misskey.api.model.UsersShowRequest
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiList
+import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.mapper.render
 import kotlinx.collections.immutable.toImmutableList
 
@@ -23,7 +22,7 @@ internal class MisskeyListMemberLoader(
         pageSize: Int,
         request: PagingRequest,
         listId: String,
-    ): PagingResult<DbUser> {
+    ): PagingResult<UiProfile> {
         val cursor =
             when (request) {
                 is PagingRequest.Append -> request.nextKey
@@ -43,7 +42,7 @@ internal class MisskeyListMemberLoader(
 
         val users =
             response.map {
-                it.user.toDbUser(accountKey.host)
+                it.user.render(accountKey)
             }
 
         return PagingResult(
@@ -55,7 +54,7 @@ internal class MisskeyListMemberLoader(
     override suspend fun addMember(
         listId: String,
         userKey: MicroBlogKey,
-    ): DbUser {
+    ): UiProfile {
         service.usersListsPush(
             UsersListsPullRequest(
                 listId = listId,
@@ -67,7 +66,7 @@ internal class MisskeyListMemberLoader(
                 UsersShowRequest(
                     userId = userKey.id,
                 ),
-            ).toDbUser(accountKey.host)
+            ).render(accountKey)
     }
 
     override suspend fun removeMember(
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/StatusDetailRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/StatusDetailRemoteMediator.kt
index ad47311cd..62c5b9add 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/StatusDetailRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/StatusDetailRemoteMediator.kt
@@ -80,7 +80,6 @@ internal class StatusDetailRemoteMediator(
                                     .insertAll(
                                         listOf(
                                             DbPagingTimeline(
-                                                accountType = AccountType.Specific(accountKey),
                                                 statusKey = statusKey,
                                                 pagingKey = pagingKey,
                                                 sortId = 0,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/rss/RssTimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/rss/RssTimelineRemoteMediator.kt
index 456c0c011..db59679e9 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/rss/RssTimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/rss/RssTimelineRemoteMediator.kt
@@ -1,6 +1,5 @@
 package dev.dimension.flare.data.datasource.rss
 
-import androidx.paging.ExperimentalPagingApi
 import dev.dimension.flare.data.database.app.model.DbRssSources
 import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/SearchUserPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/SearchUserPagingSource.kt
index 5d4df4d3b..99c425ffc 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/SearchUserPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/SearchUserPagingSource.kt
@@ -39,7 +39,7 @@ internal class SearchUserPagingSource(
                         endOfPaginationReached = true,
                     )
                 }
-                is PagingRequest.Append -> request.nextKey?.toIntOrNull()
+                is PagingRequest.Append -> request.nextKey.toIntOrNull()
             }
 
         val response =
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt
index b609c76fc..f2d9891b1 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt
@@ -425,6 +425,13 @@ internal class VVODataSource(
             response.data?.longTextContent.orEmpty()
         }.toUi()
 
+    fun status(statusKey: MicroBlogKey): Flow<UiState<UiTimelineV2>> =
+        MemCacheable(
+            "vvo_status_$statusKey",
+        ) {
+            loadStatusDetail(statusKey)
+        }.toUi()
+
     private suspend fun uploadMedia(
         fileItem: FileItem,
         st: String,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt
index 86a3fb061..30d433c38 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt
@@ -73,7 +73,6 @@ import dev.dimension.flare.ui.model.UiDMItem
 import dev.dimension.flare.ui.model.UiDMRoom
 import dev.dimension.flare.ui.model.UiPodcast
 import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.UiTimeline
 import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.mapper.render
 import dev.dimension.flare.ui.presenter.compose.ComposeStatus
@@ -382,7 +381,7 @@ internal class XQTDataSource(
                 ?.let {
                     it as? ComposeStatus.Quote
                 }?.let {
-                    data.referenceStatus.data?.content as? UiTimeline.ItemContent.Status
+                    data.referenceStatus.data as? UiTimelineV2.Post
                 }?.user
                 ?.handle
                 ?.removePrefix("@")
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTListMemberLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTListMemberLoader.kt
index 5aa88dbc0..8f405a324 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTListMemberLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTListMemberLoader.kt
@@ -1,9 +1,7 @@
 package dev.dimension.flare.data.datasource.xqt
 
 import dev.dimension.flare.data.database.cache.mapper.cursor
-import dev.dimension.flare.data.database.cache.mapper.toDbUser
 import dev.dimension.flare.data.database.cache.mapper.users
-import dev.dimension.flare.data.database.cache.model.DbUser
 import dev.dimension.flare.data.datasource.microblog.loader.ListMemberLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
@@ -14,6 +12,7 @@ import dev.dimension.flare.data.network.xqt.model.User
 import dev.dimension.flare.data.network.xqt.model.UserUnavailable
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiList
+import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.mapper.render
 
 internal class XQTListMemberLoader(
@@ -24,7 +23,7 @@ internal class XQTListMemberLoader(
         pageSize: Int,
         request: PagingRequest,
         listId: String,
-    ): PagingResult<DbUser> {
+    ): PagingResult<UiProfile> {
         val cursor = (request as? PagingRequest.Append)?.nextKey
         val response =
             service
@@ -47,8 +46,8 @@ internal class XQTListMemberLoader(
         val nextCursor = response?.cursor()
 
         val result =
-            response?.users().orEmpty().map {
-                it.toDbUser(accountKey = accountKey)
+            response?.users().orEmpty().mapNotNull {
+                it.render(accountKey = accountKey)
             }
 
         return PagingResult(
@@ -60,7 +59,7 @@ internal class XQTListMemberLoader(
     override suspend fun addMember(
         listId: String,
         userKey: MicroBlogKey,
-    ): DbUser {
+    ): UiProfile {
         service.addMember(
             request =
                 AddMemberRequest(
@@ -82,7 +81,7 @@ internal class XQTListMemberLoader(
                     is User -> it
                     is UserUnavailable -> null
                 }
-            }?.toDbUser(accountKey)
+            }?.render(accountKey)
             ?: throw Exception("User not found")
     }
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datastore/model/ComposeConfigData.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datastore/model/ComposeConfigData.kt
index 084e04bc1..c70088b46 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datastore/model/ComposeConfigData.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datastore/model/ComposeConfigData.kt
@@ -1,7 +1,7 @@
 package dev.dimension.flare.data.datastore.model
 
 import androidx.datastore.core.okio.OkioSerializer
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromByteArray
@@ -12,8 +12,8 @@ import okio.BufferedSource
 
 @Serializable
 internal data class ComposeConfigData(
-    val visibility: UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type =
-        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Public,
+    val visibility: UiTimelineV2.Post.Visibility =
+        UiTimelineV2.Post.Visibility.Public,
 )
 
 @OptIn(ExperimentalSerializationApi::class)
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/repository/AccountRepository.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/repository/AccountRepository.kt
index 617042f90..0ce6d4de9 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/repository/AccountRepository.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/repository/AccountRepository.kt
@@ -24,6 +24,7 @@ import dev.dimension.flare.ui.model.UiAccount.Companion.toUi
 import dev.dimension.flare.ui.model.UiState
 import dev.dimension.flare.ui.model.collectAsUiState
 import dev.dimension.flare.ui.model.takeSuccess
+import kotlin.time.Clock
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
@@ -31,12 +32,10 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.distinctUntilChangedBy
-import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.launch
-import kotlin.time.Clock
 
 @Stable
 public class AccountRepository internal constructor(
@@ -169,7 +168,6 @@ internal fun accountProvider(
         key1 = accountType,
     ) {
         when (accountType) {
-            AccountType.Active -> repository.activeAccount
             AccountType.Guest ->
                 flowOf(
                     UiState.Error(
@@ -203,31 +201,6 @@ internal fun accountServiceFlow(
     repository: AccountRepository,
 ): Flow<MicroblogDataSource> =
     when (accountType) {
-        AccountType.Active -> {
-            repository
-                .activeAccount
-                .map { it.takeSuccess() }
-                .distinctUntilChangedBy { it?.accountKey }
-                .flatMapLatest {
-                    if (it != null) {
-                        flowOf(it.dataSource)
-                    } else {
-                        val guestData = repository.appDataStore.guestDataStore.data
-                        guestData.map {
-                            when (it.platformType) {
-                                PlatformType.Mastodon ->
-                                    GuestMastodonDataSource(
-                                        host = it.host,
-                                        locale = Locale.language,
-                                    )
-
-                                else -> throw UnsupportedOperationException()
-                            }
-                        }
-                    }
-                }
-        }
-
         AccountType.Guest -> {
             val guestData = repository.appDataStore.guestDataStore.data
             guestData.map {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/model/AccountType.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/model/AccountType.kt
index a3e28bf71..598832ae0 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/model/AccountType.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/model/AccountType.kt
@@ -18,13 +18,6 @@ public sealed class AccountType {
         override fun toString(): String = "specific_$accountKey"
     }
 
-    @Deprecated("Use Specific with the current account's key instead")
-    @Serializable
-    @Immutable
-    public data object Active : AccountType() {
-        override fun toString(): String = "active"
-    }
-
     @Serializable
     @Immutable
     public data object Guest : AccountType(), DbAccountType {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiDMRoom.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiDMRoom.kt
index 064f0d39a..4ff2dd0e9 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiDMRoom.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiDMRoom.kt
@@ -50,7 +50,7 @@ public data class UiDMItem internal constructor(
         ) : Message
 
         public data class Status(
-            val status: UiTimeline.ItemContent.Status,
+            val status: UiTimelineV2.Post,
         ) : Message
 
         public data object Deleted : Message
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiStatus.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiStatus.kt
index 0a128943e..843c429fc 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiStatus.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiStatus.kt
@@ -89,67 +89,65 @@ private fun String.trimUrl(): String =
             }
         }
 
-public fun createSampleStatus(user: UiProfile): UiTimeline =
-    UiTimeline(
-        topMessage = null,
+public fun createSampleStatus(user: UiProfile): UiTimelineV2.Post =
+    UiTimelineV2.Post(
+        message = null,
+        platformType = user.platformType,
+        images = persistentListOf(),
+        sensitive = false,
+        contentWarning = null,
+        user = user,
+        quote = persistentListOf(),
         content =
-            UiTimeline.ItemContent.Status(
-                images = persistentListOf(),
-                sensitive = false,
-                contentWarning = null,
-                user = user,
-                quote = persistentListOf(),
-                content =
-                    Element("body")
-                        .apply {
-                            appendChild(
-                                TextNode(
-                                    "Sample content for ${user.name.raw} on ${user.key.host} ",
-                                ),
-                            )
-                            appendChild(
-                                Element("a")
-                                    .apply {
-                                        attributes().put(
-                                            "href",
-                                            DeeplinkRoute.Search(AccountType.Specific(user.key), "#flare").toUri(),
-                                        )
-                                        addChildren(TextNode("#flare"))
-                                    },
-                            )
-                        }.toUi(),
-                actions =
-                    persistentListOf(
-                        ActionMenu.Item(
-                            icon = ActionMenu.Item.Icon.Reply,
-                            text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Reply),
-                            count = UiNumber(10),
+            Element("body")
+                .apply {
+                    appendChild(
+                        TextNode(
+                            "Sample content for ${user.name.raw} on ${user.key.host} ",
                         ),
-                        ActionMenu.Item(
-                            icon = ActionMenu.Item.Icon.Retweet,
-                            text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Retweet),
-                            count = UiNumber(20),
-                        ),
-                        ActionMenu.Item(
-                            icon = ActionMenu.Item.Icon.Like,
-                            text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Like),
-                            count = UiNumber(30),
-                        ),
-                        ActionMenu.Item(
-                            icon = ActionMenu.Item.Icon.More,
-                            text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.More),
-                        ),
-                    ),
-                poll = null,
-                statusKey = MicroBlogKey(id = "123", host = user.key.host),
-                card = null,
-                createdAt = Clock.System.now().toUi(),
-                bottomContent = null,
-                topEndContent = null,
-                aboveTextContent = null,
-                onClicked = {},
-                onMediaClicked = { _, _ -> },
-                platformType = user.platformType,
-                url = "",
+                    )
+                    appendChild(
+                        Element("a")
+                            .apply {
+                                attributes().put(
+                                    "href",
+                                    DeeplinkRoute.Search(AccountType.Specific(user.key), "#flare").toUri(),
+                                )
+                                addChildren(TextNode("#flare"))
+                            },
+                    )
+                }.toUi(),
+        actions =
+            persistentListOf(
+                ActionMenu.Item(
+                    icon = UiIcon.Reply,
+                    text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Reply),
+                    count = UiNumber(10),
+                ),
+                ActionMenu.Item(
+                    icon = UiIcon.Retweet,
+                    text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Retweet),
+                    count = UiNumber(20),
+                ),
+                ActionMenu.Item(
+                    icon = UiIcon.Like,
+                    text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Like),
+                    count = UiNumber(30),
+                ),
+                ActionMenu.Item(
+                    icon = UiIcon.More,
+                    text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.More),
+                ),
             ),
+        poll = null,
+        statusKey = MicroBlogKey(id = "123", host = user.key.host),
+        card = null,
+        createdAt = Clock.System.now().toUi(),
+        emojiReactions = persistentListOf(),
+        sourceChannel = null,
+        visibility = null,
+        replyToHandle = null,
+        parents = persistentListOf(),
+        clickEvent = ClickEvent.Noop,
+        accountType = AccountType.Specific(user.key),
     )
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
deleted file mode 100644
index a1f2a1e3d..000000000
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimeline.kt
+++ /dev/null
@@ -1,461 +0,0 @@
-package dev.dimension.flare.ui.model
-
-import androidx.compose.runtime.Immutable
-import dev.dimension.flare.common.SerializableImmutableList
-import dev.dimension.flare.common.SerializableImmutableMap
-import dev.dimension.flare.data.datasource.microblog.ActionMenu
-import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.model.PlatformType
-import dev.dimension.flare.ui.model.mapper.MisskeyAchievement
-import dev.dimension.flare.ui.render.UiDateTime
-import dev.dimension.flare.ui.render.UiRichText
-import dev.dimension.flare.ui.route.DeeplinkRoute
-import dev.dimension.flare.ui.route.toUri
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.serialization.Serializable
-
-@Immutable
-public data class UiTimeline internal constructor(
-    val topMessage: TopMessage?,
-    val content: ItemContent?,
-    private val dbKey: String? = null,
-) {
-    val id: String by lazy {
-        itemKey
-    }
-    val itemKey: String
-        get() =
-            buildString {
-                if (topMessage != null) {
-                    append("withTopMessage")
-                    append(topMessage.itemKey)
-                }
-                if (content != null) {
-                    append("withContent")
-                    append(content.itemKey)
-                }
-                if (dbKey != null) {
-                    append("withDbKey")
-                    append(dbKey)
-                }
-            }
-    val itemType: String
-        get() =
-            buildString {
-//                append(platformType.name)
-                if (topMessage != null) {
-                    append("withTopMessage")
-                }
-                if (content != null) {
-                    append("withContent")
-                    when (content) {
-                        is ItemContent.Status -> {
-                            append("Status")
-                        }
-                        is ItemContent.User -> {
-                            append("User")
-                        }
-                        is ItemContent.UserList -> {
-                            append("UserList")
-                        }
-
-                        is ItemContent.Feed -> {
-                            append("Feed")
-                        }
-                    }
-                }
-            }
-
-    @Immutable
-    public sealed class ItemContent {
-        public abstract val itemKey: String
-
-        @Immutable
-        public data class Feed internal constructor(
-            val title: String?,
-            val description: String?,
-            val url: String,
-            val image: String?,
-            val createdAt: UiDateTime?,
-            val source: String,
-            val sourceIcon: String?,
-            val imageHeaders: SerializableImmutableMap<String, String>?,
-            private val openInBrowser: Boolean,
-        ) : ItemContent() {
-            val id: String by lazy {
-                itemKey
-            }
-            override val itemKey: String
-                get() = "Feed_$url"
-
-            val onClicked: ClickContext.() -> Unit = {
-                if (openInBrowser) {
-                    launcher.launch(url)
-                } else {
-                    launcher.launch(DeeplinkRoute.Rss.Detail(url).toUri())
-                }
-            }
-        }
-
-        @Immutable
-        public data class Status internal constructor(
-            val platformType: PlatformType,
-            val images: SerializableImmutableList<UiMedia>,
-            val sensitive: Boolean,
-            val contentWarning: UiRichText?,
-            val user: UiProfile?,
-            val quote: SerializableImmutableList<Status>,
-            val content: UiRichText,
-            val actions: SerializableImmutableList<ActionMenu>,
-            val poll: UiPoll?,
-            val statusKey: MicroBlogKey,
-            val card: UiCard?,
-            val createdAt: UiDateTime,
-            val bottomContent: BottomContent? = null,
-            val topEndContent: TopEndContent? = null,
-            val aboveTextContent: AboveTextContent? = null,
-            val parents: SerializableImmutableList<Status> = persistentListOf(),
-            val url: String,
-            val onClicked: ClickContext.() -> Unit,
-            val onMediaClicked: ClickContext.(media: UiMedia, index: Int) -> Unit,
-        ) : ItemContent() {
-            val id: String by lazy {
-                itemKey
-            }
-            override val itemKey: String
-                get() =
-                    buildString {
-                        append(platformType.name)
-                        append("Status")
-                        append(statusKey)
-                    }
-
-            val shouldExpandTextByDefault: Boolean by lazy {
-                (contentWarning == null || contentWarning.isEmpty) && !content.isLongText
-            }
-
-            @Immutable
-            public sealed class BottomContent {
-                @Immutable
-                public data class Reaction internal constructor(
-                    val emojiReactions: SerializableImmutableList<EmojiReaction>,
-                    val channel: SourceChannel? = null,
-                ) : BottomContent() {
-                    @Immutable
-                    public data class SourceChannel(
-                        val id: String,
-                        val name: String,
-                    )
-
-                    @Immutable
-                    public data class EmojiReaction internal constructor(
-                        val name: String,
-                        val url: String,
-                        val count: UiNumber,
-                        val onClicked: () -> Unit,
-                        // TODO: make EmojiReaction a sealed class
-                        val isUnicode: Boolean,
-                        val me: Boolean,
-                    ) {
-                        val isImageReaction: Boolean by lazy {
-                            name.startsWith(":") && name.endsWith(":")
-                        }
-                    }
-                }
-            }
-
-            @Immutable
-            public sealed class TopEndContent {
-                @Immutable
-                public data class Visibility internal constructor(
-                    val visibility: Type,
-                ) : TopEndContent() {
-                    @Serializable
-                    public enum class Type {
-                        Public,
-                        Home,
-                        Followers,
-                        Specified,
-                        Channel,
-                    }
-                }
-            }
-
-            @Immutable
-            public sealed class AboveTextContent {
-                @Immutable
-                public data class ReplyTo internal constructor(
-                    val handle: String,
-                ) : AboveTextContent()
-            }
-        }
-
-        @Immutable
-        public data class User internal constructor(
-            val value: UiProfile,
-            val button: SerializableImmutableList<Button> = persistentListOf(),
-        ) : ItemContent() {
-            val id: String by lazy {
-                itemKey
-            }
-            override val itemKey: String
-                get() =
-                    buildString {
-                        append("User")
-                        append(value.key)
-                    }
-
-            @Immutable
-            public sealed class Button {
-                @Immutable
-                public data class AcceptFollowRequest internal constructor(
-                    val onClicked: ClickContext.() -> Unit,
-                ) : Button()
-
-                @Immutable
-                public data class RejectFollowRequest internal constructor(
-                    val onClicked: ClickContext.() -> Unit,
-                ) : Button()
-            }
-        }
-
-        @Immutable
-        public data class UserList internal constructor(
-            val users: SerializableImmutableList<UiProfile>,
-            val status: Status? = null,
-        ) : ItemContent() {
-            val id: String by lazy {
-                itemKey
-            }
-            override val itemKey: String
-                get() =
-                    buildString {
-                        append("UserList")
-                        append(users.hashCode())
-                        if (status != null) {
-                            append(status.itemKey)
-                        }
-                    }
-        }
-    }
-
-    @Immutable
-    public data class TopMessage internal constructor(
-        val user: UiProfile?,
-        val icon: Icon,
-        val type: MessageType,
-        val onClicked: ClickContext.() -> Unit,
-        val statusKey: MicroBlogKey,
-    ) {
-        val id: String by lazy {
-            itemKey
-        }
-        val itemKey: String
-            get() =
-                buildString {
-                    append("TopMessage")
-                    append(type)
-                    if (user != null) {
-                        append(user.key)
-                    }
-                    append(statusKey.toString())
-                }
-
-        public enum class Icon {
-            Retweet,
-            Follow,
-            Favourite,
-            Mention,
-            Poll,
-            Edit,
-            Info,
-            Reply,
-            Quote,
-            Pin,
-        }
-
-        @Immutable
-        public sealed class MessageType {
-            @Immutable
-            public sealed class Mastodon : MessageType() {
-                @Immutable
-                public data class Reblogged internal constructor(
-                    val id: String,
-                ) : Mastodon()
-
-                @Immutable
-                public data class Follow internal constructor(
-                    val id: String,
-                ) : Mastodon()
-
-                @Immutable
-                public data class Favourite internal constructor(
-                    val id: String,
-                ) : Mastodon()
-
-                @Immutable
-                public data class Mention internal constructor(
-                    val id: String,
-                ) : Mastodon()
-
-                @Immutable
-                public data class Poll internal constructor(
-                    val id: String,
-                ) : Mastodon()
-
-                @Immutable
-                public data class FollowRequest internal constructor(
-                    val id: String,
-                ) : Mastodon()
-
-                @Immutable
-                public data class Status internal constructor(
-                    val id: String,
-                ) : Mastodon()
-
-                @Immutable
-                public data class Update internal constructor(
-                    val id: String,
-                ) : Mastodon()
-
-                @Immutable
-                public data class UnKnown internal constructor(
-                    val id: String,
-                ) : Mastodon()
-
-                @Immutable
-                public data class Pinned internal constructor(
-                    val id: String,
-                ) : Mastodon()
-            }
-
-            @Immutable
-            public sealed class Misskey : MessageType() {
-                @Immutable
-                public data class Follow internal constructor(
-                    val id: String,
-                ) : Misskey()
-
-                @Immutable
-                public data class Mention internal constructor(
-                    val id: String,
-                ) : Misskey()
-
-                @Immutable
-                public data class Reply internal constructor(
-                    val id: String,
-                ) : Misskey()
-
-                @Immutable
-                public data class Renote internal constructor(
-                    val id: String,
-                ) : Misskey()
-
-                @Immutable
-                public data class Quote internal constructor(
-                    val id: String,
-                ) : Misskey()
-
-                @Immutable
-                public data class Reaction internal constructor(
-                    val id: String,
-                ) : Misskey()
-
-                @Immutable
-                public data class PollEnded internal constructor(
-                    val id: String,
-                ) : Misskey()
-
-                @Immutable
-                public data class ReceiveFollowRequest internal constructor(
-                    val id: String,
-                ) : Misskey()
-
-                @Immutable
-                public data class FollowRequestAccepted internal constructor(
-                    val id: String,
-                ) : Misskey()
-
-                @Immutable
-                public data class AchievementEarned internal constructor(
-                    val id: String,
-                    val achievement: MisskeyAchievement?,
-                ) : Misskey()
-
-                @Immutable
-                public data class App internal constructor(
-                    val id: String,
-                ) : Misskey()
-
-                @Immutable
-                public data class UnKnown internal constructor(
-                    val type: String,
-                    val id: String,
-                ) : Misskey()
-
-                @Immutable
-                public data class Pinned internal constructor(
-                    val id: String,
-                ) : Misskey()
-            }
-
-            @Immutable
-            public sealed class Bluesky : MessageType() {
-                @Immutable
-                public data object Like : Bluesky()
-
-                @Immutable
-                public data object Repost : Bluesky()
-
-                @Immutable
-                public data object Follow : Bluesky()
-
-                @Immutable
-                public data object Mention : Bluesky()
-
-                @Immutable
-                public data object Reply : Bluesky()
-
-                @Immutable
-                public data object Quote : Bluesky()
-
-                @Immutable
-                public data object UnKnown : Bluesky()
-
-                @Immutable
-                public data object StarterpackJoined : Bluesky()
-
-                @Immutable
-                public data object Pinned : Bluesky()
-            }
-
-            @Immutable
-            public sealed class XQT : MessageType() {
-                @Immutable
-                public data object Retweet : XQT()
-
-                @Immutable
-                public data class Custom internal constructor(
-                    val message: String,
-                    val id: String,
-                ) : XQT() {
-                    override fun toString(): String = "Custom$id"
-                }
-
-                @Immutable
-                public data object Mention : XQT()
-            }
-
-            @Immutable
-            public sealed class VVO : MessageType() {
-                @Immutable
-                public data class Custom internal constructor(
-                    val message: String,
-                ) : VVO()
-
-                @Immutable
-                public data object Like : VVO()
-            }
-        }
-    }
-}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt
index d3a9621a7..1ff514807 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt
@@ -59,11 +59,14 @@ import moe.tlaster.mfm.parser.tree.SearchNode
 import moe.tlaster.mfm.parser.tree.SmallNode
 import moe.tlaster.mfm.parser.tree.StrikeNode
 import moe.tlaster.mfm.parser.tree.UrlNode
+import kotlin.jvm.JvmName
 import kotlin.math.roundToLong
 import kotlin.time.Instant
 
+@JvmName("renderMisskeyNotes")
 internal fun List<Note>.render(accountKey: MicroBlogKey): List<UiTimelineV2> = map { it.render(accountKey) }
 
+@JvmName("renderMisskeyNotifications")
 internal fun List<Notification>.render(accountKey: MicroBlogKey): List<UiTimelineV2> = map { it.render(accountKey) }
 
 internal fun Notification.render(accountKey: MicroBlogKey): UiTimelineV2 {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Render.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Render.kt
index 9665b931a..a0eb6441a 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Render.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Render.kt
@@ -11,8 +11,8 @@ import dev.dimension.flare.ui.model.UiDMItem
 import dev.dimension.flare.ui.model.UiDMRoom
 import dev.dimension.flare.ui.model.UiRssSource
 import dev.dimension.flare.ui.render.toUi
-import kotlin.time.Instant
 import kotlinx.collections.immutable.toImmutableList
+import kotlin.time.Instant
 
 // internal fun DbPagingTimelineWithStatus.render(
 //    event: StatusEvent?,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Rss.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Rss.kt
index 414dcdb4c..c7cac60ea 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Rss.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Rss.kt
@@ -2,6 +2,7 @@ package dev.dimension.flare.ui.model.mapper
 
 import com.fleeksoft.ksoup.Ksoup
 import dev.dimension.flare.data.network.rss.model.Feed
+import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiMedia
 import dev.dimension.flare.ui.model.UiTimelineV2
@@ -74,6 +75,7 @@ internal fun Feed.Atom.Entry.render(
             (published ?: updated)
                 ?.let { input -> parseRssDateToInstant(input) }
                 ?.toUi() ?: Instant.fromEpochMilliseconds(0L).toUi(),
+        accountType = AccountType.Guest,
     )
 }
 
@@ -111,6 +113,7 @@ internal fun Feed.Rss20.Item.render(
             pubDate
                 ?.let { input -> parseRssDateToInstant(input) }
                 ?.toUi() ?: Instant.fromEpochMilliseconds(0L).toUi(),
+        accountType = AccountType.Guest,
     )
 }
 
@@ -148,6 +151,7 @@ internal fun Feed.RDF.Item.render(
             date
                 ?.let { input -> parseRssDateToInstant(input) }
                 ?.toUi() ?: Instant.fromEpochMilliseconds(0L).toUi(),
+        accountType = AccountType.Guest,
     )
 }
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt
index 7079226b8..17ec40565 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt
@@ -48,7 +48,6 @@ import dev.dimension.flare.ui.model.UiPodcast
 import dev.dimension.flare.ui.model.UiPoll
 import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.UiRelation
-import dev.dimension.flare.ui.model.UiTimeline
 import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.toHtml
 import dev.dimension.flare.ui.render.UiRichText
@@ -135,7 +134,7 @@ internal fun TopLevel.renderNotifications(accountKey: MicroBlogKey): List<UiTime
                         "bird_icon" -> UiIcon.Info
                         else -> UiIcon.Info
                     }
-                val tweet =
+                val post =
                     notificationTweet?.firstOrNull()?.let {
                         Tweet(
                             restId = it.idStr,
@@ -156,24 +155,6 @@ internal fun TopLevel.renderNotifications(accountKey: MicroBlogKey): List<UiTime
                             legacy = it,
                         ).renderStatus(accountKey)
                     }
-                val itemContent: UiTimeline.ItemContent? =
-                    when {
-                        data?.icon?.id in listOf("person_icon") && users != null ->
-                            if (users.size > 1) {
-                                UiTimeline.ItemContent.UserList(
-                                    users = users.toImmutableList(),
-                                )
-                            } else if (users.size == 1) {
-                                UiTimeline.ItemContent.User(
-                                    value = users.first(),
-                                )
-                            } else {
-                                null
-                            }
-
-                        tweet != null -> tweet
-                        else -> null
-                    }
 
                 val statusKey =
                     MicroBlogKey(
@@ -182,7 +163,7 @@ internal fun TopLevel.renderNotifications(accountKey: MicroBlogKey): List<UiTime
                     )
                 val clickEvent =
                     when {
-                        itemContent == null && url == "/2/notifications/device_follow.json" ->
+                        users.isNullOrEmpty() && post == null && url == "/2/notifications/device_follow.json" ->
                             ClickEvent.Deeplink(
                                 DeeplinkRoute.Timeline
                                     .XQTDeviceFollow(
@@ -190,7 +171,7 @@ internal fun TopLevel.renderNotifications(accountKey: MicroBlogKey): List<UiTime
                                     ),
                             )
 
-                        itemContent == null && !url.isNullOrEmpty() && !url.startsWith("/") ->
+                        users.isNullOrEmpty() && post == null && !url.isNullOrEmpty() && !url.startsWith("/") ->
                             ClickEvent.Deeplink(
                                 DeeplinkRoute.OpenLinkDirectly(url),
                             )
@@ -207,29 +188,28 @@ internal fun TopLevel.renderNotifications(accountKey: MicroBlogKey): List<UiTime
                         clickEvent = clickEvent,
                         accountType = AccountType.Specific(accountKey),
                     )
-                when (itemContent) {
-                    is UiTimeline.ItemContent.Status -> itemContent.toUiTimelineV2(accountKey, messageItem)
-                    is UiTimeline.ItemContent.User ->
+                when {
+                    data?.icon?.id == "person_icon" && users?.size == 1 ->
                         UiTimelineV2.User(
                             message = messageItem,
-                            value = itemContent.value,
+                            value = users.first(),
                             createdAt = createdAt?.toUi() ?: Clock.System.now().toUi(),
-                            statusKey = itemContent.value.key,
+                            statusKey = users.first().key,
                             accountType = AccountType.Specific(accountKey),
                         )
 
-                    is UiTimeline.ItemContent.UserList ->
+                    data?.icon?.id == "person_icon" && !users.isNullOrEmpty() ->
                         UiTimelineV2.UserList(
                             message = messageItem,
-                            users = itemContent.users,
+                            users = users.toImmutableList(),
                             createdAt = createdAt?.toUi() ?: Clock.System.now().toUi(),
                             statusKey = statusKey,
-                            post = itemContent.status?.toUiTimelineV2(accountKey, null),
+                            post = null,
                             accountType = AccountType.Specific(accountKey),
                         )
 
-                    null -> messageItem
-                    else -> null
+                    post != null -> post.copy(message = messageItem)
+                    else -> messageItem
                 }
             } else if (mentionTweet != null) {
                 val tweet = globalObjects?.tweets?.get(mentionTweet.id) ?: return@mapNotNull null
@@ -266,8 +246,7 @@ internal fun TopLevel.renderNotifications(accountKey: MicroBlogKey): List<UiTime
                             ),
                         legacy = tweet,
                     ).renderStatus(accountKey)
-                data.toUiTimelineV2(
-                    accountKey = accountKey,
+                data.copy(
                     message =
                         UiTimelineV2.Message(
                             user = renderedUser,
@@ -332,7 +311,11 @@ internal fun Tweet.render(accountKey: MicroBlogKey): UiTimelineV2.Post {
         } else {
             null
         }
-    return actualTweet.toUiTimelineV2(accountKey = accountKey, message = message)
+    return if (message != null) {
+        actualTweet.copy(message = message)
+    } else {
+        actualTweet
+    }
 }
 
 internal fun XQTTimeline.render(accountKey: MicroBlogKey): UiTimelineV2? {
@@ -389,80 +372,18 @@ internal fun XQTTimeline.render(accountKey: MicroBlogKey): UiTimelineV2? {
         } else {
             null
         }
-    return actualTweet.toUiTimelineV2(accountKey = accountKey, message = message)
+    return if (message != null) {
+        actualTweet.copy(message = message)
+    } else {
+        actualTweet
+    }
 }
 
-private fun UiTimeline.ItemContent.Status.toUiTimelineV2(
-    accountKey: MicroBlogKey,
-    message: UiTimelineV2.Message?,
-): UiTimelineV2.Post =
-    UiTimelineV2.Post(
-        message = message,
-        platformType = platformType,
-        images = images,
-        sensitive = sensitive,
-        contentWarning = contentWarning,
-        user = user,
-        quote = quote.map { it.toUiTimelineV2(accountKey, null) }.toImmutableList(),
-        content = content,
-        actions = actions,
-        poll = poll,
-        statusKey = statusKey,
-        card = card,
-        createdAt = createdAt,
-        emojiReactions =
-            (bottomContent as? UiTimeline.ItemContent.Status.BottomContent.Reaction)
-                ?.emojiReactions
-                ?.map {
-                    UiTimelineV2.Post.EmojiReaction(
-                        name = it.name,
-                        url = it.url,
-                        count = it.count,
-                        clickEvent = ClickEvent.Noop,
-                        isUnicode = it.isUnicode,
-                        me = it.me,
-                    )
-                }?.toImmutableList() ?: persistentListOf(),
-        sourceChannel =
-            (bottomContent as? UiTimeline.ItemContent.Status.BottomContent.Reaction)
-                ?.channel
-                ?.let {
-                    UiTimelineV2.Post.SourceChannel(
-                        id = it.id,
-                        name = it.name,
-                    )
-                },
-        visibility =
-            (topEndContent as? UiTimeline.ItemContent.Status.TopEndContent.Visibility)
-                ?.visibility
-                ?.let {
-                    when (it) {
-                        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Public -> UiTimelineV2.Post.Visibility.Public
-                        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Home -> UiTimelineV2.Post.Visibility.Home
-                        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Followers -> UiTimelineV2.Post.Visibility.Followers
-                        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Specified -> UiTimelineV2.Post.Visibility.Specified
-                        UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Channel -> UiTimelineV2.Post.Visibility.Channel
-                    }
-                },
-        replyToHandle =
-            (aboveTextContent as? UiTimeline.ItemContent.Status.AboveTextContent.ReplyTo)
-                ?.handle,
-        parents = parents.map { it.toUiTimelineV2(accountKey, null) }.toImmutableList(),
-        clickEvent =
-            ClickEvent.Deeplink(
-                DeeplinkRoute.Status.Detail(
-                    statusKey = statusKey,
-                    accountType = AccountType.Specific(accountKey),
-                ),
-            ),
-        accountType = AccountType.Specific(accountKey),
-    )
-
 internal fun Tweet.renderStatus(
     accountKey: MicroBlogKey,
-    parents: List<UiTimeline.ItemContent.Status> = emptyList(),
-    quote: UiTimeline.ItemContent.Status? = null,
-): UiTimeline.ItemContent.Status {
+    parents: List<UiTimelineV2.Post> = emptyList(),
+    quote: UiTimelineV2.Post? = null,
+): UiTimelineV2.Post {
     val actualParents = parents.toImmutableList()
     val actualQuote = quote ?: quotedStatusResult?.result?.toTweetOrNull()?.renderStatus(accountKey = accountKey)
     val user =
@@ -627,12 +548,7 @@ internal fun Tweet.renderStatus(
         }
     val content = renderContent(accountKey)
 
-    val aboveTextContent =
-        legacy?.in_reply_to_screen_name?.let { screenName ->
-            UiTimeline.ItemContent.Status.AboveTextContent.ReplyTo(
-                handle = "@$screenName",
-            )
-        }
+    val replyToHandle = legacy?.in_reply_to_screen_name?.let { "@$it" }
 
     val isFromMe = user?.key == accountKey
     val createAt =
@@ -642,7 +558,7 @@ internal fun Tweet.renderStatus(
             id = legacy?.idStr ?: restId,
             host = accountKey.host,
         )
-    val url =
+    val statusUrl =
         buildString {
             append("https://${accountKey.host}/")
             append(user?.handleWithoutAtAndHost)
@@ -664,18 +580,15 @@ internal fun Tweet.renderStatus(
             append(legacy?.idStr ?: restId)
         }
 
-    return UiTimeline.ItemContent.Status(
-        statusKey = statusKey,
-        user = user,
-        content = content,
-        card = uiCard,
-        quote = listOfNotNull(actualQuote).toImmutableList(),
-        poll = poll,
+    return UiTimelineV2.Post(
+        message = null,
+        platformType = PlatformType.xQt,
         images = medias,
+        sensitive = legacy?.possiblySensitive == true,
         contentWarning = null,
-        createdAt = createAt.toUi(),
-        aboveTextContent = aboveTextContent,
-        parents = actualParents,
+        user = user,
+        quote = listOfNotNull(actualQuote).toImmutableList(),
+        content = content,
         actions =
             listOfNotNull(
                 ActionMenu.Item(
@@ -754,7 +667,7 @@ internal fun Tweet.renderStatus(
                                                 .ShareSheet(
                                                     statusKey = statusKey,
                                                     accountType = AccountType.Specific(accountKey),
-                                                    shareUrl = url,
+                                                    shareUrl = statusUrl,
                                                     fxShareUrl = fxUrl,
                                                     fixvxShareUrl = fixvxUrl,
                                                 ),
@@ -804,39 +717,23 @@ internal fun Tweet.renderStatus(
                         }.toImmutableList(),
                 ),
             ).toImmutableList(),
-        sensitive = legacy?.possiblySensitive == true,
-        onClicked = {
-            launcher.launch(
-                DeeplinkRoute.Status
-                    .Detail(
-                        statusKey = statusKey,
-                        accountType =
-                            dev.dimension.flare.model.AccountType
-                                .Specific(accountKey),
-                    ).toUri(),
-            )
-        },
-        platformType = PlatformType.xQt,
-        onMediaClicked = { media, index ->
-            launcher.launch(
-                DeeplinkRoute.Media
-                    .StatusMedia(
-                        statusKey = statusKey,
-                        accountType =
-                            dev.dimension.flare.model.AccountType
-                                .Specific(accountKey),
-                        index = index,
-                        preview =
-                            when (media) {
-                                is UiMedia.Image -> media.previewUrl
-                                is UiMedia.Video -> media.thumbnailUrl
-                                is UiMedia.Audio -> null
-                                is UiMedia.Gif -> media.previewUrl
-                            },
-                    ).toUri(),
-            )
-        },
-        url = url,
+        poll = poll,
+        statusKey = statusKey,
+        card = uiCard,
+        createdAt = createAt.toUi(),
+        emojiReactions = persistentListOf(),
+        sourceChannel = null,
+        visibility = null,
+        replyToHandle = replyToHandle,
+        parents = actualParents,
+        clickEvent =
+            ClickEvent.Deeplink(
+                DeeplinkRoute.Status.Detail(
+                    statusKey = statusKey,
+                    accountType = AccountType.Specific(accountKey),
+                ),
+            ),
+        accountType = AccountType.Specific(accountKey),
     )
 }
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/compose/ComposePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/compose/ComposePresenter.kt
index 3134a664a..dc33b8a27 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/compose/ComposePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/compose/ComposePresenter.kt
@@ -15,6 +15,7 @@ import dev.dimension.flare.data.datasource.microblog.AuthenticatedMicroblogDataS
 import dev.dimension.flare.data.datasource.microblog.ComposeConfig
 import dev.dimension.flare.data.datasource.microblog.ComposeData
 import dev.dimension.flare.data.datasource.microblog.ComposeType
+import dev.dimension.flare.data.datasource.microblog.datasource.UserDataSource
 import dev.dimension.flare.data.datastore.AppDataStore
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountProvider
@@ -27,7 +28,7 @@ import dev.dimension.flare.ui.model.EmojiData
 import dev.dimension.flare.ui.model.UiAccount
 import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.flatMap
 import dev.dimension.flare.ui.model.isSuccess
 import dev.dimension.flare.ui.model.map
@@ -84,7 +85,7 @@ public class ComposePresenter(
                     .flatMap { current ->
                         statusState
                             ?.mapNotNull {
-                                it.content as? UiTimeline.ItemContent.Status
+                                it as? UiTimelineV2.Post
                             }?.map {
                                 current to listOf(it.platformType)
                             } ?: UiState.Success(current to PlatformType.entries.toList())
@@ -100,7 +101,7 @@ public class ComposePresenter(
                                     repository = accountRepository,
                                 ).flatMap { service ->
                                     remember(account.accountKey) {
-                                        service.userById(account.accountKey.id)
+                                        (service as UserDataSource).userHandler.userById(account.accountKey.id)
                                     }.collectAsState()
                                         .toUi()
                                 } to account
@@ -120,10 +121,8 @@ public class ComposePresenter(
             }
         val replyState =
             statusState?.map {
-                if (it.content is UiTimeline.ItemContent.Status && it.content.platformType == PlatformType.VVo) {
-                    it.copy(
-                        content = it.content.quote.firstOrNull() ?: it.content,
-                    )
+                if (it is UiTimelineV2.Post && it.platformType == PlatformType.VVo) {
+                    it.quote.firstOrNull() ?: it
                 } else {
                     it
                 }
@@ -146,8 +145,8 @@ public class ComposePresenter(
                 userState.flatMap { user ->
                     remember(statusState) {
                         statusState.mapNotNull { timeline ->
-                            val content = timeline.content
-                            if (content is UiTimeline.ItemContent.Status) {
+                            val content = timeline
+                            if (content is UiTimelineV2.Post) {
                                 when (content.platformType) {
                                     PlatformType.VVo -> {
                                         if (content.quote.any() && status is ComposeStatus.Quote) {
@@ -330,7 +329,7 @@ public class ComposePresenter(
             mutableStateOf(false)
         }
         var visibility by remember {
-            mutableStateOf(UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Public)
+            mutableStateOf(UiTimelineV2.Post.Visibility.Public)
         }
         LaunchedEffect(appDataStore.composeConfigData.data) {
             appDataStore.composeConfigData.data.collect {
@@ -342,10 +341,10 @@ public class ComposePresenter(
 
             override val allVisibilities =
                 persistentListOf(
-                    UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Public,
-                    UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Home,
-                    UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Followers,
-                    UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Specified,
+                    UiTimelineV2.Post.Visibility.Public,
+                    UiTimelineV2.Post.Visibility.Home,
+                    UiTimelineV2.Post.Visibility.Followers,
+                    UiTimelineV2.Post.Visibility.Specified,
                 )
 
             override val showVisibilityMenu: Boolean
@@ -359,12 +358,12 @@ public class ComposePresenter(
                 showVisibilityMenu = false
             }
 
-            override fun setVisibility(value: UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type) {
+            override fun setVisibility(value: UiTimelineV2.Post.Visibility) {
                 visibility = value
             }
 
             override fun clear() {
-                visibility = UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Public
+                visibility = UiTimelineV2.Post.Visibility.Public
                 showVisibilityMenu = false
             }
         }
@@ -373,15 +372,15 @@ public class ComposePresenter(
 
 @Immutable
 public interface VisibilityState {
-    public val visibility: UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type
-    public val allVisibilities: ImmutableList<UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type>
+    public val visibility: UiTimelineV2.Post.Visibility
+    public val allVisibilities: ImmutableList<UiTimelineV2.Post.Visibility>
     public val showVisibilityMenu: Boolean
 
     public fun showVisibilityMenu()
 
     public fun hideVisibilityMenu()
 
-    public fun setVisibility(value: UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type)
+    public fun setVisibility(value: UiTimelineV2.Post.Visibility)
 
     public fun clear()
 }
@@ -408,7 +407,7 @@ public sealed class ComposeStatus {
 public abstract class ComposeState(
     public val canSend: Boolean,
     public val visibilityState: UiState<VisibilityState>,
-    public val replyState: UiState<UiTimeline>?,
+    public val replyState: UiState<UiTimelineV2>?,
     public val initialTextState: UiState<InitialText>?,
     public val emojiState: UiState<EmojiData>,
     public val composeConfig: UiState<ComposeConfig>,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/ActiveAccountPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/ActiveAccountPresenter.kt
index 7f120219a..8c4b90220 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/ActiveAccountPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/ActiveAccountPresenter.kt
@@ -1,11 +1,59 @@
 package dev.dimension.flare.ui.presenter.home
 
+import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.getValue
+import dev.dimension.flare.data.datasource.microblog.datasource.UserDataSource
+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.model.UiProfile
 import dev.dimension.flare.ui.model.UiState
+import dev.dimension.flare.ui.model.flattenUiState
+import dev.dimension.flare.ui.model.toUi
+import dev.dimension.flare.ui.presenter.PresenterBase
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 
-public class ActiveAccountPresenter : UserPresenter(accountType = AccountType.Active, userKey = null)
+public class ActiveAccountPresenter :
+    PresenterBase<UserState>(),
+    KoinComponent {
+    private val accountRepository: AccountRepository by inject()
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    private val userFlow by lazy {
+        accountRepository.activeAccount.flatMapLatest { accountState ->
+            when (accountState) {
+                is UiState.Loading -> flowOf(UiState.Loading())
+                is UiState.Error -> flowOf(UiState.Error(accountState.throwable))
+                is UiState.Success -> {
+                    val accountKey = accountState.data.accountKey
+                    accountServiceFlow(
+                        accountType = AccountType.Specific(accountKey),
+                        repository = accountRepository,
+                    ).flatMapLatest { service ->
+                        if (service is UserDataSource) {
+                            service.userHandler.userById(accountKey.id).toUi()
+                        } else {
+                            flowOf(UiState.Error(IllegalStateException("Current account does not support user data")))
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @Composable
+    override fun body(): UserState {
+        val user by userFlow.flattenUiState()
+        return object : UserState {
+            override val user: UiState<UiProfile> = user
+        }
+    }
+}
 
 @Immutable
 public interface UserState {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/AllNotificationBadgePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/AllNotificationBadgePresenter.kt
index a3f1a89ec..c4c85e9a0 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/AllNotificationBadgePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/AllNotificationBadgePresenter.kt
@@ -5,6 +5,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import dev.dimension.flare.common.collectAsState
+import dev.dimension.flare.data.datasource.microblog.datasource.NotificationDataSource
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.ui.presenter.PresenterBase
 import kotlinx.coroutines.delay
@@ -29,7 +30,7 @@ public class AllNotificationBadgePresenter :
         accountRepository.allAccounts
             .map {
                 it.map {
-                    it.dataSource.notificationBadgeCount()
+                    (it.dataSource as NotificationDataSource).notificationHandler.notificationBadgeCount
                 }
             }
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/AllNotificationPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/AllNotificationPresenter.kt
index d9db6dc2e..849b40534 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/AllNotificationPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/AllNotificationPresenter.kt
@@ -7,9 +7,9 @@ import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
+import androidx.paging.Pager
 import androidx.paging.compose.collectAsLazyPagingItems
 import dev.dimension.flare.common.CacheState
 import dev.dimension.flare.common.PagingState
@@ -18,12 +18,16 @@ import dev.dimension.flare.common.refreshSuspend
 import dev.dimension.flare.common.toPagingState
 import dev.dimension.flare.data.datasource.microblog.AuthenticatedMicroblogDataSource
 import dev.dimension.flare.data.datasource.microblog.NotificationFilter
+import dev.dimension.flare.data.datasource.microblog.datasource.NotificationDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.UserDataSource
+import dev.dimension.flare.data.datasource.microblog.paging.toPagingSource
+import dev.dimension.flare.data.datasource.microblog.pagingConfig
 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.model.UiProfile
 import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.collectAsUiState
 import dev.dimension.flare.ui.model.onSuccess
 import dev.dimension.flare.ui.presenter.PresenterBase
@@ -50,7 +54,7 @@ public class AllNotificationPresenter :
     public interface State {
         public val notifications: ImmutableMap<UiProfile, Int>
         public val supportedNotificationFilters: UiState<ImmutableList<NotificationFilter>>
-        public val timeline: PagingState<UiTimeline>
+        public val timeline: PagingState<UiTimelineV2>
         public val selectedFilter: NotificationFilter?
         public val selectedAccount: UiProfile?
         public val selectedAccountIndex: Int
@@ -66,7 +70,10 @@ public class AllNotificationPresenter :
         accountRepository.allAccounts
             .map {
                 it.map {
-                    combine(it.dataSource.userById(it.accountKey.id).data, it.dataSource.notificationBadgeCount().data) { user, badge ->
+                    combine(
+                        (it.dataSource as UserDataSource).userHandler.userById(it.accountKey.id).data,
+                        (it.dataSource as NotificationDataSource).notificationHandler.notificationBadgeCount.data,
+                    ) { user, badge ->
                         if (user is CacheState.Success) {
                             user.data to
                                 if (badge is CacheState.Success) {
@@ -93,7 +100,6 @@ public class AllNotificationPresenter :
     @OptIn(ExperimentalCoroutinesApi::class)
     @Composable
     override fun body(): State {
-        val scope = rememberCoroutineScope()
         val notifications by accountsNotificationFlow.collectAsState(persistentMapOf())
         var selectedAccount by remember {
             mutableStateOf<UiProfile?>(null)
@@ -136,15 +142,18 @@ public class AllNotificationPresenter :
                 combine(
                     snapshotFlow { selectedNotificationFilter }.filterNotNull(),
                     snapshotFlow { selectedAccount }.filterNotNull(),
-                ) { filter, profile ->
-                    accountServiceFlow(AccountType.Specific(profile.key), accountRepository)
-                        .flatMapLatest {
-                            require(it is AuthenticatedMicroblogDataSource)
-                            runCatching {
-                                it.notification(filter, scope = scope)
-                            }.getOrDefault(emptyFlow())
-                        }
-                }.flatMapLatest { it }
+                ) { filter, profile -> filter to profile }
+                    .flatMapLatest { (filter, profile) ->
+                        accountServiceFlow(AccountType.Specific(profile.key), accountRepository)
+                            .flatMapLatest {
+                                require(it is AuthenticatedMicroblogDataSource)
+                                runCatching {
+                                    Pager(config = pagingConfig) {
+                                        it.notification(filter).toPagingSource()
+                                    }.flow
+                                }.getOrDefault(emptyFlow())
+                            }
+                    }
             }.collectAsLazyPagingItems().toPagingState()
 
         return object : State {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/DeepLinkPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/DeepLinkPresenter.kt
index 4a69618a7..1f0d61c4b 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/DeepLinkPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/DeepLinkPresenter.kt
@@ -8,6 +8,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import dev.dimension.flare.common.deeplink.DeepLinkMapping
 import dev.dimension.flare.data.datasource.microblog.AuthenticatedMicroblogDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.PostDataSource
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceFlow
 import dev.dimension.flare.model.AccountType
@@ -63,7 +64,7 @@ public class DeepLinkPresenter(
                             repository = accountRepository,
                         ).collect { service ->
                             if (service is AuthenticatedMicroblogDataSource) {
-                                service.postEventHandler.handleEvent(event.postEvent)
+                                (service as PostDataSource).postEventHandler.handleEvent(event.postEvent)
                             }
                         }
                     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/DiscoverPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/DiscoverPresenter.kt
index 78512910e..e72cf9ace 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/DiscoverPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/DiscoverPresenter.kt
@@ -7,6 +7,7 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.paging.Pager
 import androidx.paging.PagingData
 import androidx.paging.compose.collectAsLazyPagingItems
 import dev.dimension.flare.common.PagingState
@@ -15,13 +16,16 @@ import dev.dimension.flare.common.combineLatestFlowLists
 import dev.dimension.flare.common.emptyFlow
 import dev.dimension.flare.common.refreshSuspend
 import dev.dimension.flare.common.toPagingState
+import dev.dimension.flare.data.datasource.microblog.datasource.UserDataSource
+import dev.dimension.flare.data.datasource.microblog.paging.toPagingSource
+import dev.dimension.flare.data.datasource.microblog.pagingConfig
 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.model.UiHashtag
 import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.collectAsUiState
 import dev.dimension.flare.ui.model.onSuccess
 import dev.dimension.flare.ui.model.takeSuccess
@@ -48,7 +52,7 @@ public class DiscoverPresenter :
         accountRepository.allAccounts
             .map {
                 it.map {
-                    it.dataSource.userById(it.accountKey.id).toUi()
+                    (it.dataSource as UserDataSource).userHandler.userById(it.accountKey.id).toUi()
                 }
             }.combineLatestFlowLists()
             .map {
@@ -76,7 +80,9 @@ public class DiscoverPresenter :
             accountServiceFlow(accountType = accountType, repository = accountRepository)
                 .flatMapLatest { dataSource ->
                     runCatching {
-                        dataSource.discoverUsers()
+                        Pager(config = pagingConfig) {
+                            dataSource.discoverUsers().toPagingSource()
+                        }.flow
                     }.getOrElse { PagingData.emptyFlow(isError = true) }
                 }
         }
@@ -87,7 +93,9 @@ public class DiscoverPresenter :
             accountServiceFlow(accountType = accountType, repository = accountRepository)
                 .flatMapLatest { dataSource ->
                     runCatching {
-                        dataSource.discoverHashtags()
+                        Pager(config = pagingConfig) {
+                            dataSource.discoverHashtags().toPagingSource()
+                        }.flow
                     }.getOrElse { PagingData.emptyFlow(isError = true) }
                 }
         }
@@ -143,7 +151,7 @@ public class DiscoverPresenter :
 @Immutable
 public interface DiscoverState {
     public val users: PagingState<UiProfile>
-    public val status: PagingState<UiTimeline>
+    public val status: PagingState<UiTimelineV2>
     public val hashtags: PagingState<UiHashtag>
     public val accounts: UiState<ImmutableList<UiProfile>>
     public val selectedAccount: UiProfile?
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/FavIconPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/FavIconPresenter.kt
index 5ba57fb84..72bec884b 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/FavIconPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/FavIconPresenter.kt
@@ -1,55 +1,26 @@
 package dev.dimension.flare.ui.presenter.home
 
 import androidx.compose.runtime.Composable
-import dev.dimension.flare.common.Cacheable
+import dev.dimension.flare.common.MemCacheable
 import dev.dimension.flare.common.collectAsState
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.model.DbEmoji
-import dev.dimension.flare.data.database.cache.model.EmojiContent
 import dev.dimension.flare.data.network.rss.RssService
 import dev.dimension.flare.ui.model.UiState
 import dev.dimension.flare.ui.model.toUi
 import dev.dimension.flare.ui.presenter.PresenterBase
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.mapNotNull
 import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
 
 public class FavIconPresenter(
     private val host: String,
 ) : PresenterBase<UiState<String>>(),
     KoinComponent {
-    private val dbKey by lazy {
+    private val cacheKey by lazy {
         "$host-favIcon"
     }
 
-    private val database: CacheDatabase by inject()
     private val flow by lazy {
-        Cacheable(
-            fetchSource = {
-                val favIcon = RssService.fetchIcon("https://$host")
-                if (favIcon == null) {
-                    throw IllegalStateException("Favicon not found")
-                } else {
-                    database.emojiDao().insert(
-                        DbEmoji(
-                            host = dbKey,
-                            content = EmojiContent.FavIcon(favIcon),
-                        ),
-                    )
-                }
-            },
-            cacheSource = {
-                database
-                    .emojiDao()
-                    .get(dbKey)
-                    .mapNotNull {
-                        it?.content as? EmojiContent.FavIcon
-                    }.map {
-                        it.data
-                    }
-            },
-        )
+        MemCacheable(cacheKey) {
+            RssService.fetchIcon("https://$host") ?: throw IllegalStateException("Favicon not found")
+        }
     }
 
     @Composable
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/NotificationBadgePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/NotificationBadgePresenter.kt
index f71a367dd..0e2876108 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/NotificationBadgePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/NotificationBadgePresenter.kt
@@ -6,6 +6,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import dev.dimension.flare.common.collectAsState
 import dev.dimension.flare.data.datasource.microblog.AuthenticatedMicroblogDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.NotificationDataSource
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceProvider
 import dev.dimension.flare.model.AccountType
@@ -37,7 +38,7 @@ public class NotificationBadgePresenter(
         val countState =
             serviceState.map { service ->
                 remember(service) {
-                    service.notificationBadgeCount()
+                    (service as NotificationDataSource).notificationHandler.notificationBadgeCount
                 }.collectAsState()
             }
         if (autoRefresh) {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/SearchPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/SearchPresenter.kt
index 1597df6b6..e3040ba4c 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/SearchPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/SearchPresenter.kt
@@ -7,18 +7,22 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.paging.Pager
 import androidx.paging.PagingData
 import dev.dimension.flare.common.PagingState
 import dev.dimension.flare.common.cachePagingState
 import dev.dimension.flare.common.combineLatestFlowLists
 import dev.dimension.flare.common.emptyFlow
 import dev.dimension.flare.common.refreshSuspend
+import dev.dimension.flare.data.datasource.microblog.datasource.UserDataSource
+import dev.dimension.flare.data.datasource.microblog.paging.toPagingSource
+import dev.dimension.flare.data.datasource.microblog.pagingConfig
 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.model.UiProfile
 import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.collectAsUiState
 import dev.dimension.flare.ui.model.onSuccess
 import dev.dimension.flare.ui.model.takeSuccess
@@ -47,7 +51,7 @@ public class SearchPresenter(
         accountRepository.allAccounts
             .map {
                 it.map {
-                    it.dataSource.userById(it.accountKey.id).toUi()
+                    (it.dataSource as UserDataSource).userHandler.userById(it.accountKey.id).toUi()
                 }
             }.combineLatestFlowLists()
             .map {
@@ -82,7 +86,9 @@ public class SearchPresenter(
                         if (query.isEmpty()) {
                             PagingData.emptyFlow(isError = true)
                         } else {
-                            dataSource.searchUser(query)
+                            Pager(config = pagingConfig) {
+                                dataSource.searchUser(query).toPagingSource()
+                            }.flow
                         }
                     }.getOrElse { PagingData.emptyFlow(isError = true) }
                 }
@@ -151,7 +157,7 @@ public class SearchPresenter(
 @Immutable
 public interface SearchState {
     public val users: PagingState<UiProfile>
-    public val status: PagingState<UiTimeline>
+    public val status: PagingState<UiTimelineV2>
     public val searching: Boolean
     public val accounts: UiState<ImmutableList<UiProfile>>
     public val selectedAccount: UiProfile?
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/SearchStatusTimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/SearchStatusTimelinePresenter.kt
index 7c3877be1..0c1b6013c 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/SearchStatusTimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/SearchStatusTimelinePresenter.kt
@@ -1,6 +1,7 @@
 package dev.dimension.flare.ui.presenter.home
 
-import dev.dimension.flare.data.datasource.microblog.paging.BaseTimelineLoader
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceFlow
@@ -37,7 +38,12 @@ public class SearchStatusTimelinePresenter(
         ).flatMapLatest { service ->
             queryFlow.map { query ->
                 if (query.isEmpty()) {
-                    BaseTimelineLoader.NotSupported
+                    object : RemoteLoader<UiTimelineV2> {
+                        override suspend fun load(
+                            pageSize: Int,
+                            request: PagingRequest,
+                        ): PagingResult<UiTimelineV2> = PagingResult(data = emptyList())
+                    }
                 } else {
                     service.searchStatus(query)
                 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt
index 90ac6e162..7009591d1 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt
@@ -91,78 +91,82 @@ public abstract class TimelinePresenter :
             },
         ).flow.map { pagingData ->
             pagingData.map { item ->
-                mapping(item, loader.pagingKey)
+                mapping(item, loader.pagingKey, useDbKeyInItemKey)
             }
         }
 
-    private fun mapping(
-        item: DbPagingTimelineWithStatus,
-        pagingKey: String,
-    ): UiTimelineV2 {
-        val root = mappingDbStatusWithUser(item.status.status, pagingKey)
-        val references =
-            item.status.references
-                .mapNotNull { it.status }
-                .map { mappingDbStatusWithUser(it, pagingKey) }
-        return when (root) {
-            is UiTimelineV2.Feed -> root
-            is UiTimelineV2.Message -> root
-            is UiTimelineV2.Post ->
-                root.copy(
-                    parents =
-                        root.parents
-                            .map { parent ->
-                                references.find { it.statusKey == parent.statusKey } as? UiTimelineV2.Post ?: parent
-                            }.toImmutableList(),
-                    quote =
-                        root.quote
-                            .map { quote ->
-                                references.find { it.statusKey == quote.statusKey } as? UiTimelineV2.Post ?: quote
-                            }.toImmutableList(),
-                )
-            is UiTimelineV2.User -> root
-            is UiTimelineV2.UserList ->
-                root.copy(
-                    post =
-                        root.post?.let { post ->
-                            references.find { it.statusKey == post.statusKey } as? UiTimelineV2.Post ?: post
-                        },
-                )
+    internal companion object {
+        fun mapping(
+            item: DbPagingTimelineWithStatus,
+            pagingKey: String,
+            useDbKeyInItemKey: Boolean,
+        ): UiTimelineV2 {
+            val root = mappingDbStatusWithUser(item.status.status, pagingKey, useDbKeyInItemKey)
+            val references =
+                item.status.references
+                    .mapNotNull { it.status }
+                    .map { mappingDbStatusWithUser(it, pagingKey, useDbKeyInItemKey) }
+            return when (root) {
+                is UiTimelineV2.Feed -> root
+                is UiTimelineV2.Message -> root
+                is UiTimelineV2.Post ->
+                    root.copy(
+                        parents =
+                            root.parents
+                                .map { parent ->
+                                    references.find { it.statusKey == parent.statusKey } as? UiTimelineV2.Post ?: parent
+                                }.toImmutableList(),
+                        quote =
+                            root.quote
+                                .map { quote ->
+                                    references.find { it.statusKey == quote.statusKey } as? UiTimelineV2.Post ?: quote
+                                }.toImmutableList(),
+                    )
+                is UiTimelineV2.User -> root
+                is UiTimelineV2.UserList ->
+                    root.copy(
+                        post =
+                            root.post?.let { post ->
+                                references.find { it.statusKey == post.statusKey } as? UiTimelineV2.Post ?: post
+                            },
+                    )
+            }
         }
-    }
 
-    private fun mappingDbStatusWithUser(
-        data: DbStatusWithUser,
-        pagingKey: String,
-    ): UiTimelineV2 {
-        val root = data.data.content
-        val users = data.references.mapNotNull { it.user?.content }
-        return when (root) {
-            is UiTimelineV2.Feed -> root
-            is UiTimelineV2.Message ->
-                root.copy(
-                    user = users.find { root.user?.key == it.key },
-                    extraKey = if (useDbKeyInItemKey) pagingKey else null,
-                )
-            is UiTimelineV2.Post ->
-                root.copy(
-                    user = users.find { root.user?.key == it.key },
-                    extraKey = if (useDbKeyInItemKey) pagingKey else null,
-                )
-            is UiTimelineV2.User ->
-                root.copy(
-                    value = users.find { root.value.key == it.key } ?: root.value,
-                    extraKey = if (useDbKeyInItemKey) pagingKey else null,
-                )
-            is UiTimelineV2.UserList ->
-                root.copy(
-                    users =
-                        root.users
-                            .map { user ->
-                                users.find { user.key == it.key } ?: user
-                            }.toImmutableList(),
-                    extraKey = if (useDbKeyInItemKey) pagingKey else null,
-                )
+        private fun mappingDbStatusWithUser(
+            data: DbStatusWithUser,
+            pagingKey: String,
+            useDbKeyInItemKey: Boolean,
+        ): UiTimelineV2 {
+            val root = data.data.content
+            val users = data.references.mapNotNull { it.user?.content }
+            return when (root) {
+                is UiTimelineV2.Feed -> root
+                is UiTimelineV2.Message ->
+                    root.copy(
+                        user = users.find { root.user?.key == it.key },
+                        extraKey = if (useDbKeyInItemKey) pagingKey else null,
+                    )
+                is UiTimelineV2.Post ->
+                    root.copy(
+                        user = users.find { root.user?.key == it.key },
+                        extraKey = if (useDbKeyInItemKey) pagingKey else null,
+                    )
+                is UiTimelineV2.User ->
+                    root.copy(
+                        value = users.find { root.value.key == it.key } ?: root.value,
+                        extraKey = if (useDbKeyInItemKey) pagingKey else null,
+                    )
+                is UiTimelineV2.UserList ->
+                    root.copy(
+                        users =
+                            root.users
+                                .map { user ->
+                                    users.find { user.key == it.key } ?: user
+                                }.toImmutableList(),
+                        extraKey = if (useDbKeyInItemKey) pagingKey else null,
+                    )
+            }
         }
     }
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/bluesky/BlueskyFeedPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/bluesky/BlueskyFeedPresenter.kt
index 777705b7b..c8d6edcfc 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/bluesky/BlueskyFeedPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/bluesky/BlueskyFeedPresenter.kt
@@ -15,7 +15,6 @@ import dev.dimension.flare.data.repository.accountServiceProvider
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.ui.model.UiList
 import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.UiTimeline
 import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.collectAsUiState
 import dev.dimension.flare.ui.model.flatMap
@@ -134,7 +133,7 @@ public class BlueskyFeedPresenter(
 @Immutable
 public interface BlueskyFeedState {
     public val info: UiState<UiList.Feed>
-    public val timeline: PagingState<UiTimeline>
+    public val timeline: PagingState<UiTimelineV2>
     public val subscribed: UiState<Boolean>
 
     public suspend fun refreshSuspend()
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MisskeyChannelPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MisskeyChannelPresenter.kt
index 7552c3abe..355aca108 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MisskeyChannelPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/misskey/MisskeyChannelPresenter.kt
@@ -15,7 +15,6 @@ import dev.dimension.flare.data.repository.accountServiceProvider
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.ui.model.UiList
 import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.UiTimeline
 import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.collectAsUiState
 import dev.dimension.flare.ui.model.flatMap
@@ -131,7 +130,7 @@ public class MisskeyChannelPresenter(
 @Immutable
 public interface MisskeyChannelState {
     public val info: UiState<UiList.Channel>
-    public val timeline: PagingState<UiTimeline>
+    public val timeline: PagingState<UiTimelineV2>
     public val followed: UiState<Boolean>
 
     public suspend fun refreshSuspend()
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/EditListMemberPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/EditListMemberPresenter.kt
index ae581fbfb..098adae8e 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/EditListMemberPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/EditListMemberPresenter.kt
@@ -2,8 +2,13 @@ package dev.dimension.flare.ui.presenter.list
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.paging.Pager
 import androidx.paging.PagingData
 import androidx.paging.cachedIn
 import androidx.paging.compose.collectAsLazyPagingItems
@@ -12,6 +17,8 @@ import dev.dimension.flare.common.PagingState
 import dev.dimension.flare.common.emptyFlow
 import dev.dimension.flare.common.toPagingState
 import dev.dimension.flare.data.datasource.microblog.datasource.ListDataSource
+import dev.dimension.flare.data.datasource.microblog.paging.toPagingSource
+import dev.dimension.flare.data.datasource.microblog.pagingConfig
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceFlow
 import dev.dimension.flare.data.repository.accountServiceProvider
@@ -21,106 +28,99 @@ import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.onSuccess
 import dev.dimension.flare.ui.presenter.PresenterBase
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
-/**
- * Presenter for editing list members.
- * This presenter should be used for managing list members.
- */
-@OptIn(ExperimentalCoroutinesApi::class)
+@Immutable
+public interface EditListMemberState {
+    public val users: PagingState<Pair<UiProfile, Boolean>>
+
+    public fun setFilter(value: String)
+
+    public fun addMember(userKey: MicroBlogKey)
+
+    public fun removeMember(userKey: MicroBlogKey)
+}
+
 public class EditListMemberPresenter(
     private val accountType: AccountType,
     private val listId: String,
 ) : PresenterBase<EditListMemberState>(),
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
-    private val filterFlow by lazy {
-        MutableStateFlow("")
-    }
-    private val listMemberFlow by lazy {
-        accountServiceFlow(accountType, accountRepository).flatMapLatest { service ->
-            require(service is ListDataSource)
-            service.listMemberHandler.listMembersListFlow(listId)
-        }
-    }
-    private val userFlow by lazy {
-        accountServiceFlow(accountType, accountRepository)
-            .flatMapLatest { service ->
-                listMemberFlow.flatMapLatest { members ->
-                    filterFlow.flatMapLatest { filter ->
-                        if (filter.isEmpty()) {
-                            PagingData.emptyFlow()
-                        } else {
-                            require(service is ListDataSource)
-                            service.searchUser(filter).map { users ->
-                                users.map { user ->
-                                    val isMember = members.any { it.key == user.key }
-                                    Pair(user, isMember)
-                                }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    @Composable
+    override fun body(): EditListMemberState {
+        val scope = rememberCoroutineScope()
+        var filter by remember { mutableStateOf("") }
+        val serviceState = accountServiceProvider(accountType = accountType, repository = accountRepository)
+
+        val membersFlow: Flow<List<UiProfile>> =
+            remember(accountType, listId) {
+                accountServiceFlow(accountType, accountRepository).flatMapLatest { service ->
+                    if (service is ListDataSource) {
+                        service.listMemberHandler.listMembersListFlow(listId)
+                    } else {
+                        flowOf(emptyList<UiProfile>())
+                    }
+                }
+            }
+        val members by membersFlow.collectAsState(initial = emptyList())
+
+        val usersFlow: Flow<PagingData<Pair<UiProfile, Boolean>>> =
+            remember(accountType, listId, filter, members) {
+                accountServiceFlow(accountType, accountRepository).flatMapLatest { service ->
+                    if (service !is ListDataSource || filter.isEmpty()) {
+                        PagingData.emptyFlow<Pair<UiProfile, Boolean>>()
+                    } else {
+                        Pager(config = pagingConfig) {
+                            service.searchUser(filter).toPagingSource()
+                        }.flow.map { pagingData ->
+                            pagingData.map { user ->
+                                user to members.any { member -> member.key == user.key }
                             }
                         }
                     }
                 }
             }
-    }
+        val usersState =
+            usersFlow
+                .cachedIn(scope)
+                .collectAsLazyPagingItems()
+                .toPagingState()
 
-    @Composable
-    override fun body(): EditListMemberState {
-        val scope = rememberCoroutineScope()
-        val serviceState =
-            accountServiceProvider(accountType = accountType, repository = accountRepository)
-        val userState =
-            remember {
-                userFlow.cachedIn(scope)
-            }.collectAsLazyPagingItems().toPagingState()
         return object : EditListMemberState {
-            override val users = userState
+            override val users: PagingState<Pair<UiProfile, Boolean>> = usersState
 
             override fun setFilter(value: String) {
-                filterFlow.value = value
+                filter = value
             }
 
             override fun addMember(userKey: MicroBlogKey) {
-                serviceState.onSuccess {
+                serviceState.onSuccess { service ->
                     scope.launch {
-                        require(it is ListDataSource)
-                        it.listMemberHandler.addMember(listId, userKey)
+                        if (service is ListDataSource) {
+                            service.listMemberHandler.addMember(listId, userKey)
+                        }
                     }
                 }
             }
 
             override fun removeMember(userKey: MicroBlogKey) {
-                serviceState.onSuccess {
+                serviceState.onSuccess { service ->
                     scope.launch {
-                        require(it is ListDataSource)
-                        it.listMemberHandler.removeMember(listId, userKey)
+                        if (service is ListDataSource) {
+                            service.listMemberHandler.removeMember(listId, userKey)
+                        }
                     }
                 }
             }
         }
     }
 }
-
-@Immutable
-public interface EditListMemberState {
-    /**
-     * Users that can be added to the list.
-     * This is a combination of search results and the current list members.
-     * pair.first is the user, pair.second is true if the user is already a member of the list.
-     */
-    public val users: PagingState<Pair<UiProfile, Boolean>>
-
-    /**
-     * Set the filter for searching users.
-     */
-    public fun setFilter(value: String)
-
-    public fun addMember(userKey: MicroBlogKey)
-
-    public fun removeMember(userKey: MicroBlogKey)
-}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ListMembersPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ListMembersPresenter.kt
index 18895a33f..2fbdaf8d2 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ListMembersPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/list/ListMembersPresenter.kt
@@ -4,23 +4,29 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.paging.PagingData
 import androidx.paging.cachedIn
 import androidx.paging.compose.collectAsLazyPagingItems
 import dev.dimension.flare.common.PagingState
+import dev.dimension.flare.common.emptyFlow
 import dev.dimension.flare.common.toPagingState
 import dev.dimension.flare.data.datasource.microblog.datasource.ListDataSource
 import dev.dimension.flare.data.repository.AccountRepository
-import dev.dimension.flare.data.repository.accountServiceProvider
+import dev.dimension.flare.data.repository.accountServiceFlow
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.ui.model.UiProfile
-import dev.dimension.flare.ui.model.map
 import dev.dimension.flare.ui.presenter.PresenterBase
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flatMapLatest
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
-/**
- * Presenter for listing members of a list.
- */
+@Immutable
+public interface ListMembersState {
+    public val memberInfo: PagingState<UiProfile>
+}
+
 public class ListMembersPresenter(
     private val accountType: AccountType,
     private val listId: String,
@@ -28,26 +34,24 @@ public class ListMembersPresenter(
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
 
+    @OptIn(ExperimentalCoroutinesApi::class)
     @Composable
     override fun body(): ListMembersState {
         val scope = rememberCoroutineScope()
-        val serviceState = accountServiceProvider(accountType = accountType, repository = accountRepository)
-        val memberInfo =
-            serviceState
-                .map {
-                    remember(it, listId) {
-                        require(it is ListDataSource)
-                        it.listMemberHandler.listMembers(listId).cachedIn(scope)
-                    }.collectAsLazyPagingItems()
-                }.toPagingState()
+        val flow: Flow<PagingData<UiProfile>> =
+            remember(accountType, listId) {
+                accountServiceFlow(accountType, accountRepository).flatMapLatest { service ->
+                    if (service is ListDataSource) {
+                        service.listMemberHandler.listMembers(listId)
+                    } else {
+                        PagingData.emptyFlow<UiProfile>()
+                    }
+                }
+            }
+        val memberInfo = flow.cachedIn(scope).collectAsLazyPagingItems().toPagingState()
 
         return object : ListMembersState {
-            override val memberInfo = memberInfo
+            override val memberInfo: PagingState<UiProfile> = memberInfo
         }
     }
 }
-
-@Immutable
-public interface ListMembersState {
-    public val memberInfo: PagingState<UiProfile>
-}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/FollowingPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/FollowingPresenter.kt
index 814f2c407..cf45a9c33 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/FollowingPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/FollowingPresenter.kt
@@ -3,13 +3,15 @@ package dev.dimension.flare.ui.presenter.profile
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.paging.PagingData
+import androidx.paging.Pager
 import androidx.paging.compose.collectAsLazyPagingItems
 import dev.dimension.flare.common.PagingState
 import dev.dimension.flare.common.onSuccess
 import dev.dimension.flare.common.toPagingState
 import dev.dimension.flare.data.datasource.microblog.MicroblogDataSource
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
+import dev.dimension.flare.data.datasource.microblog.paging.toPagingSource
+import dev.dimension.flare.data.datasource.microblog.pagingConfig
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceProvider
 import dev.dimension.flare.model.AccountType
@@ -17,8 +19,6 @@ import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.map
 import dev.dimension.flare.ui.presenter.PresenterBase
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
@@ -38,12 +38,13 @@ public abstract class UserListPresenter(
     @Composable
     override fun body(): State {
         val service = accountServiceProvider(accountType, repository = accountRepository)
-        val scope = rememberCoroutineScope()
         val listState =
             service
                 .map {
                     remember(it) {
-                        dataSource(it, scope)
+                        Pager(config = pagingConfig) {
+                            dataSource(it).toPagingSource()
+                        }.flow
                     }.collectAsLazyPagingItems()
                 }.toPagingState()
         return object : State {
@@ -57,28 +58,19 @@ public abstract class UserListPresenter(
         }
     }
 
-    internal abstract fun dataSource(
-        service: MicroblogDataSource,
-        scope: CoroutineScope,
-    ): Flow<PagingData<UiProfile>>
+    internal abstract fun dataSource(service: MicroblogDataSource): RemoteLoader<UiProfile>
 }
 
 public class FollowingPresenter(
     accountType: AccountType,
     private val userKey: MicroBlogKey,
 ) : UserListPresenter(accountType) {
-    override fun dataSource(
-        service: MicroblogDataSource,
-        scope: CoroutineScope,
-    ) = service.following(userKey, scope)
+    override fun dataSource(service: MicroblogDataSource) = service.following(userKey)
 }
 
 public class FansPresenter(
     accountType: AccountType,
     private val userKey: MicroBlogKey,
 ) : UserListPresenter(accountType) {
-    override fun dataSource(
-        service: MicroblogDataSource,
-        scope: CoroutineScope,
-    ) = service.fans(userKey, scope)
+    override fun dataSource(service: MicroblogDataSource) = service.fans(userKey)
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfileMediaPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfileMediaPresenter.kt
index 77facc1c1..ef80c63d5 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfileMediaPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfileMediaPresenter.kt
@@ -17,7 +17,6 @@ import dev.dimension.flare.data.repository.accountServiceFlow
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiMedia
-import dev.dimension.flare.ui.model.UiTimeline
 import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.PresenterBase
 import dev.dimension.flare.ui.presenter.home.TimelinePresenter
@@ -75,13 +74,12 @@ private class MediaTimelinePresenter(
     fun createTransformedPager(scope: CoroutineScope): Flow<PagingData<ProfileMedia>> =
         createPager(scope).map { data ->
             data.flatMap { status ->
-                val content = status.content
-                if (content is UiTimeline.ItemContent.Status) {
-                    content.images.map {
+                if (status is UiTimelineV2.Post) {
+                    status.images.map {
                         ProfileMedia(
                             it,
                             status,
-                            content.images.indexOf(it),
+                            status.images.indexOf(it),
                         )
                     }
                 } else {
@@ -99,6 +97,6 @@ public interface ProfileMediaState {
 @Immutable
 public data class ProfileMedia internal constructor(
     val media: UiMedia,
-    val status: UiTimeline,
+    val status: UiTimelineV2,
     val index: Int,
 )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt
index 5fe4facd1..a106d8ec4 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt
@@ -9,9 +9,10 @@ import dev.dimension.flare.common.collectAsState
 import dev.dimension.flare.data.datasource.microblog.ActionMenu
 import dev.dimension.flare.data.datasource.microblog.AuthenticatedMicroblogDataSource
 import dev.dimension.flare.data.datasource.microblog.DirectMessageDataSource
-import dev.dimension.flare.data.datasource.microblog.ProfileAction
 import dev.dimension.flare.data.datasource.microblog.ProfileTab
 import dev.dimension.flare.data.datasource.microblog.datasource.ListDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.RelationDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.UserDataSource
 import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.NoActiveAccountException
@@ -19,6 +20,8 @@ import dev.dimension.flare.data.repository.accountServiceFlow
 import dev.dimension.flare.data.repository.accountServiceProvider
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.ClickEvent
+import dev.dimension.flare.ui.model.UiIcon
 import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.UiRelation
 import dev.dimension.flare.ui.model.UiState
@@ -35,9 +38,7 @@ import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import dev.dimension.flare.ui.presenter.home.UserState
 import dev.dimension.flare.ui.presenter.status.LogUserHistoryPresenter
 import dev.dimension.flare.ui.route.DeeplinkRoute
-import dev.dimension.flare.ui.route.toUri
 import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
@@ -45,7 +46,6 @@ import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
@@ -70,7 +70,7 @@ public class ProfilePresenter(
                     } else {
                         throw NoActiveAccountException
                     }
-            service.userById(userId).toUi()
+            (service as UserDataSource).userHandler.userById(userId).toUi()
         }
     }
 
@@ -78,7 +78,7 @@ public class ProfilePresenter(
         serviceFlow.flatMapLatest { service ->
             require(service is AuthenticatedMicroblogDataSource)
             val actualUserKey = userKey ?: service.accountKey
-            service.relation(actualUserKey)
+            (service as RelationDataSource).relationHandler.relation(actualUserKey).toUi()
         }
     }
 
@@ -92,13 +92,6 @@ public class ProfilePresenter(
         }
     }
 
-    private val profileActionsFlow by lazy {
-        serviceFlow.map { service ->
-            require(service is AuthenticatedMicroblogDataSource)
-            service.profileActions().toImmutableList()
-        }
-    }
-
     private val canSendMessageFlow by lazy {
         serviceFlow.flatMapLatest { service ->
             if (service is DirectMessageDataSource && userKey != null) {
@@ -190,7 +183,6 @@ public class ProfilePresenter(
         val isListDataSource by isListDataSourceFlow.collectAsUiState()
         val relationState by relationStateFlow.flattenUiState()
         val isMe by isMeFlow.collectAsUiState()
-        val profileActions by profileActionsFlow.collectAsUiState()
         val canSendMessage by canSendMessageFlow.collectAsUiState()
         val myAccountKey by myAccountKeyFlow.collectAsUiState()
         val tabs by tabsFlow.collectAsUiState()
@@ -201,7 +193,6 @@ public class ProfilePresenter(
                 canSendMessage,
                 relationState,
                 service,
-                profileActions,
                 userState,
                 myAccountKey,
             ) {
@@ -213,17 +204,16 @@ public class ProfilePresenter(
                     listOfNotNull(
                         if (accountKey != null && userKey != null) {
                             ActionMenu.Item(
-                                icon = ActionMenu.Item.Icon.List,
+                                icon = UiIcon.List,
                                 text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.EditUserList),
-                                onClicked = {
-                                    launcher.launch(
+                                clickEvent =
+                                    ClickEvent.Deeplink(
                                         DeeplinkRoute
                                             .EditUserList(
                                                 accountKey = accountKey,
                                                 userKey = userKey,
-                                            ).toUri(),
-                                    )
-                                },
+                                            ),
+                                    ),
                             )
                         } else {
                             null
@@ -231,17 +221,16 @@ public class ProfilePresenter(
                         if (canSendMessage.takeSuccessOr(false) && accountKey != null && userKey != null) {
                             // navigate to send message
                             ActionMenu.Item(
-                                icon = ActionMenu.Item.Icon.ChatMessage,
+                                icon = UiIcon.ChatMessage,
                                 text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.SendMessage),
-                                onClicked = {
-                                    launcher.launch(
+                                clickEvent =
+                                    ClickEvent.Deeplink(
                                         DeeplinkRoute
                                             .DirectMessage(
                                                 accountKey = accountKey,
                                                 userKey = userKey,
-                                            ).toUri(),
-                                    )
-                                },
+                                            ),
+                                    ),
                             )
                         } else {
                             null
@@ -256,103 +245,52 @@ public class ProfilePresenter(
                                 },
                             ) +
                             relationState.takeSuccessOr(UiRelation()).let { relation ->
-                                profileActions
-                                    .takeSuccessOr(
-                                        persistentListOf(
-                                            object : ProfileAction.Mute {
-                                                override suspend fun invoke(
-                                                    userKey: MicroBlogKey,
-                                                    relation: UiRelation,
-                                                ) {
-                                                }
-
-                                                override fun relationState(relation: UiRelation): Boolean = false
-                                            },
-                                            object : ProfileAction.Block {
-                                                override suspend fun invoke(
-                                                    userKey: MicroBlogKey,
-                                                    relation: UiRelation,
-                                                ) {
-                                                }
-
-                                                override fun relationState(relation: UiRelation): Boolean = false
-                                            },
-                                        ),
-                                    ).map { action ->
-                                        when (action) {
-                                            is ProfileAction.Block -> {
-                                                ActionMenu.Item(
-                                                    icon =
-                                                        if (action.relationState(relation)) {
-                                                            ActionMenu.Item.Icon.UnBlock
-                                                        } else {
-                                                            ActionMenu.Item.Icon.Block
-                                                        },
-                                                    text =
-                                                        ActionMenu.Item.Text.Localized(
-                                                            if (action.relationState(relation)) {
-                                                                ActionMenu.Item.Text.Localized.Type.UnBlock
-                                                            } else {
-                                                                ActionMenu.Item.Text.Localized.Type.Block
-                                                            },
-                                                        ),
-                                                    onClicked = {
-                                                        if (userKey != null) {
-                                                            if (action.relationState(relation)) {
-                                                                scope.launch {
-                                                                    action.invoke(userKey, relation)
-                                                                }
-                                                            } else {
-                                                                launcher.launch(
-                                                                    DeeplinkRoute
-                                                                        .BlockUser(
-                                                                            accountKey = accountKey,
-                                                                            userKey = userKey,
-                                                                        ).toUri(),
-                                                                )
-                                                            }
-                                                        }
+                                listOfNotNull(
+                                    if (userKey != null) {
+                                        ActionMenu.Item(
+                                            icon = if (relation.blocking) UiIcon.UnBlock else UiIcon.Block,
+                                            text =
+                                                ActionMenu.Item.Text.Localized(
+                                                    if (relation.blocking) {
+                                                        ActionMenu.Item.Text.Localized.Type.UnBlock
+                                                    } else {
+                                                        ActionMenu.Item.Text.Localized.Type.Block
                                                     },
-                                                )
-                                            }
-
-                                            is ProfileAction.Mute -> {
-                                                ActionMenu.Item(
-                                                    icon =
-                                                        if (action.relationState(relation)) {
-                                                            ActionMenu.Item.Icon.UnMute
-                                                        } else {
-                                                            ActionMenu.Item.Icon.Mute
-                                                        },
-                                                    text =
-                                                        ActionMenu.Item.Text.Localized(
-                                                            if (action.relationState(relation)) {
-                                                                ActionMenu.Item.Text.Localized.Type.UnMute
-                                                            } else {
-                                                                ActionMenu.Item.Text.Localized.Type.Mute
-                                                            },
-                                                        ),
-                                                    onClicked = {
-                                                        if (userKey != null) {
-                                                            if (action.relationState(relation)) {
-                                                                scope.launch {
-                                                                    action.invoke(userKey, relation)
-                                                                }
-                                                            } else {
-                                                                launcher.launch(
-                                                                    DeeplinkRoute
-                                                                        .MuteUser(
-                                                                            accountKey = accountKey,
-                                                                            userKey = userKey,
-                                                                        ).toUri(),
-                                                                )
-                                                            }
-                                                        }
+                                                ),
+                                            clickEvent =
+                                                ClickEvent.Deeplink(
+                                                    DeeplinkRoute.BlockUser(
+                                                        accountKey = accountKey,
+                                                        userKey = userKey,
+                                                    ),
+                                                ),
+                                        )
+                                    } else {
+                                        null
+                                    },
+                                    if (userKey != null) {
+                                        ActionMenu.Item(
+                                            icon = if (relation.muted) UiIcon.UnMute else UiIcon.Mute,
+                                            text =
+                                                ActionMenu.Item.Text.Localized(
+                                                    if (relation.muted) {
+                                                        ActionMenu.Item.Text.Localized.Type.UnMute
+                                                    } else {
+                                                        ActionMenu.Item.Text.Localized.Type.Mute
                                                     },
-                                                )
-                                            }
-                                        }
-                                    }
+                                                ),
+                                            clickEvent =
+                                                ClickEvent.Deeplink(
+                                                    DeeplinkRoute.MuteUser(
+                                                        accountKey = accountKey,
+                                                        userKey = userKey,
+                                                    ),
+                                                ),
+                                        )
+                                    } else {
+                                        null
+                                    },
+                                )
                             } +
                             listOf(
                                 ActionMenu.Item(
@@ -360,18 +298,19 @@ public class ProfilePresenter(
                                         ActionMenu.Item.Text.Localized(
                                             ActionMenu.Item.Text.Localized.Type.Report,
                                         ),
-                                    icon = ActionMenu.Item.Icon.Report,
-                                    onClicked = {
+                                    icon = UiIcon.Report,
+                                    clickEvent =
                                         if (userKey != null) {
-                                            launcher.launch(
+                                            ClickEvent.Deeplink(
                                                 DeeplinkRoute
                                                     .ReportUser(
                                                         accountKey = accountKey,
                                                         userKey = userKey,
-                                                    ).toUri(),
+                                                    ),
                                             )
-                                        }
-                                    },
+                                        } else {
+                                            ClickEvent.Noop
+                                        },
                                     color = ActionMenu.Item.Color.Red,
                                 ),
                             )
@@ -384,7 +323,7 @@ public class ProfilePresenter(
                             ActionMenu.Group(
                                 displayItem =
                                     ActionMenu.Item(
-                                        icon = ActionMenu.Item.Icon.MoreVerticel,
+                                        icon = UiIcon.MoreVerticel,
                                     ),
                                 actions = it.toImmutableList(),
                             ),
@@ -404,25 +343,16 @@ public class ProfilePresenter(
             canSendMessage = canSendMessage,
             tabs = tabs,
         ) {
-            override fun onProfileActionClick(
-                userKey: MicroBlogKey,
-                relation: UiRelation,
-                action: ProfileAction,
-            ) {
-                scope.launch {
-                    action.invoke(userKey, relation)
-                }
-            }
-
             override fun follow(
                 userKey: MicroBlogKey,
                 data: UiRelation,
             ) {
-                scope.launch {
-                    service.onSuccess { service ->
-                        if (service is AuthenticatedMicroblogDataSource) {
-                            service.follow(userKey, data)
-                        }
+                service.onSuccess { service ->
+                    val relationHandler = (service as RelationDataSource).relationHandler
+                    if (data.following) {
+                        relationHandler.unfollow(userKey)
+                    } else {
+                        relationHandler.follow(userKey)
                     }
                 }
             }
@@ -450,12 +380,6 @@ public abstract class ProfileState(
         data: UiRelation,
     )
 
-    public abstract fun onProfileActionClick(
-        userKey: MicroBlogKey,
-        relation: UiRelation,
-        action: ProfileAction,
-    )
-
     public abstract fun report(userKey: MicroBlogKey)
 
     @Immutable
@@ -489,7 +413,7 @@ public class ProfileWithUserNameAndHostPresenter(
                 repository = accountRepository,
             ).flatMap { service ->
                 remember(service) {
-                    service.userByAcct("$userName@$host")
+                    (service as UserDataSource).userHandler.userByHandleAndHost(userName, host)
                 }.collectAsState().toUi()
             }
         return object : UserState {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/settings/AccountsPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/settings/AccountsPresenter.kt
index 911a36457..0c06d2a6c 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/settings/AccountsPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/settings/AccountsPresenter.kt
@@ -7,6 +7,7 @@ import androidx.compose.runtime.remember
 import dev.dimension.flare.common.ImmutableListWrapper
 import dev.dimension.flare.common.collectAsState
 import dev.dimension.flare.common.toImmutableListWrapper
+import dev.dimension.flare.data.datasource.microblog.datasource.UserDataSource
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceProvider
 import dev.dimension.flare.data.repository.allAccountsPresenter
@@ -43,7 +44,7 @@ public class AccountsPresenter :
                                 repository = accountRepository,
                             ).flatMap { service ->
                                 remember(account.accountKey) {
-                                    service.userById(account.accountKey.id)
+                                    (service as UserDataSource).userHandler.userById(account.accountKey.id)
                                 }.collectAsState().toUi()
                             }
                     }.toImmutableList()
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/settings/AppearancePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/settings/AppearancePresenter.kt
index d9194a7ae..95e28b27e 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/settings/AppearancePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/settings/AppearancePresenter.kt
@@ -4,7 +4,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.remember
 import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.createSampleStatus
 import dev.dimension.flare.ui.model.map
 import dev.dimension.flare.ui.presenter.PresenterBase
@@ -28,5 +28,5 @@ public class AppearancePresenter : PresenterBase<AppearanceState>() {
 
 @Immutable
 public interface AppearanceState {
-    public val sampleStatus: UiState<UiTimeline>
+    public val sampleStatus: UiState<UiTimelineV2.Post>
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/settings/LocalCacheSearchPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/settings/LocalCacheSearchPresenter.kt
index 01230d3c5..beb9690df 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/settings/LocalCacheSearchPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/settings/LocalCacheSearchPresenter.kt
@@ -12,17 +12,15 @@ import androidx.paging.map
 import dev.dimension.flare.common.PagingState
 import dev.dimension.flare.common.toPagingState
 import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.datasource.microblog.StatusEvent
 import dev.dimension.flare.data.datasource.microblog.pagingConfig
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.collectAsUiState
 import dev.dimension.flare.ui.model.flatMap
 import dev.dimension.flare.ui.model.map
-import dev.dimension.flare.ui.model.mapper.render
 import dev.dimension.flare.ui.presenter.PresenterBase
 import dev.dimension.flare.ui.presenter.status.LogStatusHistoryPresenter
 import kotlinx.coroutines.flow.map
@@ -37,8 +35,8 @@ public class LocalCacheSearchPresenter :
 
     @androidx.compose.runtime.Immutable
     public interface State {
-        public val data: PagingState<UiTimeline>
-        public val history: PagingState<UiTimeline>
+        public val data: PagingState<UiTimelineV2>
+        public val history: PagingState<UiTimelineV2>
         public val userHistory: PagingState<UiProfile>
         public val searchUser: PagingState<UiProfile>
 
@@ -74,15 +72,7 @@ public class LocalCacheSearchPresenter :
                             .getStatusHistoryPagingSource(pagingKey = LogStatusHistoryPresenter.PAGING_KEY)
                     }.flow.map {
                         it.map {
-                            val event =
-                                if (it.status.status.data.accountType is AccountType.Specific) {
-                                    accounts
-                                        .firstOrNull { account -> account.accountKey == it.status.status.data.accountType.accountKey }
-                                        ?.dataSource as? StatusEvent
-                                } else {
-                                    null
-                                }
-                            it.render(event)
+                            it.status.status.data.content
                         }
                     }
                 }
@@ -95,15 +85,7 @@ public class LocalCacheSearchPresenter :
                     paging.map { pagingData ->
                         pagingData.map {
                             it.map {
-                                val event =
-                                    if (it.status.data.accountType is AccountType.Specific) {
-                                        accounts
-                                            .firstOrNull { account -> account.accountKey == it.status.data.accountType.accountKey }
-                                            ?.dataSource as? StatusEvent
-                                    } else {
-                                        null
-                                    }
-                                it.render(event)
+                                it.status.data.content
                             }
                         }
                     }
@@ -123,31 +105,27 @@ public class LocalCacheSearchPresenter :
                         .filter {
                             it.data.accountType is AccountType.Specific
                         }.map {
-                            require(it.data.accountType is AccountType.Specific)
-                            it.user.render(it.data.accountType.accountKey)
+                            it.user.content
                         }
                 }
             }.collectAsLazyPagingItems().toPagingState()
 
         val searchUser =
-            remember(query, allAccounts) {
+            remember(query) {
                 if (query.isEmpty()) {
                     UiState.Error(Throwable("Query is empty"))
                 } else {
-                    allAccounts.map { accounts ->
+                    UiState.Success(
                         Pager(
                             config = pagingConfig,
                         ) {
                             database.userDao().searchUser(query)
                         }.flow.map {
                             it.map { user ->
-                                // TODO: potential bug: after logout, there might be no such a platform type for this user
-                                val account =
-                                    accounts.first { it.platformType == user.platformType }
-                                user.render(account.accountKey)
+                                user.content
                             }
-                        }
-                    }
+                        },
+                    )
                 }
             }.map {
                 it.collectAsLazyPagingItems()
@@ -158,8 +136,8 @@ public class LocalCacheSearchPresenter :
                 query = value
             }
 
-            override val data: PagingState<UiTimeline> = data
-            override val history: PagingState<UiTimeline> = history
+            override val data: PagingState<UiTimelineV2> = data
+            override val history: PagingState<UiTimelineV2> = history
             override val userHistory: PagingState<UiProfile> = userHistory
             override val searchUser: PagingState<UiProfile> = searchUser
         }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/LogStatusHistoryPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/LogStatusHistoryPresenter.kt
index b54da5109..97e943843 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/LogStatusHistoryPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/LogStatusHistoryPresenter.kt
@@ -3,19 +3,11 @@ package dev.dimension.flare.ui.presenter.status
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.remember
 import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.model.DbPagingTimeline
-import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.model.AccountType
-import dev.dimension.flare.model.DbAccountType
 import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.flattenUiState
-import dev.dimension.flare.ui.model.map
-import dev.dimension.flare.ui.model.onSuccess
 import dev.dimension.flare.ui.presenter.PresenterBase
-import kotlinx.coroutines.flow.map
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import kotlin.time.Clock
@@ -30,38 +22,22 @@ public class LogStatusHistoryPresenter(
     }
 
     private val cacheDatabase: CacheDatabase by inject()
-    private val accountRepository: AccountRepository by inject()
 
     @Immutable
     public interface State
 
     @Composable
     override fun body(): State {
-        when (accountType) {
-            is AccountType.Active ->
-                accountRepository.activeAccount.flattenUiState().value.map {
-                    remember(it.accountKey) {
-                        AccountType.Specific(it.accountKey) as DbAccountType
-                    }
-                }
-
-            else ->
-                remember(accountType) {
-                    UiState.Success(accountType as DbAccountType)
-                }
-        }.onSuccess { accountType ->
-            LaunchedEffect(Unit) {
-                cacheDatabase.pagingTimelineDao().insertAll(
-                    listOf(
-                        DbPagingTimeline(
-                            accountType = accountType,
-                            statusKey = statusKey,
-                            pagingKey = PAGING_KEY,
-                            sortId = Clock.System.now().toEpochMilliseconds(),
-                        ),
+        LaunchedEffect(statusKey, accountType) {
+            cacheDatabase.pagingTimelineDao().insertAll(
+                listOf(
+                    DbPagingTimeline(
+                        statusKey = statusKey,
+                        pagingKey = PAGING_KEY,
+                        sortId = Clock.System.now().toEpochMilliseconds(),
                     ),
-                )
-            }
+                ),
+            )
         }
 
         return object : State {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/LogUserHistoryPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/LogUserHistoryPresenter.kt
index f9eb303bf..86a2fd313 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/LogUserHistoryPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/LogUserHistoryPresenter.kt
@@ -3,17 +3,11 @@ package dev.dimension.flare.ui.presenter.status
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.remember
 import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.model.DbUserHistory
-import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.DbAccountType
 import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.flattenUiState
-import dev.dimension.flare.ui.model.map
-import dev.dimension.flare.ui.model.onSuccess
 import dev.dimension.flare.ui.presenter.PresenterBase
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
@@ -28,7 +22,6 @@ public class LogUserHistoryPresenter(
         const val PAGING_KEY = "user_history"
     }
 
-    private val accountRepository: AccountRepository by inject()
     private val cacheDatabase: CacheDatabase by inject()
 
     @Immutable
@@ -36,28 +29,14 @@ public class LogUserHistoryPresenter(
 
     @Composable
     override fun body(): State {
-        when (accountType) {
-            is AccountType.Active ->
-                accountRepository.activeAccount.flattenUiState().value.map {
-                    remember(it.accountKey) {
-                        AccountType.Specific(it.accountKey) as DbAccountType
-                    }
-                }
-
-            else ->
-                remember(accountType) {
-                    UiState.Success(accountType as DbAccountType)
-                }
-        }.onSuccess { accountType ->
-            LaunchedEffect(Unit) {
-                cacheDatabase.userDao().insertHistory(
-                    DbUserHistory(
-                        userKey = userKey,
-                        accountType = accountType,
-                        lastVisit = Clock.System.now().toEpochMilliseconds(),
-                    ),
-                )
-            }
+        LaunchedEffect(Unit) {
+            cacheDatabase.userDao().insertHistory(
+                DbUserHistory(
+                    userKey = userKey,
+                    accountType = accountType as DbAccountType,
+                    lastVisit = Clock.System.now().toEpochMilliseconds(),
+                ),
+            )
         }
 
         return object : State {
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
index fc4caaf76..f59508faf 100644
--- 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
@@ -4,13 +4,13 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import dev.dimension.flare.data.datasource.microblog.datasource.PostDataSource
 import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceFlow
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.UiTimeline
 import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.collectAsUiState
 import dev.dimension.flare.ui.model.onSuccess
@@ -40,7 +40,7 @@ public class StatusContextPresenter(
     KoinComponent {
     @Immutable
     public interface State : TimelineState {
-        public val current: UiState<UiTimeline.ItemContent.Status>
+        public val current: UiState<UiTimelineV2>
     }
 
     private val accountRepository: AccountRepository by inject()
@@ -50,56 +50,45 @@ public class StatusContextPresenter(
             accountType = accountType,
             repository = accountRepository,
         ).flatMapLatest { service ->
-            service.status(statusKey).toUi()
+            (service as PostDataSource).postHandler.post(statusKey).toUi()
         }.mapNotNull { it.takeSuccess() }
-            .mapNotNull {
-                it.content as? UiTimeline.ItemContent.Status
-            }.distinctUntilChanged()
+            .distinctUntilChanged()
     }
 
     private val timelinePresenter by lazy {
         object : TimelinePresenter() {
             override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
                 currentStatusFlow
-                    .map {
-                        it.statusKey
-                    }.distinctUntilChanged()
-                    .flatMapLatest { statusKey ->
+                    .map { statusKey }
+                    .distinctUntilChanged()
+                    .flatMapLatest { key ->
                         accountServiceFlow(
                             accountType = accountType,
                             repository = accountRepository,
                         ).map { service ->
-                            service.context(statusKey)
+                            service.context(key)
                         }
                     }
             }
 
-            override suspend fun transform(data: UiTimeline): UiTimeline {
+            override suspend fun transform(data: UiTimelineV2): UiTimelineV2 {
                 val currentCreatedAt = currentStatusFlow.firstOrNull()?.createdAt
-                return data.copy(
-                    content =
-                        when (val content = data.content) {
-                            is UiTimeline.ItemContent.Status -> {
-                                if (currentCreatedAt != null && content.createdAt <= currentCreatedAt) {
-                                    content.copy(
-                                        parents = persistentListOf(),
-                                    )
-                                } else if (currentCreatedAt != null) {
-                                    content.copy(
-                                        parents =
-                                            content.parents
-                                                .filter {
-                                                    it.createdAt > currentCreatedAt
-                                                }.toPersistentList(),
-                                    )
-                                } else {
-                                    content
-                                }
-                            }
-
-                            else -> content
-                        },
-                )
+                if (data !is UiTimelineV2.Post || currentCreatedAt == null) {
+                    return data
+                }
+                return if (data.createdAt <= currentCreatedAt) {
+                    data.copy(
+                        parents = persistentListOf(),
+                    )
+                } else {
+                    data.copy(
+                        parents =
+                            data.parents
+                                .filter {
+                                    it.createdAt > currentCreatedAt
+                                }.toPersistentList(),
+                    )
+                }
             }
         }
     }
@@ -112,7 +101,7 @@ public class StatusContextPresenter(
             remember {
                 LogStatusHistoryPresenter(
                     accountType = accountType,
-                    statusKey = it.statusKey,
+                    statusKey = statusKey,
                 )
             }.body()
         }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/StatusPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/StatusPresenter.kt
index a70e2bf74..8c148b627 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/StatusPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/StatusPresenter.kt
@@ -4,12 +4,13 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.remember
 import dev.dimension.flare.common.collectAsState
+import dev.dimension.flare.data.datasource.microblog.datasource.PostDataSource
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceProvider
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.flatMap
 import dev.dimension.flare.ui.model.toUi
 import dev.dimension.flare.ui.presenter.PresenterBase
@@ -29,18 +30,18 @@ public class StatusPresenter(
         val accountServiceState =
             serviceState.flatMap { service ->
                 remember(service, statusKey) {
-                    service.status(statusKey)
+                    (service as PostDataSource).postHandler.post(statusKey)
                 }.collectAsState().toUi()
             }
         remember { LogStatusHistoryPresenter(accountType = accountType, statusKey = statusKey) }.body()
 
         return object : StatusState {
-            override val status: UiState<UiTimeline> = accountServiceState
+            override val status: UiState<UiTimelineV2> = accountServiceState
         }
     }
 }
 
 @Immutable
 public interface StatusState {
-    public val status: UiState<UiTimeline>
+    public val status: UiState<UiTimelineV2>
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/VVOStatusDetailPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/VVOStatusDetailPresenter.kt
index a966e1f9e..98b474ea3 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/VVOStatusDetailPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/VVOStatusDetailPresenter.kt
@@ -22,7 +22,6 @@ import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.flatMap
 import dev.dimension.flare.ui.model.map
 import dev.dimension.flare.ui.model.mapper.renderVVOText
-import dev.dimension.flare.ui.model.toUi
 import dev.dimension.flare.ui.presenter.PresenterBase
 import dev.dimension.flare.ui.render.toUi
 import kotlinx.collections.immutable.persistentListOf
@@ -45,8 +44,8 @@ public class VVOStatusDetailPresenter(
                 .flatMap {
                     remember(statusKey, accountType) {
                         require(it is VVODataSource)
-                        it.postHandler.post(statusKey)
-                    }.collectAsState().toUi()
+                        it.status(statusKey)
+                    }.collectAsState(UiState.Loading()).value
                 }
 
         remember { LogStatusHistoryPresenter(accountType = accountType, statusKey = statusKey) }.body()
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/action/AddReactionPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/action/AddReactionPresenter.kt
index 3f794734d..037abec01 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/action/AddReactionPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/action/AddReactionPresenter.kt
@@ -4,7 +4,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.remember
 import dev.dimension.flare.common.collectAsState
-import dev.dimension.flare.data.datasource.microblog.ReactionDataSource
+import dev.dimension.flare.data.datasource.microblog.AuthenticatedMicroblogDataSource
+import dev.dimension.flare.data.datasource.microblog.ComposeType
+import dev.dimension.flare.data.datasource.microblog.PostEvent
+import dev.dimension.flare.data.datasource.microblog.datasource.PostDataSource
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceProvider
 import dev.dimension.flare.model.AccountType
@@ -12,13 +15,14 @@ import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.EmojiData
 import dev.dimension.flare.ui.model.UiEmoji
 import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.flatMap
 import dev.dimension.flare.ui.model.map
 import dev.dimension.flare.ui.model.onSuccess
 import dev.dimension.flare.ui.model.toUi
 import dev.dimension.flare.ui.presenter.PresenterBase
 import dev.dimension.flare.ui.presenter.status.StatusPresenter
+import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import org.koin.core.component.KoinComponent
@@ -37,14 +41,17 @@ public class AddReactionPresenter(
     override fun body(): AddReactionState {
         val service =
             accountServiceProvider(accountType = accountType, repository = accountRepository).map { service ->
-                service as ReactionDataSource
+                service as AuthenticatedMicroblogDataSource
             }
         val data =
             service
                 .flatMap {
-                    remember(it) {
-                        it.emoji()
-                    }.collectAsState().toUi()
+                    val emoji = remember(it) { it.composeConfig(ComposeType.Reply).emoji?.emoji }
+                    if (emoji != null) {
+                        emoji.collectAsState().toUi()
+                    } else {
+                        UiState.Success(persistentMapOf())
+                    }
                 }.map {
                     remember(it) {
                         EmojiData(it)
@@ -60,20 +67,26 @@ public class AddReactionPresenter(
 
             override fun select(emoji: UiEmoji) {
                 service.onSuccess { dataSource ->
+                    val postDataSource = dataSource as? PostDataSource ?: return@onSuccess
                     status.onSuccess { status ->
                         scope.launch {
-                            val content = status.content
-                            if (content is UiTimeline.ItemContent.Status) {
-                                val bottomContent = content.bottomContent
-                                if (bottomContent is UiTimeline.ItemContent.Status.BottomContent.Reaction) {
-                                    dataSource.react(
-                                        statusKey = statusKey,
-                                        hasReacted = bottomContent.emojiReactions.any { it.me && it.name == emoji.shortcode },
+                            if (status is UiTimelineV2.Post) {
+                                val hasReacted = status.emojiReactions.any { it.me && it.name == emoji.shortcode }
+                                val count =
+                                    status.emojiReactions
+                                        .firstOrNull { it.name == emoji.shortcode }
+                                        ?.count
+                                        ?.value ?: 0L
+                                postDataSource.postEventHandler.handleEvent(
+                                    PostEvent.Misskey.React(
+                                        postKey = statusKey,
+                                        hasReacted = hasReacted,
                                         reaction = emoji.shortcode,
-                                    )
-                                }
+                                        count = count,
+                                        accountKey = dataSource.accountKey,
+                                    ),
+                                )
                             }
-//                            dataSource.react(status as UiStatus.Misskey, ":${emoji.shortcode}:")
                         }
                     }
                 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/action/BlueskyReportStatusPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/action/BlueskyReportStatusPresenter.kt
index 0c812ad28..6218c0d49 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/action/BlueskyReportStatusPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/action/BlueskyReportStatusPresenter.kt
@@ -12,7 +12,7 @@ import dev.dimension.flare.data.repository.accountServiceProvider
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.map
 import dev.dimension.flare.ui.model.onSuccess
 import dev.dimension.flare.ui.presenter.PresenterBase
@@ -49,18 +49,18 @@ public class BlueskyReportStatusPresenter(
             override val reason: BlueskyReportStatusState.ReportReason?
                 get() = reason
 
-            override val status: UiState<UiTimeline>
+            override val status: UiState<UiTimelineV2>
                 get() =
                     status
 
             override fun report(
                 value: BlueskyReportStatusState.ReportReason,
-                status: UiTimeline,
+                status: UiTimelineV2,
             ) {
                 service.onSuccess {
                     scope.launch {
-                        if (status.content is UiTimeline.ItemContent.Status) {
-                            it.report(status.content.statusKey, value)
+                        if (status is UiTimelineV2.Post) {
+                            it.report(status.statusKey, value)
                         }
                     }
                 }
@@ -76,7 +76,7 @@ public class BlueskyReportStatusPresenter(
 @Immutable
 public interface BlueskyReportStatusState {
     public val reason: ReportReason?
-    public val status: UiState<UiTimeline>
+    public val status: UiState<UiTimelineV2>
 
     public val allReasons: ImmutableList<ReportReason>
 
@@ -93,6 +93,6 @@ public interface BlueskyReportStatusState {
 
     public fun report(
         value: ReportReason,
-        status: UiTimeline,
+        status: UiTimelineV2,
     )
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/action/DeleteStatusPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/action/DeleteStatusPresenter.kt
index 5a1e7b851..d32db11a9 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/action/DeleteStatusPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/action/DeleteStatusPresenter.kt
@@ -3,6 +3,7 @@ package dev.dimension.flare.ui.presenter.status.action
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import dev.dimension.flare.data.datasource.microblog.AuthenticatedMicroblogDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.PostDataSource
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceFlow
 import dev.dimension.flare.model.AccountType
@@ -36,7 +37,9 @@ public class DeleteStatusPresenter(
                         require(it is AuthenticatedMicroblogDataSource)
                         it
                     }.first()
-                        .deleteStatus(statusKey)
+                        .let {
+                            (it as PostDataSource).postHandler.delete(statusKey)
+                        }
                 }
             }
         }

From ce6fc271abcc1c6122a10db474b9bd836db21b1a Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Wed, 4 Mar 2026 20:58:11 +0900
Subject: [PATCH 12/33] add test

---
 .../flare/data/database/cache/dao/UserDao.kt  |   8 +-
 .../flare/data/database/cache/mapper/User.kt  |   2 +-
 .../flare/data/database/cache/model/DbUser.kt |   4 +-
 .../data/datasource/bluesky/BlueskyLoader.kt  |   8 +-
 .../datasource/mastodon/MastodonLoader.kt     |   8 +-
 .../flare/data/datasource/microblog/Paging.kt | 169 -------
 .../datasource/microblog/ProfileAction.kt     |  14 -
 .../microblog/handler/PostHandler.kt          |   7 +-
 .../microblog/handler/UserHandler.kt          |  37 +-
 .../datasource/microblog/loader/UserLoader.kt |   6 +-
 .../microblog/paging/TimelinePagingMapper.kt  | 193 ++++++++
 .../paging/TimelineRemoteMediator.kt          | 117 +----
 .../data/datasource/misskey/MisskeyLoader.kt  |  13 +-
 .../flare/data/datasource/vvo/VVOLoader.kt    |   8 +-
 .../data/datasource/xqt/XQTDataSource.kt      |   3 +-
 .../flare/data/datasource/xqt/XQTLoader.kt    |  12 +-
 .../data/repository/AccountRepository.kt      |   2 +-
 .../dev/dimension/flare/ui/model/UiHandle.kt  |  20 +
 .../dev/dimension/flare/ui/model/UiProfile.kt |  23 +-
 .../flare/ui/model/mapper/Bluesky.kt          |  27 +-
 .../flare/ui/model/mapper/Mastodon.kt         |   9 +-
 .../flare/ui/model/mapper/Misskey.kt          |  15 +-
 .../dimension/flare/ui/model/mapper/VVO.kt    |  15 +-
 .../dimension/flare/ui/model/mapper/XQT.kt    |  15 +-
 .../ui/presenter/compose/ComposePresenter.kt  |   6 +-
 .../ui/presenter/home/TimelinePresenter.kt    |  81 +---
 .../ui/presenter/profile/ProfilePresenter.kt  |  10 +-
 .../database/cache/mapper/MicroblogTest.kt    | 445 ++++++++----------
 .../microblog/PostEventHandlerTest.kt         | 299 ++++++++++++
 .../microblog/handler/EmojiHandlerTest.kt     | 177 +++++++
 .../{list => handler}/ListHandlerTest.kt      |  13 +-
 .../ListMemberHandlerTest.kt                  | 120 +++--
 .../handler/NotificationHandlerTest.kt        | 132 ++++++
 .../microblog/handler/PostHandlerTest.kt      | 253 ++++++++++
 .../microblog/handler/RelationHandlerTest.kt  | 224 +++++++++
 .../microblog/handler/UserHandlerTest.kt      | 227 +++++++++
 .../rss/RssTimelineRemoteMediatorTest.kt      |  55 +--
 .../flare/ui/model/mapper/XQTTest.kt          |  38 +-
 .../flare/ui/route/DeeplinkRouteTest.kt       |  26 +-
 39 files changed, 1960 insertions(+), 881 deletions(-)
 delete mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ProfileAction.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelinePagingMapper.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiHandle.kt
 create mode 100644 shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/PostEventHandlerTest.kt
 create mode 100644 shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/EmojiHandlerTest.kt
 rename shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/{list => handler}/ListHandlerTest.kt (96%)
 rename shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/{list => handler}/ListMemberHandlerTest.kt (79%)
 create mode 100644 shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/NotificationHandlerTest.kt
 create mode 100644 shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandlerTest.kt
 create mode 100644 shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/RelationHandlerTest.kt
 create mode 100644 shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandlerTest.kt

diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt
index a6408fe75..3a7543280 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt
@@ -39,9 +39,9 @@ internal interface UserDao {
     @Query("SELECT * FROM DbUser WHERE userKey = :userKey")
     fun findByKey(userKey: MicroBlogKey): Flow<DbUser?>
 
-    @Query("SELECT * FROM DbUser WHERE handle = :handle AND host = :host")
-    fun findByHandleAndHost(
-        handle: String,
+    @Query("SELECT * FROM DbUser WHERE canonicalHandle = :canonicalHandle AND host = :host")
+    fun findByCanonicalHandleAndHost(
+        canonicalHandle: String,
         host: String,
     ): Flow<DbUser?>
 
@@ -61,7 +61,7 @@ internal interface UserDao {
     @Transaction
     @Query(
         "SELECT * FROM DbUser " +
-            "WHERE DbUser.name like :query OR DbUser.handle like :query",
+            "WHERE DbUser.name like :query OR DbUser.canonicalHandle like :query",
     )
     fun searchUser(query: String): PagingSource<Int, DbUser>
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/User.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/User.kt
index d931600f3..971742ab7 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/User.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/User.kt
@@ -7,7 +7,7 @@ internal fun UiProfile.toDbUser(host: String = this.host ?: key.host) =
     DbUser(
         userKey = key,
         name = name.raw,
-        handle = handle,
+        canonicalHandle = handle.canonical,
         host = host,
         content = this,
     )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbUser.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbUser.kt
index a4ad8d6b3..6772ce387 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbUser.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbUser.kt
@@ -9,14 +9,14 @@ import dev.dimension.flare.ui.model.UiRelation
 
 @Entity(
     indices = [
-        Index(value = ["handle", "host"], unique = true),
+        Index(value = ["canonicalHandle", "host"], unique = true),
     ],
 )
 internal data class DbUser(
     @PrimaryKey
     val userKey: MicroBlogKey,
     val name: String,
-    val handle: String,
+    val canonicalHandle: String,
     val host: String,
     val content: UiProfile,
 )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyLoader.kt
index e128c6538..d7270e30c 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyLoader.kt
@@ -14,6 +14,7 @@ import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
 import dev.dimension.flare.data.datasource.microblog.loader.UserLoader
 import dev.dimension.flare.data.network.bluesky.BlueskyService
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiHandle
 import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.UiRelation
 import dev.dimension.flare.ui.model.UiTimelineV2
@@ -33,12 +34,9 @@ internal class BlueskyLoader(
     UserLoader,
     PostLoader,
     RelationLoader {
-    override suspend fun userByHandleAndHost(
-        handle: String,
-        host: String,
-    ): UiProfile =
+    override suspend fun userByHandleAndHost(uiHandle: UiHandle): UiProfile =
         service
-            .getProfile(GetProfileQueryParams(actor = Handle(handle = handle)))
+            .getProfile(GetProfileQueryParams(actor = Handle(handle = uiHandle.normalizedRaw)))
             .requireResponse()
             .render(accountKey)
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonLoader.kt
index adb9dfedf..436a585fc 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonLoader.kt
@@ -8,6 +8,7 @@ import dev.dimension.flare.data.datasource.microblog.loader.UserLoader
 import dev.dimension.flare.data.network.mastodon.MastodonService
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiEmoji
+import dev.dimension.flare.ui.model.UiHandle
 import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.UiRelation
 import dev.dimension.flare.ui.model.UiTimelineV2
@@ -26,12 +27,9 @@ internal class MastodonLoader(
     PostLoader,
     RelationLoader,
     EmojiLoader {
-    override suspend fun userByHandleAndHost(
-        handle: String,
-        host: String,
-    ): UiProfile =
+    override suspend fun userByHandleAndHost(uiHandle: UiHandle): UiProfile =
         service
-            .lookupUserByAcct("$handle@$host")
+            .lookupUserByAcct("${uiHandle.normalizedRaw}@${uiHandle.normalizedHost}")
             ?.render(
                 accountKey = accountKey,
                 host = accountKey.host,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/Paging.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/Paging.kt
index e7d35487d..e5fc7902f 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/Paging.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/Paging.kt
@@ -6,172 +6,3 @@ internal val pagingConfig: PagingConfig =
     PagingConfig(
         pageSize = 20,
     )
-
-// @OptIn(ExperimentalPagingApi::class)
-// internal fun timelinePager(
-//    pageSize: Int,
-//    database: CacheDatabase,
-//    scope: CoroutineScope,
-//    filterFlow: Flow<List<String>>,
-//    mediator: BaseTimelineRemoteMediator,
-//    accountRepository: AccountRepository,
-// ): Flow<PagingData<UiTimeline>> {
-//    val pagerFlow =
-//        Pager(
-//            config = pagingConfig,
-//            remoteMediator = mediator,
-//            pagingSourceFactory = {
-//                database.pagingTimelineDao().getPagingSource(
-//                    pagingKey = mediator.pagingKey,
-//                )
-//            },
-//        ).flow.cachedIn(scope)
-//    return combine(
-//        pagerFlow,
-//        filterFlow,
-//        accountRepository.allAccounts,
-//    ) { pagingData, filters, accounts ->
-//        pagingData
-//            .map { data ->
-//                withContext(Dispatchers.IO) {
-//                    val dataSource =
-//                        when (data.timeline.accountType) {
-//                            AccountType.Guest -> null
-//                            is AccountType.Specific -> {
-//                                accounts.first {
-//                                    it.accountKey == data.timeline.accountType.accountKey
-//                                }
-//                            }
-//                        }?.dataSource
-//                    data.render(dataSource)
-//                }
-//            }.filter {
-//                !it.contains(filters)
-//            }
-//    }.cachedIn(scope)
-// }
-
-// internal fun UiTimeline.contains(keywords: List<String>): Boolean {
-//    val text =
-//        if (content is UiTimeline.ItemContent.Status) {
-//            listOfNotNull(
-//                content.content.raw,
-//                content.contentWarning?.raw,
-//            )
-//        } else {
-//            emptyList()
-//        }
-//    return keywords.any { keyword ->
-//        text.any { it.contains(keyword, ignoreCase = true) }
-//    }
-// }
-
-// internal class MemoryPagingSource<T : Any>(
-//    private val key: String,
-//    private val context: CoroutineContext,
-// ) : BasePagingSource<Int, T>() {
-//    companion object {
-//        private val caches = mutableMapOf<String, MutableStateFlow<ImmutableList<Any>>>()
-//
-//        fun <T : Any> update(
-//            key: String,
-//            value: ImmutableList<T>,
-//        ) {
-//            caches[key]?.value = value
-//        }
-//
-//        fun <T : Any> append(
-//            key: String,
-//            value: ImmutableList<T>,
-//        ) {
-//            @Suppress("UNCHECKED_CAST")
-//            caches[key]?.value = ((caches[key]?.value as? ImmutableList<T> ?: persistentListOf()) + value).toImmutableList()
-//        }
-//
-//        fun <T : Any> updateWith(
-//            key: String,
-//            update: (ImmutableList<T>) -> ImmutableList<T>,
-//        ) {
-//            @Suppress("UNCHECKED_CAST")
-//            val value = caches[key]?.value as? ImmutableList<T> ?: persistentListOf()
-//            caches[key]?.value = update(value)
-//        }
-//
-//        @Suppress("UNCHECKED_CAST")
-//        fun <T : Any> get(key: String): ImmutableList<T>? = caches[key]?.value as? ImmutableList<T>
-//
-//        fun clear(key: String) {
-//            caches.remove(key)
-//        }
-//
-//        @Suppress("UNCHECKED_CAST")
-//        fun <T : Any> getFlow(key: String): Flow<ImmutableList<T>> =
-//            caches
-//                .getOrPut(key) {
-//                    MutableStateFlow(persistentListOf<T>())
-//                } as Flow<ImmutableList<T>>
-//    }
-//
-//    // TODO: workaround for skip first invalidation to avoid loading infinite loop
-//    private var skiped = false
-//
-//    private val job =
-//        caches
-//            .getOrPut(key) {
-//                MutableStateFlow(persistentListOf<T>())
-//            }.let {
-//                CoroutineScope(context).launch {
-//                    it.collectLatest {
-//                        if (!skiped) {
-//                            skiped = true
-//                            return@collectLatest
-//                        }
-//                        invalidate()
-//                    }
-//                }
-//            }
-//
-//    init {
-//        registerInvalidatedCallback {
-//            job.cancel()
-//        }
-//    }
-//
-//    override fun getRefreshKey(state: PagingState<Int, T>): Int? =
-//        state.anchorPosition?.let {
-//            maxOf(0, it - (state.config.initialLoadSize / 2))
-//        }
-//
-//    override suspend fun doLoad(params: LoadParams<Int>): LoadResult<Int, T> {
-//        val page = params.key ?: 0
-//
-//        @Suppress("UNCHECKED_CAST")
-//        val list = caches[key]?.value as? ImmutableList<T> ?: return LoadResult.Error(Exception("No data"))
-//        val data = list.subList(page, (page + params.loadSize).coerceIn(0, list.size))
-//        val prevKey = (page - params.loadSize).takeIf { it in list.indices }
-//        val nextKey = (page + params.loadSize).takeIf { it in list.indices }
-//        return LoadResult.Page(
-//            data = data,
-//            prevKey = prevKey,
-//            nextKey = nextKey,
-//        )
-//    }
-// }
-//
-// @OptIn(ExperimentalPagingApi::class)
-// internal fun <T : Any> memoryPager(
-//    pageSize: Int,
-//    pagingKey: String,
-//    scope: CoroutineScope,
-//    mediator: BaseRemoteMediator<Int, T>,
-// ): Flow<PagingData<T>> =
-//    Pager(
-//        config = pagingConfig,
-//        remoteMediator = mediator,
-//        pagingSourceFactory = {
-//            MemoryPagingSource(
-//                key = pagingKey,
-//                context = Dispatchers.IO,
-//            )
-//        },
-//    ).flow.cachedIn(scope)
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ProfileAction.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ProfileAction.kt
deleted file mode 100644
index 72b9e72f3..000000000
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ProfileAction.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package dev.dimension.flare.data.datasource.microblog
-
-// public sealed interface ProfileAction {
-//    public suspend operator fun invoke(
-//        userKey: MicroBlogKey,
-//        relation: UiRelation,
-//    )
-//
-//    public fun relationState(relation: UiRelation): Boolean
-//
-//    public interface Block : ProfileAction
-//
-//    public interface Mute : ProfileAction
-// }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandler.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandler.kt
index bbf6a7651..acc4f33df 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandler.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandler.kt
@@ -5,13 +5,12 @@ import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.connect
 import dev.dimension.flare.data.database.cache.mapper.saveToDatabase
 import dev.dimension.flare.data.datasource.microblog.loader.PostLoader
-import dev.dimension.flare.data.datasource.microblog.paging.TimelineRemoteMediator
+import dev.dimension.flare.data.datasource.microblog.paging.TimelinePagingMapper
 import dev.dimension.flare.data.repository.tryRun
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.DbAccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiTimelineV2
-import dev.dimension.flare.ui.presenter.home.TimelinePresenter
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.mapNotNull
@@ -33,7 +32,7 @@ internal class PostHandler(
                 val result = loader.status(postKey)
                 database.connect {
                     val item =
-                        TimelineRemoteMediator.mapping(
+                        TimelinePagingMapper.toDb(
                             result,
                             pagingKey,
                         )
@@ -47,7 +46,7 @@ internal class PostHandler(
                     .distinctUntilChanged()
                     .mapNotNull {
                         it?.let {
-                            TimelinePresenter.mapping(it, pagingKey, false)
+                            TimelinePagingMapper.toUi(it, pagingKey, false)
                         }
                     }
             },
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandler.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandler.kt
index ff2e3de09..6cda8e1b1 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandler.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandler.kt
@@ -5,6 +5,7 @@ import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.mapper.toDbUser
 import dev.dimension.flare.data.datasource.microblog.loader.UserLoader
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiHandle
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.mapNotNull
 import org.koin.core.component.KoinComponent
@@ -16,24 +17,24 @@ internal class UserHandler(
 ) : KoinComponent {
     private val database: CacheDatabase by inject()
 
-    fun userByHandleAndHost(
-        handle: String,
-        host: String,
-    ) = Cacheable(
-        fetchSource = {
-            val user = loader.userByHandleAndHost(handle, host)
-            database.userDao().insert(
-                user.toDbUser(),
-            )
-        },
-        cacheSource = {
-            database
-                .userDao()
-                .findByHandleAndHost(handle, host)
-                .distinctUntilChanged()
-                .mapNotNull { it?.content }
-        },
-    )
+    fun userByHandleAndHost(uiHandle: UiHandle) =
+        Cacheable(
+            fetchSource = {
+                val user = loader.userByHandleAndHost(uiHandle)
+                database.userDao().insert(
+                    user.toDbUser(),
+                )
+            },
+            cacheSource = {
+                database
+                    .userDao()
+                    .findByCanonicalHandleAndHost(
+                        canonicalHandle = uiHandle.canonical,
+                        host = uiHandle.normalizedHost,
+                    ).distinctUntilChanged()
+                    .mapNotNull { it?.content }
+            },
+        )
 
     fun userById(id: String) =
         Cacheable(
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/UserLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/UserLoader.kt
index 05f784180..cac7ef9e3 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/UserLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/UserLoader.kt
@@ -1,12 +1,10 @@
 package dev.dimension.flare.data.datasource.microblog.loader
 
+import dev.dimension.flare.ui.model.UiHandle
 import dev.dimension.flare.ui.model.UiProfile
 
 internal interface UserLoader {
-    suspend fun userByHandleAndHost(
-        handle: String,
-        host: String,
-    ): UiProfile
+    suspend fun userByHandleAndHost(uiHandle: UiHandle): UiProfile
 
     suspend fun userById(id: String): UiProfile
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelinePagingMapper.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelinePagingMapper.kt
new file mode 100644
index 000000000..64c79f690
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelinePagingMapper.kt
@@ -0,0 +1,193 @@
+package dev.dimension.flare.data.datasource.microblog.paging
+
+import SnowflakeIdGenerator
+import dev.dimension.flare.data.database.cache.mapper.toDbUser
+import dev.dimension.flare.data.database.cache.model.DbPagingTimeline
+import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
+import dev.dimension.flare.data.database.cache.model.DbStatus
+import dev.dimension.flare.data.database.cache.model.DbStatusReference
+import dev.dimension.flare.data.database.cache.model.DbStatusReferenceWithStatus
+import dev.dimension.flare.data.database.cache.model.DbStatusUserReference
+import dev.dimension.flare.data.database.cache.model.DbStatusUserReferenceWithUser
+import dev.dimension.flare.data.database.cache.model.DbStatusWithReference
+import dev.dimension.flare.data.database.cache.model.DbStatusWithUser
+import dev.dimension.flare.model.DbAccountType
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.model.ReferenceType
+import dev.dimension.flare.ui.model.UiTimelineV2
+import kotlinx.collections.immutable.toImmutableList
+import kotlin.uuid.Uuid
+
+internal object TimelinePagingMapper {
+    suspend fun toDb(
+        data: UiTimelineV2,
+        pagingKey: String,
+    ): DbPagingTimelineWithStatus =
+        DbPagingTimelineWithStatus(
+            timeline =
+                DbPagingTimeline(
+                    pagingKey = pagingKey,
+                    statusKey = data.statusKey,
+                    sortId = -SnowflakeIdGenerator.nextId(),
+                ),
+            status =
+                DbStatusWithReference(
+                    status = uiTimelineToDbStatusWithUser(data),
+                    references =
+                        when (data) {
+                            is UiTimelineV2.Feed -> emptyList()
+                            is UiTimelineV2.Message -> emptyList()
+                            is UiTimelineV2.Post ->
+                                data.quote.map {
+                                    uiTimelineToDbStatusReferenceWithStatus(
+                                        data = it,
+                                        referenceType = ReferenceType.Quote,
+                                        rootStatusKey = data.statusKey,
+                                    )
+                                } +
+                                    data.parents.map {
+                                        uiTimelineToDbStatusReferenceWithStatus(
+                                            data = it,
+                                            referenceType = ReferenceType.Reply,
+                                            rootStatusKey = data.statusKey,
+                                        )
+                                    }
+
+                            is UiTimelineV2.User -> emptyList()
+                            is UiTimelineV2.UserList ->
+                                listOfNotNull(
+                                    data.post?.let {
+                                        uiTimelineToDbStatusReferenceWithStatus(
+                                            data = it,
+                                            referenceType = ReferenceType.Quote,
+                                            rootStatusKey = data.statusKey,
+                                        )
+                                    },
+                                )
+                        },
+                ),
+        )
+
+    fun toUi(
+        item: DbPagingTimelineWithStatus,
+        pagingKey: String,
+        useDbKeyInItemKey: Boolean,
+    ): UiTimelineV2 {
+        val root = dbStatusWithUserToUiTimeline(item.status.status, pagingKey, useDbKeyInItemKey)
+        val references =
+            item.status.references
+                .mapNotNull { it.status }
+                .map { dbStatusWithUserToUiTimeline(it, pagingKey, useDbKeyInItemKey) }
+        return when (root) {
+            is UiTimelineV2.Feed -> root
+            is UiTimelineV2.Message -> root
+            is UiTimelineV2.Post ->
+                root.copy(
+                    parents =
+                        root.parents
+                            .map { parent ->
+                                references.find { it.statusKey == parent.statusKey } as? UiTimelineV2.Post ?: parent
+                            }.toImmutableList(),
+                    quote =
+                        root.quote
+                            .map { quote ->
+                                references.find { it.statusKey == quote.statusKey } as? UiTimelineV2.Post ?: quote
+                            }.toImmutableList(),
+                )
+            is UiTimelineV2.User -> root
+            is UiTimelineV2.UserList ->
+                root.copy(
+                    post =
+                        root.post?.let { post ->
+                            references.find { it.statusKey == post.statusKey } as? UiTimelineV2.Post ?: post
+                        },
+                )
+        }
+    }
+
+    private fun uiTimelineToDbStatusReferenceWithStatus(
+        data: UiTimelineV2,
+        referenceType: ReferenceType,
+        rootStatusKey: MicroBlogKey,
+    ) = DbStatusReferenceWithStatus(
+        reference =
+            DbStatusReference(
+                referenceType = referenceType,
+                statusKey = rootStatusKey,
+                referenceStatusKey = data.statusKey,
+                _id = Uuid.random().toString(),
+            ),
+        status = uiTimelineToDbStatusWithUser(data),
+    )
+
+    private fun uiTimelineToDbStatusWithUser(data: UiTimelineV2): DbStatusWithUser {
+        val user =
+            if (data is UiTimelineV2.Post) {
+                listOfNotNull(data.user)
+            } else if (data is UiTimelineV2.User) {
+                listOfNotNull(data.value)
+            } else if (data is UiTimelineV2.UserList) {
+                data.users
+            } else {
+                emptyList()
+            }
+        return DbStatusWithUser(
+            data =
+                DbStatus(
+                    statusKey = data.statusKey,
+                    content = data,
+                    accountType = data.accountType as DbAccountType,
+                    text = data.searchText,
+                ),
+            references =
+                user.map {
+                    DbStatusUserReferenceWithUser(
+                        reference =
+                            DbStatusUserReference(
+                                statusKey = data.statusKey,
+                                referenceUserKey = it.key,
+                                _id = Uuid.random().toString(),
+                            ),
+                        user =
+                            it.toDbUser(),
+                    )
+                },
+        )
+    }
+
+    private fun dbStatusWithUserToUiTimeline(
+        data: DbStatusWithUser,
+        pagingKey: String,
+        useDbKeyInItemKey: Boolean,
+    ): UiTimelineV2 {
+        val root = data.data.content
+        val users = data.references.mapNotNull { it.user?.content }
+        return when (root) {
+            is UiTimelineV2.Feed -> root
+            is UiTimelineV2.Message ->
+                root.copy(
+                    user = users.find { root.user?.key == it.key },
+                    extraKey = if (useDbKeyInItemKey) pagingKey else null,
+                )
+            is UiTimelineV2.Post ->
+                root.copy(
+                    user = users.find { root.user?.key == it.key },
+                    extraKey = if (useDbKeyInItemKey) pagingKey else null,
+                )
+            is UiTimelineV2.User ->
+                root.copy(
+                    value = users.find { root.value.key == it.key } ?: root.value,
+                    extraKey = if (useDbKeyInItemKey) pagingKey else null,
+                )
+            is UiTimelineV2.UserList ->
+                root.copy(
+                    users =
+                        root.users
+                            .map { user ->
+                                users.find { user.key == it.key } ?: user
+                            }.toImmutableList(),
+                    extraKey = if (useDbKeyInItemKey) pagingKey else null,
+                )
+        }
+    }
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelineRemoteMediator.kt
index 132a71ad9..13772125d 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelineRemoteMediator.kt
@@ -1,24 +1,10 @@
 package dev.dimension.flare.data.datasource.microblog.paging
 
-import SnowflakeIdGenerator
 import androidx.paging.ExperimentalPagingApi
 import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.mapper.saveToDatabase
-import dev.dimension.flare.data.database.cache.mapper.toDbUser
-import dev.dimension.flare.data.database.cache.model.DbPagingTimeline
 import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.database.cache.model.DbStatus
-import dev.dimension.flare.data.database.cache.model.DbStatusReference
-import dev.dimension.flare.data.database.cache.model.DbStatusReferenceWithStatus
-import dev.dimension.flare.data.database.cache.model.DbStatusUserReference
-import dev.dimension.flare.data.database.cache.model.DbStatusUserReferenceWithUser
-import dev.dimension.flare.data.database.cache.model.DbStatusWithReference
-import dev.dimension.flare.data.database.cache.model.DbStatusWithUser
-import dev.dimension.flare.model.DbAccountType
-import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.model.ReferenceType
 import dev.dimension.flare.ui.model.UiTimelineV2
-import kotlin.uuid.Uuid
 
 @OptIn(ExperimentalPagingApi::class)
 internal class TimelineRemoteMediator(
@@ -42,7 +28,7 @@ internal class TimelineRemoteMediator(
             )
         val data =
             result.data.map {
-                mapping(
+                TimelinePagingMapper.toDb(
                     data = it,
                     pagingKey = pagingKey,
                 )
@@ -54,107 +40,6 @@ internal class TimelineRemoteMediator(
         )
     }
 
-    companion object {
-        suspend fun mapping(
-            data: UiTimelineV2,
-            pagingKey: String,
-        ): DbPagingTimelineWithStatus =
-            DbPagingTimelineWithStatus(
-                timeline =
-                    DbPagingTimeline(
-                        pagingKey = pagingKey,
-                        statusKey = data.statusKey,
-                        sortId = -SnowflakeIdGenerator.nextId(),
-                    ),
-                status =
-                    DbStatusWithReference(
-                        status = mappingDbStatusWithUser(data),
-                        references =
-                            when (data) {
-                                is UiTimelineV2.Feed -> emptyList()
-                                is UiTimelineV2.Message -> emptyList()
-                                is UiTimelineV2.Post ->
-                                    data.quote.map {
-                                        mappingDbStatusReferenceWithStatus(
-                                            data = it,
-                                            referenceType = ReferenceType.Quote,
-                                            rootStatusKey = data.statusKey,
-                                        )
-                                    } +
-                                        data.parents.map {
-                                            mappingDbStatusReferenceWithStatus(
-                                                data = it,
-                                                referenceType = ReferenceType.Reply,
-                                                rootStatusKey = data.statusKey,
-                                            )
-                                        }
-
-                                is UiTimelineV2.User -> emptyList()
-                                is UiTimelineV2.UserList ->
-                                    listOfNotNull(
-                                        data.post?.let {
-                                            mappingDbStatusReferenceWithStatus(
-                                                data = it,
-                                                referenceType = ReferenceType.Quote,
-                                                rootStatusKey = data.statusKey,
-                                            )
-                                        },
-                                    )
-                            },
-                    ),
-            )
-
-        private fun mappingDbStatusReferenceWithStatus(
-            data: UiTimelineV2,
-            referenceType: ReferenceType,
-            rootStatusKey: MicroBlogKey,
-        ) = DbStatusReferenceWithStatus(
-            reference =
-                DbStatusReference(
-                    referenceType = referenceType,
-                    statusKey = rootStatusKey,
-                    referenceStatusKey = data.statusKey,
-                    _id = Uuid.random().toString(),
-                ),
-            status = mappingDbStatusWithUser(data),
-        )
-
-        private fun mappingDbStatusWithUser(data: UiTimelineV2): DbStatusWithUser {
-            val user =
-                if (data is UiTimelineV2.Post) {
-                    listOfNotNull(data.user)
-                } else if (data is UiTimelineV2.User) {
-                    listOfNotNull(data.value)
-                } else if (data is UiTimelineV2.UserList) {
-                    data.users
-                } else {
-                    emptyList()
-                }
-            return DbStatusWithUser(
-                data =
-                    DbStatus(
-                        statusKey = data.statusKey,
-                        content = data,
-                        accountType = data.accountType as DbAccountType,
-                        text = data.searchText,
-                    ),
-                references =
-                    user.map {
-                        DbStatusUserReferenceWithUser(
-                            reference =
-                                DbStatusUserReference(
-                                    statusKey = data.statusKey,
-                                    referenceUserKey = it.key,
-                                    _id = Uuid.random().toString(),
-                                ),
-                            user =
-                                it.toDbUser(),
-                        )
-                    },
-            )
-        }
-    }
-
     suspend fun timeline(
         pageSize: Int,
         request: PagingRequest,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyLoader.kt
index b712cb84d..cc77ef52a 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyLoader.kt
@@ -13,6 +13,7 @@ import dev.dimension.flare.data.network.misskey.api.model.MuteCreateRequest
 import dev.dimension.flare.data.network.misskey.api.model.UsersShowRequest
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiEmoji
+import dev.dimension.flare.ui.model.UiHandle
 import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.UiRelation
 import dev.dimension.flare.ui.model.UiTimelineV2
@@ -39,10 +40,14 @@ internal class MisskeyLoader(
                 ),
             ).size
 
-    override suspend fun userByHandleAndHost(
-        handle: String,
-        host: String,
-    ): UiProfile = service.usersShow(UsersShowRequest(username = handle, host = host)).render(accountKey)
+    override suspend fun userByHandleAndHost(uiHandle: UiHandle): UiProfile =
+        service
+            .usersShow(
+                UsersShowRequest(
+                    username = uiHandle.normalizedRaw,
+                    host = uiHandle.normalizedHost,
+                ),
+            ).render(accountKey)
 
     override suspend fun userById(id: String): UiProfile = service.usersShow(UsersShowRequest(userId = id)).render(accountKey)
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVOLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVOLoader.kt
index a4064e6d4..18e9df8de 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVOLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVOLoader.kt
@@ -12,6 +12,7 @@ import dev.dimension.flare.data.repository.LoginExpiredException
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
 import dev.dimension.flare.ui.model.UiEmoji
+import dev.dimension.flare.ui.model.UiHandle
 import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.UiRelation
 import dev.dimension.flare.ui.model.UiTimelineV2
@@ -43,11 +44,8 @@ internal class VVOLoader(
         return (mention + comment + like).toInt()
     }
 
-    override suspend fun userByHandleAndHost(
-        handle: String,
-        host: String,
-    ): UiProfile {
-        val uid = service.getUid(handle) ?: error("user not found")
+    override suspend fun userByHandleAndHost(uiHandle: UiHandle): UiProfile {
+        val uid = service.getUid(uiHandle.normalizedRaw) ?: error("user not found")
         return userById(uid)
     }
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt
index 30d433c38..d098d8fd4 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt
@@ -384,8 +384,7 @@ internal class XQTDataSource(
                     data.referenceStatus.data as? UiTimelineV2.Post
                 }?.user
                 ?.handle
-                ?.removePrefix("@")
-                ?.removeSuffix("@${accountKey.host}")
+                ?.normalizedRaw
         val maxProgress = data.medias.size + 1
         val mediaIds =
             data.medias.mapIndexed { index, (item, altText) ->
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTLoader.kt
index 3cd97459d..3127a7693 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTLoader.kt
@@ -12,6 +12,7 @@ import dev.dimension.flare.data.network.xqt.model.PostDeleteTweetRequest
 import dev.dimension.flare.data.network.xqt.model.User
 import dev.dimension.flare.data.network.xqt.model.UserUnavailable
 import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiHandle
 import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.UiRelation
 import dev.dimension.flare.ui.model.UiTimelineV2
@@ -28,16 +29,13 @@ internal class XQTLoader(
     RelationLoader {
     override suspend fun notificationBadgeCount(): Int = service.getBadgeCount().ntabUnreadCount?.toInt() ?: 0
 
-    override suspend fun userByHandleAndHost(
-        handle: String,
-        host: String,
-    ): UiProfile {
-        require(host == accountKey.host) {
-            "Cross-host lookup is unsupported for XQT: $host"
+    override suspend fun userByHandleAndHost(uiHandle: UiHandle): UiProfile {
+        require(uiHandle.normalizedHost == accountKey.host) {
+            "Cross-host lookup is unsupported for XQT: ${uiHandle.normalizedHost}"
         }
         val user =
             service
-                .userByScreenName(handle)
+                .userByScreenName(uiHandle.normalizedRaw)
                 .body()
                 ?.data
                 ?.user
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/repository/AccountRepository.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/repository/AccountRepository.kt
index 0ce6d4de9..732165dc5 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/repository/AccountRepository.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/repository/AccountRepository.kt
@@ -24,7 +24,6 @@ import dev.dimension.flare.ui.model.UiAccount.Companion.toUi
 import dev.dimension.flare.ui.model.UiState
 import dev.dimension.flare.ui.model.collectAsUiState
 import dev.dimension.flare.ui.model.takeSuccess
-import kotlin.time.Clock
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
@@ -36,6 +35,7 @@ import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.launch
+import kotlin.time.Clock
 
 @Stable
 public class AccountRepository internal constructor(
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiHandle.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiHandle.kt
new file mode 100644
index 000000000..bf0fa096b
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiHandle.kt
@@ -0,0 +1,20 @@
+package dev.dimension.flare.ui.model
+
+import androidx.compose.runtime.Immutable
+import kotlinx.serialization.Serializable
+
+@Serializable
+@Immutable
+public data class UiHandle(
+    val raw: String,
+    val host: String,
+) {
+    val normalizedRaw: String
+        get() = raw.trim().removePrefix("@").substringBefore("@")
+
+    val normalizedHost: String
+        get() = host.trim().removePrefix("@")
+
+    val canonical: String
+        get() = "@$normalizedRaw@$normalizedHost"
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiProfile.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiProfile.kt
index 54c44827c..7a9a8c777 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiProfile.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiProfile.kt
@@ -16,7 +16,7 @@ import kotlinx.serialization.Serializable
 @Immutable
 public data class UiProfile internal constructor(
     val key: MicroBlogKey,
-    val handle: String,
+    val handle: UiHandle,
     val avatar: String,
     private val nameInternal: UiRichText,
     val platformType: PlatformType,
@@ -57,17 +57,11 @@ public data class UiProfile internal constructor(
     }
 
     val handleWithoutAt: String by lazy {
-        handle.removePrefix("@")
+        handle.normalizedRaw
     }
 
     val handleWithoutAtAndHost: String by lazy {
-        run {
-            handle
-                .removePrefix("@")
-                .split("@")
-                .firstOrNull()
-                ?: handleWithoutAt
-        }.let {
+        handleWithoutAt.let {
             if (platformType == PlatformType.Bluesky) {
                 it.removeSuffix(".bsky.social")
             } else {
@@ -77,10 +71,7 @@ public data class UiProfile internal constructor(
     }
 
     val host: String? by lazy {
-        handle
-            .removePrefix("@")
-            .split("@")
-            .getOrNull(1)
+        handle.normalizedHost
     }
 
     @Serializable
@@ -114,7 +105,11 @@ public data class UiProfile internal constructor(
 public fun createSampleUser(): UiProfile =
     UiProfile(
         key = MicroBlogKey("sampleKey", "sampleHost"),
-        handle = "@sampleUser",
+        handle =
+            UiHandle(
+                raw = "sampleUser",
+                host = "sampleHost",
+            ),
         avatar = "https://example.com/avatar.jpg",
         nameInternal = Element("span").toUi(),
         platformType = PlatformType.Mastodon,
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
index e597695bc..50874a425 100644
--- 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
@@ -42,6 +42,7 @@ import dev.dimension.flare.model.toAccountType
 import dev.dimension.flare.ui.model.ClickEvent
 import dev.dimension.flare.ui.model.UiCard
 import dev.dimension.flare.ui.model.UiDMItem
+import dev.dimension.flare.ui.model.UiHandle
 import dev.dimension.flare.ui.model.UiIcon
 import dev.dimension.flare.ui.model.UiList
 import dev.dimension.flare.ui.model.UiMedia
@@ -808,7 +809,7 @@ internal fun PostView.render(accountKey: MicroBlogKey): UiTimelineV2.Post {
                                     userActionsMenu(
                                         accountKey = accountKey,
                                         userKey = user.key,
-                                        handle = user.handle,
+                                        handle = user.handle.canonical,
                                     ),
                                 )
                                 add(ActionMenu.Divider)
@@ -968,7 +969,11 @@ internal fun chat.bsky.actor.ProfileViewBasic.render(accountKey: MicroBlogKey):
                 .apply {
                     addChildren(TextNode(displayName.orEmpty()))
                 }.toUi(),
-        handle = "@${handle.handle}",
+        handle =
+            UiHandle(
+                raw = handle.handle,
+                host = accountKey.host,
+            ),
         key = userKey,
         banner = null,
         description = null,
@@ -1005,7 +1010,11 @@ internal fun ProfileViewBasic.render(accountKey: MicroBlogKey): UiProfile {
                 .apply {
                     addChildren(TextNode(displayName.orEmpty()))
                 }.toUi(),
-        handle = "@${handle.handle}",
+        handle =
+            UiHandle(
+                raw = handle.handle,
+                host = accountKey.host,
+            ),
         key = userKey,
         banner = null,
         description = null,
@@ -1042,7 +1051,11 @@ internal fun ProfileView.render(accountKey: MicroBlogKey): UiProfile {
                 .apply {
                     addChildren(TextNode(displayName.orEmpty()))
                 }.toUi(),
-        handle = "@${handle.handle}",
+        handle =
+            UiHandle(
+                raw = handle.handle,
+                host = accountKey.host,
+            ),
         key = userKey,
         banner = null,
         description = description?.let { parser.parse(it) }?.toHtml(accountKey)?.toUi(),
@@ -1079,7 +1092,11 @@ internal fun ProfileViewDetailed.render(accountKey: MicroBlogKey): UiProfile {
                 .apply {
                     addChildren(TextNode(displayName.orEmpty()))
                 }.toUi(),
-        handle = "@${handle.handle}",
+        handle =
+            UiHandle(
+                raw = handle.handle,
+                host = accountKey.host,
+            ),
         key = userKey,
         banner = banner?.uri,
         description = description?.let { parser.parse(it) }?.toHtml(accountKey)?.toUi(),
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
index caed3d17d..1f55f91fe 100644
--- 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
@@ -23,6 +23,7 @@ import dev.dimension.flare.model.PlatformType
 import dev.dimension.flare.model.toAccountType
 import dev.dimension.flare.ui.model.ClickEvent
 import dev.dimension.flare.ui.model.UiCard
+import dev.dimension.flare.ui.model.UiHandle
 import dev.dimension.flare.ui.model.UiIcon
 import dev.dimension.flare.ui.model.UiInstance
 import dev.dimension.flare.ui.model.UiInstanceMetadata
@@ -579,7 +580,7 @@ private fun Status.renderStatus(
                                         userActionsMenu(
                                             accountKey = accountKey,
                                             userKey = actualUser.key,
-                                            handle = actualUser.handle,
+                                            handle = actualUser.handle.canonical,
                                         ),
                                     )
                                     add(ActionMenu.Divider)
@@ -837,7 +838,11 @@ internal fun Account.render(
     return UiProfile(
         avatar = avatar.orEmpty(),
         nameInternal = parseName(this).toUi(),
-        handle = "@$username@$remoteHost",
+        handle =
+            UiHandle(
+                raw = username.orEmpty(),
+                host = remoteHost,
+            ),
         key = userKey,
         banner = header,
         description =
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt
index 1ff514807..5dc0151ee 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt
@@ -23,6 +23,7 @@ import dev.dimension.flare.model.PlatformType
 import dev.dimension.flare.model.toAccountType
 import dev.dimension.flare.ui.model.ClickEvent
 import dev.dimension.flare.ui.model.UiEmoji
+import dev.dimension.flare.ui.model.UiHandle
 import dev.dimension.flare.ui.model.UiIcon
 import dev.dimension.flare.ui.model.UiInstance
 import dev.dimension.flare.ui.model.UiInstanceMetadata
@@ -547,7 +548,7 @@ private fun Note.renderStatus(accountKey: MicroBlogKey): UiTimelineV2.Post {
                                     userActionsMenu(
                                         accountKey = accountKey,
                                         userKey = user.key,
-                                        handle = user.handle,
+                                        handle = user.handle.canonical,
                                     ),
                                 )
                                 add(ActionMenu.Divider)
@@ -763,7 +764,11 @@ internal fun UserLite.render(accountKey: MicroBlogKey): UiProfile {
     return UiProfile(
         avatar = avatarUrl.orEmpty(),
         nameInternal = parseName(name.orEmpty(), accountKey, emojis).toUi(),
-        handle = "@$username@$remoteHost",
+        handle =
+            UiHandle(
+                raw = username.orEmpty(),
+                host = remoteHost,
+            ),
         key = userKey,
         banner = null,
         description = null,
@@ -802,7 +807,11 @@ internal fun User.render(accountKey: MicroBlogKey): UiProfile {
     return UiProfile(
         avatar = avatarUrl.orEmpty(),
         nameInternal = parseName(name.orEmpty(), accountKey, emojis).toUi(),
-        handle = "@$username@$remoteHost",
+        handle =
+            UiHandle(
+                raw = username.orEmpty(),
+                host = remoteHost,
+            ),
         key = userKey,
         banner = bannerUrl,
         description =
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/VVO.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/VVO.kt
index d4ded9e15..7246befd3 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/VVO.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/VVO.kt
@@ -17,6 +17,7 @@ import dev.dimension.flare.model.vvoHost
 import dev.dimension.flare.model.vvoHostLong
 import dev.dimension.flare.model.vvoHostShort
 import dev.dimension.flare.ui.model.ClickEvent
+import dev.dimension.flare.ui.model.UiHandle
 import dev.dimension.flare.ui.model.UiIcon
 import dev.dimension.flare.ui.model.UiMedia
 import dev.dimension.flare.ui.model.UiNumber
@@ -152,7 +153,7 @@ private fun Status.renderStatusV2(accountKey: MicroBlogKey): UiTimelineV2.Post {
 
     val user = this.user?.render(accountKey)
     val isFromMe = user?.key == accountKey
-    val displayUser = user?.copy(handle = regionName ?: source ?: user.handle)
+    val displayUser = user
     val statusKey = MicroBlogKey(id = id, host = vvoHost)
     val canReblog = visible?.type == null || visible.type == 0L
     val url =
@@ -251,7 +252,7 @@ private fun Status.renderStatusV2(accountKey: MicroBlogKey): UiTimelineV2.Post {
                             *userActionsMenu(
                                 accountKey = accountKey,
                                 userKey = user?.key ?: statusKey,
-                                handle = user?.handle ?: "",
+                                handle = user?.handle?.canonical ?: "",
                             ).toTypedArray(),
                         ).toImmutableList(),
                 ),
@@ -283,7 +284,7 @@ private fun Comment.renderStatusV2(accountKey: MicroBlogKey): UiTimelineV2.Post
             ?.get("mid")
     val user = this.user?.render(accountKey)
     val isFromMe = user?.key == accountKey
-    val displayUser = user?.copy(handle = source ?: user.handle)
+    // val displayUser = user?.copy(handle = source ?: user.handle)
     val url =
         buildString {
             append("https://$vvoHostLong/")
@@ -331,7 +332,7 @@ private fun Comment.renderStatusV2(accountKey: MicroBlogKey): UiTimelineV2.Post
         images = media.toImmutableList(),
         sensitive = false,
         contentWarning = null,
-        user = displayUser,
+        user = user,
         quote = quote,
         content = renderVVOText(text.orEmpty(), accountKey).toUi(),
         actions =
@@ -427,7 +428,11 @@ internal fun User.render(accountKey: MicroBlogKey): UiProfile {
     return UiProfile(
         key = userKey,
         avatar = avatarHD ?: profileImageURL ?: "",
-        handle = "@$screenName@${vvoHost.removePrefix("m.")}",
+        handle =
+            UiHandle(
+                raw = screenName.orEmpty(),
+                host = vvoHost.removePrefix("m."),
+            ),
         nameInternal =
             Element("span")
                 .apply {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt
index 17ec40565..de291e8a5 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt
@@ -40,6 +40,7 @@ import dev.dimension.flare.ui.model.ClickEvent
 import dev.dimension.flare.ui.model.UiAccount
 import dev.dimension.flare.ui.model.UiCard
 import dev.dimension.flare.ui.model.UiDMItem
+import dev.dimension.flare.ui.model.UiHandle
 import dev.dimension.flare.ui.model.UiIcon
 import dev.dimension.flare.ui.model.UiList
 import dev.dimension.flare.ui.model.UiMedia
@@ -700,7 +701,7 @@ internal fun Tweet.renderStatus(
                                         userActionsMenu(
                                             accountKey = accountKey,
                                             userKey = user.key,
-                                            handle = user.handle,
+                                            handle = user.handle.canonical,
                                         ),
                                     )
                                     add(ActionMenu.Divider)
@@ -751,7 +752,11 @@ internal fun User.render(accountKey: MicroBlogKey): UiProfile {
                 .apply {
                     addChildren(TextNode(name))
                 }.toUi(),
-        handle = "@$screenName@${accountKey.host}",
+        handle =
+            UiHandle(
+                raw = screenName,
+                host = accountKey.host,
+            ),
         banner = legacy.profileBannerUrl,
         description =
             legacy.description?.takeIf { it.isNotEmpty() }?.let {
@@ -1190,7 +1195,11 @@ private fun Admin.render(accountKey: MicroBlogKey): UiProfile {
                 .apply {
                     addChildren(TextNode(displayName.orEmpty()))
                 }.toUi(),
-        handle = "@$twitterScreenName@${accountKey.host}",
+        handle =
+            UiHandle(
+                raw = twitterScreenName.orEmpty(),
+                host = accountKey.host,
+            ),
         platformType = PlatformType.xQt,
         clickEvent =
             ClickEvent.Deeplink(
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/compose/ComposePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/compose/ComposePresenter.kt
index dc33b8a27..5dccd480c 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/compose/ComposePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/compose/ComposePresenter.kt
@@ -163,7 +163,7 @@ public class ComposePresenter(
                                             val handleToAdd = mutableSetOf<String>()
                                             if (content.user?.key != selectedAccounts.firstOrNull()?.accountKey) {
                                                 content.user?.handle?.let {
-                                                    handleToAdd.add(it)
+                                                    handleToAdd.add(it.canonical)
                                                 }
                                             }
                                             content.content.data
@@ -179,9 +179,9 @@ public class ComposePresenter(
                                                             .split('/')
                                                     val userName = params.getOrNull(0)
                                                     val host = params.getOrNull(1)
-                                                    user.handle != "@$userName@$host"
+                                                    user.handle.canonical != "@$userName@$host"
                                                 }.filter {
-                                                    it.text() != content.user?.handle
+                                                    it.text() != content.user?.handle?.canonical
                                                 }.forEach {
                                                     handleToAdd.add(it.text())
                                                 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt
index 7009591d1..c04c93560 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt
@@ -17,17 +17,15 @@ import dev.dimension.flare.common.onEmpty
 import dev.dimension.flare.common.onError
 import dev.dimension.flare.common.onSuccess
 import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.database.cache.model.DbStatusWithUser
 import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
+import dev.dimension.flare.data.datasource.microblog.paging.TimelinePagingMapper
 import dev.dimension.flare.data.datasource.microblog.paging.TimelineRemoteMediator
 import dev.dimension.flare.data.datasource.microblog.paging.toPagingSource
 import dev.dimension.flare.data.datasource.microblog.pagingConfig
 import dev.dimension.flare.data.repository.LocalFilterRepository
 import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.PresenterBase
-import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
@@ -91,85 +89,10 @@ public abstract class TimelinePresenter :
             },
         ).flow.map { pagingData ->
             pagingData.map { item ->
-                mapping(item, loader.pagingKey, useDbKeyInItemKey)
+                TimelinePagingMapper.toUi(item, loader.pagingKey, useDbKeyInItemKey)
             }
         }
 
-    internal companion object {
-        fun mapping(
-            item: DbPagingTimelineWithStatus,
-            pagingKey: String,
-            useDbKeyInItemKey: Boolean,
-        ): UiTimelineV2 {
-            val root = mappingDbStatusWithUser(item.status.status, pagingKey, useDbKeyInItemKey)
-            val references =
-                item.status.references
-                    .mapNotNull { it.status }
-                    .map { mappingDbStatusWithUser(it, pagingKey, useDbKeyInItemKey) }
-            return when (root) {
-                is UiTimelineV2.Feed -> root
-                is UiTimelineV2.Message -> root
-                is UiTimelineV2.Post ->
-                    root.copy(
-                        parents =
-                            root.parents
-                                .map { parent ->
-                                    references.find { it.statusKey == parent.statusKey } as? UiTimelineV2.Post ?: parent
-                                }.toImmutableList(),
-                        quote =
-                            root.quote
-                                .map { quote ->
-                                    references.find { it.statusKey == quote.statusKey } as? UiTimelineV2.Post ?: quote
-                                }.toImmutableList(),
-                    )
-                is UiTimelineV2.User -> root
-                is UiTimelineV2.UserList ->
-                    root.copy(
-                        post =
-                            root.post?.let { post ->
-                                references.find { it.statusKey == post.statusKey } as? UiTimelineV2.Post ?: post
-                            },
-                    )
-            }
-        }
-
-        private fun mappingDbStatusWithUser(
-            data: DbStatusWithUser,
-            pagingKey: String,
-            useDbKeyInItemKey: Boolean,
-        ): UiTimelineV2 {
-            val root = data.data.content
-            val users = data.references.mapNotNull { it.user?.content }
-            return when (root) {
-                is UiTimelineV2.Feed -> root
-                is UiTimelineV2.Message ->
-                    root.copy(
-                        user = users.find { root.user?.key == it.key },
-                        extraKey = if (useDbKeyInItemKey) pagingKey else null,
-                    )
-                is UiTimelineV2.Post ->
-                    root.copy(
-                        user = users.find { root.user?.key == it.key },
-                        extraKey = if (useDbKeyInItemKey) pagingKey else null,
-                    )
-                is UiTimelineV2.User ->
-                    root.copy(
-                        value = users.find { root.value.key == it.key } ?: root.value,
-                        extraKey = if (useDbKeyInItemKey) pagingKey else null,
-                    )
-                is UiTimelineV2.UserList ->
-                    root.copy(
-                        users =
-                            root.users
-                                .map { user ->
-                                    users.find { user.key == it.key } ?: user
-                                }.toImmutableList(),
-                        extraKey = if (useDbKeyInItemKey) pagingKey else null,
-                    )
-            }
-        }
-    }
-
     protected open suspend fun transform(data: UiTimelineV2): UiTimelineV2 = data
 
     private fun networkPager(loader: RemoteLoader<UiTimelineV2>): Flow<PagingData<UiTimelineV2>> =
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt
index a106d8ec4..70ee4584d 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt
@@ -21,6 +21,7 @@ import dev.dimension.flare.data.repository.accountServiceProvider
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.ClickEvent
+import dev.dimension.flare.ui.model.UiHandle
 import dev.dimension.flare.ui.model.UiIcon
 import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.UiRelation
@@ -413,7 +414,14 @@ public class ProfileWithUserNameAndHostPresenter(
                 repository = accountRepository,
             ).flatMap { service ->
                 remember(service) {
-                    (service as UserDataSource).userHandler.userByHandleAndHost(userName, host)
+                    (service as UserDataSource)
+                        .userHandler
+                        .userByHandleAndHost(
+                            UiHandle(
+                                raw = userName,
+                                host = host,
+                            ),
+                        )
                 }.collectAsState().toUi()
             }
         return object : UserState {
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt
index f7566dbda..f7d9e0445 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt
@@ -5,31 +5,39 @@ import androidx.paging.PagingSource
 import androidx.paging.testing.TestPager
 import androidx.room.Room
 import androidx.sqlite.driver.bundled.BundledSQLiteDriver
+import com.fleeksoft.ksoup.nodes.Element
 import dev.dimension.flare.RobolectricTest
+import dev.dimension.flare.common.TestFormatter
 import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
-import dev.dimension.flare.data.database.cache.model.DbStatus
-import dev.dimension.flare.data.database.cache.model.DbStatusWithUser
-import dev.dimension.flare.data.database.cache.model.DbUser
-import dev.dimension.flare.data.database.cache.model.StatusContent
-import dev.dimension.flare.data.database.cache.model.UserContent
+import dev.dimension.flare.data.datasource.microblog.paging.TimelinePagingMapper
 import dev.dimension.flare.memoryDatabaseBuilder
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
-import dev.dimension.flare.model.PlatformType
 import dev.dimension.flare.model.ReferenceType
+import dev.dimension.flare.ui.humanizer.PlatformFormatter
+import dev.dimension.flare.ui.model.ClickEvent
+import dev.dimension.flare.ui.model.UiHandle
+import dev.dimension.flare.ui.model.UiProfile
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.render.toUi
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toPersistentList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
+import org.koin.core.context.startKoin
+import org.koin.core.context.stopKoin
+import org.koin.dsl.module
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertIs
 import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
 import kotlin.time.Clock
-import kotlin.uuid.Uuid
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class MicroblogTest : RobolectricTest() {
@@ -37,310 +45,247 @@ class MicroblogTest : RobolectricTest() {
 
     @BeforeTest
     fun setup() {
-        val db =
+        db =
             Room
                 .memoryDatabaseBuilder<CacheDatabase>()
                 .setDriver(BundledSQLiteDriver())
                 .setQueryCoroutineContext(Dispatchers.Unconfined)
                 .build()
-        this.db = db
+
+        startKoin {
+            modules(
+                module {
+                    single { db }
+                    single<PlatformFormatter> { TestFormatter() }
+                },
+            )
+        }
     }
 
     @AfterTest
     fun tearDown() {
         db.close()
+        stopKoin()
     }
 
     @Test
-    fun testSaveToDatabaseWithTestContent() =
+    fun saveToDatabasePersistsUserAndStatus() =
         runTest {
-            val userKey = MicroBlogKey(id = Uuid.random().toString(), host = "test.com")
-            val statusKey = MicroBlogKey(id = Uuid.random().toString(), host = "test.com")
-            val accountKey = MicroBlogKey(id = Uuid.random().toString(), host = "test.com")
-
-            val userContent = UserContent.Test("test user content")
-            val statusContent = StatusContent.Test("test status content")
-
-            val user =
-                DbUser(
-                    userKey = userKey,
-                    platformType = PlatformType.Mastodon,
-                    name = "Test User",
-                    handle = "testuser",
-                    host = "test.com",
-                    content = userContent,
-                )
-
-            val status =
-                DbStatus(
-                    statusKey = statusKey,
-                    accountType = AccountType.Specific(accountKey),
-                    userKey = userKey,
-                    content = statusContent,
-                    text = "test status text",
-                    createdAt = Clock.System.now(),
-                )
-
-            val statusWithUser =
-                DbStatusWithUser(
-                    data = status,
-                    user = user,
-                )
-
-            val timelineItem =
-                createDbPagingTimelineWithStatus(
+            val accountKey = MicroBlogKey(id = "account", host = "test.com")
+            val user = createUser(MicroBlogKey(id = "user-1", host = "test.com"), "User One")
+            val post =
+                createPost(
                     accountKey = accountKey,
-                    pagingKey = "home",
-                    sortId = 1L,
-                    status = statusWithUser,
-                    references = emptyMap(),
+                    user = user,
+                    statusKey = MicroBlogKey(id = "status-1", host = "test.com"),
+                    text = "status text",
                 )
 
+            val timelineItem = TimelinePagingMapper.toDb(post, pagingKey = "home")
             saveToDatabase(db, listOf(timelineItem))
 
-            // Verify User
-            val savedUser =
-                db
-                    .userDao()
-                    .findByKey(userKey)
-                    .first()
+            val savedUser = db.userDao().findByKey(user.key).first()
             assertNotNull(savedUser)
-            assertEquals(userContent, savedUser.content)
+            assertEquals(user.key, savedUser.userKey)
+            assertEquals("User One", savedUser.content.name.raw)
 
-            // Verify Status
-            val savedStatus =
-                db
-                    .statusDao()
-                    .get(statusKey, AccountType.Specific(accountKey))
-                    .first()
+            val savedStatus = db.statusDao().get(post.statusKey, AccountType.Specific(accountKey)).first()
             assertNotNull(savedStatus)
-            assertEquals(statusContent, savedStatus.content)
+            assertEquals(post.statusKey, savedStatus.content.statusKey)
+            requireNotNull(savedStatus.text)
+            kotlin.test.assertTrue(savedStatus.text.contains("status text"))
         }
 
     @Test
-    fun testSaveToDatabaseWithReference() =
+    fun saveToDatabasePersistsReferences() =
         runTest {
-            val accountKey = MicroBlogKey(id = Uuid.random().toString(), host = "test.com")
-
-            // Main Status
-            val mainUserKey = MicroBlogKey(id = Uuid.random().toString(), host = "test.com")
-            val mainStatusKey = MicroBlogKey(id = Uuid.random().toString(), host = "test.com")
-            val mainUserContent = UserContent.Test("main user content")
-            val mainStatusContent = StatusContent.Test("main status content")
-
-            val mainUser =
-                DbUser(
-                    userKey = mainUserKey,
-                    platformType = PlatformType.Mastodon,
-                    name = "Main User",
-                    handle = "mainuser",
-                    host = "test.com",
-                    content = mainUserContent,
-                )
-
-            val mainStatus =
-                DbStatus(
-                    statusKey = mainStatusKey,
-                    accountType = AccountType.Specific(accountKey),
-                    userKey = mainUserKey,
-                    content = mainStatusContent,
-                    text = "main status text",
-                    createdAt = Clock.System.now(),
-                )
-
-            val mainStatusWithUser =
-                DbStatusWithUser(
-                    data = mainStatus,
-                    user = mainUser,
-                )
-
-            // Referenced Status
-            val refUserKey = MicroBlogKey(id = Uuid.random().toString(), host = "test.com")
-            val refStatusKey = MicroBlogKey(id = Uuid.random().toString(), host = "test.com")
-            val refUserContent = UserContent.Test("ref user content")
-            val refStatusContent = StatusContent.Test("ref status content")
-
-            val refUser =
-                DbUser(
-                    userKey = refUserKey,
-                    platformType = PlatformType.Mastodon,
-                    name = "Ref User",
-                    handle = "refuser",
-                    host = "test.com",
-                    content = refUserContent,
-                )
-
-            val refStatus =
-                DbStatus(
-                    statusKey = refStatusKey,
-                    accountType = AccountType.Specific(accountKey),
-                    userKey = refUserKey,
-                    content = refStatusContent,
-                    text = "ref status text",
-                    createdAt = Clock.System.now(),
-                )
+            val accountKey = MicroBlogKey(id = "account", host = "test.com")
 
-            val refStatusWithUser =
-                DbStatusWithUser(
-                    data = refStatus,
+            val refUser = createUser(MicroBlogKey(id = "ref-user", host = "test.com"), "Ref User")
+            val refPost =
+                createPost(
+                    accountKey = accountKey,
                     user = refUser,
+                    statusKey = MicroBlogKey(id = "ref-status", host = "test.com"),
+                    text = "ref status",
                 )
 
-            val references = mapOf(ReferenceType.Reply to listOf(refStatusWithUser))
-
-            val timelineItem =
-                createDbPagingTimelineWithStatus(
+            val mainUser = createUser(MicroBlogKey(id = "main-user", host = "test.com"), "Main User")
+            val mainPost =
+                createPost(
                     accountKey = accountKey,
-                    pagingKey = "home",
-                    sortId = 1L,
-                    status = mainStatusWithUser,
-                    references = references,
+                    user = mainUser,
+                    statusKey = MicroBlogKey(id = "main-status", host = "test.com"),
+                    text = "main status",
+                    parents = persistentListOf(refPost),
                 )
 
+            val timelineItem = TimelinePagingMapper.toDb(mainPost, pagingKey = "home")
             saveToDatabase(db, listOf(timelineItem))
 
-            // Verify Main Status
-            val savedMainStatus =
-                db
-                    .statusDao()
-                    .get(mainStatusKey, AccountType.Specific(accountKey))
-                    .first()
+            val savedMainStatus = db.statusDao().get(mainPost.statusKey, AccountType.Specific(accountKey)).first()
             assertNotNull(savedMainStatus)
-            assertEquals(mainStatusContent, savedMainStatus.content)
-
-            // Verify Referenced Status
-            val savedRefStatus =
-                db
-                    .statusDao()
-                    .get(refStatusKey, AccountType.Specific(accountKey))
-                    .first()
+            val savedRefStatus = db.statusDao().get(refPost.statusKey, AccountType.Specific(accountKey)).first()
             assertNotNull(savedRefStatus)
-            assertEquals(refStatusContent, savedRefStatus.content)
 
-            // Verify Reference
-            val savedReferences = db.statusReferenceDao().getByStatusKey(mainStatusKey)
+            val savedReferences = db.statusReferenceDao().getByStatusKey(mainPost.statusKey)
             assertEquals(1, savedReferences.size)
-            val savedRef = savedReferences.first()
-            assertEquals(ReferenceType.Reply, savedRef.referenceType)
-            assertEquals(refStatusKey, savedRef.referenceStatusKey)
+            assertEquals(refPost.statusKey, savedReferences.first().referenceStatusKey)
         }
 
     @Test
-    fun testReferencesClearedWhenMissingInSubsequentInsert() =
+    fun referencesRemainWhenSubsequentInsertHasNoReferences() =
         runTest {
             val accountKey = MicroBlogKey(id = "account", host = "test.com")
 
-            val mainUserKey = MicroBlogKey(id = "main_user", host = "test.com")
-            val mainStatusKey = MicroBlogKey(id = "main_status", host = "test.com")
-            val mainUserContent = UserContent.Test("main user content")
-            val mainStatusContent = StatusContent.Test("main status content")
-
-            val mainUser =
-                DbUser(
-                    userKey = mainUserKey,
-                    platformType = PlatformType.Mastodon,
-                    name = "Main User",
-                    handle = "mainuser",
-                    host = "test.com",
-                    content = mainUserContent,
-                )
-
-            val mainStatus =
-                DbStatus(
-                    statusKey = mainStatusKey,
-                    accountType = AccountType.Specific(accountKey),
-                    userKey = mainUserKey,
-                    content = mainStatusContent,
-                    text = "main status text",
-                    createdAt = Clock.System.now(),
+            val refUser = createUser(MicroBlogKey(id = "ref-user", host = "test.com"), "Ref User")
+            val refPost =
+                createPost(
+                    accountKey = accountKey,
+                    user = refUser,
+                    statusKey = MicroBlogKey(id = "ref-status", host = "test.com"),
+                    text = "ref status",
                 )
 
-            val mainStatusWithUser =
-                DbStatusWithUser(
-                    data = mainStatus,
+            val mainUser = createUser(MicroBlogKey(id = "main-user", host = "test.com"), "Main User")
+            val withRef =
+                createPost(
+                    accountKey = accountKey,
                     user = mainUser,
+                    statusKey = MicroBlogKey(id = "main-status", host = "test.com"),
+                    text = "main status",
+                    parents = persistentListOf(refPost),
                 )
 
-            val refUserKey = MicroBlogKey(id = "ref_user", host = "test.com")
-            val refStatusKey = MicroBlogKey(id = "ref_status", host = "test.com")
-            val refUserContent = UserContent.Test("ref user content")
-            val refStatusContent = StatusContent.Test("ref status content")
-
-            val refUser =
-                DbUser(
-                    userKey = refUserKey,
-                    platformType = PlatformType.Mastodon,
-                    name = "Ref User",
-                    handle = "refuser",
-                    host = "test.com",
-                    content = refUserContent,
-                )
+            saveToDatabase(db, listOf(TimelinePagingMapper.toDb(withRef, pagingKey = "home")))
+            assertEquals(1, db.statusReferenceDao().getByStatusKey(withRef.statusKey).size)
 
-            val refStatus =
-                DbStatus(
-                    statusKey = refStatusKey,
-                    accountType = AccountType.Specific(accountKey),
-                    userKey = refUserKey,
-                    content = refStatusContent,
-                    text = "ref status text",
-                    createdAt = Clock.System.now(),
-                )
+            val withoutRef = withRef.copy(parents = persistentListOf())
+            saveToDatabase(db, listOf(TimelinePagingMapper.toDb(withoutRef, pagingKey = "home")))
 
-            val refStatusWithUser =
-                DbStatusWithUser(
-                    data = refStatus,
-                    user = refUser,
-                )
+            val refsAfter = db.statusReferenceDao().getByStatusKey(withRef.statusKey)
+            assertEquals(1, refsAfter.size)
 
-            val initialReferences = mapOf(ReferenceType.Reply to listOf(refStatusWithUser))
+            val paging = db.pagingTimelineDao().getPagingSource("home")
+            val pager = TestPager(config = PagingConfig(pageSize = 20), paging)
+            val refreshResult = pager.refresh()
+            assertIs<PagingSource.LoadResult.Page<Int, DbPagingTimelineWithStatus>>(refreshResult)
+        }
 
-            val initialTimelineItem =
-                createDbPagingTimelineWithStatus(
+    @Test
+    fun toDbMapsReplyReference() =
+        runTest {
+            val accountKey = MicroBlogKey(id = "account", host = "test.com")
+            val rootUser = createUser(MicroBlogKey(id = "root-user", host = "test.com"), "Root User")
+            val parentUser = createUser(MicroBlogKey(id = "parent-user", host = "test.com"), "Parent User")
+            val parentPost =
+                createPost(
                     accountKey = accountKey,
-                    pagingKey = "home",
-                    sortId = 1L,
-                    status = mainStatusWithUser,
-                    references = initialReferences,
+                    user = parentUser,
+                    statusKey = MicroBlogKey(id = "parent-status", host = "test.com"),
+                    text = "parent",
                 )
-
-            saveToDatabase(db, listOf(initialTimelineItem))
-
-            val savedRefsBefore = db.statusReferenceDao().getByStatusKey(mainStatusKey)
-            assertEquals(1, savedRefsBefore.size)
-
-            val updatedTimelineItem =
-                createDbPagingTimelineWithStatus(
+            val rootPost =
+                createPost(
                     accountKey = accountKey,
-                    pagingKey = "home",
-                    sortId = 2L,
-                    status = mainStatusWithUser,
-                    references = emptyMap(),
+                    user = rootUser,
+                    statusKey = MicroBlogKey(id = "root-status", host = "test.com"),
+                    text = "root",
+                    parents = listOf(parentPost),
                 )
 
-            saveToDatabase(db, listOf(updatedTimelineItem))
-
-            val savedRefsAfter = db.statusReferenceDao().getByStatusKey(mainStatusKey)
-            assertEquals(1, savedRefsAfter.size)
-
-            val savedMainStatus =
-                db
-                    .statusDao()
-                    .get(mainStatusKey, AccountType.Specific(accountKey))
+            val mapped = TimelinePagingMapper.toDb(rootPost, pagingKey = "home")
+            assertEquals(rootPost.statusKey, mapped.timeline.statusKey)
+            assertEquals(1, mapped.status.references.size)
+            val reference =
+                mapped.status.references
                     .first()
-            assertNotNull(savedMainStatus)
-            assertEquals(mainStatusContent, savedMainStatus.content)
+                    .reference
+            assertEquals(ReferenceType.Reply, reference.referenceType)
+            assertEquals(rootPost.statusKey, reference.statusKey)
+            assertEquals(parentPost.statusKey, reference.referenceStatusKey)
+        }
 
-            val savedRefStatus =
-                db
-                    .statusDao()
-                    .get(refStatusKey, AccountType.Specific(accountKey))
-                    .first()
-            assertNotNull(savedRefStatus)
-            assertEquals(refStatusContent, savedRefStatus.content)
+    @Test
+    fun toUiSetsExtraKeyForRootAndReferences() =
+        runTest {
+            val accountKey = MicroBlogKey(id = "account", host = "test.com")
+            val rootUser = createUser(MicroBlogKey(id = "root-user", host = "test.com"), "Root User")
+            val parentUser = createUser(MicroBlogKey(id = "parent-user", host = "test.com"), "Parent User")
+            val parentPost =
+                createPost(
+                    accountKey = accountKey,
+                    user = parentUser,
+                    statusKey = MicroBlogKey(id = "parent-status", host = "test.com"),
+                    text = "parent",
+                )
+            val rootPost =
+                createPost(
+                    accountKey = accountKey,
+                    user = rootUser,
+                    statusKey = MicroBlogKey(id = "root-status", host = "test.com"),
+                    text = "root",
+                    parents = listOf(parentPost),
+                )
 
-            val paging = db.pagingTimelineDao().getPagingSource("home")
-            val pager = TestPager(config = PagingConfig(pageSize = 20), paging)
-            val refreshResult = pager.refresh()
-            assertIs<PagingSource.LoadResult.Page<Int, DbPagingTimelineWithStatus>>(refreshResult)
+            val mapped = TimelinePagingMapper.toDb(rootPost, pagingKey = "home")
+            val ui = TimelinePagingMapper.toUi(mapped, pagingKey = "home", useDbKeyInItemKey = true)
+            val post = assertIs<UiTimelineV2.Post>(ui)
+            assertEquals("home", post.extraKey)
+            assertEquals(1, post.parents.size)
+            assertEquals("home", post.parents.first().extraKey)
+            assertEquals(parentPost.statusKey, post.parents.first().statusKey)
         }
+
+    private fun createUser(
+        key: MicroBlogKey,
+        name: String,
+    ): UiProfile =
+        UiProfile(
+            key = key,
+            handle =
+                UiHandle(
+                    raw = key.id,
+                    host = key.host,
+                ),
+            avatar = "https://${key.host}/${key.id}.png",
+            nameInternal = Element("span").apply { appendText(name) }.toUi(),
+            platformType = dev.dimension.flare.model.PlatformType.Mastodon,
+            clickEvent = ClickEvent.Noop,
+            banner = null,
+            description = null,
+            matrices = UiProfile.Matrices(fansCount = 0, followsCount = 0, statusesCount = 0, platformFansCount = "0"),
+            mark = persistentListOf(),
+            bottomContent = null,
+        )
+
+    private fun createPost(
+        accountKey: MicroBlogKey,
+        user: UiProfile,
+        statusKey: MicroBlogKey,
+        text: String,
+        parents: List<UiTimelineV2.Post> = emptyList(),
+    ): UiTimelineV2.Post =
+        UiTimelineV2.Post(
+            message = null,
+            platformType = dev.dimension.flare.model.PlatformType.Mastodon,
+            images = persistentListOf(),
+            sensitive = false,
+            contentWarning = null,
+            user = user,
+            quote = persistentListOf(),
+            content = Element("span").apply { appendText(text) }.toUi(),
+            actions = persistentListOf(),
+            poll = null,
+            statusKey = statusKey,
+            card = null,
+            createdAt = Clock.System.now().toUi(),
+            emojiReactions = persistentListOf(),
+            sourceChannel = null,
+            visibility = null,
+            replyToHandle = null,
+            parents = parents.toPersistentList(),
+            clickEvent = ClickEvent.Noop,
+            accountType = AccountType.Specific(accountKey),
+        )
 }
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/PostEventHandlerTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/PostEventHandlerTest.kt
new file mode 100644
index 000000000..3619bd9f0
--- /dev/null
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/PostEventHandlerTest.kt
@@ -0,0 +1,299 @@
+package dev.dimension.flare.data.datasource.microblog
+
+import androidx.room.Room
+import androidx.sqlite.driver.bundled.BundledSQLiteDriver
+import com.fleeksoft.ksoup.nodes.Element
+import dev.dimension.flare.RobolectricTest
+import dev.dimension.flare.common.SerializableImmutableList
+import dev.dimension.flare.common.TestFormatter
+import dev.dimension.flare.data.database.cache.CacheDatabase
+import dev.dimension.flare.data.database.cache.model.DbPagingTimeline
+import dev.dimension.flare.data.database.cache.model.DbStatus
+import dev.dimension.flare.data.datasource.microblog.handler.PostEventHandler
+import dev.dimension.flare.memoryDatabaseBuilder
+import dev.dimension.flare.model.AccountType
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.model.PlatformType
+import dev.dimension.flare.ui.humanizer.PlatformFormatter
+import dev.dimension.flare.ui.model.ClickEvent
+import dev.dimension.flare.ui.model.UiHandle
+import dev.dimension.flare.ui.model.UiNumber
+import dev.dimension.flare.ui.model.UiPoll
+import dev.dimension.flare.ui.model.UiProfile
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.render.toUi
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.advanceUntilIdle
+import kotlinx.coroutines.test.runTest
+import org.koin.core.context.startKoin
+import org.koin.core.context.stopKoin
+import org.koin.dsl.module
+import kotlin.test.AfterTest
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+import kotlin.time.Clock
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class PostEventHandlerTest : RobolectricTest() {
+    private lateinit var db: CacheDatabase
+    private lateinit var fakeRemoteHandler: FakeRemoteHandler
+    private lateinit var handler: PostEventHandler
+
+    private val accountKey = MicroBlogKey(id = "user-1", host = "test.social")
+    private val postKey = MicroBlogKey(id = "post-1", host = "test.social")
+
+    @BeforeTest
+    fun setup() {
+        db =
+            Room
+                .memoryDatabaseBuilder<CacheDatabase>()
+                .setDriver(BundledSQLiteDriver())
+                .setQueryCoroutineContext(Dispatchers.Unconfined)
+                .build()
+
+        fakeRemoteHandler = FakeRemoteHandler()
+    }
+
+    @AfterTest
+    fun tearDown() {
+        db.close()
+        stopKoin()
+    }
+
+    @Test
+    fun updateActionMenuEventAppliesOptimisticUpdate() =
+        runTest {
+            startKoin {
+                modules(
+                    module {
+                        single { db }
+                        single<CoroutineScope> { this@runTest }
+                        single<PlatformFormatter> { TestFormatter() }
+                    },
+                )
+            }
+
+            val original = createPost(actions = persistentListOf(createMenuItem(updateKey = "like", count = 1)))
+            insertPost(original)
+
+            handler = PostEventHandler(accountKey = accountKey, handler = fakeRemoteHandler)
+            handler.handleEvent(TestUpdateMenuEvent(postKey = postKey, updateKey = "like", nextCount = 2))
+            advanceUntilIdle()
+
+            val updated = readPost()
+            assertNotNull(updated)
+            val updatedLike = updated.actions.filterIsInstance<ActionMenu.Item>().first { it.updateKey == "like" }
+            assertEquals(2, updatedLike.count?.value)
+            assertEquals(1, fakeRemoteHandler.callCount)
+        }
+
+    @Test
+    fun updateActionMenuEventFailureRevertsOriginalData() =
+        runTest {
+            startKoin {
+                modules(
+                    module {
+                        single { db }
+                        single<CoroutineScope> { this@runTest }
+                        single<PlatformFormatter> { TestFormatter() }
+                    },
+                )
+            }
+
+            val original = createPost(actions = persistentListOf(createMenuItem(updateKey = "like", count = 1)))
+            insertPost(original)
+
+            fakeRemoteHandler.shouldFail = true
+            handler = PostEventHandler(accountKey = accountKey, handler = fakeRemoteHandler)
+            handler.handleEvent(TestUpdateMenuEvent(postKey = postKey, updateKey = "like", nextCount = 2))
+            advanceUntilIdle()
+
+            val reverted = readPost()
+            assertNotNull(reverted)
+            val like = reverted.actions.filterIsInstance<ActionMenu.Item>().first { it.updateKey == "like" }
+            assertEquals(1, like.count?.value)
+            assertEquals(1, fakeRemoteHandler.callCount)
+        }
+
+    @Test
+    fun pollEventUpdatesOwnVotesAndOptionCounts() =
+        runTest {
+            startKoin {
+                modules(
+                    module {
+                        single { db }
+                        single<CoroutineScope> { this@runTest }
+                        single<PlatformFormatter> { TestFormatter() }
+                    },
+                )
+            }
+
+            val poll =
+                UiPoll(
+                    id = "poll-1",
+                    options =
+                        persistentListOf(
+                            UiPoll.Option(title = "A", votesCount = 1, percentage = 0.5f),
+                            UiPoll.Option(title = "B", votesCount = 2, percentage = 0.5f),
+                        ),
+                    multiple = false,
+                    ownVotes = persistentListOf(),
+                    voteEvent = null,
+                    expiresAt = null,
+                )
+            insertPost(createPost(poll = poll))
+
+            handler = PostEventHandler(accountKey = accountKey, handler = fakeRemoteHandler)
+            handler.handleEvent(
+                PostEvent.Mastodon.Vote(
+                    id = "poll-1",
+                    accountKey = accountKey,
+                    postKey = postKey,
+                    options = persistentListOf(1),
+                ),
+            )
+            advanceUntilIdle()
+
+            val updated = readPost()
+            assertNotNull(updated)
+            val updatedPoll = updated.poll
+            assertNotNull(updatedPoll)
+            assertEquals(listOf(1), updatedPoll.ownVotes)
+            assertEquals(1, updatedPoll.options[0].votesCount)
+            assertEquals(3, updatedPoll.options[1].votesCount)
+        }
+
+    @Test
+    fun deleteFromCacheRemovesStatusAndPagingEntry() =
+        runTest {
+            startKoin {
+                modules(
+                    module {
+                        single { db }
+                        single<CoroutineScope> { this@runTest }
+                        single<PlatformFormatter> { TestFormatter() }
+                    },
+                )
+            }
+
+            insertPost(createPost())
+            db.pagingTimelineDao().insertAll(listOf(DbPagingTimeline(pagingKey = "home", statusKey = postKey, sortId = 1L)))
+
+            handler = PostEventHandler(accountKey = accountKey, handler = fakeRemoteHandler)
+            handler.deleteFromCache(postKey)
+
+            val saved = db.statusDao().get(postKey, AccountType.Specific(accountKey)).first()
+            assertNull(saved)
+            val exists = db.pagingTimelineDao().existsPaging(accountKey, "home")
+            assertTrue(!exists)
+        }
+
+    private suspend fun insertPost(post: UiTimelineV2.Post) {
+        db.statusDao().insert(
+            DbStatus(
+                statusKey = postKey,
+                accountType = AccountType.Specific(accountKey),
+                content = post,
+                text = post.content.raw,
+            ),
+        )
+    }
+
+    private suspend fun readPost(): UiTimelineV2.Post? =
+        db
+            .statusDao()
+            .get(postKey, AccountType.Specific(accountKey))
+            .first()
+            ?.content as? UiTimelineV2.Post
+
+    private fun createPost(
+        actions: SerializableImmutableList<ActionMenu> = persistentListOf(),
+        poll: UiPoll? = null,
+    ): UiTimelineV2.Post =
+        UiTimelineV2.Post(
+            message = null,
+            platformType = PlatformType.Mastodon,
+            images = persistentListOf(),
+            sensitive = false,
+            contentWarning = null,
+            user = createProfile(),
+            quote = persistentListOf(),
+            content = Element("span").apply { appendText("post content") }.toUi(),
+            actions = actions,
+            poll = poll,
+            statusKey = postKey,
+            card = null,
+            createdAt = Clock.System.now().toUi(),
+            emojiReactions = persistentListOf(),
+            sourceChannel = null,
+            visibility = null,
+            replyToHandle = null,
+            parents = persistentListOf(),
+            clickEvent = ClickEvent.Noop,
+            accountType = AccountType.Specific(accountKey),
+        )
+
+    private fun createProfile(): UiProfile =
+        UiProfile(
+            key = MicroBlogKey("author", "test.social"),
+            handle =
+                UiHandle(
+                    raw = "author",
+                    host = "test.social",
+                ),
+            avatar = "https://test.social/author.png",
+            nameInternal = Element("span").apply { appendText("Author") }.toUi(),
+            platformType = PlatformType.Mastodon,
+            clickEvent = ClickEvent.Noop,
+            banner = null,
+            description = null,
+            matrices = UiProfile.Matrices(fansCount = 0, followsCount = 0, statusesCount = 0, platformFansCount = "0"),
+            mark = persistentListOf(),
+            bottomContent = null,
+        )
+
+    private fun createMenuItem(
+        updateKey: String,
+        count: Long,
+    ) = ActionMenu.Item(
+        updateKey = updateKey,
+        text = ActionMenu.Item.Text.Raw("like"),
+        count = UiNumber(count),
+    )
+
+    private class FakeRemoteHandler : PostEventHandler.Handler {
+        var shouldFail: Boolean = false
+        var callCount: Int = 0
+
+        override suspend fun handle(
+            event: PostEvent,
+            updater: DatabaseUpdater,
+        ) {
+            callCount++
+            if (shouldFail) {
+                error("remote failed")
+            }
+        }
+    }
+
+    private data class TestUpdateMenuEvent(
+        override val postKey: MicroBlogKey,
+        val updateKey: String,
+        val nextCount: Long,
+    ) : UpdatePostActionMenuEvent {
+        override fun nextActionMenu(): ActionMenu.Item =
+            ActionMenu.Item(
+                updateKey = updateKey,
+                text = ActionMenu.Item.Text.Raw("updated"),
+                count = UiNumber(nextCount),
+            )
+    }
+}
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/EmojiHandlerTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/EmojiHandlerTest.kt
new file mode 100644
index 000000000..07004aa12
--- /dev/null
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/EmojiHandlerTest.kt
@@ -0,0 +1,177 @@
+package dev.dimension.flare.data.datasource.microblog.handler
+
+import androidx.paging.LoadState
+import androidx.room.Room
+import androidx.sqlite.driver.bundled.BundledSQLiteDriver
+import dev.dimension.flare.RobolectricTest
+import dev.dimension.flare.common.CacheState
+import dev.dimension.flare.data.database.cache.CacheDatabase
+import dev.dimension.flare.data.database.cache.model.DbEmoji
+import dev.dimension.flare.data.database.cache.model.EmojiContent
+import dev.dimension.flare.data.datasource.microblog.loader.EmojiLoader
+import dev.dimension.flare.memoryDatabaseBuilder
+import dev.dimension.flare.ui.model.UiEmoji
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.persistentMapOf
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.drop
+import kotlinx.coroutines.flow.filterIsInstance
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.runTest
+import org.koin.core.context.startKoin
+import org.koin.core.context.stopKoin
+import org.koin.dsl.module
+import kotlin.test.AfterTest
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+class EmojiHandlerTest : RobolectricTest() {
+    private lateinit var db: CacheDatabase
+    private lateinit var fakeLoader: FakeEmojiLoader
+    private lateinit var handler: EmojiHandler
+
+    private val host = "test.social"
+
+    @BeforeTest
+    fun setup() {
+        db =
+            Room
+                .memoryDatabaseBuilder<CacheDatabase>()
+                .setDriver(BundledSQLiteDriver())
+                .setQueryCoroutineContext(Dispatchers.Unconfined)
+                .build()
+
+        fakeLoader = FakeEmojiLoader()
+
+        startKoin {
+            modules(
+                module {
+                    single { db }
+                },
+            )
+        }
+
+        handler =
+            EmojiHandler(
+                host = host,
+                loader = fakeLoader,
+            )
+    }
+
+    @AfterTest
+    fun tearDown() {
+        db.close()
+        stopKoin()
+    }
+
+    @Test
+    fun refreshWritesLoaderResultIntoDatabase() =
+        runTest {
+            val expected =
+                persistentMapOf(
+                    "People" to
+                        persistentListOf(
+                            createEmoji(shortcode = "smile", category = "People"),
+                        ),
+                )
+            fakeLoader.nextResult = expected
+
+            val state =
+                handler.emoji.refreshState
+                    .drop(1)
+                    .first()
+            assertTrue(state is LoadState.NotLoading)
+
+            val saved = db.emojiDao().get(host).first()
+            assertNotNull(saved)
+            assertEquals(expected, saved.content.data)
+        }
+
+    @Test
+    fun dataReadsCachedEmojiFromDatabase() =
+        runTest {
+            val cached =
+                persistentMapOf(
+                    "Food" to
+                        persistentListOf(
+                            createEmoji(shortcode = "apple", category = "Food"),
+                        ),
+                )
+            db.emojiDao().insert(DbEmoji(host = host, content = EmojiContent(cached)))
+
+            val state =
+                handler.emoji.data
+                    .filterIsInstance<CacheState.Success<ImmutableMap<String, ImmutableList<UiEmoji>>>>()
+                    .first()
+            assertEquals(cached, state.data)
+        }
+
+    @Test
+    fun refreshFailureDoesNotOverrideExistingCache() =
+        runTest {
+            val existing =
+                persistentMapOf(
+                    "People" to
+                        persistentListOf(
+                            createEmoji(shortcode = "wave", category = "People"),
+                        ),
+                )
+            db.emojiDao().insert(DbEmoji(host = host, content = EmojiContent(existing)))
+            fakeLoader.shouldFail = true
+
+            val state =
+                handler.emoji.refreshState
+                    .drop(1)
+                    .first()
+            assertTrue(state is LoadState.Error)
+
+            val saved = db.emojiDao().get(host).first()
+            assertNotNull(saved)
+            assertEquals(existing, saved.content.data)
+        }
+
+    @Test
+    fun refreshFailureWithNoCacheKeepsDatabaseEmpty() =
+        runTest {
+            fakeLoader.shouldFail = true
+
+            val state =
+                handler.emoji.refreshState
+                    .drop(1)
+                    .first()
+            assertTrue(state is LoadState.Error)
+
+            val saved = db.emojiDao().get(host).first()
+            assertNull(saved)
+        }
+
+    private fun createEmoji(
+        shortcode: String,
+        category: String,
+    ): UiEmoji =
+        UiEmoji(
+            shortcode = shortcode,
+            url = "https://$host/$shortcode.png",
+            category = category,
+            searchKeywords = persistentListOf(shortcode),
+            insertText = ":$shortcode:",
+        )
+
+    private class FakeEmojiLoader : EmojiLoader {
+        var shouldFail = false
+        var nextResult: ImmutableMap<String, ImmutableList<UiEmoji>> = persistentMapOf()
+
+        override suspend fun emojis(): ImmutableMap<String, ImmutableList<UiEmoji>> {
+            if (shouldFail) {
+                error("loader failed")
+            }
+            return nextResult
+        }
+    }
+}
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListHandlerTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/ListHandlerTest.kt
similarity index 96%
rename from shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListHandlerTest.kt
rename to shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/ListHandlerTest.kt
index 23b3e04e9..e23febed8 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListHandlerTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/ListHandlerTest.kt
@@ -1,11 +1,12 @@
-package dev.dimension.flare.data.datasource.microblog.list
+package dev.dimension.flare.data.datasource.microblog.handler
 
 import androidx.paging.testing.asSnapshot
 import androidx.room.Room
 import androidx.sqlite.driver.bundled.BundledSQLiteDriver
 import dev.dimension.flare.RobolectricTest
 import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.datasource.microblog.handler.ListHandler
+import dev.dimension.flare.data.datasource.microblog.list.ListMetaData
+import dev.dimension.flare.data.datasource.microblog.list.ListMetaDataType
 import dev.dimension.flare.data.datasource.microblog.loader.ListLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
@@ -22,6 +23,7 @@ import kotlinx.coroutines.test.runTest
 import org.koin.core.context.startKoin
 import org.koin.core.context.stopKoin
 import org.koin.dsl.module
+import kotlin.experimental.ExperimentalNativeApi
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test
@@ -129,7 +131,10 @@ class ListHandlerTest : RobolectricTest() {
                 )
             fakeLoader.nextUpdateResult = updatedResult
 
-            handler.update("list-2", ListMetaData(title = "Updated Title", description = "Updated Desc"))
+            handler.update(
+                "list-2",
+                ListMetaData(title = "Updated Title", description = "Updated Desc"),
+            )
 
             // Verify the database content was updated
             val listKey = MicroBlogKey("list-2", accountKey.host)
@@ -358,7 +363,7 @@ private class FakeListLoader : ListLoader {
         return nextCreateResult
     }
 
-    @OptIn(kotlin.experimental.ExperimentalNativeApi::class)
+    @OptIn(ExperimentalNativeApi::class)
     override suspend fun update(
         listId: String,
         metaData: ListMetaData,
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListMemberHandlerTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/ListMemberHandlerTest.kt
similarity index 79%
rename from shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListMemberHandlerTest.kt
rename to shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/ListMemberHandlerTest.kt
index fce5d520c..00f52fec0 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/list/ListMemberHandlerTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/ListMemberHandlerTest.kt
@@ -1,22 +1,24 @@
-package dev.dimension.flare.data.datasource.microblog.list
+package dev.dimension.flare.data.datasource.microblog.handler
 
 import androidx.paging.testing.asSnapshot
 import androidx.room.Room
 import androidx.sqlite.driver.bundled.BundledSQLiteDriver
+import com.fleeksoft.ksoup.nodes.Element
 import dev.dimension.flare.RobolectricTest
 import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.model.DbUser
-import dev.dimension.flare.data.database.cache.model.UserContent
-import dev.dimension.flare.data.datasource.microblog.handler.ListMemberHandler
 import dev.dimension.flare.data.datasource.microblog.loader.ListMemberLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
-import dev.dimension.flare.data.network.mastodon.api.model.Account
 import dev.dimension.flare.memoryDatabaseBuilder
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
 import dev.dimension.flare.ui.humanizer.PlatformFormatter
+import dev.dimension.flare.ui.model.ClickEvent
+import dev.dimension.flare.ui.model.UiHandle
 import dev.dimension.flare.ui.model.UiList
+import dev.dimension.flare.ui.model.UiProfile
+import dev.dimension.flare.ui.render.toUi
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.first
@@ -90,17 +92,15 @@ class ListMemberHandlerTest : RobolectricTest() {
         runTest {
             val userKey = MicroBlogKey(id = "user-1", host = "test.social")
             val listId = "list-1"
-            fakeLoader.nextAddMemberResult = createDbUser(userKey)
+            fakeLoader.nextAddMemberResult = createUiProfile(userKey)
 
             handler.addMember(listId, userKey)
 
-            // Verify DbListMember was inserted
             val listKey = MicroBlogKey(listId, accountKey.host)
             val members = db.listDao().getListMembersFlow(listKey).first()
             assertEquals(1, members.size)
             assertEquals(userKey, members.first().member.memberKey)
 
-            // Verify DbUser was inserted
             val savedUser = db.userDao().findByKey(userKey).first()
             assertEquals("user-1", savedUser?.userKey?.id)
         }
@@ -112,10 +112,10 @@ class ListMemberHandlerTest : RobolectricTest() {
             val userKey1 = MicroBlogKey(id = "user-a", host = "test.social")
             val userKey2 = MicroBlogKey(id = "user-b", host = "test.social")
 
-            fakeLoader.nextAddMemberResult = createDbUser(userKey1)
+            fakeLoader.nextAddMemberResult = createUiProfile(userKey1)
             handler.addMember(listId, userKey1)
 
-            fakeLoader.nextAddMemberResult = createDbUser(userKey2)
+            fakeLoader.nextAddMemberResult = createUiProfile(userKey2)
             handler.addMember(listId, userKey2)
 
             val listKey = MicroBlogKey(listId, accountKey.host)
@@ -131,16 +131,14 @@ class ListMemberHandlerTest : RobolectricTest() {
         runTest {
             val userKey = MicroBlogKey(id = "user-3", host = "test.social")
             val listId = "list-3"
-            fakeLoader.nextAddMemberResult = createDbUser(userKey)
+            fakeLoader.nextAddMemberResult = createUiProfile(userKey)
 
-            // Add first
             handler.addMember(listId, userKey)
 
             val listKey = MicroBlogKey(listId, accountKey.host)
             val before = db.listDao().getListMembersFlow(listKey).first()
             assertEquals(1, before.size)
 
-            // Remove
             handler.removeMember(listId, userKey)
 
             val after = db.listDao().getListMembersFlow(listKey).first()
@@ -154,12 +152,11 @@ class ListMemberHandlerTest : RobolectricTest() {
             val userKey1 = MicroBlogKey(id = "user-keep", host = "test.social")
             val userKey2 = MicroBlogKey(id = "user-remove", host = "test.social")
 
-            fakeLoader.nextAddMemberResult = createDbUser(userKey1)
+            fakeLoader.nextAddMemberResult = createUiProfile(userKey1)
             handler.addMember(listId, userKey1)
-            fakeLoader.nextAddMemberResult = createDbUser(userKey2)
+            fakeLoader.nextAddMemberResult = createUiProfile(userKey2)
             handler.addMember(listId, userKey2)
 
-            // Remove only userKey2
             handler.removeMember(listId, userKey2)
 
             val listKey = MicroBlogKey(listId, accountKey.host)
@@ -186,14 +183,12 @@ class ListMemberHandlerTest : RobolectricTest() {
         runTest {
             val userKey = MicroBlogKey(id = "user-survive", host = "test.social")
             val listId = "list-6"
-            fakeLoader.nextAddMemberResult = createDbUser(userKey)
+            fakeLoader.nextAddMemberResult = createUiProfile(userKey)
             handler.addMember(listId, userKey)
 
-            // Now make loader fail and try to remove
             fakeLoader.shouldFail = true
             handler.removeMember(listId, userKey)
 
-            // Member should still be there
             val listKey = MicroBlogKey(listId, accountKey.host)
             val members = db.listDao().getListMembersFlow(listKey).first()
             assertEquals(1, members.size)
@@ -208,25 +203,17 @@ class ListMemberHandlerTest : RobolectricTest() {
             val userKey1 = MicroBlogKey(id = "member-1", host = "test.social")
             val userKey2 = MicroBlogKey(id = "member-2", host = "test.social")
 
-            // Initially empty
             val initial = db.listDao().getListMembersFlow(listKey).first()
             assertTrue(initial.isEmpty())
 
-            // Add members
-            fakeLoader.nextAddMemberResult = createDbUser(userKey1, name = "Alice")
+            fakeLoader.nextAddMemberResult = createUiProfile(userKey1, name = "Alice")
             handler.addMember(listId, userKey1)
-            fakeLoader.nextAddMemberResult = createDbUser(userKey2, name = "Bob")
+            fakeLoader.nextAddMemberResult = createUiProfile(userKey2, name = "Bob")
             handler.addMember(listId, userKey2)
 
-            // Flow should reflect 2 members
             val members = db.listDao().getListMembersFlow(listKey).first()
             assertEquals(2, members.size)
-            val memberKeys = members.map { it.member.memberKey }.toSet()
-            assertTrue(memberKeys.contains(userKey1))
-            assertTrue(memberKeys.contains(userKey2))
 
-            // Remove one, flow should reflect 1 member
-            fakeLoader.shouldFail = false
             handler.removeMember(listId, userKey1)
             val afterRemove = db.listDao().getListMembersFlow(listKey).first()
             assertEquals(1, afterRemove.size)
@@ -240,12 +227,11 @@ class ListMemberHandlerTest : RobolectricTest() {
             val userKey1 = MicroBlogKey(id = "render-1", host = "test.social")
             val userKey2 = MicroBlogKey(id = "render-2", host = "test.social")
 
-            fakeLoader.nextAddMemberResult = createDbUser(userKey1, name = "Alice")
+            fakeLoader.nextAddMemberResult = createUiProfile(userKey1, name = "Alice")
             handler.addMember(listId, userKey1)
-            fakeLoader.nextAddMemberResult = createDbUser(userKey2, name = "Bob")
+            fakeLoader.nextAddMemberResult = createUiProfile(userKey2, name = "Bob")
             handler.addMember(listId, userKey2)
 
-            // listMembersListFlow calls render() — verify it returns UiProfile items
             val rendered = handler.listMembersListFlow(listId).first()
             assertEquals(2, rendered.size)
             val names = rendered.map { it.name.raw }.toSet()
@@ -260,13 +246,14 @@ class ListMemberHandlerTest : RobolectricTest() {
             val userKey1 = MicroBlogKey(id = "paged-1", host = "test.social")
             val userKey2 = MicroBlogKey(id = "paged-2", host = "test.social")
 
-            // Pre-populate the fake loader with members
-            fakeLoader.nextAddMemberResult = createDbUser(userKey1, name = "Paged Alice")
-            fakeLoader.addMember(listId, userKey1)
-            fakeLoader.nextAddMemberResult = createDbUser(userKey2, name = "Paged Bob")
-            fakeLoader.addMember(listId, userKey2)
+            fakeLoader.setMembers(
+                listId,
+                listOf(
+                    createUiProfile(userKey1, name = "Paged Alice"),
+                    createUiProfile(userKey2, name = "Paged Bob"),
+                ),
+            )
 
-            // Collect the paging data — this triggers the remote mediator
             val snapshot = handler.listMembers(listId).asSnapshot()
 
             assertEquals(2, snapshot.size)
@@ -274,7 +261,6 @@ class ListMemberHandlerTest : RobolectricTest() {
             assertTrue(names.contains("Paged Alice"))
             assertTrue(names.contains("Paged Bob"))
 
-            // Verify members were persisted to the database
             val listKey = MicroBlogKey(listId, accountKey.host)
             val dbMembers = db.listDao().getListMembersFlow(listKey).first()
             assertEquals(2, dbMembers.size)
@@ -286,7 +272,7 @@ class ListMemberHandlerTest : RobolectricTest() {
             val listId = "list-load-more"
             val members =
                 (1..50).map { i ->
-                    createDbUser(
+                    createUiProfile(
                         userKey = MicroBlogKey(id = "user-$i", host = "test.social"),
                         name = "User $i",
                     )
@@ -307,22 +293,19 @@ class ListMemberHandlerTest : RobolectricTest() {
             val listId = "list-refresh"
             val initialMembers =
                 (1..20).map { i ->
-                    createDbUser(
+                    createUiProfile(
                         userKey = MicroBlogKey(id = "refresh-user-$i", host = "test.social"),
                         name = "Refresh User $i",
                     )
                 }
             fakeLoader.setMembers(listId, initialMembers)
 
-            // Initial load
             val initialSnapshot = handler.listMembers(listId).asSnapshot()
             assertEquals(20, initialSnapshot.size)
 
-            // Update remote data (remove half)
             val updatedMembers = initialMembers.take(10)
             fakeLoader.setMembers(listId, updatedMembers)
 
-            // Refresh by creating new pager/flow collection
             val refreshedSnapshot = handler.listMembers(listId).asSnapshot()
 
             assertEquals(10, refreshedSnapshot.size)
@@ -331,38 +314,43 @@ class ListMemberHandlerTest : RobolectricTest() {
             assertFalse(names.contains("Refresh User 20"))
         }
 
-    private fun createDbUser(
+    private fun createUiProfile(
         userKey: MicroBlogKey,
         name: String = userKey.id,
-    ): DbUser =
-        DbUser(
-            userKey = userKey,
+    ): UiProfile =
+        UiProfile(
+            key = userKey,
+            handle =
+                UiHandle(
+                    raw = userKey.id,
+                    host = userKey.host,
+                ),
+            avatar = "https://${userKey.host}/${userKey.id}.png",
+            nameInternal = Element("span").apply { appendText(name) }.toUi(),
             platformType = PlatformType.Mastodon,
-            name = name,
-            handle = userKey.id,
-            host = userKey.host,
-            content =
-                UserContent.Mastodon(
-                    Account(
-                        id = userKey.id,
-                        username = userKey.id,
-                        acct = "${userKey.id}@${userKey.host}",
-                        displayName = name,
-                        url = "https://${userKey.host}/@${userKey.id}",
-                    ),
+            clickEvent = ClickEvent.Noop,
+            banner = null,
+            description = null,
+            matrices =
+                UiProfile.Matrices(
+                    fansCount = 0,
+                    followsCount = 0,
+                    statusesCount = 0,
                 ),
+            mark = persistentListOf(),
+            bottomContent = null,
         )
 }
 
 private class FakeListMemberLoader : ListMemberLoader {
-    var nextAddMemberResult: DbUser? = null
+    var nextAddMemberResult: UiProfile? = null
     var shouldFail: Boolean = false
 
-    private val members = mutableMapOf<String, MutableList<DbUser>>()
+    private val members = mutableMapOf<String, MutableList<UiProfile>>()
 
     fun setMembers(
         listId: String,
-        users: List<DbUser>,
+        users: List<UiProfile>,
     ) {
         members[listId] = users.toMutableList()
     }
@@ -371,7 +359,7 @@ private class FakeListMemberLoader : ListMemberLoader {
         pageSize: Int,
         request: PagingRequest,
         listId: String,
-    ): PagingResult<DbUser> {
+    ): PagingResult<UiProfile> {
         val allMembers = members[listId] ?: emptyList()
         val page =
             when (request) {
@@ -401,7 +389,7 @@ private class FakeListMemberLoader : ListMemberLoader {
     override suspend fun addMember(
         listId: String,
         userKey: MicroBlogKey,
-    ): DbUser {
+    ): UiProfile {
         if (shouldFail) throw RuntimeException("Fake loader failure")
         val user = nextAddMemberResult ?: throw IllegalStateException("nextAddMemberResult not set")
         members.getOrPut(listId) { mutableListOf() }.add(user)
@@ -413,7 +401,7 @@ private class FakeListMemberLoader : ListMemberLoader {
         userKey: MicroBlogKey,
     ) {
         if (shouldFail) throw RuntimeException("Fake loader failure")
-        members[listId]?.removeAll { it.userKey == userKey }
+        members[listId]?.removeAll { it.key == userKey }
     }
 
     override suspend fun loadUserLists(
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/NotificationHandlerTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/NotificationHandlerTest.kt
new file mode 100644
index 000000000..1c9d365ff
--- /dev/null
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/NotificationHandlerTest.kt
@@ -0,0 +1,132 @@
+package dev.dimension.flare.data.datasource.microblog.handler
+
+import androidx.paging.LoadState
+import dev.dimension.flare.RobolectricTest
+import dev.dimension.flare.common.CacheState
+import dev.dimension.flare.data.datasource.microblog.loader.NotificationLoader
+import dev.dimension.flare.model.MicroBlogKey
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.drop
+import kotlinx.coroutines.flow.filterIsInstance
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.runTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class NotificationHandlerTest : RobolectricTest() {
+    @Test
+    fun refreshLoadsBadgeCountIntoCache() =
+        runTest {
+            val loader = FakeNotificationLoader(nextCount = 7)
+            val handler =
+                NotificationHandler(
+                    accountKey = MicroBlogKey("user-1", "test.social"),
+                    loader = loader,
+                )
+
+            val valueDeferred =
+                async {
+                    handler.notificationBadgeCount.data
+                        .filterIsInstance<CacheState.Success<Int>>()
+                        .first()
+                        .data
+                }
+
+            val refreshState =
+                handler.notificationBadgeCount.refreshState
+                    .drop(1)
+                    .first()
+
+            assertTrue(refreshState is LoadState.NotLoading)
+            assertEquals(1, loader.callCount)
+            assertEquals(7, valueDeferred.await())
+        }
+
+    @Test
+    fun clearSetsBadgeToZero() =
+        runTest {
+            val loader = FakeNotificationLoader(nextCount = 3)
+            val handler =
+                NotificationHandler(
+                    accountKey = MicroBlogKey("user-2", "test.social"),
+                    loader = loader,
+                )
+
+            val valueDeferred =
+                async {
+                    handler.notificationBadgeCount.data
+                        .filterIsInstance<CacheState.Success<Int>>()
+                        .first()
+                        .data
+                }
+
+            handler.notificationBadgeCount.refreshState
+                .drop(1)
+                .first()
+            assertEquals(3, valueDeferred.await())
+            handler.clear()
+
+            val latest =
+                handler.notificationBadgeCount.data
+                    .filterIsInstance<CacheState.Success<Int>>()
+                    .first()
+                    .data
+            assertEquals(0, latest)
+        }
+
+    @Test
+    fun refreshFailureKeepsPreviousValue() =
+        runTest {
+            val loader = FakeNotificationLoader(nextCount = 5)
+            val handler =
+                NotificationHandler(
+                    accountKey = MicroBlogKey("user-3", "test.social"),
+                    loader = loader,
+                )
+
+            // Warm up cache with a successful refresh.
+            val initialValueDeferred =
+                async {
+                    handler.notificationBadgeCount.data
+                        .filterIsInstance<CacheState.Success<Int>>()
+                        .first()
+                        .data
+                }
+            handler.notificationBadgeCount.refreshState
+                .drop(1)
+                .first()
+            assertEquals(5, initialValueDeferred.await())
+
+            loader.shouldFail = true
+            val failedState =
+                handler.notificationBadgeCount.refreshState
+                    .drop(1)
+                    .first()
+            assertTrue(failedState is LoadState.Error)
+
+            val latest =
+                handler.notificationBadgeCount.data
+                    .filterIsInstance<CacheState.Success<Int>>()
+                    .first()
+                    .data
+            assertEquals(5, latest)
+        }
+
+    private class FakeNotificationLoader(
+        var nextCount: Int = 0,
+    ) : NotificationLoader {
+        var shouldFail: Boolean = false
+        var callCount: Int = 0
+
+        override suspend fun notificationBadgeCount(): Int {
+            callCount++
+            if (shouldFail) {
+                error("loader failed")
+            }
+            return nextCount
+        }
+    }
+}
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandlerTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandlerTest.kt
new file mode 100644
index 000000000..93c52826c
--- /dev/null
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandlerTest.kt
@@ -0,0 +1,253 @@
+package dev.dimension.flare.data.datasource.microblog.handler
+
+import androidx.room.Room
+import androidx.sqlite.driver.bundled.BundledSQLiteDriver
+import com.fleeksoft.ksoup.nodes.Element
+import dev.dimension.flare.RobolectricTest
+import dev.dimension.flare.common.CacheState
+import dev.dimension.flare.common.TestFormatter
+import dev.dimension.flare.data.database.cache.CacheDatabase
+import dev.dimension.flare.data.database.cache.model.DbPagingTimeline
+import dev.dimension.flare.data.database.cache.model.DbStatus
+import dev.dimension.flare.data.database.cache.model.DbStatusReference
+import dev.dimension.flare.data.datasource.microblog.loader.PostLoader
+import dev.dimension.flare.memoryDatabaseBuilder
+import dev.dimension.flare.model.AccountType
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.model.PlatformType
+import dev.dimension.flare.ui.humanizer.PlatformFormatter
+import dev.dimension.flare.ui.model.ClickEvent
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.render.toUi
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.drop
+import kotlinx.coroutines.flow.filterIsInstance
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.advanceUntilIdle
+import kotlinx.coroutines.test.runTest
+import org.koin.core.context.startKoin
+import org.koin.core.context.stopKoin
+import org.koin.dsl.module
+import kotlin.test.AfterTest
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+import kotlin.uuid.Uuid
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class PostHandlerTest : RobolectricTest() {
+    private lateinit var db: CacheDatabase
+    private lateinit var fakeLoader: FakePostLoader
+
+    private val accountKey = MicroBlogKey(id = "user-1", host = "test.social")
+    private val accountType = AccountType.Specific(accountKey)
+    private val postKey = MicroBlogKey(id = "post-1", host = "test.social")
+
+    @BeforeTest
+    fun setup() {
+        db =
+            Room
+                .memoryDatabaseBuilder<CacheDatabase>()
+                .setDriver(BundledSQLiteDriver())
+                .setQueryCoroutineContext(Dispatchers.Unconfined)
+                .build()
+
+        fakeLoader = FakePostLoader()
+    }
+
+    @AfterTest
+    fun tearDown() {
+        db.close()
+        stopKoin()
+    }
+
+    @Test
+    fun postRefreshFetchesAndStoresInDatabase() =
+        runTest {
+            startKoin {
+                modules(
+                    module {
+                        single { db }
+                        single<CoroutineScope> { this@runTest }
+                        single<PlatformFormatter> { TestFormatter() }
+                    },
+                )
+            }
+
+            val expected = createPost(statusKey = postKey)
+            fakeLoader.nextStatus = expected
+            val handler = PostHandler(accountType = accountType, loader = fakeLoader)
+            val cacheable = handler.post(postKey)
+
+            val cachedValueDeferred =
+                async {
+                    cacheable.data
+                        .filterIsInstance<CacheState.Success<UiTimelineV2>>()
+                        .first()
+                        .data
+                }
+
+            val refreshState = cacheable.refreshState.drop(1).first()
+            assertTrue(refreshState is androidx.paging.LoadState.NotLoading)
+
+            val cached = cachedValueDeferred.await()
+            assertEquals(postKey, cached.statusKey)
+            assertEquals(1, fakeLoader.statusCallCount)
+
+            val savedStatus = db.statusDao().get(postKey, accountType).first()
+            assertNotNull(savedStatus)
+            assertEquals(postKey, savedStatus.statusKey)
+            val pagingExists = db.pagingTimelineDao().existsPaging(accountKey, "post_only_$postKey")
+            assertTrue(pagingExists)
+        }
+
+    @Test
+    fun deleteSuccessRemovesStatusReferencesAndPaging() =
+        runTest {
+            startKoin {
+                modules(
+                    module {
+                        single { db }
+                        single<CoroutineScope> { this@runTest }
+                        single<PlatformFormatter> { TestFormatter() }
+                    },
+                )
+            }
+
+            db.statusDao().insert(
+                DbStatus(
+                    statusKey = postKey,
+                    accountType = accountType,
+                    content = createPost(statusKey = postKey),
+                    text = "text",
+                ),
+            )
+            db.pagingTimelineDao().insertAll(
+                listOf(
+                    DbPagingTimeline(
+                        pagingKey = "post_only_$postKey",
+                        statusKey = postKey,
+                        sortId = 1L,
+                    ),
+                ),
+            )
+            db.statusReferenceDao().insertAll(
+                listOf(
+                    DbStatusReference(
+                        _id = Uuid.random().toString(),
+                        referenceType = dev.dimension.flare.model.ReferenceType.Reply,
+                        statusKey = postKey,
+                        referenceStatusKey = MicroBlogKey("ref-1", postKey.host),
+                    ),
+                ),
+            )
+
+            val handler = PostHandler(accountType = accountType, loader = fakeLoader)
+            handler.delete(postKey)
+            advanceUntilIdle()
+
+            assertEquals(1, fakeLoader.deleteCallCount)
+            val savedStatus = db.statusDao().get(postKey, accountType).first()
+            assertNull(savedStatus)
+            val refs = db.statusReferenceDao().getByStatusKey(postKey)
+            assertTrue(refs.isEmpty())
+            val pagingExists = db.pagingTimelineDao().existsPaging(accountKey, "post_only_$postKey")
+            assertTrue(!pagingExists)
+        }
+
+    @Test
+    fun deleteFailureKeepsLocalCache() =
+        runTest {
+            startKoin {
+                modules(
+                    module {
+                        single { db }
+                        single<CoroutineScope> { this@runTest }
+                        single<PlatformFormatter> { TestFormatter() }
+                    },
+                )
+            }
+
+            db.statusDao().insert(
+                DbStatus(
+                    statusKey = postKey,
+                    accountType = accountType,
+                    content = createPost(statusKey = postKey),
+                    text = "text",
+                ),
+            )
+            db.pagingTimelineDao().insertAll(
+                listOf(
+                    DbPagingTimeline(
+                        pagingKey = "post_only_$postKey",
+                        statusKey = postKey,
+                        sortId = 1L,
+                    ),
+                ),
+            )
+
+            fakeLoader.shouldFailDelete = true
+            val handler = PostHandler(accountType = accountType, loader = fakeLoader)
+            handler.delete(postKey)
+            advanceUntilIdle()
+
+            assertEquals(1, fakeLoader.deleteCallCount)
+            val savedStatus = db.statusDao().get(postKey, accountType).first()
+            assertNotNull(savedStatus)
+            val pagingExists = db.pagingTimelineDao().existsPaging(accountKey, "post_only_$postKey")
+            assertTrue(pagingExists)
+        }
+
+    private fun createPost(statusKey: MicroBlogKey): UiTimelineV2.Post =
+        UiTimelineV2.Post(
+            message = null,
+            platformType = PlatformType.Mastodon,
+            images = persistentListOf(),
+            sensitive = false,
+            contentWarning = null,
+            user = null,
+            quote = persistentListOf(),
+            content = Element("span").apply { appendText("post content") }.toUi(),
+            actions = persistentListOf(),
+            poll = null,
+            statusKey = statusKey,
+            card = null,
+            createdAt =
+                kotlin.time.Clock.System
+                    .now()
+                    .toUi(),
+            emojiReactions = persistentListOf(),
+            sourceChannel = null,
+            visibility = null,
+            replyToHandle = null,
+            parents = persistentListOf(),
+            clickEvent = ClickEvent.Noop,
+            accountType = accountType,
+        )
+
+    private class FakePostLoader : PostLoader {
+        var nextStatus: UiTimelineV2? = null
+        var shouldFailDelete: Boolean = false
+        var statusCallCount: Int = 0
+        var deleteCallCount: Int = 0
+
+        override suspend fun status(statusKey: MicroBlogKey): UiTimelineV2 {
+            statusCallCount++
+            return requireNotNull(nextStatus)
+        }
+
+        override suspend fun deleteStatus(statusKey: MicroBlogKey) {
+            deleteCallCount++
+            if (shouldFailDelete) {
+                error("delete failed")
+            }
+        }
+    }
+}
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/RelationHandlerTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/RelationHandlerTest.kt
new file mode 100644
index 000000000..e06e6590b
--- /dev/null
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/RelationHandlerTest.kt
@@ -0,0 +1,224 @@
+package dev.dimension.flare.data.datasource.microblog.handler
+
+import androidx.paging.LoadState
+import androidx.room.Room
+import androidx.sqlite.driver.bundled.BundledSQLiteDriver
+import dev.dimension.flare.RobolectricTest
+import dev.dimension.flare.common.CacheState
+import dev.dimension.flare.data.database.cache.CacheDatabase
+import dev.dimension.flare.data.database.cache.model.DbUserRelation
+import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
+import dev.dimension.flare.memoryDatabaseBuilder
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiRelation
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.drop
+import kotlinx.coroutines.flow.filterIsInstance
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.advanceUntilIdle
+import kotlinx.coroutines.test.runTest
+import org.koin.core.context.startKoin
+import org.koin.core.context.stopKoin
+import org.koin.dsl.module
+import kotlin.test.AfterTest
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class RelationHandlerTest : RobolectricTest() {
+    private lateinit var db: CacheDatabase
+    private lateinit var loader: FakeRelationLoader
+    private lateinit var handler: RelationHandler
+
+    private val accountKey = MicroBlogKey(id = "account-1", host = "test.social")
+    private val userKey = MicroBlogKey(id = "user-1", host = "test.social")
+
+    @BeforeTest
+    fun setup() {
+        db =
+            Room
+                .memoryDatabaseBuilder<CacheDatabase>()
+                .setDriver(BundledSQLiteDriver())
+                .setQueryCoroutineContext(Dispatchers.Unconfined)
+                .build()
+
+        loader = FakeRelationLoader(accountKey = accountKey)
+    }
+
+    @AfterTest
+    fun tearDown() {
+        db.close()
+        stopKoin()
+    }
+
+    @Test
+    fun relationRefreshStoresRelationInDatabase() =
+        runTest {
+            startKoin {
+                modules(
+                    module {
+                        single { db }
+                        single<CoroutineScope> { this@runTest }
+                    },
+                )
+            }
+
+            val expected = UiRelation(following = true, muted = true)
+            loader.nextRelation = expected
+            handler = RelationHandler(dataSource = loader)
+            val cacheable = handler.relation(userKey)
+
+            val valueDeferred =
+                async {
+                    cacheable.data
+                        .filterIsInstance<CacheState.Success<UiRelation>>()
+                        .first()
+                        .data
+                }
+
+            val refreshState = cacheable.refreshState.drop(1).first()
+            assertTrue(refreshState is LoadState.NotLoading)
+            assertEquals(expected, valueDeferred.await())
+
+            val saved = db.userDao().getUserRelation(accountKey, userKey).first()
+            assertEquals(expected, saved?.relation)
+            assertEquals(1, loader.relationCallCount)
+        }
+
+    @Test
+    fun followSuccessSetsFollowingTrue() =
+        runTest {
+            startKoin {
+                modules(
+                    module {
+                        single { db }
+                        single<CoroutineScope> { this@runTest }
+                    },
+                )
+            }
+
+            db.userDao().insertUserRelation(
+                DbUserRelation(
+                    accountKey = accountKey,
+                    userKey = userKey,
+                    relation = UiRelation(following = false),
+                ),
+            )
+
+            handler = RelationHandler(dataSource = loader)
+            handler.follow(userKey)
+            advanceUntilIdle()
+
+            val saved = db.userDao().getUserRelation(accountKey, userKey).first()
+            assertTrue(saved?.relation?.following == true)
+            assertEquals(1, loader.followCallCount)
+        }
+
+    @Test
+    fun followFailureRevertsFollowingFlag() =
+        runTest {
+            startKoin {
+                modules(
+                    module {
+                        single { db }
+                        single<CoroutineScope> { this@runTest }
+                    },
+                )
+            }
+
+            db.userDao().insertUserRelation(
+                DbUserRelation(
+                    accountKey = accountKey,
+                    userKey = userKey,
+                    relation = UiRelation(following = false),
+                ),
+            )
+            loader.failFollow = true
+
+            handler = RelationHandler(dataSource = loader)
+            handler.follow(userKey)
+            advanceUntilIdle()
+
+            val saved = db.userDao().getUserRelation(accountKey, userKey).first()
+            assertTrue(saved?.relation?.following == false)
+            assertEquals(1, loader.followCallCount)
+        }
+
+    @Test
+    fun approveAndRejectFollowRequestUpdateRelationLocally() =
+        runTest {
+            startKoin {
+                modules(
+                    module {
+                        single { db }
+                        single<CoroutineScope> { this@runTest }
+                    },
+                )
+            }
+
+            db.userDao().insertUserRelation(
+                DbUserRelation(
+                    accountKey = accountKey,
+                    userKey = userKey,
+                    relation = UiRelation(hasPendingFollowRequestToYou = true, isFans = false),
+                ),
+            )
+
+            handler = RelationHandler(dataSource = loader)
+            handler.approveFollowRequest(userKey)
+
+            val afterApprove = assertNotNull(db.userDao().getUserRelation(accountKey, userKey).first())
+            assertTrue(afterApprove.relation.hasPendingFollowRequestToYou == false)
+            assertTrue(afterApprove.relation.isFans == true)
+
+            db.userDao().insertUserRelation(
+                DbUserRelation(
+                    accountKey = accountKey,
+                    userKey = userKey,
+                    relation = UiRelation(hasPendingFollowRequestToYou = true, isFans = true),
+                ),
+            )
+            handler.rejectFollowRequest(userKey)
+
+            val afterReject = assertNotNull(db.userDao().getUserRelation(accountKey, userKey).first())
+            assertTrue(afterReject.relation.hasPendingFollowRequestToYou == false)
+            assertTrue(afterReject.relation.isFans == false)
+        }
+
+    private class FakeRelationLoader(
+        override val accountKey: MicroBlogKey,
+    ) : RelationLoader {
+        var nextRelation: UiRelation = UiRelation()
+        var relationCallCount: Int = 0
+        var followCallCount: Int = 0
+        var failFollow: Boolean = false
+
+        override suspend fun relation(userKey: MicroBlogKey): UiRelation {
+            relationCallCount++
+            return nextRelation
+        }
+
+        override suspend fun follow(userKey: MicroBlogKey) {
+            followCallCount++
+            if (failFollow) {
+                error("follow failed")
+            }
+        }
+
+        override suspend fun unfollow(userKey: MicroBlogKey) = Unit
+
+        override suspend fun block(userKey: MicroBlogKey) = Unit
+
+        override suspend fun unblock(userKey: MicroBlogKey) = Unit
+
+        override suspend fun mute(userKey: MicroBlogKey) = Unit
+
+        override suspend fun unmute(userKey: MicroBlogKey) = Unit
+    }
+}
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandlerTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandlerTest.kt
new file mode 100644
index 000000000..2b53f5a8b
--- /dev/null
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandlerTest.kt
@@ -0,0 +1,227 @@
+package dev.dimension.flare.data.datasource.microblog.handler
+
+import androidx.paging.LoadState
+import androidx.room.Room
+import androidx.sqlite.driver.bundled.BundledSQLiteDriver
+import com.fleeksoft.ksoup.nodes.Element
+import dev.dimension.flare.RobolectricTest
+import dev.dimension.flare.common.CacheState
+import dev.dimension.flare.common.TestFormatter
+import dev.dimension.flare.data.database.cache.CacheDatabase
+import dev.dimension.flare.data.database.cache.model.DbUser
+import dev.dimension.flare.data.datasource.microblog.loader.UserLoader
+import dev.dimension.flare.memoryDatabaseBuilder
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.model.PlatformType
+import dev.dimension.flare.ui.humanizer.PlatformFormatter
+import dev.dimension.flare.ui.model.ClickEvent
+import dev.dimension.flare.ui.model.UiHandle
+import dev.dimension.flare.ui.model.UiProfile
+import dev.dimension.flare.ui.render.toUi
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.drop
+import kotlinx.coroutines.flow.filterIsInstance
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.runTest
+import org.koin.core.context.startKoin
+import org.koin.core.context.stopKoin
+import org.koin.dsl.module
+import kotlin.test.AfterTest
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class UserHandlerTest : RobolectricTest() {
+    private lateinit var db: CacheDatabase
+    private lateinit var loader: FakeUserLoader
+    private lateinit var handler: UserHandler
+
+    private val accountKey = MicroBlogKey(id = "account-1", host = "test.social")
+
+    @BeforeTest
+    fun setup() {
+        db =
+            Room
+                .memoryDatabaseBuilder<CacheDatabase>()
+                .setDriver(BundledSQLiteDriver())
+                .setQueryCoroutineContext(Dispatchers.Unconfined)
+                .build()
+
+        loader = FakeUserLoader()
+
+        startKoin {
+            modules(
+                module {
+                    single { db }
+                    single<PlatformFormatter> { TestFormatter() }
+                },
+            )
+        }
+
+        handler = UserHandler(accountKey = accountKey, loader = loader)
+    }
+
+    @AfterTest
+    fun tearDown() {
+        db.close()
+        stopKoin()
+    }
+
+    @Test
+    fun userByHandleAndHostRefreshStoresAndEmitsUser() =
+        runTest {
+            val expected = createProfile(id = "alice", host = "test.social", handle = "alice")
+            loader.nextByHandleAndHost = expected
+
+            val cacheable =
+                handler.userByHandleAndHost(
+                    UiHandle(
+                        raw = "alice",
+                        host = "test.social",
+                    ),
+                )
+            val valueDeferred =
+                async {
+                    cacheable.data
+                        .filterIsInstance<CacheState.Success<UiProfile>>()
+                        .first()
+                        .data
+                }
+
+            val refreshState = cacheable.refreshState.drop(1).first()
+            assertTrue(refreshState is LoadState.NotLoading)
+            assertEquals(expected.key, valueDeferred.await().key)
+            assertEquals(1, loader.byHandleCallCount)
+
+            val saved = db.userDao().findByCanonicalHandleAndHost("@alice@test.social", "test.social").first()
+            assertNotNull(saved)
+            assertEquals(expected.key, saved.userKey)
+        }
+
+    @Test
+    fun userByIdRefreshStoresAndEmitsUser() =
+        runTest {
+            val expected = createProfile(id = "bob", host = "test.social", handle = "@bob@test.social")
+            loader.nextById = expected
+
+            val cacheable = handler.userById("bob")
+            val valueDeferred =
+                async {
+                    cacheable.data
+                        .filterIsInstance<CacheState.Success<UiProfile>>()
+                        .first()
+                        .data
+                }
+
+            val refreshState = cacheable.refreshState.drop(1).first()
+            assertTrue(refreshState is LoadState.NotLoading)
+            assertEquals(expected.key, valueDeferred.await().key)
+            assertEquals(1, loader.byIdCallCount)
+
+            val saved = db.userDao().findByKey(MicroBlogKey("bob", "test.social")).first()
+            assertNotNull(saved)
+            assertEquals(expected.key, saved.userKey)
+        }
+
+    @Test
+    fun refreshFailureKeepsExistingCachedUser() =
+        runTest {
+            val existing = createProfile(id = "charlie", host = "test.social", handle = "@charlie@test.social")
+            db.userDao().insert(
+                DbUser(
+                    userKey = existing.key,
+                    name = existing.name.raw,
+                    canonicalHandle = existing.handle.canonical,
+                    host = "test.social",
+                    content = existing,
+                ),
+            )
+            loader.failById = true
+
+            val cacheable = handler.userById("charlie")
+            val refreshState = cacheable.refreshState.drop(1).first()
+            assertTrue(refreshState is LoadState.Error)
+
+            val latest =
+                cacheable.data
+                    .filterIsInstance<CacheState.Success<UiProfile>>()
+                    .first()
+                    .data
+            assertEquals(existing.key, latest.key)
+        }
+
+    @Test
+    fun uiHandleQueryMatchesAtHandleInCache() =
+        runTest {
+            val atHandleProfile = createProfile(id = "david", host = "test.social", handle = "@david@test.social")
+            db.userDao().insert(
+                DbUser(
+                    userKey = atHandleProfile.key,
+                    name = atHandleProfile.name.raw,
+                    canonicalHandle = atHandleProfile.handle.canonical,
+                    host = "test.social",
+                    content = atHandleProfile,
+                ),
+            )
+
+            // UserHandler now normalizes raw+host to canonical before querying cache.
+            val uiHandleHit = db.userDao().findByCanonicalHandleAndHost("@david@test.social", "test.social").first()
+            assertNotNull(uiHandleHit)
+            assertEquals(atHandleProfile.key, uiHandleHit.userKey)
+
+            // Stored shape in many loaders/renderers: "@david@test.social"
+            val atHandleHit = db.userDao().findByCanonicalHandleAndHost("@david@test.social", "test.social").first()
+            assertNotNull(atHandleHit)
+            assertEquals(atHandleProfile.key, atHandleHit.userKey)
+        }
+
+    private fun createProfile(
+        id: String,
+        host: String,
+        handle: String,
+    ): UiProfile =
+        UiProfile(
+            key = MicroBlogKey(id = id, host = host),
+            handle =
+                UiHandle(
+                    raw = handle.removePrefix("@").substringBefore("@"),
+                    host = host,
+                ),
+            avatar = "https://$host/$id.png",
+            nameInternal = Element("span").apply { appendText(id) }.toUi(),
+            platformType = PlatformType.Mastodon,
+            clickEvent = ClickEvent.Noop,
+            banner = null,
+            description = null,
+            matrices = UiProfile.Matrices(fansCount = 0, followsCount = 0, statusesCount = 0, platformFansCount = "0"),
+            mark = persistentListOf(),
+            bottomContent = null,
+        )
+
+    private class FakeUserLoader : UserLoader {
+        var nextByHandleAndHost: UiProfile? = null
+        var nextById: UiProfile? = null
+        var failById: Boolean = false
+        var byHandleCallCount: Int = 0
+        var byIdCallCount: Int = 0
+
+        override suspend fun userByHandleAndHost(uiHandle: UiHandle): UiProfile {
+            byHandleCallCount++
+            return requireNotNull(nextByHandleAndHost)
+        }
+
+        override suspend fun userById(id: String): UiProfile {
+            byIdCallCount++
+            if (failById) {
+                error("userById failed")
+            }
+            return requireNotNull(nextById)
+        }
+    }
+}
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/rss/RssTimelineRemoteMediatorTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/rss/RssTimelineRemoteMediatorTest.kt
index 562e2067d..805c7d52a 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/rss/RssTimelineRemoteMediatorTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/rss/RssTimelineRemoteMediatorTest.kt
@@ -1,42 +1,20 @@
 package dev.dimension.flare.data.datasource.rss
 
-import androidx.room.Room
-import androidx.sqlite.driver.bundled.BundledSQLiteDriver
 import dev.dimension.flare.RobolectricTest
-import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.network.rss.model.Feed
-import dev.dimension.flare.memoryDatabaseBuilder
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.mapper.parseRssDateToInstant
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
-import kotlin.test.AfterTest
-import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class RssTimelineRemoteMediatorTest : RobolectricTest() {
-    private lateinit var cacheDb: CacheDatabase
-
-    @BeforeTest
-    fun setup() {
-        cacheDb =
-            Room
-                .memoryDatabaseBuilder<CacheDatabase>()
-                .setDriver(BundledSQLiteDriver())
-                .setQueryCoroutineContext(Dispatchers.Unconfined)
-                .build()
-    }
-
-    @AfterTest
-    fun tearDown() {
-        cacheDb.close()
-    }
-
     @Test
-    fun sortIdFollowsPublicationDate() =
+    fun feedItemsUsePublicationDateAsCreatedAt() =
         runTest {
             val middleDate = "Wed, 03 Jan 2024 10:00:00 +0000"
             val newestDate = "Fri, 05 Jan 2024 10:00:00 +0000"
@@ -77,29 +55,34 @@ class RssTimelineRemoteMediatorTest : RobolectricTest() {
             val mediator =
                 RssTimelineRemoteMediator(
                     url = "https://example.com/rss",
-                    cacheDatabase = cacheDb,
                     fetchFeed = { feed },
                     fetchIcon = { _ -> null },
                     fetchSource = { _ -> null },
                 )
 
             val result =
-                mediator.timeline(
+                mediator.load(
                     pageSize = 10,
                     request = PagingRequest.Refresh,
                 )
 
-            val sortIds = result.data.map { it.timeline.sortId }.sortedDescending()
-            val expectedSortIds =
-                listOf(newestDate, middleDate, oldestDate).map {
-                    requireNotNull(parseRssDateToInstant(it)).toEpochMilliseconds()
-                }
+            val byTitle = result.data.filterIsInstance<UiTimelineV2.Feed>().associateBy { it.title }
+            assertEquals(3, byTitle.size)
 
-            assertEquals(expectedSortIds, sortIds)
             assertEquals(
-                expectedSortIds,
-                sortIds,
-                "sortId should follow publication date for correct timeline ordering",
+                requireNotNull(parseRssDateToInstant(middleDate)).toEpochMilliseconds(),
+                byTitle["Middle"]?.createdAt?.value?.toEpochMilliseconds(),
+            )
+            assertEquals(
+                requireNotNull(parseRssDateToInstant(newestDate)).toEpochMilliseconds(),
+                byTitle["Newest"]?.createdAt?.value?.toEpochMilliseconds(),
+            )
+            assertEquals(
+                requireNotNull(parseRssDateToInstant(oldestDate)).toEpochMilliseconds(),
+                byTitle["Oldest"]?.createdAt?.value?.toEpochMilliseconds(),
             )
+            assertNotNull(byTitle["Middle"])
+            assertNotNull(byTitle["Newest"])
+            assertNotNull(byTitle["Oldest"])
         }
 }
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/XQTTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/XQTTest.kt
index 9c1401292..86ee3f596 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/XQTTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/XQTTest.kt
@@ -332,43 +332,7 @@ class XQTTest {
                 legacy = legacy,
             )
 
-        // renderStatus requires event and references. Mock or pass null/empty.
-        // renderStatus(accountKey, event, references)
-        // event is StatusEvent.XQT which is an interface. I need to mock it or create a dummy implementation.
-        // It seems StatusEvent.XQT is hard to mock without mock framework.
-        // However, I can check if I can avoid calling renderStatus directly?
-        // Tweet.render calls renderStatus.
-        // But Tweet.render returns UiTimeline.
-        // UiTimeline has content which is UiTimeline.ItemContent.Status.
-        // I can inspect that.
-
-        // But render() also requires event.
-        // Let's see if I can implement a dummy event.
-        val dummyEvent =
-            object : dev.dimension.flare.data.datasource.microblog.StatusEvent.XQT {
-                override fun retweet(
-                    statusKey: MicroBlogKey,
-                    retweeted: Boolean,
-                ) {
-                }
-
-                override fun like(
-                    statusKey: MicroBlogKey,
-                    liked: Boolean,
-                ) {
-                }
-
-                override fun bookmark(
-                    statusKey: MicroBlogKey,
-                    bookmarked: Boolean,
-                ) {
-                }
-
-                override val accountKey: MicroBlogKey
-                    get() = this@XQTTest.accountKey
-            }
-
-        val statusContent = tweet.renderStatus(accountKey, dummyEvent, emptyMap())
+        val statusContent = tweet.renderStatus(accountKey)
 
         // Assert images list is empty
         assertTrue(statusContent.images.isEmpty(), "Images should be empty when inline media is present")
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/route/DeeplinkRouteTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/route/DeeplinkRouteTest.kt
index 6d9dd375a..8dec9bb1f 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/route/DeeplinkRouteTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/route/DeeplinkRouteTest.kt
@@ -8,6 +8,8 @@ import kotlin.test.assertEquals
 import kotlin.test.assertNull
 
 class DeeplinkRouteTest {
+    private val activeAccountType = AccountType.Specific(MicroBlogKey("active", "example.com"))
+
     @Test
     fun testLogin() {
         val route = DeeplinkRoute.Login
@@ -24,7 +26,7 @@ class DeeplinkRouteTest {
         val route =
             DeeplinkRoute.Status.Detail(
                 statusKey = MicroBlogKey("status123", "example.com"),
-                accountType = AccountType.Active,
+                accountType = activeAccountType,
             )
         val uri = route.toUri()
         val parsed = DeeplinkRoute.parse(uri)
@@ -48,7 +50,7 @@ class DeeplinkRouteTest {
         val route =
             DeeplinkRoute.Status.VVOStatus(
                 statusKey = MicroBlogKey("status456", "example.com"),
-                accountType = AccountType.Active,
+                accountType = activeAccountType,
             )
         val uri = route.toUri()
         val parsed = DeeplinkRoute.parse(uri)
@@ -60,7 +62,7 @@ class DeeplinkRouteTest {
         val route =
             DeeplinkRoute.Status.AddReaction(
                 statusKey = MicroBlogKey("status789", "example.com"),
-                accountType = AccountType.Active,
+                accountType = activeAccountType,
             )
         val uri = route.toUri()
         val parsed = DeeplinkRoute.parse(uri)
@@ -80,7 +82,7 @@ class DeeplinkRouteTest {
         val route =
             DeeplinkRoute.Status.BlueskyReport(
                 statusKey = MicroBlogKey("statusBS", "bsky.app"),
-                accountType = AccountType.Active,
+                accountType = activeAccountType,
             )
         val uri = route.toUri()
         val parsed = DeeplinkRoute.parse(uri)
@@ -92,7 +94,7 @@ class DeeplinkRouteTest {
         val route =
             DeeplinkRoute.Status.DeleteConfirm(
                 statusKey = MicroBlogKey("delStatus", "example.com"),
-                accountType = AccountType.Active,
+                accountType = activeAccountType,
             )
         val uri = route.toUri()
         val parsed = DeeplinkRoute.parse(uri)
@@ -105,7 +107,7 @@ class DeeplinkRouteTest {
             DeeplinkRoute.Status.MastodonReport(
                 userKey = MicroBlogKey("user1", "mstdn.io"),
                 statusKey = MicroBlogKey("status1", "mstdn.io"),
-                accountType = AccountType.Active,
+                accountType = activeAccountType,
             )
         val uri = route.toUri()
         val parsed = DeeplinkRoute.parse(uri)
@@ -137,7 +139,7 @@ class DeeplinkRouteTest {
     fun testSearch() {
         val route =
             DeeplinkRoute.Search(
-                accountType = AccountType.Active,
+                accountType = activeAccountType,
                 query = "kotlin",
             )
         val uri = route.toUri()
@@ -147,7 +149,7 @@ class DeeplinkRouteTest {
 
     @Test
     fun testComposeNew() {
-        val route = DeeplinkRoute.Compose.New(accountType = AccountType.Active)
+        val route = DeeplinkRoute.Compose.New(accountType = activeAccountType)
         val uri = route.toUri()
         val parsed = DeeplinkRoute.parse(uri)
         assertEquals(route, parsed)
@@ -207,7 +209,7 @@ class DeeplinkRouteTest {
         val route =
             DeeplinkRoute.Media.StatusMedia(
                 statusKey = MicroBlogKey("stMedia", "example.com"),
-                accountType = AccountType.Active,
+                accountType = activeAccountType,
                 index = 2,
                 preview = "preview_data",
             )
@@ -220,7 +222,7 @@ class DeeplinkRouteTest {
     fun testMediaPodcast() {
         val route =
             DeeplinkRoute.Media.Podcast(
-                accountType = AccountType.Active,
+                accountType = activeAccountType,
                 id = "podcast123",
             )
         val uri = route.toUri()
@@ -232,7 +234,7 @@ class DeeplinkRouteTest {
     fun testProfileUser() {
         val route =
             DeeplinkRoute.Profile.User(
-                accountType = AccountType.Active,
+                accountType = activeAccountType,
                 userKey = MicroBlogKey("userP", "example.com"),
             )
         val uri = route.toUri()
@@ -244,7 +246,7 @@ class DeeplinkRouteTest {
     fun testProfileUserNameWithHost() {
         val route =
             DeeplinkRoute.Profile.UserNameWithHost(
-                accountType = AccountType.Active,
+                accountType = activeAccountType,
                 userName = "user",
                 host = "example.com",
             )

From 2cfec52993fbc98c8d0b65e7f24c54b421daacc5 Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Wed, 4 Mar 2026 21:34:48 +0900
Subject: [PATCH 13/33] add rendering test

---
 .../mapper/BlueskyNotificationRenderTest.kt   | 262 ++++++++++++++
 .../ui/model/mapper/BlueskyRenderTest.kt      | 287 +++++++++++++++
 .../ui/model/mapper/BlueskyUiMappingTest.kt   |  86 +++++
 .../ui/model/mapper/MastodonRenderTest.kt     | 220 ++++++++++++
 .../ui/model/mapper/MisskeyRenderTest.kt      | 268 ++++++++++++++
 .../flare/ui/model/mapper/VVORenderTest.kt    | 155 +++++++++
 .../flare/ui/model/mapper/XQTRenderTest.kt    | 329 ++++++++++++++++++
 7 files changed, 1607 insertions(+)
 create mode 100644 shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/BlueskyNotificationRenderTest.kt
 create mode 100644 shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/BlueskyRenderTest.kt
 create mode 100644 shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/BlueskyUiMappingTest.kt
 create mode 100644 shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/MastodonRenderTest.kt
 create mode 100644 shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/MisskeyRenderTest.kt
 create mode 100644 shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/VVORenderTest.kt
 create mode 100644 shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/XQTRenderTest.kt

diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/BlueskyNotificationRenderTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/BlueskyNotificationRenderTest.kt
new file mode 100644
index 000000000..e3f043418
--- /dev/null
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/BlueskyNotificationRenderTest.kt
@@ -0,0 +1,262 @@
+package dev.dimension.flare.ui.model.mapper
+
+import app.bsky.actor.ProfileView
+import app.bsky.actor.ProfileViewBasic
+import app.bsky.feed.Like
+import app.bsky.feed.PostView
+import app.bsky.feed.Repost
+import app.bsky.notification.ListNotificationsNotification
+import app.bsky.notification.ListNotificationsNotificationReason
+import com.atproto.repo.StrongRef
+import dev.dimension.flare.common.TestFormatter
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.humanizer.PlatformFormatter
+import dev.dimension.flare.ui.model.UiTimelineV2
+import kotlinx.collections.immutable.persistentMapOf
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.buildJsonObject
+import org.koin.core.context.startKoin
+import org.koin.core.context.stopKoin
+import org.koin.dsl.module
+import sh.christian.ozone.api.AtUri
+import sh.christian.ozone.api.Cid
+import sh.christian.ozone.api.Did
+import sh.christian.ozone.api.Handle
+import sh.christian.ozone.api.Uri
+import sh.christian.ozone.api.model.JsonContent
+import sh.christian.ozone.api.model.JsonContent.Companion.encodeAsJsonContent
+import kotlin.test.AfterTest
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertIs
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+import kotlin.time.Instant
+
+class BlueskyNotificationRenderTest {
+    private val accountKey = MicroBlogKey(id = "me", host = "bsky.social")
+
+    @BeforeTest
+    fun setup() {
+        startKoin {
+            modules(
+                module {
+                    single<PlatformFormatter> { TestFormatter() }
+                },
+            )
+        }
+    }
+
+    @AfterTest
+    fun tearDown() {
+        stopKoin()
+    }
+
+    @Test
+    fun repostAndLike_renderMessageAndPost() {
+        val repostedUri = AtUri("at://did:plc:post/app.bsky.feed.post/100")
+        val referencedPost =
+            createPostView(
+                uri = repostedUri.atUri,
+                author = createProfileBasic("post-author", "post-author.bsky.social"),
+                text = "reposted content",
+            )
+        val references = persistentMapOf(repostedUri to referencedPost)
+
+        val repostNotification =
+            createNotification(
+                reason = ListNotificationsNotificationReason.Repost,
+                uri = "at://did:plc:noti/app.bsky.notification/1",
+                author = createProfile("reposter", "reposter.bsky.social"),
+                record =
+                    bskyJson.encodeAsJsonContent(
+                        Repost(
+                            subject = StrongRef(uri = repostedUri, cid = Cid("cid-post")),
+                            createdAt = Instant.parse("2024-01-01T00:00:00Z"),
+                        ),
+                    ),
+            )
+        val likeNotification =
+            createNotification(
+                reason = ListNotificationsNotificationReason.Like,
+                uri = "at://did:plc:noti/app.bsky.notification/2",
+                author = createProfile("liker", "liker.bsky.social"),
+                record =
+                    bskyJson.encodeAsJsonContent(
+                        Like(
+                            subject = StrongRef(uri = repostedUri, cid = Cid("cid-post")),
+                            createdAt = Instant.parse("2024-01-01T00:00:00Z"),
+                        ),
+                    ),
+            )
+
+        val repostResult = listOf(repostNotification).render(accountKey, references).single()
+        val repostUserList = assertIs<UiTimelineV2.UserList>(repostResult)
+        assertNotNull(repostUserList.message)
+        assertNotNull(repostUserList.post)
+        assertEquals("reposted content", repostUserList.post.content.innerText)
+
+        val likeResult = listOf(likeNotification).render(accountKey, references).single()
+        val likeUserList = assertIs<UiTimelineV2.UserList>(likeResult)
+        assertNotNull(likeUserList.message)
+        assertNotNull(likeUserList.post)
+        assertEquals("reposted content", likeUserList.post.content.innerText)
+    }
+
+    @Test
+    fun follow_rendersMessageAndUsers() {
+        val n1 =
+            createNotification(
+                reason = ListNotificationsNotificationReason.Follow,
+                uri = "at://did:plc:noti/app.bsky.notification/f1",
+                author = createProfile("follower1", "follower1.bsky.social"),
+            )
+        val n2 =
+            createNotification(
+                reason = ListNotificationsNotificationReason.Follow,
+                uri = "at://did:plc:noti/app.bsky.notification/f2",
+                author = createProfile("follower2", "follower2.bsky.social"),
+            )
+
+        val result = listOf(n1, n2).render(accountKey, references = persistentMapOf())
+        val userList = assertIs<UiTimelineV2.UserList>(result.single())
+        assertNotNull(userList.message)
+        assertEquals(2, userList.users.size)
+        assertEquals(setOf("did:plc:follower1", "did:plc:follower2"), userList.users.map { it.key.id }.toSet())
+    }
+
+    @Test
+    fun postReasons_renderMessageAndPost() {
+        val reasons =
+            listOf(
+                ListNotificationsNotificationReason.LikeViaRepost,
+                ListNotificationsNotificationReason.RepostViaRepost,
+                ListNotificationsNotificationReason.SubscribedPost,
+                ListNotificationsNotificationReason.ContactMatch,
+                ListNotificationsNotificationReason.Mention,
+                ListNotificationsNotificationReason.Reply,
+                ListNotificationsNotificationReason.Quote,
+            )
+
+        reasons.forEachIndexed { index, reason ->
+            val uri = AtUri("at://did:plc:noti/app.bsky.notification/p$index")
+            val post =
+                createPostView(
+                    uri = uri.atUri,
+                    author = createProfileBasic("post$index", "post$index.bsky.social"),
+                    text = "post-$index",
+                )
+            val notification =
+                createNotification(
+                    reason = reason,
+                    uri = uri.atUri,
+                    author = createProfile("author$index", "author$index.bsky.social"),
+                )
+
+            val result =
+                listOf(notification).render(
+                    accountKey = accountKey,
+                    references = persistentMapOf(uri to post),
+                )
+            val renderedPost = assertIs<UiTimelineV2.Post>(result.single())
+            assertEquals("post-$index", renderedPost.content.innerText)
+            assertNotNull(renderedPost.message)
+            assertEquals(
+                "did:plc:author$index",
+                renderedPost.message.user
+                    ?.key
+                    ?.id,
+            )
+        }
+    }
+
+    @Test
+    fun otherReasons_renderUserAndMessage() {
+        val reasons =
+            listOf(
+                ListNotificationsNotificationReason.StarterpackJoined,
+                ListNotificationsNotificationReason.Verified,
+                ListNotificationsNotificationReason.Unverified,
+                ListNotificationsNotificationReason.Unknown("something-else"),
+            )
+
+        reasons.forEachIndexed { index, reason ->
+            val notification =
+                createNotification(
+                    reason = reason,
+                    uri = "at://did:plc:noti/app.bsky.notification/u$index",
+                    author = createProfile("user$index", "user$index.bsky.social"),
+                )
+            val result = listOf(notification).render(accountKey, references = persistentMapOf())
+            val user = assertIs<UiTimelineV2.User>(result.single())
+            assertNotNull(user.message)
+            assertEquals("did:plc:user$index", user.value.key.id)
+            assertEquals(
+                "did:plc:user$index",
+                user.message.user
+                    ?.key
+                    ?.id,
+            )
+            assertTrue(user.statusKey.id.contains("/u$index"))
+        }
+    }
+
+    private fun createNotification(
+        reason: ListNotificationsNotificationReason,
+        uri: String,
+        author: ProfileView,
+        record: JsonContent = jsonRecord("notification"),
+    ): ListNotificationsNotification =
+        ListNotificationsNotification(
+            uri = AtUri(uri),
+            cid = Cid("cid-${uri.substringAfterLast('/')}"),
+            author = author,
+            reason = reason,
+            record = record,
+            isRead = false,
+            indexedAt = Instant.parse("2024-01-01T00:00:00Z"),
+        )
+
+    private fun createProfile(
+        did: String,
+        handle: String,
+    ): ProfileView =
+        ProfileView(
+            did = Did("did:plc:$did"),
+            handle = Handle(handle),
+            displayName = did,
+            avatar = Uri("https://cdn.example.com/$did.png"),
+        )
+
+    private fun createProfileBasic(
+        did: String,
+        handle: String,
+    ): ProfileViewBasic =
+        ProfileViewBasic(
+            did = Did("did:plc:$did"),
+            handle = Handle(handle),
+            displayName = did,
+            avatar = Uri("https://cdn.example.com/$did.png"),
+        )
+
+    private fun createPostView(
+        uri: String,
+        author: ProfileViewBasic,
+        text: String,
+    ): PostView =
+        PostView(
+            uri = AtUri(uri),
+            cid = Cid("cid-${uri.substringAfterLast('/')}"),
+            author = author,
+            record = jsonRecord(text),
+            indexedAt = Instant.parse("2024-01-01T00:00:00Z"),
+        )
+
+    private fun jsonRecord(text: String): JsonContent =
+        bskyJson.encodeAsJsonContent(
+            buildJsonObject {
+                put("text", JsonPrimitive(text))
+            },
+        )
+}
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/BlueskyRenderTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/BlueskyRenderTest.kt
new file mode 100644
index 000000000..8f88f9253
--- /dev/null
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/BlueskyRenderTest.kt
@@ -0,0 +1,287 @@
+package dev.dimension.flare.ui.model.mapper
+
+import app.bsky.actor.ProfileViewBasic
+import app.bsky.embed.AspectRatio
+import app.bsky.embed.ImagesView
+import app.bsky.embed.ImagesViewImage
+import app.bsky.embed.RecordView
+import app.bsky.embed.RecordViewRecord
+import app.bsky.embed.RecordViewRecordUnion
+import app.bsky.feed.FeedViewPost
+import app.bsky.feed.FeedViewPostReasonUnion
+import app.bsky.feed.PostView
+import app.bsky.feed.PostViewEmbedUnion
+import app.bsky.feed.ReasonRepost
+import app.bsky.feed.ReplyRef
+import app.bsky.feed.ReplyRefParentUnion
+import app.bsky.feed.ReplyRefRootUnion
+import dev.dimension.flare.common.TestFormatter
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.humanizer.PlatformFormatter
+import dev.dimension.flare.ui.model.UiMedia
+import dev.dimension.flare.ui.model.UiTimelineV2
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.buildJsonObject
+import org.koin.core.context.startKoin
+import org.koin.core.context.stopKoin
+import org.koin.dsl.module
+import sh.christian.ozone.api.AtUri
+import sh.christian.ozone.api.Cid
+import sh.christian.ozone.api.Did
+import sh.christian.ozone.api.Handle
+import sh.christian.ozone.api.Uri
+import sh.christian.ozone.api.model.JsonContent.Companion.encodeAsJsonContent
+import kotlin.test.AfterTest
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertIs
+import kotlin.test.assertNotNull
+import kotlin.time.Instant
+
+class BlueskyRenderTest {
+    private val accountKey = MicroBlogKey(id = "me", host = "bsky.social")
+
+    @BeforeTest
+    fun setup() {
+        startKoin {
+            modules(
+                module {
+                    single<PlatformFormatter> { TestFormatter() }
+                },
+            )
+        }
+    }
+
+    @AfterTest
+    fun tearDown() {
+        stopKoin()
+    }
+
+    @Test
+    fun postRender_mapsMediaImages() {
+        val post =
+            createPostView(
+                uri = "at://did:plc:author/app.bsky.feed.post/1",
+                author = createProfile("author", "author.bsky.social"),
+                text = "with media",
+                embed =
+                    PostViewEmbedUnion.ImagesView(
+                        ImagesView(
+                            images =
+                                listOf(
+                                    ImagesViewImage(
+                                        thumb = Uri("https://cdn.example.com/thumb.jpg"),
+                                        fullsize = Uri("https://cdn.example.com/full.jpg"),
+                                        alt = "image alt",
+                                        aspectRatio = AspectRatio(width = 4, height = 3),
+                                    ),
+                                ),
+                        ),
+                    ),
+            )
+
+        val rendered = post.render(accountKey)
+        assertEquals(1, rendered.images.size)
+        val media = assertIs<UiMedia.Image>(rendered.images.first())
+        assertEquals("https://cdn.example.com/full.jpg", media.url)
+        assertEquals("https://cdn.example.com/thumb.jpg", media.previewUrl)
+        assertEquals("image alt", media.description)
+        assertEquals(4f, media.width)
+        assertEquals(3f, media.height)
+    }
+
+    @Test
+    fun postRender_mapsQuotePost() {
+        val quotedRecord =
+            RecordViewRecord(
+                uri = AtUri("at://did:plc:quoted/app.bsky.feed.post/2"),
+                cid = Cid("cid-quoted"),
+                author = createProfile("quoted", "quoted.bsky.social"),
+                value = jsonRecord("quoted content"),
+                indexedAt = Instant.parse("2024-01-01T00:00:00Z"),
+            )
+        val mainPost =
+            createPostView(
+                uri = "at://did:plc:author/app.bsky.feed.post/1",
+                author = createProfile("author", "author.bsky.social"),
+                text = "main content",
+                embed =
+                    PostViewEmbedUnion.RecordView(
+                        RecordView(
+                            record = RecordViewRecordUnion.ViewRecord(quotedRecord),
+                        ),
+                    ),
+            )
+
+        val rendered = mainPost.render(accountKey)
+        assertEquals(1, rendered.quote.size)
+        assertEquals(
+            "quoted content",
+            rendered.quote
+                .first()
+                .content.innerText,
+        )
+        assertEquals(
+            "at://did:plc:quoted/app.bsky.feed.post/2",
+            rendered.quote
+                .first()
+                .statusKey.id,
+        )
+    }
+
+    @Test
+    fun feedRender_mapsParentReply() {
+        val parent =
+            createPostView(
+                uri = "at://did:plc:parent/app.bsky.feed.post/10",
+                author = createProfile("parent", "parent.bsky.social"),
+                text = "parent content",
+            )
+        val child =
+            createPostView(
+                uri = "at://did:plc:child/app.bsky.feed.post/11",
+                author = createProfile("child", "child.bsky.social"),
+                text = "child content",
+            )
+        val feed =
+            FeedViewPost(
+                post = child,
+                reply =
+                    ReplyRef(
+                        root = ReplyRefRootUnion.PostView(parent),
+                        parent = ReplyRefParentUnion.PostView(parent),
+                    ),
+            )
+
+        val rendered = listOf(feed).render(accountKey)
+        val post = assertIs<UiTimelineV2.Post>(rendered.single())
+        assertEquals(1, post.parents.size)
+        assertEquals(
+            "at://did:plc:parent/app.bsky.feed.post/10",
+            post.parents
+                .first()
+                .statusKey.id,
+        )
+        assertEquals(
+            "parent content",
+            post.parents
+                .first()
+                .content.innerText,
+        )
+    }
+
+    @Test
+    fun feedRender_repostShowsMessageAndUsesRepostedPostContent() {
+        val originalAuthor = createProfile("original", "original.bsky.social")
+        val reposter = createProfile("reposter", "reposter.bsky.social")
+        val originalPost =
+            createPostView(
+                uri = "at://did:plc:original/app.bsky.feed.post/99",
+                author = originalAuthor,
+                text = "original post content",
+            )
+        val feed =
+            FeedViewPost(
+                post = originalPost,
+                reason =
+                    FeedViewPostReasonUnion.ReasonRepost(
+                        ReasonRepost(
+                            by = reposter,
+                            indexedAt = Instant.parse("2024-01-01T02:00:00Z"),
+                        ),
+                    ),
+            )
+
+        val rendered = assertIs<UiTimelineV2.Post>(listOf(feed).render(accountKey).single())
+        val message = assertNotNull(rendered.message)
+
+        val type = assertIs<UiTimelineV2.Message.Type.Localized>(message.type)
+        assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
+        assertEquals("did:plc:reposter", message.user?.key?.id)
+        assertEquals("did:plc:original", rendered.user?.key?.id)
+        assertEquals("original post content", rendered.content.innerText)
+    }
+
+    @Test
+    fun feedRender_repostWithQuotedPostShowsMessagePostAndQuote() {
+        val quotedRecord =
+            RecordViewRecord(
+                uri = AtUri("at://did:plc:quoted/app.bsky.feed.post/200"),
+                cid = Cid("cid-quoted"),
+                author = createProfile("quoted", "quoted.bsky.social"),
+                value = jsonRecord("quoted payload"),
+                indexedAt = Instant.parse("2024-01-01T00:00:00Z"),
+            )
+        val repostedPost =
+            createPostView(
+                uri = "at://did:plc:original/app.bsky.feed.post/201",
+                author = createProfile("original", "original.bsky.social"),
+                text = "original payload",
+                embed =
+                    PostViewEmbedUnion.RecordView(
+                        RecordView(
+                            record = RecordViewRecordUnion.ViewRecord(quotedRecord),
+                        ),
+                    ),
+            )
+        val feed =
+            FeedViewPost(
+                post = repostedPost,
+                reason =
+                    FeedViewPostReasonUnion.ReasonRepost(
+                        ReasonRepost(
+                            by = createProfile("reposter", "reposter.bsky.social"),
+                            indexedAt = Instant.parse("2024-01-01T02:00:00Z"),
+                        ),
+                    ),
+            )
+
+        val rendered = assertIs<UiTimelineV2.Post>(listOf(feed).render(accountKey).single())
+        val message = assertNotNull(rendered.message)
+        val type = assertIs<UiTimelineV2.Message.Type.Localized>(message.type)
+
+        assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
+        assertEquals("original payload", rendered.content.innerText)
+        assertEquals(1, rendered.quote.size)
+        assertEquals(
+            "quoted payload",
+            rendered.quote
+                .first()
+                .content.innerText,
+        )
+        assertEquals("did:plc:reposter", message.user?.key?.id)
+    }
+
+    private fun createProfile(
+        did: String,
+        handle: String,
+    ): ProfileViewBasic =
+        ProfileViewBasic(
+            did = Did("did:plc:$did"),
+            handle = Handle(handle),
+            displayName = did,
+        )
+
+    private fun createPostView(
+        uri: String,
+        author: ProfileViewBasic,
+        text: String,
+        embed: PostViewEmbedUnion? = null,
+    ): PostView =
+        PostView(
+            uri = AtUri(uri),
+            cid = Cid("cid-${uri.substringAfterLast('/')}"),
+            author = author,
+            record = jsonRecord(text),
+            embed = embed,
+            indexedAt = Instant.parse("2024-01-01T00:00:00Z"),
+        )
+
+    private fun jsonRecord(text: String) =
+        bskyJson.encodeAsJsonContent(
+            buildJsonObject {
+                put("text", JsonPrimitive(text))
+            },
+        )
+}
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/BlueskyUiMappingTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/BlueskyUiMappingTest.kt
new file mode 100644
index 000000000..a959d98e6
--- /dev/null
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/BlueskyUiMappingTest.kt
@@ -0,0 +1,86 @@
+package dev.dimension.flare.ui.model.mapper
+
+import app.bsky.richtext.Facet
+import app.bsky.richtext.FacetByteSlice
+import app.bsky.richtext.FacetFeatureUnion
+import app.bsky.richtext.FacetLink
+import app.bsky.richtext.FacetMention
+import app.bsky.richtext.FacetTag
+import dev.dimension.flare.model.AccountType
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.route.DeeplinkRoute
+import dev.dimension.flare.ui.route.toUri
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.encodeToJsonElement
+import sh.christian.ozone.api.Did
+import sh.christian.ozone.api.Uri
+import sh.christian.ozone.api.model.JsonContent.Companion.encodeAsJsonContent
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+class BlueskyUiMappingTest {
+    private val accountKey = MicroBlogKey(id = "account", host = "bsky.social")
+
+    @Test
+    fun parseBlueskyJson_mapsFacetsToUiLinks() {
+        val text = "https://example.com #tag @alice.bsky.social"
+        val mentionDid = "did:plc:alice123"
+        val facets =
+            listOf(
+                Facet(
+                    index = FacetByteSlice(byteStart = 0, byteEnd = 19),
+                    features = listOf(FacetFeatureUnion.Link(FacetLink(uri = Uri("https://example.com")))),
+                ),
+                Facet(
+                    index = FacetByteSlice(byteStart = 20, byteEnd = 24),
+                    features = listOf(FacetFeatureUnion.Tag(FacetTag(tag = "tag"))),
+                ),
+                Facet(
+                    index = FacetByteSlice(byteStart = 25, byteEnd = 43),
+                    features = listOf(FacetFeatureUnion.Mention(FacetMention(did = Did(mentionDid)))),
+                ),
+            )
+
+        val json =
+            bskyJson.encodeAsJsonContent(
+                buildJsonObject {
+                    put("text", JsonPrimitive(text))
+                    put("facets", bskyJson.encodeToJsonElement(facets))
+                },
+            )
+
+        val result = parseBlueskyJson(json, accountKey)
+        val expectedMentionUrl =
+            DeeplinkRoute.Profile
+                .User(
+                    accountType = AccountType.Specific(accountKey),
+                    userKey = MicroBlogKey(id = mentionDid, host = accountKey.host),
+                ).toUri()
+        val expectedTagUrl =
+            DeeplinkRoute
+                .Search(
+                    accountType = AccountType.Specific(accountKey),
+                    query = "#tag",
+                ).toUri()
+
+        assertTrue(result.html.contains("""href="https://example.com""""))
+        assertTrue(result.html.contains("""href="$expectedMentionUrl""""))
+        assertTrue(result.html.contains("""href="$expectedTagUrl""""))
+    }
+
+    @Test
+    fun parseBlueskyJson_withoutFacets_returnsPlainText() {
+        val json =
+            bskyJson.encodeAsJsonContent(
+                buildJsonObject {
+                    put("text", JsonPrimitive("plain text"))
+                },
+            )
+
+        val result = parseBlueskyJson(json, accountKey)
+        assertEquals("plain text", result.innerText)
+        assertEquals("plain text", result.html)
+    }
+}
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/MastodonRenderTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/MastodonRenderTest.kt
new file mode 100644
index 000000000..d4e3bb3fe
--- /dev/null
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/MastodonRenderTest.kt
@@ -0,0 +1,220 @@
+package dev.dimension.flare.ui.model.mapper
+
+import dev.dimension.flare.common.JSON
+import dev.dimension.flare.common.TestFormatter
+import dev.dimension.flare.data.network.mastodon.api.model.Account
+import dev.dimension.flare.data.network.mastodon.api.model.Attachment
+import dev.dimension.flare.data.network.mastodon.api.model.MastodonQuote
+import dev.dimension.flare.data.network.mastodon.api.model.MediaType
+import dev.dimension.flare.data.network.mastodon.api.model.Meta
+import dev.dimension.flare.data.network.mastodon.api.model.Status
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.humanizer.PlatformFormatter
+import dev.dimension.flare.ui.model.UiMedia
+import dev.dimension.flare.ui.model.UiTimelineV2
+import kotlinx.serialization.json.jsonObject
+import org.koin.core.context.startKoin
+import org.koin.core.context.stopKoin
+import org.koin.dsl.module
+import kotlin.test.AfterTest
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertIs
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+import kotlin.time.Instant
+
+class MastodonRenderTest {
+    private val accountKey = MicroBlogKey(id = "me", host = "mastodon.social")
+
+    @BeforeTest
+    fun setup() {
+        startKoin {
+            modules(
+                module {
+                    single<PlatformFormatter> { TestFormatter() }
+                },
+            )
+        }
+    }
+
+    @AfterTest
+    fun tearDown() {
+        stopKoin()
+    }
+
+    @Test
+    fun mediaIsRecognized() {
+        val status =
+            createStatus(
+                id = "media-1",
+                account = createAccount("media-user"),
+                content = "<p>has media</p>",
+                mediaAttachments =
+                    listOf(
+                        Attachment(
+                            id = "att-1",
+                            type = MediaType.Image,
+                            url = "https://mastodon.social/media/full.jpg",
+                            previewURL = "https://mastodon.social/media/preview.jpg",
+                            description = "image alt",
+                            meta = Meta(width = 1200, height = 800),
+                        ),
+                    ),
+            )
+
+        val rendered = assertIs<UiTimelineV2.Post>(status.render(host = accountKey.host, accountKey = accountKey))
+        assertEquals(1, rendered.images.size)
+        val image = assertIs<UiMedia.Image>(rendered.images.first())
+        assertEquals("https://mastodon.social/media/full.jpg", image.url)
+        assertEquals("https://mastodon.social/media/preview.jpg", image.previewUrl)
+        assertEquals("image alt", image.description)
+        assertEquals(1200f, image.width)
+        assertEquals(800f, image.height)
+    }
+
+    @Test
+    fun quoteIsRecognized() {
+        val quoted =
+            createStatus(
+                id = "quote-1",
+                account = createAccount("quoted-user"),
+                content = "<p>quoted content</p>",
+            )
+        val status =
+            createStatus(
+                id = "main-1",
+                account = createAccount("main-user"),
+                content = "<p>main content</p>",
+                quote = quoted,
+            )
+
+        val rendered = assertIs<UiTimelineV2.Post>(status.render(host = accountKey.host, accountKey = accountKey))
+        assertEquals(1, rendered.quote.size)
+        assertEquals(
+            "quoted content",
+            rendered.quote
+                .first()
+                .content.innerText,
+        )
+    }
+
+    @Test
+    fun parentsAreRecognizedOnCurrentPath() {
+        val status =
+            createStatus(
+                id = "reply-1",
+                account = createAccount("reply-user"),
+                content = "<p>reply content</p>",
+                inReplyToID = "parent-id",
+            )
+
+        val rendered = assertIs<UiTimelineV2.Post>(status.render(host = accountKey.host, accountKey = accountKey))
+        assertTrue(rendered.parents.isEmpty())
+    }
+
+    @Test
+    fun repostShowsMessageAndUsesRebloggedPostContent() {
+        val originalStatus =
+            createStatus(
+                id = "original-1",
+                account = createAccount("original-user"),
+                content = "<p>original content</p>",
+            )
+        val reblogWrapper =
+            createStatus(
+                id = "reblog-wrapper-1",
+                account = createAccount("reblogger-user"),
+                content = "<p>wrapper content</p>",
+                reblog = originalStatus,
+            )
+
+        val rendered = assertIs<UiTimelineV2.Post>(reblogWrapper.render(host = accountKey.host, accountKey = accountKey))
+        val message = assertNotNull(rendered.message)
+        val type = assertIs<UiTimelineV2.Message.Type.Localized>(message.type)
+
+        assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
+        assertEquals("reblogger-user", message.user?.handle?.raw)
+        assertEquals("original content", rendered.content.innerText)
+    }
+
+    @Test
+    fun reblogWithQuoteShowsMessagePostAndQuote() {
+        val quotedStatus =
+            createStatus(
+                id = "quoted-2",
+                account = createAccount("quoted-user"),
+                content = "<p>quoted content</p>",
+            )
+        val originalStatus =
+            createStatus(
+                id = "original-2",
+                account = createAccount("original-user"),
+                content = "<p>original content</p>",
+                quote = quotedStatus,
+            )
+        val reblogWrapper =
+            createStatus(
+                id = "reblog-wrapper-2",
+                account = createAccount("reblogger-user"),
+                content = "<p>wrapper</p>",
+                reblog = originalStatus,
+            )
+
+        val rendered = assertIs<UiTimelineV2.Post>(reblogWrapper.render(host = accountKey.host, accountKey = accountKey))
+        val message = assertNotNull(rendered.message)
+        val type = assertIs<UiTimelineV2.Message.Type.Localized>(message.type)
+
+        assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
+        assertEquals("reblogger-user", message.user?.handle?.raw)
+        assertEquals("original content", rendered.content.innerText)
+        assertEquals(1, rendered.quote.size)
+        assertEquals(
+            "quoted content",
+            rendered.quote
+                .first()
+                .content.innerText,
+        )
+    }
+
+    private fun createStatus(
+        id: String,
+        account: Account,
+        content: String,
+        inReplyToID: String? = null,
+        reblog: Status? = null,
+        quote: Status? = null,
+        mediaAttachments: List<Attachment>? = null,
+    ): Status =
+        Status(
+            id = id,
+            account = account,
+            content = content,
+            createdAt = Instant.parse("2024-01-01T00:00:00Z"),
+            inReplyToID = inReplyToID,
+            reblog = reblog,
+            mediaAttachments = mediaAttachments,
+            json_quote =
+                quote?.let {
+                    JSON
+                        .encodeToJsonElement(
+                            MastodonQuote.serializer(),
+                            MastodonQuote(
+                                state = "accepted",
+                                quoted_status = it,
+                            ),
+                        ).jsonObject
+                },
+        )
+
+    private fun createAccount(name: String): Account =
+        Account(
+            id = name,
+            username = name,
+            acct = "$name@mastodon.social",
+            displayName = name,
+            avatar = "https://mastodon.social/$name.png",
+            avatarStatic = "https://mastodon.social/$name.png",
+        )
+}
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/MisskeyRenderTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/MisskeyRenderTest.kt
new file mode 100644
index 000000000..1628923d1
--- /dev/null
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/MisskeyRenderTest.kt
@@ -0,0 +1,268 @@
+package dev.dimension.flare.ui.model.mapper
+
+import dev.dimension.flare.common.TestFormatter
+import dev.dimension.flare.data.network.misskey.api.model.DriveFile
+import dev.dimension.flare.data.network.misskey.api.model.DriveFileProperties
+import dev.dimension.flare.data.network.misskey.api.model.Note
+import dev.dimension.flare.data.network.misskey.api.model.UserLite
+import dev.dimension.flare.data.network.misskey.api.model.Visibility
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.humanizer.PlatformFormatter
+import dev.dimension.flare.ui.model.UiMedia
+import dev.dimension.flare.ui.model.UiTimelineV2
+import org.koin.core.context.startKoin
+import org.koin.core.context.stopKoin
+import org.koin.dsl.module
+import kotlin.test.AfterTest
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertIs
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+
+class MisskeyRenderTest {
+    private val accountKey = MicroBlogKey(id = "me", host = "misskey.io")
+
+    @BeforeTest
+    fun setup() {
+        startKoin {
+            modules(
+                module {
+                    single<PlatformFormatter> { TestFormatter() }
+                },
+            )
+        }
+    }
+
+    @AfterTest
+    fun tearDown() {
+        stopKoin()
+    }
+
+    @Test
+    fun mediaIsRecognized() {
+        val note =
+            createNote(
+                id = "note-media",
+                user = createUser("user-media"),
+                text = "has media",
+                files =
+                    listOf(
+                        createFile(
+                            id = "file-image",
+                            type = "image/png",
+                            url = "https://cdn.misskey.io/image.png",
+                            thumbnailUrl = "https://cdn.misskey.io/image-thumb.png",
+                            width = 800.0,
+                            height = 600.0,
+                            isSensitive = true,
+                        ),
+                        createFile(
+                            id = "file-video",
+                            type = "video/mp4",
+                            url = "https://cdn.misskey.io/video.mp4",
+                            thumbnailUrl = "https://cdn.misskey.io/video-thumb.jpg",
+                            width = 1920.0,
+                            height = 1080.0,
+                        ),
+                    ),
+            )
+
+        val rendered = assertIs<UiTimelineV2.Post>(note.render(accountKey))
+        assertEquals(2, rendered.images.size)
+
+        val image = assertIs<UiMedia.Image>(rendered.images[0])
+        assertEquals("https://cdn.misskey.io/image.png", image.url)
+        assertEquals("https://cdn.misskey.io/image-thumb.png", image.previewUrl)
+        assertEquals(800f, image.width)
+        assertEquals(600f, image.height)
+        assertTrue(image.sensitive)
+
+        val video = assertIs<UiMedia.Video>(rendered.images[1])
+        assertEquals("https://cdn.misskey.io/video.mp4", video.url)
+        assertEquals("https://cdn.misskey.io/video-thumb.jpg", video.thumbnailUrl)
+        assertEquals(1920f, video.width)
+        assertEquals(1080f, video.height)
+    }
+
+    @Test
+    fun quoteIsRecognized() {
+        val quoted =
+            createNote(
+                id = "note-quoted",
+                user = createUser("user-quoted"),
+                text = "quoted content",
+            )
+        val note =
+            createNote(
+                id = "note-main",
+                user = createUser("user-main"),
+                text = "main content",
+                renote = quoted,
+            )
+
+        val rendered = assertIs<UiTimelineV2.Post>(note.render(accountKey))
+        assertEquals(1, rendered.quote.size)
+        assertEquals(
+            "quoted content",
+            rendered.quote
+                .first()
+                .content.innerText,
+        )
+    }
+
+    @Test
+    fun parentsAreRecognized() {
+        val parent =
+            createNote(
+                id = "note-parent",
+                user = createUser("user-parent"),
+                text = "parent content",
+            )
+        val child =
+            createNote(
+                id = "note-child",
+                user = createUser("user-child"),
+                text = "child content",
+                reply = parent,
+                replyId = parent.id,
+            )
+
+        val rendered = assertIs<UiTimelineV2.Post>(child.render(accountKey))
+        assertEquals(1, rendered.parents.size)
+        assertEquals(
+            "parent content",
+            rendered.parents
+                .first()
+                .content.innerText,
+        )
+        assertEquals(
+            "note-parent",
+            rendered.parents
+                .first()
+                .statusKey.id,
+        )
+    }
+
+    @Test
+    fun repostShowsMessageAndUsesRepostedContent() {
+        val original =
+            createNote(
+                id = "note-original",
+                user = createUser("user-original"),
+                text = "original content",
+            )
+        val repost =
+            createNote(
+                id = "note-repost-wrapper",
+                user = createUser("user-reposter"),
+                text = null,
+                renote = original,
+            )
+
+        val rendered = assertIs<UiTimelineV2.Post>(repost.render(accountKey))
+        val message = assertNotNull(rendered.message)
+        val type = assertIs<UiTimelineV2.Message.Type.Localized>(message.type)
+
+        assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
+        assertEquals("user-reposter", message.user?.key?.id)
+        assertEquals("original content", rendered.content.innerText)
+    }
+
+    @Test
+    fun repostWithQuoteShowsMessagePostAndQuote() {
+        val quoted =
+            createNote(
+                id = "note-quoted-2",
+                user = createUser("user-quoted-2"),
+                text = "quoted payload",
+            )
+        val original =
+            createNote(
+                id = "note-original-2",
+                user = createUser("user-original-2"),
+                text = "original payload",
+                renote = quoted,
+            )
+        val repost =
+            createNote(
+                id = "note-repost-wrapper-2",
+                user = createUser("user-reposter-2"),
+                text = null,
+                renote = original,
+            )
+
+        val rendered = assertIs<UiTimelineV2.Post>(repost.render(accountKey))
+        val message = assertNotNull(rendered.message)
+        val type = assertIs<UiTimelineV2.Message.Type.Localized>(message.type)
+
+        assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
+        assertEquals("original payload", rendered.content.innerText)
+        assertEquals(1, rendered.quote.size)
+        assertEquals(
+            "quoted payload",
+            rendered.quote
+                .first()
+                .content.innerText,
+        )
+    }
+
+    private fun createUser(id: String): UserLite =
+        UserLite(
+            id = id,
+            username = id,
+            name = id,
+            host = null,
+            avatarUrl = "https://misskey.io/$id.png",
+        )
+
+    private fun createFile(
+        id: String,
+        type: String,
+        url: String,
+        thumbnailUrl: String,
+        width: Double,
+        height: Double,
+        isSensitive: Boolean = false,
+    ): DriveFile =
+        DriveFile(
+            id = id,
+            createdAt = "2024-01-01T00:00:00Z",
+            name = id,
+            type = type,
+            md5 = "md5-$id",
+            propertySize = 1.0,
+            isSensitive = isSensitive,
+            properties = DriveFileProperties(width = width, height = height),
+            url = url,
+            thumbnailUrl = thumbnailUrl,
+            comment = null,
+        )
+
+    private fun createNote(
+        id: String,
+        user: UserLite,
+        text: String?,
+        reply: Note? = null,
+        replyId: String? = null,
+        renote: Note? = null,
+        files: List<DriveFile>? = null,
+    ): Note =
+        Note(
+            id = id,
+            createdAt = "2024-01-01T00:00:00Z",
+            text = text,
+            userId = user.id,
+            user = user,
+            visibility = Visibility.Public,
+            reactions = emptyMap(),
+            renoteCount = 0.0,
+            repliesCount = 0.0,
+            replyId = replyId,
+            renoteId = renote?.id,
+            reply = reply,
+            renote = renote,
+            files = files,
+        )
+}
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/VVORenderTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/VVORenderTest.kt
new file mode 100644
index 000000000..6233c31b8
--- /dev/null
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/VVORenderTest.kt
@@ -0,0 +1,155 @@
+package dev.dimension.flare.ui.model.mapper
+
+import dev.dimension.flare.common.JSON
+import dev.dimension.flare.common.TestFormatter
+import dev.dimension.flare.data.network.vvo.model.Large
+import dev.dimension.flare.data.network.vvo.model.Status
+import dev.dimension.flare.data.network.vvo.model.StatusPic
+import dev.dimension.flare.data.network.vvo.model.User
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.humanizer.PlatformFormatter
+import dev.dimension.flare.ui.model.UiMedia
+import dev.dimension.flare.ui.model.UiTimelineV2
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.buildJsonObject
+import org.koin.core.context.startKoin
+import org.koin.core.context.stopKoin
+import org.koin.dsl.module
+import kotlin.test.AfterTest
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertIs
+import kotlin.time.Instant
+
+class VVORenderTest {
+    private val accountKey = MicroBlogKey(id = "me", host = "weibo.cn")
+
+    @BeforeTest
+    fun setup() {
+        startKoin {
+            modules(
+                module {
+                    single<PlatformFormatter> { TestFormatter() }
+                },
+            )
+        }
+    }
+
+    @AfterTest
+    fun tearDown() {
+        stopKoin()
+    }
+
+    @Test
+    fun mediaIsRecognized() {
+        val imagePic =
+            StatusPic(
+                pid = "pic-image",
+                url = "https://wx1.sinaimg.cn/thumbnail.jpg",
+                large =
+                    Large(
+                        url = "https://wx1.sinaimg.cn/large.jpg",
+                        geo =
+                            buildJsonObject {
+                                put("width", JsonPrimitive(1200))
+                                put("height", JsonPrimitive(800))
+                            },
+                    ),
+            )
+        val videoPic =
+            StatusPic(
+                pid = "pic-video",
+                type = "video",
+                videoSrc = "https://video.weibo.com/stream.mp4",
+                url = "https://wx1.sinaimg.cn/video-thumb.jpg",
+                large =
+                    Large(
+                        url = "https://wx1.sinaimg.cn/video-large.jpg",
+                        geo =
+                            buildJsonObject {
+                                put("width", JsonPrimitive(1920))
+                                put("height", JsonPrimitive(1080))
+                            },
+                    ),
+            )
+        val status =
+            createStatus(
+                id = "status-media",
+                user = createUser(1L, "media-user"),
+                text = "media post",
+                pics = JSON.encodeToJsonElement(ListSerializer(StatusPic.serializer()), listOf(imagePic, videoPic)),
+            )
+
+        val rendered = assertIs<UiTimelineV2.Post>(status.render(accountKey))
+        assertEquals(2, rendered.images.size)
+
+        val image = assertIs<UiMedia.Image>(rendered.images[0])
+        assertEquals("https://wx1.sinaimg.cn/large.jpg", image.url)
+        assertEquals("https://wx1.sinaimg.cn/thumbnail.jpg", image.previewUrl)
+        assertEquals(1200f, image.width)
+        assertEquals(800f, image.height)
+
+        val video = assertIs<UiMedia.Video>(rendered.images[1])
+        assertEquals("https://video.weibo.com/stream.mp4", video.url)
+        assertEquals("https://wx1.sinaimg.cn/video-thumb.jpg", video.thumbnailUrl)
+        assertEquals(1920f, video.width)
+        assertEquals(1080f, video.height)
+    }
+
+    @Test
+    fun quoteIsRecognized() {
+        val quoted =
+            createStatus(
+                id = "status-quoted",
+                user = createUser(2L, "quoted-user"),
+                text = "quoted content",
+            )
+        val status =
+            createStatus(
+                id = "status-main",
+                user = createUser(3L, "main-user"),
+                text = "main content",
+                retweetedStatus = quoted,
+            )
+
+        val rendered = assertIs<UiTimelineV2.Post>(status.render(accountKey))
+        assertEquals(1, rendered.quote.size)
+        assertEquals(
+            "quoted content",
+            rendered.quote
+                .first()
+                .content.innerText,
+        )
+    }
+
+    private fun createStatus(
+        id: String,
+        user: User,
+        text: String,
+        pics: kotlinx.serialization.json.JsonElement? = null,
+        retweetedStatus: Status? = null,
+    ): Status =
+        Status(
+            id = id,
+            bid = id,
+            user = user,
+            text = text,
+            createdAt = Instant.parse("2024-01-01T00:00:00Z"),
+            pics = pics,
+            retweetedStatus = retweetedStatus,
+        )
+
+    private fun createUser(
+        id: Long,
+        name: String,
+    ): User =
+        User(
+            id = id,
+            screenName = name,
+            profileImageURL = "https://weibo.cn/$name.jpg",
+            avatarHD = "https://weibo.cn/$name-hd.jpg",
+            followersCountStr = "0",
+        )
+}
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/XQTRenderTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/XQTRenderTest.kt
new file mode 100644
index 000000000..62713cd9a
--- /dev/null
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/XQTRenderTest.kt
@@ -0,0 +1,329 @@
+package dev.dimension.flare.ui.model.mapper
+
+import dev.dimension.flare.common.TestFormatter
+import dev.dimension.flare.data.database.cache.mapper.XQTTimeline
+import dev.dimension.flare.data.network.xqt.model.Entities
+import dev.dimension.flare.data.network.xqt.model.ItemResult
+import dev.dimension.flare.data.network.xqt.model.Media
+import dev.dimension.flare.data.network.xqt.model.MediaOriginalInfo
+import dev.dimension.flare.data.network.xqt.model.MediaSize
+import dev.dimension.flare.data.network.xqt.model.MediaSizes
+import dev.dimension.flare.data.network.xqt.model.MediaVideoInfo
+import dev.dimension.flare.data.network.xqt.model.MediaVideoInfoVariant
+import dev.dimension.flare.data.network.xqt.model.TimelineTweet
+import dev.dimension.flare.data.network.xqt.model.Tweet
+import dev.dimension.flare.data.network.xqt.model.TweetLegacy
+import dev.dimension.flare.data.network.xqt.model.User
+import dev.dimension.flare.data.network.xqt.model.UserLegacy
+import dev.dimension.flare.data.network.xqt.model.UserResultCore
+import dev.dimension.flare.data.network.xqt.model.UserResults
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.humanizer.PlatformFormatter
+import dev.dimension.flare.ui.model.UiMedia
+import dev.dimension.flare.ui.model.UiTimelineV2
+import org.koin.core.context.startKoin
+import org.koin.core.context.stopKoin
+import org.koin.dsl.module
+import kotlin.test.AfterTest
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertIs
+import kotlin.test.assertNotNull
+
+class XQTRenderTest {
+    private val accountKey = MicroBlogKey(id = "me", host = "x.com")
+
+    @BeforeTest
+    fun setup() {
+        startKoin {
+            modules(
+                module {
+                    single<PlatformFormatter> { TestFormatter() }
+                },
+            )
+        }
+    }
+
+    @AfterTest
+    fun tearDown() {
+        stopKoin()
+    }
+
+    @Test
+    fun mediaIsRecognized() {
+        val status =
+            createTweet(
+                id = "status-media",
+                user = createUser("user-media", "media_user"),
+                text = "post with media",
+                media =
+                    listOf(
+                        createPhotoMedia("img-1", "https://pbs.twimg.com/media/image.jpg", 1200, 800),
+                        createVideoMedia("vid-1", "https://pbs.twimg.com/media/video.jpg", "https://video.twimg.com/video.mp4", 1920, 1080),
+                    ),
+            )
+
+        val rendered = assertIs<UiTimelineV2.Post>(status.render(accountKey))
+        assertEquals(2, rendered.images.size)
+
+        val image = assertIs<UiMedia.Image>(rendered.images[0])
+        assertEquals("https://pbs.twimg.com/media/image.jpg?name=orig", image.url)
+        assertEquals("https://pbs.twimg.com/media/image.jpg", image.previewUrl)
+        assertEquals(1200f, image.width)
+        assertEquals(800f, image.height)
+
+        val video = assertIs<UiMedia.Video>(rendered.images[1])
+        assertEquals("https://video.twimg.com/video.mp4", video.url)
+        assertEquals("https://pbs.twimg.com/media/video.jpg", video.thumbnailUrl)
+        assertEquals(1920f, video.width)
+        assertEquals(1080f, video.height)
+    }
+
+    @Test
+    fun quoteIsRecognized() {
+        val quoted =
+            createTweet(
+                id = "status-quoted",
+                user = createUser("user-quoted", "quoted_user"),
+                text = "quoted content",
+            )
+        val status =
+            createTweet(
+                id = "status-main",
+                user = createUser("user-main", "main_user"),
+                text = "main content",
+                quotedStatus = quoted,
+            )
+
+        val rendered = assertIs<UiTimelineV2.Post>(status.render(accountKey))
+        assertEquals(1, rendered.quote.size)
+        assertEquals(
+            "quoted content",
+            rendered.quote
+                .first()
+                .content.innerText,
+        )
+    }
+
+    @Test
+    fun parentsAreRecognized() {
+        val parent =
+            createTweet(
+                id = "status-parent",
+                user = createUser("user-parent", "parent_user"),
+                text = "parent content",
+            )
+        val child =
+            createTweet(
+                id = "status-child",
+                user = createUser("user-child", "child_user"),
+                text = "child content",
+            )
+
+        val rendered =
+            assertIs<UiTimelineV2.Post>(
+                createTimeline(
+                    tweet = child,
+                    parents = listOf(createTimeline(parent)),
+                ).render(accountKey),
+            )
+        assertEquals(1, rendered.parents.size)
+        assertEquals(
+            "parent content",
+            rendered.parents
+                .first()
+                .content.innerText,
+        )
+        assertEquals(
+            "status-parent",
+            rendered.parents
+                .first()
+                .statusKey.id,
+        )
+    }
+
+    @Test
+    fun repostShowsMessageAndUsesRepostedContent() {
+        val original =
+            createTweet(
+                id = "status-original",
+                user = createUser("user-original", "original_user"),
+                text = "original content",
+            )
+        val repostWrapper =
+            createTweet(
+                id = "status-repost-wrapper",
+                user = createUser("user-reposter", "reposter_user"),
+                text = "wrapper content",
+                retweetedStatus = original,
+            )
+
+        val rendered = assertIs<UiTimelineV2.Post>(createTimeline(repostWrapper).render(accountKey))
+        val message = assertNotNull(rendered.message)
+        val type = assertIs<UiTimelineV2.Message.Type.Localized>(message.type)
+
+        assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
+        assertEquals("user-reposter", message.user?.key?.id)
+        assertEquals("original content", rendered.content.innerText)
+        assertEquals("user-original", rendered.user?.key?.id)
+        assertEquals("status-original", rendered.statusKey.id)
+    }
+
+    @Test
+    fun repostWithQuoteShowsMessagePostAndQuote() {
+        val quoted =
+            createTweet(
+                id = "status-quoted-2",
+                user = createUser("user-quoted-2", "quoted_user_2"),
+                text = "quoted payload",
+            )
+        val original =
+            createTweet(
+                id = "status-original-2",
+                user = createUser("user-original-2", "original_user_2"),
+                text = "original payload",
+                quotedStatus = quoted,
+            )
+        val repostWrapper =
+            createTweet(
+                id = "status-repost-wrapper-2",
+                user = createUser("user-reposter-2", "reposter_user_2"),
+                text = "wrapper payload",
+                retweetedStatus = original,
+            )
+
+        val rendered = assertIs<UiTimelineV2.Post>(createTimeline(repostWrapper).render(accountKey))
+        val message = assertNotNull(rendered.message)
+        val type = assertIs<UiTimelineV2.Message.Type.Localized>(message.type)
+
+        assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
+        assertEquals("original payload", rendered.content.innerText)
+        assertEquals(1, rendered.quote.size)
+        assertEquals(
+            "quoted payload",
+            rendered.quote
+                .first()
+                .content.innerText,
+        )
+    }
+
+    private fun createTimeline(
+        tweet: Tweet,
+        parents: List<XQTTimeline> = emptyList(),
+    ): XQTTimeline =
+        XQTTimeline(
+            parents = parents,
+            tweets = TimelineTweet(tweetResults = ItemResult(result = tweet)),
+            id = tweet.restId,
+            sortedIndex = 1L,
+        )
+
+    private fun createTweet(
+        id: String,
+        user: User,
+        text: String,
+        media: List<Media> = emptyList(),
+        retweetedStatus: Tweet? = null,
+        quotedStatus: Tweet? = null,
+    ): Tweet =
+        Tweet(
+            restId = id,
+            core = UserResultCore(userResults = UserResults(result = user)),
+            legacy =
+                TweetLegacy(
+                    idStr = id,
+                    fullText = text,
+                    displayTextRange = listOf(0, text.length),
+                    entities = Entities(media = media),
+                    createdAt = "Wed Oct 10 20:19:24 +0000 2018",
+                    favoriteCount = 0,
+                    favorited = false,
+                    isQuoteStatus = quotedStatus != null,
+                    lang = "en",
+                    quoteCount = if (quotedStatus != null) 1 else 0,
+                    replyCount = 0,
+                    retweetCount = if (retweetedStatus != null) 1 else 0,
+                    retweeted = false,
+                    userIdStr = user.restId,
+                    retweetedStatusResult = retweetedStatus?.let { ItemResult(result = it) },
+                ),
+            quotedStatusResult = quotedStatus?.let { ItemResult(result = it) },
+        )
+
+    private fun createUser(
+        id: String,
+        screenName: String,
+    ): User =
+        User(
+            restId = id,
+            legacy =
+                UserLegacy(
+                    name = screenName,
+                    screenName = screenName,
+                    profileImageUrlHttps = "https://pbs.twimg.com/profile_images/$screenName.jpg",
+                ),
+        )
+
+    private fun createPhotoMedia(
+        id: String,
+        mediaUrl: String,
+        width: Int,
+        height: Int,
+    ): Media =
+        Media(
+            idStr = id,
+            displayUrl = mediaUrl,
+            expandedUrl = mediaUrl,
+            indices = listOf(0, 1),
+            mediaUrlHttps = mediaUrl,
+            originalInfo = MediaOriginalInfo(height = height, width = width),
+            sizes = createSizes(width = width, height = height),
+            type = Media.Type.photo,
+            url = mediaUrl,
+        )
+
+    private fun createVideoMedia(
+        id: String,
+        mediaUrl: String,
+        videoUrl: String,
+        width: Int,
+        height: Int,
+    ): Media =
+        Media(
+            idStr = id,
+            displayUrl = mediaUrl,
+            expandedUrl = mediaUrl,
+            indices = listOf(0, 1),
+            mediaUrlHttps = mediaUrl,
+            originalInfo = MediaOriginalInfo(height = height, width = width),
+            sizes = createSizes(width = width, height = height),
+            type = Media.Type.video,
+            url = mediaUrl,
+            videoInfo =
+                MediaVideoInfo(
+                    aspectRatio = listOf(width, height),
+                    variants =
+                        listOf(
+                            MediaVideoInfoVariant(
+                                contentType = "video/mp4",
+                                url = videoUrl,
+                                bitrate = 2048000,
+                            ),
+                        ),
+                ),
+        )
+
+    private fun createSizes(
+        width: Int,
+        height: Int,
+    ): MediaSizes {
+        val size = MediaSize(h = height, resize = MediaSize.Resize.fit, w = width)
+        return MediaSizes(
+            large = size,
+            medium = size,
+            small = size,
+            thumb = size,
+        )
+    }
+}

From 09c393c7ba76a1f4fe22610114282959ca902e22 Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Wed, 4 Mar 2026 23:36:30 +0900
Subject: [PATCH 14/33] [WIP] make desktop run

---
 .../dimension/flare/data/model/TabSettings.kt | 124 +++--
 .../flare/ui/component/CommonProfileHeader.kt |   5 +-
 .../flare/ui/component/dm/DmListItem.kt       |   2 +-
 .../component/status/CommonStatusComponent.kt | 139 ++---
 .../status/CommonStatusHeaderComponent.kt     |   2 +-
 .../ui/component/status/FeedComponent.kt      |  20 +-
 .../ui/component/status/LazyStatusItems.kt    |   7 +-
 .../component/status/UiTimelineComponent.kt   | 508 ++++++++----------
 .../flare/ui/component/status/UserCompat.kt   |   2 +-
 .../flare/ui/presenter/HomeTabsPresenter.kt   |   2 +-
 .../ui/presenter/TimelineItemPresenter.kt     |   4 +-
 .../ui/screen/settings/AllTabsPresenter.kt    |   9 +-
 .../flare/ui/controllers/StatusController.kt  |   4 +-
 .../flare/ui/component/AccountItem.kt         |   2 +-
 .../flare/ui/screen/compose/ComposeDialog.kt  |  10 +-
 .../flare/ui/screen/home/AddTabDialog.kt      |   2 +-
 .../flare/ui/screen/home/DiscoverScreen.kt    |   2 +-
 .../ui/screen/home/NotificationScreen.kt      |   2 +-
 .../flare/ui/screen/home/ProfileScreen.kt     |   7 +-
 .../flare/ui/screen/home/SearchScreen.kt      |   2 +-
 .../ui/screen/media/StatusMediaScreen.kt      |  11 +-
 .../ui/screen/settings/SettingsScreen.kt      |   2 +-
 .../flare/ui/screen/status/StatusScreen.kt    |   6 +-
 .../flare/ui/screen/status/VVOStatusScreen.kt |  10 +-
 .../data/datasource/microblog/ActionMenu.kt   |   8 +-
 .../datasource/misskey/MisskeyDataSource.kt   |  10 -
 .../data/datasource/misskey/MisskeyLoader.kt  |  13 +-
 .../dimension/flare/ui/model/UiTimelineV2.kt  |  10 +-
 .../dimension/flare/ui/model/mapper/XQT.kt    |  18 +-
 .../home/AllNotificationBadgePresenter.kt     |   4 +-
 .../home/AllNotificationPresenter.kt          |  45 +-
 .../home/NotificationBadgePresenter.kt        |  34 +-
 .../ui/presenter/home/TimelinePresenter.kt    |   8 +-
 .../flare/ui/model/mapper/XQTTest.kt          |  17 +
 34 files changed, 505 insertions(+), 546 deletions(-)

diff --git a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/data/model/TabSettings.kt b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/data/model/TabSettings.kt
index d102f8525..1bd2e933d 100644
--- a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/data/model/TabSettings.kt
+++ b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/data/model/TabSettings.kt
@@ -162,7 +162,7 @@ public data object AllNotificationTabItem : TabItem() {
             title = TitleType.Localized(TitleType.Localized.LocalizedKey.Notifications),
             icon = IconType.Material(IconType.Material.MaterialIcon.Notification),
         )
-    override val account: AccountType = AccountType.Active
+    override val account: AccountType = AccountType.Guest
     override val key: String = "all_notification"
 
     override fun update(metaData: TabMetaData): TabItem = this
@@ -186,53 +186,75 @@ public sealed class TimelineTabItem : TabItem() {
     public abstract fun createPresenter(): TimelinePresenter
 
     public companion object {
-        public val default: ImmutableList<TabItem> =
-            persistentListOf(
-                HomeTimelineTabItem(
-                    account = AccountType.Active,
-                    metaData =
-                        TabMetaData(
-                            title = TitleType.Localized(TitleType.Localized.LocalizedKey.Home),
-                            icon = IconType.Material(IconType.Material.MaterialIcon.Home),
-                        ),
-                ),
-                AllNotificationTabItem,
-                DiscoverTabItem(
-                    account = AccountType.Active,
-                    metaData =
-                        TabMetaData(
-                            title = TitleType.Localized(TitleType.Localized.LocalizedKey.Discover),
-                            icon = IconType.Material(IconType.Material.MaterialIcon.Search),
-                        ),
-                ),
-            )
-        public val mainSidePanel: ImmutableList<TabItem> =
-            persistentListOf(
-                HomeTimelineTabItem(
-                    account = AccountType.Active,
-                    metaData =
-                        TabMetaData(
-                            title = TitleType.Localized(TitleType.Localized.LocalizedKey.Home),
-                            icon = IconType.Material(IconType.Material.MaterialIcon.Home),
-                        ),
-                ),
-                AllNotificationTabItem,
-                RssTabItem(
-                    metaData =
-                        TabMetaData(
-                            title = TitleType.Localized(TitleType.Localized.LocalizedKey.Rss),
-                            icon = IconType.Material(IconType.Material.MaterialIcon.Rss),
-                        ),
-                ),
-                DiscoverTabItem(
-                    account = AccountType.Active,
-                    metaData =
-                        TabMetaData(
-                            title = TitleType.Localized(TitleType.Localized.LocalizedKey.Discover),
-                            icon = IconType.Material(IconType.Material.MaterialIcon.Search),
-                        ),
-                ),
-            )
+        public fun default(accountKey: MicroBlogKey?): ImmutableList<TabItem> =
+            accountKey?.let {
+                val accountType = AccountType.Specific(it)
+                persistentListOf(
+                    HomeTimelineTabItem(
+                        account = accountType,
+                        metaData =
+                            TabMetaData(
+                                title = TitleType.Localized(TitleType.Localized.LocalizedKey.Home),
+                                icon = IconType.Material(IconType.Material.MaterialIcon.Home),
+                            ),
+                    ),
+                    NotificationTabItem(
+                        account = accountType,
+                        metaData =
+                            TabMetaData(
+                                title = TitleType.Localized(TitleType.Localized.LocalizedKey.Notifications),
+                                icon = IconType.Material(IconType.Material.MaterialIcon.Notification),
+                            ),
+                    ),
+                    DiscoverTabItem(
+                        account = accountType,
+                        metaData =
+                            TabMetaData(
+                                title = TitleType.Localized(TitleType.Localized.LocalizedKey.Discover),
+                                icon = IconType.Material(IconType.Material.MaterialIcon.Search),
+                            ),
+                    ),
+                )
+            } ?: guest
+
+        public fun mainSidePanel(accountKey: MicroBlogKey?): ImmutableList<TabItem> =
+            accountKey?.let {
+                val accountType = AccountType.Specific(it)
+                persistentListOf(
+                    HomeTimelineTabItem(
+                        account = accountType,
+                        metaData =
+                            TabMetaData(
+                                title = TitleType.Localized(TitleType.Localized.LocalizedKey.Home),
+                                icon = IconType.Material(IconType.Material.MaterialIcon.Home),
+                            ),
+                    ),
+                    NotificationTabItem(
+                        account = accountType,
+                        metaData =
+                            TabMetaData(
+                                title = TitleType.Localized(TitleType.Localized.LocalizedKey.Notifications),
+                                icon = IconType.Material(IconType.Material.MaterialIcon.Notification),
+                            ),
+                    ),
+                    RssTabItem(
+                        metaData =
+                            TabMetaData(
+                                title = TitleType.Localized(TitleType.Localized.LocalizedKey.Rss),
+                                icon = IconType.Material(IconType.Material.MaterialIcon.Rss),
+                            ),
+                    ),
+                    DiscoverTabItem(
+                        account = accountType,
+                        metaData =
+                            TabMetaData(
+                                title = TitleType.Localized(TitleType.Localized.LocalizedKey.Discover),
+                                icon = IconType.Material(IconType.Material.MaterialIcon.Search),
+                            ),
+                    ),
+                )
+            } ?: guest
+
         public val guest: ImmutableList<TabItem> =
             persistentListOf(
                 HomeTimelineTabItem(
@@ -1121,7 +1143,7 @@ public data class AllRssTimelineTabItem(
             title = TitleType.Localized(TitleType.Localized.LocalizedKey.AllRssFeeds),
             icon = IconType.Material(IconType.Material.MaterialIcon.Rss),
         ),
-    override val account: AccountType = AccountType.Active,
+    override val account: AccountType = AccountType.Guest,
 ) : TimelineTabItem() {
     override val key: String = "all_rss"
 
@@ -1171,7 +1193,7 @@ public data class DiscoverTabItem(
 @Serializable
 public data object SettingsTabItem : TabItem() {
     override val account: AccountType
-        get() = AccountType.Active
+        get() = AccountType.Guest
     override val key: String
         get() = "settings"
     override val metaData: TabMetaData
@@ -1199,7 +1221,7 @@ public data class DirectMessageTabItem(
 @Serializable
 public data class RssTabItem(
     override val metaData: TabMetaData,
-    override val account: AccountType = AccountType.Active,
+    override val account: AccountType = AccountType.Guest,
 ) : TabItem() {
     override val key: String = "rss"
 
diff --git a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/CommonProfileHeader.kt b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/CommonProfileHeader.kt
index 6ae7c8bdc..5066c2641 100644
--- a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/CommonProfileHeader.kt
+++ b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/CommonProfileHeader.kt
@@ -25,6 +25,7 @@ import androidx.compose.ui.unit.dp
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.component.platform.PlatformText
 import dev.dimension.flare.ui.component.platform.isBigScreen
+import dev.dimension.flare.ui.model.UiHandle
 import dev.dimension.flare.ui.render.UiRichText
 import dev.dimension.flare.ui.theme.PlatformTheme
 import dev.dimension.flare.ui.theme.screenHorizontalPadding
@@ -35,7 +36,7 @@ internal fun CommonProfileHeader(
     avatarUrl: String?,
     displayName: UiRichText,
     userKey: MicroBlogKey,
-    handle: String,
+    handle: UiHandle,
     modifier: Modifier = Modifier,
     onAvatarClick: (() -> Unit)? = null,
     onBannerClick: (() -> Unit)? = null,
@@ -190,7 +191,7 @@ internal fun CommonProfileHeader(
                             verticalAlignment = Alignment.CenterVertically,
                         ) {
                             PlatformText(
-                                text = handle,
+                                text = handle.canonical,
                                 style = PlatformTheme.typography.caption,
 //                            modifier =
 //                                Modifier
diff --git a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/dm/DmListItem.kt b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/dm/DmListItem.kt
index 5e3fc5027..231ed21fc 100644
--- a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/dm/DmListItem.kt
+++ b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/dm/DmListItem.kt
@@ -131,7 +131,7 @@ public fun LazyListScope.dmList(
                                     )
                                     if (item.users.size == 1) {
                                         PlatformText(
-                                            text = user.handle,
+                                            text = user.handle.canonical,
                                             style = PlatformTheme.typography.caption,
                                             color = PlatformTheme.colorScheme.caption,
                                             maxLines = 1,
diff --git a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusComponent.kt b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusComponent.kt
index e09e2ef12..d45956194 100644
--- a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusComponent.kt
+++ b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusComponent.kt
@@ -122,7 +122,6 @@ import dev.dimension.flare.compose.ui.user_unmute
 import dev.dimension.flare.compose.ui.vote
 import dev.dimension.flare.data.datasource.microblog.ActionMenu
 import dev.dimension.flare.data.model.PostActionStyle
-import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
 import dev.dimension.flare.ui.component.AdaptiveGrid
 import dev.dimension.flare.ui.component.AvatarComponent
@@ -147,10 +146,10 @@ import dev.dimension.flare.ui.component.platform.PlatformTextStyle
 import dev.dimension.flare.ui.icons.Misskey
 import dev.dimension.flare.ui.model.ClickContext
 import dev.dimension.flare.ui.model.UiCard
+import dev.dimension.flare.ui.model.UiIcon
 import dev.dimension.flare.ui.model.UiMedia
 import dev.dimension.flare.ui.model.UiPoll
-import dev.dimension.flare.ui.model.UiTimeline
-import dev.dimension.flare.ui.model.collectAsUiState
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.onError
 import dev.dimension.flare.ui.model.onLoading
 import dev.dimension.flare.ui.model.onSuccess
@@ -164,7 +163,7 @@ import org.jetbrains.compose.resources.stringResource
 
 @Composable
 public fun CommonStatusComponent(
-    item: UiTimeline.ItemContent.Status,
+    item: UiTimelineV2.Post,
     modifier: Modifier = Modifier,
     isDetail: Boolean = false,
     isQuote: Boolean = false,
@@ -219,18 +218,14 @@ public fun CommonStatusComponent(
                         verticalAlignment = Alignment.CenterVertically,
                         horizontalArrangement = Arrangement.spacedBy(4.dp),
                     ) {
-                        when (val content = item.topEndContent) {
-                            is UiTimeline.ItemContent.Status.TopEndContent.Visibility -> {
-                                StatusVisibilityComponent(
-                                    visibility = content.visibility,
-                                    modifier =
-                                        Modifier
-                                            .size(PlatformTheme.typography.caption.fontSize.value.dp),
-                                    tint = PlatformTheme.colorScheme.caption,
-                                )
-                            }
-
-                            null -> Unit
+                        item.visibility?.let {
+                            StatusVisibilityComponent(
+                                visibility = it,
+                                modifier =
+                                    Modifier
+                                        .size(PlatformTheme.typography.caption.fontSize.value.dp),
+                                tint = PlatformTheme.colorScheme.caption,
+                            )
                         }
                         if (appearanceSettings.showPlatformLogo) {
                             val icon =
@@ -312,15 +307,11 @@ public fun CommonStatusComponent(
                     }
                 }
             }
-            when (val content = item.aboveTextContent) {
-                is UiTimeline.ItemContent.Status.AboveTextContent.ReplyTo -> {
-                    Spacer(modifier = Modifier.height(4.dp))
-                    StatusReplyComponent(
-                        replyHandle = content.handle,
-                    )
-                }
-
-                null -> Unit
+            item.replyToHandle?.let { replyHandle ->
+                Spacer(modifier = Modifier.height(4.dp))
+                StatusReplyComponent(
+                    replyHandle = replyHandle,
+                )
             }
             if (isDetail) {
                 SelectionContainer {
@@ -350,7 +341,7 @@ public fun CommonStatusComponent(
 
             if (isDetail && !item.content.isEmpty && appearanceSettings.showTranslateButton) {
                 TranslationComponent(
-                    statusKey = item.statusKey,
+                    statusKey = item.itemKey,
                     contentWarning = item.contentWarning,
                     rawContent = item.content.innerText,
                     content = item.content,
@@ -362,15 +353,7 @@ public fun CommonStatusComponent(
                 StatusMediasComponent(
                     item,
                     onMediaClick = { media ->
-                        item.onMediaClicked.invoke(
-                            ClickContext(
-                                launcher = {
-                                    uriHandler.openUri(it)
-                                },
-                            ),
-                            media,
-                            item.images.indexOf(media),
-                        )
+                        uriHandler.openUri(media.url)
                     },
                 )
             }
@@ -395,19 +378,11 @@ public fun CommonStatusComponent(
                 )
             }
 
-            if (!isQuote) {
-                when (val content = item.bottomContent) {
-                    is UiTimeline.ItemContent.Status.BottomContent.Reaction -> {
-                        if (content.emojiReactions.isNotEmpty() || content.channel != null) {
-                            Spacer(modifier = Modifier.height(4.dp))
-                            StatusReactionComponent(
-                                data = content,
-                            )
-                        }
-                    }
-
-                    null -> Unit
-                }
+            if (!isQuote && (item.emojiReactions.isNotEmpty() || item.sourceChannel != null)) {
+                Spacer(modifier = Modifier.height(4.dp))
+                StatusReactionComponent(
+                    data = item,
+                )
             }
 
             if (isDetail) {
@@ -453,7 +428,7 @@ public fun CommonStatusComponent(
 
 @Composable
 internal fun StatusMediasComponent(
-    item: UiTimeline.ItemContent.Status,
+    item: UiTimelineV2.Post,
     onMediaClick: (UiMedia) -> Unit,
 ) {
     val appearanceSettings = LocalComponentAppearance.current
@@ -520,7 +495,7 @@ internal fun StatusMediasComponent(
 
 @Composable
 private fun StatusQuoteComponent(
-    quotes: ImmutableList<UiTimeline.ItemContent.Status>,
+    quotes: ImmutableList<UiTimelineV2.Post>,
     modifier: Modifier = Modifier,
 ) {
     Box(
@@ -560,14 +535,15 @@ private fun StatusQuoteComponent(
 
 @Composable
 private fun StatusReactionComponent(
-    data: UiTimeline.ItemContent.Status.BottomContent.Reaction,
+    data: UiTimelineV2.Post,
     modifier: Modifier = Modifier,
 ) {
+    val uriHandler = LocalUriHandler.current
     Column(
         modifier = modifier,
         verticalArrangement = Arrangement.spacedBy(4.dp),
     ) {
-        data.channel?.let { channel ->
+        data.sourceChannel?.let { channel ->
             Row(
                 verticalAlignment = Alignment.CenterVertically,
                 horizontalArrangement = Arrangement.spacedBy(4.dp),
@@ -622,7 +598,9 @@ private fun StatusReactionComponent(
                             modifier =
                                 Modifier
                                     .clickable {
-                                        reaction.onClicked.invoke()
+                                        reaction.onClicked.invoke(
+                                            ClickContext(uriHandler::openUri),
+                                        )
                                     }.padding(horizontal = 8.dp, vertical = 4.dp),
                         ) {
                             if (reaction.isUnicode) {
@@ -647,7 +625,7 @@ private fun StatusReactionComponent(
 
 @Composable
 private fun TranslationComponent(
-    statusKey: MicroBlogKey,
+    statusKey: String,
     contentWarning: UiRichText?,
     rawContent: String,
     content: UiRichText,
@@ -843,44 +821,6 @@ internal fun StatusActions(
                                     StatusActionItemMenu(subActions, closeMenu, launcher)
                                 }
 
-                                is ActionMenu.AsyncActionMenuItem -> {
-                                    if (isMenuShown) {
-                                        val state by subActions.flow.collectAsUiState()
-                                        state
-                                            .onSuccess {
-                                                StatusActionItemMenu(it, closeMenu, launcher)
-                                            }.onLoading {
-                                                PlatformDropdownMenuItem(
-                                                    text = {
-                                                        PlatformText(
-                                                            text = "Loading",
-                                                            modifier =
-                                                                Modifier.placeholder(
-                                                                    true,
-                                                                    color = PlatformTheme.colorScheme.cardAlt,
-                                                                ),
-                                                        )
-                                                    },
-                                                    leadingIcon = {
-                                                        FAIcon(
-                                                            imageVector = FontAwesomeIcons.Solid.Ellipsis,
-                                                            contentDescription = "Loading",
-                                                            modifier =
-                                                                Modifier
-                                                                    .size(PlatformTextStyle.current.fontSize.value.dp + 2.dp)
-                                                                    .placeholder(
-                                                                        true,
-                                                                        color = PlatformTheme.colorScheme.cardAlt,
-                                                                    ),
-                                                        )
-                                                    },
-                                                    onClick = {
-                                                    },
-                                                )
-                                            }
-                                    }
-                                }
-
                                 // nested group is not supported
                                 is ActionMenu.Group -> Unit
                                 ActionMenu.Divider -> PlatformDropdownMenuDivider()
@@ -896,7 +836,7 @@ internal fun StatusActions(
                         color = action.color?.toComposeColor() ?: PlatformContentColor.current,
                         withTextMinWidth = index != items.lastIndex,
                         onClicked = {
-                            action.onClicked?.let { onClick ->
+                            action.onClicked.let { onClick ->
                                 haptics.performHapticFeedback(HapticFeedbackType.ContextClick)
                                 onClick.invoke(
                                     ClickContext(
@@ -910,8 +850,6 @@ internal fun StatusActions(
                     )
                 }
 
-                // async action item is only supported in group
-                is ActionMenu.AsyncActionMenuItem -> Unit
                 // divider is only supported in group
                 ActionMenu.Divider -> Unit
             }
@@ -946,7 +884,7 @@ private fun PlatformDropdownMenuScope.StatusActionItemMenu(
         },
         onClick = {
             closeMenu.invoke()
-            subActions.onClicked?.invoke(
+            subActions.onClicked.invoke(
                 ClickContext(
                     launcher = {
                         launcher.openUri(it)
@@ -988,6 +926,8 @@ private fun ActionMenu.Item.Text.asString(): String =
                     ActionMenu.Item.Text.Localized.Type.UnBlock -> Res.string.user_unblock
                     ActionMenu.Item.Text.Localized.Type.BlockWithHandleParameter -> Res.string.user_block_with_parameter
                     ActionMenu.Item.Text.Localized.Type.MuteWithHandleParameter -> Res.string.user_mute_with_parameter
+                    ActionMenu.Item.Text.Localized.Type.AcceptFollowRequest -> Res.string.more
+                    ActionMenu.Item.Text.Localized.Type.RejectFollowRequest -> Res.string.more
                 }
             stringResource(resource, *parameters.toTypedArray())
         }
@@ -1025,6 +965,7 @@ private fun UiIcon.toImageVector(): ImageVector =
         UiIcon.UnMute -> FontAwesomeIcons.Solid.VolumeXmark
         UiIcon.Block -> FontAwesomeIcons.Solid.UserSlash
         UiIcon.UnBlock -> FontAwesomeIcons.Solid.UserSlash
+        else -> FontAwesomeIcons.Solid.Ellipsis
     }
 
 @Composable
@@ -1204,10 +1145,14 @@ private fun StatusPollComponent(
             }
         }
         if (poll.canVote) {
+            val uriHandler = LocalUriHandler.current
             PlatformFilledTonalButton(
                 modifier = Modifier.fillMaxWidth(),
                 onClick = {
-                    poll.onVote.invoke(selectedOptions.toImmutableList())
+                    poll.onVote.invoke(
+                        ClickContext(launcher = uriHandler::openUri),
+                        selectedOptions.toImmutableList(),
+                    )
                 },
             ) {
                 PlatformText(
diff --git a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusHeaderComponent.kt b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusHeaderComponent.kt
index 4d2c7173c..e6a13c932 100644
--- a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusHeaderComponent.kt
+++ b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusHeaderComponent.kt
@@ -61,7 +61,7 @@ public fun CommonStatusHeaderComponent(
         },
         supportingContent = {
             PlatformText(
-                text = data.handle,
+                text = data.handle.canonical,
                 style = PlatformTheme.typography.caption,
                 color = PlatformTheme.colorScheme.caption,
                 modifier =
diff --git a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/FeedComponent.kt b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/FeedComponent.kt
index e7bd26342..306cde4a8 100644
--- a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/FeedComponent.kt
+++ b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/FeedComponent.kt
@@ -16,13 +16,13 @@ import dev.dimension.flare.ui.component.DateTimeText
 import dev.dimension.flare.ui.component.NetworkImage
 import dev.dimension.flare.ui.component.platform.PlatformText
 import dev.dimension.flare.ui.model.ClickContext
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.theme.PlatformTheme
 import dev.dimension.flare.ui.theme.screenHorizontalPadding
 
 @Composable
 internal fun FeedComponent(
-    data: UiTimeline.ItemContent.Feed,
+    data: UiTimelineV2.Feed,
     modifier: Modifier = Modifier,
 ) {
     val uriHandler = LocalUriHandler.current
@@ -43,20 +43,20 @@ internal fun FeedComponent(
             horizontalArrangement = Arrangement.spacedBy(8.dp),
             verticalAlignment = androidx.compose.ui.Alignment.CenterVertically,
         ) {
-            data.sourceIcon?.let {
+            data.source.icon?.let {
                 NetworkImage(
                     it,
-                    contentDescription = data.source,
+                    contentDescription = data.source.name,
                     modifier = Modifier.size(16.dp),
                 )
             }
             PlatformText(
-                text = data.source,
+                text = data.source.name,
                 style = PlatformTheme.typography.caption,
                 modifier = Modifier.weight(1f),
                 maxLines = 1,
             )
-            data.createdAt?.let {
+            data.actualCreatedAt?.let {
                 DateTimeText(
                     it,
                     style = PlatformTheme.typography.caption,
@@ -81,7 +81,7 @@ internal fun FeedComponent(
                     color = PlatformTheme.colorScheme.caption,
                     modifier =
                         Modifier.let {
-                            if (data.image != null) {
+                            if (data.media != null) {
                                 it.weight(1f)
                             } else {
                                 it
@@ -89,9 +89,9 @@ internal fun FeedComponent(
                         },
                 )
             }
-            data.image?.let {
+            data.media?.let {
                 NetworkImage(
-                    model = it,
+                    model = it.url,
                     contentDescription = data.title,
                     modifier =
                         Modifier
@@ -104,7 +104,7 @@ internal fun FeedComponent(
                             }.clip(
                                 PlatformTheme.shapes.medium,
                             ),
-                    customHeaders = data.imageHeaders,
+                    customHeaders = it.customHeaders,
                 )
             }
         }
diff --git a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/LazyStatusItems.kt b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/LazyStatusItems.kt
index 5bb744168..165154477 100644
--- a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/LazyStatusItems.kt
+++ b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/LazyStatusItems.kt
@@ -37,13 +37,13 @@ import dev.dimension.flare.ui.component.ErrorContent
 import dev.dimension.flare.ui.component.FAIcon
 import dev.dimension.flare.ui.component.placeholder
 import dev.dimension.flare.ui.component.platform.PlatformText
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.theme.PlatformTheme
 import dev.dimension.flare.ui.theme.screenHorizontalPadding
 import org.jetbrains.compose.resources.stringResource
 
 public fun LazyStaggeredGridScope.status(
-    pagingState: PagingState<UiTimeline>,
+    pagingState: PagingState<UiTimelineV2>,
     detailStatusKey: MicroBlogKey? = null,
 ): Unit =
     with(pagingState) {
@@ -222,8 +222,7 @@ private fun OnError(
 
 @Composable
 public fun StatusItem(
-    item: UiTimeline?,
-//    event: StatusEvent,
+    item: UiTimelineV2?,
     modifier: Modifier = Modifier,
     detailStatusKey: MicroBlogKey? = null,
     horizontalPadding: Dp = screenHorizontalPadding,
diff --git a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/UiTimelineComponent.kt b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/UiTimelineComponent.kt
index 59b0e86f8..f97c2e12c 100644
--- a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/UiTimelineComponent.kt
+++ b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/UiTimelineComponent.kt
@@ -40,15 +40,7 @@ import compose.icons.fontawesomeicons.solid.Thumbtack
 import compose.icons.fontawesomeicons.solid.UserPlus
 import compose.icons.fontawesomeicons.solid.Xmark
 import dev.dimension.flare.compose.ui.Res
-import dev.dimension.flare.compose.ui.bluesky_notification_item_favourited_your_status
-import dev.dimension.flare.compose.ui.bluesky_notification_item_followed_you
-import dev.dimension.flare.compose.ui.bluesky_notification_item_mentioned_you
-import dev.dimension.flare.compose.ui.bluesky_notification_item_pin
-import dev.dimension.flare.compose.ui.bluesky_notification_item_quoted_your_status
-import dev.dimension.flare.compose.ui.bluesky_notification_item_reblogged_your_status
-import dev.dimension.flare.compose.ui.bluesky_notification_item_replied_to_you
 import dev.dimension.flare.compose.ui.bluesky_notification_item_starterpack_joined
-import dev.dimension.flare.compose.ui.bluesky_notification_item_unKnown
 import dev.dimension.flare.compose.ui.mastodon_item_pinned
 import dev.dimension.flare.compose.ui.mastodon_notification_item_favourited_your_status
 import dev.dimension.flare.compose.ui.mastodon_notification_item_followed_you
@@ -217,20 +209,10 @@ import dev.dimension.flare.compose.ui.misskey_achievement_view_instance_chart_ti
 import dev.dimension.flare.compose.ui.misskey_notification_item_achievement_earned
 import dev.dimension.flare.compose.ui.misskey_notification_item_app
 import dev.dimension.flare.compose.ui.misskey_notification_item_follow_request_accepted
-import dev.dimension.flare.compose.ui.misskey_notification_item_followed_you
-import dev.dimension.flare.compose.ui.misskey_notification_item_mentioned_you
-import dev.dimension.flare.compose.ui.misskey_notification_item_poll_ended
-import dev.dimension.flare.compose.ui.misskey_notification_item_quoted_your_status
 import dev.dimension.flare.compose.ui.misskey_notification_item_reacted_to_your_status
-import dev.dimension.flare.compose.ui.misskey_notification_item_replied_to_you
-import dev.dimension.flare.compose.ui.misskey_notification_item_reposted_your_status
-import dev.dimension.flare.compose.ui.misskey_notification_item_requested_follow
-import dev.dimension.flare.compose.ui.misskey_notification_unknwon
 import dev.dimension.flare.compose.ui.notification_item_accept_follow_request
 import dev.dimension.flare.compose.ui.notification_item_reject_follow_request
-import dev.dimension.flare.compose.ui.vvo_notification_like
-import dev.dimension.flare.compose.ui.xqt_item_mention_status
-import dev.dimension.flare.compose.ui.xqt_item_reblogged_status
+import dev.dimension.flare.data.datasource.microblog.ActionMenu
 import dev.dimension.flare.data.model.PostActionStyle
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.component.AvatarComponentDefaults
@@ -243,9 +225,9 @@ import dev.dimension.flare.ui.component.platform.PlatformCard
 import dev.dimension.flare.ui.component.platform.PlatformFilledTonalButton
 import dev.dimension.flare.ui.component.platform.PlatformText
 import dev.dimension.flare.ui.component.platform.PlatformTextStyle
-import dev.dimension.flare.ui.component.platform.isBigScreen
 import dev.dimension.flare.ui.model.ClickContext
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiIcon
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.mapper.MisskeyAchievement
 import dev.dimension.flare.ui.theme.PlatformContentColor
 import dev.dimension.flare.ui.theme.PlatformTheme
@@ -253,91 +235,123 @@ import dev.dimension.flare.ui.theme.screenHorizontalPadding
 import org.jetbrains.compose.resources.StringResource
 import org.jetbrains.compose.resources.stringResource
 
+// @Composable
+// internal fun UiTimelineComponent(
+//    item: UiTimelineV2,
+//    modifier: Modifier = Modifier,
+//    detailStatusKey: MicroBlogKey? = null,
+//    horizontalPadding: Dp = screenHorizontalPadding,
+// ) {
+//    val bigScreen = isBigScreen()
+//    val appearance = LocalComponentAppearance.current
+//    Column(
+//        modifier = modifier,
+//    ) {
+//        val message =
+//            when (item) {
+//                is UiTimelineV2.Post -> item.message
+//                is UiTimelineV2.User -> item.message
+//                is UiTimelineV2.UserList -> item.message
+//                is UiTimelineV2.Message -> item
+//                is UiTimelineV2.Feed -> null
+//            }
+//        val hasContent = item !is UiTimelineV2.Message
+//        message?.let {
+//            TopMessageComponent(
+//                data = it,
+//                topMessageOnly = !hasContent,
+//                modifier =
+//                    Modifier
+//                        .padding(horizontal = horizontalPadding)
+//                        .let {
+//                            if (!hasContent) {
+//                                it.padding(vertical = 8.dp)
+//                            } else {
+//                                if (!appearance.fullWidthPost) {
+//                                    it.padding(
+//                                        top = 8.dp,
+//                                        start = AvatarComponentDefaults.size - PlatformTheme.typography.caption.fontSize.value.dp,
+//                                    )
+//                                } else {
+//                                    it.padding(top = 8.dp)
+//                                }
+//                            }
+//                        }.fillMaxWidth(),
+//            )
+//        }
+//        if (hasContent) {
+//            val padding =
+//                if (message == null) {
+//                    PaddingValues(
+//                        start = horizontalPadding,
+//                        end = horizontalPadding,
+//                        bottom = 8.dp,
+//                        top = if (bigScreen) 16.dp else 8.dp,
+//                    )
+//                } else {
+//                    PaddingValues(
+//                        start = horizontalPadding,
+//                        end = horizontalPadding,
+//                        bottom = 8.dp,
+//                        top = 8.dp,
+//                    )
+//                }
+//            ItemContentComponent(
+//                item = item,
+//                detailStatusKey = detailStatusKey,
+//                paddingValues = padding,
+//            )
+//        }
+//    }
+// }
+
 @Composable
 internal fun UiTimelineComponent(
-    item: UiTimeline,
+    item: UiTimelineV2,
     modifier: Modifier = Modifier,
     detailStatusKey: MicroBlogKey? = null,
     horizontalPadding: Dp = screenHorizontalPadding,
-) {
-    val bigScreen = isBigScreen()
-    val appearance = LocalComponentAppearance.current
-    Column(
-        modifier = modifier,
-    ) {
-        item.topMessage?.let {
-            TopMessageComponent(
-                data = it,
-                topMessageOnly = item.content == null,
-                modifier =
-                    Modifier
-                        .padding(horizontal = horizontalPadding)
-                        .let {
-                            if (item.content == null) {
-                                it.padding(vertical = 8.dp)
-                            } else {
-                                if (!appearance.fullWidthPost) {
-                                    it.padding(
-                                        top = 8.dp,
-                                        start = AvatarComponentDefaults.size - PlatformTheme.typography.caption.fontSize.value.dp,
-                                    )
-                                } else {
-                                    it.padding(top = 8.dp)
-                                }
-                            }
-                        }.fillMaxWidth(),
-            )
-        }
-        item.content?.let {
-            val padding =
-                if (item.topMessage == null) {
-                    PaddingValues(
-                        start = horizontalPadding,
-                        end = horizontalPadding,
-                        bottom = 8.dp,
-                        top = if (bigScreen) 16.dp else 8.dp,
-                    )
-                } else {
-                    PaddingValues(
-                        start = horizontalPadding,
-                        end = horizontalPadding,
-                        bottom = 8.dp,
-                        top = 8.dp,
-                    )
-                }
-            ItemContentComponent(
-                item = it,
-                detailStatusKey = detailStatusKey,
-                paddingValues = padding,
-            )
-        }
-    }
-}
-
-@Composable
-private fun ItemContentComponent(
-    item: UiTimeline.ItemContent,
-    detailStatusKey: MicroBlogKey?,
-    paddingValues: PaddingValues,
-    modifier: Modifier = Modifier,
 ) {
     val uriHandler = LocalUriHandler.current
     when (item) {
-        is UiTimeline.ItemContent.Status ->
+        is UiTimelineV2.Post ->
             StatusContent(
                 data = item,
                 detailStatusKey = detailStatusKey,
-                paddingValues = paddingValues,
+                paddingValues =
+                    PaddingValues(
+                        start = horizontalPadding,
+                        end = horizontalPadding,
+                        bottom = 8.dp,
+                        top = 8.dp,
+                    ),
                 modifier = modifier,
             )
 
-        is UiTimeline.ItemContent.User -> {
+        is UiTimelineV2.User -> {
             Column(
                 modifier =
                     modifier
-                        .padding(paddingValues),
+                        .padding(
+                            PaddingValues(
+                                start = horizontalPadding,
+                                end = horizontalPadding,
+                                bottom = 8.dp,
+                                top = 8.dp,
+                            ),
+                        ),
                 verticalArrangement = Arrangement.spacedBy(8.dp),
             ) {
+                item.message?.let { message ->
+                    TopMessageComponent(
+                        data = message,
+                        topMessageOnly = false,
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .padding(top = 8.dp),
+                    )
+                }
                 CommonStatusHeaderComponent(
                     data = item.value,
                     onUserClick = {
@@ -355,8 +369,8 @@ private fun ItemContentComponent(
                         horizontalArrangement = Arrangement.spacedBy(8.dp),
                     ) {
                         item.button.fastForEach { button ->
-                            when (button) {
-                                is UiTimeline.ItemContent.User.Button.AcceptFollowRequest ->
+                            when ((button.text as? ActionMenu.Item.Text.Localized)?.type) {
+                                ActionMenu.Item.Text.Localized.Type.AcceptFollowRequest ->
                                     PlatformFilledTonalButton(
                                         onClick = {
                                             button.onClicked.invoke(
@@ -383,7 +397,7 @@ private fun ItemContentComponent(
                                                 ),
                                         )
                                     }
-                                is UiTimeline.ItemContent.User.Button.RejectFollowRequest -> {
+                                ActionMenu.Item.Text.Localized.Type.RejectFollowRequest -> {
                                     PlatformButton(
                                         onClick = {
                                             button.onClicked.invoke(
@@ -414,6 +428,8 @@ private fun ItemContentComponent(
                                         },
                                     )
                                 }
+
+                                else -> Unit
                             }
                         }
                     }
@@ -421,26 +437,44 @@ private fun ItemContentComponent(
             }
         }
 
-        is UiTimeline.ItemContent.UserList ->
+        is UiTimelineV2.UserList ->
             UserListContent(
                 data = item,
                 modifier =
                     modifier
-                        .padding(paddingValues),
+                        .padding(
+                            PaddingValues(
+                                start = horizontalPadding,
+                                end = horizontalPadding,
+                                bottom = 8.dp,
+                                top = 8.dp,
+                            ),
+                        ),
             )
 
-        is UiTimeline.ItemContent.Feed -> {
+        is UiTimelineV2.Feed -> {
             FeedComponent(
                 data = item,
                 modifier = modifier,
             )
         }
+
+        is UiTimelineV2.Message ->
+            TopMessageComponent(
+                data = item,
+                topMessageOnly = true,
+                modifier =
+                    Modifier
+                        .padding(horizontal = horizontalPadding)
+                        .padding(vertical = 8.dp)
+                        .fillMaxWidth(),
+            )
     }
 }
 
 @Composable
 private fun UserListContent(
-    data: UiTimeline.ItemContent.UserList,
+    data: UiTimelineV2.UserList,
     modifier: Modifier = Modifier,
 ) {
     val uriHandler = LocalUriHandler.current
@@ -448,6 +482,16 @@ private fun UserListContent(
         modifier = modifier,
         verticalArrangement = Arrangement.spacedBy(8.dp),
     ) {
+        data.message?.let { message ->
+            TopMessageComponent(
+                data = message,
+                topMessageOnly = false,
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .padding(top = 8.dp),
+            )
+        }
         LazyRow(
             horizontalArrangement = Arrangement.spacedBy(8.dp),
         ) {
@@ -472,7 +516,7 @@ private fun UserListContent(
                 }
             }
         }
-        val status = data.status
+        val status = data.post
         if (status != null) {
             CompositionLocalProvider(
                 LocalComponentAppearance provides
@@ -500,7 +544,7 @@ private fun UserListContent(
 
 @Composable
 private fun StatusContent(
-    data: UiTimeline.ItemContent.Status,
+    data: UiTimelineV2.Post,
     detailStatusKey: MicroBlogKey?,
     modifier: Modifier = Modifier,
     paddingValues: PaddingValues = PaddingValues(0.dp),
@@ -563,210 +607,102 @@ private fun StatusContent(
                 },
             )
         }
-        CommonStatusComponent(
-            item = data,
-            isDetail = detailStatusKey == data.statusKey,
-            modifier = Modifier.padding(paddingValues),
-        )
+        Column {
+            data.message?.let { message ->
+                TopMessageComponent(
+                    data = message,
+                    topMessageOnly = false,
+                    modifier =
+                        Modifier
+                            .fillMaxWidth()
+                            .padding(top = 8.dp, bottom = 4.dp),
+                )
+            }
+            CommonStatusComponent(
+                item = data,
+                isDetail = detailStatusKey?.toString()?.let(data.itemKey::contains) == true,
+                modifier = Modifier.padding(paddingValues),
+            )
+        }
     }
 }
 
 @Composable
 private fun TopMessageComponent(
-    data: UiTimeline.TopMessage,
+    data: UiTimelineV2.Message,
     topMessageOnly: Boolean,
     modifier: Modifier = Modifier,
 ) {
+    val appearance = LocalComponentAppearance.current
     val uriHandler = LocalUriHandler.current
-    val icon =
-        when (data.icon) {
-            UiTimeline.TopMessage.Icon.Retweet -> FontAwesomeIcons.Solid.Retweet
-            UiTimeline.TopMessage.Icon.Follow -> FontAwesomeIcons.Solid.UserPlus
-            UiTimeline.TopMessage.Icon.Favourite -> FontAwesomeIcons.Solid.Heart
-            UiTimeline.TopMessage.Icon.Mention -> FontAwesomeIcons.Solid.At
-            UiTimeline.TopMessage.Icon.Poll -> FontAwesomeIcons.Solid.SquarePollHorizontal
-            UiTimeline.TopMessage.Icon.Edit -> FontAwesomeIcons.Solid.Pen
-            UiTimeline.TopMessage.Icon.Info -> FontAwesomeIcons.Solid.CircleInfo
-            UiTimeline.TopMessage.Icon.Reply -> FontAwesomeIcons.Solid.Reply
-            UiTimeline.TopMessage.Icon.Quote -> FontAwesomeIcons.Solid.QuoteLeft
-            UiTimeline.TopMessage.Icon.Pin -> FontAwesomeIcons.Solid.Thumbtack
-        }
+    val icon = data.icon.toTopMessageIcon()
     val text: String? =
         when (val type = data.type) {
-            is UiTimeline.TopMessage.MessageType.Bluesky ->
-                when (type) {
-                    UiTimeline.TopMessage.MessageType.Bluesky.Follow ->
-                        stringResource(resource = Res.string.bluesky_notification_item_followed_you)
-
-                    UiTimeline.TopMessage.MessageType.Bluesky.Like ->
-                        stringResource(
-                            resource = Res.string.bluesky_notification_item_favourited_your_status,
-                        )
-
-                    UiTimeline.TopMessage.MessageType.Bluesky.Mention ->
-                        stringResource(
-                            resource = Res.string.bluesky_notification_item_mentioned_you,
-                        )
-
-                    UiTimeline.TopMessage.MessageType.Bluesky.Quote ->
-                        stringResource(
-                            resource = Res.string.bluesky_notification_item_quoted_your_status,
-                        )
-
-                    UiTimeline.TopMessage.MessageType.Bluesky.Reply ->
-                        stringResource(
-                            resource = Res.string.bluesky_notification_item_replied_to_you,
-                        )
-
-                    UiTimeline.TopMessage.MessageType.Bluesky.Repost ->
-                        stringResource(
-                            resource = Res.string.bluesky_notification_item_reblogged_your_status,
-                        )
+            is UiTimelineV2.Message.Type.Raw -> type.content
+            is UiTimelineV2.Message.Type.Unknown -> type.rawType.ifBlank { null }
+            is UiTimelineV2.Message.Type.Localized ->
+                when (type.data) {
+                    UiTimelineV2.Message.Type.Localized.MessageId.Mention ->
+                        stringResource(resource = Res.string.mastodon_notification_item_mentioned_you)
 
-                    UiTimeline.TopMessage.MessageType.Bluesky.StarterpackJoined ->
-                        stringResource(
-                            resource = Res.string.bluesky_notification_item_starterpack_joined,
-                        )
-                    UiTimeline.TopMessage.MessageType.Bluesky.UnKnown ->
-                        stringResource(
-                            resource = Res.string.bluesky_notification_item_unKnown,
-                        )
-
-                    UiTimeline.TopMessage.MessageType.Bluesky.Pinned ->
-                        stringResource(
-                            resource = Res.string.bluesky_notification_item_pin,
-                        )
-                }
+                    UiTimelineV2.Message.Type.Localized.MessageId.NewPost ->
+                        stringResource(resource = Res.string.mastodon_notification_item_posted_status)
 
-            is UiTimeline.TopMessage.MessageType.Mastodon ->
-                when (type) {
-                    is UiTimeline.TopMessage.MessageType.Mastodon.Favourite ->
-                        stringResource(
-                            resource = Res.string.mastodon_notification_item_favourited_your_status,
-                        )
+                    UiTimelineV2.Message.Type.Localized.MessageId.Repost ->
+                        stringResource(resource = Res.string.mastodon_notification_item_reblogged_your_status)
 
-                    is UiTimeline.TopMessage.MessageType.Mastodon.Follow ->
-                        stringResource(
-                            resource = Res.string.mastodon_notification_item_followed_you,
-                        )
+                    UiTimelineV2.Message.Type.Localized.MessageId.Follow ->
+                        stringResource(resource = Res.string.mastodon_notification_item_followed_you)
 
-                    is UiTimeline.TopMessage.MessageType.Mastodon.FollowRequest ->
-                        stringResource(
-                            resource = Res.string.mastodon_notification_item_requested_follow,
-                        )
+                    UiTimelineV2.Message.Type.Localized.MessageId.FollowRequest ->
+                        stringResource(resource = Res.string.mastodon_notification_item_requested_follow)
 
-                    is UiTimeline.TopMessage.MessageType.Mastodon.Mention ->
-                        stringResource(
-                            resource = Res.string.mastodon_notification_item_mentioned_you,
-                        )
+                    UiTimelineV2.Message.Type.Localized.MessageId.Favourite ->
+                        stringResource(resource = Res.string.mastodon_notification_item_favourited_your_status)
 
-                    is UiTimeline.TopMessage.MessageType.Mastodon.Poll ->
+                    UiTimelineV2.Message.Type.Localized.MessageId.PollEnded ->
                         stringResource(resource = Res.string.mastodon_notification_item_poll_ended)
 
-                    is UiTimeline.TopMessage.MessageType.Mastodon.Reblogged ->
-                        stringResource(
-                            resource = Res.string.mastodon_notification_item_reblogged_your_status,
-                        )
-
-                    is UiTimeline.TopMessage.MessageType.Mastodon.Status ->
-                        stringResource(
-                            resource = Res.string.mastodon_notification_item_posted_status,
-                        )
-
-                    is UiTimeline.TopMessage.MessageType.Mastodon.Update ->
-                        stringResource(
-                            resource = Res.string.mastodon_notification_item_updated_status,
-                        )
-
-                    is UiTimeline.TopMessage.MessageType.Mastodon.UnKnown -> null
-                    is UiTimeline.TopMessage.MessageType.Mastodon.Pinned ->
-                        stringResource(
-                            resource = Res.string.mastodon_item_pinned,
-                        )
-                }
-
-            is UiTimeline.TopMessage.MessageType.Misskey ->
-                when (type) {
-                    is UiTimeline.TopMessage.MessageType.Misskey.AchievementEarned ->
-                        stringResource(
-                            resource = Res.string.misskey_notification_item_achievement_earned,
-                            type.achievement?.titleResId?.let { stringResource(it) } ?: "",
-                            type.achievement?.descriptionResId?.let { stringResource(it) } ?: "",
-                        )
-
-                    is UiTimeline.TopMessage.MessageType.Misskey.App ->
-                        stringResource(resource = Res.string.misskey_notification_item_app)
-
-                    is UiTimeline.TopMessage.MessageType.Misskey.Follow ->
-                        stringResource(resource = Res.string.misskey_notification_item_followed_you)
-
-                    is UiTimeline.TopMessage.MessageType.Misskey.FollowRequestAccepted ->
-                        stringResource(
-                            resource = Res.string.misskey_notification_item_follow_request_accepted,
-                        )
-
-                    is UiTimeline.TopMessage.MessageType.Misskey.Mention ->
-                        stringResource(
-                            resource = Res.string.misskey_notification_item_mentioned_you,
-                        )
-
-                    is UiTimeline.TopMessage.MessageType.Misskey.PollEnded ->
-                        stringResource(
-                            resource = Res.string.misskey_notification_item_poll_ended,
-                        )
-
-                    is UiTimeline.TopMessage.MessageType.Misskey.Quote ->
-                        stringResource(
-                            resource = Res.string.misskey_notification_item_quoted_your_status,
-                        )
-
-                    is UiTimeline.TopMessage.MessageType.Misskey.Reaction ->
-                        stringResource(
-                            resource = Res.string.misskey_notification_item_reacted_to_your_status,
-                        )
+                    UiTimelineV2.Message.Type.Localized.MessageId.PostUpdated ->
+                        stringResource(resource = Res.string.mastodon_notification_item_updated_status)
 
-                    is UiTimeline.TopMessage.MessageType.Misskey.ReceiveFollowRequest ->
-                        stringResource(
-                            resource = Res.string.misskey_notification_item_requested_follow,
-                        )
+                    UiTimelineV2.Message.Type.Localized.MessageId.Reply ->
+                        stringResource(resource = Res.string.mastodon_notification_item_mentioned_you)
 
-                    is UiTimeline.TopMessage.MessageType.Misskey.Renote ->
-                        stringResource(
-                            resource = Res.string.misskey_notification_item_reposted_your_status,
-                        )
+                    UiTimelineV2.Message.Type.Localized.MessageId.Quote ->
+                        stringResource(resource = Res.string.mastodon_notification_item_reblogged_your_status)
 
-                    is UiTimeline.TopMessage.MessageType.Misskey.Reply ->
-                        stringResource(
-                            resource = Res.string.misskey_notification_item_replied_to_you,
-                        )
+                    UiTimelineV2.Message.Type.Localized.MessageId.Reaction ->
+                        stringResource(resource = Res.string.misskey_notification_item_reacted_to_your_status)
 
-                    is UiTimeline.TopMessage.MessageType.Misskey.UnKnown ->
-                        stringResource(
-                            resource = Res.string.misskey_notification_unknwon,
-                            type.type,
-                        )
+                    UiTimelineV2.Message.Type.Localized.MessageId.FollowRequestAccepted ->
+                        stringResource(resource = Res.string.misskey_notification_item_follow_request_accepted)
 
-                    is UiTimeline.TopMessage.MessageType.Misskey.Pinned ->
-                        stringResource(
-                            resource = Res.string.mastodon_item_pinned,
-                        )
-                }
+                    UiTimelineV2.Message.Type.Localized.MessageId.AchievementEarned -> {
+                        runCatching {
+                            MisskeyAchievement.valueOf(type.args.getOrNull(0).orEmpty())
+                        }.getOrNull()?.let { achievement ->
+                            stringResource(
+                                resource = Res.string.misskey_notification_item_achievement_earned,
+                                achievement.titleResId,
+                                achievement.descriptionResId,
+                            )
+                        }
+                            ?: stringResource(
+                                resource = Res.string.misskey_notification_item_achievement_earned,
+                                type.args.getOrNull(0).orEmpty(),
+                                "",
+                            )
+                    }
 
-            is UiTimeline.TopMessage.MessageType.VVO ->
-                when (type) {
-                    is UiTimeline.TopMessage.MessageType.VVO.Custom -> type.message
-                    UiTimeline.TopMessage.MessageType.VVO.Like ->
-                        stringResource(resource = Res.string.vvo_notification_like)
-                }
+                    UiTimelineV2.Message.Type.Localized.MessageId.App ->
+                        stringResource(resource = Res.string.misskey_notification_item_app)
 
-            is UiTimeline.TopMessage.MessageType.XQT ->
-                when (type) {
-                    is UiTimeline.TopMessage.MessageType.XQT.Custom -> type.message
-                    UiTimeline.TopMessage.MessageType.XQT.Mention ->
-                        stringResource(resource = Res.string.xqt_item_mention_status)
+                    UiTimelineV2.Message.Type.Localized.MessageId.StarterpackJoined ->
+                        stringResource(resource = Res.string.bluesky_notification_item_starterpack_joined)
 
-                    UiTimeline.TopMessage.MessageType.XQT.Retweet ->
-                        stringResource(resource = Res.string.xqt_item_reblogged_status)
+                    UiTimelineV2.Message.Type.Localized.MessageId.Pinned ->
+                        stringResource(resource = Res.string.mastodon_item_pinned)
                 }
         }
 
@@ -797,11 +733,35 @@ private fun TopMessageComponent(
                                 },
                             ),
                         )
-                    }.then(modifier),
+                    }.let {
+                        if (!appearance.fullWidthPost && !topMessageOnly) {
+                            it.padding(
+                                start = AvatarComponentDefaults.size - PlatformTheme.typography.caption.fontSize.value.dp,
+                            )
+                        } else {
+                            it
+                        }
+                    }.fillMaxWidth()
+                    .then(modifier),
         )
     }
 }
 
+private fun UiIcon.toTopMessageIcon() =
+    when (this) {
+        UiIcon.Retweet -> FontAwesomeIcons.Solid.Retweet
+        UiIcon.Follow -> FontAwesomeIcons.Solid.UserPlus
+        UiIcon.Favourite -> FontAwesomeIcons.Solid.Heart
+        UiIcon.Mention -> FontAwesomeIcons.Solid.At
+        UiIcon.Poll -> FontAwesomeIcons.Solid.SquarePollHorizontal
+        UiIcon.Edit -> FontAwesomeIcons.Solid.Pen
+        UiIcon.Info -> FontAwesomeIcons.Solid.CircleInfo
+        UiIcon.Reply -> FontAwesomeIcons.Solid.Reply
+        UiIcon.Quote -> FontAwesomeIcons.Solid.QuoteLeft
+        UiIcon.Pin -> FontAwesomeIcons.Solid.Thumbtack
+        else -> FontAwesomeIcons.Solid.CircleInfo
+    }
+
 private val MisskeyAchievement.titleResId: StringResource
     get() =
         when (this) {
diff --git a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/UserCompat.kt b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/UserCompat.kt
index 9decec3db..66dc008b7 100644
--- a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/UserCompat.kt
+++ b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/UserCompat.kt
@@ -57,7 +57,7 @@ internal fun UserCompat(
                     modifier = Modifier.alignByBaseline(),
                 )
                 PlatformText(
-                    text = handle,
+                    text = handle.canonical,
                     style = PlatformTheme.typography.caption,
                     color = PlatformTheme.colorScheme.caption,
                     maxLines = 1,
diff --git a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/HomeTabsPresenter.kt b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/HomeTabsPresenter.kt
index dd166b9a0..d6f24697f 100644
--- a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/HomeTabsPresenter.kt
+++ b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/HomeTabsPresenter.kt
@@ -62,7 +62,7 @@ public class HomeTabsPresenter :
                         tabsState.secondaryItems ?: TimelineTabItem.defaultSecondary(account)
                     State.HomeTabState(
                         primary =
-                            TimelineTabItem.default.toImmutableList(),
+                            TimelineTabItem.default(account.accountKey).toImmutableList(),
                         secondary =
                             secondary.toImmutableList(),
                         extraProfileRoute =
diff --git a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/TimelineItemPresenter.kt b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/TimelineItemPresenter.kt
index 6193e9e58..87afbaff4 100644
--- a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/TimelineItemPresenter.kt
+++ b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/TimelineItemPresenter.kt
@@ -5,7 +5,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import dev.dimension.flare.common.PagingState
 import dev.dimension.flare.common.isRefreshing
 import dev.dimension.flare.data.model.TimelineTabItem
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.home.NotificationBadgePresenter
 import kotlinx.coroutines.launch
 
@@ -13,7 +13,7 @@ public class TimelineItemPresenter(
     private val timelineTabItem: TimelineTabItem,
 ) : PresenterBase<TimelineItemPresenter.State>() {
     public interface State {
-        public val listState: PagingState<UiTimeline>
+        public val listState: PagingState<UiTimelineV2>
 
         public fun refreshSync()
 
diff --git a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/screen/settings/AllTabsPresenter.kt b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/screen/settings/AllTabsPresenter.kt
index 7fcf4894a..7ebc958e7 100644
--- a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/screen/settings/AllTabsPresenter.kt
+++ b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/screen/settings/AllTabsPresenter.kt
@@ -78,8 +78,15 @@ public class AllTabsPresenter(
             }
 
         return object : State {
+            val defaultAccountKey =
+                accountTabs
+                    .takeSuccess()
+                    ?.firstOrNull()
+                    ?.profile
+                    ?.key
             override val defaultTabs =
-                TimelineTabItem.mainSidePanel
+                TimelineTabItem
+                    .mainSidePanel(defaultAccountKey)
                     .let {
                         if (filterIsTimeline) {
                             it.filterIsInstance<TimelineTabItem>()
diff --git a/compose-ui/src/iosMain/kotlin/dev/dimension/flare/ui/controllers/StatusController.kt b/compose-ui/src/iosMain/kotlin/dev/dimension/flare/ui/controllers/StatusController.kt
index 7e70e87cc..84cd771ea 100644
--- a/compose-ui/src/iosMain/kotlin/dev/dimension/flare/ui/controllers/StatusController.kt
+++ b/compose-ui/src/iosMain/kotlin/dev/dimension/flare/ui/controllers/StatusController.kt
@@ -55,7 +55,7 @@ import dev.dimension.flare.ui.component.floatingToolbarVerticalNestedScroll
 import dev.dimension.flare.ui.component.rememberPullToRefreshState
 import dev.dimension.flare.ui.component.status.LazyStatusVerticalStaggeredGrid
 import dev.dimension.flare.ui.component.status.status
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.TimelineItemPresenterWithLazyListState
 import dev.dimension.flare.ui.theme.FlareTheme
 import kotlinx.coroutines.launch
@@ -142,7 +142,7 @@ public fun TimelineItemController(
 
 @Suppress("FunctionName")
 public fun TimelineController(
-    state: ComposeUIStateProxy<PagingState<UiTimeline>>,
+    state: ComposeUIStateProxy<PagingState<UiTimelineV2>>,
     detailStatusKey: MicroBlogKey?,
     topPadding: Int,
     onExpand: () -> Unit,
diff --git a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/component/AccountItem.kt b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/component/AccountItem.kt
index 1ab396fcf..484489fd4 100644
--- a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/component/AccountItem.kt
+++ b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/component/AccountItem.kt
@@ -36,7 +36,7 @@ fun AccountItem(
         RichText(text = it.name, maxLines = 1)
     },
     supportingContent: @Composable (UiProfile) -> Unit = {
-        Text(text = it.handle, maxLines = 1)
+        Text(text = it.handle.canonical, maxLines = 1)
     },
     avatarSize: Dp = 24.dp,
 ) {
diff --git a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/compose/ComposeDialog.kt b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/compose/ComposeDialog.kt
index 082d643e0..2df8b9fc9 100644
--- a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/compose/ComposeDialog.kt
+++ b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/compose/ComposeDialog.kt
@@ -98,7 +98,7 @@ import dev.dimension.flare.ui.component.status.CommonStatusComponent
 import dev.dimension.flare.ui.component.status.StatusVisibilityComponent
 import dev.dimension.flare.ui.model.UiEmoji
 import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.map
 import dev.dimension.flare.ui.model.mapNotNull
 import dev.dimension.flare.ui.model.onError
@@ -236,7 +236,7 @@ fun ComposeDialog(
                                 },
                                 content = {
                                     AvatarComponent(it.avatar, size = 24.dp)
-                                    Text(it.handle)
+                                    Text(it.handle.canonical)
                                 },
                             )
                         }
@@ -250,7 +250,7 @@ fun ComposeDialog(
                                         user.onSuccess { data ->
                                             MenuFlyoutItem(
                                                 text = {
-                                                    Text(text = data.handle)
+                                                    Text(text = data.handle.canonical)
                                                 },
                                                 onClick = {
                                                     state.state.selectAccount(account)
@@ -600,8 +600,8 @@ fun ComposeDialog(
 
             state.state.replyState?.let { replyState ->
                 replyState.onSuccess { state ->
-                    val content = state.content
-                    if (content is UiTimeline.ItemContent.Status) {
+                    val content = state as? UiTimelineV2.Post
+                    if (content is UiTimelineV2.Post) {
                         Card(
                             modifier =
                                 Modifier
diff --git a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/AddTabDialog.kt b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/AddTabDialog.kt
index fa8580b2a..1b98db145 100644
--- a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/AddTabDialog.kt
+++ b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/AddTabDialog.kt
@@ -144,7 +144,7 @@ internal fun AddTabDialog(
                                         overflow = TextOverflow.Ellipsis,
                                     )
                                     Text(
-                                        text = tab.profile.handle,
+                                        text = tab.profile.handle.canonical,
                                         style = FluentTheme.typography.caption,
                                         color =
                                             if (pagerState.currentPage == index + 1) {
diff --git a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/DiscoverScreen.kt b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/DiscoverScreen.kt
index 5e7894567..a25778ef0 100644
--- a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/DiscoverScreen.kt
+++ b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/DiscoverScreen.kt
@@ -209,7 +209,7 @@ internal fun DiscoverScreen(
                                         size = AvatarComponentDefaults.compatSize,
                                     )
                                     Text(
-                                        profile.handle,
+                                        profile.handle.canonical,
                                         maxLines = 1,
                                         modifier = Modifier.padding(start = 8.dp),
                                     )
diff --git a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/NotificationScreen.kt b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/NotificationScreen.kt
index f31bdcfdb..235da1e07 100644
--- a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/NotificationScreen.kt
+++ b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/NotificationScreen.kt
@@ -74,7 +74,7 @@ internal fun NotificationScreen() {
                                         size = AvatarComponentDefaults.compatSize,
                                     )
                                     Text(
-                                        profile.handle,
+                                        profile.handle.canonical,
                                         maxLines = 1,
                                         modifier = Modifier.padding(start = 8.dp),
                                     )
diff --git a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/ProfileScreen.kt b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/ProfileScreen.kt
index f2ce86ea4..b320ce55a 100644
--- a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/ProfileScreen.kt
+++ b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/ProfileScreen.kt
@@ -60,7 +60,7 @@ import dev.dimension.flare.ui.component.status.LazyStatusVerticalStaggeredGrid
 import dev.dimension.flare.ui.component.status.MediaItem
 import dev.dimension.flare.ui.component.status.StatusPlaceholder
 import dev.dimension.flare.ui.component.status.status
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.map
 import dev.dimension.flare.ui.model.onError
 import dev.dimension.flare.ui.model.onLoading
@@ -333,8 +333,7 @@ internal fun ProfileScreen(
                                                     vertical = 4.dp,
                                                 ).clipToBounds()
                                                 .clickable {
-                                                    val content = item.status.content
-                                                    if (content is UiTimeline.ItemContent.Status) {
+                                                    if (item.status is UiTimelineV2.Post) {
 //                                                onItemClicked(
 //                                                    content.statusKey,
 //                                                    item.index,
@@ -481,7 +480,7 @@ private fun presenter(
 private sealed interface ProfileTabItem {
     data class Timeline(
         val type: ProfileTab.Timeline.Type,
-        val data: PagingState<UiTimeline>,
+        val data: PagingState<UiTimelineV2>,
     ) : ProfileTabItem
 
     data class Media(
diff --git a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/SearchScreen.kt b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/SearchScreen.kt
index 12537cbb2..39d98efdb 100644
--- a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/SearchScreen.kt
+++ b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/SearchScreen.kt
@@ -203,7 +203,7 @@ fun SearchScreen(
                                             size = AvatarComponentDefaults.compatSize,
                                         )
                                         Text(
-                                            profile.handle,
+                                            profile.handle.canonical,
                                             maxLines = 1,
                                             modifier = Modifier.padding(start = 8.dp),
                                         )
diff --git a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/media/StatusMediaScreen.kt b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/media/StatusMediaScreen.kt
index aeb2384b1..52a783099 100644
--- a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/media/StatusMediaScreen.kt
+++ b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/media/StatusMediaScreen.kt
@@ -78,7 +78,7 @@ import dev.dimension.flare.ui.component.NetworkImage
 import dev.dimension.flare.ui.component.status.MediaItem
 import dev.dimension.flare.ui.humanizer.humanize
 import dev.dimension.flare.ui.model.UiMedia
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.getFileName
 import dev.dimension.flare.ui.model.map
 import dev.dimension.flare.ui.model.onSuccess
@@ -581,7 +581,7 @@ private fun presenter(
 
     val medias =
         state.status.map {
-            (it.content as? UiTimeline.ItemContent.Status)?.images.orEmpty().toImmutableList()
+            (it as? UiTimelineV2.Post)?.images.orEmpty().toImmutableList()
         }
 
     medias.onSuccess {
@@ -606,11 +606,10 @@ private fun presenter(
         }
 
         fun save(item: UiMedia) {
-            val status = (state.status.takeSuccess()?.content as? UiTimeline.ItemContent.Status)
+            val status = state.status.takeSuccess() as? UiTimelineV2.Post
             if (status != null) {
-                val statusKey = status.statusKey.toString()
-                val userHandle = status.user?.handle ?: "unknown"
-                val fileName = item.getFileName(statusKey, userHandle)
+                val userHandle = status.user?.handle?.canonical ?: "unknown"
+                val fileName = item.getFileName(statusKey.toString(), userHandle)
 
                 when (item) {
                     is UiMedia.Audio -> Unit
diff --git a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/settings/SettingsScreen.kt b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/settings/SettingsScreen.kt
index df8afb7c8..8989a5065 100644
--- a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/settings/SettingsScreen.kt
+++ b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/settings/SettingsScreen.kt
@@ -274,7 +274,7 @@ internal fun SettingsScreen(
                             AvatarComponent(data = activeAccount.avatar, size = 24.dp)
                         },
                         caption = {
-                            Text(text = activeAccount.handle)
+                            Text(text = activeAccount.handle.canonical)
                         },
                     ) {
                         state.accountState.accounts.onSuccess { accounts ->
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
index 05595bcef..7ce033c08 100644
--- 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
@@ -21,7 +21,6 @@ import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 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,10 +52,7 @@ internal fun StatusScreen(
         ) {
             status(
                 state.state.listState,
-                detailStatusKey =
-                    state.state.current
-                        .takeSuccess()
-                        ?.statusKey,
+                detailStatusKey = statusKey,
             )
         }
         if (state.isRefreshing) {
diff --git a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/status/VVOStatusScreen.kt b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/status/VVOStatusScreen.kt
index c982ca608..d1025a267 100644
--- a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/status/VVOStatusScreen.kt
+++ b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/status/VVOStatusScreen.kt
@@ -40,7 +40,7 @@ import dev.dimension.flare.ui.component.status.LazyStatusVerticalStaggeredGrid
 import dev.dimension.flare.ui.component.status.StatusItem
 import dev.dimension.flare.ui.component.status.status
 import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.onError
 import dev.dimension.flare.ui.model.onLoading
 import dev.dimension.flare.ui.model.onSuccess
@@ -117,13 +117,13 @@ internal fun VVOStatusScreen(
 
 @Composable
 private fun StatusContent(
-    statusState: UiState<UiTimeline>,
+    statusState: UiState<UiTimelineV2>,
     detailStatusKey: MicroBlogKey,
     modifier: Modifier = Modifier,
 ) {
     statusState
         .onSuccess { status ->
-            key(status.itemKey, status.content) {
+            key(status.itemKey) {
                 StatusItem(
                     item = status,
                     detailStatusKey = detailStatusKey,
@@ -167,8 +167,8 @@ private fun StatusContent(
 }
 
 private fun LazyStaggeredGridScope.reactionContent(
-    comment: PagingState<UiTimeline>,
-    repost: PagingState<UiTimeline>,
+    comment: PagingState<UiTimelineV2>,
+    repost: PagingState<UiTimelineV2>,
     detailType: DetailType,
     onDetailTypeChange: (DetailType) -> Unit,
 ) {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ActionMenu.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ActionMenu.kt
index 30d248ff2..c11a5c7ec 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ActionMenu.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/ActionMenu.kt
@@ -1,6 +1,7 @@
 package dev.dimension.flare.data.datasource.microblog
 
 import androidx.compose.runtime.Immutable
+import dev.dimension.flare.common.SerializableImmutableList
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.ClickContext
 import dev.dimension.flare.ui.model.ClickEvent
@@ -8,8 +9,8 @@ import dev.dimension.flare.ui.model.UiIcon
 import dev.dimension.flare.ui.model.UiNumber
 import dev.dimension.flare.ui.model.onClicked
 import dev.dimension.flare.ui.route.DeeplinkRoute
-import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -19,7 +20,7 @@ public sealed class ActionMenu {
     @Serializable
     public data class Group internal constructor(
         val displayItem: Item,
-        val actions: ImmutableList<ActionMenu>,
+        val actions: SerializableImmutableList<ActionMenu>,
     ) : ActionMenu()
 
 //    @Immutable
@@ -72,8 +73,9 @@ public sealed class ActionMenu {
             @Immutable
             @Serializable
             public data class Localized(
+                @SerialName("action_type")
                 val type: Type,
-                val parameters: ImmutableList<String> = persistentListOf(),
+                val parameters: SerializableImmutableList<String> = persistentListOf(),
             ) : Text {
                 @Serializable
                 public enum class Type {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
index 0b8516251..eea38dc1e 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
@@ -17,14 +17,12 @@ import dev.dimension.flare.data.datasource.microblog.PostEvent
 import dev.dimension.flare.data.datasource.microblog.ProfileTab
 import dev.dimension.flare.data.datasource.microblog.ReactionDataSource
 import dev.dimension.flare.data.datasource.microblog.datasource.ListDataSource
-import dev.dimension.flare.data.datasource.microblog.datasource.NotificationDataSource
 import dev.dimension.flare.data.datasource.microblog.datasource.PostDataSource
 import dev.dimension.flare.data.datasource.microblog.datasource.RelationDataSource
 import dev.dimension.flare.data.datasource.microblog.datasource.UserDataSource
 import dev.dimension.flare.data.datasource.microblog.handler.EmojiHandler
 import dev.dimension.flare.data.datasource.microblog.handler.ListHandler
 import dev.dimension.flare.data.datasource.microblog.handler.ListMemberHandler
-import dev.dimension.flare.data.datasource.microblog.handler.NotificationHandler
 import dev.dimension.flare.data.datasource.microblog.handler.PostEventHandler
 import dev.dimension.flare.data.datasource.microblog.handler.PostHandler
 import dev.dimension.flare.data.datasource.microblog.handler.RelationHandler
@@ -74,7 +72,6 @@ internal class MisskeyDataSource(
     override val accountKey: MicroBlogKey,
     private val host: String,
 ) : AuthenticatedMicroblogDataSource,
-    NotificationDataSource,
     UserDataSource,
     PostDataSource,
     KoinComponent,
@@ -109,13 +106,6 @@ internal class MisskeyDataSource(
         )
     }
 
-    override val notificationHandler by lazy {
-        NotificationHandler(
-            accountKey = accountKey,
-            loader = loader,
-        )
-    }
-
     override val userHandler by lazy {
         UserHandler(
             accountKey = accountKey,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyLoader.kt
index cc77ef52a..cc5ab0ddf 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyLoader.kt
@@ -1,13 +1,11 @@
 package dev.dimension.flare.data.datasource.misskey
 
 import dev.dimension.flare.data.datasource.microblog.loader.EmojiLoader
-import dev.dimension.flare.data.datasource.microblog.loader.NotificationLoader
 import dev.dimension.flare.data.datasource.microblog.loader.PostLoader
 import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
 import dev.dimension.flare.data.datasource.microblog.loader.UserLoader
 import dev.dimension.flare.data.network.misskey.MisskeyService
 import dev.dimension.flare.data.network.misskey.api.model.AdminAccountsDeleteRequest
-import dev.dimension.flare.data.network.misskey.api.model.INotificationsRequest
 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.UsersShowRequest
@@ -27,19 +25,10 @@ import kotlinx.collections.immutable.toImmutableMap
 internal class MisskeyLoader(
     override val accountKey: MicroBlogKey,
     private val service: MisskeyService,
-) : NotificationLoader,
-    UserLoader,
+) : UserLoader,
     PostLoader,
     RelationLoader,
     EmojiLoader {
-    override suspend fun notificationBadgeCount(): Int =
-        service
-            .iNotifications(
-                INotificationsRequest(
-                    limit = 1,
-                ),
-            ).size
-
     override suspend fun userByHandleAndHost(uiHandle: UiHandle): UiProfile =
         service
             .usersShow(
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
index 8b85cddd3..c58a7d260 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
@@ -12,6 +12,7 @@ import dev.dimension.flare.ui.render.UiRichText
 import dev.dimension.flare.ui.route.DeeplinkRoute
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.serialization.Serializable
+import kotlin.time.Instant
 
 @Serializable
 @Immutable
@@ -24,7 +25,7 @@ public sealed class UiTimelineV2 {
 
     internal abstract val searchText: String?
     internal abstract val statusKey: MicroBlogKey
-    internal abstract val createdAt: UiDateTime
+    public abstract val createdAt: UiDateTime
     internal abstract val accountType: AccountType
 
     public abstract val itemKey: String
@@ -128,6 +129,13 @@ public sealed class UiTimelineV2 {
         override val extraKey: String? = null,
         override val accountType: AccountType,
     ) : UiTimelineV2() {
+        val actualCreatedAt: UiDateTime? by lazy {
+            if (createdAt.value == Instant.fromEpochMilliseconds(0L)) {
+                null
+            } else {
+                createdAt
+            }
+        }
         override val statusKey: MicroBlogKey = MicroBlogKey.fromRss(url)
         override val searchText: String =
             buildString {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt
index de291e8a5..ef6e8bcc6 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt
@@ -888,7 +888,7 @@ internal fun parseXQTCustomDateTime(dateTimeStr: String): Instant? {
             "Dec" to 12,
         )
 
-    val parts = dateTimeStr.split(" ")
+    val parts = dateTimeStr.trim().split(Regex("\\s+"))
     if (parts.size != 6) return null
 
     try {
@@ -896,20 +896,20 @@ internal fun parseXQTCustomDateTime(dateTimeStr: String): Instant? {
         val day = parts[2].toInt()
         val timeParts = parts[3].split(":").map { it.toInt() }
         val year = parts[5].toInt()
+        val timezoneOffset = parts[4]
+        if (timezoneOffset.length != 5 || (timezoneOffset[0] != '+' && timezoneOffset[0] != '-')) return null
+        val offsetHours = timezoneOffset.substring(1, 3).toInt()
+        val offsetMinutes = timezoneOffset.substring(3, 5).toInt()
 
         val hour = timeParts[0]
         val minute = timeParts[1]
         val second = timeParts[2]
 
-        // Assuming the timezone is always in the format of +HHMM or -HHMM
-//        val timezoneOffset = parts[4]
-//        val offsetHours = timezoneOffset.substring(1, 3).toInt()
-//        val offsetMinutes = timezoneOffset.substring(3, 5).toInt()
-//        val totalOffsetMinutes = offsetHours * 60 + offsetMinutes
-//        val offsetSign = if (timezoneOffset.startsWith("+")) 1 else -1
-
         val dateTime = LocalDateTime(year, month, day, hour, minute, second)
-        return dateTime.toInstant(TimeZone.UTC)
+        val offsetSign = if (timezoneOffset.startsWith("+")) 1 else -1
+        val totalOffsetMillis = ((offsetHours * 60L) + offsetMinutes) * 60_000L
+        val utcEpochMillis = dateTime.toInstant(TimeZone.UTC).toEpochMilliseconds() - (offsetSign * totalOffsetMillis)
+        return Instant.fromEpochMilliseconds(utcEpochMillis)
     } catch (e: Exception) {
         return null
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/AllNotificationBadgePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/AllNotificationBadgePresenter.kt
index c4c85e9a0..90214c7b9 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/AllNotificationBadgePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/AllNotificationBadgePresenter.kt
@@ -29,8 +29,8 @@ public class AllNotificationBadgePresenter :
     private val allBadgeFlow by lazy {
         accountRepository.allAccounts
             .map {
-                it.map {
-                    (it.dataSource as NotificationDataSource).notificationHandler.notificationBadgeCount
+                it.map { it.dataSource }.filterIsInstance<NotificationDataSource>().map {
+                    it.notificationHandler.notificationBadgeCount
                 }
             }
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/AllNotificationPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/AllNotificationPresenter.kt
index 849b40534..5b4c34809 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/AllNotificationPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/AllNotificationPresenter.kt
@@ -41,6 +41,7 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
@@ -68,21 +69,39 @@ public class AllNotificationPresenter :
 
     private val accountsNotificationFlow by lazy {
         accountRepository.allAccounts
-            .map {
-                it.map {
-                    combine(
-                        (it.dataSource as UserDataSource).userHandler.userById(it.accountKey.id).data,
-                        (it.dataSource as NotificationDataSource).notificationHandler.notificationBadgeCount.data,
-                    ) { user, badge ->
-                        if (user is CacheState.Success) {
-                            user.data to
-                                if (badge is CacheState.Success) {
-                                    badge.data
+            .map { accounts ->
+                accounts.map { account ->
+                    when (val dataSource = account.dataSource) {
+                        !is UserDataSource -> {
+                            flowOf(null)
+                        }
+
+                        !is NotificationDataSource -> {
+                            dataSource.userHandler.userById(account.accountKey.id).data.map {
+                                if (it is CacheState.Success) {
+                                    it.data to 0
                                 } else {
-                                    0
+                                    null
                                 }
-                        } else {
-                            null
+                            }
+                        }
+
+                        else -> {
+                            combine(
+                                dataSource.userHandler.userById(account.accountKey.id).data,
+                                dataSource.notificationHandler.notificationBadgeCount.data,
+                            ) { user, badge ->
+                                if (user is CacheState.Success) {
+                                    user.data to
+                                        if (badge is CacheState.Success) {
+                                            badge.data
+                                        } else {
+                                            0
+                                        }
+                                } else {
+                                    null
+                                }
+                            }
                         }
                     }
                 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/NotificationBadgePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/NotificationBadgePresenter.kt
index 0e2876108..6c128e112 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/NotificationBadgePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/NotificationBadgePresenter.kt
@@ -3,20 +3,21 @@ package dev.dimension.flare.ui.presenter.home
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.getValue
 import dev.dimension.flare.common.collectAsState
-import dev.dimension.flare.data.datasource.microblog.AuthenticatedMicroblogDataSource
 import dev.dimension.flare.data.datasource.microblog.datasource.NotificationDataSource
 import dev.dimension.flare.data.repository.AccountRepository
-import dev.dimension.flare.data.repository.accountServiceProvider
+import dev.dimension.flare.data.repository.accountServiceFlow
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.ui.model.UiState
+import dev.dimension.flare.ui.model.collectAsUiState
 import dev.dimension.flare.ui.model.flatMap
-import dev.dimension.flare.ui.model.map
 import dev.dimension.flare.ui.model.onSuccess
 import dev.dimension.flare.ui.model.toUi
 import dev.dimension.flare.ui.presenter.PresenterBase
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.filterIsInstance
+import kotlinx.coroutines.flow.map
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import kotlin.time.Duration.Companion.minutes
@@ -28,19 +29,20 @@ public class NotificationBadgePresenter(
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
 
+    private val countFlow by lazy {
+        accountServiceFlow(
+            accountType = accountType,
+            repository = accountRepository,
+        ).filterIsInstance<NotificationDataSource>()
+            .map {
+                it.notificationHandler.notificationBadgeCount
+            }
+    }
+
     @Composable
     override fun body(): NotificationBadgeState {
-        val serviceState =
-            accountServiceProvider(accountType = accountType, repository = accountRepository).map {
-                require(it is AuthenticatedMicroblogDataSource)
-                it
-            }
-        val countState =
-            serviceState.map { service ->
-                remember(service) {
-                    (service as NotificationDataSource).notificationHandler.notificationBadgeCount
-                }.collectAsState()
-            }
+        val countState by countFlow.collectAsUiState()
+        val count = countState.flatMap { it.collectAsState().toUi() }
         if (autoRefresh) {
             countState.onSuccess {
                 LaunchedEffect(Unit) {
@@ -50,7 +52,7 @@ public class NotificationBadgePresenter(
             }
         }
         return object : NotificationBadgeState {
-            override val count: UiState<Int> = countState.flatMap { it.toUi() }
+            override val count = count
 
             override fun refresh() {
                 countState.onSuccess {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt
index c04c93560..52de89ecf 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt
@@ -63,8 +63,12 @@ public abstract class TimelinePresenter :
                 }.flatMapLatest { pager ->
                     filterFlow.map { filterList ->
                         pager.filter { item ->
-                            filterList.any { filter ->
-                                item.searchText.orEmpty().contains(filter, ignoreCase = true)
+                            if (filterList.isEmpty()) {
+                                true
+                            } else {
+                                !filterList.any { filter ->
+                                    item.searchText.orEmpty().contains(filter, ignoreCase = true)
+                                }
                             }
                         }
                     }
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/XQTTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/XQTTest.kt
index 86ee3f596..2f8fdae51 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/XQTTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/XQTTest.kt
@@ -22,6 +22,7 @@ import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
+import kotlin.time.Instant
 
 class XQTTest {
     @BeforeTest
@@ -42,6 +43,22 @@ class XQTTest {
 
     private val accountKey = MicroBlogKey("test_id", "example.com")
 
+    @Test
+    fun parseXQTCustomDateTime_appliesTimezoneOffset() {
+        val parsedPlus = parseXQTCustomDateTime("Wed Mar 04 14:17:49 +0900 2026")
+        val parsedMinus = parseXQTCustomDateTime("Wed Mar 04 14:17:49 -0500 2026")
+
+        assertEquals(Instant.parse("2026-03-04T05:17:49Z"), parsedPlus)
+        assertEquals(Instant.parse("2026-03-04T19:17:49Z"), parsedMinus)
+    }
+
+    @Test
+    fun parseXQTCustomDateTime_supportsDoubleSpacesInDayField() {
+        val parsed = parseXQTCustomDateTime("Wed Mar  4 14:17:49 +0000 2026")
+
+        assertEquals(Instant.parse("2026-03-04T14:17:49Z"), parsed)
+    }
+
     @Test
     fun renderContent_legacyTweet_rendersCorrectly() {
         val legacy =

From 8dea67e6a1623ee1df3e7cc2bb292b7bc2264c3f Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Thu, 5 Mar 2026 00:11:11 +0900
Subject: [PATCH 15/33] fix mixed timeline ordering

---
 .../microblog/MixedRemoteMediator.kt          |  17 +-
 .../microblog/MixedRemoteMediatorTest.kt      | 277 ++++++++++++++++++
 2 files changed, 287 insertions(+), 7 deletions(-)
 create mode 100644 shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediatorTest.kt

diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediator.kt
index a784ce166..62f0ecdcb 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediator.kt
@@ -77,7 +77,7 @@ internal class MixedRemoteMediator(
 
                 PagingResult(
                     endOfPaginationReached = currentMediators.isEmpty(),
-                    data = mixedTimelineResult + timelineResult,
+                    data = mixedTimelineResult,
                     nextKey = if (currentMediators.isEmpty()) null else "mixed_next_key",
                     previousKey = null,
                 )
@@ -92,7 +92,7 @@ internal class MixedRemoteMediator(
             is PagingRequest.Append -> {
                 database
                     .pagingTimelineDao()
-                    .getPagingKey(mediator.pagingKey)
+                    .getPagingKey(subKey(mediator))
                     ?.nextKey
                     ?.let(PagingRequest::Append)
             }
@@ -100,7 +100,7 @@ internal class MixedRemoteMediator(
             is PagingRequest.Prepend ->
                 database
                     .pagingTimelineDao()
-                    .getPagingKey(mediator.pagingKey)
+                    .getPagingKey(subKey(mediator))
                     ?.prevKey
                     ?.let(PagingRequest::Prepend)
 
@@ -116,19 +116,19 @@ internal class MixedRemoteMediator(
         val (mediator, result) = subResponse
         if (request is PagingRequest.Prepend && result.previousKey != null) {
             database.pagingTimelineDao().updatePagingKeyPrevKey(
-                pagingKey = mediator.pagingKey,
+                pagingKey = subKey(mediator),
                 prevKey = result.previousKey,
             )
         } else if (request is PagingRequest.Append && result.nextKey != null) {
             database.pagingTimelineDao().updatePagingKeyNextKey(
-                pagingKey = mediator.pagingKey,
+                pagingKey = subKey(mediator),
                 nextKey = result.nextKey,
             )
         } else if (request is PagingRequest.Refresh) {
-            database.pagingTimelineDao().deletePagingKey(mediator.pagingKey)
+            database.pagingTimelineDao().deletePagingKey(subKey(mediator))
             database.pagingTimelineDao().insertPagingKey(
                 dev.dimension.flare.data.database.cache.model.DbPagingKey(
-                    pagingKey = mediator.pagingKey,
+                    pagingKey = subKey(mediator),
                     nextKey = result.nextKey,
                     prevKey = result.previousKey,
                 ),
@@ -136,6 +136,9 @@ internal class MixedRemoteMediator(
         }
     }
 
+    private fun subKey(mediator: CacheableRemoteLoader<UiTimelineV2>) =
+        "mixed_${mediator.pagingKey}"
+
     private data class SubRequest(
         val mediator: CacheableRemoteLoader<UiTimelineV2>,
         val request: PagingRequest,
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediatorTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediatorTest.kt
new file mode 100644
index 000000000..1e83549ee
--- /dev/null
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediatorTest.kt
@@ -0,0 +1,277 @@
+package dev.dimension.flare.data.datasource.microblog
+
+import androidx.room.Room
+import androidx.sqlite.driver.bundled.BundledSQLiteDriver
+import androidx.paging.LoadType
+import androidx.paging.PagingConfig
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+import androidx.paging.ExperimentalPagingApi
+import dev.dimension.flare.RobolectricTest
+import dev.dimension.flare.common.TestFormatter
+import dev.dimension.flare.data.database.cache.CacheDatabase
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
+import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
+import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.TimelineRemoteMediator
+import dev.dimension.flare.memoryDatabaseBuilder
+import dev.dimension.flare.model.AccountType
+import dev.dimension.flare.ui.humanizer.PlatformFormatter
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.render.toUi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.koin.core.context.startKoin
+import org.koin.core.context.stopKoin
+import org.koin.dsl.module
+import kotlin.test.AfterTest
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+import kotlin.time.Instant
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class MixedRemoteMediatorTest : RobolectricTest() {
+    private lateinit var db: CacheDatabase
+
+    @BeforeTest
+    fun setup() {
+        startKoin {
+            modules(
+                module {
+                    single<PlatformFormatter> { TestFormatter() }
+                },
+            )
+        }
+        db =
+            Room
+                .memoryDatabaseBuilder<CacheDatabase>()
+                .setDriver(BundledSQLiteDriver())
+                .setQueryCoroutineContext(Dispatchers.Unconfined)
+                .build()
+    }
+
+    @AfterTest
+    fun tearDown() {
+        db.close()
+        stopKoin()
+    }
+
+    @Test
+    fun prependReturnsEndWithoutLoadingSubMediators() =
+        runTest {
+            val first = FakeLoader("a") { PagingResult(nextKey = "next_a") }
+            val second = FakeLoader("b") { PagingResult(nextKey = "next_b") }
+            val mediator = MixedRemoteMediator(db, listOf(first, second))
+
+            val result = mediator.load(pageSize = 20, request = PagingRequest.Prepend("ignored"))
+
+            assertNull(result.nextKey)
+            assertEquals(0, first.requests.size)
+            assertEquals(0, second.requests.size)
+        }
+
+    @Test
+    fun appendUsesRemainingMediatorsAndRefreshResetsMediatorSet() =
+        runTest {
+            val first =
+                FakeLoader("a") { request ->
+                    when (request) {
+                        PagingRequest.Refresh ->
+                            PagingResult(
+                                data = listOf(feed("https://example.com/a_refresh", 1000L)),
+                                nextKey = "a_next",
+                            )
+
+                        is PagingRequest.Append -> {
+                            assertEquals("a_next", request.nextKey)
+                            PagingResult(
+                                data = listOf(feed("https://example.com/a_append", 900L)),
+                                nextKey = null,
+                            )
+                        }
+
+                        is PagingRequest.Prepend -> error("Prepend should not be requested here")
+                    }
+                }
+
+            val second =
+                FakeLoader("b") { request ->
+                    when (request) {
+                        PagingRequest.Refresh ->
+                            PagingResult(
+                                data = listOf(feed("https://example.com/b_refresh", 2000L)),
+                                nextKey = null,
+                            )
+
+                        is PagingRequest.Append -> error("Second mediator should be filtered out before append")
+                        is PagingRequest.Prepend -> error("Prepend should not be requested here")
+                    }
+                }
+
+            val mediator = MixedRemoteMediator(db, listOf(first, second))
+
+            mediator.load(pageSize = 20, request = PagingRequest.Refresh)
+            val appendResult = mediator.load(pageSize = 20, request = PagingRequest.Append("mixed_next_key"))
+
+            assertNull(appendResult.nextKey)
+            assertEquals(listOf<PagingRequest>(PagingRequest.Refresh, PagingRequest.Append("a_next")), first.requests)
+            assertEquals(listOf<PagingRequest>(PagingRequest.Refresh), second.requests)
+
+            mediator.load(pageSize = 20, request = PagingRequest.Refresh)
+
+            assertEquals(3, first.requests.size)
+            assertEquals(PagingRequest.Refresh, first.requests.last())
+            assertEquals(2, second.requests.size)
+            assertEquals(PagingRequest.Refresh, second.requests.last())
+        }
+
+    @Test
+    fun failingSubMediatorIsIgnoredAndLoadStillSucceeds() =
+        runTest {
+            val failing =
+                FakeLoader("failing") { _ ->
+                    error("network failure")
+                }
+            val healthy =
+                FakeLoader("healthy") { request ->
+                    when (request) {
+                        PagingRequest.Refresh ->
+                            PagingResult(
+                                data = listOf(feed("https://example.com/healthy", 3000L)),
+                                nextKey = null,
+                            )
+
+                        is PagingRequest.Append -> error("No append expected")
+                        is PagingRequest.Prepend -> error("No prepend expected")
+                    }
+                }
+
+            val mediator = MixedRemoteMediator(db, listOf(failing, healthy))
+            val result = mediator.load(pageSize = 20, request = PagingRequest.Refresh)
+
+            assertNull(result.nextKey)
+            assertEquals(1, failing.requests.size)
+            assertEquals(1, healthy.requests.size)
+            assertEquals(1, result.data.size)
+            assertEquals("https://example.com/healthy", (result.data.first() as UiTimelineV2.Feed).url)
+            assertNotNull(db.pagingTimelineDao().getPagingKey("failing"))
+            assertNotNull(db.pagingTimelineDao().getPagingKey("healthy"))
+        }
+
+    @OptIn(ExperimentalPagingApi::class)
+    @Test
+    fun refreshWithMultipleItemsPerSubPersistsSortedOrderInDatabase() =
+        runTest {
+            val first =
+                FakeLoader("a") { request ->
+                    when (request) {
+                        PagingRequest.Refresh ->
+                            PagingResult(
+                                data =
+                                    listOf(
+                                        feed("https://example.com/a_3000", 3000L),
+                                        feed("https://example.com/a_1000", 1000L),
+                                    ),
+                                nextKey = null,
+                            )
+
+                        is PagingRequest.Append -> error("No append expected")
+                        is PagingRequest.Prepend -> error("No prepend expected")
+                    }
+                }
+            val second =
+                FakeLoader("b") { request ->
+                    when (request) {
+                        PagingRequest.Refresh ->
+                            PagingResult(
+                                data =
+                                    listOf(
+                                        feed("https://example.com/b_4000", 4000L),
+                                        feed("https://example.com/b_2000", 2000L),
+                                    ),
+                                nextKey = null,
+                            )
+
+                        is PagingRequest.Append -> error("No append expected")
+                        is PagingRequest.Prepend -> error("No prepend expected")
+                    }
+                }
+
+            val mixed = MixedRemoteMediator(db, listOf(first, second))
+            val timelineRemoteMediator = TimelineRemoteMediator(loader = mixed, database = db)
+
+            val mediatorResult =
+                timelineRemoteMediator.load(
+                    loadType = LoadType.REFRESH,
+                    state =
+                        PagingState(
+                            pages = emptyList(),
+                            anchorPosition = null,
+                            config = PagingConfig(pageSize = 20),
+                            leadingPlaceholderCount = 0,
+                        ),
+                )
+            assertTrue(mediatorResult is androidx.paging.RemoteMediator.MediatorResult.Success)
+
+            val pagingSource = db.pagingTimelineDao().getPagingSource(timelineRemoteMediator.pagingKey)
+            val page =
+                pagingSource.load(
+                    PagingSource.LoadParams.Refresh(
+                        key = null,
+                        loadSize = 20,
+                        placeholdersEnabled = false,
+                    ),
+                )
+            assertTrue(page is PagingSource.LoadResult.Page)
+            val urls =
+                page.data.mapNotNull {
+                    (it.status.status.data.content as? UiTimelineV2.Feed)?.url
+                }
+            assertEquals(
+                listOf(
+                    "https://example.com/b_4000",
+                    "https://example.com/a_3000",
+                    "https://example.com/b_2000",
+                    "https://example.com/a_1000",
+                ),
+                urls,
+            )
+        }
+
+    private class FakeLoader(
+        override val pagingKey: String,
+        private val onLoad: suspend (PagingRequest) -> PagingResult<UiTimelineV2>,
+    ) : CacheableRemoteLoader<UiTimelineV2> {
+        val requests = mutableListOf<PagingRequest>()
+
+        override suspend fun load(
+            pageSize: Int,
+            request: PagingRequest,
+        ): PagingResult<UiTimelineV2> {
+            requests += request
+            return onLoad(request)
+        }
+    }
+
+    private fun feed(
+        url: String,
+        createdAtEpochMs: Long,
+    ) = UiTimelineV2.Feed(
+        title = url.substringAfterLast('/'),
+        description = null,
+        url = url,
+        createdAt = Instant.fromEpochMilliseconds(createdAtEpochMs).toUi(),
+        source =
+            UiTimelineV2.Feed.Source(
+                name = "test",
+                icon = null,
+            ),
+        openInBrowser = false,
+        accountType = AccountType.Guest,
+    )
+}

From 234156b1fc1edc95c1d8dc159a8f53bdc393b931 Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Thu, 5 Mar 2026 00:59:08 +0900
Subject: [PATCH 16/33] fix retweet and quote same post

---
 .../microblog/MixedRemoteMediator.kt          |   3 +-
 .../flare/ui/model/mapper/Bluesky.kt          |   7 +-
 .../flare/ui/model/mapper/Mastodon.kt         |  21 +--
 .../flare/ui/model/mapper/Misskey.kt          |   8 +-
 .../dimension/flare/ui/model/mapper/XQT.kt    |   6 +-
 .../database/cache/mapper/MicroblogTest.kt    | 145 +++++++++++++++++-
 .../microblog/MixedRemoteMediatorTest.kt      |   6 +-
 .../ui/model/mapper/BlueskyRenderTest.kt      |   2 +
 .../ui/model/mapper/MastodonRenderTest.kt     |   2 +
 .../ui/model/mapper/MisskeyRenderTest.kt      |   2 +
 .../flare/ui/model/mapper/XQTRenderTest.kt    |   3 +-
 11 files changed, 184 insertions(+), 21 deletions(-)

diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediator.kt
index 62f0ecdcb..2a3e20ce9 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediator.kt
@@ -136,8 +136,7 @@ internal class MixedRemoteMediator(
         }
     }
 
-    private fun subKey(mediator: CacheableRemoteLoader<UiTimelineV2>) =
-        "mixed_${mediator.pagingKey}"
+    private fun subKey(mediator: CacheableRemoteLoader<UiTimelineV2>) = "mixed_${mediator.pagingKey}"
 
     private data class SubRequest(
         val mediator: CacheableRemoteLoader<UiTimelineV2>,
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
index 50874a425..b5516b82e 100644
--- 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
@@ -627,6 +627,11 @@ private fun FeedViewPost.render(accountKey: MicroBlogKey): UiTimelineV2 {
 
             else -> null
         }
+    val postForTimeline =
+        when (reason) {
+            is FeedViewPostReasonUnion.ReasonRepost -> renderedPost.copy(statusKey = message?.statusKey ?: renderedPost.statusKey)
+            else -> renderedPost
+        }
 
     val reply =
         when (val reply = reply?.parent) {
@@ -639,7 +644,7 @@ private fun FeedViewPost.render(accountKey: MicroBlogKey): UiTimelineV2 {
 
             else -> null
         }?.render(accountKey)
-    return renderedPost.copy(
+    return postForTimeline.copy(
         message = message,
         parents = listOfNotNull(reply).toImmutableList(),
     )
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
index 1f55f91fe..1b347be83 100644
--- 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
@@ -194,9 +194,9 @@ internal fun Status.render(
     accountKey: MicroBlogKey?,
 ): UiTimelineV2 {
     requireNotNull(account) { "account is null" }
+    val currentStatus = this.renderStatus(host, accountKey)
     val topMessage =
         if (pinned == true) {
-            val currentStatus = this.renderStatus(host, accountKey)
             UiTimelineV2.Message(
                 user = null,
                 icon = UiIcon.Pin,
@@ -210,7 +210,6 @@ internal fun Status.render(
                 accountType = accountKey.toAccountType(),
             )
         } else if (reblog != null) {
-            val currentStatus = this.renderStatus(host, accountKey)
             val userKey = currentStatus.user?.key
             UiTimelineV2.Message(
                 user = currentStatus.user,
@@ -238,13 +237,17 @@ internal fun Status.render(
         } else {
             null
         }
-    return (this.reblog ?: this)
-        .renderStatus(
-            host = host,
-            accountKey = accountKey,
-        ).copy(
-            message = topMessage,
-        )
+    val actualStatus =
+        if (reblog != null) {
+            reblog
+                .renderStatus(
+                    host = host,
+                    accountKey = accountKey,
+                ).copy(statusKey = currentStatus.statusKey)
+        } else {
+            currentStatus
+        }
+    return actualStatus.copy(message = topMessage)
 }
 
 private fun Status.renderStatus(
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt
index 5dc0151ee..45b9875cf 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt
@@ -302,13 +302,19 @@ public enum class MisskeyAchievement(
 }
 
 internal fun Note.render(accountKey: MicroBlogKey): UiTimelineV2 {
+    val wrapperStatus = this.renderStatus(accountKey)
     val actualStatus =
         if (!text.isNullOrEmpty() || !files.isNullOrEmpty() || poll != null || cw != null) {
             this
         } else {
             renote ?: this
         }
-    val status = actualStatus.renderStatus(accountKey)
+    val status =
+        if (actualStatus !== this) {
+            actualStatus.renderStatus(accountKey).copy(statusKey = wrapperStatus.statusKey)
+        } else {
+            wrapperStatus
+        }
     val topMessage =
         if (actualStatus !== this) {
             val user = user.render(accountKey)
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt
index ef6e8bcc6..33042e099 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt
@@ -286,7 +286,7 @@ internal fun Tweet.render(accountKey: MicroBlogKey): UiTimelineV2.Post {
     val quote = quoteUnion?.toTweetOrNull()?.renderStatus(accountKey = accountKey)
     val retweet = retweetUnion?.toTweetOrNull()?.renderStatus(accountKey, quote = quote)
     val currentTweet = renderStatus(accountKey, quote = quote)
-    val actualTweet = retweet ?: currentTweet
+    val actualTweet = if (retweet != null) retweet.copy(statusKey = currentTweet.statusKey) else currentTweet
     val user = currentTweet.user
     val message =
         if (retweet != null && user != null) {
@@ -347,7 +347,7 @@ internal fun XQTTimeline.render(accountKey: MicroBlogKey): UiTimelineV2? {
                 accountKey = accountKey,
                 quote = quote,
             )
-    val actualTweet = retweet ?: currentTweet
+    val actualTweet = if (retweet != null) retweet.copy(statusKey = currentTweet.statusKey) else currentTweet
     val user = currentTweet.user
     val message =
         if (retweet != null && user != null) {
@@ -1312,7 +1312,7 @@ internal fun Tweet.renderContent(accountKey: MicroBlogKey): UiRichText {
                                         .UserNameWithHost(
                                             dev.dimension.flare.model.AccountType
                                                 .Specific(accountKey),
-                                            it.screenName ?: "",
+                                            it.screenName?.trimStart('@') ?: "",
                                             accountKey.host,
                                         ).toUri(),
                                 )
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt
index f7d9e0445..c331a5311 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt
@@ -237,6 +237,148 @@ class MicroblogTest : RobolectricTest() {
             assertEquals(parentPost.statusKey, post.parents.first().statusKey)
         }
 
+    @Test
+    fun timelinePagingMapperKeepsPostMessageAfterRoundTrip() =
+        runTest {
+            val accountKey = MicroBlogKey(id = "account", host = "test.com")
+            val postUser = createUser(MicroBlogKey(id = "post-user", host = "test.com"), "Post User")
+            val post =
+                createPost(
+                    accountKey = accountKey,
+                    user = postUser,
+                    statusKey = MicroBlogKey(id = "post-status", host = "test.com"),
+                    text = "post content",
+                ).copy(
+                    message =
+                        UiTimelineV2.Message(
+                            user = null,
+                            statusKey = MicroBlogKey(id = "message-status", host = "test.com"),
+                            icon = dev.dimension.flare.ui.model.UiIcon.Retweet,
+                            type =
+                                UiTimelineV2.Message.Type.Localized(
+                                    UiTimelineV2.Message.Type.Localized.MessageId.Repost,
+                                ),
+                            createdAt = Clock.System.now().toUi(),
+                            clickEvent = ClickEvent.Noop,
+                            accountType = AccountType.Specific(accountKey),
+                        ),
+                )
+
+            val mapped = TimelinePagingMapper.toDb(post, pagingKey = "home")
+            val roundTrip = TimelinePagingMapper.toUi(mapped, pagingKey = "home", useDbKeyInItemKey = false)
+            val rendered = assertIs<UiTimelineV2.Post>(roundTrip)
+            val message = assertNotNull(rendered.message)
+            val type = assertIs<UiTimelineV2.Message.Type.Localized>(message.type)
+
+            assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
+        }
+
+    @Test
+    fun quoteAndRetweetTogetherKeepsRetweetMessageOnSharedStatus() =
+        runTest {
+            val accountKey = MicroBlogKey(id = "account", host = "x.com")
+            val originalUser = createUser(MicroBlogKey(id = "u-original", host = "x.com"), "Original")
+            val wrapperUser = createUser(MicroBlogKey(id = "u-wrapper", host = "x.com"), "Wrapper")
+            val original =
+                createPost(
+                    accountKey = accountKey,
+                    user = originalUser,
+                    statusKey = MicroBlogKey(id = "fake-original-shared", host = "x.com"),
+                    text = "original content",
+                )
+            val quoteWrapper =
+                createPost(
+                    accountKey = accountKey,
+                    user = wrapperUser,
+                    statusKey = MicroBlogKey(id = "fake-quote-wrapper", host = "x.com"),
+                    text = "quote wrapper",
+                    quote = listOf(original),
+                )
+            val retweetMessage =
+                UiTimelineV2.Message(
+                    user = wrapperUser,
+                    statusKey = MicroBlogKey(id = "fake-retweet-wrapper", host = "x.com"),
+                    icon = dev.dimension.flare.ui.model.UiIcon.Retweet,
+                    type =
+                        UiTimelineV2.Message.Type.Localized(
+                            UiTimelineV2.Message.Type.Localized.MessageId.Repost,
+                        ),
+                    createdAt = Clock.System.now().toUi(),
+                    clickEvent = ClickEvent.Noop,
+                    accountType = AccountType.Specific(accountKey),
+                )
+            val retweetItem =
+                original.copy(
+                    statusKey = retweetMessage.statusKey,
+                    message = retweetMessage,
+                )
+
+            val items =
+                listOf(
+                    TimelinePagingMapper.toDb(quoteWrapper, pagingKey = "home"),
+                    TimelinePagingMapper.toDb(retweetItem, pagingKey = "home"),
+                )
+            saveToDatabase(db, items)
+
+            val savedRetweet =
+                db
+                    .statusDao()
+                    .get(
+                        retweetMessage.statusKey,
+                        AccountType.Specific(accountKey),
+                    ).first()
+            val savedPost = assertIs<UiTimelineV2.Post>(assertNotNull(savedRetweet).content)
+            val savedMessage = assertNotNull(savedPost.message)
+            val savedType = assertIs<UiTimelineV2.Message.Type.Localized>(savedMessage.type)
+            assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, savedType.data)
+            assertEquals(retweetMessage.statusKey, savedPost.statusKey)
+        }
+
+    @Test
+    fun detailRefreshDoesNotRemoveExistingRetweetMessage() =
+        runTest {
+            val accountKey = MicroBlogKey(id = "account", host = "x.com")
+            val originalUser = createUser(MicroBlogKey(id = "u-original", host = "x.com"), "Original")
+            val wrapperUser = createUser(MicroBlogKey(id = "u-wrapper", host = "x.com"), "Wrapper")
+            val statusKey = MicroBlogKey(id = "fake-original-detail", host = "x.com")
+            val original =
+                createPost(
+                    accountKey = accountKey,
+                    user = originalUser,
+                    statusKey = statusKey,
+                    text = "original content",
+                )
+            val retweetMessage =
+                UiTimelineV2.Message(
+                    user = wrapperUser,
+                    statusKey = MicroBlogKey(id = "fake-retweet-detail-wrapper", host = "x.com"),
+                    icon = dev.dimension.flare.ui.model.UiIcon.Retweet,
+                    type =
+                        UiTimelineV2.Message.Type.Localized(
+                            UiTimelineV2.Message.Type.Localized.MessageId.Repost,
+                        ),
+                    createdAt = Clock.System.now().toUi(),
+                    clickEvent = ClickEvent.Noop,
+                    accountType = AccountType.Specific(accountKey),
+                )
+            val homeRetweetView =
+                original.copy(
+                    statusKey = retweetMessage.statusKey,
+                    message = retweetMessage,
+                )
+            val detailView = original.copy(message = null)
+
+            saveToDatabase(db, listOf(TimelinePagingMapper.toDb(homeRetweetView, pagingKey = "home")))
+            saveToDatabase(db, listOf(TimelinePagingMapper.toDb(detailView, pagingKey = "post_only_$statusKey")))
+
+            val saved =
+                db.statusDao().get(retweetMessage.statusKey, AccountType.Specific(accountKey)).first()
+            val savedPost = assertIs<UiTimelineV2.Post>(assertNotNull(saved).content)
+            val savedMessage = assertNotNull(savedPost.message)
+            val savedType = assertIs<UiTimelineV2.Message.Type.Localized>(savedMessage.type)
+            assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, savedType.data)
+        }
+
     private fun createUser(
         key: MicroBlogKey,
         name: String,
@@ -264,6 +406,7 @@ class MicroblogTest : RobolectricTest() {
         user: UiProfile,
         statusKey: MicroBlogKey,
         text: String,
+        quote: List<UiTimelineV2.Post> = emptyList(),
         parents: List<UiTimelineV2.Post> = emptyList(),
     ): UiTimelineV2.Post =
         UiTimelineV2.Post(
@@ -273,7 +416,7 @@ class MicroblogTest : RobolectricTest() {
             sensitive = false,
             contentWarning = null,
             user = user,
-            quote = persistentListOf(),
+            quote = quote.toPersistentList(),
             content = Element("span").apply { appendText(text) }.toUi(),
             actions = persistentListOf(),
             poll = null,
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediatorTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediatorTest.kt
index 1e83549ee..32ad9f1db 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediatorTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediatorTest.kt
@@ -1,12 +1,12 @@
 package dev.dimension.flare.data.datasource.microblog
 
-import androidx.room.Room
-import androidx.sqlite.driver.bundled.BundledSQLiteDriver
+import androidx.paging.ExperimentalPagingApi
 import androidx.paging.LoadType
 import androidx.paging.PagingConfig
 import androidx.paging.PagingSource
 import androidx.paging.PagingState
-import androidx.paging.ExperimentalPagingApi
+import androidx.room.Room
+import androidx.sqlite.driver.bundled.BundledSQLiteDriver
 import dev.dimension.flare.RobolectricTest
 import dev.dimension.flare.common.TestFormatter
 import dev.dimension.flare.data.database.cache.CacheDatabase
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/BlueskyRenderTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/BlueskyRenderTest.kt
index 8f88f9253..4d59a8b8d 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/BlueskyRenderTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/BlueskyRenderTest.kt
@@ -201,6 +201,7 @@ class BlueskyRenderTest {
         assertEquals("did:plc:reposter", message.user?.key?.id)
         assertEquals("did:plc:original", rendered.user?.key?.id)
         assertEquals("original post content", rendered.content.innerText)
+        assertEquals(message.statusKey.id, rendered.statusKey.id)
     }
 
     @Test
@@ -243,6 +244,7 @@ class BlueskyRenderTest {
 
         assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
         assertEquals("original payload", rendered.content.innerText)
+        assertEquals(message.statusKey.id, rendered.statusKey.id)
         assertEquals(1, rendered.quote.size)
         assertEquals(
             "quoted payload",
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/MastodonRenderTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/MastodonRenderTest.kt
index d4e3bb3fe..fdde505fb 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/MastodonRenderTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/MastodonRenderTest.kt
@@ -137,6 +137,7 @@ class MastodonRenderTest {
         assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
         assertEquals("reblogger-user", message.user?.handle?.raw)
         assertEquals("original content", rendered.content.innerText)
+        assertEquals("reblog-wrapper-1", rendered.statusKey.id)
     }
 
     @Test
@@ -169,6 +170,7 @@ class MastodonRenderTest {
         assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
         assertEquals("reblogger-user", message.user?.handle?.raw)
         assertEquals("original content", rendered.content.innerText)
+        assertEquals("reblog-wrapper-2", rendered.statusKey.id)
         assertEquals(1, rendered.quote.size)
         assertEquals(
             "quoted content",
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/MisskeyRenderTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/MisskeyRenderTest.kt
index 1628923d1..bcd99e751 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/MisskeyRenderTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/MisskeyRenderTest.kt
@@ -168,6 +168,7 @@ class MisskeyRenderTest {
         assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
         assertEquals("user-reposter", message.user?.key?.id)
         assertEquals("original content", rendered.content.innerText)
+        assertEquals("note-repost-wrapper", rendered.statusKey.id)
     }
 
     @Test
@@ -199,6 +200,7 @@ class MisskeyRenderTest {
 
         assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
         assertEquals("original payload", rendered.content.innerText)
+        assertEquals("note-repost-wrapper-2", rendered.statusKey.id)
         assertEquals(1, rendered.quote.size)
         assertEquals(
             "quoted payload",
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/XQTRenderTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/XQTRenderTest.kt
index 62713cd9a..fd6892d9d 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/XQTRenderTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/XQTRenderTest.kt
@@ -167,7 +167,7 @@ class XQTRenderTest {
         assertEquals("user-reposter", message.user?.key?.id)
         assertEquals("original content", rendered.content.innerText)
         assertEquals("user-original", rendered.user?.key?.id)
-        assertEquals("status-original", rendered.statusKey.id)
+        assertEquals("status-repost-wrapper", rendered.statusKey.id)
     }
 
     @Test
@@ -198,6 +198,7 @@ class XQTRenderTest {
         val type = assertIs<UiTimelineV2.Message.Type.Localized>(message.type)
 
         assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
+        assertEquals("status-repost-wrapper-2", rendered.statusKey.id)
         assertEquals("original payload", rendered.content.innerText)
         assertEquals(1, rendered.quote.size)
         assertEquals(

From fa4a9b799017085c272119f750637fc4cd91c95e Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Thu, 5 Mar 2026 01:01:06 +0900
Subject: [PATCH 17/33] fix test

---
 .../data/datasource/microblog/MixedRemoteMediatorTest.kt      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediatorTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediatorTest.kt
index 32ad9f1db..8fb9db406 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediatorTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediatorTest.kt
@@ -159,8 +159,8 @@ class MixedRemoteMediatorTest : RobolectricTest() {
             assertEquals(1, healthy.requests.size)
             assertEquals(1, result.data.size)
             assertEquals("https://example.com/healthy", (result.data.first() as UiTimelineV2.Feed).url)
-            assertNotNull(db.pagingTimelineDao().getPagingKey("failing"))
-            assertNotNull(db.pagingTimelineDao().getPagingKey("healthy"))
+            assertNotNull(db.pagingTimelineDao().getPagingKey("mixed_failing"))
+            assertNotNull(db.pagingTimelineDao().getPagingKey("mixed_healthy"))
         }
 
     @OptIn(ExperimentalPagingApi::class)

From 24d5ebfa4ea0d65773d3e6d82fa6f14acd0ea9b2 Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Thu, 5 Mar 2026 15:01:07 +0900
Subject: [PATCH 18/33] fix ui

---
 .../component/status/CommonStatusComponent.kt |  19 +-
 .../ui/component/status/LazyStatusItems.kt    |   5 +-
 .../component/status/UiTimelineComponent.kt   | 374 +++++++-----------
 .../datasource/bluesky/BlueskyDataSource.kt   |   6 +-
 .../datasource/mastodon/MastodonDataSource.kt |   3 +-
 .../microblog/handler/PostEventHandler.kt     |   7 +
 .../microblog/paging/RemoteLoader.kt          |   9 +
 .../microblog/paging/TimelinePagingMapper.kt  |  85 +++-
 .../datasource/misskey/MisskeyDataSource.kt   |   3 +-
 .../data/datasource/vvo/VVODataSource.kt      |  15 +-
 .../xqt/NotificationPagingSource.kt           |   6 +-
 .../data/network/vvo/model/TimelineData.kt    |   2 +-
 .../dimension/flare/ui/model/UiTimelineV2.kt  |   5 +-
 .../flare/ui/model/mapper/Bluesky.kt          |   6 +-
 .../flare/ui/model/mapper/Mastodon.kt         |  19 +-
 .../flare/ui/model/mapper/Misskey.kt          |  54 ++-
 .../dimension/flare/ui/model/mapper/VVO.kt    |  32 +-
 .../dimension/flare/ui/model/mapper/XQT.kt    |  14 +-
 .../home/AllNotificationPresenter.kt          | 105 ++---
 .../ui/presenter/home/TimelinePresenter.kt    |  25 +-
 .../ui/presenter/profile/ProfilePresenter.kt  |   2 +-
 .../status/action/AddReactionPresenter.kt     |   5 +-
 .../database/cache/mapper/MicroblogTest.kt    | 175 ++++++++
 .../ui/model/mapper/BlueskyRenderTest.kt      |  12 +
 .../ui/model/mapper/MastodonRenderTest.kt     |  14 +-
 .../ui/model/mapper/MisskeyRenderTest.kt      |  14 +-
 .../flare/ui/model/mapper/XQTRenderTest.kt    |  15 +-
 27 files changed, 641 insertions(+), 390 deletions(-)

diff --git a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusComponent.kt b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusComponent.kt
index d45956194..f6cc511ee 100644
--- a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusComponent.kt
+++ b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusComponent.kt
@@ -59,6 +59,7 @@ import compose.icons.fontawesomeicons.regular.CommentDots
 import compose.icons.fontawesomeicons.regular.Heart
 import compose.icons.fontawesomeicons.solid.At
 import compose.icons.fontawesomeicons.solid.Bookmark
+import compose.icons.fontawesomeicons.solid.Check
 import compose.icons.fontawesomeicons.solid.CircleInfo
 import compose.icons.fontawesomeicons.solid.Ellipsis
 import compose.icons.fontawesomeicons.solid.EllipsisVertical
@@ -70,13 +71,16 @@ import compose.icons.fontawesomeicons.solid.Lock
 import compose.icons.fontawesomeicons.solid.LockOpen
 import compose.icons.fontawesomeicons.solid.Message
 import compose.icons.fontawesomeicons.solid.Minus
+import compose.icons.fontawesomeicons.solid.Pen
 import compose.icons.fontawesomeicons.solid.Plus
-import compose.icons.fontawesomeicons.solid.QuoteLeft
 import compose.icons.fontawesomeicons.solid.Reply
 import compose.icons.fontawesomeicons.solid.Retweet
 import compose.icons.fontawesomeicons.solid.ShareNodes
+import compose.icons.fontawesomeicons.solid.SquarePollHorizontal
+import compose.icons.fontawesomeicons.solid.Thumbtack
 import compose.icons.fontawesomeicons.solid.Trash
 import compose.icons.fontawesomeicons.solid.Tv
+import compose.icons.fontawesomeicons.solid.UserPlus
 import compose.icons.fontawesomeicons.solid.UserSlash
 import compose.icons.fontawesomeicons.solid.VolumeXmark
 import dev.dimension.flare.compose.ui.Res
@@ -941,7 +945,7 @@ private fun ActionMenu.Item.Color.toComposeColor(): Color =
         ActionMenu.Item.Color.PrimaryColor -> PlatformTheme.colorScheme.retweetColor
     }
 
-private fun UiIcon.toImageVector(): ImageVector =
+internal fun UiIcon.toImageVector(): ImageVector =
     when (this) {
         UiIcon.Like -> FontAwesomeIcons.Regular.Heart
         UiIcon.Unlike -> FontAwesomeIcons.Solid.Heart
@@ -949,7 +953,7 @@ private fun UiIcon.toImageVector(): ImageVector =
         UiIcon.Unretweet -> FontAwesomeIcons.Solid.Retweet
         UiIcon.Reply -> FontAwesomeIcons.Solid.Reply
         UiIcon.Comment -> FontAwesomeIcons.Regular.CommentDots
-        UiIcon.Quote -> FontAwesomeIcons.Solid.QuoteLeft
+        UiIcon.Quote -> FontAwesomeIcons.Solid.Reply
         UiIcon.Bookmark -> FontAwesomeIcons.Regular.Bookmark
         UiIcon.Unbookmark -> FontAwesomeIcons.Solid.Bookmark
         UiIcon.More -> FontAwesomeIcons.Solid.Ellipsis
@@ -965,7 +969,14 @@ private fun UiIcon.toImageVector(): ImageVector =
         UiIcon.UnMute -> FontAwesomeIcons.Solid.VolumeXmark
         UiIcon.Block -> FontAwesomeIcons.Solid.UserSlash
         UiIcon.UnBlock -> FontAwesomeIcons.Solid.UserSlash
-        else -> FontAwesomeIcons.Solid.Ellipsis
+        UiIcon.Follow -> FontAwesomeIcons.Solid.UserPlus
+        UiIcon.Favourite -> FontAwesomeIcons.Solid.Heart
+        UiIcon.Mention -> FontAwesomeIcons.Solid.At
+        UiIcon.Poll -> FontAwesomeIcons.Solid.SquarePollHorizontal
+        UiIcon.Edit -> FontAwesomeIcons.Solid.Pen
+        UiIcon.Info -> FontAwesomeIcons.Solid.CircleInfo
+        UiIcon.Pin -> FontAwesomeIcons.Solid.Thumbtack
+        UiIcon.Check -> FontAwesomeIcons.Solid.Check
     }
 
 @Composable
diff --git a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/LazyStatusItems.kt b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/LazyStatusItems.kt
index 165154477..a701143c8 100644
--- a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/LazyStatusItems.kt
+++ b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/LazyStatusItems.kt
@@ -18,7 +18,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import compose.icons.FontAwesomeIcons
 import compose.icons.fontawesomeicons.Solid
@@ -225,13 +224,12 @@ public fun StatusItem(
     item: UiTimelineV2?,
     modifier: Modifier = Modifier,
     detailStatusKey: MicroBlogKey? = null,
-    horizontalPadding: Dp = screenHorizontalPadding,
 ) {
     if (item == null) {
         Column(
             modifier =
                 modifier.padding(
-                    horizontal = horizontalPadding,
+                    horizontal = screenHorizontalPadding,
                     vertical = 8.dp,
                 ),
         ) {
@@ -242,7 +240,6 @@ public fun StatusItem(
             item = item,
             detailStatusKey = detailStatusKey,
             modifier = modifier,
-            horizontalPadding = screenHorizontalPadding,
         )
     }
 }
diff --git a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/UiTimelineComponent.kt b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/UiTimelineComponent.kt
index f97c2e12c..a205b0cf4 100644
--- a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/UiTimelineComponent.kt
+++ b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/UiTimelineComponent.kt
@@ -4,10 +4,8 @@ import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.calculateStartPadding
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
@@ -18,26 +16,14 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.Layout
-import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.unit.Constraints
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.util.fastForEach
 import androidx.compose.ui.zIndex
 import compose.icons.FontAwesomeIcons
 import compose.icons.fontawesomeicons.Solid
-import compose.icons.fontawesomeicons.solid.At
 import compose.icons.fontawesomeicons.solid.Check
-import compose.icons.fontawesomeicons.solid.CircleInfo
-import compose.icons.fontawesomeicons.solid.Heart
-import compose.icons.fontawesomeicons.solid.Pen
-import compose.icons.fontawesomeicons.solid.QuoteLeft
-import compose.icons.fontawesomeicons.solid.Reply
-import compose.icons.fontawesomeicons.solid.Retweet
-import compose.icons.fontawesomeicons.solid.SquarePollHorizontal
-import compose.icons.fontawesomeicons.solid.Thumbtack
-import compose.icons.fontawesomeicons.solid.UserPlus
 import compose.icons.fontawesomeicons.solid.Xmark
 import dev.dimension.flare.compose.ui.Res
 import dev.dimension.flare.compose.ui.bluesky_notification_item_starterpack_joined
@@ -226,7 +212,6 @@ import dev.dimension.flare.ui.component.platform.PlatformFilledTonalButton
 import dev.dimension.flare.ui.component.platform.PlatformText
 import dev.dimension.flare.ui.component.platform.PlatformTextStyle
 import dev.dimension.flare.ui.model.ClickContext
-import dev.dimension.flare.ui.model.UiIcon
 import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.mapper.MisskeyAchievement
 import dev.dimension.flare.ui.theme.PlatformContentColor
@@ -235,221 +220,37 @@ import dev.dimension.flare.ui.theme.screenHorizontalPadding
 import org.jetbrains.compose.resources.StringResource
 import org.jetbrains.compose.resources.stringResource
 
-// @Composable
-// internal fun UiTimelineComponent(
-//    item: UiTimelineV2,
-//    modifier: Modifier = Modifier,
-//    detailStatusKey: MicroBlogKey? = null,
-//    horizontalPadding: Dp = screenHorizontalPadding,
-// ) {
-//    val bigScreen = isBigScreen()
-//    val appearance = LocalComponentAppearance.current
-//    Column(
-//        modifier = modifier,
-//    ) {
-//        val message =
-//            when (item) {
-//                is UiTimelineV2.Post -> item.message
-//                is UiTimelineV2.User -> item.message
-//                is UiTimelineV2.UserList -> item.message
-//                is UiTimelineV2.Message -> item
-//                is UiTimelineV2.Feed -> null
-//            }
-//        val hasContent = item !is UiTimelineV2.Message
-//        message?.let {
-//            TopMessageComponent(
-//                data = it,
-//                topMessageOnly = !hasContent,
-//                modifier =
-//                    Modifier
-//                        .padding(horizontal = horizontalPadding)
-//                        .let {
-//                            if (!hasContent) {
-//                                it.padding(vertical = 8.dp)
-//                            } else {
-//                                if (!appearance.fullWidthPost) {
-//                                    it.padding(
-//                                        top = 8.dp,
-//                                        start = AvatarComponentDefaults.size - PlatformTheme.typography.caption.fontSize.value.dp,
-//                                    )
-//                                } else {
-//                                    it.padding(top = 8.dp)
-//                                }
-//                            }
-//                        }.fillMaxWidth(),
-//            )
-//        }
-//        if (hasContent) {
-//            val padding =
-//                if (message == null) {
-//                    PaddingValues(
-//                        start = horizontalPadding,
-//                        end = horizontalPadding,
-//                        bottom = 8.dp,
-//                        top = if (bigScreen) 16.dp else 8.dp,
-//                    )
-//                } else {
-//                    PaddingValues(
-//                        start = horizontalPadding,
-//                        end = horizontalPadding,
-//                        bottom = 8.dp,
-//                        top = 8.dp,
-//                    )
-//                }
-//            ItemContentComponent(
-//                item = item,
-//                detailStatusKey = detailStatusKey,
-//                paddingValues = padding,
-//            )
-//        }
-//    }
-// }
-
 @Composable
 internal fun UiTimelineComponent(
     item: UiTimelineV2,
     modifier: Modifier = Modifier,
     detailStatusKey: MicroBlogKey? = null,
-    horizontalPadding: Dp = screenHorizontalPadding,
 ) {
-    val uriHandler = LocalUriHandler.current
     when (item) {
         is UiTimelineV2.Post ->
             StatusContent(
                 data = item,
                 detailStatusKey = detailStatusKey,
-                paddingValues =
-                    PaddingValues(
-                        start = horizontalPadding,
-                        end = horizontalPadding,
-                        bottom = 8.dp,
-                        top = 8.dp,
-                    ),
                 modifier = modifier,
             )
 
         is UiTimelineV2.User -> {
-            Column(
+            UserContent(
+                item,
                 modifier =
-                    modifier
-                        .padding(
-                            PaddingValues(
-                                start = horizontalPadding,
-                                end = horizontalPadding,
-                                bottom = 8.dp,
-                                top = 8.dp,
-                            ),
-                        ),
-                verticalArrangement = Arrangement.spacedBy(8.dp),
-            ) {
-                item.message?.let { message ->
-                    TopMessageComponent(
-                        data = message,
-                        topMessageOnly = false,
-                        modifier =
-                            Modifier
-                                .fillMaxWidth()
-                                .padding(top = 8.dp),
-                    )
-                }
-                CommonStatusHeaderComponent(
-                    data = item.value,
-                    onUserClick = {
-                        item.value.onClicked.invoke(
-                            ClickContext(
-                                launcher = {
-                                    uriHandler.openUri(it)
-                                },
-                            ),
-                        )
-                    },
-                )
-                if (item.button.isNotEmpty()) {
-                    Row(
-                        horizontalArrangement = Arrangement.spacedBy(8.dp),
-                    ) {
-                        item.button.fastForEach { button ->
-                            when ((button.text as? ActionMenu.Item.Text.Localized)?.type) {
-                                ActionMenu.Item.Text.Localized.Type.AcceptFollowRequest ->
-                                    PlatformFilledTonalButton(
-                                        onClick = {
-                                            button.onClicked.invoke(
-                                                ClickContext(
-                                                    launcher = {
-                                                        uriHandler.openUri(it)
-                                                    },
-                                                ),
-                                            )
-                                        },
-                                    ) {
-                                        FAIcon(
-                                            FontAwesomeIcons.Solid.Check,
-                                            contentDescription =
-                                                stringResource(
-                                                    Res.string.notification_item_accept_follow_request,
-                                                ),
-                                        )
-                                        Spacer(modifier = Modifier.width(8.dp))
-                                        PlatformText(
-                                            text =
-                                                stringResource(
-                                                    Res.string.notification_item_accept_follow_request,
-                                                ),
-                                        )
-                                    }
-                                ActionMenu.Item.Text.Localized.Type.RejectFollowRequest -> {
-                                    PlatformButton(
-                                        onClick = {
-                                            button.onClicked.invoke(
-                                                ClickContext(
-                                                    launcher = {
-                                                        uriHandler.openUri(it)
-                                                    },
-                                                ),
-                                            )
-                                        },
-                                        content = {
-                                            FAIcon(
-                                                FontAwesomeIcons.Solid.Xmark,
-                                                contentDescription =
-                                                    stringResource(
-                                                        Res.string.notification_item_reject_follow_request,
-                                                    ),
-                                                tint = PlatformTheme.colorScheme.error,
-                                            )
-                                            Spacer(modifier = Modifier.width(8.dp))
-                                            PlatformText(
-                                                text =
-                                                    stringResource(
-                                                        Res.string.notification_item_reject_follow_request,
-                                                    ),
-                                                color = PlatformTheme.colorScheme.error,
-                                            )
-                                        },
-                                    )
-                                }
-
-                                else -> Unit
-                            }
-                        }
-                    }
-                }
-            }
+                    Modifier
+                        .padding(horizontal = screenHorizontalPadding)
+                        .padding(vertical = 8.dp),
+            )
         }
 
         is UiTimelineV2.UserList ->
             UserListContent(
                 data = item,
                 modifier =
-                    modifier
-                        .padding(
-                            PaddingValues(
-                                start = horizontalPadding,
-                                end = horizontalPadding,
-                                bottom = 8.dp,
-                                top = 8.dp,
-                            ),
-                        ),
+                    Modifier
+                        .padding(horizontal = screenHorizontalPadding)
+                        .padding(vertical = 8.dp),
             )
 
         is UiTimelineV2.Feed -> {
@@ -465,13 +266,118 @@ internal fun UiTimelineComponent(
                 topMessageOnly = true,
                 modifier =
                     Modifier
-                        .padding(horizontal = horizontalPadding)
+                        .padding(horizontal = screenHorizontalPadding)
                         .padding(vertical = 8.dp)
                         .fillMaxWidth(),
             )
     }
 }
 
+@Composable
+private fun UserContent(
+    item: UiTimelineV2.User,
+    modifier: Modifier = Modifier,
+) {
+    val uriHandler = LocalUriHandler.current
+    Column(
+        modifier = modifier,
+        verticalArrangement = Arrangement.spacedBy(8.dp),
+    ) {
+        item.message?.let { message ->
+            TopMessageComponent(
+                data = message,
+                topMessageOnly = false,
+                modifier =
+                    Modifier
+                        .fillMaxWidth(),
+            )
+        }
+        CommonStatusHeaderComponent(
+            data = item.value,
+            onUserClick = {
+                item.value.onClicked.invoke(
+                    ClickContext(
+                        launcher = {
+                            uriHandler.openUri(it)
+                        },
+                    ),
+                )
+            },
+        )
+        if (item.button.isNotEmpty()) {
+            Row(
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
+            ) {
+                item.button.fastForEach { button ->
+                    when ((button.text as? ActionMenu.Item.Text.Localized)?.type) {
+                        ActionMenu.Item.Text.Localized.Type.AcceptFollowRequest ->
+                            PlatformFilledTonalButton(
+                                onClick = {
+                                    button.onClicked.invoke(
+                                        ClickContext(
+                                            launcher = {
+                                                uriHandler.openUri(it)
+                                            },
+                                        ),
+                                    )
+                                },
+                            ) {
+                                FAIcon(
+                                    FontAwesomeIcons.Solid.Check,
+                                    contentDescription =
+                                        stringResource(
+                                            Res.string.notification_item_accept_follow_request,
+                                        ),
+                                )
+                                Spacer(modifier = Modifier.width(8.dp))
+                                PlatformText(
+                                    text =
+                                        stringResource(
+                                            Res.string.notification_item_accept_follow_request,
+                                        ),
+                                )
+                            }
+
+                        ActionMenu.Item.Text.Localized.Type.RejectFollowRequest -> {
+                            PlatformButton(
+                                onClick = {
+                                    button.onClicked.invoke(
+                                        ClickContext(
+                                            launcher = {
+                                                uriHandler.openUri(it)
+                                            },
+                                        ),
+                                    )
+                                },
+                                content = {
+                                    FAIcon(
+                                        FontAwesomeIcons.Solid.Xmark,
+                                        contentDescription =
+                                            stringResource(
+                                                Res.string.notification_item_reject_follow_request,
+                                            ),
+                                        tint = PlatformTheme.colorScheme.error,
+                                    )
+                                    Spacer(modifier = Modifier.width(8.dp))
+                                    PlatformText(
+                                        text =
+                                            stringResource(
+                                                Res.string.notification_item_reject_follow_request,
+                                            ),
+                                        color = PlatformTheme.colorScheme.error,
+                                    )
+                                },
+                            )
+                        }
+
+                        else -> Unit
+                    }
+                }
+            }
+        }
+    }
+}
+
 @Composable
 private fun UserListContent(
     data: UiTimelineV2.UserList,
@@ -489,7 +395,7 @@ private fun UserListContent(
                 modifier =
                     Modifier
                         .fillMaxWidth()
-                        .padding(top = 8.dp),
+                        .padding(),
             )
         }
         LazyRow(
@@ -547,7 +453,6 @@ private fun StatusContent(
     data: UiTimelineV2.Post,
     detailStatusKey: MicroBlogKey?,
     modifier: Modifier = Modifier,
-    paddingValues: PaddingValues = PaddingValues(0.dp),
 ) {
     Column(
         modifier = modifier,
@@ -557,7 +462,10 @@ private fun StatusContent(
             Layout(
                 content = {
                     CompositionLocalProvider(
-                        LocalComponentAppearance provides LocalComponentAppearance.current.copy(fullWidthPost = false),
+                        LocalComponentAppearance provides
+                            LocalComponentAppearance.current.copy(
+                                fullWidthPost = false,
+                            ),
                     ) {
                         Column(
                             verticalArrangement = Arrangement.spacedBy(2.dp),
@@ -566,7 +474,11 @@ private fun StatusContent(
                                 CommonStatusComponent(
                                     item = it,
                                     isDetail = false,
-                                    modifier = Modifier.padding(paddingValues),
+                                    modifier =
+                                        Modifier.padding(
+                                            horizontal = screenHorizontalPadding,
+                                            vertical = 8.dp,
+                                        ),
                                 )
                             }
                         }
@@ -576,7 +488,7 @@ private fun StatusContent(
                             Modifier
                                 .zIndex(-1f)
                                 .padding(
-                                    start = paddingValues.calculateStartPadding(LocalLayoutDirection.current),
+                                    start = screenHorizontalPadding,
                                 ).padding(start = AvatarComponentDefaults.size / 2)
                                 .offset(y = AvatarComponentDefaults.size / 2),
                     )
@@ -615,13 +527,21 @@ private fun StatusContent(
                     modifier =
                         Modifier
                             .fillMaxWidth()
-                            .padding(top = 8.dp, bottom = 4.dp),
+                            .padding(top = 8.dp)
+                            .padding(
+                                horizontal = screenHorizontalPadding,
+                            ),
                 )
             }
             CommonStatusComponent(
                 item = data,
                 isDetail = detailStatusKey?.toString()?.let(data.itemKey::contains) == true,
-                modifier = Modifier.padding(paddingValues),
+                modifier =
+                    Modifier
+                        .padding(
+                            horizontal = screenHorizontalPadding,
+                            vertical = 8.dp,
+                        ),
             )
         }
     }
@@ -635,7 +555,7 @@ private fun TopMessageComponent(
 ) {
     val appearance = LocalComponentAppearance.current
     val uriHandler = LocalUriHandler.current
-    val icon = data.icon.toTopMessageIcon()
+    val icon = data.icon.toImageVector()
     val text: String? =
         when (val type = data.type) {
             is UiTimelineV2.Message.Type.Raw -> type.content
@@ -684,8 +604,8 @@ private fun TopMessageComponent(
                         }.getOrNull()?.let { achievement ->
                             stringResource(
                                 resource = Res.string.misskey_notification_item_achievement_earned,
-                                achievement.titleResId,
-                                achievement.descriptionResId,
+                                stringResource(achievement.titleResId),
+                                stringResource(achievement.descriptionResId),
                             )
                         }
                             ?: stringResource(
@@ -747,21 +667,6 @@ private fun TopMessageComponent(
     }
 }
 
-private fun UiIcon.toTopMessageIcon() =
-    when (this) {
-        UiIcon.Retweet -> FontAwesomeIcons.Solid.Retweet
-        UiIcon.Follow -> FontAwesomeIcons.Solid.UserPlus
-        UiIcon.Favourite -> FontAwesomeIcons.Solid.Heart
-        UiIcon.Mention -> FontAwesomeIcons.Solid.At
-        UiIcon.Poll -> FontAwesomeIcons.Solid.SquarePollHorizontal
-        UiIcon.Edit -> FontAwesomeIcons.Solid.Pen
-        UiIcon.Info -> FontAwesomeIcons.Solid.CircleInfo
-        UiIcon.Reply -> FontAwesomeIcons.Solid.Reply
-        UiIcon.Quote -> FontAwesomeIcons.Solid.QuoteLeft
-        UiIcon.Pin -> FontAwesomeIcons.Solid.Thumbtack
-        else -> FontAwesomeIcons.Solid.CircleInfo
-    }
-
 private val MisskeyAchievement.titleResId: StringResource
     get() =
         when (this) {
@@ -910,6 +815,7 @@ private val MisskeyAchievement.descriptionResId: StringResource
             MisskeyAchievement.VIEW_INSTANCE_CHART -> Res.string.misskey_achievement_view_instance_chart_description
             MisskeyAchievement.OUTPUT_HELLO_WORLD_ON_SCRATCHPAD ->
                 Res.string.misskey_achievement_output_hello_world_on_scratchpad_description
+
             MisskeyAchievement.OPEN3WINDOWS -> Res.string.misskey_achievement_open3windows_description
             MisskeyAchievement.DRIVE_FOLDER_CIRCULAR_REFERENCE -> Res.string.misskey_achievement_drive_folder_circular_reference_description
             MisskeyAchievement.REACT_WITHOUT_READ -> Res.string.misskey_achievement_react_without_read_description
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
index e88c30c54..29751716f 100644
--- 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
@@ -74,6 +74,7 @@ import dev.dimension.flare.data.datasource.microblog.handler.UserHandler
 import dev.dimension.flare.data.datasource.microblog.loader.ListLoader
 import dev.dimension.flare.data.datasource.microblog.loader.ListMemberLoader
 import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
+import dev.dimension.flare.data.datasource.microblog.paging.notSupported
 import dev.dimension.flare.data.datasource.microblog.pagingConfig
 import dev.dimension.flare.data.network.bluesky.BlueskyService
 import dev.dimension.flare.data.network.bluesky.model.DidDoc
@@ -250,7 +251,7 @@ internal class BlueskyDataSource(
                     },
                 )
 
-            else -> throw IllegalArgumentException("Unsupported notification filter")
+            else -> notSupported()
         }
 
     override val supportedNotificationFilter: List<NotificationFilter>
@@ -758,9 +759,6 @@ internal class BlueskyDataSource(
         )
     }
 
-    private val notificationMarkerKey: String
-        get() = "notificationBadgeCount_$accountKey"
-
     override fun directMessageList(scope: CoroutineScope): Flow<PagingData<UiDMRoom>> =
         Pager(
             config = pagingConfig,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt
index e40d5b925..365c927a5 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt
@@ -27,6 +27,7 @@ import dev.dimension.flare.data.datasource.microblog.handler.UserHandler
 import dev.dimension.flare.data.datasource.microblog.loader.ListLoader
 import dev.dimension.flare.data.datasource.microblog.loader.ListMemberLoader
 import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
+import dev.dimension.flare.data.datasource.microblog.paging.notSupported
 import dev.dimension.flare.data.datasource.pleroma.PleromaDataSource
 import dev.dimension.flare.data.network.mastodon.MastodonService
 import dev.dimension.flare.data.network.mastodon.api.model.PostPoll
@@ -193,7 +194,7 @@ internal open class MastodonDataSource(
                     accountKey,
                 )
 
-            else -> throw IllegalStateException("Unsupported notification type")
+            else -> notSupported()
         }
 
     override val supportedNotificationFilter: List<NotificationFilter>
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostEventHandler.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostEventHandler.kt
index 72796f0c8..3d87f0d25 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostEventHandler.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostEventHandler.kt
@@ -181,7 +181,14 @@ internal class PostEventHandler(
                 if (it is ActionMenu.Item && it.updateKey.isNotEmpty() && it.updateKey == newActionMenu.updateKey) {
                     newActionMenu
                 } else if (it is ActionMenu.Group) {
+                    val updatedDisplayItem =
+                        if (it.displayItem.updateKey.isNotEmpty() && it.displayItem.updateKey == newActionMenu.updateKey) {
+                            newActionMenu
+                        } else {
+                            it.displayItem
+                        }
                     it.copy(
+                        displayItem = updatedDisplayItem,
                         actions = findAndReplaceActionMenu(it.actions, newActionMenu),
                     )
                 } else {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/RemoteLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/RemoteLoader.kt
index c29e8db8e..10af34db5 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/RemoteLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/RemoteLoader.kt
@@ -10,6 +10,15 @@ internal interface RemoteLoader<T : Any> {
     ): PagingResult<T>
 }
 
+internal fun <T : Any> notSupported(): RemoteLoader<T> = NotSupportRemoteLoader()
+
+internal class NotSupportRemoteLoader<T : Any> : RemoteLoader<T> {
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<T> = PagingResult(endOfPaginationReached = true)
+}
+
 internal fun <T : Any> RemoteLoader<T>.toPagingSource() =
     object : PagingSource<String, T>() {
         override suspend fun load(params: LoadParams<String>): LoadResult<String, T> {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelinePagingMapper.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelinePagingMapper.kt
index 64c79f690..b4d88c475 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelinePagingMapper.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelinePagingMapper.kt
@@ -51,7 +51,16 @@ internal object TimelinePagingMapper {
                                             referenceType = ReferenceType.Reply,
                                             rootStatusKey = data.statusKey,
                                         )
-                                    }
+                                    } +
+                                    listOfNotNull(
+                                        data.internalRepost?.let {
+                                            uiTimelineToDbStatusReferenceWithStatus(
+                                                data = it,
+                                                referenceType = ReferenceType.Retweet,
+                                                rootStatusKey = data.statusKey,
+                                            )
+                                        },
+                                    )
 
                             is UiTimelineV2.User -> emptyList()
                             is UiTimelineV2.UserList ->
@@ -75,36 +84,76 @@ internal object TimelinePagingMapper {
     ): UiTimelineV2 {
         val root = dbStatusWithUserToUiTimeline(item.status.status, pagingKey, useDbKeyInItemKey)
         val references =
-            item.status.references
-                .mapNotNull { it.status }
-                .map { dbStatusWithUserToUiTimeline(it, pagingKey, useDbKeyInItemKey) }
+            item.status.references.mapNotNull { reference ->
+                reference.status?.let {
+                    reference.reference.referenceType to
+                        dbStatusWithUserToUiTimeline(
+                            it,
+                            pagingKey,
+                            useDbKeyInItemKey,
+                        )
+                }
+            }
         return when (root) {
             is UiTimelineV2.Feed -> root
             is UiTimelineV2.Message -> root
-            is UiTimelineV2.Post ->
-                root.copy(
-                    parents =
-                        root.parents
-                            .map { parent ->
-                                references.find { it.statusKey == parent.statusKey } as? UiTimelineV2.Post ?: parent
-                            }.toImmutableList(),
-                    quote =
-                        root.quote
-                            .map { quote ->
-                                references.find { it.statusKey == quote.statusKey } as? UiTimelineV2.Post ?: quote
-                            }.toImmutableList(),
-                )
+            is UiTimelineV2.Post -> {
+                val resolvedRoot =
+                    root.resolveReferences(
+                        references = references,
+                    )
+                val repost =
+                    (references.find { it.first == ReferenceType.Retweet }?.second as? UiTimelineV2.Post)
+                        ?: resolvedRoot.internalRepost
+                val resolvedRepost =
+                    repost?.resolveReferences(
+                        references = references,
+                    )
+                if (resolvedRepost != null) {
+                    resolvedRepost.copy(
+                        internalRepost = resolvedRepost,
+                        statusKey = resolvedRoot.statusKey,
+                        message = resolvedRoot.message,
+                    )
+                } else {
+                    resolvedRoot
+                }
+            }
             is UiTimelineV2.User -> root
             is UiTimelineV2.UserList ->
                 root.copy(
                     post =
                         root.post?.let { post ->
-                            references.find { it.statusKey == post.statusKey } as? UiTimelineV2.Post ?: post
+                            references.map { it.second }.find { it.statusKey == post.statusKey } as? UiTimelineV2.Post ?: post
                         },
                 )
         }
     }
 
+    private fun UiTimelineV2.Post.resolveReferences(references: List<Pair<ReferenceType, UiTimelineV2>>): UiTimelineV2.Post =
+        copy(
+            parents =
+                parents
+                    .map { parent ->
+                        references
+                            .find { it.first == ReferenceType.Reply && it.second.statusKey == parent.statusKey }
+                            ?.second as? UiTimelineV2.Post ?: parent
+                    }.toImmutableList(),
+            quote =
+                quote
+                    .map { quote ->
+                        references
+                            .find { it.first == ReferenceType.Quote && it.second.statusKey == quote.statusKey }
+                            ?.second as? UiTimelineV2.Post ?: quote
+                    }.toImmutableList(),
+            internalRepost =
+                internalRepost?.let { repost ->
+                    references
+                        .find { it.first == ReferenceType.Retweet && it.second.statusKey == repost.statusKey }
+                        ?.second as? UiTimelineV2.Post ?: repost
+                },
+        )
+
     private fun uiTimelineToDbStatusReferenceWithStatus(
         data: UiTimelineV2,
         referenceType: ReferenceType,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
index eea38dc1e..0054b2cb2 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
@@ -32,6 +32,7 @@ import dev.dimension.flare.data.datasource.microblog.loader.ListMemberLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
+import dev.dimension.flare.data.datasource.microblog.paging.notSupported
 import dev.dimension.flare.data.datasource.microblog.paging.toPagingSource
 import dev.dimension.flare.data.datasource.microblog.pagingConfig
 import dev.dimension.flare.data.network.misskey.api.model.AdminAccountsDeleteRequest
@@ -368,7 +369,7 @@ internal class MisskeyDataSource(
                     service,
                 )
 
-            else -> throw IllegalStateException("Unsupported notification type")
+            else -> notSupported()
         }
 
     override val supportedNotificationFilter: List<NotificationFilter>
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt
index f2d9891b1..2c4d46e40 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt
@@ -150,7 +150,7 @@ internal class VVODataSource(
                     service = service,
                     accountKey = accountKey,
                     onClearMarker = {
-                        MemCacheable.update(notificationMarkerMentionKey, 0)
+                        notificationHandler.clear()
                     },
                 )
 
@@ -159,7 +159,7 @@ internal class VVODataSource(
                     service = service,
                     accountKey = accountKey,
                     onClearMarker = {
-                        MemCacheable.update(notificationMarkerCommentKey, 0)
+                        notificationHandler.clear()
                     },
                 )
 
@@ -168,7 +168,7 @@ internal class VVODataSource(
                     service = service,
                     accountKey = accountKey,
                     onClearMarker = {
-                        MemCacheable.update(notificationMarkerLikeKey, 0)
+                        notificationHandler.clear()
                     },
                 )
         }
@@ -487,13 +487,4 @@ internal class VVODataSource(
 
         return json.firstOrNull()?.status?.render(accountKey) ?: throw Exception("status not found")
     }
-
-    private val notificationMarkerMentionKey: String
-        get() = "notificationBadgeCount_mention_$accountKey"
-
-    private val notificationMarkerCommentKey: String
-        get() = "notificationBadgeCount_comment_$accountKey"
-
-    private val notificationMarkerLikeKey: String
-        get() = "notificationBadgeCount_like_$accountKey"
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/NotificationPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/NotificationPagingSource.kt
index bd7201a48..f52a8daac 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/NotificationPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/NotificationPagingSource.kt
@@ -1,9 +1,9 @@
 package dev.dimension.flare.data.datasource.xqt
 
 import dev.dimension.flare.data.database.cache.mapper.cursor
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
-import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.xqt.XQTService
 import dev.dimension.flare.data.network.xqt.model.CursorType
 import dev.dimension.flare.model.MicroBlogKey
@@ -15,7 +15,9 @@ internal class NotificationPagingSource(
     private val service: XQTService,
     private val accountKey: MicroBlogKey,
     private val onClearMarker: () -> Unit,
-) : RemoteLoader<UiTimelineV2> {
+) : CacheableRemoteLoader<UiTimelineV2> {
+    override val pagingKey: String = "notification_$accountKey"
+
     override suspend fun load(
         pageSize: Int,
         request: PagingRequest,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/network/vvo/model/TimelineData.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/network/vvo/model/TimelineData.kt
index 095c67ab6..121c6ab5b 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/network/vvo/model/TimelineData.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/network/vvo/model/TimelineData.kt
@@ -515,7 +515,7 @@ internal object VVODateSerializer : KSerializer<Instant> {
                     },
             )
         }.getOrElse {
-            Instant.parse(str)
+            Instant.parseOrNull(str) ?: Instant.DISTANT_PAST
         }
     }
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
index c58a7d260..0c118b510 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
@@ -11,6 +11,7 @@ import dev.dimension.flare.ui.render.UiDateTime
 import dev.dimension.flare.ui.render.UiRichText
 import dev.dimension.flare.ui.route.DeeplinkRoute
 import kotlinx.collections.immutable.persistentListOf
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlin.time.Instant
 
@@ -45,6 +46,7 @@ public sealed class UiTimelineV2 {
         val user: UiProfile? = null,
         override val statusKey: MicroBlogKey,
         val icon: UiIcon,
+        @SerialName("messageType")
         val type: Type,
         override val createdAt: UiDateTime,
         private val clickEvent: ClickEvent,
@@ -189,7 +191,8 @@ public sealed class UiTimelineV2 {
         val visibility: Visibility? = null,
         val replyToHandle: String? = null,
         val parents: SerializableImmutableList<Post> = persistentListOf(),
-        private val clickEvent: ClickEvent,
+        internal val internalRepost: Post? = null,
+        internal val clickEvent: ClickEvent,
         override val extraKey: String? = null,
         override val accountType: AccountType,
     ) : UiTimelineV2() {
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
index b5516b82e..153573271 100644
--- 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
@@ -629,7 +629,11 @@ private fun FeedViewPost.render(accountKey: MicroBlogKey): UiTimelineV2 {
         }
     val postForTimeline =
         when (reason) {
-            is FeedViewPostReasonUnion.ReasonRepost -> renderedPost.copy(statusKey = message?.statusKey ?: renderedPost.statusKey)
+            is FeedViewPostReasonUnion.ReasonRepost ->
+                renderedPost.copy(
+                    statusKey = message?.statusKey ?: renderedPost.statusKey,
+                    internalRepost = renderedPost,
+                )
             else -> renderedPost
         }
 
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
index 1b347be83..018b9c105 100644
--- 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
@@ -237,17 +237,18 @@ internal fun Status.render(
         } else {
             null
         }
-    val actualStatus =
-        if (reblog != null) {
-            reblog
-                .renderStatus(
+    return if (reblog != null) {
+        currentStatus.copy(
+            message = topMessage,
+            internalRepost =
+                reblog.renderStatus(
                     host = host,
                     accountKey = accountKey,
-                ).copy(statusKey = currentStatus.statusKey)
-        } else {
-            currentStatus
-        }
-    return actualStatus.copy(message = topMessage)
+                ),
+        )
+    } else {
+        currentStatus.copy(message = topMessage)
+    }
 }
 
 private fun Status.renderStatus(
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt
index 45b9875cf..82d62b8a2 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt
@@ -82,29 +82,40 @@ internal fun Notification.render(accountKey: MicroBlogKey): UiTimelineV2 {
         when (notificationType) {
             NotificationType.Follow ->
                 UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.Follow)
+
             NotificationType.Mention ->
                 UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.Mention)
+
             NotificationType.Reply ->
                 UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.Reply)
+
             NotificationType.Renote ->
                 UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.Repost)
+
             NotificationType.Quote ->
                 UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.Quote)
+
             NotificationType.Reaction ->
                 UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.Reaction)
+
             NotificationType.PollEnded ->
                 UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.PollEnded)
+
             NotificationType.ReceiveFollowRequest ->
                 UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.FollowRequest)
+
             NotificationType.FollowRequestAccepted ->
                 UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.FollowRequestAccepted)
+
             NotificationType.AchievementEarned ->
                 UiTimelineV2.Message.Type.Localized(
                     UiTimelineV2.Message.Type.Localized.MessageId.AchievementEarned,
-                    listOfNotNull(achievement).toPersistentList(),
+                    listOfNotNull(achievement?.let { MisskeyAchievement.fromString(it) }?.name).toPersistentList(),
                 )
+
             NotificationType.App ->
                 UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.App)
+
             else -> UiTimelineV2.Message.Type.Unknown(rawType = type)
         }
     val message =
@@ -140,7 +151,13 @@ internal fun Notification.render(accountKey: MicroBlogKey): UiTimelineV2 {
             accountType = accountKey.toAccountType(),
         )
 
-    if (notificationType in listOf(NotificationType.Follow, NotificationType.FollowRequestAccepted) && user != null) {
+    if (notificationType in
+        listOf(
+            NotificationType.Follow,
+            NotificationType.FollowRequestAccepted,
+        ) &&
+        user != null
+    ) {
         return UiTimelineV2.User(
             message = message,
             value = user,
@@ -309,12 +326,6 @@ internal fun Note.render(accountKey: MicroBlogKey): UiTimelineV2 {
         } else {
             renote ?: this
         }
-    val status =
-        if (actualStatus !== this) {
-            actualStatus.renderStatus(accountKey).copy(statusKey = wrapperStatus.statusKey)
-        } else {
-            wrapperStatus
-        }
     val topMessage =
         if (actualStatus !== this) {
             val user = user.render(accountKey)
@@ -322,8 +333,8 @@ internal fun Note.render(accountKey: MicroBlogKey): UiTimelineV2 {
                 user = user,
                 icon = UiIcon.Retweet,
                 type = UiTimelineV2.Message.Type.Localized(UiTimelineV2.Message.Type.Localized.MessageId.Repost),
-                statusKey = status.statusKey,
-                createdAt = status.createdAt,
+                statusKey = wrapperStatus.statusKey,
+                createdAt = wrapperStatus.createdAt,
                 clickEvent =
                     ClickEvent.Deeplink(
                         DeeplinkRoute.Profile.User(
@@ -336,7 +347,14 @@ internal fun Note.render(accountKey: MicroBlogKey): UiTimelineV2 {
         } else {
             null
         }
-    return status.copy(message = topMessage)
+    return if (actualStatus !== this) {
+        wrapperStatus.copy(
+            message = topMessage,
+            internalRepost = actualStatus.renderStatus(accountKey),
+        )
+    } else {
+        wrapperStatus.copy(message = topMessage)
+    }
 }
 
 private fun Note.renderStatus(accountKey: MicroBlogKey): UiTimelineV2.Post {
@@ -542,7 +560,10 @@ private fun Note.renderStatus(accountKey: MicroBlogKey): UiTimelineV2.Post {
                                             ClickEvent.Deeplink(
                                                 DeeplinkRoute.Status
                                                     .DeleteConfirm(
-                                                        accountType = AccountType.Specific(accountKey),
+                                                        accountType =
+                                                            AccountType.Specific(
+                                                                accountKey,
+                                                            ),
                                                         statusKey = statusKey,
                                                     ),
                                             ),
@@ -569,7 +590,10 @@ private fun Note.renderStatus(accountKey: MicroBlogKey): UiTimelineV2.Post {
                                                     .MisskeyReport(
                                                         statusKey = statusKey,
                                                         userKey = user.key,
-                                                        accountType = AccountType.Specific(accountKey),
+                                                        accountType =
+                                                            AccountType.Specific(
+                                                                accountKey,
+                                                            ),
                                                     ),
                                             ),
                                     ),
@@ -682,7 +706,9 @@ internal fun ActionMenu.Companion.misskeyReact(
                     DeeplinkRoute.Status
                         .AddReaction(
                             statusKey = postKey,
-                            accountType = accountKey?.let { AccountType.Specific(it) } ?: AccountType.Guest,
+                            accountType =
+                                accountKey?.let { AccountType.Specific(it) }
+                                    ?: AccountType.Guest,
                         ),
                 )
             } else {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/VVO.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/VVO.kt
index 7246befd3..c75adc7f4 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/VVO.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/VVO.kt
@@ -5,7 +5,6 @@ import com.fleeksoft.ksoup.nodes.Node
 import com.fleeksoft.ksoup.nodes.TextNode
 import dev.dimension.flare.data.datasource.microblog.ActionMenu
 import dev.dimension.flare.data.datasource.microblog.PostEvent
-import dev.dimension.flare.data.datasource.microblog.userActionsMenu
 import dev.dimension.flare.data.network.vvo.model.Attitude
 import dev.dimension.flare.data.network.vvo.model.Comment
 import dev.dimension.flare.data.network.vvo.model.Status
@@ -163,8 +162,27 @@ private fun Status.renderStatusV2(accountKey: MicroBlogKey): UiTimelineV2.Post {
             append('/')
             append(bid)
         }
+    val message =
+        title?.text?.let {
+            UiTimelineV2.Message(
+                user = displayUser,
+                statusKey = statusKey,
+                icon = UiIcon.Info,
+                type = UiTimelineV2.Message.Type.Raw(it),
+                createdAt = createdAt?.toUi() ?: Clock.System.now().toUi(),
+                clickEvent =
+                    ClickEvent.Deeplink(
+                        DeeplinkRoute.Status.VVOStatus(
+                            statusKey = statusKey,
+                            accountType = AccountType.Specific(accountKey),
+                        ),
+                    ),
+                accountType = AccountType.Specific(accountKey),
+            )
+        }
 
     return UiTimelineV2.Post(
+        message = message,
         platformType = PlatformType.VVo,
         images = actualMedia.toImmutableList(),
         sensitive = false,
@@ -247,13 +265,13 @@ private fun Status.renderStatusV2(accountKey: MicroBlogKey): UiTimelineV2.Post {
                                         ),
                                 )
                             } else {
-                                null
+                                ActionMenu.Item(
+                                    icon = UiIcon.Report,
+                                    text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.Report),
+                                    color = ActionMenu.Item.Color.Red,
+                                    clickEvent = ClickEvent.Noop,
+                                )
                             },
-                            *userActionsMenu(
-                                accountKey = accountKey,
-                                userKey = user?.key ?: statusKey,
-                                handle = user?.handle?.canonical ?: "",
-                            ).toTypedArray(),
                         ).toImmutableList(),
                 ),
             ).toImmutableList(),
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt
index 33042e099..b564edf03 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt
@@ -286,7 +286,12 @@ internal fun Tweet.render(accountKey: MicroBlogKey): UiTimelineV2.Post {
     val quote = quoteUnion?.toTweetOrNull()?.renderStatus(accountKey = accountKey)
     val retweet = retweetUnion?.toTweetOrNull()?.renderStatus(accountKey, quote = quote)
     val currentTweet = renderStatus(accountKey, quote = quote)
-    val actualTweet = if (retweet != null) retweet.copy(statusKey = currentTweet.statusKey) else currentTweet
+    val actualTweet =
+        if (retweet != null) {
+            currentTweet.copy(internalRepost = retweet)
+        } else {
+            currentTweet
+        }
     val user = currentTweet.user
     val message =
         if (retweet != null && user != null) {
@@ -347,7 +352,12 @@ internal fun XQTTimeline.render(accountKey: MicroBlogKey): UiTimelineV2? {
                 accountKey = accountKey,
                 quote = quote,
             )
-    val actualTweet = if (retweet != null) retweet.copy(statusKey = currentTweet.statusKey) else currentTweet
+    val actualTweet =
+        if (retweet != null) {
+            currentTweet.copy(internalRepost = retweet)
+        } else {
+            currentTweet
+        }
     val user = currentTweet.user
     val message =
         if (retweet != null && user != null) {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/AllNotificationPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/AllNotificationPresenter.kt
index 5b4c34809..037095d83 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/AllNotificationPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/AllNotificationPresenter.kt
@@ -5,23 +5,16 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.runtime.snapshotFlow
-import androidx.paging.Pager
-import androidx.paging.compose.collectAsLazyPagingItems
 import dev.dimension.flare.common.CacheState
 import dev.dimension.flare.common.PagingState
 import dev.dimension.flare.common.combineLatestFlowLists
 import dev.dimension.flare.common.refreshSuspend
-import dev.dimension.flare.common.toPagingState
 import dev.dimension.flare.data.datasource.microblog.AuthenticatedMicroblogDataSource
 import dev.dimension.flare.data.datasource.microblog.NotificationFilter
 import dev.dimension.flare.data.datasource.microblog.datasource.NotificationDataSource
 import dev.dimension.flare.data.datasource.microblog.datasource.UserDataSource
-import dev.dimension.flare.data.datasource.microblog.paging.toPagingSource
-import dev.dimension.flare.data.datasource.microblog.pagingConfig
+import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceFlow
 import dev.dimension.flare.model.AccountType
@@ -37,8 +30,10 @@ import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
@@ -50,6 +45,8 @@ public class AllNotificationPresenter :
     PresenterBase<AllNotificationPresenter.State>(),
     KoinComponent {
     private val accountRepository: AccountRepository by inject()
+    private val selectedAccountFlow = MutableStateFlow<UiProfile?>(null)
+    private val selectedNotificationFilterFlow = MutableStateFlow<NotificationFilter?>(null)
 
     @androidx.compose.runtime.Immutable
     public interface State {
@@ -116,64 +113,72 @@ public class AllNotificationPresenter :
             }
     }
 
+    @OptIn(ExperimentalCoroutinesApi::class)
+    private val notificationFiltersFlow by lazy {
+        selectedAccountFlow
+            .filterNotNull()
+            .distinctUntilChanged()
+            .flatMapLatest {
+                accountServiceFlow(AccountType.Specific(it.key), accountRepository)
+            }.map {
+                require(it is AuthenticatedMicroblogDataSource)
+                it.supportedNotificationFilter.toImmutableList()
+            }.distinctUntilChanged()
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    private val timelinePresenter by lazy {
+        object : TimelinePresenter() {
+            override val loader: Flow<RemoteLoader<UiTimelineV2>> by lazy {
+                combine(
+                    selectedNotificationFilterFlow.filterNotNull(),
+                    selectedAccountFlow.filterNotNull(),
+                ) { filter, profile -> filter to profile.key }
+                    .distinctUntilChanged()
+                    .flatMapLatest { (filter, accountKey) ->
+                        accountServiceFlow(AccountType.Specific(accountKey), accountRepository)
+                            .map {
+                                require(it is AuthenticatedMicroblogDataSource)
+                                it.notification(filter)
+                            }.distinctUntilChanged()
+                    }
+            }
+        }
+    }
+
     @OptIn(ExperimentalCoroutinesApi::class)
     @Composable
     override fun body(): State {
         val notifications by accountsNotificationFlow.collectAsState(persistentMapOf())
-        var selectedAccount by remember {
-            mutableStateOf<UiProfile?>(null)
-        }
+        val selectedAccount by selectedAccountFlow.collectAsState()
         val selectedAccountIndex by remember {
             derivedStateOf {
                 val maxIndex = (notifications.size - 1).coerceAtLeast(0)
                 selectedAccount?.let { profile ->
-                    notifications.keys.indexOf(profile).coerceIn(0, maxIndex)
+                    notifications.keys
+                        .map { it.key }
+                        .indexOf(profile.key)
+                        .coerceIn(0, maxIndex)
                 } ?: 0
             }
         }
-        var selectedNotificationFilter by remember {
-            mutableStateOf<NotificationFilter?>(null)
-        }
-
-        val notificationFilters by remember {
-            snapshotFlow { selectedAccount }
-                .filterNotNull()
-                .flatMapLatest {
-                    accountServiceFlow(AccountType.Specific(it.key), accountRepository)
-                }.map {
-                    require(it is AuthenticatedMicroblogDataSource)
-                    it.supportedNotificationFilter.toImmutableList()
-                }
-        }.collectAsUiState()
+        val selectedNotificationFilter by selectedNotificationFilterFlow.collectAsState()
+        val notificationFilters by notificationFiltersFlow.collectAsUiState()
 
         notificationFilters.onSuccess {
             LaunchedEffect(it) {
-                selectedNotificationFilter = it.firstOrNull()
+                selectedNotificationFilterFlow.value = it.firstOrNull()
             }
         }
 
-        LaunchedEffect(notifications.size) {
-            selectedAccount = notifications.keys.firstOrNull()
+        LaunchedEffect(notifications) {
+            val current = selectedAccountFlow.value
+            if (current == null || current.key !in notifications.keys.map { it.key }) {
+                selectedAccountFlow.value = notifications.keys.firstOrNull()
+            }
         }
 
-        val listState =
-            remember {
-                combine(
-                    snapshotFlow { selectedNotificationFilter }.filterNotNull(),
-                    snapshotFlow { selectedAccount }.filterNotNull(),
-                ) { filter, profile -> filter to profile }
-                    .flatMapLatest { (filter, profile) ->
-                        accountServiceFlow(AccountType.Specific(profile.key), accountRepository)
-                            .flatMapLatest {
-                                require(it is AuthenticatedMicroblogDataSource)
-                                runCatching {
-                                    Pager(config = pagingConfig) {
-                                        it.notification(filter).toPagingSource()
-                                    }.flow
-                                }.getOrDefault(emptyFlow())
-                            }
-                    }
-            }.collectAsLazyPagingItems().toPagingState()
+        val listState = timelinePresenter.body().listState
 
         return object : State {
             override val notifications = notifications
@@ -184,11 +189,11 @@ public class AllNotificationPresenter :
             override val selectedAccountIndex = selectedAccountIndex
 
             override fun setAccount(profile: UiProfile) {
-                selectedAccount = profile
+                selectedAccountFlow.value = profile
             }
 
             override fun setFilter(filter: NotificationFilter) {
-                selectedNotificationFilter = filter
+                selectedNotificationFilterFlow.value = filter
             }
 
             override suspend fun refreshSuspend() {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt
index 52de89ecf..7beb2fa88 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt
@@ -18,6 +18,7 @@ import dev.dimension.flare.common.onError
 import dev.dimension.flare.common.onSuccess
 import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
+import dev.dimension.flare.data.datasource.microblog.paging.NotSupportRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.TimelinePagingMapper
 import dev.dimension.flare.data.datasource.microblog.paging.TimelineRemoteMediator
@@ -52,14 +53,22 @@ public abstract class TimelinePresenter :
     internal fun createPager(scope: CoroutineScope): Flow<PagingData<UiTimelineV2>> =
         loader
             .flatMapLatest {
-                if (it is CacheableRemoteLoader<UiTimelineV2>) {
-                    cachePager(
-                        loader = it,
-                    ).cachedIn(scope)
-                } else {
-                    networkPager(
-                        loader = it,
-                    ).cachedIn(scope)
+                when (it) {
+                    is NotSupportRemoteLoader<UiTimelineV2> -> {
+                        PagingData.emptyFlow(isError = false)
+                    }
+
+                    is CacheableRemoteLoader<UiTimelineV2> -> {
+                        cachePager(
+                            loader = it,
+                        ).cachedIn(scope)
+                    }
+
+                    else -> {
+                        networkPager(
+                            loader = it,
+                        ).cachedIn(scope)
+                    }
                 }.flatMapLatest { pager ->
                     filterFlow.map { filterList ->
                         pager.filter { item ->
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt
index 70ee4584d..756578271 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt
@@ -203,7 +203,7 @@ public class ProfilePresenter(
                     emptyList()
                 } else {
                     listOfNotNull(
-                        if (accountKey != null && userKey != null) {
+                        if (accountKey != null && userKey != null && service is ListDataSource) {
                             ActionMenu.Item(
                                 icon = UiIcon.List,
                                 text = ActionMenu.Item.Text.Localized(ActionMenu.Item.Text.Localized.Type.EditUserList),
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/action/AddReactionPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/action/AddReactionPresenter.kt
index 037abec01..ca1d9133c 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/action/AddReactionPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/status/action/AddReactionPresenter.kt
@@ -73,10 +73,7 @@ public class AddReactionPresenter(
                             if (status is UiTimelineV2.Post) {
                                 val hasReacted = status.emojiReactions.any { it.me && it.name == emoji.shortcode }
                                 val count =
-                                    status.emojiReactions
-                                        .firstOrNull { it.name == emoji.shortcode }
-                                        ?.count
-                                        ?.value ?: 0L
+                                    status.emojiReactions.sumOf { it.count.value }
                                 postDataSource.postEventHandler.handleEvent(
                                     PostEvent.Misskey.React(
                                         postKey = statusKey,
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt
index c331a5311..89f80882f 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt
@@ -206,6 +206,37 @@ class MicroblogTest : RobolectricTest() {
             assertEquals(parentPost.statusKey, reference.referenceStatusKey)
         }
 
+    @Test
+    fun toDbMapsRetweetReferenceFromInternalRepost() =
+        runTest {
+            val accountKey = MicroBlogKey(id = "account", host = "test.com")
+            val wrapperUser = createUser(MicroBlogKey(id = "wrapper-user", host = "test.com"), "Wrapper User")
+            val repostUser = createUser(MicroBlogKey(id = "repost-user", host = "test.com"), "Repost User")
+            val repostPost =
+                createPost(
+                    accountKey = accountKey,
+                    user = repostUser,
+                    statusKey = MicroBlogKey(id = "repost-status", host = "test.com"),
+                    text = "repost",
+                )
+            val wrapperPost =
+                createPost(
+                    accountKey = accountKey,
+                    user = wrapperUser,
+                    statusKey = MicroBlogKey(id = "wrapper-status", host = "test.com"),
+                    text = "wrapper",
+                ).copy(
+                    internalRepost = repostPost,
+                )
+
+            val mapped = TimelinePagingMapper.toDb(wrapperPost, pagingKey = "home")
+            val retweetReference =
+                mapped.status.references.find { it.reference.referenceType == ReferenceType.Retweet }
+            assertNotNull(retweetReference)
+            assertEquals(wrapperPost.statusKey, retweetReference.reference.statusKey)
+            assertEquals(repostPost.statusKey, retweetReference.reference.referenceStatusKey)
+        }
+
     @Test
     fun toUiSetsExtraKeyForRootAndReferences() =
         runTest {
@@ -273,6 +304,150 @@ class MicroblogTest : RobolectricTest() {
             assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
         }
 
+    @Test
+    fun toUiFlattensInternalRepostButKeepsReferencePayload() =
+        runTest {
+            val accountKey = MicroBlogKey(id = "account", host = "test.com")
+            val wrapperUser = createUser(MicroBlogKey(id = "wrapper-user", host = "test.com"), "Wrapper User")
+            val repostUser = createUser(MicroBlogKey(id = "repost-user", host = "test.com"), "Repost User")
+            val repostPost =
+                createPost(
+                    accountKey = accountKey,
+                    user = repostUser,
+                    statusKey = MicroBlogKey(id = "repost-status", host = "test.com"),
+                    text = "repost content",
+                )
+            val repostMessage =
+                UiTimelineV2.Message(
+                    user = wrapperUser,
+                    statusKey = MicroBlogKey(id = "wrapper-status", host = "test.com"),
+                    icon = dev.dimension.flare.ui.model.UiIcon.Retweet,
+                    type =
+                        UiTimelineV2.Message.Type.Localized(
+                            UiTimelineV2.Message.Type.Localized.MessageId.Repost,
+                        ),
+                    createdAt = Clock.System.now().toUi(),
+                    clickEvent = ClickEvent.Noop,
+                    accountType = AccountType.Specific(accountKey),
+                )
+            val wrapperPost =
+                createPost(
+                    accountKey = accountKey,
+                    user = wrapperUser,
+                    statusKey = MicroBlogKey(id = "wrapper-status", host = "test.com"),
+                    text = "wrapper content",
+                ).copy(
+                    message = repostMessage,
+                    internalRepost = repostPost,
+                )
+
+            val mapped = TimelinePagingMapper.toDb(wrapperPost, pagingKey = "home")
+            saveToDatabase(db, listOf(mapped))
+
+            val savedWrapper = db.statusDao().get(wrapperPost.statusKey, AccountType.Specific(accountKey)).first()
+            val savedRepost = db.statusDao().get(repostPost.statusKey, AccountType.Specific(accountKey)).first()
+            assertNotNull(savedWrapper)
+            assertNotNull(savedRepost)
+
+            val roundTrip = TimelinePagingMapper.toUi(mapped, pagingKey = "home", useDbKeyInItemKey = false)
+            val rendered = assertIs<UiTimelineV2.Post>(roundTrip)
+            val internalRepost = assertNotNull(rendered.internalRepost)
+
+            assertEquals(wrapperPost.statusKey, rendered.statusKey)
+            assertEquals(repostPost.statusKey, internalRepost.statusKey)
+            assertEquals(repostPost.content.raw, rendered.content.raw)
+            assertEquals(repostPost.user?.key, rendered.user?.key)
+            assertEquals(repostPost.content.raw, internalRepost.content.raw)
+
+            val message = assertNotNull(rendered.message)
+            val type = assertIs<UiTimelineV2.Message.Type.Localized>(message.type)
+            assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
+        }
+
+    @Test
+    fun repostWithQuoteChainIsStoredSeparatedAndFlattenedOnToUi() =
+        runTest {
+            val accountKey = MicroBlogKey(id = "account", host = "test.com")
+            val userA = createUser(MicroBlogKey(id = "user-a", host = "test.com"), "User A")
+            val userB = createUser(MicroBlogKey(id = "user-b", host = "test.com"), "User B")
+            val userC = createUser(MicroBlogKey(id = "user-c", host = "test.com"), "User C")
+
+            val postC =
+                createPost(
+                    accountKey = accountKey,
+                    user = userC,
+                    statusKey = MicroBlogKey(id = "status-c", host = "test.com"),
+                    text = "content-c",
+                )
+            val postB =
+                createPost(
+                    accountKey = accountKey,
+                    user = userB,
+                    statusKey = MicroBlogKey(id = "status-b", host = "test.com"),
+                    text = "content-b",
+                    quote = listOf(postC),
+                )
+            val postA =
+                createPost(
+                    accountKey = accountKey,
+                    user = userA,
+                    statusKey = MicroBlogKey(id = "status-a", host = "test.com"),
+                    text = "content-a",
+                ).copy(
+                    internalRepost = postB,
+                    message =
+                        UiTimelineV2.Message(
+                            user = userA,
+                            statusKey = MicroBlogKey(id = "status-a", host = "test.com"),
+                            icon = dev.dimension.flare.ui.model.UiIcon.Retweet,
+                            type =
+                                UiTimelineV2.Message.Type.Localized(
+                                    UiTimelineV2.Message.Type.Localized.MessageId.Repost,
+                                ),
+                            createdAt = Clock.System.now().toUi(),
+                            clickEvent = ClickEvent.Noop,
+                            accountType = AccountType.Specific(accountKey),
+                        ),
+                )
+
+            val mapped = TimelinePagingMapper.toDb(postA, pagingKey = "home")
+            val retweetRefs = mapped.status.references.filter { it.reference.referenceType == ReferenceType.Retweet }
+            val quoteRefs = mapped.status.references.filter { it.reference.referenceType == ReferenceType.Quote }
+            assertEquals(1, retweetRefs.size)
+            assertEquals(postB.statusKey, retweetRefs.first().reference.referenceStatusKey)
+            assertTrue(quoteRefs.isEmpty())
+
+            saveToDatabase(db, listOf(mapped))
+            val savedA = db.statusDao().get(postA.statusKey, AccountType.Specific(accountKey)).first()
+            val savedB = db.statusDao().get(postB.statusKey, AccountType.Specific(accountKey)).first()
+            assertNotNull(savedA)
+            assertNotNull(savedB)
+
+            val ui = TimelinePagingMapper.toUi(mapped, pagingKey = "home", useDbKeyInItemKey = false)
+            val rendered = assertIs<UiTimelineV2.Post>(ui)
+            val repost = assertNotNull(rendered.internalRepost)
+
+            assertEquals(postA.statusKey, rendered.statusKey)
+            assertEquals("content-b", rendered.content.raw)
+            assertEquals("content-b", repost.content.raw)
+            assertEquals(postB.statusKey, repost.statusKey)
+            assertEquals(1, rendered.quote.size)
+            assertEquals(
+                "content-c",
+                rendered.quote
+                    .first()
+                    .content.raw,
+            )
+            assertEquals(1, repost.quote.size)
+            assertEquals(
+                "content-c",
+                repost.quote
+                    .first()
+                    .content.raw,
+            )
+            assertEquals(postC.statusKey, repost.quote.first().statusKey)
+        }
+
     @Test
     fun quoteAndRetweetTogetherKeepsRetweetMessageOnSharedStatus() =
         runTest {
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/BlueskyRenderTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/BlueskyRenderTest.kt
index 4d59a8b8d..97ba858da 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/BlueskyRenderTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/BlueskyRenderTest.kt
@@ -195,6 +195,7 @@ class BlueskyRenderTest {
 
         val rendered = assertIs<UiTimelineV2.Post>(listOf(feed).render(accountKey).single())
         val message = assertNotNull(rendered.message)
+        val repost = assertNotNull(rendered.internalRepost)
 
         val type = assertIs<UiTimelineV2.Message.Type.Localized>(message.type)
         assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
@@ -202,6 +203,8 @@ class BlueskyRenderTest {
         assertEquals("did:plc:original", rendered.user?.key?.id)
         assertEquals("original post content", rendered.content.innerText)
         assertEquals(message.statusKey.id, rendered.statusKey.id)
+        assertEquals("original post content", repost.content.innerText)
+        assertEquals("did:plc:original", repost.user?.key?.id)
     }
 
     @Test
@@ -240,6 +243,7 @@ class BlueskyRenderTest {
 
         val rendered = assertIs<UiTimelineV2.Post>(listOf(feed).render(accountKey).single())
         val message = assertNotNull(rendered.message)
+        val repost = assertNotNull(rendered.internalRepost)
         val type = assertIs<UiTimelineV2.Message.Type.Localized>(message.type)
 
         assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
@@ -252,6 +256,14 @@ class BlueskyRenderTest {
                 .first()
                 .content.innerText,
         )
+        assertEquals("original payload", repost.content.innerText)
+        assertEquals(1, repost.quote.size)
+        assertEquals(
+            "quoted payload",
+            repost.quote
+                .first()
+                .content.innerText,
+        )
         assertEquals("did:plc:reposter", message.user?.key?.id)
     }
 
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/MastodonRenderTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/MastodonRenderTest.kt
index fdde505fb..ac217233c 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/MastodonRenderTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/MastodonRenderTest.kt
@@ -133,11 +133,14 @@ class MastodonRenderTest {
         val rendered = assertIs<UiTimelineV2.Post>(reblogWrapper.render(host = accountKey.host, accountKey = accountKey))
         val message = assertNotNull(rendered.message)
         val type = assertIs<UiTimelineV2.Message.Type.Localized>(message.type)
+        val repost = assertNotNull(rendered.internalRepost)
 
         assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
         assertEquals("reblogger-user", message.user?.handle?.raw)
-        assertEquals("original content", rendered.content.innerText)
+        assertEquals("wrapper content", rendered.content.innerText)
         assertEquals("reblog-wrapper-1", rendered.statusKey.id)
+        assertEquals("original content", repost.content.innerText)
+        assertEquals("original-1", repost.statusKey.id)
     }
 
     @Test
@@ -166,15 +169,18 @@ class MastodonRenderTest {
         val rendered = assertIs<UiTimelineV2.Post>(reblogWrapper.render(host = accountKey.host, accountKey = accountKey))
         val message = assertNotNull(rendered.message)
         val type = assertIs<UiTimelineV2.Message.Type.Localized>(message.type)
+        val repost = assertNotNull(rendered.internalRepost)
 
         assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
         assertEquals("reblogger-user", message.user?.handle?.raw)
-        assertEquals("original content", rendered.content.innerText)
+        assertEquals("wrapper", rendered.content.innerText)
         assertEquals("reblog-wrapper-2", rendered.statusKey.id)
-        assertEquals(1, rendered.quote.size)
+        assertTrue(rendered.quote.isEmpty())
+        assertEquals("original content", repost.content.innerText)
+        assertEquals(1, repost.quote.size)
         assertEquals(
             "quoted content",
-            rendered.quote
+            repost.quote
                 .first()
                 .content.innerText,
         )
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/MisskeyRenderTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/MisskeyRenderTest.kt
index bcd99e751..6782a0df1 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/MisskeyRenderTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/MisskeyRenderTest.kt
@@ -164,11 +164,14 @@ class MisskeyRenderTest {
         val rendered = assertIs<UiTimelineV2.Post>(repost.render(accountKey))
         val message = assertNotNull(rendered.message)
         val type = assertIs<UiTimelineV2.Message.Type.Localized>(message.type)
+        val repostInternal = assertNotNull(rendered.internalRepost)
 
         assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
         assertEquals("user-reposter", message.user?.key?.id)
-        assertEquals("original content", rendered.content.innerText)
+        assertTrue(rendered.content.innerText.isBlank())
         assertEquals("note-repost-wrapper", rendered.statusKey.id)
+        assertEquals("original content", repostInternal.content.innerText)
+        assertEquals("note-original", repostInternal.statusKey.id)
     }
 
     @Test
@@ -197,14 +200,17 @@ class MisskeyRenderTest {
         val rendered = assertIs<UiTimelineV2.Post>(repost.render(accountKey))
         val message = assertNotNull(rendered.message)
         val type = assertIs<UiTimelineV2.Message.Type.Localized>(message.type)
+        val repostInternal = assertNotNull(rendered.internalRepost)
 
         assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
-        assertEquals("original payload", rendered.content.innerText)
+        assertTrue(rendered.content.innerText.isBlank())
         assertEquals("note-repost-wrapper-2", rendered.statusKey.id)
-        assertEquals(1, rendered.quote.size)
+        assertTrue(rendered.quote.isEmpty())
+        assertEquals("original payload", repostInternal.content.innerText)
+        assertEquals(1, repostInternal.quote.size)
         assertEquals(
             "quoted payload",
-            rendered.quote
+            repostInternal.quote
                 .first()
                 .content.innerText,
         )
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/XQTRenderTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/XQTRenderTest.kt
index fd6892d9d..d7a56a283 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/XQTRenderTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/XQTRenderTest.kt
@@ -162,12 +162,16 @@ class XQTRenderTest {
         val rendered = assertIs<UiTimelineV2.Post>(createTimeline(repostWrapper).render(accountKey))
         val message = assertNotNull(rendered.message)
         val type = assertIs<UiTimelineV2.Message.Type.Localized>(message.type)
+        val repostInternal = assertNotNull(rendered.internalRepost)
 
         assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
         assertEquals("user-reposter", message.user?.key?.id)
-        assertEquals("original content", rendered.content.innerText)
-        assertEquals("user-original", rendered.user?.key?.id)
+        assertEquals("wrapper content", rendered.content.innerText)
+        assertEquals("user-reposter", rendered.user?.key?.id)
         assertEquals("status-repost-wrapper", rendered.statusKey.id)
+        assertEquals("original content", repostInternal.content.innerText)
+        assertEquals("user-original", repostInternal.user?.key?.id)
+        assertEquals("status-original", repostInternal.statusKey.id)
     }
 
     @Test
@@ -196,14 +200,17 @@ class XQTRenderTest {
         val rendered = assertIs<UiTimelineV2.Post>(createTimeline(repostWrapper).render(accountKey))
         val message = assertNotNull(rendered.message)
         val type = assertIs<UiTimelineV2.Message.Type.Localized>(message.type)
+        val repostInternal = assertNotNull(rendered.internalRepost)
 
         assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
         assertEquals("status-repost-wrapper-2", rendered.statusKey.id)
-        assertEquals("original payload", rendered.content.innerText)
+        assertEquals("wrapper payload", rendered.content.innerText)
         assertEquals(1, rendered.quote.size)
+        assertEquals("original payload", repostInternal.content.innerText)
+        assertEquals(1, repostInternal.quote.size)
         assertEquals(
             "quoted payload",
-            rendered.quote
+            repostInternal.quote
                 .first()
                 .content.innerText,
         )

From ddccb420917c763dfd1741d72ffd4d970287222a Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Thu, 5 Mar 2026 16:12:31 +0900
Subject: [PATCH 19/33] fix android

---
 .../dimension/flare/ui/component/SearchBar.kt |  4 +--
 .../flare/ui/screen/compose/ComposeScreen.kt  | 27 ++++++++++++----
 .../flare/ui/screen/home/DiscoverScreen.kt    |  2 +-
 .../flare/ui/screen/home/HomeScreen.kt        | 17 +++++++---
 .../ui/screen/home/NotificationScreen.kt      |  2 +-
 .../flare/ui/screen/home/SearchScreen.kt      |  2 +-
 .../ui/screen/media/StatusMediaScreen.kt      | 20 ++++++------
 .../flare/ui/screen/profile/ProfileScreen.kt  | 10 +++---
 .../ui/screen/settings/AccountsScreen.kt      |  2 +-
 .../ui/screen/settings/TabAddBottomSheet.kt   |  5 +--
 .../flare/ui/screen/status/StatusScreen.kt    |  6 +---
 .../flare/ui/screen/status/VVOStatusScreen.kt | 10 +++---
 .../component/status/CommonStatusComponent.kt | 18 ++++++++++-
 .../datasource/bluesky/BlueskyDataSource.kt   |  3 --
 .../bluesky/StatusDetailRemoteMediator.kt     | 20 ------------
 .../mastodon/StatusDetailRemoteMediator.kt    | 26 ----------------
 .../microblog/handler/PostHandler.kt          | 21 +++++++++++++
 .../misskey/StatusDetailRemoteMediator.kt     | 30 ------------------
 .../dimension/flare/ui/model/UiTimelineV2.kt  |  4 +--
 .../profile/ProfileMediaPresenter.kt          |  2 ++
 .../status/StatusContextPresenter.kt          | 31 ++++++++++++++++++-
 21 files changed, 136 insertions(+), 126 deletions(-)

diff --git a/app/src/main/java/dev/dimension/flare/ui/component/SearchBar.kt b/app/src/main/java/dev/dimension/flare/ui/component/SearchBar.kt
index 32a6a4a80..7e389df97 100644
--- a/app/src/main/java/dev/dimension/flare/ui/component/SearchBar.kt
+++ b/app/src/main/java/dev/dimension/flare/ui/component/SearchBar.kt
@@ -50,7 +50,7 @@ import dev.dimension.flare.ui.component.status.status
 import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.UiSearchHistory
 import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.onSuccess
 import dev.dimension.flare.ui.presenter.home.SearchHistoryPresenter
 import dev.dimension.flare.ui.presenter.home.SearchHistoryState
@@ -166,7 +166,7 @@ private fun SearchContent(
 
 internal fun LazyStaggeredGridScope.searchContent(
     searchUsers: PagingState<UiProfile>,
-    searchStatus: PagingState<UiTimeline>,
+    searchStatus: PagingState<UiTimelineV2>,
     toUser: (MicroBlogKey) -> Unit,
 ) {
     searchUsers
diff --git a/app/src/main/java/dev/dimension/flare/ui/screen/compose/ComposeScreen.kt b/app/src/main/java/dev/dimension/flare/ui/screen/compose/ComposeScreen.kt
index 2c79aad0f..aa5ec5c46 100644
--- a/app/src/main/java/dev/dimension/flare/ui/screen/compose/ComposeScreen.kt
+++ b/app/src/main/java/dev/dimension/flare/ui/screen/compose/ComposeScreen.kt
@@ -105,7 +105,7 @@ import dev.dimension.flare.ui.component.status.CommonStatusComponent
 import dev.dimension.flare.ui.component.status.StatusVisibilityComponent
 import dev.dimension.flare.ui.model.UiEmoji
 import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.map
 import dev.dimension.flare.ui.model.mapNotNull
 import dev.dimension.flare.ui.model.onError
@@ -113,6 +113,7 @@ import dev.dimension.flare.ui.model.onSuccess
 import dev.dimension.flare.ui.model.takeSuccess
 import dev.dimension.flare.ui.presenter.compose.ComposePresenter
 import dev.dimension.flare.ui.presenter.compose.ComposeStatus
+import dev.dimension.flare.ui.presenter.home.ActiveAccountPresenter
 import dev.dimension.flare.ui.presenter.invoke
 import dev.dimension.flare.ui.theme.FlareTheme
 import dev.dimension.flare.ui.theme.screenHorizontalPadding
@@ -132,13 +133,21 @@ fun ShortcutComposeRoute(
     initialText: String = "",
     initialMedias: ImmutableList<Uri> = persistentListOf(),
 ) {
+    val activeAccountState by producePresenter(key = "shortcut_compose_active_account") {
+        activeAccountPresenter()
+    }
+    val accountType =
+        activeAccountState.user
+            .takeSuccess()
+            ?.let { AccountType.Specific(it.key) }
+            ?: AccountType.Guest
     FlareTheme {
         CompositionLocalProvider(
             LocalContentColor provides MaterialTheme.colorScheme.onBackground,
         ) {
             ComposeScreen(
                 onBack = onBack,
-                accountType = AccountType.Active,
+                accountType = accountType,
                 initialText = initialText,
                 initialMedias = initialMedias,
             )
@@ -146,6 +155,12 @@ fun ShortcutComposeRoute(
     }
 }
 
+@Composable
+private fun activeAccountPresenter() =
+    run {
+        remember { ActiveAccountPresenter() }.invoke()
+    }
+
 @OptIn(
     ExperimentalMaterial3Api::class,
     ExperimentalMaterial3ExpressiveApi::class,
@@ -255,7 +270,7 @@ internal fun ComposeScreen(
                                     state.state.selectAccount(account)
                                 },
                                 label = {
-                                    Text(it.handle)
+                                    Text(it.handle.canonical)
                                 },
                                 leadingIcon = {
                                     AvatarComponent(it.avatar, size = 24.dp)
@@ -285,7 +300,7 @@ internal fun ComposeScreen(
                                             user.onSuccess { data ->
                                                 DropdownMenuItem(
                                                     text = {
-                                                        Text(text = data.handle)
+                                                        Text(text = data.handle.canonical)
                                                     },
                                                     onClick = {
                                                         state.state.selectAccount(account)
@@ -616,8 +631,8 @@ internal fun ComposeScreen(
 
             state.state.replyState?.let { replyState ->
                 replyState.onSuccess { state ->
-                    val content = state.content
-                    if (content is UiTimeline.ItemContent.Status) {
+                    val content = state as? UiTimelineV2.Post
+                    if (content is UiTimelineV2.Post) {
                         Card {
                             CompositionLocalProvider(
                                 LocalComponentAppearance provides
diff --git a/app/src/main/java/dev/dimension/flare/ui/screen/home/DiscoverScreen.kt b/app/src/main/java/dev/dimension/flare/ui/screen/home/DiscoverScreen.kt
index a5bf11725..4549624db 100644
--- a/app/src/main/java/dev/dimension/flare/ui/screen/home/DiscoverScreen.kt
+++ b/app/src/main/java/dev/dimension/flare/ui/screen/home/DiscoverScreen.kt
@@ -118,7 +118,7 @@ internal fun DiscoverScreen(onUserClick: (AccountType, MicroBlogKey) -> Unit) {
                                                 state.setAccount(profile)
                                             },
                                             label = {
-                                                Text(profile.handle)
+                                                Text(profile.handle.canonical)
                                             },
                                             leadingIcon = {
                                                 AvatarComponent(
diff --git a/app/src/main/java/dev/dimension/flare/ui/screen/home/HomeScreen.kt b/app/src/main/java/dev/dimension/flare/ui/screen/home/HomeScreen.kt
index 3c4a311d4..4a5b84944 100644
--- a/app/src/main/java/dev/dimension/flare/ui/screen/home/HomeScreen.kt
+++ b/app/src/main/java/dev/dimension/flare/ui/screen/home/HomeScreen.kt
@@ -89,6 +89,7 @@ import dev.dimension.flare.ui.model.onLoading
 import dev.dimension.flare.ui.model.onSuccess
 import dev.dimension.flare.ui.model.takeSuccess
 import dev.dimension.flare.ui.presenter.HomeTabsPresenter
+import dev.dimension.flare.ui.presenter.home.ActiveAccountPresenter
 import dev.dimension.flare.ui.presenter.home.AllNotificationBadgePresenter
 import dev.dimension.flare.ui.presenter.home.UserPresenter
 import dev.dimension.flare.ui.presenter.invoke
@@ -136,7 +137,7 @@ internal fun HomeScreen(afterInit: () -> Unit) {
                 }
 
             val currentRoute = topLevelBackStack.topLevelKey
-            val accountType = currentRoute.accountTypeOr(AccountType.Active)
+            val accountType = currentRoute.accountTypeOr(state.defaultAccountType)
             val userState by producePresenter(key = "home_account_type_$accountType") {
                 userPresenter(accountType)
             }
@@ -167,6 +168,7 @@ internal fun HomeScreen(afterInit: () -> Unit) {
                             userState,
                             layoutType,
                             currentRoute,
+                            state.defaultAccountType,
                             navigate,
                         )
                     },
@@ -314,6 +316,7 @@ private fun HomeRailHeader(
     userState: UiState<UiProfile>,
     layoutType: NavigationSuiteType,
     currentRoute: Route,
+    defaultAccountType: AccountType,
     navigate: (Route) -> Unit,
 ) {
     val scope = rememberCoroutineScope()
@@ -418,7 +421,7 @@ private fun HomeRailHeader(
                                         textStyle = MaterialTheme.typography.titleMedium,
                                     )
                                     Text(
-                                        user.handle,
+                                        user.handle.canonical,
                                         style = MaterialTheme.typography.bodySmall,
                                         color = MaterialTheme.colorScheme.outline,
                                     )
@@ -456,7 +459,7 @@ private fun HomeRailHeader(
                                     navigate(
                                         Route.Compose.New(
                                             currentRoute.accountTypeOr(
-                                                AccountType.Active,
+                                                defaultAccountType,
                                             ),
                                         ),
                                     )
@@ -484,7 +487,7 @@ private fun HomeRailHeader(
                                     navigate(
                                         Route.Compose.New(
                                             currentRoute.accountTypeOr(
-                                                AccountType.Active,
+                                                defaultAccountType,
                                             ),
                                         ),
                                     )
@@ -542,6 +545,7 @@ private fun getDirection(
 @Composable
 private fun presenter() =
     run {
+        val activeAccountState = remember { ActiveAccountPresenter() }.invoke()
         val navigationState =
             remember {
                 NavigationState()
@@ -563,6 +567,11 @@ private fun presenter() =
             val tabs = tabs.tabs
             val navigationState = navigationState
             val scrollToTopRegistry = scrollToTopRegistry
+            val defaultAccountType: AccountType =
+                activeAccountState.user
+                    .takeSuccess()
+                    ?.let { AccountType.Specific(it.key) }
+                    ?: AccountType.Guest
         }
     }
 
diff --git a/app/src/main/java/dev/dimension/flare/ui/screen/home/NotificationScreen.kt b/app/src/main/java/dev/dimension/flare/ui/screen/home/NotificationScreen.kt
index 89b5d0f0a..c03ffd222 100644
--- a/app/src/main/java/dev/dimension/flare/ui/screen/home/NotificationScreen.kt
+++ b/app/src/main/java/dev/dimension/flare/ui/screen/home/NotificationScreen.kt
@@ -104,7 +104,7 @@ internal fun NotificationScreen() {
                                     },
                                     text = {
                                         Text(
-                                            text = account.handle,
+                                            text = account.handle.canonical,
                                             maxLines = 1,
                                         )
                                     },
diff --git a/app/src/main/java/dev/dimension/flare/ui/screen/home/SearchScreen.kt b/app/src/main/java/dev/dimension/flare/ui/screen/home/SearchScreen.kt
index 7f330c04e..f222b864b 100644
--- a/app/src/main/java/dev/dimension/flare/ui/screen/home/SearchScreen.kt
+++ b/app/src/main/java/dev/dimension/flare/ui/screen/home/SearchScreen.kt
@@ -92,7 +92,7 @@ internal fun SearchScreen(
                                                 state.searchState.setAccount(profile)
                                             },
                                             label = {
-                                                Text(profile.handle)
+                                                Text(profile.handle.canonical)
                                             },
                                             leadingIcon = {
                                                 AvatarComponent(
diff --git a/app/src/main/java/dev/dimension/flare/ui/screen/media/StatusMediaScreen.kt b/app/src/main/java/dev/dimension/flare/ui/screen/media/StatusMediaScreen.kt
index b3aa382c5..37602b0ab 100644
--- a/app/src/main/java/dev/dimension/flare/ui/screen/media/StatusMediaScreen.kt
+++ b/app/src/main/java/dev/dimension/flare/ui/screen/media/StatusMediaScreen.kt
@@ -110,7 +110,7 @@ import dev.dimension.flare.ui.component.status.CommonStatusComponent
 import dev.dimension.flare.ui.humanizer.humanize
 import dev.dimension.flare.ui.model.UiMedia
 import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.getFileName
 import dev.dimension.flare.ui.model.isSuccess
 import dev.dimension.flare.ui.model.onLoading
@@ -438,8 +438,8 @@ internal fun StatusMediaScreen(
                         }
 
                         state.status.onSuccess { status ->
-                            val content = status.content
-                            if (content is UiTimeline.ItemContent.Status) {
+                            val content = status as? UiTimelineV2.Post
+                            if (content is UiTimelineV2.Post) {
                                 androidx.compose.animation.AnimatedVisibility(
                                     visible = state.showUi,
                                     modifier =
@@ -563,8 +563,8 @@ internal fun StatusMediaScreen(
                                 contentColor = MaterialTheme.colorScheme.onSurface,
                             ) {
                                 state.status.onSuccess {
-                                    val content = it.content
-                                    if (content is UiTimeline.ItemContent.Status) {
+                                    val content = it as? UiTimelineV2.Post
+                                    if (content is UiTimelineV2.Post) {
                                         CompositionLocalProvider(
                                             LocalComponentAppearance provides
                                                 LocalComponentAppearance.current.copy(
@@ -866,7 +866,7 @@ private fun statusMediaPresenter(
                 .onSuccess {
                     medias =
                         UiState.Success(
-                            (it.content as? UiTimeline.ItemContent.Status)
+                            (it as? UiTimelineV2.Post)
                                 ?.images
                                 .orEmpty()
                                 .toImmutableList(),
@@ -904,11 +904,11 @@ private fun statusMediaPresenter(
         }
 
         fun save(data: UiMedia) {
-            val status = (state.status.takeSuccess()?.content as? UiTimeline.ItemContent.Status)
+            val status = (state.status.takeSuccess() as? UiTimelineV2.Post)
             if (status != null) {
-                val statusKey = status.statusKey.toString()
-                val userHandle = status.user?.handle ?: "unknown"
-                val fileName = data.getFileName(statusKey, userHandle)
+                val statusKeyString = statusKey.toString()
+                val userHandle = status.user?.handle?.canonical ?: "unknown"
+                val fileName = data.getFileName(statusKeyString, userHandle)
 
                 when (data) {
                     is UiMedia.Audio -> download(data.url, fileName)
diff --git a/app/src/main/java/dev/dimension/flare/ui/screen/profile/ProfileScreen.kt b/app/src/main/java/dev/dimension/flare/ui/screen/profile/ProfileScreen.kt
index ff3e6fd7a..a6e61882b 100644
--- a/app/src/main/java/dev/dimension/flare/ui/screen/profile/ProfileScreen.kt
+++ b/app/src/main/java/dev/dimension/flare/ui/screen/profile/ProfileScreen.kt
@@ -82,7 +82,7 @@ import dev.dimension.flare.ui.component.status.MediaItem
 import dev.dimension.flare.ui.component.status.StatusPlaceholder
 import dev.dimension.flare.ui.component.status.status
 import dev.dimension.flare.ui.model.UiMedia
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.map
 import dev.dimension.flare.ui.model.onError
 import dev.dimension.flare.ui.model.onLoading
@@ -564,10 +564,10 @@ private fun ProfileMediaTab(
                                         .clip(MaterialTheme.shapes.medium)
                                         .clipToBounds()
                                         .clickable {
-                                            val content = item.status.content
-                                            if (content is UiTimeline.ItemContent.Status) {
+                                            val content = item.status as? UiTimelineV2.Post
+                                            if (content is UiTimelineV2.Post) {
                                                 onItemClicked(
-                                                    content.statusKey,
+                                                    item.statusKey,
                                                     item.index,
                                                     when (media) {
                                                         is UiMedia.Image -> media.previewUrl
@@ -702,7 +702,7 @@ private fun profilePresenter(
 private sealed interface ProfileTabItem {
     data class Timeline(
         val type: ProfileTab.Timeline.Type,
-        val data: PagingState<UiTimeline>,
+        val data: PagingState<UiTimelineV2>,
     ) : ProfileTabItem
 
     data class Media(
diff --git a/app/src/main/java/dev/dimension/flare/ui/screen/settings/AccountsScreen.kt b/app/src/main/java/dev/dimension/flare/ui/screen/settings/AccountsScreen.kt
index b65e84e6f..141420830 100644
--- a/app/src/main/java/dev/dimension/flare/ui/screen/settings/AccountsScreen.kt
+++ b/app/src/main/java/dev/dimension/flare/ui/screen/settings/AccountsScreen.kt
@@ -242,7 +242,7 @@ fun AccountItem(
         RichText(text = it.name, maxLines = 1)
     },
     supportingContent: @Composable (UiProfile) -> Unit = {
-        Text(text = it.handle, maxLines = 1)
+        Text(text = it.handle.canonical, maxLines = 1)
     },
     avatarSize: Dp = AvatarComponentDefaults.size,
     colors: ListItemColors = ListItemDefaults.segmentedColors(),
diff --git a/app/src/main/java/dev/dimension/flare/ui/screen/settings/TabAddBottomSheet.kt b/app/src/main/java/dev/dimension/flare/ui/screen/settings/TabAddBottomSheet.kt
index 7167bc5d0..a0e4929ac 100644
--- a/app/src/main/java/dev/dimension/flare/ui/screen/settings/TabAddBottomSheet.kt
+++ b/app/src/main/java/dev/dimension/flare/ui/screen/settings/TabAddBottomSheet.kt
@@ -152,7 +152,7 @@ internal fun TabAddBottomSheet(
                                         overflow = TextOverflow.Ellipsis,
                                     )
                                     Text(
-                                        text = tab.profile.handle,
+                                        text = tab.profile.handle.canonical,
                                         style = MaterialTheme.typography.bodySmall,
                                         color = MaterialTheme.colorScheme.outline,
                                         maxLines = 1,
@@ -369,7 +369,8 @@ internal fun allTabsPresenter(filterIsTimeline: Boolean = false): AllTabsState =
 
         object : AllTabsState {
             override val defaultTabs =
-                TimelineTabItem.mainSidePanel
+                TimelineTabItem
+                    .mainSidePanel(null)
                     .let {
                         if (filterIsTimeline) {
                             it.filterIsInstance<TimelineTabItem>()
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
index 5dd845152..2943c681a 100644
--- 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,7 +30,6 @@ 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
@@ -91,10 +90,7 @@ internal fun StatusScreen(
                 ) {
                     status(
                         state.state.listState,
-                        detailStatusKey =
-                            state.state.current
-                                .takeSuccess()
-                                ?.statusKey,
+                        detailStatusKey = statusKey,
                     )
                 }
             },
diff --git a/app/src/main/java/dev/dimension/flare/ui/screen/status/VVOStatusScreen.kt b/app/src/main/java/dev/dimension/flare/ui/screen/status/VVOStatusScreen.kt
index a01c36ae0..8db9a0490 100644
--- a/app/src/main/java/dev/dimension/flare/ui/screen/status/VVOStatusScreen.kt
+++ b/app/src/main/java/dev/dimension/flare/ui/screen/status/VVOStatusScreen.kt
@@ -53,7 +53,7 @@ import dev.dimension.flare.ui.component.status.LazyStatusVerticalStaggeredGrid
 import dev.dimension.flare.ui.component.status.StatusItem
 import dev.dimension.flare.ui.component.status.status
 import dev.dimension.flare.ui.model.UiState
-import dev.dimension.flare.ui.model.UiTimeline
+import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.onError
 import dev.dimension.flare.ui.model.onLoading
 import dev.dimension.flare.ui.model.onSuccess
@@ -156,13 +156,13 @@ internal fun VVOStatusScreen(
 
 @Composable
 private fun StatusContent(
-    statusState: UiState<UiTimeline>,
+    statusState: UiState<UiTimelineV2>,
     detailStatusKey: MicroBlogKey,
     modifier: Modifier = Modifier,
 ) {
     statusState
         .onSuccess { status ->
-            key(status.itemKey, status.content) {
+            key(status.itemKey) {
                 StatusItem(
                     item = status,
                     detailStatusKey = detailStatusKey,
@@ -207,8 +207,8 @@ private fun StatusContent(
 
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
 private fun LazyStaggeredGridScope.reactionContent(
-    comment: PagingState<UiTimeline>,
-    repost: PagingState<UiTimeline>,
+    comment: PagingState<UiTimelineV2>,
+    repost: PagingState<UiTimelineV2>,
     detailType: DetailType,
     onDetailTypeChange: (DetailType) -> Unit,
 ) {
diff --git a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusComponent.kt b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusComponent.kt
index f6cc511ee..8332af9ea 100644
--- a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusComponent.kt
+++ b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusComponent.kt
@@ -158,6 +158,8 @@ import dev.dimension.flare.ui.model.onError
 import dev.dimension.flare.ui.model.onLoading
 import dev.dimension.flare.ui.model.onSuccess
 import dev.dimension.flare.ui.render.UiRichText
+import dev.dimension.flare.ui.route.DeeplinkRoute
+import dev.dimension.flare.ui.route.toUri
 import dev.dimension.flare.ui.theme.PlatformContentColor
 import dev.dimension.flare.ui.theme.PlatformTheme
 import kotlinx.collections.immutable.ImmutableList
@@ -357,7 +359,21 @@ public fun CommonStatusComponent(
                 StatusMediasComponent(
                     item,
                     onMediaClick = { media ->
-                        uriHandler.openUri(media.url)
+                        val index = item.images.indexOf(media)
+                        val link =
+                            DeeplinkRoute.Media.StatusMedia(
+                                statusKey = item.statusKey,
+                                accountType = item.accountType,
+                                index = index,
+                                preview =
+                                    when (media) {
+                                        is UiMedia.Image -> media.previewUrl
+                                        is UiMedia.Video -> media.thumbnailUrl
+                                        is UiMedia.Gif -> media.previewUrl
+                                        is UiMedia.Audio -> null
+                                    },
+                            )
+                        uriHandler.openUri(link.toUri())
                     },
                 )
             }
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
index 29751716f..4579fc00f 100644
--- 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
@@ -79,7 +79,6 @@ import dev.dimension.flare.data.datasource.microblog.pagingConfig
 import dev.dimension.flare.data.network.bluesky.BlueskyService
 import dev.dimension.flare.data.network.bluesky.model.DidDoc
 import dev.dimension.flare.data.repository.AccountRepository
-import dev.dimension.flare.data.repository.LocalFilterRepository
 import dev.dimension.flare.data.repository.tryRun
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
@@ -138,7 +137,6 @@ internal class BlueskyDataSource(
     PostEventHandler.Handler {
     private val database: CacheDatabase by inject()
     private val appDatabase: AppDatabase by inject()
-    private val localFilterRepository: LocalFilterRepository by inject()
     private val coroutineScope: CoroutineScope by inject()
     private val accountRepository: AccountRepository by inject()
     private val imageCompressor: ImageCompressor by inject()
@@ -272,7 +270,6 @@ internal class BlueskyDataSource(
             statusKey,
             service,
             accountKey,
-            database,
             statusOnly = false,
         )
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/StatusDetailRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/StatusDetailRemoteMediator.kt
index 66953a151..8c860a7b8 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/StatusDetailRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/StatusDetailRemoteMediator.kt
@@ -11,13 +11,10 @@ import app.bsky.feed.ReplyRefRootUnion
 import app.bsky.feed.ThreadViewPost
 import app.bsky.feed.ThreadViewPostParentUnion
 import app.bsky.feed.ThreadViewPostReplieUnion
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.model.DbPagingTimeline
 import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.bluesky.BlueskyService
-import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.mapper.render
@@ -30,7 +27,6 @@ internal class StatusDetailRemoteMediator(
     private val statusKey: MicroBlogKey,
     private val service: BlueskyService,
     private val accountKey: MicroBlogKey,
-    private val database: CacheDatabase,
     private val statusOnly: Boolean,
 ) : CacheableRemoteLoader<UiTimelineV2> {
     override val pagingKey: String =
@@ -136,22 +132,6 @@ internal class StatusDetailRemoteMediator(
                     )
                 }
                 PagingRequest.Refresh -> {
-                    if (!database.pagingTimelineDao().existsPaging(accountKey, pagingKey)) {
-                        database.statusDao().get(statusKey, AccountType.Specific(accountKey)).firstOrNull()?.let {
-                            database
-                                .pagingTimelineDao()
-                                .insertAll(
-                                    listOf(
-                                        DbPagingTimeline(
-                                            statusKey = statusKey,
-                                            pagingKey = pagingKey,
-                                            sortId = 0,
-                                        ),
-                                    ),
-                                )
-                        }
-                    }
-
                     val current =
                         service
                             .getPosts(
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/StatusDetailRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/StatusDetailRemoteMediator.kt
index a8abb9d95..4bd129d12 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/StatusDetailRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/StatusDetailRemoteMediator.kt
@@ -1,20 +1,14 @@
 package dev.dimension.flare.data.datasource.mastodon
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.connect
-import dev.dimension.flare.data.database.cache.model.DbPagingTimeline
 import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.mastodon.MastodonService
-import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.mapper.render
-import kotlinx.coroutines.flow.firstOrNull
 import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
 
 @OptIn(ExperimentalPagingApi::class)
 internal class StatusDetailRemoteMediator(
@@ -24,7 +18,6 @@ internal class StatusDetailRemoteMediator(
     private val statusOnly: Boolean,
 ) : CacheableRemoteLoader<UiTimelineV2>,
     KoinComponent {
-    private val database: CacheDatabase by inject()
     override val pagingKey: String =
         buildString {
             append("status_detail_")
@@ -64,25 +57,6 @@ internal class StatusDetailRemoteMediator(
                         endOfPaginationReached = true,
                     )
                 PagingRequest.Refresh -> {
-                    val exists = database.pagingTimelineDao().existsPaging(accountKey, pagingKey)
-                    if (!exists) {
-                        val status = database.statusDao().get(statusKey, AccountType.Specific(accountKey)).firstOrNull()
-                        status?.let {
-                            database.connect {
-                                database
-                                    .pagingTimelineDao()
-                                    .insertAll(
-                                        listOf(
-                                            DbPagingTimeline(
-                                                statusKey = statusKey,
-                                                pagingKey = pagingKey,
-                                                sortId = 0,
-                                            ),
-                                        ),
-                                    )
-                            }
-                        }
-                    }
                     val current =
                         service.lookupStatus(
                             statusKey.id,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandler.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandler.kt
index acc4f33df..0874336b9 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandler.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandler.kt
@@ -4,6 +4,7 @@ import dev.dimension.flare.common.Cacheable
 import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.connect
 import dev.dimension.flare.data.database.cache.mapper.saveToDatabase
+import dev.dimension.flare.data.database.cache.model.DbPagingTimeline
 import dev.dimension.flare.data.datasource.microblog.loader.PostLoader
 import dev.dimension.flare.data.datasource.microblog.paging.TimelinePagingMapper
 import dev.dimension.flare.data.repository.tryRun
@@ -13,6 +14,7 @@ import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiTimelineV2
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.launch
 import org.koin.core.component.KoinComponent
@@ -29,6 +31,25 @@ internal class PostHandler(
         val pagingKey = "post_only_$postKey"
         return Cacheable(
             fetchSource = {
+                val exists = database.pagingTimelineDao().existsPaging(accountType as DbAccountType, pagingKey)
+                if (!exists) {
+                    val status = database.statusDao().get(postKey, accountType).firstOrNull()
+                    status?.let {
+                        database.connect {
+                            database
+                                .pagingTimelineDao()
+                                .insertAll(
+                                    listOf(
+                                        DbPagingTimeline(
+                                            statusKey = postKey,
+                                            pagingKey = pagingKey,
+                                            sortId = 0,
+                                        ),
+                                    ),
+                                )
+                        }
+                    }
+                }
                 val result = loader.status(postKey)
                 database.connect {
                     val item =
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/StatusDetailRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/StatusDetailRemoteMediator.kt
index 62c5b9add..f00e731f7 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/StatusDetailRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/StatusDetailRemoteMediator.kt
@@ -1,23 +1,16 @@
 package dev.dimension.flare.data.datasource.misskey
 
 import androidx.paging.ExperimentalPagingApi
-import dev.dimension.flare.data.database.cache.CacheDatabase
-import dev.dimension.flare.data.database.cache.connect
-import dev.dimension.flare.data.database.cache.model.DbPagingTimeline
 import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.network.misskey.MisskeyService
 import dev.dimension.flare.data.network.misskey.api.model.IPinRequest
 import dev.dimension.flare.data.network.misskey.api.model.NotesChildrenRequest
-import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.model.mapper.render
-import kotlinx.coroutines.flow.firstOrNull
 import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
-import kotlin.getValue
 
 @OptIn(ExperimentalPagingApi::class)
 internal class StatusDetailRemoteMediator(
@@ -27,7 +20,6 @@ internal class StatusDetailRemoteMediator(
     private val statusOnly: Boolean,
 ) : CacheableRemoteLoader<UiTimelineV2>,
     KoinComponent {
-    private val database: CacheDatabase by inject()
     override val pagingKey: String =
         buildString {
             append("status_detail_")
@@ -67,28 +59,6 @@ internal class StatusDetailRemoteMediator(
                     )
 
                 PagingRequest.Refresh -> {
-                    if (!database.pagingTimelineDao().existsPaging(accountKey, pagingKey)) {
-                        val status =
-                            database
-                                .statusDao()
-                                .get(statusKey, AccountType.Specific(accountKey))
-                                .firstOrNull()
-                        status?.let {
-                            database.connect {
-                                database
-                                    .pagingTimelineDao()
-                                    .insertAll(
-                                        listOf(
-                                            DbPagingTimeline(
-                                                statusKey = statusKey,
-                                                pagingKey = pagingKey,
-                                                sortId = 0,
-                                            ),
-                                        ),
-                                    )
-                            }
-                        }
-                    }
                     val current =
                         service
                             .notesShow(
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
index 0c118b510..33ad3772c 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
@@ -183,7 +183,7 @@ public sealed class UiTimelineV2 {
         val content: UiRichText,
         val actions: SerializableImmutableList<ActionMenu>,
         val poll: UiPoll?,
-        override val statusKey: MicroBlogKey,
+        public override val statusKey: MicroBlogKey,
         val card: UiCard?,
         override val createdAt: UiDateTime,
         val emojiReactions: SerializableImmutableList<EmojiReaction> = persistentListOf(),
@@ -194,7 +194,7 @@ public sealed class UiTimelineV2 {
         internal val internalRepost: Post? = null,
         internal val clickEvent: ClickEvent,
         override val extraKey: String? = null,
-        override val accountType: AccountType,
+        public override val accountType: AccountType,
     ) : UiTimelineV2() {
         override val searchText: String =
             buildString {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfileMediaPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfileMediaPresenter.kt
index ef80c63d5..bc1230a05 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfileMediaPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfileMediaPresenter.kt
@@ -79,6 +79,7 @@ private class MediaTimelinePresenter(
                         ProfileMedia(
                             it,
                             status,
+                            status.statusKey,
                             status.images.indexOf(it),
                         )
                     }
@@ -98,5 +99,6 @@ public interface ProfileMediaState {
 public data class ProfileMedia internal constructor(
     val media: UiMedia,
     val status: UiTimelineV2,
+    val statusKey: MicroBlogKey,
     val index: Int,
 )
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
index f59508faf..acc12e785 100644
--- 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
@@ -4,11 +4,16 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import dev.dimension.flare.data.database.cache.CacheDatabase
+import dev.dimension.flare.data.database.cache.connect
+import dev.dimension.flare.data.database.cache.model.DbPagingTimeline
 import dev.dimension.flare.data.datasource.microblog.datasource.PostDataSource
+import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceFlow
 import dev.dimension.flare.model.AccountType
+import dev.dimension.flare.model.DbAccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiState
 import dev.dimension.flare.ui.model.UiTimelineV2
@@ -43,6 +48,7 @@ public class StatusContextPresenter(
         public val current: UiState<UiTimelineV2>
     }
 
+    private val database: CacheDatabase by inject()
     private val accountRepository: AccountRepository by inject()
 
     private val currentStatusFlow by lazy {
@@ -66,7 +72,30 @@ public class StatusContextPresenter(
                             accountType = accountType,
                             repository = accountRepository,
                         ).map { service ->
-                            service.context(key)
+                            val loader = service.context(key)
+                            if (loader is CacheableRemoteLoader<UiTimelineV2>) {
+                                val pagingKey = loader.pagingKey
+                                val exists = database.pagingTimelineDao().existsPaging(accountType as DbAccountType, pagingKey)
+                                if (!exists) {
+                                    val status = database.statusDao().get(statusKey, accountType).firstOrNull()
+                                    status?.let {
+                                        database.connect {
+                                            database
+                                                .pagingTimelineDao()
+                                                .insertAll(
+                                                    listOf(
+                                                        DbPagingTimeline(
+                                                            statusKey = statusKey,
+                                                            pagingKey = pagingKey,
+                                                            sortId = 0,
+                                                        ),
+                                                    ),
+                                                )
+                                        }
+                                    }
+                                }
+                            }
+                            loader
                         }
                     }
             }

From 77a7a4b48692b33a8340289eb4a02a49ca926068 Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Thu, 5 Mar 2026 16:36:56 +0900
Subject: [PATCH 20/33] fix parents

---
 .../data/database/cache/mapper/Microblog.kt   | 31 ++++++-
 .../ui/presenter/home/TimelinePresenter.kt    | 17 ++--
 .../database/cache/mapper/MicroblogTest.kt    | 34 ++++++++
 .../microblog/handler/PostHandlerTest.kt      | 83 ++++++++++++++++++-
 4 files changed, 152 insertions(+), 13 deletions(-)

diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Microblog.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Microblog.kt
index 298614afa..dcd1f1b3a 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Microblog.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Microblog.kt
@@ -2,6 +2,9 @@ package dev.dimension.flare.data.database.cache.mapper
 
 import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
+import dev.dimension.flare.data.database.cache.model.DbStatus
+import dev.dimension.flare.ui.model.UiTimelineV2
+import kotlinx.coroutines.flow.firstOrNull
 
 internal suspend fun saveToDatabase(
     database: CacheDatabase,
@@ -96,14 +99,13 @@ internal suspend fun saveToDatabase(
 //                )
 //            })
 //        }
-    (
+    val statuses =
         items.map { it.status.status.data } +
             items
                 .flatMap { it.status.references }
                 .mapNotNull { it.status?.data }
-    ).let {
-        database.statusDao().insertAll(it)
-    }
+    val mergedStatuses = statuses.map { mergeWithExistingPostParents(database, it) }
+    database.statusDao().insertAll(mergedStatuses)
     items.flatMap { it.status.references }.map { it.reference }.let {
         // TODO: delete old references
         database.statusReferenceDao().insertAll(it)
@@ -111,6 +113,27 @@ internal suspend fun saveToDatabase(
     database.pagingTimelineDao().insertAll(items.map { it.timeline })
 }
 
+private suspend fun mergeWithExistingPostParents(
+    database: CacheDatabase,
+    incoming: DbStatus,
+): DbStatus {
+    val incomingPost = incoming.content as? UiTimelineV2.Post ?: return incoming
+    if (incomingPost.parents.isNotEmpty()) {
+        return incoming
+    }
+    val existingPost =
+        database
+            .statusDao()
+            .get(incoming.statusKey, incoming.accountType)
+            .firstOrNull()
+            ?.content as? UiTimelineV2.Post
+    return if (existingPost?.parents?.isNotEmpty() == true) {
+        incoming.copy(content = incomingPost.copy(parents = existingPost.parents))
+    } else {
+        incoming
+    }
+}
+
 // internal fun createDbPagingTimelineWithStatus(
 //    accountType: DbAccountType,
 //    pagingKey: String,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt
index 7beb2fa88..bef03d649 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt
@@ -71,15 +71,18 @@ public abstract class TimelinePresenter :
                     }
                 }.flatMapLatest { pager ->
                     filterFlow.map { filterList ->
-                        pager.filter { item ->
-                            if (filterList.isEmpty()) {
-                                true
-                            } else {
-                                !filterList.any { filter ->
-                                    item.searchText.orEmpty().contains(filter, ignoreCase = true)
+                        pager
+                            .filter { item ->
+                                if (filterList.isEmpty()) {
+                                    true
+                                } else {
+                                    !filterList.any { filter ->
+                                        item.searchText.orEmpty().contains(filter, ignoreCase = true)
+                                    }
                                 }
+                            }.map {
+                                transform(it)
                             }
-                        }
                     }
                 }
             }.catch {
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt
index 89f80882f..dcd53adcb 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt
@@ -172,6 +172,40 @@ class MicroblogTest : RobolectricTest() {
             assertIs<PagingSource.LoadResult.Page<Int, DbPagingTimelineWithStatus>>(refreshResult)
         }
 
+    @Test
+    fun postContentParentsRemainWhenSubsequentInsertHasNoParents() =
+        runTest {
+            val accountKey = MicroBlogKey(id = "account", host = "test.com")
+
+            val refUser = createUser(MicroBlogKey(id = "ref-user", host = "test.com"), "Ref User")
+            val refPost =
+                createPost(
+                    accountKey = accountKey,
+                    user = refUser,
+                    statusKey = MicroBlogKey(id = "ref-status-2", host = "test.com"),
+                    text = "ref status",
+                )
+
+            val mainUser = createUser(MicroBlogKey(id = "main-user", host = "test.com"), "Main User")
+            val withParents =
+                createPost(
+                    accountKey = accountKey,
+                    user = mainUser,
+                    statusKey = MicroBlogKey(id = "main-status-2", host = "test.com"),
+                    text = "main status",
+                    parents = persistentListOf(refPost),
+                )
+
+            saveToDatabase(db, listOf(TimelinePagingMapper.toDb(withParents, pagingKey = "home")))
+            val withoutParents = withParents.copy(parents = persistentListOf())
+            saveToDatabase(db, listOf(TimelinePagingMapper.toDb(withoutParents, pagingKey = "post_only_${withParents.statusKey}")))
+
+            val saved = db.statusDao().get(withParents.statusKey, AccountType.Specific(accountKey)).first()
+            val savedPost = assertIs<UiTimelineV2.Post>(assertNotNull(saved).content)
+            assertEquals(1, savedPost.parents.size)
+            assertEquals(refPost.statusKey, savedPost.parents.first().statusKey)
+        }
+
     @Test
     fun toDbMapsReplyReference() =
         runTest {
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandlerTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandlerTest.kt
index 93c52826c..f61ad0318 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandlerTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandlerTest.kt
@@ -19,6 +19,7 @@ import dev.dimension.flare.ui.humanizer.PlatformFormatter
 import dev.dimension.flare.ui.model.ClickEvent
 import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.render.toUi
+import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -108,6 +109,81 @@ class PostHandlerTest : RobolectricTest() {
             assertTrue(pagingExists)
         }
 
+    @Test
+    fun postRefreshKeepsLocalParentsWhenRemoteParentsIsEmpty() =
+        runTest {
+            startKoin {
+                modules(
+                    module {
+                        single { db }
+                        single<CoroutineScope> { this@runTest }
+                        single<PlatformFormatter> { TestFormatter() }
+                    },
+                )
+            }
+
+            val parentKey = MicroBlogKey(id = "parent-1", host = "test.social")
+            val localWithParents = createPost(statusKey = postKey, parents = persistentListOf(createPost(statusKey = parentKey)))
+            db.statusDao().insert(
+                DbStatus(
+                    statusKey = postKey,
+                    accountType = accountType,
+                    content = localWithParents,
+                    text = "text",
+                ),
+            )
+            fakeLoader.nextStatus = createPost(statusKey = postKey, parents = persistentListOf())
+
+            val handler = PostHandler(accountType = accountType, loader = fakeLoader)
+            val cacheable = handler.post(postKey)
+            val refreshState = cacheable.refreshState.drop(1).first()
+            assertTrue(refreshState is androidx.paging.LoadState.NotLoading)
+
+            val savedStatus = db.statusDao().get(postKey, accountType).first()
+            val savedPost = savedStatus?.content as? UiTimelineV2.Post
+            assertNotNull(savedPost)
+            assertEquals(1, savedPost.parents.size)
+            assertEquals(parentKey, savedPost.parents.first().statusKey)
+        }
+
+    @Test
+    fun postRefreshUsesRemoteParentsWhenRemoteParentsIsNotEmpty() =
+        runTest {
+            startKoin {
+                modules(
+                    module {
+                        single { db }
+                        single<CoroutineScope> { this@runTest }
+                        single<PlatformFormatter> { TestFormatter() }
+                    },
+                )
+            }
+
+            val localParentKey = MicroBlogKey(id = "local-parent", host = "test.social")
+            val remoteParentKey = MicroBlogKey(id = "remote-parent", host = "test.social")
+            val local = createPost(statusKey = postKey, parents = persistentListOf(createPost(statusKey = localParentKey)))
+            db.statusDao().insert(
+                DbStatus(
+                    statusKey = postKey,
+                    accountType = accountType,
+                    content = local,
+                    text = "text",
+                ),
+            )
+            fakeLoader.nextStatus = createPost(statusKey = postKey, parents = persistentListOf(createPost(statusKey = remoteParentKey)))
+
+            val handler = PostHandler(accountType = accountType, loader = fakeLoader)
+            val cacheable = handler.post(postKey)
+            val refreshState = cacheable.refreshState.drop(1).first()
+            assertTrue(refreshState is androidx.paging.LoadState.NotLoading)
+
+            val savedStatus = db.statusDao().get(postKey, accountType).first()
+            val savedPost = savedStatus?.content as? UiTimelineV2.Post
+            assertNotNull(savedPost)
+            assertEquals(1, savedPost.parents.size)
+            assertEquals(remoteParentKey, savedPost.parents.first().statusKey)
+        }
+
     @Test
     fun deleteSuccessRemovesStatusReferencesAndPaging() =
         runTest {
@@ -205,7 +281,10 @@ class PostHandlerTest : RobolectricTest() {
             assertTrue(pagingExists)
         }
 
-    private fun createPost(statusKey: MicroBlogKey): UiTimelineV2.Post =
+    private fun createPost(
+        statusKey: MicroBlogKey,
+        parents: PersistentList<UiTimelineV2.Post> = persistentListOf(),
+    ): UiTimelineV2.Post =
         UiTimelineV2.Post(
             message = null,
             platformType = PlatformType.Mastodon,
@@ -227,7 +306,7 @@ class PostHandlerTest : RobolectricTest() {
             sourceChannel = null,
             visibility = null,
             replyToHandle = null,
-            parents = persistentListOf(),
+            parents = parents,
             clickEvent = ClickEvent.Noop,
             accountType = accountType,
         )

From de5ff8c80a1bb816a871ddd3f93808f5c33bbf24 Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Fri, 6 Mar 2026 12:06:58 +0900
Subject: [PATCH 21/33] fix richtext

---
 .../flare/data/datasource/xqt/XQTLoader.kt    |  3 --
 .../presenter/profile/BlockUserPresenter.kt   |  6 ++--
 .../dimension/flare/ui/render/UiRichText.kt   | 15 +++++++---
 .../flare/ui/render/UiRichTextTest.kt         | 29 +++++++++++++++++++
 4 files changed, 43 insertions(+), 10 deletions(-)
 create mode 100644 shared/src/commonTest/kotlin/dev/dimension/flare/ui/render/UiRichTextTest.kt

diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTLoader.kt
index 3127a7693..eeaf9d8a9 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTLoader.kt
@@ -30,9 +30,6 @@ internal class XQTLoader(
     override suspend fun notificationBadgeCount(): Int = service.getBadgeCount().ntabUnreadCount?.toInt() ?: 0
 
     override suspend fun userByHandleAndHost(uiHandle: UiHandle): UiProfile {
-        require(uiHandle.normalizedHost == accountKey.host) {
-            "Cross-host lookup is unsupported for XQT: ${uiHandle.normalizedHost}"
-        }
         val user =
             service
                 .userByScreenName(uiHandle.normalizedRaw)
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/BlockUserPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/BlockUserPresenter.kt
index be0620210..d5c650bca 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/BlockUserPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/BlockUserPresenter.kt
@@ -2,7 +2,7 @@ package dev.dimension.flare.ui.presenter.profile
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
-import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
+import dev.dimension.flare.data.datasource.microblog.datasource.RelationDataSource
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceFlow
 import dev.dimension.flare.model.AccountType
@@ -36,8 +36,8 @@ public class BlockUserPresenter(
                         accountServiceFlow(accountType, repository = accountRepository)
                             .firstOrNull()
                             ?.let {
-                                if (it is RelationLoader) {
-                                    it.block(userKey)
+                                if (it is RelationDataSource) {
+                                    it.relationHandler.block(userKey)
                                 }
                             }
                     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/render/UiRichText.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/render/UiRichText.kt
index f6e89a93e..0ce11021e 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/render/UiRichText.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/render/UiRichText.kt
@@ -21,8 +21,7 @@ public data class UiRichText(
     public val innerText: String = data.wholeText()
     val raw: String by lazy {
         data
-            .nodeStream()
-            .map { node ->
+            .nodeStream().joinToString("") { node ->
                 when {
                     node is TextNode -> node.getWholeText()
                     node.nameIs("br") -> "\n"
@@ -30,9 +29,9 @@ public data class UiRichText(
                     node.nameIs("emoji") -> node.attr("alt")
                     else -> ""
                 }
-            }.joinToString("")
+            }
     }
-    val html: String = data.html()
+    val html: String = data.compactHtml()
     public val isEmpty: Boolean = raw.isEmpty() && data.getAllElements().size <= 1
     public val isLongText: Boolean = innerText.codePointCount() > 480
 
@@ -59,6 +58,14 @@ internal object UiRichTextSerializer : KSerializer<UiRichText> {
     }
 }
 
+private fun Element.compactHtml(): String {
+    val root = clone()
+    val document = Ksoup.parse("")
+    document.outputSettings().prettyPrint(false)
+    document.body().appendChild(root)
+    return root.html()
+}
+
 internal fun Element.toUi(): UiRichText =
     UiRichText(
         data = this,
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/render/UiRichTextTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/render/UiRichTextTest.kt
new file mode 100644
index 000000000..1e27ecf0c
--- /dev/null
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/render/UiRichTextTest.kt
@@ -0,0 +1,29 @@
+package dev.dimension.flare.ui.render
+
+import com.fleeksoft.ksoup.nodes.Element
+import kotlinx.serialization.json.Json
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+
+class UiRichTextTest {
+    @Test
+    fun serializerDoesNotPrettyPrintBrLines() {
+        val uiRichText =
+            UiRichText(
+                data =
+                    Element("body").apply {
+                        appendText("Line 1")
+                        appendChild(Element("br"))
+                        appendText("Line 2")
+                    },
+                isRtl = false,
+            )
+
+        val encoded = Json.encodeToString(uiRichText)
+        val decoded = Json.decodeFromString<UiRichText>(encoded)
+
+        assertFalse(encoded.contains("\\n "))
+        assertEquals("Line 1\nLine 2", decoded.raw)
+    }
+}

From c60896a93c93843162ed38b691f17f7701b459f4 Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Fri, 6 Mar 2026 13:02:52 +0900
Subject: [PATCH 22/33] fix profile relation

---
 .../dev/dimension/flare/ui/route/Route.kt     |  22 ++++
 .../ui/screen/profile/BlockUserDialog.kt      |  76 +++++++++++++
 .../ui/screen/profile/ProfileEntryBuilder.kt  |  22 +++-
 app/src/main/res/values/strings.xml           |   4 +
 .../platform/PlatformButton.android.kt        |  36 +++++++
 .../flare/ui/component/ProfileHeader.kt       | 100 ++++++++++++++----
 .../ui/component/platform/PlatformButton.kt   |  16 +++
 .../component/platform/PlatformButton.ios.kt  |  38 +++++++
 .../component/platform/PlatformButton.jvm.kt  |  64 +++++++++++
 .../main/composeResources/values/strings.xml  |   4 +
 .../dev/dimension/flare/ui/route/Route.kt     |  22 ++++
 .../dev/dimension/flare/ui/route/Router.kt    |  20 ++++
 .../flare/ui/screen/home/BlockUserDialog.kt   |  71 +++++++++++++
 .../datasource/bluesky/BlueskyDataSource.kt   |   3 +
 .../data/datasource/bluesky/BlueskyLoader.kt  |   8 ++
 .../datasource/mastodon/MastodonDataSource.kt |   3 +
 .../datasource/mastodon/MastodonLoader.kt     |   8 ++
 .../datasource/RelationDataSource.kt          |   2 +
 .../microblog/loader/RelationLoader.kt        |   7 ++
 .../datasource/misskey/MisskeyDataSource.kt   |   3 +
 .../data/datasource/misskey/MisskeyLoader.kt  |   8 ++
 .../data/datasource/vvo/VVODataSource.kt      |   3 +
 .../flare/data/datasource/vvo/VVOLoader.kt    |   3 +
 .../data/datasource/xqt/XQTDataSource.kt      |   3 +
 .../flare/data/datasource/xqt/XQTLoader.kt    |   8 ++
 .../ui/presenter/profile/ProfilePresenter.kt  |  77 +++++++++-----
 .../presenter/profile/UnblockUserPresenter.kt |  47 ++++++++
 .../presenter/profile/UnmuteUserPresenter.kt  |  47 ++++++++
 .../dimension/flare/ui/render/UiRichText.kt   |   3 +-
 .../dimension/flare/ui/route/DeeplinkRoute.kt |  12 +++
 30 files changed, 695 insertions(+), 45 deletions(-)
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/UnblockUserPresenter.kt
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/UnmuteUserPresenter.kt

diff --git a/app/src/main/java/dev/dimension/flare/ui/route/Route.kt b/app/src/main/java/dev/dimension/flare/ui/route/Route.kt
index 482cf3bb0..04243bcb1 100644
--- a/app/src/main/java/dev/dimension/flare/ui/route/Route.kt
+++ b/app/src/main/java/dev/dimension/flare/ui/route/Route.kt
@@ -448,12 +448,24 @@ internal sealed interface Route : NavKey {
         val userKey: MicroBlogKey,
     ) : Route
 
+    @Serializable
+    public data class UnblockUser(
+        val accountType: AccountType?,
+        val userKey: MicroBlogKey,
+    ) : Route
+
     @Serializable
     public data class MuteUser(
         val accountType: AccountType?,
         val userKey: MicroBlogKey,
     ) : Route
 
+    @Serializable
+    public data class UnmuteUser(
+        val accountType: AccountType?,
+        val userKey: MicroBlogKey,
+    ) : Route
+
     @Serializable
     public data class ReportUser(
         val accountType: AccountType?,
@@ -625,6 +637,11 @@ internal sealed interface Route : NavKey {
                         accountType = deeplinkRoute.accountKey?.let { AccountType.Specific(it) },
                         userKey = deeplinkRoute.userKey,
                     )
+                is DeeplinkRoute.UnblockUser ->
+                    Route.UnblockUser(
+                        accountType = deeplinkRoute.accountKey?.let { AccountType.Specific(it) },
+                        userKey = deeplinkRoute.userKey,
+                    )
                 is DeeplinkRoute.DirectMessage ->
                     DM.UserConversation(
                         accountType = AccountType.Specific(deeplinkRoute.accountKey),
@@ -640,6 +657,11 @@ internal sealed interface Route : NavKey {
                         accountType = deeplinkRoute.accountKey?.let { AccountType.Specific(it) },
                         userKey = deeplinkRoute.userKey,
                     )
+                is DeeplinkRoute.UnmuteUser ->
+                    Route.UnmuteUser(
+                        accountType = deeplinkRoute.accountKey?.let { AccountType.Specific(it) },
+                        userKey = deeplinkRoute.userKey,
+                    )
                 is DeeplinkRoute.ReportUser ->
                     Route.ReportUser(
                         accountType = deeplinkRoute.accountKey?.let { AccountType.Specific(it) },
diff --git a/app/src/main/java/dev/dimension/flare/ui/screen/profile/BlockUserDialog.kt b/app/src/main/java/dev/dimension/flare/ui/screen/profile/BlockUserDialog.kt
index a2abdc32e..00fcf9ce3 100644
--- a/app/src/main/java/dev/dimension/flare/ui/screen/profile/BlockUserDialog.kt
+++ b/app/src/main/java/dev/dimension/flare/ui/screen/profile/BlockUserDialog.kt
@@ -12,6 +12,8 @@ import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.presenter.profile.BlockUserPresenter
 import dev.dimension.flare.ui.presenter.profile.MuteUserPresenter
+import dev.dimension.flare.ui.presenter.profile.UnblockUserPresenter
+import dev.dimension.flare.ui.presenter.profile.UnmuteUserPresenter
 import moe.tlaster.precompose.molecule.producePresenter
 
 @Composable
@@ -88,6 +90,80 @@ internal fun MuteUserDialog(
     )
 }
 
+@Composable
+internal fun UnblockUserDialog(
+    accountType: AccountType?,
+    userKey: MicroBlogKey,
+    onBack: () -> Unit,
+) {
+    val state by producePresenter("unblock_user_${accountType}_$userKey") {
+        remember {
+            UnblockUserPresenter(accountType, userKey)
+        }.body()
+    }
+    AlertDialog(
+        onDismissRequest = onBack,
+        title = {
+            Text(text = stringResource(id = R.string.unblock_user_title))
+        },
+        text = {
+            Text(text = stringResource(id = R.string.unblock_user_description))
+        },
+        confirmButton = {
+            TextButton(
+                onClick = {
+                    state.confirm()
+                    onBack.invoke()
+                },
+            ) {
+                Text(text = stringResource(id = android.R.string.ok))
+            }
+        },
+        dismissButton = {
+            TextButton(onClick = onBack) {
+                Text(text = stringResource(id = android.R.string.cancel))
+            }
+        },
+    )
+}
+
+@Composable
+internal fun UnmuteUserDialog(
+    accountType: AccountType?,
+    userKey: MicroBlogKey,
+    onBack: () -> Unit,
+) {
+    val state by producePresenter("unmute_user_${accountType}_$userKey") {
+        remember {
+            UnmuteUserPresenter(accountType, userKey)
+        }.body()
+    }
+    AlertDialog(
+        onDismissRequest = onBack,
+        title = {
+            Text(text = stringResource(id = R.string.unmute_user_title))
+        },
+        text = {
+            Text(text = stringResource(id = R.string.unmute_user_description))
+        },
+        confirmButton = {
+            TextButton(
+                onClick = {
+                    state.confirm()
+                    onBack.invoke()
+                },
+            ) {
+                Text(text = stringResource(id = android.R.string.ok))
+            }
+        },
+        dismissButton = {
+            TextButton(onClick = onBack) {
+                Text(text = stringResource(id = android.R.string.cancel))
+            }
+        },
+    )
+}
+
 @Composable
 internal fun ReportUserDialog(
     accountType: AccountType?,
diff --git a/app/src/main/java/dev/dimension/flare/ui/screen/profile/ProfileEntryBuilder.kt b/app/src/main/java/dev/dimension/flare/ui/screen/profile/ProfileEntryBuilder.kt
index 5fd881c7b..d86b5008b 100644
--- a/app/src/main/java/dev/dimension/flare/ui/screen/profile/ProfileEntryBuilder.kt
+++ b/app/src/main/java/dev/dimension/flare/ui/screen/profile/ProfileEntryBuilder.kt
@@ -232,6 +232,26 @@ internal fun EntryProviderScope<NavKey>.profileEntryBuilder(
         )
     }
 
+    entry<Route.UnblockUser>(
+        metadata = DialogSceneStrategy.dialog()
+    ) {
+        UnblockUserDialog(
+            accountType = it.accountType,
+            userKey = it.userKey,
+            onBack = onBack,
+        )
+    }
+
+    entry<Route.UnmuteUser>(
+        metadata = DialogSceneStrategy.dialog()
+    ) {
+        UnmuteUserDialog(
+            accountType = it.accountType,
+            userKey = it.userKey,
+            onBack = onBack,
+        )
+    }
+
     entry<Route.ReportUser>(
         metadata = DialogSceneStrategy.dialog()
     ) {
@@ -243,4 +263,4 @@ internal fun EntryProviderScope<NavKey>.profileEntryBuilder(
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9b39b71e5..79317f540 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -410,9 +410,13 @@
 
     <string name="block_user_title">Block user</string>
     <string name="block_user_description">Are you sure you want to block this user?</string>
+    <string name="unblock_user_title">Unblock user</string>
+    <string name="unblock_user_description">Are you sure you want to unblock this user?</string>
 
     <string name="mute_user_title">Mute user</string>
     <string name="mute_user_description">Are you sure you want to mute this user?</string>
+    <string name="unmute_user_title">Unmute user</string>
+    <string name="unmute_user_description">Are you sure you want to unmute this user?</string>
 
     <string name="report_user_title">Report user</string>
     <string name="report_user_description">Are you sure you want to report this user?</string>
diff --git a/compose-ui/src/androidMain/kotlin/dev/dimension/flare/ui/component/platform/PlatformButton.android.kt b/compose-ui/src/androidMain/kotlin/dev/dimension/flare/ui/component/platform/PlatformButton.android.kt
index 93ff1b967..c99769f7a 100644
--- a/compose-ui/src/androidMain/kotlin/dev/dimension/flare/ui/component/platform/PlatformButton.android.kt
+++ b/compose-ui/src/androidMain/kotlin/dev/dimension/flare/ui/component/platform/PlatformButton.android.kt
@@ -1,6 +1,7 @@
 package dev.dimension.flare.ui.component.platform
 
 import androidx.compose.foundation.layout.RowScope
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 
@@ -50,6 +51,41 @@ internal actual fun PlatformFilledTonalButton(
     )
 }
 
+@Composable
+internal actual fun PlatformOutlinedButton(
+    onClick: () -> Unit,
+    modifier: Modifier,
+    enabled: Boolean,
+    content: @Composable RowScope.() -> Unit,
+) {
+    androidx.compose.material3.OutlinedButton(
+        onClick = onClick,
+        modifier = modifier,
+        content = content,
+        enabled = enabled,
+    )
+}
+
+@Composable
+internal actual fun PlatformErrorButton(
+    onClick: () -> Unit,
+    modifier: Modifier,
+    enabled: Boolean,
+    content: @Composable RowScope.() -> Unit,
+) {
+    androidx.compose.material3.FilledTonalButton(
+        onClick = onClick,
+        modifier = modifier,
+        content = content,
+        enabled = enabled,
+        colors =
+            androidx.compose.material3.ButtonDefaults.filledTonalButtonColors(
+                containerColor = MaterialTheme.colorScheme.errorContainer,
+                contentColor = MaterialTheme.colorScheme.onErrorContainer,
+            ),
+    )
+}
+
 @Composable
 internal actual fun PlatformIconButton(
     onClick: () -> Unit,
diff --git a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/ProfileHeader.kt b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/ProfileHeader.kt
index a80a581c9..b5ee3a421 100644
--- a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/ProfileHeader.kt
+++ b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/ProfileHeader.kt
@@ -1,5 +1,11 @@
 package dev.dimension.flare.ui.component
 
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.scaleIn
+import androidx.compose.animation.scaleOut
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -41,13 +47,16 @@ import dev.dimension.flare.compose.ui.profile_header_button_is_fans
 import dev.dimension.flare.compose.ui.profile_header_button_requested
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.component.placeholder
+import dev.dimension.flare.ui.component.platform.PlatformErrorButton
 import dev.dimension.flare.ui.component.platform.PlatformFilledTonalButton
+import dev.dimension.flare.ui.component.platform.PlatformOutlinedButton
 import dev.dimension.flare.ui.component.platform.PlatformText
 import dev.dimension.flare.ui.component.platform.isBigScreen
 import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.UiRelation
 import dev.dimension.flare.ui.model.UiState
 import dev.dimension.flare.ui.model.onSuccess
+import dev.dimension.flare.ui.model.takeSuccess
 import dev.dimension.flare.ui.presenter.profile.ProfileState
 import dev.dimension.flare.ui.route.DeeplinkRoute
 import dev.dimension.flare.ui.route.toUri
@@ -80,7 +89,9 @@ public fun ProfileHeader(
                 modifier = modifier,
                 user = userState.data,
                 relationState = state.relationState,
+                myAccountKey = state.myAccountKey,
                 onFollowClick = state::follow,
+                onUnfollowClick = state::unfollow,
                 isMe = state.isMe,
                 menu = menu,
                 expandMatrices = isBigScreen,
@@ -97,7 +108,9 @@ public fun ProfileHeader(
 private fun ProfileHeaderSuccess(
     user: UiProfile,
     relationState: UiState<UiRelation>,
-    onFollowClick: (userKey: MicroBlogKey, UiRelation) -> Unit,
+    myAccountKey: UiState<MicroBlogKey>,
+    onFollowClick: (userKey: MicroBlogKey) -> Unit,
+    onUnfollowClick: (userKey: MicroBlogKey) -> Unit,
     onAvatarClick: () -> Unit,
     onBannerClick: () -> Unit,
     isMe: UiState<Boolean>,
@@ -136,32 +149,63 @@ private fun ProfileHeaderSuccess(
                         }
 
                         is UiState.Success -> {
+                            val relation = relationState.data
                             Column(
                                 horizontalAlignment = Alignment.CenterHorizontally,
                             ) {
-                                PlatformFilledTonalButton(onClick = {
-                                    onFollowClick.invoke(user.key, relationState.data)
-                                }) {
-                                    PlatformText(
-                                        text =
-                                            stringResource(
-                                                when {
-                                                    relationState.data.blocking ->
-                                                        Res.string.profile_header_button_blocked
+                                AnimatedContent(
+                                    targetState = FollowButtonState.from(relation),
+                                    transitionSpec = {
+                                        (fadeIn() + scaleIn(initialScale = 0.92f)) togetherWith
+                                            (fadeOut() + scaleOut(targetScale = 0.92f))
+                                    },
+                                    label = "profile_follow_button",
+                                ) { buttonState ->
+                                    when (buttonState) {
+                                        FollowButtonState.Blocked ->
+                                            PlatformErrorButton(
+                                                onClick = {
+                                                    uriLauncher.openUri(
+                                                        DeeplinkRoute
+                                                            .UnblockUser(
+                                                                accountKey = myAccountKey.takeSuccess(),
+                                                                userKey = user.key,
+                                                            ).toUri(),
+                                                    )
+                                                },
+                                            ) {
+                                                PlatformText(text = stringResource(Res.string.profile_header_button_blocked))
+                                            }
 
-                                                    relationState.data.following ->
-                                                        Res.string.profile_header_button_following
+                                        FollowButtonState.Following ->
+                                            PlatformOutlinedButton(
+                                                onClick = {
+                                                    onUnfollowClick.invoke(user.key)
+                                                },
+                                            ) {
+                                                PlatformText(text = stringResource(Res.string.profile_header_button_following))
+                                            }
 
-                                                    relationState.data.hasPendingFollowRequestFromYou ->
-                                                        Res.string.profile_header_button_requested
+                                        FollowButtonState.Requested ->
+                                            PlatformOutlinedButton(
+                                                onClick = {
+                                                    onUnfollowClick.invoke(user.key)
+                                                },
+                                            ) {
+                                                PlatformText(text = stringResource(Res.string.profile_header_button_requested))
+                                            }
 
-                                                    else ->
-                                                        Res.string.profile_header_button_follow
+                                        FollowButtonState.Follow ->
+                                            PlatformFilledTonalButton(
+                                                onClick = {
+                                                    onFollowClick.invoke(user.key)
                                                 },
-                                            ),
-                                    )
+                                            ) {
+                                                PlatformText(text = stringResource(Res.string.profile_header_button_follow))
+                                            }
+                                    }
                                 }
-                                if (relationState.data.isFans) {
+                                if (relation.isFans) {
                                     PlatformText(
                                         text = stringResource(Res.string.profile_header_button_is_fans),
                                         textAlign = TextAlign.Center,
@@ -280,6 +324,24 @@ private fun ProfileHeaderSuccess(
     )
 }
 
+private enum class FollowButtonState {
+    Follow,
+    Requested,
+    Following,
+    Blocked,
+    ;
+
+    companion object {
+        fun from(relation: UiRelation): FollowButtonState =
+            when {
+                relation.blocking -> Blocked
+                relation.following -> Following
+                relation.hasPendingFollowRequestFromYou -> Requested
+                else -> Follow
+            }
+    }
+}
+
 @Composable
 private fun ProfileHeaderError() {
 }
diff --git a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/platform/PlatformButton.kt b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/platform/PlatformButton.kt
index 80634c813..4f89faefb 100644
--- a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/platform/PlatformButton.kt
+++ b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/platform/PlatformButton.kt
@@ -28,6 +28,22 @@ internal expect fun PlatformFilledTonalButton(
     content: @Composable RowScope.() -> Unit,
 )
 
+@Composable
+internal expect fun PlatformOutlinedButton(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    enabled: Boolean = true,
+    content: @Composable RowScope.() -> Unit,
+)
+
+@Composable
+internal expect fun PlatformErrorButton(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    enabled: Boolean = true,
+    content: @Composable RowScope.() -> Unit,
+)
+
 @Composable
 internal expect fun PlatformIconButton(
     onClick: () -> Unit,
diff --git a/compose-ui/src/iosMain/kotlin/dev/dimension/flare/ui/component/platform/PlatformButton.ios.kt b/compose-ui/src/iosMain/kotlin/dev/dimension/flare/ui/component/platform/PlatformButton.ios.kt
index 6f67d072e..120b3a75f 100644
--- a/compose-ui/src/iosMain/kotlin/dev/dimension/flare/ui/component/platform/PlatformButton.ios.kt
+++ b/compose-ui/src/iosMain/kotlin/dev/dimension/flare/ui/component/platform/PlatformButton.ios.kt
@@ -5,10 +5,12 @@ package dev.dimension.flare.ui.component.platform
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import com.slapps.cupertino.CupertinoButton
 import com.slapps.cupertino.CupertinoButtonDefaults
 import com.slapps.cupertino.CupertinoIconButton
 import com.slapps.cupertino.ExperimentalCupertinoApi
+import dev.dimension.flare.ui.theme.PlatformTheme
 
 @Composable
 internal actual fun PlatformButton(
@@ -57,6 +59,42 @@ internal actual fun PlatformFilledTonalButton(
     )
 }
 
+@Composable
+internal actual fun PlatformOutlinedButton(
+    onClick: () -> Unit,
+    modifier: Modifier,
+    enabled: Boolean,
+    content: @Composable (RowScope.() -> Unit),
+) {
+    CupertinoButton(
+        onClick = onClick,
+        modifier = modifier,
+        content = content,
+        enabled = enabled,
+        colors = CupertinoButtonDefaults.tintedButtonColors(),
+    )
+}
+
+@Composable
+internal actual fun PlatformErrorButton(
+    onClick: () -> Unit,
+    modifier: Modifier,
+    enabled: Boolean,
+    content: @Composable (RowScope.() -> Unit),
+) {
+    CupertinoButton(
+        onClick = onClick,
+        modifier = modifier,
+        content = content,
+        enabled = enabled,
+        colors =
+            CupertinoButtonDefaults.filledButtonColors(
+                containerColor = PlatformTheme.colorScheme.error,
+                contentColor = Color.White,
+            ),
+    )
+}
+
 @Composable
 internal actual fun PlatformIconButton(
     onClick: () -> Unit,
diff --git a/compose-ui/src/jvmMain/kotlin/dev/dimension/flare/ui/component/platform/PlatformButton.jvm.kt b/compose-ui/src/jvmMain/kotlin/dev/dimension/flare/ui/component/platform/PlatformButton.jvm.kt
index b798f83f6..f54643497 100644
--- a/compose-ui/src/jvmMain/kotlin/dev/dimension/flare/ui/component/platform/PlatformButton.jvm.kt
+++ b/compose-ui/src/jvmMain/kotlin/dev/dimension/flare/ui/component/platform/PlatformButton.jvm.kt
@@ -3,8 +3,14 @@ package dev.dimension.flare.ui.component.platform
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.SolidColor
+import dev.dimension.flare.ui.theme.PlatformTheme
+import io.github.composefluent.FluentTheme
 import io.github.composefluent.component.AccentButton
 import io.github.composefluent.component.Button
+import io.github.composefluent.component.ButtonColor
+import io.github.composefluent.component.ButtonDefaults
 import io.github.composefluent.component.SubtleButton
 
 @Composable
@@ -52,6 +58,64 @@ internal actual fun PlatformFilledTonalButton(
     )
 }
 
+@Composable
+internal actual fun PlatformOutlinedButton(
+    onClick: () -> Unit,
+    modifier: Modifier,
+    enabled: Boolean,
+    content: @Composable RowScope.() -> Unit,
+) {
+    Button(
+        onClick = onClick,
+        modifier = modifier,
+        content = content,
+        disabled = !enabled,
+    )
+}
+
+@Composable
+internal actual fun PlatformErrorButton(
+    onClick: () -> Unit,
+    modifier: Modifier,
+    enabled: Boolean,
+    content: @Composable RowScope.() -> Unit,
+) {
+    val error = PlatformTheme.colorScheme.error
+    AccentButton(
+        onClick = onClick,
+        modifier = modifier,
+        content = content,
+        disabled = !enabled,
+        buttonColors =
+            ButtonDefaults.accentButtonColors(
+                default =
+                    ButtonColor(
+                        fillColor = error,
+                        contentColor = Color.White,
+                        borderBrush = FluentTheme.colors.borders.accentControl,
+                    ),
+                hovered =
+                    ButtonColor(
+                        fillColor = error.copy(alpha = 0.92f),
+                        contentColor = Color.White,
+                        borderBrush = FluentTheme.colors.borders.accentControl,
+                    ),
+                pressed =
+                    ButtonColor(
+                        fillColor = error.copy(alpha = 0.84f),
+                        contentColor = Color.White,
+                        borderBrush = FluentTheme.colors.borders.accentControl,
+                    ),
+                disabled =
+                    ButtonColor(
+                        fillColor = error.copy(alpha = 0.4f),
+                        contentColor = Color.White.copy(alpha = 0.7f),
+                        borderBrush = SolidColor(Color.Transparent),
+                    ),
+            ),
+    )
+}
+
 @Composable
 internal actual fun PlatformIconButton(
     onClick: () -> Unit,
diff --git a/desktopApp/src/main/composeResources/values/strings.xml b/desktopApp/src/main/composeResources/values/strings.xml
index 210a4e475..e1f9954ee 100644
--- a/desktopApp/src/main/composeResources/values/strings.xml
+++ b/desktopApp/src/main/composeResources/values/strings.xml
@@ -360,9 +360,13 @@
 
     <string name="block_user_title">Block user</string>
     <string name="block_user_description">Are you sure you want to block this user?</string>
+    <string name="unblock_user_title">Unblock user</string>
+    <string name="unblock_user_description">Are you sure you want to unblock this user?</string>
 
     <string name="mute_user_title">Mute user</string>
     <string name="mute_user_description">Are you sure you want to mute this user?</string>
+    <string name="unmute_user_title">Unmute user</string>
+    <string name="unmute_user_description">Are you sure you want to unmute this user?</string>
 
     <string name="report_user_title">Report user</string>
     <string name="report_user_description">Are you sure you want to report this user?</string>
diff --git a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/route/Route.kt b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/route/Route.kt
index 50637eeea..fa6affd10 100644
--- a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/route/Route.kt
+++ b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/route/Route.kt
@@ -243,12 +243,24 @@ internal sealed interface Route : NavKey {
         val userKey: MicroBlogKey,
     ) : FloatingRoute
 
+    @Serializable
+    data class UnblockUser(
+        val accountType: AccountType?,
+        val userKey: MicroBlogKey,
+    ) : FloatingRoute
+
     @Serializable
     data class MuteUser(
         val accountType: AccountType?,
         val userKey: MicroBlogKey,
     ) : FloatingRoute
 
+    @Serializable
+    data class UnmuteUser(
+        val accountType: AccountType?,
+        val userKey: MicroBlogKey,
+    ) : FloatingRoute
+
     @Serializable
     data class ReportUser(
         val accountType: AccountType?,
@@ -404,6 +416,11 @@ internal sealed interface Route : NavKey {
                         accountType = deeplinkRoute.accountKey?.let { AccountType.Specific(it) },
                         userKey = deeplinkRoute.userKey,
                     )
+                is DeeplinkRoute.UnmuteUser ->
+                    Route.UnmuteUser(
+                        accountType = deeplinkRoute.accountKey?.let { AccountType.Specific(it) },
+                        userKey = deeplinkRoute.userKey,
+                    )
                 is DeeplinkRoute.ReportUser ->
                     Route.ReportUser(
                         accountType = deeplinkRoute.accountKey?.let { AccountType.Specific(it) },
@@ -415,6 +432,11 @@ internal sealed interface Route : NavKey {
                         accountType = deeplinkRoute.accountKey?.let { AccountType.Specific(it) },
                         userKey = deeplinkRoute.userKey,
                     )
+                is DeeplinkRoute.UnblockUser ->
+                    Route.UnblockUser(
+                        accountType = deeplinkRoute.accountKey?.let { AccountType.Specific(it) },
+                        userKey = deeplinkRoute.userKey,
+                    )
             }
         }
     }
diff --git a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/route/Router.kt b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/route/Router.kt
index 519c25087..fbbaf2cd5 100644
--- a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/route/Router.kt
+++ b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/route/Router.kt
@@ -65,6 +65,8 @@ import dev.dimension.flare.ui.screen.home.ReportUserDialog
 import dev.dimension.flare.ui.screen.home.SearchScreen
 import dev.dimension.flare.ui.screen.home.TabSettingScreen
 import dev.dimension.flare.ui.screen.home.TimelineScreen
+import dev.dimension.flare.ui.screen.home.UnblockUserDialog
+import dev.dimension.flare.ui.screen.home.UnmuteUserDialog
 import dev.dimension.flare.ui.screen.list.AllListScreen
 import dev.dimension.flare.ui.screen.media.RawMediaScreen
 import dev.dimension.flare.ui.screen.media.StatusMediaScreen
@@ -834,6 +836,24 @@ internal fun WindowScope.Router(
                         onBack = onBack,
                     )
                 }
+                entry<Route.UnblockUser>(
+                    metadata = dialog(),
+                ) { args ->
+                    UnblockUserDialog(
+                        accountType = args.accountType,
+                        userKey = args.userKey,
+                        onBack = onBack,
+                    )
+                }
+                entry<Route.UnmuteUser>(
+                    metadata = dialog(),
+                ) { args ->
+                    UnmuteUserDialog(
+                        accountType = args.accountType,
+                        userKey = args.userKey,
+                        onBack = onBack,
+                    )
+                }
                 entry<Route.ReportUser>(
                     metadata = dialog(),
                 ) { args ->
diff --git a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/BlockUserDialog.kt b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/BlockUserDialog.kt
index 131a3991d..64903043b 100644
--- a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/BlockUserDialog.kt
+++ b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/BlockUserDialog.kt
@@ -16,6 +16,12 @@ import dev.dimension.flare.report_user_description
 import dev.dimension.flare.report_user_title
 import dev.dimension.flare.ui.presenter.profile.BlockUserPresenter
 import dev.dimension.flare.ui.presenter.profile.MuteUserPresenter
+import dev.dimension.flare.ui.presenter.profile.UnblockUserPresenter
+import dev.dimension.flare.ui.presenter.profile.UnmuteUserPresenter
+import dev.dimension.flare.unblock_user_description
+import dev.dimension.flare.unblock_user_title
+import dev.dimension.flare.unmute_user_description
+import dev.dimension.flare.unmute_user_title
 import io.github.composefluent.component.ContentDialog
 import io.github.composefluent.component.ContentDialogButton
 import io.github.composefluent.component.Text
@@ -87,6 +93,71 @@ internal fun MuteUserDialog(
     )
 }
 
+@Composable
+internal fun UnblockUserDialog(
+    accountType: AccountType?,
+    userKey: MicroBlogKey,
+    onBack: () -> Unit,
+) {
+    val state by producePresenter("unblock_user_${accountType}_$userKey") {
+        remember {
+            UnblockUserPresenter(accountType, userKey)
+        }.body()
+    }
+    ContentDialog(
+        title = stringResource(Res.string.unblock_user_title),
+        visible = true,
+        content = {
+            Text(stringResource(Res.string.unblock_user_description))
+        },
+        primaryButtonText = stringResource(Res.string.ok),
+        closeButtonText = stringResource(Res.string.cancel),
+        onButtonClick = {
+            when (it) {
+                ContentDialogButton.Primary -> {
+                    state.confirm()
+                    onBack.invoke()
+                }
+                ContentDialogButton.Secondary -> onBack.invoke()
+                ContentDialogButton.Close -> onBack.invoke()
+            }
+        },
+    )
+}
+
+@Composable
+internal fun UnmuteUserDialog(
+    accountType: AccountType?,
+    userKey: MicroBlogKey,
+    onBack: () -> Unit,
+) {
+    val state by producePresenter("unmute_user_${accountType}_$userKey") {
+        remember {
+            UnmuteUserPresenter(accountType, userKey)
+        }.body()
+    }
+
+    ContentDialog(
+        title = stringResource(Res.string.unmute_user_title),
+        visible = true,
+        content = {
+            Text(stringResource(Res.string.unmute_user_description))
+        },
+        primaryButtonText = stringResource(Res.string.ok),
+        closeButtonText = stringResource(Res.string.cancel),
+        onButtonClick = {
+            when (it) {
+                ContentDialogButton.Primary -> {
+                    state.confirm()
+                    onBack.invoke()
+                }
+                ContentDialogButton.Secondary -> onBack.invoke()
+                ContentDialogButton.Close -> onBack.invoke()
+            }
+        },
+    )
+}
+
 @Composable
 internal fun ReportUserDialog(
     accountType: AccountType?,
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
index 4579fc00f..ccaaeab61 100644
--- 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
@@ -210,6 +210,9 @@ internal class BlueskyDataSource(
         )
     }
 
+    override val supportedRelationTypes: Set<dev.dimension.flare.data.datasource.microblog.loader.RelationActionType>
+        get() = loader.supportedTypes
+
     override val postEventHandler by lazy {
         PostEventHandler(
             accountKey = accountKey,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyLoader.kt
index d7270e30c..87577af60 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyLoader.kt
@@ -10,6 +10,7 @@ import com.atproto.repo.CreateRecordRequest
 import com.atproto.repo.DeleteRecordRequest
 import dev.dimension.flare.data.datasource.microblog.loader.NotificationLoader
 import dev.dimension.flare.data.datasource.microblog.loader.PostLoader
+import dev.dimension.flare.data.datasource.microblog.loader.RelationActionType
 import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
 import dev.dimension.flare.data.datasource.microblog.loader.UserLoader
 import dev.dimension.flare.data.network.bluesky.BlueskyService
@@ -34,6 +35,13 @@ internal class BlueskyLoader(
     UserLoader,
     PostLoader,
     RelationLoader {
+    override val supportedTypes: Set<RelationActionType> =
+        setOf(
+            RelationActionType.Follow,
+            RelationActionType.Block,
+            RelationActionType.Mute,
+        )
+
     override suspend fun userByHandleAndHost(uiHandle: UiHandle): UiProfile =
         service
             .getProfile(GetProfileQueryParams(actor = Handle(handle = uiHandle.normalizedRaw)))
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt
index 365c927a5..730505455 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt
@@ -117,6 +117,9 @@ internal open class MastodonDataSource(
         )
     }
 
+    override val supportedRelationTypes: Set<dev.dimension.flare.data.datasource.microblog.loader.RelationActionType>
+        get() = loader.supportedTypes
+
     override val postEventHandler by lazy {
         PostEventHandler(
             accountKey = accountKey,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonLoader.kt
index 436a585fc..f45c08f5d 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonLoader.kt
@@ -3,6 +3,7 @@ package dev.dimension.flare.data.datasource.mastodon
 import dev.dimension.flare.data.datasource.microblog.loader.EmojiLoader
 import dev.dimension.flare.data.datasource.microblog.loader.NotificationLoader
 import dev.dimension.flare.data.datasource.microblog.loader.PostLoader
+import dev.dimension.flare.data.datasource.microblog.loader.RelationActionType
 import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
 import dev.dimension.flare.data.datasource.microblog.loader.UserLoader
 import dev.dimension.flare.data.network.mastodon.MastodonService
@@ -27,6 +28,13 @@ internal class MastodonLoader(
     PostLoader,
     RelationLoader,
     EmojiLoader {
+    override val supportedTypes: Set<RelationActionType> =
+        setOf(
+            RelationActionType.Follow,
+            RelationActionType.Block,
+            RelationActionType.Mute,
+        )
+
     override suspend fun userByHandleAndHost(uiHandle: UiHandle): UiProfile =
         service
             .lookupUserByAcct("${uiHandle.normalizedRaw}@${uiHandle.normalizedHost}")
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/datasource/RelationDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/datasource/RelationDataSource.kt
index 708942a52..b5804372d 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/datasource/RelationDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/datasource/RelationDataSource.kt
@@ -1,7 +1,9 @@
 package dev.dimension.flare.data.datasource.microblog.datasource
 
 import dev.dimension.flare.data.datasource.microblog.handler.RelationHandler
+import dev.dimension.flare.data.datasource.microblog.loader.RelationActionType
 
 internal interface RelationDataSource {
     val relationHandler: RelationHandler
+    val supportedRelationTypes: Set<RelationActionType>
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/RelationLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/RelationLoader.kt
index cdcced3f6..b4e88b9c4 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/RelationLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/RelationLoader.kt
@@ -3,8 +3,15 @@ package dev.dimension.flare.data.datasource.microblog.loader
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiRelation
 
+internal enum class RelationActionType {
+    Follow,
+    Block,
+    Mute,
+}
+
 internal interface RelationLoader {
     val accountKey: MicroBlogKey
+    val supportedTypes: Set<RelationActionType>
 
     suspend fun relation(userKey: MicroBlogKey): UiRelation
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
index 0054b2cb2..d359b03eb 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
@@ -127,6 +127,9 @@ internal class MisskeyDataSource(
         )
     }
 
+    override val supportedRelationTypes: Set<dev.dimension.flare.data.datasource.microblog.loader.RelationActionType>
+        get() = loader.supportedTypes
+
     override val postEventHandler by lazy {
         PostEventHandler(
             accountKey = accountKey,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyLoader.kt
index cc5ab0ddf..f69c89303 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyLoader.kt
@@ -2,6 +2,7 @@ package dev.dimension.flare.data.datasource.misskey
 
 import dev.dimension.flare.data.datasource.microblog.loader.EmojiLoader
 import dev.dimension.flare.data.datasource.microblog.loader.PostLoader
+import dev.dimension.flare.data.datasource.microblog.loader.RelationActionType
 import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
 import dev.dimension.flare.data.datasource.microblog.loader.UserLoader
 import dev.dimension.flare.data.network.misskey.MisskeyService
@@ -29,6 +30,13 @@ internal class MisskeyLoader(
     PostLoader,
     RelationLoader,
     EmojiLoader {
+    override val supportedTypes: Set<RelationActionType> =
+        setOf(
+            RelationActionType.Follow,
+            RelationActionType.Block,
+            RelationActionType.Mute,
+        )
+
     override suspend fun userByHandleAndHost(uiHandle: UiHandle): UiProfile =
         service
             .usersShow(
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt
index 2c4d46e40..5fc130123 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt
@@ -115,6 +115,9 @@ internal class VVODataSource(
         )
     }
 
+    override val supportedRelationTypes: Set<dev.dimension.flare.data.datasource.microblog.loader.RelationActionType>
+        get() = loader.supportedTypes
+
     override val postEventHandler by lazy {
         PostEventHandler(
             accountKey = accountKey,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVOLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVOLoader.kt
index 18e9df8de..27a732a9c 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVOLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVOLoader.kt
@@ -4,6 +4,7 @@ import dev.dimension.flare.common.decodeJson
 import dev.dimension.flare.data.datasource.microblog.loader.EmojiLoader
 import dev.dimension.flare.data.datasource.microblog.loader.NotificationLoader
 import dev.dimension.flare.data.datasource.microblog.loader.PostLoader
+import dev.dimension.flare.data.datasource.microblog.loader.RelationActionType
 import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
 import dev.dimension.flare.data.datasource.microblog.loader.UserLoader
 import dev.dimension.flare.data.network.vvo.VVOService
@@ -31,6 +32,8 @@ internal class VVOLoader(
     RelationLoader,
     EmojiLoader,
     PostLoader {
+    override val supportedTypes: Set<RelationActionType> = setOf(RelationActionType.Follow)
+
     override suspend fun notificationBadgeCount(): Int {
         val st = ensureLogin()
         val response =
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt
index d098d8fd4..c5abbee50 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt
@@ -170,6 +170,9 @@ internal class XQTDataSource(
         )
     }
 
+    override val supportedRelationTypes: Set<dev.dimension.flare.data.datasource.microblog.loader.RelationActionType>
+        get() = loader.supportedTypes
+
     override val postEventHandler by lazy {
         PostEventHandler(
             accountKey = accountKey,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTLoader.kt
index eeaf9d8a9..b0be4c544 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTLoader.kt
@@ -4,6 +4,7 @@ import dev.dimension.flare.common.encodeJson
 import dev.dimension.flare.data.database.cache.mapper.tweets
 import dev.dimension.flare.data.datasource.microblog.loader.NotificationLoader
 import dev.dimension.flare.data.datasource.microblog.loader.PostLoader
+import dev.dimension.flare.data.datasource.microblog.loader.RelationActionType
 import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
 import dev.dimension.flare.data.datasource.microblog.loader.UserLoader
 import dev.dimension.flare.data.network.xqt.XQTService
@@ -27,6 +28,13 @@ internal class XQTLoader(
     UserLoader,
     PostLoader,
     RelationLoader {
+    override val supportedTypes: Set<RelationActionType> =
+        setOf(
+            RelationActionType.Follow,
+            RelationActionType.Block,
+            RelationActionType.Mute,
+        )
+
     override suspend fun notificationBadgeCount(): Int = service.getBadgeCount().ntabUnreadCount?.toInt() ?: 0
 
     override suspend fun userByHandleAndHost(uiHandle: UiHandle): UiProfile {
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt
index 756578271..4887cf49f 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt
@@ -13,6 +13,7 @@ import dev.dimension.flare.data.datasource.microblog.ProfileTab
 import dev.dimension.flare.data.datasource.microblog.datasource.ListDataSource
 import dev.dimension.flare.data.datasource.microblog.datasource.RelationDataSource
 import dev.dimension.flare.data.datasource.microblog.datasource.UserDataSource
+import dev.dimension.flare.data.datasource.microblog.loader.RelationActionType
 import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.NoActiveAccountException
@@ -165,6 +166,12 @@ public class ProfilePresenter(
         }
     }
 
+    private val supportedRelationTypesFlow by lazy {
+        serviceFlow.map { service ->
+            (service as? RelationDataSource)?.supportedRelationTypes.orEmpty()
+        }
+    }
+
     private val isGuestMode by lazy {
         accountType == AccountType.Guest
     }
@@ -182,6 +189,7 @@ public class ProfilePresenter(
             }
         }
         val isListDataSource by isListDataSourceFlow.collectAsUiState()
+        val supportedRelationTypes by supportedRelationTypesFlow.collectAsUiState()
         val relationState by relationStateFlow.flattenUiState()
         val isMe by isMeFlow.collectAsUiState()
         val canSendMessage by canSendMessageFlow.collectAsUiState()
@@ -193,12 +201,14 @@ public class ProfilePresenter(
                 isMe,
                 canSendMessage,
                 relationState,
+                supportedRelationTypes,
                 service,
                 userState,
                 myAccountKey,
             ) {
                 val user = userState.takeSuccess()
                 val accountKey = myAccountKey.takeSuccess()
+                val relationTypes = supportedRelationTypes.takeSuccessOr(emptySet())
                 if (isMe.takeSuccessOr(false) || user == null) {
                     emptyList()
                 } else {
@@ -247,7 +257,7 @@ public class ProfilePresenter(
                             ) +
                             relationState.takeSuccessOr(UiRelation()).let { relation ->
                                 listOfNotNull(
-                                    if (userKey != null) {
+                                    if (userKey != null && RelationActionType.Block in relationTypes) {
                                         ActionMenu.Item(
                                             icon = if (relation.blocking) UiIcon.UnBlock else UiIcon.Block,
                                             text =
@@ -260,16 +270,23 @@ public class ProfilePresenter(
                                                 ),
                                             clickEvent =
                                                 ClickEvent.Deeplink(
-                                                    DeeplinkRoute.BlockUser(
-                                                        accountKey = accountKey,
-                                                        userKey = userKey,
-                                                    ),
+                                                    if (relation.blocking) {
+                                                        DeeplinkRoute.UnblockUser(
+                                                            accountKey = accountKey,
+                                                            userKey = userKey,
+                                                        )
+                                                    } else {
+                                                        DeeplinkRoute.BlockUser(
+                                                            accountKey = accountKey,
+                                                            userKey = userKey,
+                                                        )
+                                                    },
                                                 ),
                                         )
                                     } else {
                                         null
                                     },
-                                    if (userKey != null) {
+                                    if (userKey != null && RelationActionType.Mute in relationTypes) {
                                         ActionMenu.Item(
                                             icon = if (relation.muted) UiIcon.UnMute else UiIcon.Mute,
                                             text =
@@ -282,10 +299,17 @@ public class ProfilePresenter(
                                                 ),
                                             clickEvent =
                                                 ClickEvent.Deeplink(
-                                                    DeeplinkRoute.MuteUser(
-                                                        accountKey = accountKey,
-                                                        userKey = userKey,
-                                                    ),
+                                                    if (relation.muted) {
+                                                        DeeplinkRoute.UnmuteUser(
+                                                            accountKey = accountKey,
+                                                            userKey = userKey,
+                                                        )
+                                                    } else {
+                                                        DeeplinkRoute.MuteUser(
+                                                            accountKey = accountKey,
+                                                            userKey = userKey,
+                                                        )
+                                                    },
                                                 ),
                                         )
                                     } else {
@@ -344,17 +368,21 @@ public class ProfilePresenter(
             canSendMessage = canSendMessage,
             tabs = tabs,
         ) {
-            override fun follow(
-                userKey: MicroBlogKey,
-                data: UiRelation,
-            ) {
+            override fun follow(userKey: MicroBlogKey) {
                 service.onSuccess { service ->
-                    val relationHandler = (service as RelationDataSource).relationHandler
-                    if (data.following) {
-                        relationHandler.unfollow(userKey)
-                    } else {
-                        relationHandler.follow(userKey)
-                    }
+                    (service as RelationDataSource).relationHandler.follow(userKey)
+                }
+            }
+
+            override fun unfollow(userKey: MicroBlogKey) {
+                service.onSuccess { service ->
+                    (service as RelationDataSource).relationHandler.unfollow(userKey)
+                }
+            }
+
+            override fun unblock(userKey: MicroBlogKey) {
+                service.onSuccess { service ->
+                    (service as RelationDataSource).relationHandler.unblock(userKey)
                 }
             }
 
@@ -376,10 +404,11 @@ public abstract class ProfileState(
     public val canSendMessage: UiState<Boolean>,
     public val tabs: UiState<ImmutableList<Tab>>,
 ) {
-    public abstract fun follow(
-        userKey: MicroBlogKey,
-        data: UiRelation,
-    )
+    public abstract fun follow(userKey: MicroBlogKey)
+
+    public abstract fun unfollow(userKey: MicroBlogKey)
+
+    public abstract fun unblock(userKey: MicroBlogKey)
 
     public abstract fun report(userKey: MicroBlogKey)
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/UnblockUserPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/UnblockUserPresenter.kt
new file mode 100644
index 000000000..3c77c0ebb
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/UnblockUserPresenter.kt
@@ -0,0 +1,47 @@
+package dev.dimension.flare.ui.presenter.profile
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import dev.dimension.flare.data.datasource.microblog.datasource.RelationDataSource
+import dev.dimension.flare.data.repository.AccountRepository
+import dev.dimension.flare.data.repository.accountServiceFlow
+import dev.dimension.flare.model.AccountType
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.presenter.PresenterBase
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+
+public class UnblockUserPresenter(
+    private val accountType: AccountType?,
+    private val userKey: MicroBlogKey,
+) : PresenterBase<UnblockUserPresenter.State>(),
+    KoinComponent {
+    private val accountRepository by inject<AccountRepository>()
+    private val scope by inject<CoroutineScope>()
+
+    @Immutable
+    public interface State {
+        public fun confirm()
+    }
+
+    @Composable
+    override fun body(): State =
+        object : State {
+            override fun confirm() {
+                if (accountType != null) {
+                    scope.launch {
+                        accountServiceFlow(accountType, repository = accountRepository)
+                            .firstOrNull()
+                            ?.let {
+                                if (it is RelationDataSource) {
+                                    it.relationHandler.unblock(userKey)
+                                }
+                            }
+                    }
+                }
+            }
+        }
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/UnmuteUserPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/UnmuteUserPresenter.kt
new file mode 100644
index 000000000..6a16f9e51
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/UnmuteUserPresenter.kt
@@ -0,0 +1,47 @@
+package dev.dimension.flare.ui.presenter.profile
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import dev.dimension.flare.data.datasource.microblog.datasource.RelationDataSource
+import dev.dimension.flare.data.repository.AccountRepository
+import dev.dimension.flare.data.repository.accountServiceFlow
+import dev.dimension.flare.model.AccountType
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.presenter.PresenterBase
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+
+public class UnmuteUserPresenter(
+    private val accountType: AccountType?,
+    private val userKey: MicroBlogKey,
+) : PresenterBase<UnmuteUserPresenter.State>(),
+    KoinComponent {
+    private val accountRepository by inject<AccountRepository>()
+    private val scope by inject<CoroutineScope>()
+
+    @Immutable
+    public interface State {
+        public fun confirm()
+    }
+
+    @Composable
+    override fun body(): State =
+        object : State {
+            override fun confirm() {
+                if (accountType != null) {
+                    scope.launch {
+                        accountServiceFlow(accountType, repository = accountRepository)
+                            .firstOrNull()
+                            ?.let {
+                                if (it is RelationDataSource) {
+                                    it.relationHandler.unmute(userKey)
+                                }
+                            }
+                    }
+                }
+            }
+        }
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/render/UiRichText.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/render/UiRichText.kt
index 0ce11021e..33eba09dc 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/render/UiRichText.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/render/UiRichText.kt
@@ -21,7 +21,8 @@ public data class UiRichText(
     public val innerText: String = data.wholeText()
     val raw: String by lazy {
         data
-            .nodeStream().joinToString("") { node ->
+            .nodeStream()
+            .joinToString("") { node ->
                 when {
                     node is TextNode -> node.getWholeText()
                     node.nameIs("br") -> "\n"
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/route/DeeplinkRoute.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/route/DeeplinkRoute.kt
index 19e174181..6e5bc8910 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/route/DeeplinkRoute.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/route/DeeplinkRoute.kt
@@ -199,12 +199,24 @@ public sealed class DeeplinkRoute {
         val userKey: MicroBlogKey,
     ) : DeeplinkRoute()
 
+    @Serializable
+    public data class UnblockUser(
+        val accountKey: MicroBlogKey?,
+        val userKey: MicroBlogKey,
+    ) : DeeplinkRoute()
+
     @Serializable
     public data class MuteUser(
         val accountKey: MicroBlogKey?,
         val userKey: MicroBlogKey,
     ) : DeeplinkRoute()
 
+    @Serializable
+    public data class UnmuteUser(
+        val accountKey: MicroBlogKey?,
+        val userKey: MicroBlogKey,
+    ) : DeeplinkRoute()
+
     @Serializable
     public data class ReportUser(
         val accountKey: MicroBlogKey?,

From 76d52f203ae0aa4428669b2946c941709f05a1e9 Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Fri, 6 Mar 2026 13:14:23 +0900
Subject: [PATCH 23/33] fix xqt notification

---
 .../kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt
index b564edf03..cd77011e3 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt
@@ -164,7 +164,7 @@ internal fun TopLevel.renderNotifications(accountKey: MicroBlogKey): List<UiTime
                     )
                 val clickEvent =
                     when {
-                        users.isNullOrEmpty() && post == null && url == "/2/notifications/device_follow.json" ->
+                        url == "/2/notifications/device_follow.json" ->
                             ClickEvent.Deeplink(
                                 DeeplinkRoute.Timeline
                                     .XQTDeviceFollow(
@@ -172,7 +172,7 @@ internal fun TopLevel.renderNotifications(accountKey: MicroBlogKey): List<UiTime
                                     ),
                             )
 
-                        users.isNullOrEmpty() && post == null && !url.isNullOrEmpty() && !url.startsWith("/") ->
+                        post == null && !url.isNullOrEmpty() && !url.startsWith("/") ->
                             ClickEvent.Deeplink(
                                 DeeplinkRoute.OpenLinkDirectly(url),
                             )

From 6da461dab05d2eed26719898dcb864cfcb3d466b Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Fri, 6 Mar 2026 13:20:52 +0900
Subject: [PATCH 24/33] fix user

---
 .../data/datasource/microblog/paging/TimelinePagingMapper.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelinePagingMapper.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelinePagingMapper.kt
index b4d88c475..36514b9b9 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelinePagingMapper.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelinePagingMapper.kt
@@ -215,12 +215,12 @@ internal object TimelinePagingMapper {
             is UiTimelineV2.Feed -> root
             is UiTimelineV2.Message ->
                 root.copy(
-                    user = users.find { root.user?.key == it.key },
+                    user = users.find { root.user?.key == it.key } ?: root.user,
                     extraKey = if (useDbKeyInItemKey) pagingKey else null,
                 )
             is UiTimelineV2.Post ->
                 root.copy(
-                    user = users.find { root.user?.key == it.key },
+                    user = users.find { root.user?.key == it.key } ?: root.user,
                     extraKey = if (useDbKeyInItemKey) pagingKey else null,
                 )
             is UiTimelineV2.User ->

From 1f78be5bb792e81d2905b6bb8042d39f7732a42c Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Fri, 6 Mar 2026 13:33:36 +0900
Subject: [PATCH 25/33] fix profile

---
 .../data/database/cache/mapper/Bluesky.kt     |  2 +-
 .../data/database/cache/mapper/Microblog.kt   |  2 +-
 .../flare/data/database/cache/mapper/User.kt  | 32 ++++++++++
 .../flare/data/database/cache/mapper/XQT.kt   |  2 +-
 .../microblog/handler/ListMemberHandler.kt    |  5 +-
 .../microblog/handler/UserHandler.kt          |  5 +-
 .../dev/dimension/flare/ui/model/UiProfile.kt | 34 +++++++++++
 .../database/cache/mapper/MicroblogTest.kt    | 58 +++++++++++++++++++
 8 files changed, 133 insertions(+), 7 deletions(-)

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
index 585458967..95dcdf74b 100644
--- 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
@@ -33,7 +33,7 @@ internal object Bluesky {
                 .map {
                     it.render(accountKey).toDbUser(host = accountKey.host)
                 }
-        database.userDao().insertAll(users)
+        database.upsertUsers(users)
         database.messageDao().insertMessages(messages)
         database.messageDao().insertReferences(references)
         database.messageDao().insert(rooms)
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Microblog.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Microblog.kt
index dcd1f1b3a..a4b2c37d8 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Microblog.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Microblog.kt
@@ -25,7 +25,7 @@ internal suspend fun saveToDatabase(
             }.flatMap { post ->
                 post.references.map { it.reference }
             }
-    database.userDao().insertAll(users)
+    database.upsertUsers(users)
     database.userDao().insertAllReferences(userReferences)
 
 //    (
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/User.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/User.kt
index 971742ab7..9d1938c49 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/User.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/User.kt
@@ -1,7 +1,9 @@
 package dev.dimension.flare.data.database.cache.mapper
 
+import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.model.DbUser
 import dev.dimension.flare.ui.model.UiProfile
+import kotlinx.coroutines.flow.firstOrNull
 
 internal fun UiProfile.toDbUser(host: String = this.host ?: key.host) =
     DbUser(
@@ -11,3 +13,33 @@ internal fun UiProfile.toDbUser(host: String = this.host ?: key.host) =
         host = host,
         content = this,
     )
+
+internal suspend fun CacheDatabase.upsertUser(user: DbUser) {
+    upsertUsers(listOf(user))
+}
+
+internal suspend fun CacheDatabase.upsertUsers(users: List<DbUser>) {
+    if (users.isEmpty()) {
+        return
+    }
+    val distinctUsers = users.distinctBy { it.userKey }
+    val existingUsers =
+        userDao()
+            .findByKeys(distinctUsers.map { it.userKey })
+            .firstOrNull()
+            .orEmpty()
+            .associateBy { it.userKey }
+    userDao().insertAll(
+        distinctUsers.map { user ->
+            existingUsers[user.userKey]?.let { user.mergeWith(it) } ?: user
+        },
+    )
+}
+
+private fun DbUser.mergeWith(existing: DbUser): DbUser =
+    copy(
+        name = name.ifBlank { existing.name },
+        canonicalHandle = canonicalHandle.ifBlank { existing.canonicalHandle },
+        host = host.ifBlank { existing.host },
+        content = content.mergeWith(existing.content),
+    )
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/XQT.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/XQT.kt
index 974187830..aa2edc6a6 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/XQT.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/XQT.kt
@@ -114,7 +114,7 @@ internal object XQT {
                 }
             database.messageDao().insert(rooms)
         }
-        database.userDao().insertAll(
+        database.upsertUsers(
             users
                 ?.values
                 .orEmpty()
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/ListMemberHandler.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/ListMemberHandler.kt
index a89783d08..7e530e6e3 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/ListMemberHandler.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/ListMemberHandler.kt
@@ -7,6 +7,7 @@ import dev.dimension.flare.common.Cacheable
 import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.connect
 import dev.dimension.flare.data.database.cache.mapper.toDbUser
+import dev.dimension.flare.data.database.cache.mapper.upsertUsers
 import dev.dimension.flare.data.database.cache.model.DbList
 import dev.dimension.flare.data.database.cache.model.DbListMember
 import dev.dimension.flare.data.datasource.microblog.loader.ListMemberLoader
@@ -59,7 +60,7 @@ internal class ListMemberHandler(
                                 )
                             },
                         )
-                        database.userDao().insertAll(data.map { it.toDbUser() })
+                        database.upsertUsers(data.map { it.toDbUser() })
                     },
                 ),
             pagingSourceFactory = {
@@ -101,7 +102,7 @@ internal class ListMemberHandler(
                         ),
                     ),
                 )
-                database.userDao().insertAll(
+                database.upsertUsers(
                     listOf(user.toDbUser()),
                 )
             }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandler.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandler.kt
index 6cda8e1b1..f9d52e155 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandler.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandler.kt
@@ -3,6 +3,7 @@ package dev.dimension.flare.data.datasource.microblog.handler
 import dev.dimension.flare.common.Cacheable
 import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.mapper.toDbUser
+import dev.dimension.flare.data.database.cache.mapper.upsertUser
 import dev.dimension.flare.data.datasource.microblog.loader.UserLoader
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiHandle
@@ -21,7 +22,7 @@ internal class UserHandler(
         Cacheable(
             fetchSource = {
                 val user = loader.userByHandleAndHost(uiHandle)
-                database.userDao().insert(
+                database.upsertUser(
                     user.toDbUser(),
                 )
             },
@@ -40,7 +41,7 @@ internal class UserHandler(
         Cacheable(
             fetchSource = {
                 val user = loader.userById(id)
-                database.userDao().insert(
+                database.upsertUser(
                     user.toDbUser(),
                 )
             },
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiProfile.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiProfile.kt
index 7a9a8c777..ed0044e95 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiProfile.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiProfile.kt
@@ -10,6 +10,7 @@ import dev.dimension.flare.ui.humanizer.Formatter.humanize
 import dev.dimension.flare.ui.render.UiRichText
 import dev.dimension.flare.ui.render.toUi
 import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toPersistentList
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -43,6 +44,31 @@ public data class UiProfile internal constructor(
         clickEvent.onClicked
     }
 
+    internal fun mergeWith(existing: UiProfile): UiProfile =
+        UiProfile(
+            key = key,
+            handle =
+                if (handle.raw.isBlank()) {
+                    existing.handle
+                } else {
+                    handle
+                },
+            avatar = avatar.ifBlank { existing.avatar },
+            nameInternal =
+                if (name.raw.isBlank()) {
+                    existing.name
+                } else {
+                    name
+                },
+            platformType = platformType,
+            clickEvent = clickEvent,
+            banner = banner ?: existing.banner,
+            description = description ?: existing.description,
+            matrices = matrices.mergeWith(existing.matrices),
+            mark = (existing.mark + mark).distinct().toPersistentList(),
+            bottomContent = bottomContent ?: existing.bottomContent,
+        )
+
     @Serializable
     @Immutable
     public data class Matrices internal constructor(
@@ -126,3 +152,11 @@ public fun createSampleUser(): UiProfile =
         mark = persistentListOf(),
         bottomContent = null,
     )
+
+private fun UiProfile.Matrices.mergeWith(existing: UiProfile.Matrices): UiProfile.Matrices =
+    UiProfile.Matrices(
+        fansCount = fansCount.takeUnless { it == 0L && existing.fansCount > 0L } ?: existing.fansCount,
+        followsCount = followsCount.takeUnless { it == 0L && existing.followsCount > 0L } ?: existing.followsCount,
+        statusesCount = statusesCount.takeUnless { it == 0L && existing.statusesCount > 0L } ?: existing.statusesCount,
+        platformFansCount = platformFansCount ?: existing.platformFansCount,
+    )
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt
index dcd53adcb..3bdc071f6 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt
@@ -588,6 +588,64 @@ class MicroblogTest : RobolectricTest() {
             assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, savedType.data)
         }
 
+    @Test
+    fun richerUserSurvivesLaterPartialUpdate() =
+        runTest {
+            val accountKey = MicroBlogKey(id = "account", host = "bsky.social")
+            val userKey = MicroBlogKey(id = "did:plc:test-user", host = "bsky.social")
+            val detailedUser =
+                createUser(userKey, "Detailed").copy(
+                    platformType = dev.dimension.flare.model.PlatformType.Bluesky,
+                    banner = "https://bsky.social/banner.png",
+                    description = Element("span").apply { appendText("full profile") }.toUi(),
+                    matrices = UiProfile.Matrices(fansCount = 12, followsCount = 34, statusesCount = 56),
+                )
+            val partialUser =
+                createUser(userKey, "Partial").copy(
+                    platformType = dev.dimension.flare.model.PlatformType.Bluesky,
+                    banner = null,
+                    description = null,
+                    matrices = UiProfile.Matrices(fansCount = 0, followsCount = 0, statusesCount = 0),
+                )
+
+            saveToDatabase(
+                db,
+                listOf(
+                    TimelinePagingMapper.toDb(
+                        createPost(
+                            accountKey = accountKey,
+                            user = detailedUser,
+                            statusKey = MicroBlogKey(id = "status-detailed", host = "bsky.social"),
+                            text = "detailed",
+                        ),
+                        pagingKey = "home",
+                    ),
+                ),
+            )
+            saveToDatabase(
+                db,
+                listOf(
+                    TimelinePagingMapper.toDb(
+                        createPost(
+                            accountKey = accountKey,
+                            user = partialUser,
+                            statusKey = MicroBlogKey(id = "status-partial", host = "bsky.social"),
+                            text = "partial",
+                        ),
+                        pagingKey = "home",
+                    ),
+                ),
+            )
+
+            val savedUser = db.userDao().findByKey(userKey).first()
+            val savedProfile = assertNotNull(savedUser).content
+            assertEquals("https://bsky.social/banner.png", savedProfile.banner)
+            assertEquals("full profile", savedProfile.description?.raw)
+            assertEquals(12, savedProfile.matrices.fansCount)
+            assertEquals(34, savedProfile.matrices.followsCount)
+            assertEquals(56, savedProfile.matrices.statusesCount)
+        }
+
     private fun createUser(
         key: MicroBlogKey,
         name: String,

From 6eab36225e1e0d517840455ef8a0461b13d60b97 Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Fri, 6 Mar 2026 16:50:33 +0900
Subject: [PATCH 26/33] migrate ios

---
 .../ui/screen/home/NotificationScreen.kt      |    4 +-
 .../ui/screen/home/NotificationScreen.kt      |    6 +-
 iosApp/flare/Localizable.xcstrings            | 6058 ++++++-----------
 .../UI/Component/CommonProfileHeader.swift    |    2 +-
 .../UI/Component/ComposeTimelineView.swift    |    8 +-
 .../flare/UI/Component/Status/FeedView.swift  |   18 +-
 .../Component/Status/StatusActionView.swift   |   47 +-
 .../UI/Component/Status/StatusPollView.swift  |    7 +-
 .../Component/Status/StatusReactionView.swift |    7 +-
 .../Component/Status/StatusShareSheet.swift   |    6 +-
 .../Status/StatusTopMessageView.swift         |  226 +-
 .../UI/Component/Status/StatusView.swift      |   42 +-
 .../Status/StatusVisibilityView.swift         |    2 +-
 .../Component/Status/TimelineUserView.swift   |   28 +-
 .../UI/Component/Status/TimelineView.swift    |   67 +-
 .../UI/Component/Status/UserListView.swift    |    4 +-
 .../UI/Component/TimelinePagingView.swift     |   12 +-
 .../flare/UI/Component/UserCompatView.swift   |    2 +-
 .../flare/UI/Component/UserOnelineView.swift  |    2 +-
 iosApp/flare/UI/Model/Extension.swift         |   12 +-
 iosApp/flare/UI/Route/Route.swift             |   33 +-
 iosApp/flare/UI/Screen/ComposeScreen.swift    |  133 +-
 iosApp/flare/UI/Screen/DMListScreen.swift     |    2 +-
 iosApp/flare/UI/Screen/DiscoverScreen.swift   |    2 +-
 .../flare/UI/Screen/NotificationScreen.swift  |   13 +-
 iosApp/flare/UI/Screen/ProfileScreen.swift    |   20 +-
 iosApp/flare/UI/Screen/SearchScreen.swift     |    2 +-
 .../flare/UI/Screen/StatusDetailScreen.swift  |    2 +-
 .../flare/UI/Screen/StatusMediaScreen.swift   |    8 +-
 .../flare/UI/Screen/TabSettingsScreen.swift   |    2 +-
 .../dimension/flare/ui/model/UiTimelineV2.kt  |   12 +
 .../home/AllNotificationPresenter.kt          |   38 +-
 32 files changed, 2630 insertions(+), 4197 deletions(-)

diff --git a/app/src/main/java/dev/dimension/flare/ui/screen/home/NotificationScreen.kt b/app/src/main/java/dev/dimension/flare/ui/screen/home/NotificationScreen.kt
index c03ffd222..678ba5a8e 100644
--- a/app/src/main/java/dev/dimension/flare/ui/screen/home/NotificationScreen.kt
+++ b/app/src/main/java/dev/dimension/flare/ui/screen/home/NotificationScreen.kt
@@ -93,7 +93,9 @@ internal fun NotificationScreen() {
                             },
                             minTabWidth = 48.dp,
                         ) {
-                            state.notifications.forEach { (account, badge) ->
+                            state.notifications.forEach { item ->
+                                val account = item.profile
+                                val badge = item.badge
                                 LeadingIconTab(
                                     modifier = Modifier.clip(CircleShape),
                                     selectedContentColor = MaterialTheme.colorScheme.onSecondaryContainer,
diff --git a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/NotificationScreen.kt b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/NotificationScreen.kt
index 235da1e07..7943297b2 100644
--- a/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/NotificationScreen.kt
+++ b/desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/NotificationScreen.kt
@@ -57,7 +57,9 @@ internal fun NotificationScreen() {
                     span = StaggeredGridItemSpan.FullLine,
                 ) {
                     LiteFilter {
-                        state.notifications.forEach { (profile, badge) ->
+                        state.notifications.forEach { item ->
+                            val profile = item.profile
+                            val badge = item.badge
                             PillButton(
                                 selected = state.selectedAccount?.key == profile.key,
                                 onSelectedChanged = {
@@ -99,7 +101,7 @@ internal fun NotificationScreen() {
                         span = StaggeredGridItemSpan.FullLine,
                     ) {
                         LiteFilter {
-                            types.forEachIndexed { index, type ->
+                            types.forEach { type ->
                                 PillButton(
                                     selected = state.selectedFilter == type,
                                     onSelectedChanged = {
diff --git a/iosApp/flare/Localizable.xcstrings b/iosApp/flare/Localizable.xcstrings
index 610c574d5..87ad3ed74 100644
--- a/iosApp/flare/Localizable.xcstrings
+++ b/iosApp/flare/Localizable.xcstrings
@@ -72,16 +72,16 @@
             "value" : "読み込み中"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Laden..."
+            "value" : "Laster"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Laster"
+            "value" : "Laden..."
           }
         },
         "pl" : {
@@ -133,6 +133,9 @@
           }
         }
       }
+    },
+    "%d" : {
+
     },
     "%lld" : {
       "localizations" : {
@@ -190,13 +193,13 @@
             "value" : "%lld"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "%lld"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "%lld"
@@ -314,13 +317,13 @@
             "value" : "%1$lld/%2$d"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "%1$lld/%2$d"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "%1$lld/%2$d"
@@ -438,13 +441,13 @@
             "value" : "%1$lld/%2$lld"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "%1$lld/%2$lld"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "%1$lld/%2$lld"
@@ -598,16 +601,16 @@
             "value" : "Flare에 대해 더 알아보기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Meer informatie over Flare"
+            "value" : "Lær mer om Flare"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lær mer om Flare"
+            "value" : "Meer informatie over Flare"
           }
         },
         "pl" : {
@@ -788,16 +791,16 @@
             "value" : "정보"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Informatie"
+            "value" : "Om"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Om"
+            "value" : "Informatie"
           }
         },
         "pl" : {
@@ -942,16 +945,16 @@
             "value" : "フォローリクエストを承認する"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Accepteer volgverzoek"
+            "value" : "Godta følg-forespørsel"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Godta følg-forespørsel"
+            "value" : "Accepteer volgverzoek"
           }
         },
         "pl" : {
@@ -1078,16 +1081,16 @@
             "value" : "アカウントを管理する"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Beheer je accounts"
+            "value" : "Administrer kontoene dine"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Administrer kontoene dine"
+            "value" : "Beheer je accounts"
           }
         },
         "pl" : {
@@ -1208,16 +1211,16 @@
             "value" : "アカウント管理"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Account beheer"
+            "value" : "Konto administrasjon"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Konto administrasjon"
+            "value" : "Account beheer"
           }
         },
         "pl" : {
@@ -1380,16 +1383,16 @@
             "value" : "재시도"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Opnieuw"
+            "value" : "Prøv igjen"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Prøv igjen"
+            "value" : "Opnieuw"
           }
         },
         "pl" : {
@@ -1570,16 +1573,16 @@
             "value" : "추가"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Toevoegen"
+            "value" : "Legg til"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Legg til"
+            "value" : "Toevoegen"
           }
         },
         "pl" : {
@@ -1730,16 +1733,16 @@
             "value" : "RSSを追加"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "RSS toevoegen"
+            "value" : "Legg til RSS"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Legg til RSS"
+            "value" : "RSS toevoegen"
           }
         },
         "pl" : {
@@ -1800,131 +1803,11 @@
     },
     "AI Type" : {
       "localizations" : {
-        "ar" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "AI Type"
-          }
-        },
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "AI Type"
-          }
-        },
-        "da" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "AI Type"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "AI Type"
-          }
-        },
-        "el" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "AI Type"
-          }
-        },
         "en" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "AI Type"
           }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "AI Type"
-          }
-        },
-        "fi" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "AI Type"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "AI Type"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "AI Type"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "AI Type"
-          }
-        },
-        "nl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "AI Type"
-          }
-        },
-        "no" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "AI Type"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "AI Type"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "AI Type"
-          }
-        },
-        "pt-BR" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "AI Type"
-          }
-        },
-        "ro" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "AI Type"
-          }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "AI Type"
-          }
-        },
-        "sv" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "AI Type"
-          }
-        },
-        "uk" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "AI Type"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "AI Type"
-          }
         }
       }
     },
@@ -2032,16 +1915,16 @@
             "value" : "AI 설정 구성"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Configureer AI instellingen"
+            "value" : "Konfigurer AI-innstillinger"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Konfigurer AI-innstillinger"
+            "value" : "Configureer AI instellingen"
           }
         },
         "pl" : {
@@ -2193,16 +2076,16 @@
             "value" : "AI 機能"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "AI functies"
+            "value" : "Egenskaper av AI"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Egenskaper av AI"
+            "value" : "AI functies"
           }
         },
         "pl" : {
@@ -2360,16 +2243,16 @@
             "value" : "서버 URL을 입력하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Voer de server-URL in"
+            "value" : "Skriv inn nettadressen til serveren"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Skriv inn nettadressen til serveren"
+            "value" : "Voer de server-URL in"
           }
         },
         "pl" : {
@@ -2551,16 +2434,16 @@
             "value" : "서버 URL"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Server URL"
+            "value" : "URL til server"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "URL til server"
+            "value" : "Server URL"
           }
         },
         "pl" : {
@@ -2741,16 +2624,16 @@
             "value" : "AI 요약 기능 활성화"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "AI samenvatting inschakelen"
+            "value" : "Aktiver AI sammendrag"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Aktiver AI sammendrag"
+            "value" : "AI samenvatting inschakelen"
           }
         },
         "pl" : {
@@ -2931,16 +2814,16 @@
             "value" : "AI 구성"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "AI configuratie"
+            "value" : "AI Konfigurasjon"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "AI Konfigurasjon"
+            "value" : "AI configuratie"
           }
         },
         "pl" : {
@@ -3121,16 +3004,16 @@
             "value" : "AI 구성"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "AI configuratie"
+            "value" : "Aktiver AI-oversettelse"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Aktiver AI-oversettelse"
+            "value" : "AI configuratie"
           }
         },
         "pl" : {
@@ -3311,16 +3194,16 @@
             "value" : "발견하기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ontdek feeds"
+            "value" : "Oppdag fôr"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Oppdag fôr"
+            "value" : "Ontdek feeds"
           }
         },
         "pl" : {
@@ -3501,16 +3384,16 @@
             "value" : "내 피드"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Mijn feeds"
+            "value" : "Mine fôr"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Mine fôr"
+            "value" : "Mijn feeds"
           }
         },
         "pl" : {
@@ -3661,16 +3544,16 @@
             "value" : "すべてのフィード"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Alle feeds"
+            "value" : "Alle kanaler"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Alle kanaler"
+            "value" : "Alle feeds"
           }
         },
         "pl" : {
@@ -3827,16 +3710,16 @@
             "value" : "목록"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Klantenlijst"
+            "value" : "Liste"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Liste"
+            "value" : "Klantenlijst"
           }
         },
         "pl" : {
@@ -3981,16 +3864,16 @@
             "value" : "すべてのRSSフィード"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Alle RSS feeds"
+            "value" : "Alle RSS-Feeds"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Alle RSS-Feeds"
+            "value" : "Alle RSS feeds"
           }
         },
         "pl" : {
@@ -4105,13 +3988,13 @@
             "value" : "ALT"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "ALT"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "ALT"
@@ -4271,13 +4154,13 @@
             "value" : "안테나"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Antenne"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Antenne"
@@ -4461,13 +4344,13 @@
             "value" : "안테나"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Antenne"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Antenne"
@@ -4549,131 +4432,11 @@
     },
     "API Key" : {
       "localizations" : {
-        "ar" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "مفتاح API"
-          }
-        },
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "API klíč"
-          }
-        },
-        "da" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "API Nøgle"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "API-Schlüssel"
-          }
-        },
-        "el" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Κλειδί API"
-          }
-        },
         "en" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "API Key"
           }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Clave API"
-          }
-        },
-        "fi" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Api Avain"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Clé API"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Chiave API"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "API キー"
-          }
-        },
-        "nl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "API Sleutel"
-          }
-        },
-        "no" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "API-nøkkel (Automatic Translation)"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Klucz API"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Chave de API"
-          }
-        },
-        "pt-BR" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Chave de API"
-          }
-        },
-        "ro" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Cheie API"
-          }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Ключ API"
-          }
-        },
-        "sv" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "API nyckel"
-          }
-        },
-        "uk" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "API ключ"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "API 密钥"
-          }
         }
       }
     },
@@ -4775,16 +4538,16 @@
             "value" : "앱 로깅"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "App logboek"
+            "value" : "Logg app"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Logg app"
+            "value" : "App logboek"
           }
         },
         "pl" : {
@@ -4959,16 +4722,16 @@
             "value" : "네트워크 로깅 활성화"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Netwerk loggen inschakelen"
+            "value" : "Aktiver nettverkslogging"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Aktiver nettverkslogging"
+            "value" : "Netwerk loggen inschakelen"
           }
         },
         "pl" : {
@@ -5113,16 +4876,16 @@
             "value" : "絶対タイムスタンプです"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Absolute tijdstempel"
+            "value" : "Absolutt tidsstempel"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Absolutt tidsstempel"
+            "value" : "Absolute tijdstempel"
           }
         },
         "pl" : {
@@ -5161,12 +4924,6 @@
             "value" : "Absolut tidsstämpel"
           }
         },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Mutlak zaman damgası"
-          }
-        },
         "uk" : {
           "stringUnit" : {
             "state" : "translated",
@@ -5249,16 +5006,16 @@
             "value" : "投稿に絶対タイムスタンプを表示する"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Geef absolute tijdsaanduiding weer bij berichten"
+            "value" : "Vis absolutte tidsstempler på innlegg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vis absolutte tidsstempler på innlegg"
+            "value" : "Geef absolute tijdsaanduiding weer bij berichten"
           }
         },
         "pl" : {
@@ -5297,12 +5054,6 @@
             "value" : "Visa absoluta tidsstämplar på inlägg"
           }
         },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Gönderilere mutlak zaman damgaları ekle"
-          }
-        },
         "uk" : {
           "stringUnit" : {
             "state" : "translated",
@@ -5421,16 +5172,16 @@
             "value" : "아바타 모양"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vorm avatar"
+            "value" : "Profilbilde form"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Profilbilde form"
+            "value" : "Vorm avatar"
           }
         },
         "pl" : {
@@ -5611,16 +5362,16 @@
             "value" : "둥글게"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ronde"
+            "value" : "Rund"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Rund"
+            "value" : "Ronde"
           }
         },
         "pl" : {
@@ -5801,16 +5552,16 @@
             "value" : "아바타의 모양을 변경합니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "De vorm van de avatar wijzigen"
+            "value" : "Endre formen på avataren"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Endre formen på avataren"
+            "value" : "De vorm van de avatar wijzigen"
           }
         },
         "pl" : {
@@ -5991,16 +5742,16 @@
             "value" : "정사각형"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vierkant"
+            "value" : "Firkant"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Firkant"
+            "value" : "Vierkant"
           }
         },
         "pl" : {
@@ -6175,16 +5926,16 @@
             "value" : "링크 미리보기 표시"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Toon linkvoorbeelden"
+            "value" : "Link forhåndsvisninger i Compat modus"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Link forhåndsvisninger i Compat modus"
+            "value" : "Toon linkvoorbeelden"
           }
         },
         "pl" : {
@@ -6329,16 +6080,16 @@
             "value" : "投稿にシンプルモードでリンクのプレビューを表示する"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Geef voorbeeld van de link weer in de vereenvoudiging modus van de post"
+            "value" : "Vis forhåndsvisning av lenker i forenkle modus i innlegget"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vis forhåndsvisning av lenker i forenkle modus i innlegget"
+            "value" : "Geef voorbeeld van de link weer in de vereenvoudiging modus van de post"
           }
         },
         "pl" : {
@@ -6495,16 +6246,16 @@
             "value" : "Flare의 모양과 느낌을_customize합니다."
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Pas het uiterlijk en gevoel van Flare aan"
+            "value" : "Tilpass utseendet og følelsen til flare"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Tilpass utseendet og følelsen til flare"
+            "value" : "Pas het uiterlijk en gevoel van Flare aan"
           }
         },
         "pl" : {
@@ -6685,16 +6436,16 @@
             "value" : "미디어를 전체 크기로 확장"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Media uitbreiden naar volledige grootte"
+            "value" : "Utvid media til full størrelse"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Utvid media til full størrelse"
+            "value" : "Media uitbreiden naar volledige grootte"
           }
         },
         "pl" : {
@@ -6869,16 +6620,16 @@
             "value" : "타임라인의 미디어 비율 유지"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bewaar het aspect van de media op de tijdlijn"
+            "value" : "Hold medias erfaring i tidslinje"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Hold medias erfaring i tidslinje"
+            "value" : "Bewaar het aspect van de media op de tijdlijn"
           }
         },
         "pl" : {
@@ -7023,13 +6774,13 @@
             "value" : "Font Size"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Font Size"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Font Size"
@@ -7159,16 +6910,16 @@
             "value" : "横広の投稿"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Volledige breedte bericht"
+            "value" : "Full bredde innlegg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Full bredde innlegg"
+            "value" : "Volledige breedte bericht"
           }
         },
         "pl" : {
@@ -7207,12 +6958,6 @@
             "value" : "Full bredd inlägg"
           }
         },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Tam genişlikte gönderi"
-          }
-        },
         "uk" : {
           "stringUnit" : {
             "state" : "translated",
@@ -7295,16 +7040,16 @@
             "value" : "投稿を横広く表示する"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Toon bericht in volledige breedte"
+            "value" : "Vis innholdet i full bredde"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vis innholdet i full bredde"
+            "value" : "Toon bericht in volledige breedte"
           }
         },
         "pl" : {
@@ -7343,12 +7088,6 @@
             "value" : "Visa inlägget i full bredd"
           }
         },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Gönderiyi tam genişlikte göster"
-          }
-        },
         "uk" : {
           "stringUnit" : {
             "state" : "translated",
@@ -7431,16 +7170,16 @@
             "value" : "appearance_post_action_style"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "verschijn_post_action_stijl"
+            "value" : "Publiser handlingsstil"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Publiser handlingsstil"
+            "value" : "verschijn_post_action_stijl"
           }
         },
         "pl" : {
@@ -7561,16 +7300,16 @@
             "value" : "投稿のアクションのスタイルを変更する"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Wijzig de stijl van de actie van het bericht"
+            "value" : "Endre stilen til innleggets handling"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Endre stilen til innleggets handling"
+            "value" : "Wijzig de stijl van de actie van het bericht"
           }
         },
         "pl" : {
@@ -7691,13 +7430,13 @@
             "value" : "Hidden"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Hidden"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Hidden"
@@ -7821,16 +7560,16 @@
             "value" : "左揃え"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Links uitgelijnd"
+            "value" : "Venstre justert"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Venstre justert"
+            "value" : "Links uitgelijnd"
           }
         },
         "pl" : {
@@ -7951,16 +7690,16 @@
             "value" : "右揃え"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Rechts uitgelijnd"
+            "value" : "Høyre justert"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Høyre justert"
+            "value" : "Rechts uitgelijnd"
           }
         },
         "pl" : {
@@ -8081,16 +7820,16 @@
             "value" : "ストレッチ"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Uitrekken"
+            "value" : "Strekk"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Strekk"
+            "value" : "Uitrekken"
           }
         },
         "pl" : {
@@ -8247,16 +7986,16 @@
             "value" : "링크 미리보기 표시"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Toon linkvoorbeelden"
+            "value" : "Vis forhåndsvisning av lenker"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vis forhåndsvisning av lenker"
+            "value" : "Toon linkvoorbeelden"
           }
         },
         "pl" : {
@@ -8401,16 +8140,16 @@
             "value" : "投稿にリンクのプレビューを表示する"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Toon linkvoorbeelden in het bericht"
+            "value" : "Vis forhåndsvisning av lenker i innlegget"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vis forhåndsvisning av lenker i innlegget"
+            "value" : "Toon linkvoorbeelden in het bericht"
           }
         },
         "pl" : {
@@ -8567,16 +8306,16 @@
             "value" : "미디어 표시"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Media tonen"
+            "value" : "Vis media"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vis media"
+            "value" : "Media tonen"
           }
         },
         "pl" : {
@@ -8721,16 +8460,16 @@
             "value" : "投稿にメディアを表示する"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Media in het bericht weergeven"
+            "value" : "Vis media i innlegget"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vis media i innlegget"
+            "value" : "Media in het bericht weergeven"
           }
         },
         "pl" : {
@@ -8887,16 +8626,16 @@
             "value" : "숫자 표시"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Getallen weergeven"
+            "value" : "Vis tall"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vis tall"
+            "value" : "Getallen weergeven"
           }
         },
         "pl" : {
@@ -9041,16 +8780,16 @@
             "value" : "投稿の下部に番号を表示する"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Getallen aan de onderkant van het bericht weergeven"
+            "value" : "Vis tall på bunnen av innlegget"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vis tall på bunnen av innlegget"
+            "value" : "Getallen aan de onderkant van het bericht weergeven"
           }
         },
         "pl" : {
@@ -9171,16 +8910,16 @@
             "value" : "プラットフォームのロゴを表示"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Toon platform logo"
+            "value" : "Vis plattformlogo"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vis plattformlogo"
+            "value" : "Toon platform logo"
           }
         },
         "pl" : {
@@ -9301,16 +9040,16 @@
             "value" : "投稿にソース・プラットフォームのロゴを表示する"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Toon het bronlogo van het platform op post"
+            "value" : "Vis logo for kildeplattformplattformen på innlegg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vis logo for kildeplattformplattformen på innlegg"
+            "value" : "Toon het bronlogo van het platform op post"
           }
         },
         "pl" : {
@@ -9467,16 +9206,16 @@
             "value" : "민감한 콘텐츠 표시"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gevoelige inhoud weergeven"
+            "value" : "Vis sensitivt innhold"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vis sensitivt innhold"
+            "value" : "Gevoelige inhoud weergeven"
           }
         },
         "pl" : {
@@ -9651,16 +9390,16 @@
             "value" : "상태에서 항상 민감한 콘텐츠 표시"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gevoelige inhoud altijd in status weergeven"
+            "value" : "Vis alltid sensitivt innhold i innlegget"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vis alltid sensitivt innhold i innlegget"
+            "value" : "Gevoelige inhoud altijd in status weergeven"
           }
         },
         "pl" : {
@@ -9841,16 +9580,16 @@
             "value" : "테마"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Thema"
+            "value" : "Tema"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Tema"
+            "value" : "Thema"
           }
         },
         "pl" : {
@@ -10031,16 +9770,16 @@
             "value" : "어두운 색"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Donker"
+            "value" : "Mørk"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Mørk"
+            "value" : "Donker"
           }
         },
         "pl" : {
@@ -10221,16 +9960,16 @@
             "value" : "앱의 테마 변경"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Verander het thema van de app"
+            "value" : "Endre temaet for appen"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Endre temaet for appen"
+            "value" : "Verander het thema van de app"
           }
         },
         "pl" : {
@@ -10411,16 +10150,16 @@
             "value" : "밝은 색"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Licht"
+            "value" : "Lys"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lys"
+            "value" : "Licht"
           }
         },
         "pl" : {
@@ -10595,16 +10334,16 @@
             "value" : "시스템"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Systeem"
+            "value" : "Systemadministrasjon"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Systemadministrasjon"
+            "value" : "Systeem"
           }
         },
         "pl" : {
@@ -10785,16 +10524,16 @@
             "value" : "모양"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Uiterlijk"
+            "value" : "Utseende"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Utseende"
+            "value" : "Uiterlijk"
           }
         },
         "pl" : {
@@ -10939,16 +10678,16 @@
             "value" : "実験的：クロスプラットフォーム投稿UIを使用"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Experimenteel: Gebruik cross-platform post UI"
+            "value" : "Eksperimentelt: bruk grensesnittet på kryss-plattformen"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Eksperimentelt: bruk grensesnittet på kryss-plattformen"
+            "value" : "Experimenteel: Gebruik cross-platform post UI"
           }
         },
         "pl" : {
@@ -11069,16 +10808,16 @@
             "value" : "Android と Desktop から同じポスト UI コードを使用してください。これは実験的なものであり、将来的に削除される可能性があります。"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gebruik dezelfde gebruikersinterface code van Android en Desktop, dit is experimenteel en kan in de toekomst worden verwijderd."
+            "value" : "Bruk samme innlegg UI kode fra Android og Desktop, dette er eksperimentell og kan bli fjernet i fremtiden."
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bruk samme innlegg UI kode fra Android og Desktop, dette er eksperimentell og kan bli fjernet i fremtiden."
+            "value" : "Gebruik dezelfde gebruikersinterface code van Android en Desktop, dit is experimenteel en kan in de toekomst worden verwijderd."
           }
         },
         "pl" : {
@@ -11235,16 +10974,16 @@
             "value" : "비디오 자동 재생"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Video automatisch afspelen"
+            "value" : "Video autokjør"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Video autokjør"
+            "value" : "Video automatisch afspelen"
           }
         },
         "pl" : {
@@ -11425,16 +11164,16 @@
             "value" : "항상"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "altijd"
+            "value" : "Alltid"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Alltid"
+            "value" : "altijd"
           }
         },
         "pl" : {
@@ -11579,16 +11318,16 @@
             "value" : "投稿内の動画を自動的に再生"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Video's automatisch afspelen in het bericht"
+            "value" : "Automatisk spill av videoer i innlegget"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Automatisk spill av videoer i innlegget"
+            "value" : "Video's automatisch afspelen in het bericht"
           }
         },
         "pl" : {
@@ -11745,16 +11484,16 @@
             "value" : "절대"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Nooit"
+            "value" : "Aldri"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Aldri"
+            "value" : "Nooit"
           }
         },
         "pl" : {
@@ -11935,16 +11674,16 @@
             "value" : "Wi-Fi 전용"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Alleen wifi"
+            "value" : "Kun Wi-Fi"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Kun Wi-Fi"
+            "value" : "Alleen wifi"
           }
         },
         "pl" : {
@@ -12125,16 +11864,16 @@
             "value" : "차단"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Blokkeren"
+            "value" : "Blokker"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Blokker"
+            "value" : "Blokkeren"
           }
         },
         "pl" : {
@@ -12279,16 +12018,16 @@
             "value" : "このユーザーをブロックしてもよろしいですか？"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Weet je zeker dat je deze gebruiker wilt blokkeren?"
+            "value" : "Er du sikker på at du vil blokkere denne brukeren?"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Er du sikker på at du vil blokkere denne brukeren?"
+            "value" : "Weet je zeker dat je deze gebruiker wilt blokkeren?"
           }
         },
         "pl" : {
@@ -12409,16 +12148,16 @@
             "value" : "ユーザーをブロック"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gebruiker blokkeren"
+            "value" : "Blokker bruker"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Blokker bruker"
+            "value" : "Gebruiker blokkeren"
           }
         },
         "pl" : {
@@ -12699,16 +12438,16 @@
             "value" : "피드"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Feeds"
+            "value" : "Strøm"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Strøm"
+            "value" : "Feeds"
           }
         },
         "pl" : {
@@ -12786,6 +12525,7 @@
       }
     },
     "bluesky_notification_follow" : {
+      "extractionState" : "stale",
       "localizations" : {
         "af" : {
           "stringUnit" : {
@@ -12889,16 +12629,16 @@
             "value" : "당신을 팔로우했습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "volgt jou nu"
+            "value" : "fulgte deg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "fulgte deg"
+            "value" : "volgt jou nu"
           }
         },
         "pl" : {
@@ -12976,6 +12716,7 @@
       }
     },
     "bluesky_notification_item_pin" : {
+      "extractionState" : "stale",
       "localizations" : {
         "af" : {
           "stringUnit" : {
@@ -13079,16 +12820,16 @@
             "value" : "고정됨"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vastgezet"
+            "value" : "Festet"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Festet"
+            "value" : "Vastgezet"
           }
         },
         "pl" : {
@@ -13166,6 +12907,7 @@
       }
     },
     "bluesky_notification_like" : {
+      "extractionState" : "stale",
       "localizations" : {
         "af" : {
           "stringUnit" : {
@@ -13269,16 +13011,16 @@
             "value" : "좋아요를 눌렀습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "favoriet"
+            "value" : "favorisert"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "favorisert"
+            "value" : "favoriet"
           }
         },
         "pl" : {
@@ -13356,6 +13098,7 @@
       }
     },
     "bluesky_notification_mention" : {
+      "extractionState" : "stale",
       "localizations" : {
         "af" : {
           "stringUnit" : {
@@ -13459,16 +13202,16 @@
             "value" : "당신을 언급했습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "noemde je"
+            "value" : "nevnte deg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "nevnte deg"
+            "value" : "noemde je"
           }
         },
         "pl" : {
@@ -13546,6 +13289,7 @@
       }
     },
     "bluesky_notification_quote" : {
+      "extractionState" : "stale",
       "localizations" : {
         "af" : {
           "stringUnit" : {
@@ -13649,16 +13393,16 @@
             "value" : "인용했습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "geciteerd"
+            "value" : "sitert"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "sitert"
+            "value" : "geciteerd"
           }
         },
         "pl" : {
@@ -13736,6 +13480,7 @@
       }
     },
     "bluesky_notification_reply" : {
+      "extractionState" : "stale",
       "localizations" : {
         "af" : {
           "stringUnit" : {
@@ -13839,16 +13584,16 @@
             "value" : "당신에게 답글을 달았습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "heeft u geantwoord"
+            "value" : "svarte deg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "svarte deg"
+            "value" : "heeft u geantwoord"
           }
         },
         "pl" : {
@@ -13926,6 +13671,7 @@
       }
     },
     "bluesky_notification_repost" : {
+      "extractionState" : "stale",
       "localizations" : {
         "af" : {
           "stringUnit" : {
@@ -14023,16 +13769,16 @@
             "value" : "상태를 부스트했습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "boostte een status"
+            "value" : "repostet et innlegg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "repostet et innlegg"
+            "value" : "boostte een status"
           }
         },
         "pl" : {
@@ -14207,16 +13953,16 @@
             "value" : "스타터팩에 가입했습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Starterpack toegetreden"
+            "value" : "Starterpack er medlem"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Starterpack er medlem"
+            "value" : "Starterpack toegetreden"
           }
         },
         "pl" : {
@@ -14294,6 +14040,7 @@
       }
     },
     "bluesky_notification_unKnown" : {
+      "extractionState" : "stale",
       "localizations" : {
         "af" : {
           "stringUnit" : {
@@ -14391,16 +14138,16 @@
             "value" : "알 수 없음"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Onbekend"
+            "value" : "Ukjent"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ukjent"
+            "value" : "Onbekend"
           }
         },
         "pl" : {
@@ -14581,16 +14328,16 @@
             "value" : "신고하기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Rapporteren"
+            "value" : "Rapporter"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Rapporter"
+            "value" : "Rapporteren"
           }
         },
         "pl" : {
@@ -14765,16 +14512,16 @@
             "value" : "이 게시물의 문제는 무엇인가요?"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Wat is het probleem met dit bericht?"
+            "value" : "Hva er problemet med dette innlegget?"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Hva er problemet med dette innlegget?"
+            "value" : "Wat is het probleem met dit bericht?"
           }
         },
         "pl" : {
@@ -14949,16 +14696,16 @@
             "value" : "오해의 소지가 있는"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Misleidend"
+            "value" : "Villende"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Villende"
+            "value" : "Misleidend"
           }
         },
         "pl" : {
@@ -15133,16 +14880,16 @@
             "value" : "이 게시물은 오해의 소지가 있습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Deze post is misleidend"
+            "value" : "Dette innlegget er misvisende"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Dette innlegget er misvisende"
+            "value" : "Deze post is misleidend"
           }
         },
         "pl" : {
@@ -15317,16 +15064,16 @@
             "value" : "기타"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "anders"
+            "value" : "Annet"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Annet"
+            "value" : "anders"
           }
         },
         "pl" : {
@@ -15501,16 +15248,16 @@
             "value" : "이 옵션에 포함되지 않은 문제"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Een probleem niet opgenomen in deze opties"
+            "value" : "Et problem er ikke inkludert i disse alternativene"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Et problem er ikke inkludert i disse alternativene"
+            "value" : "Een probleem niet opgenomen in deze opties"
           }
         },
         "pl" : {
@@ -15685,16 +15432,16 @@
             "value" : "반사회적 행동"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Anti-sociaal gedrag"
+            "value" : "Anti-Social Athavior"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Anti-Social Athavior"
+            "value" : "Anti-sociaal gedrag"
           }
         },
         "pl" : {
@@ -15869,16 +15616,16 @@
             "value" : "괴롭힘, 트롤링 또는 편견"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Pesterij, trollen of intolerantie"
+            "value" : "Trakassering, kontroll eller intoleranse"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Trakassering, kontroll eller intoleranse"
+            "value" : "Pesterij, trollen of intolerantie"
           }
         },
         "pl" : {
@@ -16053,16 +15800,16 @@
             "value" : "원치 않는 성적 콘텐츠"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ongewenste seksuele inhoud"
+            "value" : "Uønsket suell innhold"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Uønsket suell innhold"
+            "value" : "Ongewenste seksuele inhoud"
           }
         },
         "pl" : {
@@ -16237,16 +15984,16 @@
             "value" : "라벨이 없는 누드 또는 포르노그래피"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Voedingsstoffen of pornografie niet als zodanig geëtiketteerd"
+            "value" : "Nudity eller pornografi som ikke er merket slik"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Nudity eller pornografi som ikke er merket slik"
+            "value" : "Voedingsstoffen of pornografie niet als zodanig geëtiketteerd"
           }
         },
         "pl" : {
@@ -16427,16 +16174,16 @@
             "value" : "스팸"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Spam"
+            "value" : "Søppelpost"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Søppelpost"
+            "value" : "Spam"
           }
         },
         "pl" : {
@@ -16611,16 +16358,16 @@
             "value" : "과도한 멘션이나 답글"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Overmatige vermeldingen of reacties"
+            "value" : "Overdreven omtale eller svar"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Overdreven omtale eller svar"
+            "value" : "Overmatige vermeldingen of reacties"
           }
         },
         "pl" : {
@@ -16795,16 +16542,16 @@
             "value" : "불법 및 긴급"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Illegaal en urgent"
+            "value" : "Ulovlig og Haster"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ulovlig og Haster"
+            "value" : "Illegaal en urgent"
           }
         },
         "pl" : {
@@ -16979,16 +16726,16 @@
             "value" : "법률 또는 서비스 조건의 명백한 위반"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ernstige schendingen van de wet of de gebruiksvoorwaarden"
+            "value" : "Anskaffelse av lovbrudd eller tjenestevilkår"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Anskaffelse av lovbrudd eller tjenestevilkår"
+            "value" : "Ernstige schendingen van de wet of de gebruiksvoorwaarden"
           }
         },
         "pl" : {
@@ -17169,16 +16916,16 @@
             "value" : "북마크 추가"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bladwijzer toevoegen"
+            "value" : "Legg til bokmerke"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Legg til bokmerke"
+            "value" : "Bladwijzer toevoegen"
           }
         },
         "pl" : {
@@ -17359,16 +17106,16 @@
             "value" : "북마크 제거"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bladwijzer verwijderen"
+            "value" : "Fjern bokmerke"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Fjern bokmerke"
+            "value" : "Bladwijzer verwijderen"
           }
         },
         "pl" : {
@@ -17549,16 +17296,16 @@
             "value" : "취소"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "annuleren"
+            "value" : "Avbryt"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Avbryt"
+            "value" : "annuleren"
           }
         },
         "pl" : {
@@ -17703,16 +17450,16 @@
             "value" : "チャンネル"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Kanaal"
+            "value" : "Kanal"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Kanal"
+            "value" : "Kanaal"
           }
         },
         "pl" : {
@@ -17833,16 +17580,16 @@
             "value" : "チャンネル"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Kanalen"
+            "value" : "Kanaler"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Kanaler"
+            "value" : "Kanalen"
           }
         },
         "pl" : {
@@ -17881,12 +17628,6 @@
             "value" : "Kanaler"
           }
         },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Kanallar"
-          }
-        },
         "uk" : {
           "stringUnit" : {
             "state" : "translated",
@@ -18005,16 +17746,16 @@
             "value" : "닫기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Afsluiten"
+            "value" : "Lukk"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lukk"
+            "value" : "Afsluiten"
           }
         },
         "pl" : {
@@ -18195,16 +17936,16 @@
             "value" : "댓글"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Opmerking"
+            "value" : "Kommentar"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Kommentar"
+            "value" : "Opmerking"
           }
         },
         "pl" : {
@@ -18355,13 +18096,13 @@
             "value" : "Cnacel"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Cnacel"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Cnacel"
@@ -18521,16 +18262,16 @@
             "value" : "보내기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Verzenden"
+            "value" : "Sende"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Sende"
+            "value" : "Verzenden"
           }
         },
         "pl" : {
@@ -18711,16 +18452,16 @@
             "value" : "컨텐츠 경고"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Waarschuwing inhoud"
+            "value" : "Advarsel for innhold"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Advarsel for innhold"
+            "value" : "Waarschuwing inhoud"
           }
         },
         "pl" : {
@@ -18901,16 +18642,16 @@
             "value" : "미디어를 민감한 내용으로 표시하기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Media als gevoelig markeren"
+            "value" : "Merk media som sensitivt"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Merk media som sensitivt"
+            "value" : "Media als gevoelig markeren"
           }
         },
         "pl" : {
@@ -19091,16 +18832,16 @@
             "value" : "무슨 일이 일어나고 있나요?"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Wat gebeurt er?"
+            "value" : "Hva skjer?"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Hva skjer?"
+            "value" : "Wat gebeurt er?"
           }
         },
         "pl" : {
@@ -19245,16 +18986,16 @@
             "value" : "Option"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Optie"
+            "value" : "Alternativ"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Alternativ"
+            "value" : "Optie"
           }
         },
         "pl" : {
@@ -19381,16 +19122,16 @@
             "value" : "有効期限："
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vervaldatum op:"
+            "value" : "Utløp på:"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Utløp på:"
+            "value" : "Vervaldatum op:"
           }
         },
         "pl" : {
@@ -19511,16 +19252,16 @@
             "value" : "アンケートタイプ"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Poll type"
+            "value" : "Avstemnings type"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Avstemnings type"
+            "value" : "Poll type"
           }
         },
         "pl" : {
@@ -19677,16 +19418,16 @@
             "value" : "복수 선택"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Meerdere keuzes"
+            "value" : "Flere valg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Flere valg"
+            "value" : "Meerdere keuzes"
           }
         },
         "pl" : {
@@ -19867,16 +19608,16 @@
             "value" : "단일 선택"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Enkele keuze"
+            "value" : "Ett valg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ett valg"
+            "value" : "Enkele keuze"
           }
         },
         "pl" : {
@@ -20057,16 +19798,16 @@
             "value" : "작성하기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Samenstellen"
+            "value" : "Skriv"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Skriv"
+            "value" : "Samenstellen"
           }
         },
         "pl" : {
@@ -20247,16 +19988,16 @@
             "value" : "인용하기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Offerte"
+            "value" : "Sitat"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Sitat"
+            "value" : "Offerte"
           }
         },
         "pl" : {
@@ -20437,16 +20178,16 @@
             "value" : "답글"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Beantwoorden"
+            "value" : "Svar"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Svar"
+            "value" : "Beantwoorden"
           }
         },
         "pl" : {
@@ -20627,16 +20368,16 @@
             "value" : "어두운 색"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Donker"
+            "value" : "Mørk"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Mørk"
+            "value" : "Donker"
           }
         },
         "pl" : {
@@ -20817,16 +20558,16 @@
             "value" : "브라우저에서 열기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Openen in browser"
+            "value" : "Åpne i nettleser"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Åpne i nettleser"
+            "value" : "Openen in browser"
           }
         },
         "pl" : {
@@ -20971,16 +20712,16 @@
             "value" : "アカウントを選択"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Selecteer account"
+            "value" : "Velg konto"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Velg konto"
+            "value" : "Selecteer account"
           }
         },
         "pl" : {
@@ -21137,16 +20878,16 @@
             "value" : "삭제"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Verwijderen"
+            "value" : "Slett"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Slett"
+            "value" : "Verwijderen"
           }
         },
         "pl" : {
@@ -21327,16 +21068,16 @@
             "value" : "삭제"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Verwijderen"
+            "value" : "Slett"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Slett"
+            "value" : "Verwijderen"
           }
         },
         "pl" : {
@@ -21517,16 +21258,16 @@
             "value" : "삭제"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Verwijderen"
+            "value" : "Slett"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Slett"
+            "value" : "Verwijderen"
           }
         },
         "pl" : {
@@ -21671,16 +21412,16 @@
             "value" : "このリストを削除してもよろしいですか？"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Weet u zeker dat u deze lijst wilt verwijderen?"
+            "value" : "Er du sikker på at du vil slette denne listen?"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Er du sikker på at du vil slette denne listen?"
+            "value" : "Weet u zeker dat u deze lijst wilt verwijderen?"
           }
         },
         "pl" : {
@@ -21837,16 +21578,16 @@
             "value" : "목록 삭제"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lijst verwijderen"
+            "value" : "Slett liste"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Slett liste"
+            "value" : "Lijst verwijderen"
           }
         },
         "pl" : {
@@ -22021,16 +21762,16 @@
             "value" : "정말로 이것을 삭제하시겠습니까?"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Weet u zeker dat u dit wilt verwijderen?"
+            "value" : "Er du sikker på at du vil slette dette?"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Er du sikker på at du vil slette dette?"
+            "value" : "Weet u zeker dat u dit wilt verwijderen?"
           }
         },
         "pl" : {
@@ -22175,16 +21916,16 @@
             "value" : "説明"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Beschrijving"
+            "value" : "Beskrivelse"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Beskrivelse"
+            "value" : "Beschrijving"
           }
         },
         "pl" : {
@@ -22311,16 +22052,16 @@
             "value" : "ダイレクトメッセージ"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Direct Bericht"
+            "value" : "Direkte melding"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Direkte melding"
+            "value" : "Direct Bericht"
           }
         },
         "pl" : {
@@ -22447,16 +22188,16 @@
             "value" : "トレンド"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Populair"
+            "value" : "Populært"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Populært"
+            "value" : "Populair"
           }
         },
         "pl" : {
@@ -22619,13 +22360,13 @@
             "value" : "트렌딩 해시태그"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Trending Hashtags"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Trending Hashtags"
@@ -22809,16 +22550,16 @@
             "value" : "발견하기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ontdek"
+            "value" : "Oppdag"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Oppdag"
+            "value" : "Ontdek"
           }
         },
         "pl" : {
@@ -22999,16 +22740,16 @@
             "value" : "사용자 추천"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gebruikers aanbevelen"
+            "value" : "Anbefal brukere"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Anbefal brukere"
+            "value" : "Gebruikers aanbevelen"
           }
         },
         "pl" : {
@@ -23159,16 +22900,16 @@
             "value" : "ダイレクトメッセージを書く"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Schrijf direct bericht"
+            "value" : "Skriv direkte melding"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Skriv direkte melding"
+            "value" : "Schrijf direct bericht"
           }
         },
         "pl" : {
@@ -23295,16 +23036,16 @@
             "value" : "ダイレクトメッセージ"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Direct Bericht"
+            "value" : "Direkte melding"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Direkte melding"
+            "value" : "Direct Bericht"
           }
         },
         "pl" : {
@@ -23461,16 +23202,16 @@
             "value" : "완료"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Voltooid"
+            "value" : "Ferdig"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ferdig"
+            "value" : "Voltooid"
           }
         },
         "pl" : {
@@ -23651,16 +23392,16 @@
             "value" : "완료"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Voltooid"
+            "value" : "Ferdig"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ferdig"
+            "value" : "Voltooid"
           }
         },
         "pl" : {
@@ -23841,16 +23582,16 @@
             "value" : "편집"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bewerken"
+            "value" : "Rediger"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Rediger"
+            "value" : "Bewerken"
           }
         },
         "pl" : {
@@ -23995,16 +23736,16 @@
             "value" : "説明を編集"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Beschrijving bewerken"
+            "value" : "Rediger beskrivelse"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Rediger beskrivelse"
+            "value" : "Beschrijving bewerken"
           }
         },
         "pl" : {
@@ -24161,16 +23902,16 @@
             "value" : "목록 편집"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lijst bewerken"
+            "value" : "Rediger liste"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Rediger liste"
+            "value" : "Lijst bewerken"
           }
         },
         "pl" : {
@@ -24345,16 +24086,16 @@
             "value" : "RSS 소스 편집"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Wijzig Rss Source"
+            "value" : "Rediger Rss kilde"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Rediger Rss kilde"
+            "value" : "Wijzig Rss Source"
           }
         },
         "pl" : {
@@ -24535,16 +24276,16 @@
             "value" : "목록에 추가/제거"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Toevoegen/Verwijderen uit lijst"
+            "value" : "Legg til/fjern fra listen"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Legg til/fjern fra listen"
+            "value" : "Toevoegen/Verwijderen uit lijst"
           }
         },
         "pl" : {
@@ -24689,16 +24430,16 @@
             "value" : "最近使用したもの"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Recent gebruikt"
+            "value" : "Nylig brukt"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Nylig brukt"
+            "value" : "Recent gebruikt"
           }
         },
         "pl" : {
@@ -24825,16 +24566,16 @@
             "value" : "絵文字を検索"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Zoek naar Emoji"
+            "value" : "Søk etter Emoji"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Søk etter Emoji"
+            "value" : "Zoek naar Emoji"
           }
         },
         "pl" : {
@@ -24961,16 +24702,16 @@
             "value" : "終わりに達しました"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Je bereikt het einde"
+            "value" : "Du når slutten"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Du når slutten"
+            "value" : "Je bereikt het einde"
           }
         },
         "pl" : {
@@ -25133,16 +24874,16 @@
             "value" : "오류"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Foutmelding"
+            "value" : "Feil"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Feil"
+            "value" : "Foutmelding"
           }
         },
         "pl" : {
@@ -25323,16 +25064,16 @@
             "value" : "오류"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Foutmelding"
+            "value" : "Feil"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Feil"
+            "value" : "Foutmelding"
           }
         },
         "pl" : {
@@ -25477,16 +25218,16 @@
             "value" : "%@ のログインセッションが失効しました。"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "De aanmeldsessie is verlopen voor %@"
+            "value" : "Login økten er utløpt for %@"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Login økten er utløpt for %@"
+            "value" : "De aanmeldsessie is verlopen voor %@"
           }
         },
         "pl" : {
@@ -25601,16 +25342,16 @@
             "value" : "再ログイン"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Re login"
+            "value" : "Kjør innlogging"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Kjør innlogging"
+            "value" : "Re login"
           }
         },
         "pl" : {
@@ -25737,16 +25478,16 @@
             "value" : "データのエクスポートに失敗しました"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gegevens exporteren mislukt"
+            "value" : "Kunne ikke eksportere data"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Kunne ikke eksportere data"
+            "value" : "Gegevens exporteren mislukt"
           }
         },
         "pl" : {
@@ -25801,131 +25542,11 @@
     },
     "Failed to load models" : {
       "localizations" : {
-        "ar" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "فشل في تحميل النماذج"
-          }
-        },
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Nepodařilo se načíst modely"
-          }
-        },
-        "da" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Kunne ikke indlæse modeller"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Fehler beim Laden der Modelle"
-          }
-        },
-        "el" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Αποτυχία φόρτωσης μοντέλων"
-          }
-        },
         "en" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Failed to load models"
           }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Error al cargar los modelos"
-          }
-        },
-        "fi" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Mallien lataaminen epäonnistui"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Impossible de charger les modèles"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Impossibile caricare i modelli"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "モデルの読み込みに失敗しました"
-          }
-        },
-        "nl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "modellen laden mislukt"
-          }
-        },
-        "no" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Kan ikke laste inn modeller"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Nie udało się załadować modeli"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Falha ao carregar modelos"
-          }
-        },
-        "pt-BR" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Falha ao carregar modelos"
-          }
-        },
-        "ro" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Încărcarea modelelor a eșuat"
-          }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Не удалось загрузить модели"
-          }
-        },
-        "sv" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Det gick inte att ladda modeller"
-          }
-        },
-        "uk" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Не вдалося завантажити моделі"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "加载模型失败"
-          }
         }
       }
     },
@@ -26003,16 +25624,16 @@
             "value" : "fx_share"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Fx_share"
+            "value" : "Del via FxEmbed"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Del via FxEmbed"
+            "value" : "Fx_share"
           }
         },
         "pl" : {
@@ -26169,16 +25790,16 @@
             "value" : "북마크"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bladwijzers"
+            "value" : "Bokmerker"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bokmerker"
+            "value" : "Bladwijzers"
           }
         },
         "pl" : {
@@ -26359,16 +25980,16 @@
             "value" : "발견하기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ontdek"
+            "value" : "Oppdag"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Oppdag"
+            "value" : "Ontdek"
           }
         },
         "pl" : {
@@ -26513,16 +26134,16 @@
             "value" : "お気に入り"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Favoriete"
+            "value" : "Favoritt"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Favoritt"
+            "value" : "Favoriete"
           }
         },
         "pl" : {
@@ -26685,16 +26306,16 @@
             "value" : "추천"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Aanbevolen"
+            "value" : "Anbefalt"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Anbefalt"
+            "value" : "Aanbevolen"
           }
         },
         "pl" : {
@@ -26875,16 +26496,16 @@
             "value" : "피드"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Feeds"
+            "value" : "Strøm"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Strøm"
+            "value" : "Feeds"
           }
         },
         "pl" : {
@@ -27065,16 +26686,16 @@
             "value" : "홈"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Startpagina"
+            "value" : "Hjem"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Hjem"
+            "value" : "Startpagina"
           }
         },
         "pl" : {
@@ -27255,16 +26876,16 @@
             "value" : "목록"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Klantenlijst"
+            "value" : "Liste"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Liste"
+            "value" : "Klantenlijst"
           }
         },
         "pl" : {
@@ -27445,16 +27066,16 @@
             "value" : "내 정보"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "IK"
+            "value" : "Meg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Meg"
+            "value" : "IK"
           }
         },
         "pl" : {
@@ -27599,16 +27220,16 @@
             "value" : "Notification"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Notificatie"
+            "value" : "Varsling"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Varsling"
+            "value" : "Notificatie"
           }
         },
         "pl" : {
@@ -27735,16 +27356,16 @@
             "value" : "インポート完了"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Importeren voltooid"
+            "value" : "Import fullført"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Import fullført"
+            "value" : "Importeren voltooid"
           }
         },
         "pl" : {
@@ -27865,16 +27486,16 @@
             "value" : "これはファイルからデータをインポートします。一致するIDを持つ既存のレコードは置き換えられます。続行しますか？"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Dit zal gegevens uit het bestand importeren. Bestaande records met bijpassende IDs zullen worden vervangen. Wilt u doorgaan?"
+            "value" : "Dette vil importere data fra filen. Eksisterende poster med samsvarende ID-er vil bli erstattet. Vil du fortsette?"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Dette vil importere data fra filen. Eksisterende poster med samsvarende ID-er vil bli erstattet. Vil du fortsette?"
+            "value" : "Dit zal gegevens uit het bestand importeren. Bestaande records met bijpassende IDs zullen worden vervangen. Wilt u doorgaan?"
           }
         },
         "pl" : {
@@ -27995,16 +27616,16 @@
             "value" : "インポートの確認"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Import bevestigen"
+            "value" : "Bekreft import"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bekreft import"
+            "value" : "Import bevestigen"
           }
         },
         "pl" : {
@@ -28125,16 +27746,16 @@
             "value" : "データのインポートに失敗しました"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gegevens importeren mislukt"
+            "value" : "Kan ikke importere data"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Kan ikke importere data"
+            "value" : "Gegevens importeren mislukt"
           }
         },
         "pl" : {
@@ -28291,16 +27912,16 @@
             "value" : "밝은 색"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Licht"
+            "value" : "Lys"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lys"
+            "value" : "Licht"
           }
         },
         "pl" : {
@@ -28481,16 +28102,16 @@
             "value" : "좋아요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "vind-ik-leuk"
+            "value" : "Lik"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lik"
+            "value" : "vind-ik-leuk"
           }
         },
         "pl" : {
@@ -28635,16 +28256,16 @@
             "value" : "いいね！"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Leukgevonden"
+            "value" : "Likte"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Likte"
+            "value" : "Leukgevonden"
           }
         },
         "pl" : {
@@ -28801,16 +28422,16 @@
             "value" : "목록 설명"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Omschrijving lijst"
+            "value" : "Liste beskrivelse"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Liste beskrivelse"
+            "value" : "Omschrijving lijst"
           }
         },
         "pl" : {
@@ -28955,16 +28576,16 @@
             "value" : "リストアイコン"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lijst pictogram"
+            "value" : "Liste ikon"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Liste ikon"
+            "value" : "Lijst pictogram"
           }
         },
         "pl" : {
@@ -29121,16 +28742,16 @@
             "value" : "목록 설명"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Omschrijving lijst"
+            "value" : "Liste beskrivelse"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Liste beskrivelse"
+            "value" : "Omschrijving lijst"
           }
         },
         "pl" : {
@@ -29311,16 +28932,16 @@
             "value" : "목록 구성원 편집"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lijstleden bewerken"
+            "value" : "Rediger listemedlemmer"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Rediger listemedlemmer"
+            "value" : "Lijstleden bewerken"
           }
         },
         "pl" : {
@@ -29501,16 +29122,16 @@
             "value" : "목록 이름"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lijst naam"
+            "value" : "Navn på liste"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Navn på liste"
+            "value" : "Lijst naam"
           }
         },
         "pl" : {
@@ -29691,16 +29312,16 @@
             "value" : "목록 편집"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lijst bewerken"
+            "value" : "Rediger liste"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Rediger liste"
+            "value" : "Lijst bewerken"
           }
         },
         "pl" : {
@@ -29845,16 +29466,16 @@
             "value" : "ここには何もありません"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Niets hier"
+            "value" : "Ingenting her"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ingenting her"
+            "value" : "Niets hier"
           }
         },
         "pl" : {
@@ -30011,16 +29632,16 @@
             "value" : "구성원"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "leden"
+            "value" : "Medlemmer"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Medlemmer"
+            "value" : "leden"
           }
         },
         "pl" : {
@@ -30201,16 +29822,16 @@
             "value" : "목록 이름"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lijst naam"
+            "value" : "Navn på liste"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Navn på liste"
+            "value" : "Lijst naam"
           }
         },
         "pl" : {
@@ -30355,16 +29976,16 @@
             "value" : "リストアイコン"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lijst pictogram"
+            "value" : "Liste ikon"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Liste ikon"
+            "value" : "Lijst pictogram"
           }
         },
         "pl" : {
@@ -30521,16 +30142,16 @@
             "value" : "목록 설명"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Omschrijving lijst"
+            "value" : "Liste beskrivelse"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Liste beskrivelse"
+            "value" : "Omschrijving lijst"
           }
         },
         "pl" : {
@@ -30711,16 +30332,16 @@
             "value" : "목록 설명"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Omschrijving lijst"
+            "value" : "Liste beskrivelse"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Liste beskrivelse"
+            "value" : "Omschrijving lijst"
           }
         },
         "pl" : {
@@ -30901,16 +30522,16 @@
             "value" : "목록 이름"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lijst naam"
+            "value" : "Navn på liste"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Navn på liste"
+            "value" : "Lijst naam"
           }
         },
         "pl" : {
@@ -31091,16 +30712,16 @@
             "value" : "목록 이름"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lijst naam"
+            "value" : "Navn på liste"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Navn på liste"
+            "value" : "Lijst naam"
           }
         },
         "pl" : {
@@ -31281,16 +30902,16 @@
             "value" : "목록 생성"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lijst aanmaken"
+            "value" : "Lag oppgaveliste"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lag oppgaveliste"
+            "value" : "Lijst aanmaken"
           }
         },
         "pl" : {
@@ -31369,131 +30990,11 @@
     },
     "Loading models..." : {
       "localizations" : {
-        "ar" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "تحميل النماذج..."
-          }
-        },
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Načítání modelů..."
-          }
-        },
-        "da" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Indlæser modeller..."
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Lade Modelle..."
-          }
-        },
-        "el" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Φόρτωση μοντέλων..."
-          }
-        },
         "en" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Loading models..."
           }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Cargando modelos..."
-          }
-        },
-        "fi" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Ladataan malleja..."
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Chargement des modèles..."
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Caricamento modelli..."
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "モデルを読み込み中..."
-          }
-        },
-        "nl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Motoren laden..."
-          }
-        },
-        "no" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Laster modeller..."
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Ładowanie modeli..."
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Carregando modelos..."
-          }
-        },
-        "pt-BR" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Carregando modelos..."
-          }
-        },
-        "ro" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Se încarcă modelele..."
-          }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Загрузка моделей..."
-          }
-        },
-        "sv" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Laddar modeller..."
-          }
-        },
-        "uk" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Завантаження моделей..."
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "正在加载模型..."
-          }
         }
       }
     },
@@ -31565,16 +31066,16 @@
             "value" : "読み込み中..."
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Laden..."
+            "value" : "Laster..."
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Laster..."
+            "value" : "Laden..."
           }
         },
         "pl" : {
@@ -31737,16 +31238,16 @@
             "value" : "삭제"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Verwijderen"
+            "value" : "Slett"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Slett"
+            "value" : "Verwijderen"
           }
         },
         "pl" : {
@@ -31927,16 +31428,16 @@
             "value" : "타임라인을 위한 로컬 필터 설정"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lokale filterinstellingen voor tijdlijn"
+            "value" : "Lokale filterinnstillinger for tidslinjen"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lokale filterinnstillinger for tidslinjen"
+            "value" : "Lokale filterinstellingen voor tijdlijn"
           }
         },
         "pl" : {
@@ -32117,16 +31618,16 @@
             "value" : "편집"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bewerken"
+            "value" : "Rediger"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Rediger"
+            "value" : "Bewerken"
           }
         },
         "pl" : {
@@ -32277,16 +31778,16 @@
             "value" : "フィルターを編集"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Filter bewerken"
+            "value" : "Rediger filter"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Rediger filter"
+            "value" : "Filter bewerken"
           }
         },
         "pl" : {
@@ -32443,13 +31944,13 @@
             "value" : "키워드"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Keyword"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Keyword"
@@ -32597,16 +32098,16 @@
             "value" : "キーワードを入力してください"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Voer een trefwoord in"
+            "value" : "Skriv inn et nøkkelord"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Skriv inn et nøkkelord"
+            "value" : "Voer een trefwoord in"
           }
         },
         "pl" : {
@@ -32733,16 +32234,16 @@
             "value" : "通知を有効にする"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Inschakelen in melding"
+            "value" : "Aktiver i varsel"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Aktiver i varsel"
+            "value" : "Inschakelen in melding"
           }
         },
         "pl" : {
@@ -32863,16 +32364,16 @@
             "value" : "フィルタを有効にする"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Filter in"
+            "value" : "Aktiver filter i"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Aktiver filter i"
+            "value" : "Filter in"
           }
         },
         "pl" : {
@@ -32993,16 +32494,16 @@
             "value" : "検索で有効にする"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Inschakelen in zoekopdracht"
+            "value" : "Aktiver i søk"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Aktiver i søk"
+            "value" : "Inschakelen in zoekopdracht"
           }
         },
         "pl" : {
@@ -33123,16 +32624,16 @@
             "value" : "タイムラインで有効にする"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Inschakelen op tijdlijn"
+            "value" : "Aktiver i tidslinjen"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Aktiver i tidslinjen"
+            "value" : "Inschakelen op tijdlijn"
           }
         },
         "pl" : {
@@ -33289,16 +32790,16 @@
             "value" : "로컬 필터"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lokaal filter"
+            "value" : "Lokalt filter"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lokalt filter"
+            "value" : "Lokaal filter"
           }
         },
         "pl" : {
@@ -33479,16 +32980,16 @@
             "value" : "브라우징 기록 보기 또는 검색"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bekijk of zoek uw browsegeschiedenis"
+            "value" : "Vis eller søk i historikk"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vis eller søk i historikk"
+            "value" : "Bekijk of zoek uw browsegeschiedenis"
           }
         },
         "pl" : {
@@ -33621,16 +33122,16 @@
             "value" : "Cerca nella cache…"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Zoeken in cache…"
+            "value" : "Søk i mellomlager…"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Søk i mellomlager…"
+            "value" : "Zoeken in cache…"
           }
         },
         "pl" : {
@@ -33787,16 +33288,16 @@
             "value" : "게시물"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Statuses"
+            "value" : "Innlegg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Innlegg"
+            "value" : "Statuses"
           }
         },
         "pl" : {
@@ -33977,16 +33478,16 @@
             "value" : "로컬 기록"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lokale geschiedenis"
+            "value" : "Lokal historikk"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lokal historikk"
+            "value" : "Lokale geschiedenis"
           }
         },
         "pl" : {
@@ -34167,16 +33668,16 @@
             "value" : "사용자"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gebruikers"
+            "value" : "Brukere"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Brukere"
+            "value" : "Gebruikers"
           }
         },
         "pl" : {
@@ -34357,16 +33858,16 @@
             "value" : "로그인"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Aanmelden"
+            "value" : "Innlogging"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Innlogging"
+            "value" : "Aanmelden"
           }
         },
         "pl" : {
@@ -34547,16 +34048,16 @@
             "value" : "로그인"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Aanmelden"
+            "value" : "Innlogging"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Innlogging"
+            "value" : "Aanmelden"
           }
         },
         "pl" : {
@@ -34701,16 +34202,16 @@
             "value" : "ログアウト"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Afmelden"
+            "value" : "Logg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Logg"
+            "value" : "Afmelden"
           }
         },
         "pl" : {
@@ -34873,16 +34374,16 @@
             "value" : "고정된 투트"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vastgepinde toot"
+            "value" : "Festet innlegg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Festet innlegg"
+            "value" : "Vastgepinde toot"
           }
         },
         "pl" : {
@@ -35063,16 +34564,16 @@
             "value" : "덜 보기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Minder weergeven"
+            "value" : "Vis mindre"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vis mindre"
+            "value" : "Minder weergeven"
           }
         },
         "pl" : {
@@ -35253,16 +34754,16 @@
             "value" : "더 보기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Toon meer"
+            "value" : "Vis mer"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vis mer"
+            "value" : "Toon meer"
           }
         },
         "pl" : {
@@ -35443,16 +34944,16 @@
             "value" : "좋아요를 눌렀습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "favoriet"
+            "value" : "favorisert"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "favorisert"
+            "value" : "favoriet"
           }
         },
         "pl" : {
@@ -35633,16 +35134,16 @@
             "value" : "당신을 팔로우했습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "volgt jou nu"
+            "value" : "fulgte deg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "fulgte deg"
+            "value" : "volgt jou nu"
           }
         },
         "pl" : {
@@ -35817,16 +35318,16 @@
             "value" : "당신을 팔로우 요청했습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "verzoek je te volgen"
+            "value" : "forespørsel om å følge deg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "forespørsel om å følge deg"
+            "value" : "verzoek je te volgen"
           }
         },
         "pl" : {
@@ -36007,16 +35508,16 @@
             "value" : "당신을 언급했습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "noemde je"
+            "value" : "nevnte deg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "nevnte deg"
+            "value" : "noemde je"
           }
         },
         "pl" : {
@@ -36191,16 +35692,16 @@
             "value" : "참여했던 설문조사가 종료되었습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Een poll waaraan u deelnam, is beëindigd"
+            "value" : "En avstemming du deltok i er avsluttet"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "En avstemming du deltok i er avsluttet"
+            "value" : "Een poll waaraan u deelnam, is beëindigd"
           }
         },
         "pl" : {
@@ -36381,16 +35882,16 @@
             "value" : "리블로그했습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "gedeeld"
+            "value" : "reblogget"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "reblogget"
+            "value" : "gedeeld"
           }
         },
         "pl" : {
@@ -36565,16 +36066,16 @@
             "value" : "투트를 부스트했습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "toot heeft geboost"
+            "value" : "repostet et innlegg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "repostet et innlegg"
+            "value" : "toot heeft geboost"
           }
         },
         "pl" : {
@@ -36749,16 +36250,16 @@
             "value" : "투트를 업데이트했습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "heeft een toot bijgewerkt"
+            "value" : "oppdaterte et innlegg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "oppdaterte et innlegg"
+            "value" : "heeft een toot bijgewerkt"
           }
         },
         "pl" : {
@@ -36933,16 +36434,16 @@
             "value" : "정말로 이것을 신고하시겠습니까?"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Weet u zeker dat u dit wilt melden?"
+            "value" : "Er du sikker på at du vil rapportere dette?"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Er du sikker på at du vil rapportere dette?"
+            "value" : "Weet u zeker dat u dit wilt melden?"
           }
         },
         "pl" : {
@@ -37123,16 +36624,16 @@
             "value" : "신고하기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Rapporteren"
+            "value" : "Rapporter"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Rapporter"
+            "value" : "Rapporteren"
           }
         },
         "pl" : {
@@ -37283,16 +36784,16 @@
             "value" : "ローカルタイムライン"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lokale tijdlijn"
+            "value" : "Lokal tidslinje"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lokal tidslinje"
+            "value" : "Lokale tijdlijn"
           }
         },
         "pl" : {
@@ -37425,16 +36926,16 @@
             "value" : "公開タイムライン"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Publieke tijdlijn"
+            "value" : "Offentlig tidslinje"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Offentlig tidslinje"
+            "value" : "Publieke tijdlijn"
           }
         },
         "pl" : {
@@ -37591,16 +37092,16 @@
             "value" : "팔로워"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Volgers"
+            "value" : "Følgere"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Følgere"
+            "value" : "Volgers"
           }
         },
         "pl" : {
@@ -37781,16 +37282,16 @@
             "value" : "팔로잉"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Volgt"
+            "value" : "Følger"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Følger"
+            "value" : "Volgt"
           }
         },
         "pl" : {
@@ -37966,16 +37467,16 @@
             "value" : "브레인 다이버의 링크를 게시하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Plaats de link naar Brain Diver"
+            "value" : "Post linken til Brain Diver"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post linken til Brain Diver"
+            "value" : "Plaats de link naar Brain Diver"
           }
         },
         "pl" : {
@@ -38151,13 +37652,13 @@
             "value" : "Misskey-Misskey 라투마"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Misskey-Misskey La-Tu-Ma"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Misskey-Misskey La-Tu-Ma"
@@ -38336,16 +37837,16 @@
             "value" : "브레인 다이버"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Hersenen Duiver"
+            "value" : "Hjerne sover"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Hjerne sover"
+            "value" : "Hersenen Duiver"
           }
         },
         "pl" : {
@@ -38521,16 +38022,16 @@
             "value" : "버블 게임에서 동시에 가장 큰 두 객체"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Twee van de grootste objecten in het bubbelspel op hetzelfde moment"
+            "value" : "To av de største objektene i boblespillet samtidig"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "To av de største objektene i boblespillet samtidig"
+            "value" : "Twee van de grootste objecten in het bubbelspel op hetzelfde moment"
           }
         },
         "pl" : {
@@ -38706,16 +38207,16 @@
             "value" : "이렇게 점심 도시락을 채울 수 있습니다 🤯 🤯 약간."
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Je kunt een lunchdoos zoals deze 🤯 🤯 een beetje opvullen."
+            "value" : "Du kan fylle en lunsj boks som dette 🤯 🤯 en bit."
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Du kan fylle en lunsj boks som dette 🤯 🤯 en bit."
+            "value" : "Je kunt een lunchdoos zoals deze 🤯 🤯 een beetje opvullen."
           }
         },
         "pl" : {
@@ -38891,16 +38392,16 @@
             "value" : "더블 🤯"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Dubbel:exploderen_head:"
+            "value" : "Dobbel🤯"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Dobbel🤯"
+            "value" : "Dubbel:exploderen_head:"
           }
         },
         "pl" : {
@@ -39076,16 +38577,16 @@
             "value" : "버블 게임에서 가장 큰 객체"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Het grootste object in het bubbelspel"
+            "value" : "Det største objektet i boblespill"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Det største objektet i boblespill"
+            "value" : "Het grootste object in het bubbelspel"
           }
         },
         "pl" : {
@@ -39261,13 +38762,13 @@
             "value" : "🤯"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "🤯"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "🤯"
@@ -39446,16 +38947,16 @@
             "value" : "여기를 클릭했습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Je hebt hier geklikt"
+            "value" : "Du har klikket her"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Du har klikket her"
+            "value" : "Je hebt hier geklikt"
           }
         },
         "pl" : {
@@ -39637,16 +39138,16 @@
             "value" : "여기를 클릭하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Klik hier"
+            "value" : "Klikk her"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Klikk her"
+            "value" : "Klik hier"
           }
         },
         "pl" : {
@@ -39822,16 +39323,16 @@
             "value" : "Misskey를 최소 30분 동안 열어 두세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Houd Misskey open voor ten minste 30 minuten"
+            "value" : "Behold Misskey åpnet i minst 30 minutter"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Behold Misskey åpnet i minst 30 minutter"
+            "value" : "Houd Misskey open voor ten minste 30 minuten"
           }
         },
         "pl" : {
@@ -40013,16 +39514,16 @@
             "value" : "짧은 휴식"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Korte pauze"
+            "value" : "Kort pause"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Kort pause"
+            "value" : "Korte pauze"
           }
         },
         "pl" : {
@@ -40204,16 +39705,16 @@
             "value" : "Misskey를 최소 60분 동안 열어 두세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Houd Misskey open voor ten minste 60 minuten"
+            "value" : "Behold Misskey åpnet i minst 60 minutter"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Behold Misskey åpnet i minst 60 minutter"
+            "value" : "Houd Misskey open voor ten minste 60 minuten"
           }
         },
         "pl" : {
@@ -40395,16 +39896,16 @@
             "value" : "Misskey에서는 \"Miss\"가 없습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Geen \"Miss\" in Misskey"
+            "value" : "Ingen \"Misske\" i Misskey"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ingen \"Misske\" i Misskey"
+            "value" : "Geen \"Miss\" in Misskey"
           }
         },
         "pl" : {
@@ -40580,16 +40081,16 @@
             "value" : "30개의 업적 획득"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Verdien 30 prestaties"
+            "value" : "Tjen 30 prestasjoner"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Tjen 30 prestasjoner"
+            "value" : "Verdien 30 prestaties"
           }
         },
         "pl" : {
@@ -40765,16 +40266,16 @@
             "value" : "업적 수집가"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Prestatie Verzamelaar"
+            "value" : "Prestasjon samler"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Prestasjon samler"
+            "value" : "Prestatie Verzamelaar"
           }
         },
         "pl" : {
@@ -40950,16 +40451,16 @@
             "value" : "쿠키를 클릭했습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Klikte de cookie"
+            "value" : "Klikket på infokapselen"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Klikket på infokapselen"
+            "value" : "Klikte de cookie"
           }
         },
         "pl" : {
@@ -41135,16 +40636,16 @@
             "value" : "기다려, 정확한 웹사이트에 있나요?"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Wacht, ben je op de juiste website?"
+            "value" : "Vent, er du på riktig nettside?"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vent, er du på riktig nettside?"
+            "value" : "Wacht, ben je op de juiste website?"
           }
         },
         "pl" : {
@@ -41320,16 +40821,16 @@
             "value" : "쿠키를 클릭하는 게임"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Een spel waarin je op cookies klikt"
+            "value" : "Et spill hvor du klikker på informasjonskapsler"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Et spill hvor du klikker på informasjonskapsler"
+            "value" : "Een spel waarin je op cookies klikt"
           }
         },
         "pl" : {
@@ -41505,16 +41006,16 @@
             "value" : "드라이브에서 재귀적으로 중첩된 폴더 만들기 시도"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Poging een resource map te maken in de Drive"
+            "value" : "Forsøk på å opprette en rekursivt nestet mappe i stasjon"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Forsøk på å opprette en rekursivt nestet mappe i stasjon"
+            "value" : "Poging een resource map te maken in de Drive"
           }
         },
         "pl" : {
@@ -41690,16 +41191,16 @@
             "value" : "순환 참조"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ronde referentie"
+            "value" : "Sirkulær referanse"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Sirkulær referanse"
+            "value" : "Ronde referentie"
           }
         },
         "pl" : {
@@ -41881,16 +41382,16 @@
             "value" : "1명의 팔로워 얻기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Krijg 1 volger"
+            "value" : "Få 1 følger"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Få 1 følger"
+            "value" : "Krijg 1 volger"
           }
         },
         "pl" : {
@@ -42072,16 +41573,16 @@
             "value" : "첫 번째 팔로워"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Eerste volger"
+            "value" : "Første tilhenger"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Første tilhenger"
+            "value" : "Eerste volger"
           }
         },
         "pl" : {
@@ -42263,16 +41764,16 @@
             "value" : "10명의 팔로워 얻기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Krijg 10 volgers"
+            "value" : "Få 10 følgere"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Få 10 følgere"
+            "value" : "Krijg 10 volgers"
           }
         },
         "pl" : {
@@ -42454,16 +41955,16 @@
             "value" : "나를 팔로우하세요!"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Volg mij!"
+            "value" : "Følg meg!"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Følg meg!"
+            "value" : "Volg mij!"
           }
         },
         "pl" : {
@@ -42645,16 +42146,16 @@
             "value" : "50명의 팔로워 얻기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Krijg 50 volgers"
+            "value" : "Få 50 følgere"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Få 50 følgere"
+            "value" : "Krijg 50 volgers"
           }
         },
         "pl" : {
@@ -42830,16 +42331,16 @@
             "value" : "사람들이 몰려옵니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Komt in massa's"
+            "value" : "Hva skjer med flere"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Hva skjer med flere"
+            "value" : "Komt in massa's"
           }
         },
         "pl" : {
@@ -43021,16 +42522,16 @@
             "value" : "100명의 팔로워 얻기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Krijg 100 volgers"
+            "value" : "Få 100 følgere"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Få 100 følgere"
+            "value" : "Krijg 100 volgers"
           }
         },
         "pl" : {
@@ -43212,16 +42713,16 @@
             "value" : "인기 있는"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Populair"
+            "value" : "Populær"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Populær"
+            "value" : "Populair"
           }
         },
         "pl" : {
@@ -43403,16 +42904,16 @@
             "value" : "300명의 팔로워 얻기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Krijg 300 volgers"
+            "value" : "Få 300 følgere"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Få 300 følgere"
+            "value" : "Krijg 300 volgers"
           }
         },
         "pl" : {
@@ -43588,16 +43089,16 @@
             "value" : "한 줄로 서주세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gelieve een enkele regel te vormen"
+            "value" : "Fyll inn en enkelt linje"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Fyll inn en enkelt linje"
+            "value" : "Gelieve een enkele regel te vormen"
           }
         },
         "pl" : {
@@ -43779,16 +43280,16 @@
             "value" : "500명의 팔로워 얻기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Krijg 500 volgers"
+            "value" : "Få 500 følgere"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Få 500 følgere"
+            "value" : "Krijg 500 volgers"
           }
         },
         "pl" : {
@@ -43970,16 +43471,16 @@
             "value" : "라디오 타워"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Radio toren"
+            "value" : "Radio tårn"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Radio tårn"
+            "value" : "Radio toren"
           }
         },
         "pl" : {
@@ -44161,16 +43662,16 @@
             "value" : "1,000명의 팔로워 얻기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Krijg 1000 volgers"
+            "value" : "Få 1000 følgere"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Få 1000 følgere"
+            "value" : "Krijg 1000 volgers"
           }
         },
         "pl" : {
@@ -44352,16 +43853,16 @@
             "value" : "인플루언서"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bevochtiger"
+            "value" : "Påvirkning"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Påvirkning"
+            "value" : "Bevochtiger"
           }
         },
         "pl" : {
@@ -44543,16 +44044,16 @@
             "value" : "사용자를 팔로우하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Volg een gebruiker"
+            "value" : "Følg en bruker"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Følg en bruker"
+            "value" : "Volg een gebruiker"
           }
         },
         "pl" : {
@@ -44728,16 +44229,16 @@
             "value" : "첫 번째 사용자를 팔로우하기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Je volgt je eerste gebruiker"
+            "value" : "Følger din første bruker"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Følger din første bruker"
+            "value" : "Je volgt je eerste gebruiker"
           }
         },
         "pl" : {
@@ -44919,16 +44420,16 @@
             "value" : "10명 사용자 팔로우하기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Volg 10 gebruikers"
+            "value" : "Følg 10 brukere"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Følg 10 brukere"
+            "value" : "Volg 10 gebruikers"
           }
         },
         "pl" : {
@@ -45104,16 +44605,16 @@
             "value" : "계속... 계속..."
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Hou door... ga zo door..."
+            "value" : "Fortsett med... fortsett å være med..."
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Fortsett med... fortsett å være med..."
+            "value" : "Hou door... ga zo door..."
           }
         },
         "pl" : {
@@ -45295,16 +44796,16 @@
             "value" : "50명 계정 팔로우하기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Volg 50 accounts"
+            "value" : "Følg 50 kontoer"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Følg 50 kontoer"
+            "value" : "Volg 50 accounts"
           }
         },
         "pl" : {
@@ -45486,16 +44987,16 @@
             "value" : "많은 친구들"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Veel vrienden"
+            "value" : "Masse av venner"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Masse av venner"
+            "value" : "Veel vrienden"
           }
         },
         "pl" : {
@@ -45677,16 +45178,16 @@
             "value" : "100명 계정 팔로우하기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Volg 100 accounts"
+            "value" : "Følg 100 kontoer"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Følg 100 kontoer"
+            "value" : "Volg 100 accounts"
           }
         },
         "pl" : {
@@ -45868,16 +45369,16 @@
             "value" : "100명의 친구들"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "100 vrienden"
+            "value" : "100 venner"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "100 venner"
+            "value" : "100 vrienden"
           }
         },
         "pl" : {
@@ -46059,16 +45560,16 @@
             "value" : "300명 계정 팔로우하기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Volg 300 accounts"
+            "value" : "Følg 300 kontoer"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Følg 300 kontoer"
+            "value" : "Volg 300 accounts"
           }
         },
         "pl" : {
@@ -46244,16 +45745,16 @@
             "value" : "친구 과잉"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vriend overbelast"
+            "value" : "Venn overbelastet"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Venn overbelastet"
+            "value" : "Vriend overbelast"
           }
         },
         "pl" : {
@@ -46429,16 +45930,16 @@
             "value" : "숨겨진 보물을 찾았습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Je hebt de verborgen schat gevonden"
+            "value" : "Du har funnet den skjulte skatten"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Du har funnet den skjulte skatten"
+            "value" : "Je hebt de verborgen schat gevonden"
           }
         },
         "pl" : {
@@ -46614,16 +46115,16 @@
             "value" : "보물 찾기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Schat Jacht"
+            "value" : "Skatt Jakt"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Skatt Jakt"
+            "value" : "Schat Jacht"
           }
         },
         "pl" : {
@@ -46799,16 +46300,16 @@
             "value" : "귀하의 홈 타임라인 속도가 분당 20개 노트를 초과하도록 하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Heb de snelheid van je home tijdlijn groter dan 20 npm (notities per minuut)"
+            "value" : "Få hastigheten på hjemmetidslinjen over 20 npm (notater per minutt)"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Få hastigheten på hjemmetidslinjen over 20 npm (notater per minutt)"
+            "value" : "Heb de snelheid van je home tijdlijn groter dan 20 npm (notities per minuut)"
           }
         },
         "pl" : {
@@ -46984,16 +46485,16 @@
             "value" : "흐르는 타임라인"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vloeiende tijdlijn"
+            "value" : "flytende tidslinje"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "flytende tidslinje"
+            "value" : "Vloeiende tijdlijn"
           }
         },
         "pl" : {
@@ -47169,16 +46670,16 @@
             "value" : "\"I ❤ #Misskey\" 게시하기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Plaats \"I ❤️ #Misskey\""
+            "value" : "Innlegg \"I ❤️ #Misskey\""
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Innlegg \"I ❤️ #Misskey\""
+            "value" : "Plaats \"I ❤️ #Misskey\""
           }
         },
         "pl" : {
@@ -47354,16 +46855,16 @@
             "value" : "미스키의 개발 팀이 당신의 지원에 매우 감사드립니다!"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Misskey's ontwikkelingsteam waardeert je steun zeer!"
+            "value" : "Misskey's utviklingsteam setter stor pris på din støtte!"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Misskey's utviklingsteam setter stor pris på din støtte!"
+            "value" : "Misskey's ontwikkelingsteam waardeert je steun zeer!"
           }
         },
         "pl" : {
@@ -47539,16 +47040,16 @@
             "value" : "나는 미스키를 사랑해요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ik hou van Misskey"
+            "value" : "Jeg elsker Misskey"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Jeg elsker Misskey"
+            "value" : "Ik hou van Misskey"
           }
         },
         "pl" : {
@@ -47694,16 +47195,16 @@
             "value" : "10秒ごとに0.005%の確率で獲得できます"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Heeft een kans om te worden verkregen met een kans van 0,005% per 10 seconden"
+            "value" : "Har en sjanse til å bli oppnådd med en sannsynlighet på 0,005% hvert 10 sekund"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Har en sjanse til å bli oppnådd med en sannsynlighet på 0,005% hvert 10 sekund"
+            "value" : "Heeft een kans om te worden verkregen met een kans van 0,005% per 10 seconden"
           }
         },
         "pl" : {
@@ -47861,16 +47362,16 @@
             "value" : "그냥 운이 좋았다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Eenvoudig Geluk"
+            "value" : "Bare ren lykke"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bare ren lykke"
+            "value" : "Eenvoudig Geluk"
           }
         },
         "pl" : {
@@ -48052,16 +47553,16 @@
             "value" : "생일에 로그인하기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Log in op je verjaardag"
+            "value" : "Logg inn på bursdagen din"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Logg inn på bursdagen din"
+            "value" : "Log in op je verjaardag"
           }
         },
         "pl" : {
@@ -48243,16 +47744,16 @@
             "value" : "생일 축하합니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gefeliciteerd met je verjaardag"
+            "value" : "Gratulerer med dagen"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gratulerer med dagen"
+            "value" : "Gefeliciteerd met je verjaardag"
           }
         },
         "pl" : {
@@ -48434,16 +47935,16 @@
             "value" : "새해 첫날에 로그인했습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ingelogd op de eerste dag van het jaar"
+            "value" : "Logget på den første dagen av året"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Logget på den første dagen av året"
+            "value" : "Ingelogd op de eerste dag van het jaar"
           }
         },
         "pl" : {
@@ -48619,16 +48120,16 @@
             "value" : "이 인스턴스에서 또 다른 훌륭한 해를 기원합니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Tot nog een geweldig jaar op dit exemplaar"
+            "value" : "Til et annet stort år i dette tilfellet"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Til et annet stort år i dette tilfellet"
+            "value" : "Tot nog een geweldig jaar op dit exemplaar"
           }
         },
         "pl" : {
@@ -48810,16 +48311,16 @@
             "value" : "새해 복 많이 받으세요!"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gelukkig nieuwjaar!"
+            "value" : "Godt nytt år!"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Godt nytt år!"
+            "value" : "Gelukkig nieuwjaar!"
           }
         },
         "pl" : {
@@ -48995,16 +48496,16 @@
             "value" : "총 3일 로그인"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "In totaal 3 dagen inloggen"
+            "value" : "Logg inn totalt 3 dager"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Logg inn totalt 3 dager"
+            "value" : "In totaal 3 dagen inloggen"
           }
         },
         "pl" : {
@@ -49180,16 +48681,16 @@
             "value" : "오늘부터 저를 미스키스트라고 부르세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Begint vandaag, noem me Misskist"
+            "value" : "Starter i dag, bare ring meg Misskist"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Starter i dag, bare ring meg Misskist"
+            "value" : "Begint vandaag, noem me Misskist"
           }
         },
         "pl" : {
@@ -49371,16 +48872,16 @@
             "value" : "초보자 I"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Beginner I"
+            "value" : "Nybegynner jeg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Nybegynner jeg"
+            "value" : "Beginner I"
           }
         },
         "pl" : {
@@ -49556,16 +49057,16 @@
             "value" : "총 7일 로그인"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Log in voor een totaal van 7 dagen"
+            "value" : "Logg inn totalt 7 dager"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Logg inn totalt 7 dager"
+            "value" : "Log in voor een totaal van 7 dagen"
           }
         },
         "pl" : {
@@ -49741,16 +49242,16 @@
             "value" : "뭔가 익숙해지셨나요?"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Heb je het gevoel dat je dingen al opgehangen hebt?"
+            "value" : "Føler som du har fått heftet på ting enda?"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Føler som du har fått heftet på ting enda?"
+            "value" : "Heb je het gevoel dat je dingen al opgehangen hebt?"
           }
         },
         "pl" : {
@@ -49932,16 +49433,16 @@
             "value" : "초보자 II"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Beginner II"
+            "value" : "Nybegynner II"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Nybegynner II"
+            "value" : "Beginner II"
           }
         },
         "pl" : {
@@ -50117,16 +49618,16 @@
             "value" : "총 15일 로그인"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Log in voor een totaal van 15 dagen"
+            "value" : "Logg inn totalt 15 dager"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Logg inn totalt 15 dager"
+            "value" : "Log in voor een totaal van 15 dagen"
           }
         },
         "pl" : {
@@ -50308,16 +49809,16 @@
             "value" : "초보자 III"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Beginner III"
+            "value" : "Nybegynner III"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Nybegynner III"
+            "value" : "Beginner III"
           }
         },
         "pl" : {
@@ -50493,16 +49994,16 @@
             "value" : "총 30일 로그인"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Log in voor een totaal van 30 dagen"
+            "value" : "Logg inn totalt 30 dager"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Logg inn totalt 30 dager"
+            "value" : "Log in voor een totaal van 30 dagen"
           }
         },
         "pl" : {
@@ -50678,13 +50179,13 @@
             "value" : "미스키스트 I"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Misskist I"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Misskist I"
@@ -50863,16 +50364,16 @@
             "value" : "총 60일 로그인"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Log in voor een totaal van 60 dagen"
+            "value" : "Logg inn totalt 60 dager"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Logg inn totalt 60 dager"
+            "value" : "Log in voor een totaal van 60 dagen"
           }
         },
         "pl" : {
@@ -51048,13 +50549,13 @@
             "value" : "미스키스트 II"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Misskist II"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Misskist II"
@@ -51233,16 +50734,16 @@
             "value" : "총 100일 로그인"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Log in voor een totaal van 100 dagen"
+            "value" : "Logg inn i totalt 100 dager"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Logg inn i totalt 100 dager"
+            "value" : "Log in voor een totaal van 100 dagen"
           }
         },
         "pl" : {
@@ -51418,16 +50919,16 @@
             "value" : "폭력적인 미스키스트"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gewelddadige Misskist"
+            "value" : "Voldelig delegasjon"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Voldelig delegasjon"
+            "value" : "Gewelddadige Misskist"
           }
         },
         "pl" : {
@@ -51603,13 +51104,13 @@
             "value" : "미스키스트 III"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Misskist III"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Misskist III"
@@ -51788,16 +51289,16 @@
             "value" : "총 200일 로그인"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Log in voor een totaal van 200 dagen"
+            "value" : "Logg inn for totalt 200 dager"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Logg inn for totalt 200 dager"
+            "value" : "Log in voor een totaal van 200 dagen"
           }
         },
         "pl" : {
@@ -51973,16 +51474,16 @@
             "value" : "정상 I"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Normaal I"
+            "value" : "Vanlig 1"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vanlig 1"
+            "value" : "Normaal I"
           }
         },
         "pl" : {
@@ -52158,16 +51659,16 @@
             "value" : "총 300일 로그인"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Log in voor een totaal van 300 dagen"
+            "value" : "Logg inn totalt 300 dager"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Logg inn totalt 300 dager"
+            "value" : "Log in voor een totaal van 300 dagen"
           }
         },
         "pl" : {
@@ -52343,16 +51844,16 @@
             "value" : "정상 II"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Normaal II"
+            "value" : "Vanlig II"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vanlig II"
+            "value" : "Normaal II"
           }
         },
         "pl" : {
@@ -52528,16 +52029,16 @@
             "value" : "총 400일 로그인"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Log in totaal 400 dagen in"
+            "value" : "Logg inn i totalt 400 dager"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Logg inn i totalt 400 dager"
+            "value" : "Log in totaal 400 dagen in"
           }
         },
         "pl" : {
@@ -52713,16 +52214,16 @@
             "value" : "정상 III"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Normaal III"
+            "value" : "Vanlig III"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vanlig III"
+            "value" : "Normaal III"
           }
         },
         "pl" : {
@@ -52898,16 +52399,16 @@
             "value" : "총 500일 로그인"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Log in voor een totaal van 500 dagen"
+            "value" : "Logg inn totalt 500 dager"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Logg inn totalt 500 dager"
+            "value" : "Log in voor een totaal van 500 dagen"
           }
         },
         "pl" : {
@@ -53083,16 +52584,16 @@
             "value" : "내 친구들, 내가 노트를 좋아한다고 자주 말해왔습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Beste vrienden, er is vaak gezegd dat ik van notities houd"
+            "value" : "Mine venner har ofte blitt sagt at jeg liker notater"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Mine venner har ofte blitt sagt at jeg liker notater"
+            "value" : "Beste vrienden, er is vaak gezegd dat ik van notities houd"
           }
         },
         "pl" : {
@@ -53268,16 +52769,16 @@
             "value" : "전문가 I"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Expert I"
+            "value" : "Ekspert 1"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ekspert 1"
+            "value" : "Expert I"
           }
         },
         "pl" : {
@@ -53453,16 +52954,16 @@
             "value" : "총 600일 로그인"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Log in voor een totaal van 600 dagen"
+            "value" : "Logg inn i totalt 600 dager"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Logg inn i totalt 600 dager"
+            "value" : "Log in voor een totaal van 600 dagen"
           }
         },
         "pl" : {
@@ -53638,16 +53139,16 @@
             "value" : "전문가 II"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Expert II"
+            "value" : "Ekspert II"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ekspert II"
+            "value" : "Expert II"
           }
         },
         "pl" : {
@@ -53823,16 +53324,16 @@
             "value" : "총 700일 로그인"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Log in totaal 700 dagen in"
+            "value" : "Logg inn i til sammen 700 dager"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Logg inn i til sammen 700 dager"
+            "value" : "Log in totaal 700 dagen in"
           }
         },
         "pl" : {
@@ -54008,16 +53509,16 @@
             "value" : "전문가 III"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Expert III"
+            "value" : "Ekspert III"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ekspert III"
+            "value" : "Expert III"
           }
         },
         "pl" : {
@@ -54193,16 +53694,16 @@
             "value" : "총 800일 로그인"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Log in voor een totaal van 800 dagen"
+            "value" : "Log inn totalt 800 dager"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Log inn totalt 800 dager"
+            "value" : "Log in voor een totaal van 800 dagen"
           }
         },
         "pl" : {
@@ -54378,16 +53879,16 @@
             "value" : "노트의 달인 I"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Meester der notities I"
+            "value" : "Master i Merknader I"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Master i Merknader I"
+            "value" : "Meester der notities I"
           }
         },
         "pl" : {
@@ -54563,16 +54064,16 @@
             "value" : "총 900일 로그인"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Log in totaal 900 dagen in"
+            "value" : "Logg inn totalt 900 dager"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Logg inn totalt 900 dager"
+            "value" : "Log in totaal 900 dagen in"
           }
         },
         "pl" : {
@@ -54748,16 +54249,16 @@
             "value" : "노트의 달인 II"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Meester der notities II"
+            "value" : "Master i Merknader II"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Master i Merknader II"
+            "value" : "Meester der notities II"
           }
         },
         "pl" : {
@@ -54933,16 +54434,16 @@
             "value" : "총 1,000일 로그인"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Log in voor een totaal van 1.000 dagen"
+            "value" : "Logg inn totalt 1000 dager"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Logg inn totalt 1000 dager"
+            "value" : "Log in voor een totaal van 1.000 dagen"
           }
         },
         "pl" : {
@@ -55124,16 +54625,16 @@
             "value" : "Misskey를 사용해 주셔서 감사합니다!"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bedankt voor het gebruiken van Misskey!"
+            "value" : "Takk for at du bruker Misskey!"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Takk for at du bruker Misskey!"
+            "value" : "Bedankt voor het gebruiken van Misskey!"
           }
         },
         "pl" : {
@@ -55309,16 +54810,16 @@
             "value" : "노트의 달인 III"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Meester der notities III"
+            "value" : "Master i note III"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Master i note III"
+            "value" : "Meester der notities III"
           }
         },
         "pl" : {
@@ -55494,16 +54995,16 @@
             "value" : "계정을 고양이로 표시하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Markeer jouw account als een kat"
+            "value" : "Merk kontoen din som en katt"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Merk kontoen din som en katt"
+            "value" : "Markeer jouw account als een kat"
           }
         },
         "pl" : {
@@ -55679,16 +55180,16 @@
             "value" : "나중에 이름을 정할게요."
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ik zal je later een naam geven."
+            "value" : "Jeg skal gi deg et navn senere."
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Jeg skal gi deg et navn senere."
+            "value" : "Ik zal je later een naam geven."
           }
         },
         "pl" : {
@@ -55870,16 +55371,16 @@
             "value" : "나는 고양이입니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ik ben een kat"
+            "value" : "Jeg er en katt"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Jeg er en katt"
+            "value" : "Ik ben een kat"
           }
         },
         "pl" : {
@@ -56055,16 +55556,16 @@
             "value" : "다른 사람이 당신의 노트를 즐겨찾기하도록 하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Laat iemand anders een van je notities favoriet maken"
+            "value" : "Har noen andre satt på en av notatene dine"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Har noen andre satt på en av notatene dine"
+            "value" : "Laat iemand anders een van je notities favoriet maken"
           }
         },
         "pl" : {
@@ -56240,16 +55741,16 @@
             "value" : "별 찾기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Zoek sterren"
+            "value" : "Søker etter stjerner"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Søker etter stjerner"
+            "value" : "Zoek sterren"
           }
         },
         "pl" : {
@@ -56425,16 +55926,16 @@
             "value" : "첫 번째 노트를 클립하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Knip je eerste notitie"
+            "value" : "Klipp din første notat"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Klipp din første notat"
+            "value" : "Knip je eerste notitie"
           }
         },
         "pl" : {
@@ -56610,16 +56111,16 @@
             "value" : "필요하다... 클립하다..."
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Mosterd... klem..."
+            "value" : "Må... klipp..."
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Må... klipp..."
+            "value" : "Mosterd... klem..."
           }
         },
         "pl" : {
@@ -56795,16 +56296,16 @@
             "value" : "게시 후 1분 이내에 노트를 삭제하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Een notitie verwijderen binnen een minuut na het plaatsen ervan"
+            "value" : "Slett et notat i løpet av ett minutt etter å poste det"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Slett et notat i løpet av ett minutt etter å poste det"
+            "value" : "Een notitie verwijderen binnen een minuut na het plaatsen ervan"
           }
         },
         "pl" : {
@@ -56980,16 +56481,16 @@
             "value" : "신경 쓰지 마세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Onthoud"
+            "value" : "Glem det"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Glem det"
+            "value" : "Onthoud"
           }
         },
         "pl" : {
@@ -57165,16 +56666,16 @@
             "value" : "첫 번째 노트를 즐겨찾기에 추가하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Favoriet je eerste notitie"
+            "value" : "Favoritt ditt første notat"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Favoritt ditt første notat"
+            "value" : "Favoriet je eerste notitie"
           }
         },
         "pl" : {
@@ -57350,13 +56851,13 @@
             "value" : "별을 바라보는 사람"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Stargazer"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Stargazer"
@@ -57535,16 +57036,16 @@
             "value" : "첫 번째 노트를 게시하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Plaats je eerste notitie"
+            "value" : "Legg inn ditt første notat"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Legg inn ditt første notat"
+            "value" : "Plaats je eerste notitie"
           }
         },
         "pl" : {
@@ -57720,16 +57221,16 @@
             "value" : "Misskey와 즐거운 시간을 보내세요!"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Veel tijd met Misskey!"
+            "value" : "Ha en god tid med Misskey!"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ha en god tid med Misskey!"
+            "value" : "Veel tijd met Misskey!"
           }
         },
         "pl" : {
@@ -57905,16 +57406,16 @@
             "value" : "내 msky 설정 중입니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "stel gewoon mijn msky op"
+            "value" : "Nettopp msky min"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Nettopp msky min"
+            "value" : "stel gewoon mijn msky op"
           }
         },
         "pl" : {
@@ -58096,16 +57597,16 @@
             "value" : "10개 노트 게시하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Plaats 10 notities"
+            "value" : "Post 10 notater"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 10 notater"
+            "value" : "Plaats 10 notities"
           }
         },
         "pl" : {
@@ -58281,16 +57782,16 @@
             "value" : "몇 개의 노트"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Sommige notities"
+            "value" : "Noen notater"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Noen notater"
+            "value" : "Sommige notities"
           }
         },
         "pl" : {
@@ -58472,16 +57973,16 @@
             "value" : "100개 노트 게시하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 100 notities"
+            "value" : "Post 100 notater"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 100 notater"
+            "value" : "Post 100 notities"
           }
         },
         "pl" : {
@@ -58663,16 +58164,16 @@
             "value" : "많은 노트"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Veel notities"
+            "value" : "Mange notater"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Mange notater"
+            "value" : "Veel notities"
           }
         },
         "pl" : {
@@ -58854,16 +58355,16 @@
             "value" : "500개 노트 게시하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Plaats 500 notities"
+            "value" : "Post 500 notater"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 500 notater"
+            "value" : "Plaats 500 notities"
           }
         },
         "pl" : {
@@ -59039,16 +58540,16 @@
             "value" : "노트에 담긴"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gedekt in notities"
+            "value" : "Dekket i notater"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Dekket i notater"
+            "value" : "Gedekt in notities"
           }
         },
         "pl" : {
@@ -59230,16 +58731,16 @@
             "value" : "1,000개 노트 게시하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 1.000 notities"
+            "value" : "Post 1000 notater"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 1000 notater"
+            "value" : "Post 1.000 notities"
           }
         },
         "pl" : {
@@ -59421,16 +58922,16 @@
             "value" : "산더미 같은 노트"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Een berg notities"
+            "value" : "A mountain of notes"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "A mountain of notes"
+            "value" : "Een berg notities"
           }
         },
         "pl" : {
@@ -59612,16 +59113,16 @@
             "value" : "5,000개 노트 게시하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 5.000 notities"
+            "value" : "Post 5000 notater"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 5000 notater"
+            "value" : "Post 5.000 notities"
           }
         },
         "pl" : {
@@ -59797,16 +59298,16 @@
             "value" : "넘쳐나는 노트"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Notities overvloeien"
+            "value" : "Noter som flyter over"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Noter som flyter over"
+            "value" : "Notities overvloeien"
           }
         },
         "pl" : {
@@ -59988,16 +59489,16 @@
             "value" : "10,000개 노트 게시하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 10.000 notities"
+            "value" : "Post 10000 notater"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 10000 notater"
+            "value" : "Post 10.000 notities"
           }
         },
         "pl" : {
@@ -60173,16 +59674,16 @@
             "value" : "슈퍼노트"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Supernotitie"
+            "value" : "Supernota"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Supernota"
+            "value" : "Supernotitie"
           }
         },
         "pl" : {
@@ -60364,16 +59865,16 @@
             "value" : "20,000개 노트 게시하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 20.000 notities"
+            "value" : "Post 20 000 notater"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 20 000 notater"
+            "value" : "Post 20.000 notities"
           }
         },
         "pl" : {
@@ -60555,16 +60056,16 @@
             "value" : "더 많은 노트가 필요해요..."
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Nood... aantekeningen..."
+            "value" : "Trenger mer... mer... notater..."
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Trenger mer... mer... notater..."
+            "value" : "Nood... aantekeningen..."
           }
         },
         "pl" : {
@@ -60746,16 +60247,16 @@
             "value" : "30,000개 노트 게시하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 30.000 notities"
+            "value" : "Post 30.000 notater"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 30.000 notater"
+            "value" : "Post 30.000 notities"
           }
         },
         "pl" : {
@@ -60937,16 +60438,16 @@
             "value" : "노트 노트 노트!"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Notities notities"
+            "value" : "Notater notater!"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Notater notater!"
+            "value" : "Notities notities"
           }
         },
         "pl" : {
@@ -61128,16 +60629,16 @@
             "value" : "40,000개 노트 게시하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 40.000 notities"
+            "value" : "Post 40.000 notater"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 40.000 notater"
+            "value" : "Post 40.000 notities"
           }
         },
         "pl" : {
@@ -61319,16 +60820,16 @@
             "value" : "노트 공장"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Notitie fabriek"
+            "value" : "Merknader fabrikk"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Merknader fabrikk"
+            "value" : "Notitie fabriek"
           }
         },
         "pl" : {
@@ -61510,16 +61011,16 @@
             "value" : "50,000개 노트 게시하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 50.000 notities"
+            "value" : "Post 50,000 notater"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 50,000 notater"
+            "value" : "Post 50.000 notities"
           }
         },
         "pl" : {
@@ -61701,16 +61202,16 @@
             "value" : "노트의 행성"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Planet van notities"
+            "value" : "Planet of notes"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Planet of notes"
+            "value" : "Planet van notities"
           }
         },
         "pl" : {
@@ -61892,16 +61393,16 @@
             "value" : "60,000개 노트 게시하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 60.000 notities"
+            "value" : "Post 60.000 notater"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 60.000 notater"
+            "value" : "Post 60.000 notities"
           }
         },
         "pl" : {
@@ -62083,16 +61584,16 @@
             "value" : "노트 퀘이사"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Quasar Notitie"
+            "value" : "Merk kvasar"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Merk kvasar"
+            "value" : "Quasar Notitie"
           }
         },
         "pl" : {
@@ -62274,16 +61775,16 @@
             "value" : "70,000개 노트 게시하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 70,000 notities"
+            "value" : "Post 70,000 notater"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 70,000 notater"
+            "value" : "Post 70,000 notities"
           }
         },
         "pl" : {
@@ -62465,16 +61966,16 @@
             "value" : "노트 블랙홀"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Zwart gat notitie"
+            "value" : "Noter svart hull"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Noter svart hull"
+            "value" : "Zwart gat notitie"
           }
         },
         "pl" : {
@@ -62656,16 +62157,16 @@
             "value" : "80,000개 노트 게시하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 80,000 notities"
+            "value" : "Post 80,000 notater"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 80,000 notater"
+            "value" : "Post 80,000 notities"
           }
         },
         "pl" : {
@@ -62847,16 +62348,16 @@
             "value" : "노트 은하"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Notitie sterrenstelsel"
+            "value" : "Note galakse"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Note galakse"
+            "value" : "Notitie sterrenstelsel"
           }
         },
         "pl" : {
@@ -63038,16 +62539,16 @@
             "value" : "90,000개 노트 게시하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 90,000 notities"
+            "value" : "Post 90.000 notater"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 90.000 notater"
+            "value" : "Post 90,000 notities"
           }
         },
         "pl" : {
@@ -63229,16 +62730,16 @@
             "value" : "노트 우주"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Noot universum"
+            "value" : "Notat univers"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Notat univers"
+            "value" : "Noot universum"
           }
         },
         "pl" : {
@@ -63420,16 +62921,16 @@
             "value" : "100,000개 노트 게시하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 100.000 notities"
+            "value" : "Post 100 000 notater"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post 100 000 notater"
+            "value" : "Post 100.000 notities"
           }
         },
         "pl" : {
@@ -63605,16 +63106,16 @@
             "value" : "당신은 할 말이 많습니다."
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "U hebt zeker veel te zeggen."
+            "value" : "Du er sikker på at du har mye å si."
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Du er sikker på at du har mye å si."
+            "value" : "U hebt zeker veel te zeggen."
           }
         },
         "pl" : {
@@ -63796,16 +63297,16 @@
             "value" : "모든 노트는 우리에게 속해있습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "ALLES UW MET BELONG OM TE ONS"
+            "value" : "ALLE DIN merk – FEIL TIL USAs"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "ALLE DIN merk – FEIL TIL USAs"
+            "value" : "ALLES UW MET BELONG OM TE ONS"
           }
         },
         "pl" : {
@@ -63981,16 +63482,16 @@
             "value" : "동시에 3개 이상의 창을 엽니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Heb ten minste 3 vensters open op hetzelfde moment"
+            "value" : "Ha minst tre vinduer åpne samtidig"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ha minst tre vinduer åpne samtidig"
+            "value" : "Heb ten minste 3 vensters open op hetzelfde moment"
           }
         },
         "pl" : {
@@ -64166,16 +63667,16 @@
             "value" : "멀티윈도우"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Multi-venster"
+            "value" : "Multi-Vindu"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Multi-Vindu"
+            "value" : "Multi-venster"
           }
         },
         "pl" : {
@@ -64351,16 +63852,16 @@
             "value" : "스크래치패드에서 \"hello world\" 출력하기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Uitvoer \"hallo wereld\" in het Scratchpad"
+            "value" : "Utgang \"hallo verden\" på Scratchpad"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Utgang \"hallo verden\" på Scratchpad"
+            "value" : "Uitvoer \"hallo wereld\" in het Scratchpad"
           }
         },
         "pl" : {
@@ -64542,16 +64043,16 @@
             "value" : "안녕하세요, 세계!"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Hallo, wereld!"
+            "value" : "Hallo, verden!"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Hallo, verden!"
+            "value" : "Hallo, wereld!"
           }
         },
         "pl" : {
@@ -64727,16 +64228,16 @@
             "value" : "계정 생성 후 1년이 지났습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Eén jaar is verstreken sinds uw account is aangemaakt"
+            "value" : "Ett år har gått siden din konto ble opprettet"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ett år har gått siden din konto ble opprettet"
+            "value" : "Eén jaar is verstreken sinds uw account is aangemaakt"
           }
         },
         "pl" : {
@@ -64912,16 +64413,16 @@
             "value" : "1주년"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Één Verjaardag"
+            "value" : "Et års jubileum"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Et års jubileum"
+            "value" : "Één Verjaardag"
           }
         },
         "pl" : {
@@ -65097,16 +64598,16 @@
             "value" : "계정 생성 후 2년이 지났습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Twee jaar zijn verstreken sinds het aanmaken van uw account"
+            "value" : "Det er gått 2 år siden din konto ble opprettet"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Det er gått 2 år siden din konto ble opprettet"
+            "value" : "Twee jaar zijn verstreken sinds het aanmaken van uw account"
           }
         },
         "pl" : {
@@ -65282,16 +64783,16 @@
             "value" : "2주년"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Tweejarig Verjaardag"
+            "value" : "To års jubileum"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "To års jubileum"
+            "value" : "Tweejarig Verjaardag"
           }
         },
         "pl" : {
@@ -65467,16 +64968,16 @@
             "value" : "계정 생성 후 3년이 지났습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Drie jaar zijn verstreken sinds de aanmaak van uw account"
+            "value" : "Det er gått tre år siden din konto ble opprettet"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Det er gått tre år siden din konto ble opprettet"
+            "value" : "Drie jaar zijn verstreken sinds de aanmaak van uw account"
           }
         },
         "pl" : {
@@ -65652,16 +65153,16 @@
             "value" : "3주년"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Drie jaar Verjaardag"
+            "value" : "Tre års jubileum"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Tre års jubileum"
+            "value" : "Drie jaar Verjaardag"
           }
         },
         "pl" : {
@@ -65837,16 +65338,16 @@
             "value" : "00:00에 노트를 게시하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Plaats een notitie om 00:00"
+            "value" : "Skriv en melding klokken 00:00"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Skriv en melding klokken 00:00"
+            "value" : "Plaats een notitie om 00:00"
           }
         },
         "pl" : {
@@ -66022,13 +65523,13 @@
             "value" : "클릭 클릭 클릭 쨍"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Click Click Click Claaang"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Click Click Click Claaang"
@@ -66207,16 +65708,16 @@
             "value" : "시계 맞추기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Sprekende Klok"
+            "value" : "Snakker klokke"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Snakker klokke"
+            "value" : "Sprekende Klok"
           }
         },
         "pl" : {
@@ -66392,16 +65893,16 @@
             "value" : "늦은 밤에 노트를 게시하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Plaats een notitie laat in de nacht"
+            "value" : "Legg inn en melding sent om natten"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Legg inn en melding sent om natten"
+            "value" : "Plaats een notitie laat in de nacht"
           }
         },
         "pl" : {
@@ -66577,16 +66078,16 @@
             "value" : "이제 잘 시간입니다."
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Het is hoog tijd om naar bed te gaan."
+            "value" : "Det er på tide å gå til sengs."
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Det er på tide å gå til sengs."
+            "value" : "Het is hoog tijd om naar bed te gaan."
           }
         },
         "pl" : {
@@ -66762,16 +66263,16 @@
             "value" : "야행성"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Nachtelijk"
+            "value" : "Nattlig"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Nattlig"
+            "value" : "Nachtelijk"
           }
         },
         "pl" : {
@@ -66947,16 +66448,16 @@
             "value" : "프로필을 설정하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Stel je profiel in"
+            "value" : "Sett opp din profil"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Sett opp din profil"
+            "value" : "Stel je profiel in"
           }
         },
         "pl" : {
@@ -67132,16 +66633,16 @@
             "value" : "잘 준비했습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Goed bereid"
+            "value" : "Godt forberedt"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Godt forberedt"
+            "value" : "Goed bereid"
           }
         },
         "pl" : {
@@ -67317,16 +66818,16 @@
             "value" : "게시된 후 3초 이내에 100자 이상의 메모에 반응하기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Reageer op een notitie die meer dan 100 tekens lang is binnen 3 seconden nadat deze is gepost"
+            "value" : "React på et notat som er over 100 tegn innenfor 3 sekunder etter at det er postet"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "React på et notat som er over 100 tegn innenfor 3 sekunder etter at det er postet"
+            "value" : "Reageer op een notitie die meer dan 100 tekens lang is binnen 3 seconden nadat deze is gepost"
           }
         },
         "pl" : {
@@ -67502,16 +67003,16 @@
             "value" : "정말로 그걸 읽었나요?"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Heb je dat echt gelezen?"
+            "value" : "Har du virkelig lest det?"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Har du virkelig lest det?"
+            "value" : "Heb je dat echt gelezen?"
           }
         },
         "pl" : {
@@ -67687,16 +67188,16 @@
             "value" : "자신의 노트를 인용하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Citeer uw eigen notitie"
+            "value" : "Siter ditt eget notat"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Siter ditt eget notat"
+            "value" : "Citeer uw eigen notitie"
           }
         },
         "pl" : {
@@ -67872,16 +67373,16 @@
             "value" : "자기 참조"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Zelfreferentie"
+            "value" : "Selv-referanse"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Selv-referanse"
+            "value" : "Zelfreferentie"
           }
         },
         "pl" : {
@@ -68063,16 +67564,16 @@
             "value" : "이름을 \"syuilo\"로 설정하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Stel je naam in op \"syuilo\""
+            "value" : "Sett ditt navn til \"syuilo\""
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Sett ditt navn til \"syuilo\""
+            "value" : "Stel je naam in op \"syuilo\""
           }
         },
         "pl" : {
@@ -68254,16 +67755,16 @@
             "value" : "신의 복잡성"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "God Complex"
+            "value" : "Kompleks Gud"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Kompleks Gud"
+            "value" : "God Complex"
           }
         },
         "pl" : {
@@ -68439,16 +67940,16 @@
             "value" : "극도로 짧은 시간 안에 알림 테스트를 반복적으로 트리거하세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Trigger de notificatie-test herhaaldelijk binnen extreem korte tijd"
+            "value" : "Utløs varslingstesten gjentatte ganger i løpet av svært kort tid"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Utløs varslingstesten gjentatte ganger i løpet av svært kort tid"
+            "value" : "Trigger de notificatie-test herhaaldelijk binnen extreem korte tijd"
           }
         },
         "pl" : {
@@ -68624,16 +68125,16 @@
             "value" : "테스트 오버플로우"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Overloop testen"
+            "value" : "Prøving av overflyt"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Prøving av overflyt"
+            "value" : "Overloop testen"
           }
         },
         "pl" : {
@@ -68809,16 +68310,16 @@
             "value" : "튜토리얼 완료"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Tutorial voltooid"
+            "value" : "Opplæring fullført"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Opplæring fullført"
+            "value" : "Tutorial voltooid"
           }
         },
         "pl" : {
@@ -68994,16 +68495,16 @@
             "value" : "Misskey 초급 과정 졸업장"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Misskey Elementary Cursus Diploma"
+            "value" : "Misskey Elementary Course Diploma"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Misskey Elementary Course Diploma"
+            "value" : "Misskey Elementary Cursus Diploma"
           }
         },
         "pl" : {
@@ -69179,16 +68680,16 @@
             "value" : "업적 목록을 최소 3분 동안 봅니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bekijk je lijst met prestaties voor ten minste 3 minuten"
+            "value" : "Se listen over prestasjoner i minst 3 minutter"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Se listen over prestasjoner i minst 3 minutter"
+            "value" : "Bekijk je lijst met prestaties voor ten minste 3 minuten"
           }
         },
         "pl" : {
@@ -69364,16 +68865,16 @@
             "value" : "좋아요 업적"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Likes Prestaties"
+            "value" : "Liker Prestasjoner"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Liker Prestasjoner"
+            "value" : "Likes Prestaties"
           }
         },
         "pl" : {
@@ -69549,16 +69050,16 @@
             "value" : "귀하의 인스턴스 차트를 봅니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bekijk de grafieken van je instantie"
+            "value" : "Vis din instans sine karter"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vis din instans sine karter"
+            "value" : "Bekijk de grafieken van je instantie"
           }
         },
         "pl" : {
@@ -69734,16 +69235,16 @@
             "value" : "분석가"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Analist"
+            "value" : "Analytiker"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Analytiker"
+            "value" : "Analist"
           }
         },
         "pl" : {
@@ -69888,16 +69389,16 @@
             "value" : "お気に入り"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Favoriete"
+            "value" : "Favoritt"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Favoritt"
+            "value" : "Favoriete"
           }
         },
         "pl" : {
@@ -70060,16 +69561,16 @@
             "value" : "팔로우"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Volgen"
+            "value" : "Følg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Følg"
+            "value" : "Volgen"
           }
         },
         "pl" : {
@@ -70214,16 +69715,16 @@
             "value" : "お気に入り"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Favorieten"
+            "value" : "Favoritter"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Favoritter"
+            "value" : "Favorieten"
           }
         },
         "pl" : {
@@ -70262,12 +69763,6 @@
             "value" : "Favoriter"
           }
         },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Favoriler"
-          }
-        },
         "uk" : {
           "stringUnit" : {
             "state" : "translated",
@@ -70386,16 +69881,16 @@
             "value" : "추천"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Aanbevolen"
+            "value" : "Anbefalt"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Anbefalt"
+            "value" : "Aanbevolen"
           }
         },
         "pl" : {
@@ -70576,16 +70071,16 @@
             "value" : "팔로잉"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Volgt"
+            "value" : "Følger"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Følger"
+            "value" : "Volgt"
           }
         },
         "pl" : {
@@ -70730,16 +70225,16 @@
             "value" : "所有しています"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Eigendom"
+            "value" : "Eid"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Eid"
+            "value" : "Eigendom"
           }
         },
         "pl" : {
@@ -70778,12 +70273,6 @@
             "value" : "Ägd"
           }
         },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Sahip olduklarım"
-          }
-        },
         "uk" : {
           "stringUnit" : {
             "state" : "translated",
@@ -70866,13 +70355,13 @@
             "value" : "Unfavourite"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Unfavourite"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Unfavourite"
@@ -70914,12 +70403,6 @@
             "value" : "Unfavourite"
           }
         },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Favorilerden Çıkar"
-          }
-        },
         "uk" : {
           "stringUnit" : {
             "state" : "translated",
@@ -71002,16 +70485,16 @@
             "value" : "フォローを解除"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ontvolgen"
+            "value" : "Ikke følg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ikke følg"
+            "value" : "Ontvolgen"
           }
         },
         "pl" : {
@@ -71050,12 +70533,6 @@
             "value" : "Sluta följa"
           }
         },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Takibi bırak"
-          }
-        },
         "uk" : {
           "stringUnit" : {
             "state" : "translated",
@@ -71074,132 +70551,142 @@
       "localizations" : {
         "ar" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "لقد حصلت على انجاز"
           }
         },
         "cs" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Získali jste úspěch"
           }
         },
         "da" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Du har opnået en bedrift"
           }
         },
         "de" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Sie haben eine Errungenschaft verdient"
           }
         },
         "el" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Έχετε κερδίσει ένα επίτευγμα"
           }
         },
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "You've earned an achievement"
+            "value" : "You've earned an achievement %@ %@ "
           }
         },
         "es" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Has conseguido un logro"
           }
         },
         "fi" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Olet ansainnut saavutuksen"
           }
         },
         "fr" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Vous avez gagné un accomplissement"
           }
         },
         "it" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Risultato raggiunto"
           }
         },
         "ja" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "アチーブメントを獲得しました"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
-            "state" : "translated",
-            "value" : "Je hebt een prestatie verdiend"
+            "state" : "needs_review",
+            "value" : "Du har tjent en prestasjon"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
-            "state" : "translated",
-            "value" : "Du har tjent en prestasjon"
+            "state" : "needs_review",
+            "value" : "Je hebt een prestatie verdiend"
           }
         },
         "pl" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Zdobyłeś osiągnięcie"
           }
         },
         "pt" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Você ganhou uma conquista"
           }
         },
         "pt-BR" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Você ganhou uma conquista"
           }
         },
         "ro" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Ai câștigat o realizare"
           }
         },
         "ru" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Вы получили достижение"
           }
         },
         "sv" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Du har förtjänat en prestation"
           }
         },
         "uk" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Ви заробили досягнення"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "您已经获得了成就"
           }
         }
       }
     },
+    "misskey_notification_achievement_earned %@ %@" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "You've earned an achievement %1$@ %2$@"
+          }
+        }
+      }
+    },
     "misskey_notification_app" : {
       "localizations" : {
         "af" : {
@@ -71304,13 +70791,13 @@
             "value" : "앱"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "App"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "App"
@@ -71391,6 +70878,7 @@
       }
     },
     "misskey_notification_follow" : {
+      "extractionState" : "stale",
       "localizations" : {
         "af" : {
           "stringUnit" : {
@@ -71494,16 +70982,16 @@
             "value" : "당신을 팔로우했습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "volgt jou nu"
+            "value" : "fulgte deg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "fulgte deg"
+            "value" : "volgt jou nu"
           }
         },
         "pl" : {
@@ -71678,16 +71166,16 @@
             "value" : "당신의 팔로우 요청을 수락했습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "heeft je volgverzoek geaccepteerd"
+            "value" : "aksepterte din forespørsel"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "aksepterte din forespørsel"
+            "value" : "heeft je volgverzoek geaccepteerd"
           }
         },
         "pl" : {
@@ -71765,6 +71253,7 @@
       }
     },
     "misskey_notification_mention" : {
+      "extractionState" : "stale",
       "localizations" : {
         "af" : {
           "stringUnit" : {
@@ -71868,16 +71357,16 @@
             "value" : "당신을 언급했습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "noemde je"
+            "value" : "nevnte deg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "nevnte deg"
+            "value" : "noemde je"
           }
         },
         "pl" : {
@@ -71955,6 +71444,7 @@
       }
     },
     "misskey_notification_poll_ended" : {
+      "extractionState" : "stale",
       "localizations" : {
         "af" : {
           "stringUnit" : {
@@ -72052,16 +71542,16 @@
             "value" : "참여했던 설문조사가 종료되었습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Een poll waaraan u deelnam, is beëindigd"
+            "value" : "En avstemming du deltok i er avsluttet"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "En avstemming du deltok i er avsluttet"
+            "value" : "Een poll waaraan u deelnam, is beëindigd"
           }
         },
         "pl" : {
@@ -72242,16 +71732,16 @@
             "value" : "인용했습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "geciteerd"
+            "value" : "sitert"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "sitert"
+            "value" : "geciteerd"
           }
         },
         "pl" : {
@@ -72432,16 +71922,16 @@
             "value" : "다시 게시했습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "gepost"
+            "value" : "repostet"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "repostet"
+            "value" : "gepost"
           }
         },
         "pl" : {
@@ -72519,6 +72009,7 @@
       }
     },
     "misskey_notification_receive_follow_request" : {
+      "extractionState" : "stale",
       "localizations" : {
         "af" : {
           "stringUnit" : {
@@ -72616,16 +72107,16 @@
             "value" : "당신을 팔로우 요청했습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "aangevraagd om je te volgen"
+            "value" : "bedt om å følge deg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "bedt om å følge deg"
+            "value" : "aangevraagd om je te volgen"
           }
         },
         "pl" : {
@@ -72703,6 +72194,7 @@
       }
     },
     "misskey_notification_renote" : {
+      "extractionState" : "stale",
       "localizations" : {
         "ar" : {
           "stringUnit" : {
@@ -72770,13 +72262,13 @@
             "value" : "renote"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "renote"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "renote"
@@ -72930,16 +72422,16 @@
             "value" : "답장"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Beantwoorden"
+            "value" : "svar"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "svar"
+            "value" : "Beantwoorden"
           }
         },
         "pl" : {
@@ -73017,6 +72509,7 @@
       }
     },
     "misskey_notification_unknwon" : {
+      "extractionState" : "stale",
       "localizations" : {
         "ar" : {
           "stringUnit" : {
@@ -73084,16 +72577,16 @@
             "value" : "Unknwn"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ontbrekend"
+            "value" : "Uknuste"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Uknuste"
+            "value" : "Ontbrekend"
           }
         },
         "pl" : {
@@ -73244,16 +72737,16 @@
             "value" : "이 게시물의 문제는 무엇인가요?"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Wat is het probleem met dit bericht?"
+            "value" : "Hva er problemet med dette innlegget?"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Hva er problemet med dette innlegget?"
+            "value" : "Wat is het probleem met dit bericht?"
           }
         },
         "pl" : {
@@ -73398,16 +72891,16 @@
             "value" : "ここに問題を入力してください"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Voer het probleem hier in"
+            "value" : "Skriv inn problemet her"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Skriv inn problemet her"
+            "value" : "Voer het probleem hier in"
           }
         },
         "pl" : {
@@ -73564,16 +73057,16 @@
             "value" : "신고하기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Rapporteren"
+            "value" : "Rapporter"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Rapporter"
+            "value" : "Rapporteren"
           }
         },
         "pl" : {
@@ -73754,16 +73247,16 @@
             "value" : "혼합"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gemengd"
+            "value" : "Blandet"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Blandet"
+            "value" : "Gemengd"
           }
         },
         "pl" : {
@@ -73842,131 +73335,11 @@
     },
     "Model" : {
       "localizations" : {
-        "ar" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "الموديل"
-          }
-        },
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Vzor"
-          }
-        },
-        "da" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Model"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Modell"
-          }
-        },
-        "el" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Μοντέλο"
-          }
-        },
         "en" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Model"
           }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Modelo"
-          }
-        },
-        "fi" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Malli"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Modélisation"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Modello"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "モデル"
-          }
-        },
-        "nl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Model"
-          }
-        },
-        "no" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Modell"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Wzór"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Modelo"
-          }
-        },
-        "pt-BR" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Modelo"
-          }
-        },
-        "ro" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Model"
-          }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Модель"
-          }
-        },
-        "sv" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Modell"
-          }
-        },
-        "uk" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Модель"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "模型"
-          }
         }
       }
     },
@@ -74074,16 +73447,16 @@
             "value" : "더보기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Meer"
+            "value" : "Mer"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Mer"
+            "value" : "Meer"
           }
         },
         "pl" : {
@@ -74264,16 +73637,16 @@
             "value" : "더보기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Meer"
+            "value" : "Mer"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Mer"
+            "value" : "Meer"
           }
         },
         "pl" : {
@@ -74454,16 +73827,16 @@
             "value" : "음소거"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Dempen"
+            "value" : "Demp"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Demp"
+            "value" : "Dempen"
           }
         },
         "pl" : {
@@ -74608,16 +73981,16 @@
             "value" : "このユーザーをミュートしてもよろしいですか？"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Weet je zeker dat je deze gebruiker wilt muten?"
+            "value" : "Er du sikker på at du vil dempe denne brukeren?"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Er du sikker på at du vil dempe denne brukeren?"
+            "value" : "Weet je zeker dat je deze gebruiker wilt muten?"
           }
         },
         "pl" : {
@@ -74738,16 +74111,16 @@
             "value" : "ユーザーをミュート"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gebruiker dempen"
+            "value" : "Demp bruker"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Demp bruker"
+            "value" : "Gebruiker dempen"
           }
         },
         "pl" : {
@@ -74926,131 +74299,11 @@
     },
     "No models available" : {
       "localizations" : {
-        "ar" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "لا توجد نماذج متاحة"
-          }
-        },
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Žádné dostupné modely"
-          }
-        },
-        "da" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Ingen tilgængelige modeller"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Keine Modelle verfügbar"
-          }
-        },
-        "el" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Δεν υπάρχουν διαθέσιμα μοντέλα"
-          }
-        },
         "en" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "No models available"
           }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "No hay modelos disponibles"
-          }
-        },
-        "fi" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Ei malleja saatavilla"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Aucun modèle disponible"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Nessun modello disponibile"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "利用可能なモデルがありません"
-          }
-        },
-        "nl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Geen modellen beschikbaar"
-          }
-        },
-        "no" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Ingen modeller tilgjengelig"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Brak dostępnych modeli"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Não há modelos disponíveis"
-          }
-        },
-        "pt-BR" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Não há modelos disponíveis"
-          }
-        },
-        "ro" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Nu există modele disponibile"
-          }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Нет доступных моделей"
-          }
-        },
-        "sv" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Inga modeller tillgängliga"
-          }
-        },
-        "uk" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Немає доступних моделей"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "没有可用的模型"
-          }
         }
       }
     },
@@ -75116,16 +74369,16 @@
             "value" : "%@ はまだ完了していません。"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Nog niet klaar voor %@"
+            "value" : "Ikke ferdig enda for %@"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ikke ferdig enda for %@"
+            "value" : "Nog niet klaar voor %@"
           }
         },
         "pl" : {
@@ -75246,16 +74499,16 @@
             "value" : "投稿を送信できませんでした"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bericht versturen mislukt"
+            "value" : "Kunne ikke sende innlegg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Kunne ikke sende innlegg"
+            "value" : "Bericht versturen mislukt"
           }
         },
         "pl" : {
@@ -75382,16 +74635,16 @@
             "value" : "投稿を送信しました"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bericht verzonden"
+            "value" : "Post sendt"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post sendt"
+            "value" : "Bericht verzonden"
           }
         },
         "pl" : {
@@ -75548,16 +74801,16 @@
             "value" : "로그인 만료, 다시 로그인 해주세요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Inloggen verlopen, gelieve opnieuw in te loggen"
+            "value" : "Innlogging utløpt, vennligst logg inn igjen"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Innlogging utløpt, vennligst logg inn igjen"
+            "value" : "Inloggen verlopen, gelieve opnieuw in te loggen"
           }
         },
         "pl" : {
@@ -75708,16 +74961,16 @@
             "value" : "画像の保存に失敗しました"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Opslaan van afbeelding mislukt"
+            "value" : "Kunne ikke lagre bilde"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Kunne ikke lagre bilde"
+            "value" : "Opslaan van afbeelding mislukt"
           }
         },
         "pl" : {
@@ -75844,16 +75097,16 @@
             "value" : "画像をライブラリに保存しました"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Afbeelding opgeslagen in bibliotheek"
+            "value" : "Bilde lagret i biblioteket"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bilde lagret i biblioteket"
+            "value" : "Afbeelding opgeslagen in bibliotheek"
           }
         },
         "pl" : {
@@ -76010,16 +75263,16 @@
             "value" : "모두"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Allemaal"
+            "value" : "Alle"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Alle"
+            "value" : "Allemaal"
           }
         },
         "pl" : {
@@ -76200,16 +75453,16 @@
             "value" : "댓글"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Opmerking"
+            "value" : "Kommentar"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Kommentar"
+            "value" : "Opmerking"
           }
         },
         "pl" : {
@@ -76390,16 +75643,16 @@
             "value" : "좋아요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "vind-ik-leuk"
+            "value" : "Lik"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lik"
+            "value" : "vind-ik-leuk"
           }
         },
         "pl" : {
@@ -76544,16 +75797,16 @@
             "value" : "メンション"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vermelding"
+            "value" : "Nevn"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Nevn"
+            "value" : "Vermelding"
           }
         },
         "pl" : {
@@ -76674,16 +75927,16 @@
             "value" : "Notification"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Notificatie"
+            "value" : "Varsling"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Varsling"
+            "value" : "Notificatie"
           }
         },
         "pl" : {
@@ -76846,13 +76099,13 @@
             "value" : "확인"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Ok"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Ok"
@@ -77000,16 +76253,16 @@
             "value" : "ブラウダーで開く"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Openen in blader"
+            "value" : "Åpne i nettleser"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Åpne i nettleser"
+            "value" : "Openen in blader"
           }
         },
         "pl" : {
@@ -77064,131 +76317,11 @@
     },
     "OpenAI model used for translation and summary" : {
       "localizations" : {
-        "ar" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "نموذج OpenAI المستخدم للترجمة والموجز"
-          }
-        },
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "OpenAI model použitý pro překlad a shrnutí"
-          }
-        },
-        "da" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "OpenAI model brugt til oversættelse og resumé"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "OpenAI-Modell für Übersetzung und Zusammenfassung"
-          }
-        },
-        "el" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Μοντέλο OpenAI που χρησιμοποιείται για μετάφραση και περίληψη"
-          }
-        },
         "en" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "OpenAI model used for translation and summary"
           }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Modelo OpenAI utilizado para la traducción y resumen"
-          }
-        },
-        "fi" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "OpenAI malli käytetään kääntämiseen ja tiivistelmään"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Modèle OpenAI utilisé pour la traduction et le résumé"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Modello OpenAI utilizzato per traduzione e riepilogo"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "翻訳と概要に使用されるOpenAIモデル"
-          }
-        },
-        "nl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "OpenAI-model gebruikt voor vertaling en samenvatting"
-          }
-        },
-        "no" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "OpenAI-modell brukt for oversettelse og sammendrag"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Model OpenAI używany do tłumaczenia i podsumowania"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Modelo OpenAI usado para tradução e resumo"
-          }
-        },
-        "pt-BR" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Modelo OpenAI usado para tradução e resumo"
-          }
-        },
-        "ro" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Modelul OpenAI folosit pentru traducere și rezumat"
-          }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Модель OpenAI, используемая для перевода и сводки"
-          }
-        },
-        "sv" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "OpenAI-modell som används för översättning och sammanfattning"
-          }
-        },
-        "uk" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Модель OpenAI, яка використовується для перекладу та резюме"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "用于翻译和摘要的 OpenAI 模型"
-          }
         }
       }
     },
@@ -77260,16 +76393,16 @@
             "value" : "OPMLからインポート"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Importeren uit OPML"
+            "value" : "Importer fra OPML"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Importer fra OPML"
+            "value" : "Importeren uit OPML"
           }
         },
         "pl" : {
@@ -77308,12 +76441,6 @@
             "value" : "Importera från OPML"
           }
         },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "OPML'den içe aktar"
-          }
-        },
         "uk" : {
           "stringUnit" : {
             "state" : "translated",
@@ -77396,16 +76523,16 @@
             "value" : "OPMLからインポート"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Importeren uit OPML"
+            "value" : "Importer fra OPML"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Importer fra OPML"
+            "value" : "Importeren uit OPML"
           }
         },
         "pl" : {
@@ -77444,12 +76571,6 @@
             "value" : "Importera från OPML"
           }
         },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "OPML'den içe aktar"
-          }
-        },
         "uk" : {
           "stringUnit" : {
             "state" : "translated",
@@ -77532,16 +76653,16 @@
             "value" : "このページにアクセスするには再ログインが必要です"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "U moet opnieuw inloggen om toegang te krijgen tot deze pagina"
+            "value" : "Du må logge inn på nytt for å få tilgang til denne siden"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Du må logge inn på nytt for å få tilgang til denne siden"
+            "value" : "U moet opnieuw inloggen om toegang te krijgen tot deze pagina"
           }
         },
         "pl" : {
@@ -77662,16 +76783,16 @@
             "value" : "アクセスが拒否されました"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Toestemming geweigerd"
+            "value" : "Tilgang nektet"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Tilgang nektet"
+            "value" : "Toestemming geweigerd"
           }
         },
         "pl" : {
@@ -77822,16 +76943,16 @@
             "value" : "투표가 만료됨"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Poll verlopen"
+            "value" : "Avstemningen utløpt"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Avstemningen utløpt"
+            "value" : "Poll verlopen"
           }
         },
         "pl" : {
@@ -77976,16 +77097,16 @@
             "value" : "有効期限："
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Verlopen op"
+            "value" : "Utløpt på"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Utløpt på"
+            "value" : "Verlopen op"
           }
         },
         "pl" : {
@@ -78142,16 +77263,16 @@
             "value" : "투표"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Stemming"
+            "value" : "Stem"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Stem"
+            "value" : "Stemming"
           }
         },
         "pl" : {
@@ -78332,16 +77453,16 @@
             "value" : "게시물"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Berichten"
+            "value" : "Innlegg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Innlegg"
+            "value" : "Berichten"
           }
         },
         "pl" : {
@@ -78522,16 +77643,16 @@
             "value" : "좋아요"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vind-ik-leuk"
+            "value" : "Liker"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Liker"
+            "value" : "Vind-ik-leuk"
           }
         },
         "pl" : {
@@ -78712,16 +77833,16 @@
             "value" : "미디어"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Medium"
+            "value" : "Medier"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Medier"
+            "value" : "Medium"
           }
         },
         "pl" : {
@@ -78902,16 +78023,16 @@
             "value" : "게시물 및 회신"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Berichten en antwoorden"
+            "value" : "Innlegg og svar"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Innlegg og svar"
+            "value" : "Berichten en antwoorden"
           }
         },
         "pl" : {
@@ -79092,16 +78213,16 @@
             "value" : "게시물"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Berichten"
+            "value" : "Innlegg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Innlegg"
+            "value" : "Berichten"
           }
         },
         "pl" : {
@@ -79282,16 +78403,16 @@
             "value" : "인용하기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Offerte"
+            "value" : "Sitat"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Sitat"
+            "value" : "Offerte"
           }
         },
         "pl" : {
@@ -79472,16 +78593,16 @@
             "value" : "반응 추가"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Reactie toevoegen"
+            "value" : "Legg til reaksjon"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Legg til reaksjon"
+            "value" : "Reactie toevoegen"
           }
         },
         "pl" : {
@@ -79662,16 +78783,16 @@
             "value" : "반응 제거"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Reactie verwijderen"
+            "value" : "Fjern reaksjon"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Fjern reaksjon"
+            "value" : "Reactie verwijderen"
           }
         },
         "pl" : {
@@ -79846,16 +78967,16 @@
             "value" : "거부"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Afwijzen"
+            "value" : "Avvis"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Avvis"
+            "value" : "Afwijzen"
           }
         },
         "pl" : {
@@ -80036,16 +79157,16 @@
             "value" : "차단됨"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Geblokkeerd"
+            "value" : "Blokkert"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Blokkert"
+            "value" : "Geblokkeerd"
           }
         },
         "pl" : {
@@ -80226,16 +79347,16 @@
             "value" : "팔로우"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Volgen"
+            "value" : "Følg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Følg"
+            "value" : "Volgen"
           }
         },
         "pl" : {
@@ -80416,16 +79537,16 @@
             "value" : "팔로잉"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Volgt"
+            "value" : "Følger"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Følger"
+            "value" : "Volgt"
           }
         },
         "pl" : {
@@ -80606,16 +79727,16 @@
             "value" : "당신을 팔로우합니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Volgt jou"
+            "value" : "Følger deg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Følger deg"
+            "value" : "Volgt jou"
           }
         },
         "pl" : {
@@ -80796,16 +79917,16 @@
             "value" : "요청됨"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Aangevraagd"
+            "value" : "Forespurt"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Forespurt"
+            "value" : "Aangevraagd"
           }
         },
         "pl" : {
@@ -80986,16 +80107,16 @@
             "value" : "답장"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Beantwoorden"
+            "value" : "Svar"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Svar"
+            "value" : "Beantwoorden"
           }
         },
         "pl" : {
@@ -81170,16 +80291,16 @@
             "value" : "%@에게 답장"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Antwoord op %@"
+            "value" : "Svar til %@"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Svar til %@"
+            "value" : "Antwoord op %@"
           }
         },
         "pl" : {
@@ -81360,16 +80481,16 @@
             "value" : "보고서"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Rapporteren"
+            "value" : "Rapporter"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Rapporter"
+            "value" : "Rapporteren"
           }
         },
         "pl" : {
@@ -81550,16 +80671,16 @@
             "value" : "리트윗"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Retweet"
+            "value" : "Gjenkjenn"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gjenkjenn"
+            "value" : "Retweet"
           }
         },
         "pl" : {
@@ -81734,16 +80855,16 @@
             "value" : "리트윗 제거"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Verwijder retweet"
+            "value" : "Fjern innlegg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Fjern innlegg"
+            "value" : "Verwijder retweet"
           }
         },
         "pl" : {
@@ -81924,16 +81045,16 @@
             "value" : "추가"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Toevoegen"
+            "value" : "Legg til"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Legg til"
+            "value" : "Toevoegen"
           }
         },
         "pl" : {
@@ -82078,16 +81199,16 @@
             "value" : "RSS ソースを検出しました"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gedetecteerde RSS-bron"
+            "value" : "Oppdaget RSS kilde"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Oppdaget RSS kilde"
+            "value" : "Gedetecteerde RSS-bron"
           }
         },
         "pl" : {
@@ -82220,16 +81341,16 @@
             "value" : "RssHub를 사용하려면 RssHub 호스트를 설정하거나 공개 RssHub 서버를 선택해야 합니다."
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "U moet de RssHub host instellen als u RssHub wilt gebruiken, of selecteer de publieke RssHub server"
+            "value" : "Du må angi RssHUB-vert hvis du vil bruke RsssHub, eller velge den offentlige RssHUB-serveren"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Du må angi RssHUB-vert hvis du vil bruke RsssHub, eller velge den offentlige RssHUB-serveren"
+            "value" : "U moet de RssHub host instellen als u RssHub wilt gebruiken, of selecteer de publieke RssHub server"
           }
         },
         "pl" : {
@@ -82362,16 +81483,16 @@
             "value" : "ここにRssHubホストを入力してください"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Voer hier de host van RssHub in"
+            "value" : "Vennligst skriv Rsshule-vert her"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vennligst skriv Rsshule-vert her"
+            "value" : "Voer hier de host van RssHub in"
           }
         },
         "pl" : {
@@ -82504,16 +81625,16 @@
             "value" : "RssHub 호스트"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "RssHub host"
+            "value" : "RssHUB-vert"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "RssHUB-vert"
+            "value" : "RssHub host"
           }
         },
         "pl" : {
@@ -82646,16 +81767,16 @@
             "value" : "RSS ソース名"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "RSS bronnaam"
+            "value" : "RSS kilde navn"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "RSS kilde navn"
+            "value" : "RSS bronnaam"
           }
         },
         "pl" : {
@@ -82776,16 +81897,16 @@
             "value" : "開く"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Openen in"
+            "value" : "Åpne i"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Åpne i"
+            "value" : "Openen in"
           }
         },
         "pl" : {
@@ -82942,13 +82063,13 @@
             "value" : "앱"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "App"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "App"
@@ -83096,16 +82217,16 @@
             "value" : "ブラウザー"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "browser"
+            "value" : "Nettleser"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Nettleser"
+            "value" : "browser"
           }
         },
         "pl" : {
@@ -83244,16 +82365,16 @@
             "value" : "검색된 RSS 소스"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ontdekte Rss Bronnen"
+            "value" : "Oppdaget Rss kilder"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Oppdaget Rss kilder"
+            "value" : "Ontdekte Rss Bronnen"
           }
         },
         "pl" : {
@@ -83386,13 +82507,13 @@
             "value" : "RSS"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "RSS"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "RSS"
@@ -83516,13 +82637,13 @@
             "value" : "RSS URL"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "RSS URL"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "RSS URL"
@@ -83652,16 +82773,16 @@
             "value" : "ここにURLを入力してください"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Voer de URL hier in"
+            "value" : "Skriv inn URL'en her"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Skriv inn URL'en her"
+            "value" : "Voer de URL hier in"
           }
         },
         "pl" : {
@@ -83782,16 +82903,16 @@
             "value" : "保存が完了しました"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Opslaan voltooid"
+            "value" : "Lagring fullført"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lagring fullført"
+            "value" : "Opslaan voltooid"
           }
         },
         "pl" : {
@@ -83912,16 +83033,16 @@
             "value" : "データの保存に失敗しました"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gegevens opslaan mislukt"
+            "value" : "Klarte ikke å lagre data"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Klarte ikke å lagre data"
+            "value" : "Gegevens opslaan mislukt"
           }
         },
         "pl" : {
@@ -84042,16 +83163,16 @@
             "value" : "スクリーンショットを保存"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Schermafdruk opslaan"
+            "value" : "Lagre skjermbilde"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lagre skjermbilde"
+            "value" : "Schermafdruk opslaan"
           }
         },
         "pl" : {
@@ -84090,12 +83211,6 @@
             "value" : "Spara skärmdump"
           }
         },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Ekran görüntüsünü kaydet"
-          }
-        },
         "uk" : {
           "stringUnit" : {
             "state" : "translated",
@@ -84214,16 +83329,16 @@
             "value" : "검색"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Zoeken"
+            "value" : "Søk"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Søk"
+            "value" : "Zoeken"
           }
         },
         "pl" : {
@@ -84404,16 +83519,16 @@
             "value" : "게시물"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Statuses"
+            "value" : "Innlegg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Innlegg"
+            "value" : "Statuses"
           }
         },
         "pl" : {
@@ -84594,16 +83709,16 @@
             "value" : "검색"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Zoeken"
+            "value" : "Søk"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Søk"
+            "value" : "Zoeken"
           }
         },
         "pl" : {
@@ -84784,16 +83899,16 @@
             "value" : "사용자"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gebruikers"
+            "value" : "Brukere"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Brukere"
+            "value" : "Gebruikers"
           }
         },
         "pl" : {
@@ -84872,131 +83987,11 @@
     },
     "Select AI provider" : {
       "localizations" : {
-        "ar" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "حدد موفر الذكاء الاصطناعي"
-          }
-        },
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Vyberte poskytovatele AI"
-          }
-        },
-        "da" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Vælg AI-udbyder"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "KI-Anbieter auswählen"
-          }
-        },
-        "el" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Επιλέξτε πάροχο τεχνητής νοημοσύνης"
-          }
-        },
         "en" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Select AI provider"
           }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Seleccionar proveedor AI"
-          }
-        },
-        "fi" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Valitse tekoälyn tarjoaja"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Sélectionnez le fournisseur d'IA"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Seleziona provider AI"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "AIプロバイダを選択"
-          }
-        },
-        "nl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Selecteer AI provider"
-          }
-        },
-        "no" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Velg AI-leverandør"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Wybierz dostawcę SI"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Selecione o provedor de IA"
-          }
-        },
-        "pt-BR" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Selecione o provedor de IA"
-          }
-        },
-        "ro" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Selectați furnizorul AI"
-          }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Выберите поставщика AI"
-          }
-        },
-        "sv" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Välj AI-leverantör"
-          }
-        },
-        "uk" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Виберіть постачальника ШІ"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "选择 AI 提供商"
-          }
         }
       }
     },
@@ -85068,16 +84063,16 @@
             "value" : "アイコンを選択"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Selecteer pictogram"
+            "value" : "Velg ikon"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Velg ikon"
+            "value" : "Selecteer pictogram"
           }
         },
         "pl" : {
@@ -85234,16 +84229,16 @@
             "value" : "메시지 보내기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Verstuur bericht"
+            "value" : "Send melding"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Send melding"
+            "value" : "Verstuur bericht"
           }
         },
         "pl" : {
@@ -85395,16 +84390,16 @@
             "value" : "表示"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Weergeven"
+            "value" : "Vis"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vis"
+            "value" : "Weergeven"
           }
         },
         "pl" : {
@@ -85459,191 +84454,11 @@
     },
     "Server URL" : {
       "localizations" : {
-        "af" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Bediener URL"
-          }
-        },
-        "ar" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "رابط الخادم"
-          }
-        },
-        "bg" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Адрес на сървъра"
-          }
-        },
-        "ca" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "URL del servidor"
-          }
-        },
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "URL serveru"
-          }
-        },
-        "da" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Server URL"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Server-URL"
-          }
-        },
-        "el" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Url Διακομιστή"
-          }
-        },
         "en" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Server URL"
           }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "URL del servidor"
-          }
-        },
-        "fi" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Palvelimen URL"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "URL du serveur"
-          }
-        },
-        "he" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "כתובת URL של השרת"
-          }
-        },
-        "hu" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Szerver URL"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "URL del server"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "サーバー URL"
-          }
-        },
-        "ko" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "서버 URL"
-          }
-        },
-        "nl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Server URL"
-          }
-        },
-        "no" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "URL til server"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Adres URL serwera"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "URL do servidor"
-          }
-        },
-        "pt-BR" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "URL do servidor"
-          }
-        },
-        "ro" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "URL Server"
-          }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "URL сервера"
-          }
-        },
-        "sr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "URL сервера"
-          }
-        },
-        "sv" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Server URL"
-          }
-        },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Sunucu URL'si"
-          }
-        },
-        "uk" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "URL-адреса сервера"
-          }
-        },
-        "vi" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "URL máy chủ"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "服务器 URL"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "伺服器網址"
-          }
         }
       }
     },
@@ -85715,16 +84530,16 @@
             "value" : "RSS ソースを管理"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Uw RSS-bronnen beheren"
+            "value" : "Rediger RSS-kildene dine"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Rediger RSS-kildene dine"
+            "value" : "Uw RSS-bronnen beheren"
           }
         },
         "pl" : {
@@ -85845,16 +84660,16 @@
             "value" : "RSS管理"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "RSS Management"
+            "value" : "RSS administrasjon"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "RSS administrasjon"
+            "value" : "RSS Management"
           }
         },
         "pl" : {
@@ -85893,12 +84708,6 @@
             "value" : "RSS-hantering"
           }
         },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "RSS Yönetimi"
-          }
-        },
         "uk" : {
           "stringUnit" : {
             "state" : "translated",
@@ -85981,16 +84790,16 @@
             "value" : "データをエクスポート"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gegevens exporteren"
+            "value" : "Eksporter data"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Eksporter data"
+            "value" : "Gegevens exporteren"
           }
         },
         "pl" : {
@@ -86111,16 +84920,16 @@
             "value" : "データベースと設定を含むすべてのデータをエクスポート"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Exporteer alle gegevens inclusief database en instellingen"
+            "value" : "Eksporter alle data inkludert database og innstillinger"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Eksporter alle data inkludert database og innstillinger"
+            "value" : "Exporteer alle gegevens inclusief database en instellingen"
           }
         },
         "pl" : {
@@ -86241,16 +85050,16 @@
             "value" : "データのインポート"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gegevens importeren"
+            "value" : "Importer data"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Importer data"
+            "value" : "Gegevens importeren"
           }
         },
         "pl" : {
@@ -86371,16 +85180,16 @@
             "value" : "ファイルからデータをインポート (既存のデータとマージ、重複を置き換えます)"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gegevens importeren uit bestand (samengevoegd met bestaande gegevens, vervangt duplicaten)"
+            "value" : "Importer data fra fil (sammenslåing med eksisterende data, erstatter duplikater)"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Importer data fra fil (sammenslåing med eksisterende data, erstatter duplikater)"
+            "value" : "Gegevens importeren uit bestand (samengevoegd met bestaande gegevens, vervangt duplicaten)"
           }
         },
         "pl" : {
@@ -86537,16 +85346,16 @@
             "value" : "설정"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Instellingen"
+            "value" : "Innstillinger"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Innstillinger"
+            "value" : "Instellingen"
           }
         },
         "pl" : {
@@ -86727,16 +85536,16 @@
             "value" : "공유"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Delen"
+            "value" : "Del"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Del"
+            "value" : "Delen"
           }
         },
         "pl" : {
@@ -86881,16 +85690,16 @@
             "value" : "リンクを共有"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Link delen"
+            "value" : "Del kobling"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Del kobling"
+            "value" : "Link delen"
           }
         },
         "pl" : {
@@ -86929,12 +85738,6 @@
             "value" : "Dela länk"
           }
         },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Bağlantıyı paylaş"
-          }
-        },
         "uk" : {
           "stringUnit" : {
             "state" : "translated",
@@ -87017,16 +85820,16 @@
             "value" : "スクリーンショットを共有"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Schermafdruk delen"
+            "value" : "Del skjermbilde"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Del skjermbilde"
+            "value" : "Schermafdruk delen"
           }
         },
         "pl" : {
@@ -87065,12 +85868,6 @@
             "value" : "Dela skärmdump"
           }
         },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Ekran görüntüsünü paylaş"
-          }
-        },
         "uk" : {
           "stringUnit" : {
             "state" : "translated",
@@ -87153,16 +85950,16 @@
             "value" : "Fixvxでシェア"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Delen via Fixvx"
+            "value" : "Del via Fixvx"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Del via Fixvx"
+            "value" : "Delen via Fixvx"
           }
         },
         "pl" : {
@@ -87289,16 +86086,16 @@
             "value" : "FxEmbedで共有"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Delen via FxEmbed"
+            "value" : "Del via FxEmbed"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Del via FxEmbed"
+            "value" : "Delen via FxEmbed"
           }
         },
         "pl" : {
@@ -87456,16 +86253,16 @@
             "value" : "미디어 표시"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Media tonen"
+            "value" : "Vis media"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vis media"
+            "value" : "Media tonen"
           }
         },
         "pl" : {
@@ -87628,16 +86425,16 @@
             "value" : "소셜"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Sociaal"
+            "value" : "Sosial"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Sosial"
+            "value" : "Sociaal"
           }
         },
         "pl" : {
@@ -87770,16 +86567,16 @@
             "value" : "ステータス詳細"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Status detail"
+            "value" : "Post detaljer"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Post detaljer"
+            "value" : "Status detail"
           }
         },
         "pl" : {
@@ -87936,16 +86733,16 @@
             "value" : "공유"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Delen"
+            "value" : "Del"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Del"
+            "value" : "Delen"
           }
         },
         "pl" : {
@@ -88096,16 +86893,16 @@
             "value" : "サマリー投稿"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Samenvatting bericht"
+            "value" : "Sammendrag post"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Sammendrag post"
+            "value" : "Samenvatting bericht"
           }
         },
         "pl" : {
@@ -88232,16 +87029,16 @@
             "value" : "投稿を翻訳"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bericht vertalen"
+            "value" : "Oversett innlegg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Oversett innlegg"
+            "value" : "Bericht vertalen"
           }
         },
         "pl" : {
@@ -88398,16 +87195,16 @@
             "value" : "팔로워"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Volgers"
+            "value" : "Følgere"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Følgere"
+            "value" : "Volgers"
           }
         },
         "pl" : {
@@ -88552,16 +87349,16 @@
             "value" : "フォロワーだけがこの投稿を見ることができます"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Alleen volgers kunnen dit bericht zien"
+            "value" : "Bare tilhengere kan se denne posten"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bare tilhengere kan se denne posten"
+            "value" : "Alleen volgers kunnen dit bericht zien"
           }
         },
         "pl" : {
@@ -88718,16 +87515,16 @@
             "value" : "홈"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Startpagina"
+            "value" : "Hjem"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Hjem"
+            "value" : "Startpagina"
           }
         },
         "pl" : {
@@ -88872,16 +87669,16 @@
             "value" : "このインスタンス上のユーザーのみがこの投稿を見ることができます"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Alleen gebruikers op dit exemplaar kunnen dit bericht zien"
+            "value" : "Bare brukere i denne forekomsten kan se dette innlegget"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bare brukere i denne forekomsten kan se dette innlegget"
+            "value" : "Alleen gebruikers op dit exemplaar kunnen dit bericht zien"
           }
         },
         "pl" : {
@@ -89038,16 +87835,16 @@
             "value" : "공개"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Openbaar"
+            "value" : "Offentlig"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Offentlig"
+            "value" : "Openbaar"
           }
         },
         "pl" : {
@@ -89192,16 +87989,16 @@
             "value" : "誰でもこの投稿を見ることができます。"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Iedereen kan dit bericht zien en opnieuw plaatsen"
+            "value" : "Alle kan se og poste dette innlegget"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Alle kan se og poste dette innlegget"
+            "value" : "Iedereen kan dit bericht zien en opnieuw plaatsen"
           }
         },
         "pl" : {
@@ -89358,16 +88155,16 @@
             "value" : "명시된 사람만"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Opgegeven"
+            "value" : "Spesifisert"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Spesifisert"
+            "value" : "Opgegeven"
           }
         },
         "pl" : {
@@ -89512,16 +88309,16 @@
             "value" : "メンションされたユーザーのみがこの投稿を見ることができます"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Alleen vermelde gebruikers kunnen dit bericht zien"
+            "value" : "Kun nevnte brukere kan se dette innlegget"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Kun nevnte brukere kan se dette innlegget"
+            "value" : "Alleen vermelde gebruikers kunnen dit bericht zien"
           }
         },
         "pl" : {
@@ -89642,16 +88439,16 @@
             "value" : "確認する"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bevestigen"
+            "value" : "Slett databasemellomlager?"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Slett databasemellomlager?"
+            "value" : "Bevestigen"
           }
         },
         "pl" : {
@@ -89772,16 +88569,16 @@
             "value" : "%1$lld ユーザーと %2$lld ステータスが削除されます"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "%1$lld gebruikers en %2$lld statussen worden verwijderd"
+            "value" : "Slett database cache, %1$lld brukere og %2$lld innlegg vil bli slettet"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Slett database cache, %1$lld brukere og %2$lld innlegg vil bli slettet"
+            "value" : "%1$lld gebruikers en %2$lld statussen worden verwijderd"
           }
         },
         "pl" : {
@@ -89938,16 +88735,16 @@
             "value" : "이미지 캐시 지우기"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Afbeeldingencache legen"
+            "value" : "Tøm bildebuffer"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Tøm bildebuffer"
+            "value" : "Afbeeldingencache legen"
           }
         },
         "pl" : {
@@ -90092,16 +88889,16 @@
             "value" : "確認する"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bevestigen"
+            "value" : "Slett bilde-hurtiglager?"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Slett bilde-hurtiglager?"
+            "value" : "Bevestigen"
           }
         },
         "pl" : {
@@ -90258,16 +89055,16 @@
             "value" : "Flare의 저장소 관리"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Beheer Flare's opslag"
+            "value" : "Behandle flammetall lagring"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Behandle flammetall lagring"
+            "value" : "Beheer Flare's opslag"
           }
         },
         "pl" : {
@@ -90448,16 +89245,16 @@
             "value" : "저장소"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Opslagruimte"
+            "value" : "Lagring"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lagring"
+            "value" : "Opslagruimte"
           }
         },
         "pl" : {
@@ -90632,16 +89429,16 @@
             "value" : "앱 로깅"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "App logboek"
+            "value" : "Logg app"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Logg app"
+            "value" : "App logboek"
           }
         },
         "pl" : {
@@ -90720,131 +89517,11 @@
     },
     "Summarize long text with AI" : {
       "localizations" : {
-        "ar" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "تلخيص النص الطويل مع الذكاء الاصطناعي"
-          }
-        },
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Shrňte dlouhý text s AI"
-          }
-        },
-        "da" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Opsummér lang tekst med AI"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Lange Text mit KI zusammenfassen"
-          }
-        },
-        "el" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Σύνοψη μεγάλου κειμένου με τεχνητή νοημοσύνη"
-          }
-        },
         "en" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Summarize long text with AI"
           }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Resumir texto largo con IA"
-          }
-        },
-        "fi" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Tiivistä pitkä teksti tekoälyn avulla"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Résumer le texte long avec l'IA"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Riepilogo testo lungo con IA"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "AIで長いテキストをまとめます"
-          }
-        },
-        "nl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Vat lange tekst samen met AI"
-          }
-        },
-        "no" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "oppsummerer lang tekst med AI"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Podsumowanie długiego tekstu z AI"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Resumir texto longo com IA"
-          }
-        },
-        "pt-BR" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Resumir texto longo com IA"
-          }
-        },
-        "ro" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Rezumă text lung cu AI"
-          }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Суммировать длинный текст с ИИ"
-          }
-        },
-        "sv" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Sammanfatta lång text med AI"
-          }
-        },
-        "uk" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Підсумувати довгі тексти з ШІ"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "与 AI 摘要长文本"
-          }
         }
       }
     },
@@ -90916,16 +89593,16 @@
             "value" : "この記事を要約"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Dit artikel samenvatten"
+            "value" : "oppsummerer denne artikkelen"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "oppsummerer denne artikkelen"
+            "value" : "Dit artikel samenvatten"
           }
         },
         "pl" : {
@@ -90980,131 +89657,11 @@
     },
     "Summary Prompt" : {
       "localizations" : {
-        "ar" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "ملخص الطلب"
-          }
-        },
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Souhrnný požadavek"
-          }
-        },
-        "da" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Resumé Spørg"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Zusammenfassung-Aufforderung"
-          }
-        },
-        "el" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Ερώτηση Περίληψης"
-          }
-        },
         "en" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Summary Prompt"
           }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Resumen"
-          }
-        },
-        "fi" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Tiivistelmä"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Récapitulatif"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Prompt Del Riepilogo"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "概要のプロンプト表示"
-          }
-        },
-        "nl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Samenvatting Prompt"
-          }
-        },
-        "no" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Ledetekst i sammendrag"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Pytanie podsumowujące"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Prompt de Resumo"
-          }
-        },
-        "pt-BR" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Prompt de Resumo"
-          }
-        },
-        "ro" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Sumar Prompt"
-          }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Краткая подсказка"
-          }
-        },
-        "sv" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Sammanfattning Fråga"
-          }
-        },
-        "uk" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Підсумок"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "摘要提示"
-          }
         }
       }
     },
@@ -91206,16 +89763,16 @@
             "value" : "시스템"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Systeem"
+            "value" : "Systemadministrasjon"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Systemadministrasjon"
+            "value" : "Systeem"
           }
         },
         "pl" : {
@@ -91360,16 +89917,16 @@
             "value" : "フレアの許可または言語を更新"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Toestemming of taal van Vlam bijwerken"
+            "value" : "Oppdatere flammets tillatelse eller språk"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Oppdatere flammets tillatelse eller språk"
+            "value" : "Toestemming of taal van Vlam bijwerken"
           }
         },
         "pl" : {
@@ -91490,16 +90047,16 @@
             "value" : "システム設定"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Systeem instellingen"
+            "value" : "System innstillinger"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "System innstillinger"
+            "value" : "Systeem instellingen"
           }
         },
         "pl" : {
@@ -91620,16 +90177,16 @@
             "value" : "グループを追加"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Groep toevoegen"
+            "value" : "Legg til gruppe"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Legg til gruppe"
+            "value" : "Groep toevoegen"
           }
         },
         "pl" : {
@@ -91750,16 +90307,16 @@
             "value" : "タブを追加"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Tabblad toevoegen"
+            "value" : "Legg til fane"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Legg til fane"
+            "value" : "Tabblad toevoegen"
           }
         },
         "pl" : {
@@ -91916,16 +90473,16 @@
             "value" : "삭제"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Verwijderen"
+            "value" : "Slett"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Slett"
+            "value" : "Verwijderen"
           }
         },
         "pl" : {
@@ -92106,16 +90663,16 @@
             "value" : "편집"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bewerken"
+            "value" : "Rediger"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Rediger"
+            "value" : "Bewerken"
           }
         },
         "pl" : {
@@ -92260,16 +90817,16 @@
             "value" : "グループを編集"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Groep bewerken"
+            "value" : "Rediger gruppe"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Rediger gruppe"
+            "value" : "Groep bewerken"
           }
         },
         "pl" : {
@@ -92390,13 +90947,13 @@
             "value" : "Tab icon"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Tab icon"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Tab icon"
@@ -92526,16 +91083,16 @@
             "value" : "タブのタイトル"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Tabblad titel"
+            "value" : "Tittel på fane"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Tittel på fane"
+            "value" : "Tabblad titel"
           }
         },
         "pl" : {
@@ -92662,16 +91219,16 @@
             "value" : "ここにタブのタイトルを入力してください"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Voer de tab titel hier in"
+            "value" : "Skriv inn fanetittel her"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Skriv inn fanetittel her"
+            "value" : "Voer de tab titel hier in"
           }
         },
         "pl" : {
@@ -92792,16 +91349,16 @@
             "value" : "ユーザーのアバターを表示"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Toon gebruikersafbeelding"
+            "value" : "Vis brukerens profilbilde"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vis brukerens profilbilde"
+            "value" : "Toon gebruikersafbeelding"
           }
         },
         "pl" : {
@@ -92958,16 +91515,16 @@
             "value" : "혼합된 타임라인은 모든 탭의 타임라인 결과를 하나의 탭으로 혼합합니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gemengde tijdlijn mengt alle resultaten van de tabbladen in één tabblad"
+            "value" : "Blandet tidslinje vil blande alle faners tidslinjen resulterer i en fane"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Blandet tidslinje vil blande alle faners tidslinjen resulterer i en fane"
+            "value" : "Gemengde tijdlijn mengt alle resultaten van de tabbladen in één tabblad"
           }
         },
         "pl" : {
@@ -93112,16 +91669,16 @@
             "value" : "混合タイムラインタブを有効にする"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Inschakelen gemengde tijdlijn tabblad"
+            "value" : "Aktiver blandet tidslinjefanel"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Aktiver blandet tidslinjefanel"
+            "value" : "Inschakelen gemengde tijdlijn tabblad"
           }
         },
         "pl" : {
@@ -93242,16 +91799,16 @@
             "value" : "グループ"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Groeperen"
+            "value" : "Gruppe"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gruppe"
+            "value" : "Groeperen"
           }
         },
         "pl" : {
@@ -93372,16 +91929,16 @@
             "value" : "このグループにはタブがありません"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Geen tabbladen in deze groep"
+            "value" : "Ingen faner i denne gruppen"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ingen faner i denne gruppen"
+            "value" : "Geen tabbladen in deze groep"
           }
         },
         "pl" : {
@@ -93502,16 +92059,16 @@
             "value" : "グループ名"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Groep Naam"
+            "value" : "Gruppens navn"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gruppens navn"
+            "value" : "Groep Naam"
           }
         },
         "pl" : {
@@ -93638,16 +92195,16 @@
             "value" : "メインタブ"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Belangrijkste tabbladen"
+            "value" : "Hovedfaner"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Hovedfaner"
+            "value" : "Belangrijkste tabbladen"
           }
         },
         "pl" : {
@@ -93804,16 +92361,16 @@
             "value" : "탭 설정"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Tabblad instellingen"
+            "value" : "Fane innstillinger"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Fane innstillinger"
+            "value" : "Tabblad instellingen"
           }
         },
         "pl" : {
@@ -93952,13 +92509,13 @@
             "value" : "Tabs"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Tabs"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Tabs"
@@ -94118,16 +92675,16 @@
             "value" : "테마"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Thema"
+            "value" : "Tema"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Tema"
+            "value" : "Thema"
           }
         },
         "pl" : {
@@ -94206,261 +92763,21 @@
     },
     "Translate Prompt" : {
       "localizations" : {
-        "ar" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "ترجمة الطلب"
-          }
-        },
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Přeložit výzvu"
-          }
-        },
-        "da" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Oversæt Spørg"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Übersetzungsaufforderung"
-          }
-        },
-        "el" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Μετάφραση Προώθησης"
-          }
-        },
         "en" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Translate Prompt"
           }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Traducir Prompt"
-          }
-        },
-        "fi" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Käännä Prompt"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Traduire l'invitation"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Traduci Prompt"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "翻訳プロンプトの翻訳"
-          }
-        },
-        "nl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Prompt vertalen"
-          }
-        },
-        "no" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Oversett prompt"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Przetłumacz pytanie"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Traduzir Sugestão"
-          }
-        },
-        "pt-BR" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Traduzir Sugestão"
-          }
-        },
-        "ro" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Traducere promptă"
-          }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Запрос на перевод"
-          }
-        },
-        "sv" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Översätt prompt"
-          }
-        },
-        "uk" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Перекласти підказку"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "翻译提示"
-          }
         }
       }
     },
     "Translate text with AI" : {
       "localizations" : {
-        "ar" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "ترجمة النص مع AI"
-          }
-        },
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Přeložit text s AI"
-          }
-        },
-        "da" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Oversæt tekst med AI"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Text mit KI übersetzen"
-          }
-        },
-        "el" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Μετάφραση κειμένου με τεχνητή νοημοσύνη"
-          }
-        },
         "en" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Translate text with AI"
           }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Traducir texto con IA"
-          }
-        },
-        "fi" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Käännä teksti tekoälyllä"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Traduire du texte avec l'IA"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Traduci testo con IA"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "テキストをAIで翻訳"
-          }
-        },
-        "nl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Vertaal tekst met AI"
-          }
-        },
-        "no" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Oversett tekst med AI"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Tłumacz tekst za pomocą AI"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Traduzir texto com IA"
-          }
-        },
-        "pt-BR" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Traduzir texto com IA"
-          }
-        },
-        "ro" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Tradu text cu AI"
-          }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Перевод текста с помощью ИИ"
-          }
-        },
-        "sv" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Översätt text med AI"
-          }
-        },
-        "uk" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Перекласти текст з ШІ"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "使用 AI 翻译文本"
-          }
         }
       }
     },
@@ -94568,16 +92885,16 @@
             "value" : "차단 해제"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Deblokkeer"
+            "value" : "Avblokker"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Avblokker"
+            "value" : "Deblokkeer"
           }
         },
         "pl" : {
@@ -94758,16 +93075,16 @@
             "value" : "좋아요 취소"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Anders dan"
+            "value" : "Ulikt"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ulikt"
+            "value" : "Anders dan"
           }
         },
         "pl" : {
@@ -94942,16 +93259,16 @@
             "value" : "음소거 해제"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Deblokkeer"
+            "value" : "Udemp"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Udemp"
+            "value" : "Deblokkeer"
           }
         },
         "pl" : {
@@ -95132,16 +93449,16 @@
             "value" : "팔로워"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Volger"
+            "value" : "Følger"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Følger"
+            "value" : "Volger"
           }
         },
         "pl" : {
@@ -95322,16 +93639,16 @@
             "value" : "팔로잉"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Volgt"
+            "value" : "Følger"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Følger"
+            "value" : "Volgt"
           }
         },
         "pl" : {
@@ -95409,6 +93726,7 @@
       }
     },
     "vvo_notification_like" : {
+      "extractionState" : "stale",
       "localizations" : {
         "af" : {
           "stringUnit" : {
@@ -95512,16 +93830,16 @@
             "value" : "당신의 상태에 좋아요를 눌렀습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Vind je status leuk"
+            "value" : "Likte ditt innlegg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Likte ditt innlegg"
+            "value" : "Vind je status leuk"
           }
         },
         "pl" : {
@@ -95702,16 +94020,16 @@
             "value" : "댓글"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Opmerkingen"
+            "value" : "Kommentarer"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Kommentarer"
+            "value" : "Opmerkingen"
           }
         },
         "pl" : {
@@ -95856,16 +94174,16 @@
             "value" : "リポスト"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Herposten"
+            "value" : "Tilbakestilling"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Tilbakestilling"
+            "value" : "Herposten"
           }
         },
         "pl" : {
@@ -96022,16 +94340,16 @@
             "value" : "상태"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "status"
+            "value" : "Innlegg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Innlegg"
+            "value" : "status"
           }
         },
         "pl" : {
@@ -96109,6 +94427,7 @@
       }
     },
     "xqt_notification_mention" : {
+      "extractionState" : "stale",
       "localizations" : {
         "af" : {
           "stringUnit" : {
@@ -96212,16 +94531,16 @@
             "value" : "당신을 언급했습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "vermeldt je"
+            "value" : "nevner deg"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "nevner deg"
+            "value" : "vermeldt je"
           }
         },
         "pl" : {
@@ -96299,6 +94618,7 @@
       }
     },
     "xqt_notification_retweet" : {
+      "extractionState" : "stale",
       "localizations" : {
         "af" : {
           "stringUnit" : {
@@ -96396,16 +94716,16 @@
             "value" : "리트윗했습니다"
           }
         },
-        "nl" : {
+        "nb" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "geretweet"
+            "value" : "retweeted"
           }
         },
-        "no" : {
+        "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "retweeted"
+            "value" : "geretweet"
           }
         },
         "pl" : {
diff --git a/iosApp/flare/UI/Component/CommonProfileHeader.swift b/iosApp/flare/UI/Component/CommonProfileHeader.swift
index eb37856c1..7ddae75d5 100644
--- a/iosApp/flare/UI/Component/CommonProfileHeader.swift
+++ b/iosApp/flare/UI/Component/CommonProfileHeader.swift
@@ -110,7 +110,7 @@ struct CommonProfileHeader: View {
                 .frame(maxWidth: .infinity, alignment: .leading)
                 .textSelection(.enabled)
             HStack {
-                Text(user.handle)
+                Text(user.handle.canonical)
                     .font(.subheadline)
                     .foregroundColor(.gray)
                     .textSelection(.enabled)
diff --git a/iosApp/flare/UI/Component/ComposeTimelineView.swift b/iosApp/flare/UI/Component/ComposeTimelineView.swift
index 0e4ffcd80..1845db41d 100644
--- a/iosApp/flare/UI/Component/ComposeTimelineView.swift
+++ b/iosApp/flare/UI/Component/ComposeTimelineView.swift
@@ -39,8 +39,8 @@ struct ComposeTimelineItemView : UIViewControllerRepresentable {
 
 struct ComposeTimelineView : UIViewControllerRepresentable {
     let key: String
-    let data: PagingState<UiTimeline>
-    let state: ComposeUIStateProxy<PagingState<UiTimeline>>
+    let data: PagingState<UiTimelineV2>
+    let state: ComposeUIStateProxy<PagingState<UiTimelineV2>>
     let topPadding: Int
     let onExpand: () -> Void
     let onCollapse: () -> Void
@@ -48,7 +48,7 @@ struct ComposeTimelineView : UIViewControllerRepresentable {
     
     init(
         key: String,
-        data: PagingState<UiTimeline>,
+        data: PagingState<UiTimelineV2>,
         detailStatusKey: MicroBlogKey?,
         topPadding: Int,
         onOpenLink: @escaping (String) -> Void,
@@ -63,7 +63,7 @@ struct ComposeTimelineView : UIViewControllerRepresentable {
         self.detailStatusKey = detailStatusKey
         if let state = ComposeUIStateProxyCache.shared.getOrCreate(key: key, factory: {
             .init(initialState: data, onOpenLink: onOpenLink)
-        }) as? ComposeUIStateProxy<PagingState<UiTimeline>> {
+        }) as? ComposeUIStateProxy<PagingState<UiTimelineV2>> {
             self.state = state
         } else {
             self.state = ComposeUIStateProxy(initialState: data, onOpenLink: onOpenLink)
diff --git a/iosApp/flare/UI/Component/Status/FeedView.swift b/iosApp/flare/UI/Component/Status/FeedView.swift
index 07b63bcf7..fcd72be98 100644
--- a/iosApp/flare/UI/Component/Status/FeedView.swift
+++ b/iosApp/flare/UI/Component/Status/FeedView.swift
@@ -3,22 +3,26 @@ import KotlinSharedUI
 
 struct FeedView: View {
     @Environment(\.openURL) private var openURL
-    let data: UiTimeline.ItemContentFeed
+    let data: UiTimelineV2.Feed
 //    @State private var showDetail = false
+    private var descriptionText: String? {
+        let description = data.description_ ?? data.description
+        return description.isEmpty ? nil : description
+    }
     var body: some View {
         VStack(
             alignment: .leading
         ) {
             HStack {
-                if let sourceIcon = data.sourceIcon, !sourceIcon.isEmpty {
+                if let sourceIcon = data.source.icon, !sourceIcon.isEmpty {
                     NetworkImage(data: sourceIcon)
                         .frame(width: 20, height: 20)
                 }
-                Text(data.source)
+                Text(data.source.name)
                     .font(.footnote)
                     .fixedSize(horizontal: false, vertical: true)
                 Spacer()
-                if let date = data.createdAt {
+                if let date = data.actualCreatedAt {
                     DateTimeText(data: date)
                         .font(.footnote)
                         .foregroundStyle(.secondary)
@@ -28,7 +32,7 @@ struct FeedView: View {
                 Text(title)
             }
             HStack {
-                if let desc = data.description_ {
+                if let desc = descriptionText {
                     Text(desc)
                         .font(.caption)
                         .foregroundStyle(.secondary)
@@ -36,8 +40,8 @@ struct FeedView: View {
                         .frame(maxWidth: .infinity, alignment: .leading)
                         .fixedSize(horizontal: false, vertical: true)
                 }
-                if let image = data.image {
-                    NetworkImage(data: image, customHeader: data.imageHeaders)
+                if let image = data.media {
+                    NetworkImage(data: image.url, customHeader: image.customHeaders)
                         .frame(width: 72, height: 72)
                         .clipShape(RoundedRectangle(cornerRadius: 8))
                 }
diff --git a/iosApp/flare/UI/Component/Status/StatusActionView.swift b/iosApp/flare/UI/Component/Status/StatusActionView.swift
index 6d5d48e8b..f196da40a 100644
--- a/iosApp/flare/UI/Component/Status/StatusActionView.swift
+++ b/iosApp/flare/UI/Component/Status/StatusActionView.swift
@@ -94,43 +94,24 @@ struct StatusActionView: View {
                 }
                 .buttonStyle(.plain)
             }
-        case .asyncActionMenuItem(let asyncItem):
-            EmptyView()
-//            AsyncStatusActionView(data: asyncItem)
         case .divider:
             Divider()
         }
     }
 }
 
-struct AsyncStatusActionView: View {
-    let data: ActionMenuAsyncActionMenuItem
-    var body: some View {
-        // TODO: Not supported yet
-//        Button {
-//
-//        } label: {
-//
-//        }
-//        .onAppear {
-//        }
-    }
-}
-
 struct StatusActionItemView: View {
     @Environment(\.appearanceSettings.showNumbers) private var showNumbers
     @Environment(\.openURL) private var openURL
     @ScaledMetric(relativeTo: .footnote) var fontSize = 13
-    let data: ActionMenuItem
+    let data: ActionMenu.Item
     let useText: Bool
     let isFixedWidth: Bool
     var body: some View {
         Button(
             role: data.color?.role
         ) {
-            if let onClicked = data.onClicked {
-                onClicked(ClickContext(launcher: AppleUriLauncher(openUrl: openURL)))
-            }
+            data.onClicked(ClickContext(launcher: AppleUriLauncher(openUrl: openURL)))
         } label: {
             if useText, let text = data.text?.resolvedString {
                 Label {
@@ -182,7 +163,7 @@ struct StatusActionItemView: View {
     }
 }
 
-extension ActionMenuItem.Color {
+extension ActionMenu.ItemColor {
     var swiftColor: Color? {
         switch self {
         case .red: return .red
@@ -239,22 +220,28 @@ extension ActionMenuItemText {
             case .unBlock: return "unblock"
             case .blockWithHandleParameter: return "block_user_with_handle \(localized.parameters.first ?? "")"
             case .muteWithHandleParameter: return "mute_user_with_handle \(localized.parameters.first ?? "")"
+            case .acceptFollowRequest: return "accept_follow_request"
+            case .rejectFollowRequest: return "reject_follow_request"
             }
         }
     }
 }
 
 struct StatusActionIcon: View {
-    let icon: ActionMenuItem.Icon?
+    let icon: UiIcon?
 
     var body: some View {
         if let icon = icon {
-            Image(icon.imageName)
+            icon.image
         }
     }
 }
 
-extension ActionMenuItem.Icon {
+extension UiIcon {
+    var image: Image {
+        Image(imageName)
+    }
+
     var imageName: String {
         switch self {
         case .bookmark: return "fa-bookmark"
@@ -263,7 +250,7 @@ extension ActionMenuItem.Icon {
         case .like: return "fa-heart"
         case .unlike: return "fa-heart.fill"
         case .more: return "fa-ellipsis"
-        case .quote: return "fa-quote-left"
+        case .quote: return "fa-reply"
         case .react: return "fa-plus"
         case .unReact: return "fa-minus"
         case .reply: return "fa-reply"
@@ -279,6 +266,14 @@ extension ActionMenuItem.Icon {
         case .unMute: return "fa-volume-xmark"
         case .block: return "fa-user-slash"
         case .unBlock: return "fa-user-slash"
+        case .follow: return "fa-user-plus"
+        case .favourite: return "fa-heart"
+        case .mention: return "fa-at"
+        case .poll: return "fa-square-poll-horizontal"
+        case .edit: return "fa-pen"
+        case .info: return "fa-circle-info"
+        case .pin: return "fa-thumbtack"
+        case .check: return "fa-check"
         }
     }
 }
diff --git a/iosApp/flare/UI/Component/Status/StatusPollView.swift b/iosApp/flare/UI/Component/Status/StatusPollView.swift
index bad90f048..870524705 100644
--- a/iosApp/flare/UI/Component/Status/StatusPollView.swift
+++ b/iosApp/flare/UI/Component/Status/StatusPollView.swift
@@ -3,6 +3,7 @@ import KotlinSharedUI
 import SwiftUIBackports
 
 struct StatusPollView: View {
+    @Environment(\.openURL) private var openURL
     let data: UiPoll
     @State private var selectedOption: [Int] = []
     var body: some View {
@@ -82,7 +83,10 @@ struct StatusPollView: View {
             
             if data.canVote {
                 Button {
-                    data.onVote(selectedOption.map { KotlinInt(value: Int32($0)) } )
+                    data.onVote(
+                        ClickContext(launcher: AppleUriLauncher(openUrl: openURL)),
+                        selectedOption.map { KotlinInt(value: Int32($0)) }
+                    )
                 } label: {
                     Text("poll_vote")
                 }
@@ -92,4 +96,3 @@ struct StatusPollView: View {
         }
     }
 }
-
diff --git a/iosApp/flare/UI/Component/Status/StatusReactionView.swift b/iosApp/flare/UI/Component/Status/StatusReactionView.swift
index 851a2961b..ded1213b9 100644
--- a/iosApp/flare/UI/Component/Status/StatusReactionView.swift
+++ b/iosApp/flare/UI/Component/Status/StatusReactionView.swift
@@ -2,13 +2,14 @@ import SwiftUI
 import KotlinSharedUI
 
 struct StatusReactionView: View {
-    let data: UiTimeline.ItemContentStatusBottomContentReaction
+    @Environment(\.openURL) private var openURL
+    let data: [UiTimelineV2.PostEmojiReaction]
     var body: some View {
         ScrollView(.horizontal) {
             LazyHStack {
-                ForEach(data.emojiReactions, id: \.name) { item in
+                ForEach(data, id: \.name) { item in
                     Button {
-                        item.onClicked()
+                        item.onClicked(ClickContext(launcher: AppleUriLauncher(openUrl: openURL)))
                     } label: {
                         Label {
                             Text(item.count.humanized)
diff --git a/iosApp/flare/UI/Component/Status/StatusShareSheet.swift b/iosApp/flare/UI/Component/Status/StatusShareSheet.swift
index 647fcaab1..acdd4bff4 100644
--- a/iosApp/flare/UI/Component/Status/StatusShareSheet.swift
+++ b/iosApp/flare/UI/Component/Status/StatusShareSheet.swift
@@ -117,7 +117,7 @@ struct StatusShareSheet: View {
     }
     
     @ViewBuilder
-    private func previewView(data: UiTimeline) -> some View {
+    private func previewView(data: UiTimelineV2) -> some View {
         TimelineView(data: data, detailStatusKey: statusKey, showTranslate: false)
             .frame(width: 360)
             .padding()
@@ -132,11 +132,11 @@ struct StatusShareSheet: View {
     }
     
     
-    private func renderImage(data: UiTimeline) async -> UIImage? {
+    private func renderImage(data: UiTimelineV2) async -> UIImage? {
         return await previewView(data: data).snapshot()
     }
     
-    private func saveImage(data: UiTimeline) async {
+    private func saveImage(data: UiTimelineV2) async {
         guard let image = image else { return }
         UIImageWriteToSavedPhotosAlbum(image, nil, nil, nil)
         dismiss()
diff --git a/iosApp/flare/UI/Component/Status/StatusTopMessageView.swift b/iosApp/flare/UI/Component/Status/StatusTopMessageView.swift
index 1be2cf509..a77cafdf7 100644
--- a/iosApp/flare/UI/Component/Status/StatusTopMessageView.swift
+++ b/iosApp/flare/UI/Component/Status/StatusTopMessageView.swift
@@ -3,10 +3,10 @@ import KotlinSharedUI
 
 struct StatusTopMessageView: View {
     @Environment(\.openURL) private var openURL
-    let topMessage: UiTimeline.TopMessage
+    let topMessage: UiTimelineV2.Message
     var body: some View {
         HStack {
-            topMessage.icon.awesomeImage
+            topMessage.icon.image
             if let user = topMessage.user {
                 RichText(text: user.name)
             }
@@ -21,98 +21,150 @@ struct StatusTopMessageView: View {
     }
 }
 
-extension UiTimeline.TopMessageIcon {
-    var awesomeImage: Image {
-        switch self {
-        case .retweet:
-            return Image("fa-retweet")
-        case .follow:
-            return Image("fa-user-plus")
-        case .favourite:
-            return Image("fa-heart")
-        case .mention:
-            return Image("fa-at")
-        case .poll:
-            return Image("fa-square-poll-horizontal")
-        case .edit:
-            return Image("fa-pen")
-        case .info:
-            return Image("fa-circle-info")
-        case .reply:
-            return Image("fa-reply")
-        case .quote:
-            return Image("fa-quote-left")
-        case .pin:
-            return Image("fa-thumbtack")
-        }
-    }
-}
-
-extension UiTimeline.TopMessageMessageType {
+extension UiTimelineV2.MessageType {
     var localizedText: String? {
-        switch onEnum(of: self) {
-        case .bluesky(let data):
-            switch onEnum(of: data) {
-            case .follow: String(localized: "bluesky_notification_follow")
-            case .like: String(localized: "bluesky_notification_like")
-            case .mention: String(localized: "bluesky_notification_mention")
-            case .quote: String(localized: "bluesky_notification_quote")
-            case .reply: String(localized: "bluesky_notification_reply")
-            case .repost: String(localized: "bluesky_notification_repost")
-            case .unKnown: String(localized: "bluesky_notification_unKnown")
-            case .starterpackJoined: String(localized: "bluesky_notification_starterpackJoined")
-            case .pinned: String(localized: "bluesky_notification_item_pin")
-            }
-        case .mastodon(let data):
-            switch onEnum(of: data) {
-            case .favourite: String(localized: "mastodon_notification_favourite")
-            case .follow: String(localized: "mastodon_notification_follow")
-            case .followRequest: String(localized: "mastodon_notification_follow_request")
-            case .mention: String(localized: "mastodon_notification_mention")
-            case .poll: String(localized: "mastodon_notification_poll")
-            case .reblogged: String(localized: "mastodon_notification_reblog")
-            case .status: String(localized: "mastodon_notification_status")
-            case .update: String(localized: "mastodon_notification_update")
-            case .pinned: String(localized: "mastodon_item_pinned")
-            case .unKnown: nil
-            }
-        case .misskey(let data):
-            switch onEnum(of: data) {
-            case .achievementEarned(let achive):
-                String(
-                    format: NSLocalizedString("misskey_notification_achievement_earned", comment: ""),
-                    String(localized: achive.achievement?.titleKey ?? ""),
-                    String(localized: achive.achievement?.descriptionKey ?? "")
-                )
-            case .app: String(localized: "misskey_notification_app")
-            case .follow: String(localized: "misskey_notification_follow")
-            case .followRequestAccepted: String(localized: "misskey_notification_follow_request_accepted")
-            case .mention: String(localized: "misskey_notification_mention")
-            case .pollEnded: String(localized: "misskey_notification_poll_ended")
-            case .quote: String(localized: "misskey_notification_quote")
-            case .reaction: String(localized: "misskey_notification_reaction")
-            case .receiveFollowRequest: String(localized: "misskey_notification_receive_follow_request")
-            case .renote: String(localized: "misskey_notification_renote")
-            case .reply: String(localized: "misskey_notification_reply")
-            case .pinned: String(localized: "mastodon_item_pinned")
-            case .unKnown(let type): String(format: NSLocalizedString("misskey_notification_unknwon", comment: ""), type.type)
-            }
-        case .vVO(let data):
-            switch onEnum(of: data) {
-            case .custom(let message): message.message
-            case .like: String(localized: "vvo_notification_like")
-            }
-        case .xQT(let data):
-            switch onEnum(of: data) {
-            case .custom(let message): message.message
-            case .mention: String(localized: "xqt_notification_mention")
-            case .retweet: String(localized: "xqt_notification_retweet")
+        if let data = self as? UiTimelineV2.MessageTypeRaw {
+            return data.content
+        }
+        if let data = self as? UiTimelineV2.MessageTypeUnknown {
+            return data.rawType.isEmpty ? nil : data.rawType
+        }
+        if let data = self as? UiTimelineV2.MessageTypeLocalized {
+            return switch data.data {
+            case .mention:
+                String(localized: "mastodon_notification_mention")
+            case .newPost:
+                String(localized: "mastodon_notification_status")
+            case .repost:
+                String(localized: "mastodon_notification_reblog")
+            case .follow:
+                String(localized: "mastodon_notification_follow")
+            case .followRequest:
+                String(localized: "mastodon_notification_follow_request")
+            case .favourite:
+                String(localized: "mastodon_notification_favourite")
+            case .pollEnded:
+                String(localized: "mastodon_notification_poll")
+            case .postUpdated:
+                String(localized: "mastodon_notification_update")
+            case .reply:
+                String(localized: "misskey_notification_reply")
+            case .quote:
+                String(localized: "misskey_notification_quote")
+            case .reaction:
+                String(localized: "misskey_notification_reaction")
+            case .followRequestAccepted:
+                String(localized: "misskey_notification_follow_request_accepted")
+            case .achievementEarned:
+                if let rawAchievement = data.args.first,
+                   let achievement = MisskeyAchievement.from(rawAchievement) {
+                    String(
+                        localized: "misskey_notification_achievement_earned \(String(localized: achievement.titleKey)) \(String(localized: achievement.descriptionKey))"
+                    )
+                } else {
+                    String(
+                        format: NSLocalizedString("misskey_notification_achievement_earned", comment: ""),
+                        data.args.first ?? "",
+                        ""
+                    )
+                }
+            case .app:
+                String(localized: "misskey_notification_app")
+            case .starterpackJoined:
+                String(localized: "bluesky_notification_starterpackJoined")
+            case .pinned:
+                String(localized: "mastodon_item_pinned")
             }
         }
+        return nil
     }
 }
 
 extension MisskeyAchievement {
+    static func from(_ rawValue: String) -> MisskeyAchievement? {
+        switch rawValue {
+        case "notes1": return .notes1
+        case "notes10": return .notes10
+        case "notes100": return .notes100
+        case "notes500": return .notes500
+        case "notes1000": return .notes1000
+        case "notes5000": return .notes5000
+        case "notes10000": return .notes10000
+        case "notes20000": return .notes20000
+        case "notes30000": return .notes30000
+        case "notes40000": return .notes40000
+        case "notes50000": return .notes50000
+        case "notes60000": return .notes60000
+        case "notes70000": return .notes70000
+        case "notes80000": return .notes80000
+        case "notes90000": return .notes90000
+        case "notes100000": return .notes100000
+        case "login3": return .login3
+        case "login7": return .login7
+        case "login15": return .login15
+        case "login30": return .login30
+        case "login60": return .login60
+        case "login100": return .login100
+        case "login200": return .login200
+        case "login300": return .login300
+        case "login400": return .login400
+        case "login500": return .login500
+        case "login600": return .login600
+        case "login700": return .login700
+        case "login800": return .login800
+        case "login900": return .login900
+        case "login1000": return .login1000
+        case "noteClipped1": return .noteClipped1
+        case "noteFavorited1": return .noteFavorited1
+        case "myNoteFavorited1": return .myNoteFavorited1
+        case "profileFilled": return .profileFilled
+        case "markedAsCat": return .markedAsCat
+        case "following1": return .following1
+        case "following10": return .following10
+        case "following50": return .following50
+        case "following100": return .following100
+        case "following300": return .following300
+        case "followers1": return .followers1
+        case "followers10": return .followers10
+        case "followers50": return .followers50
+        case "followers100": return .followers100
+        case "followers300": return .followers300
+        case "followers500": return .followers500
+        case "followers1000": return .followers1000
+        case "collectAchievements30": return .collectAchievements30
+        case "viewAchievements3Min": return .viewAchievements3Min
+        case "iLoveMisskey": return .iLoveMisskey
+        case "foundTreasure": return .foundTreasure
+        case "client30Min": return .client30Min
+        case "client60Min": return .client60Min
+        case "noteDeletedWithin1Min": return .noteDeletedWithin1Min
+        case "postedAtLateNight": return .postedAtLateNight
+        case "postedAt0Min0Sec": return .postedAt0Min0Sec
+        case "selfQuote": return .selfQuote
+        case "htl20Npm": return .htl20Npm
+        case "viewInstanceChart": return .viewInstanceChart
+        case "outputHelloWorldOnScratchpad": return .outputHelloWorldOnScratchpad
+        case "open3Windows": return .open3Windows
+        case "driveFolderCircularReference": return .driveFolderCircularReference
+        case "reactWithoutRead": return .reactWithoutRead
+        case "clickedClickHere": return .clickedClickHere
+        case "justPlainLucky": return .justPlainLucky
+        case "setNameToSyuilo": return .setNameToSyuilo
+        case "passedSinceAccountCreated1": return .passedSinceAccountCreated1
+        case "passedSinceAccountCreated2": return .passedSinceAccountCreated2
+        case "passedSinceAccountCreated3": return .passedSinceAccountCreated3
+        case "loggedInOnBirthday": return .loggedInOnBirthday
+        case "loggedInOnNewYearsDay": return .loggedInOnNewYearsDay
+        case "cookieClicked": return .cookieClicked
+        case "brainDiver": return .brainDiver
+        case "smashTestNotificationButton": return .smashTestNotificationButton
+        case "tutorialCompleted": return .tutorialCompleted
+        case "bubbleGameExplodingHead": return .bubbleGameExplodingHead
+        case "bubbleGameDoubleExplodingHead": return .bubbleGameDoubleExplodingHead
+        default: return nil
+        }
+    }
+
     var titleKey: LocalizedStringResource {
         switch self {
         case .notes1:      return "misskey_achievement_notes1_title"
diff --git a/iosApp/flare/UI/Component/Status/StatusView.swift b/iosApp/flare/UI/Component/Status/StatusView.swift
index af8a9a69d..01c02b788 100644
--- a/iosApp/flare/UI/Component/Status/StatusView.swift
+++ b/iosApp/flare/UI/Component/Status/StatusView.swift
@@ -9,7 +9,7 @@ struct StatusView: View {
     @Environment(\.appearanceSettings.postActionStyle) private var postActionStyle
     @Environment(\.appearanceSettings.showPlatformLogo) private var showPlatformLogo
     @Environment(\.openURL) private var openURL
-    let data: UiTimeline.ItemContentStatus
+    let data: UiTimelineV2.Post
     var isDetail: Bool = false
     var isQuote: Bool = false
     var withLeadingPadding: Bool = false
@@ -85,16 +85,13 @@ struct StatusView: View {
                         alignment: .leading,
                         spacing: 8,
                     ) {
-                        if let aboveTextContent = data.aboveTextContent {
-                            switch onEnum(of: aboveTextContent) {
-                            case .replyTo(let replyTo):
-                                HStack {
-                                    Image("fa-reply")
-                                    Text("Reply to \(replyTo.handle)")
-                                }
-                                .font(.caption)
-                                .foregroundStyle(.secondary)
+                        if let replyToHandle = data.replyToHandle {
+                            HStack {
+                                Image("fa-reply")
+                                Text("Reply to \(replyToHandle)")
                             }
+                            .font(.caption)
+                            .foregroundStyle(.secondary)
                         }
                         if let contentWarning = data.contentWarning, !contentWarning.isEmpty {
                             RichText(text: contentWarning)
@@ -158,7 +155,15 @@ struct StatusView: View {
                         
                         if !data.images.isEmpty, showMedia {
                             StatusMediaContent(data: data.images, sensitive: data.sensitive) { media, index in
-                                data.onMediaClicked(ClickContext(launcher: AppleUriLauncher(openUrl: openURL)), media, .init(int: .init(index)))
+                                let route = DeeplinkRoute.MediaStatusMedia(
+                                    statusKey: data.statusKey,
+                                    accountType: data.accountType,
+                                    index: Int32(index),
+                                    preview: nil as String?
+                                )
+                                if let url = URL(string: route.toUri()) {
+                                    openURL(url)
+                                }
                             }
                         }
 
@@ -187,8 +192,8 @@ struct StatusView: View {
                             )
                         }
 
-                        if case .reaction(let reaction) = onEnum(of: data.bottomContent), showMedia, !isQuote {
-                            if let channel = reaction.channel {
+                        if showMedia, !isQuote {
+                            if let channel = data.sourceChannel {
                                 HStack {
                                     Image(.faTv)
                                     Text(channel.name)
@@ -196,8 +201,8 @@ struct StatusView: View {
                                 .font(.footnote)
                                 .foregroundStyle(.secondary)
                             }
-                            if !reaction.emojiReactions.isEmpty {
-                                StatusReactionView(data: reaction)
+                            if !data.emojiReactions.isEmpty {
+                                StatusReactionView(data: Array(data.emojiReactions))
                             }
                         }
 
@@ -234,13 +239,10 @@ struct StatusView: View {
     
     var topEndContent: some View {
         HStack {
-            switch onEnum(of: data.topEndContent) {
-            case .visibility(let visibility):
-                StatusVisibilityView(data: visibility.visibility)
+            if let visibility = data.visibility {
+                StatusVisibilityView(data: visibility)
                     .font(.caption)
                     .foregroundStyle(.secondary)
-            case .none:
-                EmptyView()
             }
             if showPlatformLogo {
                 switch data.platformType {
diff --git a/iosApp/flare/UI/Component/Status/StatusVisibilityView.swift b/iosApp/flare/UI/Component/Status/StatusVisibilityView.swift
index 8d8653ccb..969451d24 100644
--- a/iosApp/flare/UI/Component/Status/StatusVisibilityView.swift
+++ b/iosApp/flare/UI/Component/Status/StatusVisibilityView.swift
@@ -2,7 +2,7 @@ import SwiftUI
 import KotlinSharedUI
 
 struct StatusVisibilityView: View {
-    let data: UiTimeline.ItemContentStatusTopEndContentVisibilityType
+    let data: UiTimelineV2.PostVisibility
     var body: some View {
         switch data {
         case .public:    Image("fa-globe")
diff --git a/iosApp/flare/UI/Component/Status/TimelineUserView.swift b/iosApp/flare/UI/Component/Status/TimelineUserView.swift
index bde329634..179c4135d 100644
--- a/iosApp/flare/UI/Component/Status/TimelineUserView.swift
+++ b/iosApp/flare/UI/Component/Status/TimelineUserView.swift
@@ -3,7 +3,7 @@ import KotlinSharedUI
 
 struct TimelineUserView: View {
     @Environment(\.openURL) private var openURL
-    let data: UiTimeline.ItemContentUser
+    let data: UiTimelineV2.User
     var body: some View {
         VStack {
             UserCompatView(data: data.value)
@@ -12,30 +12,8 @@ struct TimelineUserView: View {
                 }
             if !data.button.isEmpty {
                 HStack {
-                    ForEach(0..<data.button.count, id: \.self) { index in
-                        let button = data.button[index]
-                        switch onEnum(of: button) {
-                        case .acceptFollowRequest(let acceptFollowButton):
-                            Button {
-                                acceptFollowButton.onClicked(ClickContext(launcher: AppleUriLauncher(openUrl: openURL)))
-                            } label: {
-                                Label {
-                                    Text("accept_follow_request")
-                                } icon: {
-                                    Image("fa-check")
-                                }
-                            }
-                        case .rejectFollowRequest(let rejectFollowButton):
-                            Button(role: .destructive) {
-                                rejectFollowButton.onClicked(ClickContext(launcher: AppleUriLauncher(openUrl: openURL)))
-                            } label: {
-                                Label {
-                                    Text("reject_follow_request")
-                                } icon: {
-                                    Image("fa-xmark")
-                                }
-                            }
-                        }
+                    ForEach(Array(data.button.enumerated()), id: \.offset) { _, button in
+                        StatusActionItemView(data: button, useText: true, isFixedWidth: false)
                     }
                 }
             }
diff --git a/iosApp/flare/UI/Component/Status/TimelineView.swift b/iosApp/flare/UI/Component/Status/TimelineView.swift
index f451eed7a..99e767b5a 100644
--- a/iosApp/flare/UI/Component/Status/TimelineView.swift
+++ b/iosApp/flare/UI/Component/Status/TimelineView.swift
@@ -2,49 +2,54 @@ import SwiftUI
 import KotlinSharedUI
 
 struct TimelineView: View {
-    let data: UiTimeline
+    let data: UiTimelineV2
     let detailStatusKey: MicroBlogKey?
     var showTranslate: Bool = true
-    @Environment(\.openURL) private var openURL
     @Environment(\.appearanceSettings.fullWidthPost) private var fullWidthPost
     @ScaledMetric(relativeTo: .caption) var iconSize: CGFloat = 15
+
     var body: some View {
-        VStack {
-            if let topMessage = data.topMessage {
-                StatusTopMessageView(topMessage: topMessage)
-                    .if(!fullWidthPost && data.content != nil, transform: { view in
-                        view.padding(.leading, 44 - iconSize)
-                    })
-                    .if(data.content != nil, transform: { view in
-                        view.lineLimit(1)
-                            .font(.caption)
-                            .foregroundStyle(.secondary)
-                    })
-                    .onTapGesture {
-                        if let user = topMessage.user {
-                            user.onClicked(ClickContext(launcher: AppleUriLauncher(openUrl: openURL)))
-                        }
-                    }
+        switch onEnum(of: data) {
+        case .feed(let feed):
+            FeedView(data: feed)
+        case .post(let post):
+            VStack {
+                messageView(post.message, topMessageOnly: false)
+                StatusView(data: post, isDetail: detailStatusKey == post.statusKey, showTranslate: showTranslate)
+            }
+        case .user(let user):
+            VStack {
+                messageView(user.message, topMessageOnly: false)
+                TimelineUserView(data: user)
             }
-            if let content = data.content {
-                switch onEnum(of: content) {
-                case .feed(let feed):
-                    FeedView(data: feed)
-                case .status(let status):
-                    StatusView(data: status, isDetail: detailStatusKey == status.statusKey, showTranslate: showTranslate)
-                case .user(let user):
-                    TimelineUserView(data: user)
-                case .userList(let userList):
-                    UserListView(data: userList)
-                }
+        case .userList(let userList):
+            VStack {
+                messageView(userList.message, topMessageOnly: false)
+                UserListView(data: userList)
             }
+        case .message(let message):
+            messageView(message, topMessageOnly: true)
+        }
+    }
+
+    @ViewBuilder
+    private func messageView(_ message: UiTimelineV2.Message?, topMessageOnly: Bool) -> some View {
+        if let message {
+            StatusTopMessageView(topMessage: message)
+                .if(!fullWidthPost && !topMessageOnly, transform: { view in
+                    view.padding(.leading, 44 - iconSize)
+                })
+                .if(!topMessageOnly, transform: { view in
+                    view.lineLimit(1)
+                        .font(.caption)
+                        .foregroundStyle(.secondary)
+                })
         }
-//        .id(data.itemKey)
     }
 }
 
 extension TimelineView {
-    init(data: UiTimeline) {
+    init(data: UiTimelineV2) {
         self.data = data
         self.detailStatusKey = nil
     }
diff --git a/iosApp/flare/UI/Component/Status/UserListView.swift b/iosApp/flare/UI/Component/Status/UserListView.swift
index 5975fd157..635bdb22f 100644
--- a/iosApp/flare/UI/Component/Status/UserListView.swift
+++ b/iosApp/flare/UI/Component/Status/UserListView.swift
@@ -3,7 +3,7 @@ import KotlinSharedUI
 
 struct UserListView: View {
     @Environment(\.openURL) private var openURL
-    let data: UiTimeline.ItemContentUserList
+    let data: UiTimelineV2.UserList
     var body: some View {
         VStack {
             ScrollView(.horizontal) {
@@ -24,7 +24,7 @@ struct UserListView: View {
                 }
             }
             .scrollIndicators(.hidden)
-            if let status = data.status {
+            if let status = data.post {
                 VStack {
                     StatusView(data: status, isQuote: true, forceHideActions: true)
                         .padding(8)
diff --git a/iosApp/flare/UI/Component/TimelinePagingView.swift b/iosApp/flare/UI/Component/TimelinePagingView.swift
index 1c9963a62..0c6f844f7 100644
--- a/iosApp/flare/UI/Component/TimelinePagingView.swift
+++ b/iosApp/flare/UI/Component/TimelinePagingView.swift
@@ -3,7 +3,7 @@ import WaterfallGrids
 import KotlinSharedUI
 
 struct TimelinePagingView: View {
-    let data: PagingState<UiTimeline>
+    let data: PagingState<UiTimelineV2>
     let detailStatusKey: MicroBlogKey?
     var body: some View {
         PagingView(data: data) {
@@ -30,7 +30,7 @@ struct TimelinePagingView: View {
 }
 
 extension TimelinePagingView {
-    init(data: PagingState<UiTimeline>) {
+    init(data: PagingState<UiTimelineV2>) {
         self.data = data
         self.detailStatusKey = nil
     }
@@ -38,12 +38,12 @@ extension TimelinePagingView {
 
 struct TimelineData: Identifiable, Hashable {
     let id: String
-    let data: UiTimeline?
+    let data: UiTimelineV2?
     let index: Int
 }
 
 struct TimelineCollection: @MainActor RandomAccessCollection {
-    let data: PagingStateSuccess<UiTimeline>
+    let data: PagingStateSuccess<UiTimelineV2>
     public var startIndex: Int { 0 }
     public var endIndex: Int { Int(data.itemCount) }
 
@@ -64,7 +64,7 @@ struct TimelinePagingContent: View {
     @AppStorage("pref_timeline_use_compose_view") private var useComposeView: Bool = false
     @Environment(\.horizontalSizeClass) private var horizontalSizeClass
     @Environment(\.openURL) private var openURL
-    let data: PagingState<UiTimeline>
+    let data: PagingState<UiTimelineV2>
     let detailStatusKey: MicroBlogKey?
     let key: String
     var body: some View {
@@ -125,7 +125,7 @@ struct TimelinePagingContent: View {
 }
 
 struct TimelineWaterFallPagingView: View {
-    let data: PagingState<UiTimeline>
+    let data: PagingState<UiTimelineV2>
     let detailStatusKey: MicroBlogKey?
     let columns: [WaterfallItems.Column]
     var body: some View {
diff --git a/iosApp/flare/UI/Component/UserCompatView.swift b/iosApp/flare/UI/Component/UserCompatView.swift
index 5b6531388..dfffba75c 100644
--- a/iosApp/flare/UI/Component/UserCompatView.swift
+++ b/iosApp/flare/UI/Component/UserCompatView.swift
@@ -20,7 +20,7 @@ struct UserCompatView<TrailingContent: View>: View {
                 alignment: .leading
             ) {
                 RichText(text: data.name)
-                Text(data.handle)
+                Text(data.handle.canonical)
                     .font(.caption)
                     .foregroundStyle(.secondary)
             }
diff --git a/iosApp/flare/UI/Component/UserOnelineView.swift b/iosApp/flare/UI/Component/UserOnelineView.swift
index edd015e11..9930def6c 100644
--- a/iosApp/flare/UI/Component/UserOnelineView.swift
+++ b/iosApp/flare/UI/Component/UserOnelineView.swift
@@ -21,7 +21,7 @@ struct UserOnelineView<TrailingContent: View>: View {
             }
             HStack {
                 RichText(text: data.name)
-                Text(data.handle)
+                Text(data.handle.canonical)
                     .font(.caption)
                     .foregroundStyle(.secondary)
             }
diff --git a/iosApp/flare/UI/Model/Extension.swift b/iosApp/flare/UI/Model/Extension.swift
index f36e394e6..08160e082 100644
--- a/iosApp/flare/UI/Model/Extension.swift
+++ b/iosApp/flare/UI/Model/Extension.swift
@@ -1,13 +1,13 @@
 import KotlinSharedUI
 
-extension UiTimeline : Identifiable {}
+extension UiTimelineV2 : Identifiable {}
 
-extension UiTimeline.ItemContentFeed : Identifiable {}
+extension UiTimelineV2.Feed : Identifiable {}
 
-extension UiTimeline.ItemContentStatus : Identifiable {}
+extension UiTimelineV2.Post : Identifiable {}
 
-extension UiTimeline.ItemContentUser : Identifiable {}
+extension UiTimelineV2.User : Identifiable {}
 
-extension UiTimeline.ItemContentUserList : Identifiable {}
+extension UiTimelineV2.UserList : Identifiable {}
 
-extension UiTimeline.TopMessage : Identifiable {}
+extension UiTimelineV2.Message : Identifiable {}
diff --git a/iosApp/flare/UI/Route/Route.swift b/iosApp/flare/UI/Route/Route.swift
index 5226d2bb4..fe513ee3b 100644
--- a/iosApp/flare/UI/Route/Route.swift
+++ b/iosApp/flare/UI/Route/Route.swift
@@ -148,7 +148,9 @@ enum Route: Hashable, Identifiable {
     case appLog
     case deepLinkAccountPicker(String, [MicroBlogKey: Route])
     case blockUser(AccountType?, MicroBlogKey)
+    case unblockUser(AccountType?, MicroBlogKey)
     case muteUser(AccountType?, MicroBlogKey)
+    case unmuteUser(AccountType?, MicroBlogKey)
     case reportUser(AccountType?, MicroBlogKey)
     case editUserList(AccountType, MicroBlogKey)
     case userDirectMessages(AccountType, MicroBlogKey)
@@ -252,6 +254,12 @@ enum Route: Hashable, Identifiable {
             } else {
                 return .blockUser(nil, data.userKey)
             }
+        case .unblockUser(let data):
+            if let accountKey = data.accountKey {
+                return .unblockUser(.Specific(accountKey: accountKey), data.userKey)
+            } else {
+                return .unblockUser(nil, data.userKey)
+            }
         case .directMessage(let data):
             return .userDirectMessages(.Specific(accountKey: data.accountKey), data.userKey)
         case .editUserList(let data):
@@ -262,6 +270,12 @@ enum Route: Hashable, Identifiable {
             } else {
                 return .muteUser(nil, data.userKey)
             }
+        case .unmuteUser(let data):
+            if let accountKey = data.accountKey {
+                return .unmuteUser(.Specific(accountKey: accountKey), data.userKey)
+            } else {
+                return .unmuteUser(nil, data.userKey)
+            }
         case .reportUser(let data):
             if let accountKey = data.accountKey {
                 return .reportUser(.Specific(accountKey: accountKey), data.userKey)
@@ -283,8 +297,12 @@ enum Route: Hashable, Identifiable {
             return "mastodon_report_status_alert_title"
         case .blockUser:
             return "block_user_alert_title"
+        case .unblockUser:
+            return "unblock"
         case .muteUser:
             return "mute_user_alert_title"
+        case .unmuteUser:
+            return "unmute"
         default:
             return nil
         }
@@ -299,8 +317,12 @@ enum Route: Hashable, Identifiable {
              Text("mastodon_report_status_alert_message")
         case .blockUser:
             Text("block_user_alert_message")
+        case .unblockUser:
+            Text("unblock")
         case .muteUser:
             Text("mute_user_alert_message")
+        case .unmuteUser:
+            Text("unmute")
         default:
              EmptyView()
         }
@@ -334,14 +356,23 @@ enum Route: Hashable, Identifiable {
             Button("block", role: .destructive) {
                 BlockUserPresenter(accountType: accountType, userKey: userKey).models.value.confirm()
             }
+        case .unblockUser(let accountType, let userKey):
+            Button("Cancel", role: .cancel) {}
+            Button("unblock", role: .destructive) {
+                UnblockUserPresenter(accountType: accountType, userKey: userKey).models.value.confirm()
+            }
         case .muteUser(let accountType, let userKey):
             Button("Cancel", role: .cancel) {}
             Button("mute", role: .destructive) {
                 MuteUserPresenter(accountType: accountType, userKey: userKey).models.value.confirm()
             }
+        case .unmuteUser(let accountType, let userKey):
+            Button("Cancel", role: .cancel) {}
+            Button("unmute", role: .destructive) {
+                UnmuteUserPresenter(accountType: accountType, userKey: userKey).models.value.confirm()
+            }
         default:
             EmptyView()
         }
     }
 }
-
diff --git a/iosApp/flare/UI/Screen/ComposeScreen.swift b/iosApp/flare/UI/Screen/ComposeScreen.swift
index 21e27e4c3..e6f44935d 100644
--- a/iosApp/flare/UI/Screen/ComposeScreen.swift
+++ b/iosApp/flare/UI/Screen/ComposeScreen.swift
@@ -19,68 +19,7 @@ struct ComposeScreen: View {
         VStack(
             spacing: 8
         ) {
-            ScrollView(.horizontal) {
-                HStack {
-                    StateView(state: presenter.state.selectedUsers) { users in
-                        ForEach(0..<users.size, id: \.self) { index in
-                            let item = users.get(index: index)
-                            if let userState = item.first, let account = item.second {
-                                StateView(state: userState) { user in
-                                    Label {
-                                        Text(user.handle)
-                                    } icon: {
-                                        AvatarView(data: user.avatar)
-                                            .scaledToFit()
-                                            .frame(width: 20, height: 20)
-                                    }
-//                                    HStack {
-//                                        AvatarView(data: user.avatar)
-//                                            .scaledToFit()
-//                                            .frame(width: 20, height: 20)
-//                                        Text(user.handle)
-//                                    }
-                                    .padding(.horizontal)
-                                    .padding(.vertical, 8)
-                                    .background(Color(.secondarySystemBackground))
-                                    .clipShape(.rect(cornerRadius: 16))
-                                    .onTapGesture {
-                                        presenter.state.selectAccount(account: account)
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    StateView(state: presenter.state.otherAccounts) { others in
-                        if (others.size > 0) {
-                            Menu {
-                                ForEach(0..<others.size, id: \.self) { index in
-                                    let item = others.get(index: index)
-                                    if let userState = item.first, let account = item.second {
-                                        StateView(state: userState) { user in
-                                            Button {
-                                                presenter.state.selectAccount(account: account)
-                                            } label: {
-                                                Label {
-                                                    Text(user.handle)
-                                                } icon: {
-                                                    AvatarView(data: user.avatar)
-                                                        .scaledToFit()
-                                                        .frame(maxWidth: 20, maxHeight: 20)
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            } label: {
-                                Image("fa-plus")
-                            }
-
-                        }
-                    }
-                }
-                .padding(.horizontal)
-            }
-            .scrollIndicators(.hidden)
+            accountSelectionView
             ScrollView {
                 VStack(
                     spacing: 8
@@ -178,7 +117,7 @@ struct ComposeScreen: View {
                     }
                     if let replyState = presenter.state.replyState,
                        case .success(let reply) = onEnum(of: replyState),
-                       case .status(let content) = onEnum(of: reply.data.content) {
+                       let content = reply.data as? UiTimelineV2.Post {
                         StatusView(data: content, isQuote: true, showMedia: false, forceHideActions: true)
                             .padding()
                             .clipShape(.rect(cornerRadius: 16))
@@ -411,6 +350,64 @@ struct ComposeScreen: View {
             }
         }
     }
+
+    private var accountSelectionView: some View {
+        ScrollView(.horizontal) {
+            HStack {
+                StateView(state: presenter.state.selectedUsers) { users in
+                    ForEach(0..<users.size, id: \.self) { index in
+                        let item = users.get(index: index)
+                        if let userState = item.first, let account = item.second {
+                            StateView(state: userState) { user in
+                                Label {
+                                    Text(user.handle.canonical)
+                                } icon: {
+                                    AvatarView(data: user.avatar)
+                                        .scaledToFit()
+                                        .frame(width: 20, height: 20)
+                                }
+                                .padding(.horizontal)
+                                .padding(.vertical, 8)
+                                .background(Color(.secondarySystemBackground))
+                                .clipShape(.rect(cornerRadius: 16))
+                                .onTapGesture {
+                                    presenter.state.selectAccount(account: account)
+                                }
+                            }
+                        }
+                    }
+                }
+                StateView(state: presenter.state.otherAccounts) { others in
+                    if others.size > 0 {
+                        Menu {
+                            ForEach(0..<others.size, id: \.self) { index in
+                                let item = others.get(index: index)
+                                if let userState = item.first, let account = item.second {
+                                    StateView(state: userState) { user in
+                                        Button {
+                                            presenter.state.selectAccount(account: account)
+                                        } label: {
+                                            Label {
+                                                Text(user.handle.canonical)
+                                            } icon: {
+                                                AvatarView(data: user.avatar)
+                                                    .scaledToFit()
+                                                    .frame(maxWidth: 20, maxHeight: 20)
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        } label: {
+                            Image("fa-plus")
+                        }
+                    }
+                }
+            }
+            .padding(.horizontal)
+        }
+        .scrollIndicators(.hidden)
+    }
     
     private func applyCursorIfPossible() {
         guard let textView = uiTextView, textView.isFirstResponder, let pendingCursor else { return }
@@ -472,7 +469,7 @@ struct ComposeScreen: View {
     }
     private func getReferenceStatus() -> ComposeData.ReferenceStatus? {
         return if let data = composeStatus {
-            ComposeData.ReferenceStatus(data: presenter.state.replyState?.takeSuccess() as? UiTimeline, composeStatus: data)
+            ComposeData.ReferenceStatus(data: presenter.state.replyState?.takeSuccess() as? UiTimelineV2, composeStatus: data)
         } else {
             nil
         }
@@ -484,10 +481,10 @@ struct ComposeScreen: View {
             nil
         }
     }
-    private func getVisibility() -> UiTimeline.ItemContentStatusTopEndContentVisibilityType {
+    private func getVisibility() -> UiTimelineV2.PostVisibility {
         switch onEnum(of: presenter.state.visibilityState) {
-        case .success(let success): return success.data.visibility
-        default: return .public
+            case .success(let success): return success.data.visibility
+            default: return .public
         }
     }
 
@@ -734,7 +731,7 @@ struct ComposeMediaItemView: View {
     }
 }
 
-extension UiTimeline.ItemContentStatusTopEndContentVisibilityType {
+extension UiTimelineV2.PostVisibility {
     var title: LocalizedStringResource {
         switch self {
         case .public:
diff --git a/iosApp/flare/UI/Screen/DMListScreen.swift b/iosApp/flare/UI/Screen/DMListScreen.swift
index e43647dd7..918870791 100644
--- a/iosApp/flare/UI/Screen/DMListScreen.swift
+++ b/iosApp/flare/UI/Screen/DMListScreen.swift
@@ -26,7 +26,7 @@ struct DMListScreen: View {
                                         RichText(text: user.name)
                                             .lineLimit(1)
                                         if (item.users.count == 1) {
-                                            Text(user.handle)
+                                            Text(user.handle.canonical)
                                                 .lineLimit(1)
                                                 .font(.caption)
                                                 .foregroundStyle(.secondary)
diff --git a/iosApp/flare/UI/Screen/DiscoverScreen.swift b/iosApp/flare/UI/Screen/DiscoverScreen.swift
index de9c5e34f..98d4e775f 100644
--- a/iosApp/flare/UI/Screen/DiscoverScreen.swift
+++ b/iosApp/flare/UI/Screen/DiscoverScreen.swift
@@ -62,7 +62,7 @@ struct DiscoverScreen: View {
                                     HStack {
                                         AvatarView(data: account.avatar)
                                             .frame(width: 18, height: 18)
-                                        Text(account.handle).font(.caption)
+                                        Text(account.handle.canonical).font(.caption)
                                     }
                                     .padding(.horizontal, 8)
                                     .padding(.vertical, 4)
diff --git a/iosApp/flare/UI/Screen/NotificationScreen.swift b/iosApp/flare/UI/Screen/NotificationScreen.swift
index 563809da5..1fbd687a8 100644
--- a/iosApp/flare/UI/Screen/NotificationScreen.swift
+++ b/iosApp/flare/UI/Screen/NotificationScreen.swift
@@ -100,20 +100,21 @@ struct NotificationFilterSegments: View {
 }
 
 struct NotificationAccountsBar: View {
-    let items: [UiProfile : KotlinInt]
+    let items: [NotificationAccountItem]
     let selectedAccount: UiProfile?
     let onSelect: (UiProfile) -> Void
 
     var body: some View {
         ScrollView(.horizontal) {
             HStack(spacing: 8) {
-                ForEach(Array(items.keys), id: \.handle) { key in
-                    let value = items[key]?.intValue
+                ForEach(items, id: \.stableKey) { item in
+                    let key = item.profile
+                    let value = item.badge
                     HStack {
                         ZStack(alignment: .bottomTrailing) {
                             AvatarView(data: key.avatar)
-                            if let badge = value, badge > 0 {
-                                Text("\(badge)")
+                            if value > 0 {
+                                Text("\(value)")
                                     .font(.caption2)
                                     .padding(2)
                                     .background(
@@ -124,7 +125,7 @@ struct NotificationAccountsBar: View {
                                     .frame(width: 12, height: 12)
                             }
                         }
-                        Text(key.handle)
+                        Text(key.handle.canonical)
                     }
                     .onTapGesture {
                         onSelect(key)
diff --git a/iosApp/flare/UI/Screen/ProfileScreen.swift b/iosApp/flare/UI/Screen/ProfileScreen.swift
index 57807c30c..890c4931f 100644
--- a/iosApp/flare/UI/Screen/ProfileScreen.swift
+++ b/iosApp/flare/UI/Screen/ProfileScreen.swift
@@ -4,6 +4,7 @@ import SwiftUIBackports
 
 struct ProfileScreen: View {
     @Environment(\.horizontalSizeClass) private var horizontalSizeClass
+    @Environment(\.openURL) private var openURL
     let accountType: AccountType
     let userKey: MicroBlogKey?
     let onFollowingClick: (MicroBlogKey) -> Void
@@ -82,7 +83,7 @@ struct ProfileScreen: View {
                         relation: presenter.state.relationState,
                         isMe: presenter.state.isMe,
                         onFollowClick: { user, relation in
-                            presenter.state.follow(userKey: user.key, data: relation)
+                            handleFollowAction(user: user, relation: relation)
                         },
                         onFollowingClick: onFollowingClick,
                         onFansClick: onFansClick
@@ -114,7 +115,7 @@ struct ProfileScreen: View {
                 relation: presenter.state.relationState,
                 isMe: presenter.state.isMe,
                 onFollowClick: { user, relation in
-                    presenter.state.follow(userKey: user.key, data: relation)
+                    handleFollowAction(user: user, relation: relation)
                 },
                 onFollowingClick: onFollowingClick,
                 onFansClick: onFansClick
@@ -164,6 +165,21 @@ struct ProfileScreen: View {
         .listStyle(.plain)
         .edgesIgnoringSafeArea(.top)
     }
+
+    private func handleFollowAction(user: UiProfile, relation: UiRelation) {
+        if relation.blocking {
+            if case .success(let state) = onEnum(of: presenter.state.myAccountKey) {
+                let route = DeeplinkRoute.UnblockUser(accountKey: state.data, userKey: user.key)
+                if let url = URL(string: route.toUri()) {
+                    openURL(url)
+                }
+            }
+        } else if relation.following || relation.hasPendingFollowRequestFromYou {
+            presenter.state.unfollow(userKey: user.key)
+        } else {
+            presenter.state.follow(userKey: user.key)
+        }
+    }
 }
 
 extension ProfileScreen {
diff --git a/iosApp/flare/UI/Screen/SearchScreen.swift b/iosApp/flare/UI/Screen/SearchScreen.swift
index 1addb162e..716a67364 100644
--- a/iosApp/flare/UI/Screen/SearchScreen.swift
+++ b/iosApp/flare/UI/Screen/SearchScreen.swift
@@ -92,7 +92,7 @@ struct SearchScreen: View {
                                     HStack {
                                         AvatarView(data: account.avatar)
                                             .frame(width: 18, height: 18)
-                                        Text(account.handle).font(.caption)
+                                        Text(account.handle.canonical).font(.caption)
                                     }
                                     .padding(.horizontal, 8)
                                     .padding(.vertical, 4)
diff --git a/iosApp/flare/UI/Screen/StatusDetailScreen.swift b/iosApp/flare/UI/Screen/StatusDetailScreen.swift
index b51823808..1e6eb8305 100644
--- a/iosApp/flare/UI/Screen/StatusDetailScreen.swift
+++ b/iosApp/flare/UI/Screen/StatusDetailScreen.swift
@@ -9,7 +9,7 @@ struct StatusDetailScreen: View {
     private var detailStatusKey: MicroBlogKey? {
         return switch onEnum(of: presenter.state.current) {
         case .success(let data):
-            data.data.statusKey
+            (data.data as? UiTimelineV2.Post)?.statusKey
         default:
             nil
         }
diff --git a/iosApp/flare/UI/Screen/StatusMediaScreen.swift b/iosApp/flare/UI/Screen/StatusMediaScreen.swift
index 2ec03fc7e..c788f4c01 100644
--- a/iosApp/flare/UI/Screen/StatusMediaScreen.swift
+++ b/iosApp/flare/UI/Screen/StatusMediaScreen.swift
@@ -104,9 +104,11 @@ struct StatusMediaScreen: View {
             currentTime = .zero
         }
         .onChange(of: presenter.state.status) { oldValue, newValue in
-            if medias.isEmpty, case .success(let success) = onEnum(of: newValue), case .status(let content) = onEnum(of: success.data.content) {
+            if medias.isEmpty,
+               case .success(let success) = onEnum(of: newValue),
+               let content = success.data as? UiTimelineV2.Post {
                 withAnimation {
-                    medias = content.images
+                    medias = Array(content.images)
                 }
             }
         }
@@ -152,7 +154,7 @@ struct StatusMediaScreen: View {
             }
             
             StateView(state: presenter.state.status) { timeline in
-                if case .status(let content) = onEnum(of: timeline.content) {
+                if let content = timeline as? UiTimelineV2.Post {
                     StatusView(data: content, isQuote: true, showMedia: false, maxLine: 3, showExpandTextButton: false)
                 }
             }
diff --git a/iosApp/flare/UI/Screen/TabSettingsScreen.swift b/iosApp/flare/UI/Screen/TabSettingsScreen.swift
index 4ead7798a..0b7ebea41 100644
--- a/iosApp/flare/UI/Screen/TabSettingsScreen.swift
+++ b/iosApp/flare/UI/Screen/TabSettingsScreen.swift
@@ -300,7 +300,7 @@ struct AddTabSheet: View {
                         ForEach(0..<tabs.count, id: \.self) { index in
                             let item = tabs[index]
                             Label {
-                                Text(item.profile.handle)
+                                Text(item.profile.handle.canonical)
                             } icon: {
                                 AvatarView(data: item.profile.avatar)
                                     .frame(width: 20, height: 20)
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
index 33ad3772c..c06a2f634 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
@@ -13,6 +13,7 @@ import dev.dimension.flare.ui.route.DeeplinkRoute
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
 import kotlin.time.Instant
 
 @Serializable
@@ -31,6 +32,7 @@ public sealed class UiTimelineV2 {
 
     public abstract val itemKey: String
 
+    @Transient
     public val itemType: String =
         when (this) {
             is Feed -> "feed"
@@ -57,6 +59,8 @@ public sealed class UiTimelineV2 {
         val onClicked: ClickContext.() -> Unit by lazy {
             clickEvent.onClicked
         }
+
+        @Transient
         override val itemKey: String =
             buildString {
                 append("Message_")
@@ -152,6 +156,8 @@ public sealed class UiTimelineV2 {
         val onClicked: ClickContext.() -> Unit by lazy {
             clickEvent.onClicked
         }
+
+        @Transient
         override val itemKey: String =
             buildString {
                 append("Feed_")
@@ -220,6 +226,8 @@ public sealed class UiTimelineV2 {
         val onClicked: ClickContext.() -> Unit by lazy {
             clickEvent.onClicked
         }
+
+        @Transient
         override val itemKey: String =
             buildString {
                 append(platformType.name)
@@ -286,6 +294,8 @@ public sealed class UiTimelineV2 {
         override val accountType: AccountType,
     ) : UiTimelineV2() {
         override val searchText: String? = null
+
+        @Transient
         override val itemKey: String =
             buildString {
                 append("User_")
@@ -313,6 +323,8 @@ public sealed class UiTimelineV2 {
         override val accountType: AccountType,
     ) : UiTimelineV2() {
         override val searchText: String? = null
+
+        @Transient
         override val itemKey: String =
             buildString {
                 append("UserList_")
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/AllNotificationPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/AllNotificationPresenter.kt
index 037095d83..0e6243b91 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/AllNotificationPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/AllNotificationPresenter.kt
@@ -25,10 +25,7 @@ import dev.dimension.flare.ui.model.collectAsUiState
 import dev.dimension.flare.ui.model.onSuccess
 import dev.dimension.flare.ui.presenter.PresenterBase
 import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.ImmutableMap
-import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.collections.immutable.toImmutableList
-import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -41,6 +38,12 @@ import kotlinx.coroutines.flow.map
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
+public data class NotificationAccountItem(
+    val stableKey: String,
+    val profile: UiProfile,
+    val badge: Int,
+)
+
 public class AllNotificationPresenter :
     PresenterBase<AllNotificationPresenter.State>(),
     KoinComponent {
@@ -50,7 +53,7 @@ public class AllNotificationPresenter :
 
     @androidx.compose.runtime.Immutable
     public interface State {
-        public val notifications: ImmutableMap<UiProfile, Int>
+        public val notifications: ImmutableList<NotificationAccountItem>
         public val supportedNotificationFilters: UiState<ImmutableList<NotificationFilter>>
         public val timeline: PagingState<UiTimelineV2>
         public val selectedFilter: NotificationFilter?
@@ -106,10 +109,18 @@ public class AllNotificationPresenter :
             .map {
                 it
                     .filterNotNull()
-                    .sortedByDescending {
-                        it.second
-                    }.toMap()
-                    .toImmutableMap()
+                    .sortedWith(
+                        compareByDescending<Pair<UiProfile, Int>> { it.second }
+                            .thenBy { it.first.handle.canonical }
+                            .thenBy { it.first.key.host }
+                            .thenBy { it.first.key.id },
+                    ).map { (profile, badge) ->
+                        NotificationAccountItem(
+                            stableKey = "${profile.key.host}:${profile.key.id}",
+                            profile = profile,
+                            badge = badge,
+                        )
+                    }.toImmutableList()
             }
     }
 
@@ -149,15 +160,14 @@ public class AllNotificationPresenter :
     @OptIn(ExperimentalCoroutinesApi::class)
     @Composable
     override fun body(): State {
-        val notifications by accountsNotificationFlow.collectAsState(persistentMapOf())
+        val notifications by accountsNotificationFlow.collectAsState(emptyList<NotificationAccountItem>().toImmutableList())
         val selectedAccount by selectedAccountFlow.collectAsState()
         val selectedAccountIndex by remember {
             derivedStateOf {
                 val maxIndex = (notifications.size - 1).coerceAtLeast(0)
                 selectedAccount?.let { profile ->
-                    notifications.keys
-                        .map { it.key }
-                        .indexOf(profile.key)
+                    notifications
+                        .indexOfFirst { it.profile.key == profile.key }
                         .coerceIn(0, maxIndex)
                 } ?: 0
             }
@@ -173,8 +183,8 @@ public class AllNotificationPresenter :
 
         LaunchedEffect(notifications) {
             val current = selectedAccountFlow.value
-            if (current == null || current.key !in notifications.keys.map { it.key }) {
-                selectedAccountFlow.value = notifications.keys.firstOrNull()
+            if (current == null || notifications.none { it.profile.key == current.key }) {
+                selectedAccountFlow.value = notifications.firstOrNull()?.profile
             }
         }
 

From 41ee19193378eb348b31b9d9920eaaf9711ff878 Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Fri, 6 Mar 2026 21:13:32 +0900
Subject: [PATCH 27/33] update cache db

---
 .../UI/Component/Status/StatusView.swift      |  12 +-
 .../data/database/cache/CacaheDatabase.kt     |   3 +-
 .../database/cache/dao/PagingTimelineDao.kt   |   9 +
 .../data/database/cache/dao/StatusDao.kt      |  15 +
 .../flare/data/database/cache/dao/UserDao.kt  |   4 -
 .../data/database/cache/mapper/Microblog.kt   | 308 ++++++++----------
 .../flare/data/database/cache/mapper/User.kt  |  19 +-
 .../database/cache/model/DbDirectMessage.kt   |  22 +-
 .../flare/data/database/cache/model/DbList.kt |   6 +
 .../database/cache/model/DbPagingTimeline.kt  |  42 +--
 .../database/cache/model/DbStatusReference.kt |   5 +
 .../database/cache/model/DbUserHistory.kt     |   1 +
 .../microblog/handler/PostHandler.kt          |  52 ++-
 .../microblog/paging/TimelinePagingMapper.kt  | 137 ++++----
 .../dimension/flare/ui/model/UiTimelineV2.kt  |  12 +
 .../ui/presenter/home/TimelinePresenter.kt    |   9 +-
 .../database/cache/mapper/MicroblogTest.kt    | 203 +++++++++++-
 .../microblog/PostEventHandlerTest.kt         |   1 +
 .../microblog/handler/PostHandlerTest.kt      | 120 ++++++-
 .../microblog/handler/RelationHandlerTest.kt  |   4 +-
 .../flare/ui/model/mapper/XQTRenderTest.kt    |  27 ++
 21 files changed, 694 insertions(+), 317 deletions(-)

diff --git a/iosApp/flare/UI/Component/Status/StatusView.swift b/iosApp/flare/UI/Component/Status/StatusView.swift
index 01c02b788..21032c2da 100644
--- a/iosApp/flare/UI/Component/Status/StatusView.swift
+++ b/iosApp/flare/UI/Component/Status/StatusView.swift
@@ -155,11 +155,21 @@ struct StatusView: View {
                         
                         if !data.images.isEmpty, showMedia {
                             StatusMediaContent(data: data.images, sensitive: data.sensitive) { media, index in
+                                let preview: String? = switch onEnum(of: media) {
+                                case .image(let image):
+                                    image.previewUrl
+                                case .video(let video):
+                                    video.thumbnailUrl
+                                case .gif(let gif):
+                                    gif.previewUrl
+                                case .audio:
+                                    nil
+                                }
                                 let route = DeeplinkRoute.MediaStatusMedia(
                                     statusKey: data.statusKey,
                                     accountType: data.accountType,
                                     index: Int32(index),
-                                    preview: nil as String?
+                                    preview: preview
                                 )
                                 if let url = URL(string: route.toUri()) {
                                     openURL(url)
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/CacaheDatabase.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/CacaheDatabase.kt
index 815ea9e29..66f5681ad 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/CacaheDatabase.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/CacaheDatabase.kt
@@ -8,13 +8,12 @@ import androidx.room.TypeConverters
 import androidx.room.immediateTransaction
 import androidx.room.useWriterConnection
 
-internal const val CACHE_DATABASE_VERSION = 24
+internal const val CACHE_DATABASE_VERSION = 26
 
 @Database(
     entities = [
         dev.dimension.flare.data.database.cache.model.DbEmoji::class,
         dev.dimension.flare.data.database.cache.model.DbStatusReference::class,
-        dev.dimension.flare.data.database.cache.model.DbStatusUserReference::class,
         dev.dimension.flare.data.database.cache.model.DbStatus::class,
         dev.dimension.flare.data.database.cache.model.DbUser::class,
         dev.dimension.flare.data.database.cache.model.DbPagingTimeline::class,
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
index 33c05bba6..fc8473439 100644
--- 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
@@ -64,6 +64,15 @@ internal interface PagingTimelineDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertAll(timeline: List<DbPagingTimeline>)
 
+    @Query(
+        "SELECT * FROM DbPagingTimeline " +
+            "WHERE pagingKey = :pagingKey AND statusKey IN (:statusKeys)",
+    )
+    suspend fun getByPagingKeyAndStatusKeys(
+        pagingKey: String,
+        statusKeys: List<MicroBlogKey>,
+    ): List<DbPagingTimeline>
+
     @Delete
     suspend fun delete(timeline: List<DbPagingTimeline>)
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/StatusDao.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/StatusDao.kt
index 470c0dbfd..222a916df 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/StatusDao.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/StatusDao.kt
@@ -4,7 +4,9 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
+import androidx.room.Transaction
 import dev.dimension.flare.data.database.cache.model.DbStatus
+import dev.dimension.flare.data.database.cache.model.DbStatusWithReference
 import dev.dimension.flare.model.DbAccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiTimelineV2
@@ -24,6 +26,19 @@ internal interface StatusDao {
         accountType: DbAccountType,
     ): Flow<DbStatus?>
 
+    @Transaction
+    @Query("SELECT * FROM DbStatus WHERE statusKey = :statusKey AND accountType = :accountType")
+    fun getWithReferences(
+        statusKey: MicroBlogKey,
+        accountType: DbAccountType,
+    ): Flow<DbStatusWithReference?>
+
+    @Query("SELECT * FROM DbStatus WHERE accountType = :accountType AND statusKey IN (:statusKeys)")
+    suspend fun getByKeys(
+        statusKeys: List<MicroBlogKey>,
+        accountType: DbAccountType,
+    ): List<DbStatus>
+
     @Query("UPDATE DbStatus SET content = :content WHERE statusKey = :statusKey AND accountType = :accountType")
     suspend fun update(
         statusKey: MicroBlogKey,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt
index 3a7543280..189780f0b 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt
@@ -6,7 +6,6 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Transaction
-import dev.dimension.flare.data.database.cache.model.DbStatusUserReference
 import dev.dimension.flare.data.database.cache.model.DbUser
 import dev.dimension.flare.data.database.cache.model.DbUserHistory
 import dev.dimension.flare.data.database.cache.model.DbUserHistoryWithUser
@@ -24,9 +23,6 @@ internal interface UserDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertAll(users: List<DbUser>)
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertAllReferences(references: List<DbStatusUserReference>)
-
     @Query("UPDATE DbUser SET content = :content WHERE userKey = :userKey")
     suspend fun update(
         userKey: MicroBlogKey,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Microblog.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Microblog.kt
index a4b2c37d8..1417329d0 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Microblog.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Microblog.kt
@@ -1,194 +1,174 @@
 package dev.dimension.flare.data.database.cache.mapper
 
 import dev.dimension.flare.data.database.cache.CacheDatabase
+import dev.dimension.flare.data.database.cache.model.DbPagingTimeline
 import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
 import dev.dimension.flare.data.database.cache.model.DbStatus
+import dev.dimension.flare.model.DbAccountType
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.model.ReferenceType
+import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.UiTimelineV2
-import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 
 internal suspend fun saveToDatabase(
     database: CacheDatabase,
     items: List<DbPagingTimelineWithStatus>,
 ) {
-    // TODO: check existing users and update them if needed
-    val users =
-        items
-            .flatMap {
-                listOfNotNull(it.status.status) + it.status.references.mapNotNull { it.status }
-            }.flatMap { it.references }
-            .mapNotNull { it.user }
-            .distinctBy { it.userKey }
-    val userReferences =
-        items
-            .flatMap {
-                listOfNotNull(it.status.status) + it.status.references.mapNotNull { it.status }
-            }.flatMap { post ->
-                post.references.map { it.reference }
-            }
-    database.upsertUsers(users)
-    database.userDao().insertAllReferences(userReferences)
-
-//    (
-//            items.flatMap { it.status.status.references.mapNotNull { it.user } } +
-//                    items
-//                        .flatMap { it.status.references }
-//                        .flatMap { it.status?.references.orEmpty() }
-//                        .mapNotNull { it.user }
-//            ).let { allUsers ->
-//            val exsitingUsers =
-//                database
-//                    .userDao()
-//                    .findByKeys(allUsers.map { it.userKey })
-//                    .firstOrNull()
-//                    .orEmpty()
-// //                .map {
-// //                    when (val content = it.content) {
-// //                        is UserContent.Bluesky -> {
-// //                            val user =
-// //                                allUsers.find { user ->
-// //                                    user.userKey == it.userKey
-// //                                }
-// //                            if (user != null && user.content is UserContent.BlueskyLite) {
-// //                                it.copy(
-// //                                    content =
-// //                                        content.copy(
-// //                                            data =
-// //                                                content.data.copy(
-// //                                                    handle = user.content.data.handle,
-// //                                                    displayName = user.content.data.displayName,
-// //                                                    avatar = user.content.data.avatar,
-// //                                                ),
-// //                                        ),
-// //                                )
-// //                            } else {
-// //                                it
-// //                            }
-// //                        }
-// //                        is UserContent.Misskey -> {
-// //                            val user =
-// //                                allUsers.find { user ->
-// //                                    user.userKey == it.userKey
-// //                                }
-// //                            if (user != null && user.content is UserContent.MisskeyLite) {
-// //                                it.copy(
-// //                                    content =
-// //                                        content.copy(
-// //                                            data =
-// //                                                content.data.copy(
-// //                                                    name = user.content.data.name,
-// //                                                    username = user.content.data.username,
-// //                                                    avatarUrl = user.content.data.avatarUrl,
-// //                                                ),
-// //                                        ),
-// //                                )
-// //                            } else {
-// //                                it
-// //                            }
-// //                        }
-// //                        else -> it
-// //                    }
-// //                }
-//
-//            val result = (exsitingUsers + allUsers).distinctBy { it.userKey }
-//            database.userDao().insertAll(result)
-//            database.userDao().insertAll(result.map {
-//                DbStatusUserReference(
-//                    _id = "${it.userKey}_${it.name}",
-//                    statusKey = it.userKey,
-//                    referenceUserKey = it.userKey,
-//                )
-//            })
-//        }
     val statuses =
         items.map { it.status.status.data } +
             items
                 .flatMap { it.status.references }
                 .mapNotNull { it.status?.data }
-    val mergedStatuses = statuses.map { mergeWithExistingPostParents(database, it) }
-    database.statusDao().insertAll(mergedStatuses)
+    val users = statuses.flatMap { it.content.usersInContent() }.distinctBy { it.key }
+    database.upsertUsers(users.map { it.toDbUser() })
+    val mergedStatuses = mergeWithExistingPostParents(database, statuses)
+    val changedStatuses = loadChangedStatuses(database, mergedStatuses)
+    if (changedStatuses.isNotEmpty()) {
+        database.statusDao().insertAll(changedStatuses)
+    }
     items.flatMap { it.status.references }.map { it.reference }.let {
         // TODO: delete old references
         database.statusReferenceDao().insertAll(it)
     }
-    database.pagingTimelineDao().insertAll(items.map { it.timeline })
+    val changedTimeline = loadChangedTimeline(database, items.map { it.timeline })
+    if (changedTimeline.isNotEmpty()) {
+        database.pagingTimelineDao().insertAll(changedTimeline)
+    }
 }
 
 private suspend fun mergeWithExistingPostParents(
     database: CacheDatabase,
-    incoming: DbStatus,
-): DbStatus {
-    val incomingPost = incoming.content as? UiTimelineV2.Post ?: return incoming
-    if (incomingPost.parents.isNotEmpty()) {
+    incoming: List<DbStatus>,
+): List<DbStatus> {
+    if (incoming.isEmpty()) {
         return incoming
     }
-    val existingPost =
-        database
-            .statusDao()
-            .get(incoming.statusKey, incoming.accountType)
-            .firstOrNull()
-            ?.content as? UiTimelineV2.Post
-    return if (existingPost?.parents?.isNotEmpty() == true) {
-        incoming.copy(content = incomingPost.copy(parents = existingPost.parents))
-    } else {
+
+    val candidatesByAccount =
         incoming
+            .asSequence()
+            .mapNotNull { item ->
+                val post = item.content as? UiTimelineV2.Post ?: return@mapNotNull null
+                if (post.parents.isNotEmpty() || post.references.any { it.type == ReferenceType.Reply }) {
+                    return@mapNotNull null
+                }
+                item.accountType to item.statusKey
+            }.groupBy(
+                keySelector = { it.first },
+                valueTransform = { it.second },
+            )
+    if (candidatesByAccount.isEmpty()) {
+        return incoming
+    }
+
+    val existingReplyReferencesByStatus = loadExistingPostReplyReferences(database, candidatesByAccount)
+    return incoming.map { item ->
+        val post = item.content as? UiTimelineV2.Post ?: return@map item
+        if (post.parents.isNotEmpty() || post.references.any { it.type == ReferenceType.Reply }) {
+            return@map item
+        }
+        val existingReplyReferences = existingReplyReferencesByStatus[item.accountType to item.statusKey] ?: return@map item
+        item.copy(
+            content =
+                post.copy(
+                    references =
+                        (
+                            post.references +
+                                existingReplyReferences
+                        ).distinctBy { it.type to it.statusKey }
+                            .toImmutableList(),
+                ),
+        )
+    }
+}
+
+private suspend fun loadExistingPostReplyReferences(
+    database: CacheDatabase,
+    candidatesByAccount: Map<DbAccountType, List<MicroBlogKey>>,
+): Map<Pair<DbAccountType, MicroBlogKey>, ImmutableList<UiTimelineV2.Post.Reference>> {
+    val result =
+        mutableMapOf<
+            Pair<DbAccountType, MicroBlogKey>,
+            ImmutableList<UiTimelineV2.Post.Reference>,
+        >()
+    candidatesByAccount.forEach { (accountType, keys) ->
+        keys.distinct().chunked(SQL_IN_BATCH_SIZE).forEach { chunk ->
+            database.statusDao().getByKeys(statusKeys = chunk, accountType = accountType).forEach { existing ->
+                val existingPost = existing.content as? UiTimelineV2.Post ?: return@forEach
+                val replyReferences =
+                    (
+                        existingPost.references.filter { it.type == ReferenceType.Reply } +
+                            existingPost.parents.map {
+                                UiTimelineV2.Post.Reference(
+                                    statusKey = it.statusKey,
+                                    type = ReferenceType.Reply,
+                                )
+                            }
+                    ).distinctBy { it.type to it.statusKey }
+                        .toImmutableList()
+                if (replyReferences.isEmpty()) {
+                    return@forEach
+                }
+                result[accountType to existing.statusKey] = replyReferences
+            }
+        }
     }
+    return result
 }
 
-// internal fun createDbPagingTimelineWithStatus(
-//    accountType: DbAccountType,
-//    pagingKey: String,
-//    sortId: Long,
-//    status: DbStatusWithUser,
-//    references: Map<ReferenceType, List<DbStatusWithUser>>,
-// ): DbPagingTimelineWithStatus {
-//    val timeline =
-//        DbPagingTimeline(
-//            accountType = accountType,
-//            statusKey = status.data.statusKey,
-//            pagingKey = pagingKey,
-//            sortId = sortId,
-//        )
-//    return DbPagingTimelineWithStatus(
-//        timeline = timeline,
-//        status =
-//            DbStatusWithReference(
-//                status = status,
-//                references =
-//                    references.flatMap { (type, reference) ->
-//                        reference.map {
-//                            it.toDbStatusReference(status.data.statusKey, type)
-//                        }
-//                    },
-//            ),
-//    )
-// }
-//
-// internal fun createDbPagingTimelineWithStatus(
-//    accountKey: MicroBlogKey,
-//    pagingKey: String,
-//    sortId: Long,
-//    status: DbStatusWithUser,
-//    references: Map<ReferenceType, List<DbStatusWithUser>>,
-// ): DbPagingTimelineWithStatus =
-//    createDbPagingTimelineWithStatus(
-//        accountType = AccountType.Specific(accountKey),
-//        pagingKey = pagingKey,
-//        sortId = sortId,
-//        status = status,
-//        references = references,
-//    )
-//
-// private fun DbStatusWithUser.toDbStatusReference(
-//    statusKey: MicroBlogKey,
-//    referenceType: ReferenceType,
-// ): DbStatusReferenceWithStatus =
-//    DbStatusReferenceWithStatus(
-//        reference =
-//            DbStatusReference(
-//                _id = Uuid.random().toString(),
-//                referenceType = referenceType,
-//                statusKey = statusKey,
-//                referenceStatusKey = data.statusKey,
-//            ),
-//        status = this,
-//    )
+private const val SQL_IN_BATCH_SIZE = 500
+
+private suspend fun loadChangedStatuses(
+    database: CacheDatabase,
+    incoming: List<DbStatus>,
+): List<DbStatus> {
+    val existingByKey =
+        incoming
+            .groupBy { it.accountType }
+            .flatMap { (accountType, accountStatuses) ->
+                accountStatuses
+                    .map { it.statusKey }
+                    .distinct()
+                    .chunked(SQL_IN_BATCH_SIZE)
+                    .flatMap { chunk ->
+                        database.statusDao().getByKeys(statusKeys = chunk, accountType = accountType)
+                    }
+            }.associateBy { it.id }
+    return incoming.filter { status ->
+        existingByKey[status.id] != status
+    }
+}
+
+private suspend fun loadChangedTimeline(
+    database: CacheDatabase,
+    incoming: List<DbPagingTimeline>,
+): List<DbPagingTimeline> {
+    val existingByPair =
+        incoming
+            .groupBy { it.pagingKey }
+            .flatMap { (pagingKey, rows) ->
+                rows
+                    .map { it.statusKey }
+                    .distinct()
+                    .chunked(SQL_IN_BATCH_SIZE)
+                    .flatMap { chunk ->
+                        database.pagingTimelineDao().getByPagingKeyAndStatusKeys(
+                            pagingKey = pagingKey,
+                            statusKeys = chunk,
+                        )
+                    }
+            }.associateBy { it.pagingKey to it.statusKey }
+    return incoming.filter { timeline ->
+        existingByPair[timeline.pagingKey to timeline.statusKey] != timeline
+    }
+}
+
+private fun UiTimelineV2.usersInContent(): List<UiProfile> =
+    when (this) {
+        is UiTimelineV2.Post -> listOfNotNull(user)
+        is UiTimelineV2.User -> listOf(value)
+        is UiTimelineV2.UserList -> users
+        else -> emptyList()
+    }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/User.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/User.kt
index 9d1938c49..832266126 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/User.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/User.kt
@@ -29,11 +29,20 @@ internal suspend fun CacheDatabase.upsertUsers(users: List<DbUser>) {
             .firstOrNull()
             .orEmpty()
             .associateBy { it.userKey }
-    userDao().insertAll(
-        distinctUsers.map { user ->
-            existingUsers[user.userKey]?.let { user.mergeWith(it) } ?: user
-        },
-    )
+    val changedUsers =
+        distinctUsers.mapNotNull { user ->
+            val existing = existingUsers[user.userKey]
+            val merged = existing?.let { user.mergeWith(it) } ?: user
+            if (merged == existing) {
+                null
+            } else {
+                merged
+            }
+        }
+    if (changedUsers.isEmpty()) {
+        return
+    }
+    userDao().insertAll(changedUsers)
 }
 
 private fun DbUser.mergeWith(existing: DbUser): DbUser =
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbDirectMessage.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbDirectMessage.kt
index f855e9c5a..299ebf326 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbDirectMessage.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbDirectMessage.kt
@@ -2,6 +2,7 @@ package dev.dimension.flare.data.database.cache.model
 
 import androidx.room.Embedded
 import androidx.room.Entity
+import androidx.room.Index
 import androidx.room.PrimaryKey
 import androidx.room.Relation
 import androidx.room.TypeConverter
@@ -16,10 +17,13 @@ import kotlinx.serialization.Serializable
 
 @Entity(
     indices = [
-        androidx.room.Index(
+        Index(
             value = ["accountType", "roomKey"],
             unique = true,
         ),
+        Index(
+            value = ["accountType", "sortId"],
+        ),
     ],
 )
 internal data class DbDirectMessageTimeline(
@@ -50,7 +54,13 @@ internal data class DbMessageRoom(
     val messageKey: MicroBlogKey?,
 )
 
-@Entity
+@Entity(
+    indices = [
+        Index(
+            value = ["roomKey"],
+        ),
+    ],
+)
 internal data class DbMessageRoomReference(
     val roomKey: MicroBlogKey,
     val userKey: MicroBlogKey,
@@ -85,7 +95,13 @@ internal data class DbMessageRoomWithLastMessageAndUser(
     val users: List<DbMessageRoomReferenceWithUser>,
 )
 
-@Entity
+@Entity(
+    indices = [
+        Index(
+            value = ["roomKey", "timestamp"],
+        ),
+    ],
+)
 internal data class DbMessageItem(
     @PrimaryKey
     val messageKey: MicroBlogKey,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbList.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbList.kt
index 88938acce..b8859c84c 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbList.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbList.kt
@@ -41,6 +41,9 @@ internal class ListContentConverters {
 
 @Entity(
     indices = [
+        Index(
+            value = ["pagingKey"],
+        ),
         Index(
             value = ["accountType", "listKey", "pagingKey"],
             unique = true,
@@ -68,6 +71,9 @@ internal data class DbListWithContent(
 
 @Entity(
     indices = [
+        Index(
+            value = ["memberKey"],
+        ),
         Index(
             value = ["listKey", "memberKey"],
             unique = true,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbPagingTimeline.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbPagingTimeline.kt
index 5551979f0..d778840c3 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbPagingTimeline.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbPagingTimeline.kt
@@ -17,6 +17,9 @@ import kotlin.uuid.Uuid
             value = ["statusKey", "pagingKey"],
             unique = true,
         ),
+        Index(
+            value = ["pagingKey", "sortId"],
+        ),
     ],
 )
 internal data class DbPagingTimeline(
@@ -49,45 +52,6 @@ internal data class DbPagingTimelineWithStatus(
 internal data class DbStatusWithUser(
     @Embedded
     val data: DbStatus,
-    @Relation(
-        parentColumn = "statusKey",
-        entityColumn = "statusKey",
-        entity = DbStatusUserReference::class,
-    )
-    val references: List<DbStatusUserReferenceWithUser>,
-)
-
-@Entity(
-    tableName = "status_user_reference",
-    indices = [
-        Index(
-            value = [
-                "statusKey",
-                "referenceUserKey",
-            ],
-            unique = true,
-        ),
-    ],
-)
-internal data class DbStatusUserReference(
-    /**
-     * Id that being used in the database
-     */
-    @PrimaryKey
-    val _id: String,
-    val statusKey: MicroBlogKey,
-    val referenceUserKey: MicroBlogKey,
-)
-
-internal data class DbStatusUserReferenceWithUser(
-    @Embedded
-    val reference: DbStatusUserReference,
-    @Relation(
-        parentColumn = "referenceUserKey",
-        entityColumn = "userKey",
-        entity = DbUser::class,
-    )
-    val user: DbUser?,
 )
 
 internal data class DbStatusReferenceWithStatus(
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbStatusReference.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbStatusReference.kt
index b7e2d5d47..8f7e76e92 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbStatusReference.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbStatusReference.kt
@@ -9,6 +9,11 @@ import dev.dimension.flare.model.ReferenceType
 @Entity(
     tableName = "status_reference",
     indices = [
+        Index(
+            value = [
+                "statusKey",
+            ],
+        ),
         Index(
             value = [
                 "referenceType",
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbUserHistory.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbUserHistory.kt
index 2aeb72e1d..d5f4e06e3 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbUserHistory.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbUserHistory.kt
@@ -11,6 +11,7 @@ import dev.dimension.flare.model.MicroBlogKey
 @Entity(
     indices = [
         Index(value = ["userKey", "accountType"], unique = true),
+        Index(value = ["lastVisit"]),
     ],
 )
 internal data class DbUserHistory(
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandler.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandler.kt
index 0874336b9..1b6404729 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandler.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandler.kt
@@ -5,6 +5,7 @@ import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.connect
 import dev.dimension.flare.data.database.cache.mapper.saveToDatabase
 import dev.dimension.flare.data.database.cache.model.DbPagingTimeline
+import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
 import dev.dimension.flare.data.datasource.microblog.loader.PostLoader
 import dev.dimension.flare.data.datasource.microblog.paging.TimelinePagingMapper
 import dev.dimension.flare.data.repository.tryRun
@@ -13,8 +14,8 @@ import dev.dimension.flare.model.DbAccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiTimelineV2
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.launch
 import org.koin.core.component.KoinComponent
@@ -31,25 +32,6 @@ internal class PostHandler(
         val pagingKey = "post_only_$postKey"
         return Cacheable(
             fetchSource = {
-                val exists = database.pagingTimelineDao().existsPaging(accountType as DbAccountType, pagingKey)
-                if (!exists) {
-                    val status = database.statusDao().get(postKey, accountType).firstOrNull()
-                    status?.let {
-                        database.connect {
-                            database
-                                .pagingTimelineDao()
-                                .insertAll(
-                                    listOf(
-                                        DbPagingTimeline(
-                                            statusKey = postKey,
-                                            pagingKey = pagingKey,
-                                            sortId = 0,
-                                        ),
-                                    ),
-                                )
-                        }
-                    }
-                }
                 val result = loader.status(postKey)
                 database.connect {
                     val item =
@@ -61,15 +43,31 @@ internal class PostHandler(
                 }
             },
             cacheSource = {
+                val dbAccountType = accountType as DbAccountType
                 database
-                    .pagingTimelineDao()
-                    .get(pagingKey, accountType = accountType as DbAccountType)
-                    .distinctUntilChanged()
-                    .mapNotNull {
-                        it?.let {
-                            TimelinePagingMapper.toUi(it, pagingKey, false)
+                    .statusDao()
+                    .getWithReferences(postKey, dbAccountType)
+                    .combine(database.pagingTimelineDao().get(pagingKey, accountType = dbAccountType)) { status, paging ->
+                        when {
+                            paging != null -> TimelinePagingMapper.toUi(paging, pagingKey, false)
+                            status != null ->
+                                TimelinePagingMapper.toUi(
+                                    DbPagingTimelineWithStatus(
+                                        timeline =
+                                            DbPagingTimeline(
+                                                pagingKey = pagingKey,
+                                                statusKey = postKey,
+                                                sortId = 0,
+                                            ),
+                                        status = status,
+                                    ),
+                                    pagingKey,
+                                    false,
+                                )
+                            else -> null
                         }
-                    }
+                    }.distinctUntilChanged()
+                    .mapNotNull { it }
             },
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelinePagingMapper.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelinePagingMapper.kt
index 36514b9b9..9b671f89e 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelinePagingMapper.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelinePagingMapper.kt
@@ -1,20 +1,18 @@
 package dev.dimension.flare.data.datasource.microblog.paging
 
 import SnowflakeIdGenerator
-import dev.dimension.flare.data.database.cache.mapper.toDbUser
 import dev.dimension.flare.data.database.cache.model.DbPagingTimeline
 import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
 import dev.dimension.flare.data.database.cache.model.DbStatus
 import dev.dimension.flare.data.database.cache.model.DbStatusReference
 import dev.dimension.flare.data.database.cache.model.DbStatusReferenceWithStatus
-import dev.dimension.flare.data.database.cache.model.DbStatusUserReference
-import dev.dimension.flare.data.database.cache.model.DbStatusUserReferenceWithUser
 import dev.dimension.flare.data.database.cache.model.DbStatusWithReference
 import dev.dimension.flare.data.database.cache.model.DbStatusWithUser
 import dev.dimension.flare.model.DbAccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.ReferenceType
 import dev.dimension.flare.ui.model.UiTimelineV2
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlin.uuid.Uuid
 
@@ -32,7 +30,7 @@ internal object TimelinePagingMapper {
                 ),
             status =
                 DbStatusWithReference(
-                    status = uiTimelineToDbStatusWithUser(data),
+                    status = uiTimelineToDbStatusWithUser(data, sanitizePostReferences = true),
                     references =
                         when (data) {
                             is UiTimelineV2.Feed -> emptyList()
@@ -132,28 +130,39 @@ internal object TimelinePagingMapper {
 
     private fun UiTimelineV2.Post.resolveReferences(references: List<Pair<ReferenceType, UiTimelineV2>>): UiTimelineV2.Post =
         copy(
-            parents =
-                parents
-                    .map { parent ->
-                        references
-                            .find { it.first == ReferenceType.Reply && it.second.statusKey == parent.statusKey }
-                            ?.second as? UiTimelineV2.Post ?: parent
-                    }.toImmutableList(),
-            quote =
-                quote
-                    .map { quote ->
-                        references
-                            .find { it.first == ReferenceType.Quote && it.second.statusKey == quote.statusKey }
-                            ?.second as? UiTimelineV2.Post ?: quote
-                    }.toImmutableList(),
+            parents = resolveReferencePosts(ReferenceType.Reply, references, parents),
+            quote = resolveReferencePosts(ReferenceType.Quote, references, quote),
             internalRepost =
-                internalRepost?.let { repost ->
-                    references
-                        .find { it.first == ReferenceType.Retweet && it.second.statusKey == repost.statusKey }
-                        ?.second as? UiTimelineV2.Post ?: repost
-                },
+                resolveReferencePosts(
+                    type = ReferenceType.Retweet,
+                    references = references,
+                    current = internalRepost?.let(::listOf).orEmpty(),
+                ).firstOrNull(),
         )
 
+    private fun UiTimelineV2.Post.resolveReferencePosts(
+        type: ReferenceType,
+        references: List<Pair<ReferenceType, UiTimelineV2>>,
+        current: List<UiTimelineV2.Post>,
+    ) = if (current.isNotEmpty()) {
+        current
+            .map { currentPost ->
+                references
+                    .find { it.first == type && it.second.statusKey == currentPost.statusKey }
+                    ?.second as? UiTimelineV2.Post ?: currentPost
+            }.toImmutableList()
+    } else {
+        this.references
+            .asSequence()
+            .filter { it.type == type }
+            .mapNotNull { reference ->
+                references
+                    .find { it.first == type && it.second.statusKey == reference.statusKey }
+                    ?.second as? UiTimelineV2.Post
+            }.toList()
+            .toImmutableList()
+    }
+
     private fun uiTimelineToDbStatusReferenceWithStatus(
         data: UiTimelineV2,
         referenceType: ReferenceType,
@@ -166,43 +175,60 @@ internal object TimelinePagingMapper {
                 referenceStatusKey = data.statusKey,
                 _id = Uuid.random().toString(),
             ),
-        status = uiTimelineToDbStatusWithUser(data),
+        status = uiTimelineToDbStatusWithUser(data, sanitizePostReferences = false),
     )
 
-    private fun uiTimelineToDbStatusWithUser(data: UiTimelineV2): DbStatusWithUser {
-        val user =
-            if (data is UiTimelineV2.Post) {
-                listOfNotNull(data.user)
-            } else if (data is UiTimelineV2.User) {
-                listOfNotNull(data.value)
-            } else if (data is UiTimelineV2.UserList) {
-                data.users
-            } else {
-                emptyList()
-            }
-        return DbStatusWithUser(
+    private fun uiTimelineToDbStatusWithUser(
+        data: UiTimelineV2,
+        sanitizePostReferences: Boolean,
+    ): DbStatusWithUser =
+        DbStatusWithUser(
             data =
                 DbStatus(
                     statusKey = data.statusKey,
-                    content = data,
+                    content = if (sanitizePostReferences) data.sanitizeForDatabase() else data,
                     accountType = data.accountType as DbAccountType,
                     text = data.searchText,
                 ),
-            references =
-                user.map {
-                    DbStatusUserReferenceWithUser(
-                        reference =
-                            DbStatusUserReference(
-                                statusKey = data.statusKey,
-                                referenceUserKey = it.key,
-                                _id = Uuid.random().toString(),
-                            ),
-                        user =
-                            it.toDbUser(),
-                    )
-                },
         )
-    }
+
+    private fun UiTimelineV2.sanitizeForDatabase(): UiTimelineV2 =
+        when (this) {
+            is UiTimelineV2.Post ->
+                copy(
+                    references = directReferences(),
+                    quote = persistentListOf(),
+                    parents = persistentListOf(),
+                    internalRepost = null,
+                )
+            else -> this
+        }
+
+    private fun UiTimelineV2.Post.directReferences() =
+        (
+            references +
+                quote.map {
+                    UiTimelineV2.Post.Reference(
+                        statusKey = it.statusKey,
+                        type = ReferenceType.Quote,
+                    )
+                } +
+                parents.map {
+                    UiTimelineV2.Post.Reference(
+                        statusKey = it.statusKey,
+                        type = ReferenceType.Reply,
+                    )
+                } +
+                listOfNotNull(
+                    internalRepost?.let {
+                        UiTimelineV2.Post.Reference(
+                            statusKey = it.statusKey,
+                            type = ReferenceType.Retweet,
+                        )
+                    },
+                )
+        ).distinctBy { it.type to it.statusKey }
+            .toImmutableList()
 
     private fun dbStatusWithUserToUiTimeline(
         data: DbStatusWithUser,
@@ -210,31 +236,22 @@ internal object TimelinePagingMapper {
         useDbKeyInItemKey: Boolean,
     ): UiTimelineV2 {
         val root = data.data.content
-        val users = data.references.mapNotNull { it.user?.content }
         return when (root) {
             is UiTimelineV2.Feed -> root
             is UiTimelineV2.Message ->
                 root.copy(
-                    user = users.find { root.user?.key == it.key } ?: root.user,
                     extraKey = if (useDbKeyInItemKey) pagingKey else null,
                 )
             is UiTimelineV2.Post ->
                 root.copy(
-                    user = users.find { root.user?.key == it.key } ?: root.user,
                     extraKey = if (useDbKeyInItemKey) pagingKey else null,
                 )
             is UiTimelineV2.User ->
                 root.copy(
-                    value = users.find { root.value.key == it.key } ?: root.value,
                     extraKey = if (useDbKeyInItemKey) pagingKey else null,
                 )
             is UiTimelineV2.UserList ->
                 root.copy(
-                    users =
-                        root.users
-                            .map { user ->
-                                users.find { user.key == it.key } ?: user
-                            }.toImmutableList(),
                     extraKey = if (useDbKeyInItemKey) pagingKey else null,
                 )
         }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
index c06a2f634..1245c4a87 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
@@ -6,6 +6,7 @@ import dev.dimension.flare.data.datasource.microblog.ActionMenu
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
+import dev.dimension.flare.model.ReferenceType
 import dev.dimension.flare.ui.model.mapper.fromRss
 import dev.dimension.flare.ui.render.UiDateTime
 import dev.dimension.flare.ui.render.UiRichText
@@ -185,6 +186,7 @@ public sealed class UiTimelineV2 {
         val sensitive: Boolean,
         val contentWarning: UiRichText?,
         val user: UiProfile?,
+        @Transient
         val quote: SerializableImmutableList<Post> = persistentListOf(),
         val content: UiRichText,
         val actions: SerializableImmutableList<ActionMenu>,
@@ -196,7 +198,10 @@ public sealed class UiTimelineV2 {
         val sourceChannel: SourceChannel? = null,
         val visibility: Visibility? = null,
         val replyToHandle: String? = null,
+        internal val references: SerializableImmutableList<Reference> = persistentListOf(),
+        @Transient
         val parents: SerializableImmutableList<Post> = persistentListOf(),
+        @Transient
         internal val internalRepost: Post? = null,
         internal val clickEvent: ClickEvent,
         override val extraKey: String? = null,
@@ -272,6 +277,13 @@ public sealed class UiTimelineV2 {
             }
         }
 
+        @Serializable
+        @Immutable
+        internal data class Reference internal constructor(
+            val statusKey: MicroBlogKey,
+            val type: ReferenceType,
+        )
+
         @Serializable
         public enum class Visibility {
             Public,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt
index bef03d649..b0b688bf9 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/TimelinePresenter.kt
@@ -28,12 +28,15 @@ import dev.dimension.flare.data.repository.LocalFilterRepository
 import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.presenter.PresenterBase
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.IO
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.withContext
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
@@ -104,8 +107,10 @@ public abstract class TimelinePresenter :
                 )
             },
         ).flow.map { pagingData ->
-            pagingData.map { item ->
-                TimelinePagingMapper.toUi(item, loader.pagingKey, useDbKeyInItemKey)
+            withContext(Dispatchers.IO) {
+                pagingData.map { item ->
+                    TimelinePagingMapper.toUi(item, loader.pagingKey, useDbKeyInItemKey)
+                }
             }
         }
 
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt
index 3bdc071f6..dc78e3af8 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt
@@ -96,6 +96,93 @@ class MicroblogTest : RobolectricTest() {
             kotlin.test.assertTrue(savedStatus.text.contains("status text"))
         }
 
+    @Test
+    fun saveToDatabaseUpdatesUserWhenUserChanged() =
+        runTest {
+            val accountKey = MicroBlogKey(id = "account", host = "test.com")
+            val statusKey = MicroBlogKey(id = "status-user-update", host = "test.com")
+            val userKey = MicroBlogKey(id = "user-update", host = "test.com")
+            val initialUser = createUser(userKey, "Old Name")
+            val updatedUser = createUser(userKey, "New Name")
+
+            saveToDatabase(
+                db,
+                listOf(
+                    TimelinePagingMapper.toDb(
+                        createPost(
+                            accountKey = accountKey,
+                            user = initialUser,
+                            statusKey = statusKey,
+                            text = "status text",
+                        ),
+                        pagingKey = "home",
+                    ),
+                ),
+            )
+
+            saveToDatabase(
+                db,
+                listOf(
+                    TimelinePagingMapper.toDb(
+                        createPost(
+                            accountKey = accountKey,
+                            user = updatedUser,
+                            statusKey = statusKey,
+                            text = "status text",
+                        ),
+                        pagingKey = "home",
+                    ),
+                ),
+            )
+
+            val savedUser = db.userDao().findByKey(userKey).first()
+            assertNotNull(savedUser)
+            assertEquals("New Name", savedUser.content.name.raw)
+        }
+
+    @Test
+    fun saveToDatabaseUpdatesStatusWhenStatusChanged() =
+        runTest {
+            val accountKey = MicroBlogKey(id = "account", host = "test.com")
+            val statusKey = MicroBlogKey(id = "status-update", host = "test.com")
+            val user = createUser(MicroBlogKey(id = "status-update-user", host = "test.com"), "Status User")
+
+            saveToDatabase(
+                db,
+                listOf(
+                    TimelinePagingMapper.toDb(
+                        createPost(
+                            accountKey = accountKey,
+                            user = user,
+                            statusKey = statusKey,
+                            text = "old status text",
+                        ),
+                        pagingKey = "home",
+                    ),
+                ),
+            )
+
+            saveToDatabase(
+                db,
+                listOf(
+                    TimelinePagingMapper.toDb(
+                        createPost(
+                            accountKey = accountKey,
+                            user = user,
+                            statusKey = statusKey,
+                            text = "new status text",
+                        ),
+                        pagingKey = "home",
+                    ),
+                ),
+            )
+
+            val savedStatus = db.statusDao().get(statusKey, AccountType.Specific(accountKey)).first()
+            assertNotNull(savedStatus)
+            requireNotNull(savedStatus.text)
+            assertTrue(savedStatus.text.contains("new status text"))
+        }
+
     @Test
     fun saveToDatabasePersistsReferences() =
         runTest {
@@ -125,6 +212,11 @@ class MicroblogTest : RobolectricTest() {
 
             val savedMainStatus = db.statusDao().get(mainPost.statusKey, AccountType.Specific(accountKey)).first()
             assertNotNull(savedMainStatus)
+            val savedMainPost = assertIs<UiTimelineV2.Post>(savedMainStatus.content)
+            assertTrue(savedMainPost.parents.isEmpty())
+            assertEquals(1, savedMainPost.references.size)
+            assertEquals(ReferenceType.Reply, savedMainPost.references.first().type)
+            assertEquals(refPost.statusKey, savedMainPost.references.first().statusKey)
             val savedRefStatus = db.statusDao().get(refPost.statusKey, AccountType.Specific(accountKey)).first()
             assertNotNull(savedRefStatus)
 
@@ -133,6 +225,59 @@ class MicroblogTest : RobolectricTest() {
             assertEquals(refPost.statusKey, savedReferences.first().referenceStatusKey)
         }
 
+    @Test
+    fun saveToDatabaseStillPersistsUsersForPostUserAndUserListTimeline() =
+        runTest {
+            val accountKey = MicroBlogKey(id = "account", host = "test.com")
+            val firstUser = createUser(MicroBlogKey(id = "user-1", host = "test.com"), "First User")
+            val secondUser = createUser(MicroBlogKey(id = "user-2", host = "test.com"), "Second User")
+            val postUser = createUser(MicroBlogKey(id = "user-3", host = "test.com"), "Post User")
+
+            val userTimeline =
+                UiTimelineV2.User(
+                    message = null,
+                    value = firstUser,
+                    createdAt = Clock.System.now().toUi(),
+                    statusKey = MicroBlogKey(id = "timeline-user", host = "test.com"),
+                    accountType = AccountType.Specific(accountKey),
+                )
+            val userListTimeline =
+                UiTimelineV2.UserList(
+                    message = null,
+                    users = persistentListOf(firstUser, secondUser),
+                    createdAt = Clock.System.now().toUi(),
+                    statusKey = MicroBlogKey(id = "timeline-user-list", host = "test.com"),
+                    post = null,
+                    accountType = AccountType.Specific(accountKey),
+                )
+            val postTimeline =
+                createPost(
+                    accountKey = accountKey,
+                    user = postUser,
+                    statusKey = MicroBlogKey(id = "timeline-post", host = "test.com"),
+                    text = "post timeline",
+                )
+
+            saveToDatabase(
+                db,
+                listOf(
+                    TimelinePagingMapper.toDb(postTimeline, pagingKey = "home"),
+                    TimelinePagingMapper.toDb(userTimeline, pagingKey = "home"),
+                    TimelinePagingMapper.toDb(userListTimeline, pagingKey = "home"),
+                ),
+            )
+
+            val savedFirst = db.userDao().findByKey(firstUser.key).first()
+            val savedSecond = db.userDao().findByKey(secondUser.key).first()
+            val savedPostUser = db.userDao().findByKey(postUser.key).first()
+            assertNotNull(savedFirst)
+            assertNotNull(savedSecond)
+            assertNotNull(savedPostUser)
+            assertEquals("First User", savedFirst.content.name.raw)
+            assertEquals("Second User", savedSecond.content.name.raw)
+            assertEquals("Post User", savedPostUser.content.name.raw)
+        }
+
     @Test
     fun referencesRemainWhenSubsequentInsertHasNoReferences() =
         runTest {
@@ -173,7 +318,7 @@ class MicroblogTest : RobolectricTest() {
         }
 
     @Test
-    fun postContentParentsRemainWhenSubsequentInsertHasNoParents() =
+    fun postContentReplyReferencesRemainWhenSubsequentInsertHasNoParents() =
         runTest {
             val accountKey = MicroBlogKey(id = "account", host = "test.com")
 
@@ -202,8 +347,9 @@ class MicroblogTest : RobolectricTest() {
 
             val saved = db.statusDao().get(withParents.statusKey, AccountType.Specific(accountKey)).first()
             val savedPost = assertIs<UiTimelineV2.Post>(assertNotNull(saved).content)
-            assertEquals(1, savedPost.parents.size)
-            assertEquals(refPost.statusKey, savedPost.parents.first().statusKey)
+            assertTrue(savedPost.parents.isEmpty())
+            assertEquals(1, savedPost.references.size)
+            assertEquals(refPost.statusKey, savedPost.references.first().statusKey)
         }
 
     @Test
@@ -338,6 +484,50 @@ class MicroblogTest : RobolectricTest() {
             assertEquals(UiTimelineV2.Message.Type.Localized.MessageId.Repost, type.data)
         }
 
+    @Test
+    fun toUiUsesEmbeddedUserDataWithoutReadingUserJoin() =
+        runTest {
+            val accountKey = MicroBlogKey(id = "account", host = "test.com")
+            val user = createUser(MicroBlogKey(id = "user-join", host = "test.com"), "Embedded User")
+            val post =
+                createPost(
+                    accountKey = accountKey,
+                    user = user,
+                    statusKey = MicroBlogKey(id = "status-join", host = "test.com"),
+                    text = "post content",
+                )
+
+            val mapped = TimelinePagingMapper.toDb(post, pagingKey = "home")
+            saveToDatabase(db, listOf(mapped))
+
+            val overwrittenUser =
+                user.copy(
+                    nameInternal = Element("span").apply { appendText("Joined User") }.toUi(),
+                )
+            db.userDao().insert(overwrittenUser.toDbUser())
+
+            val paging = db.pagingTimelineDao().getPagingSource("home")
+            val pager = TestPager(config = PagingConfig(pageSize = 20), paging)
+            val refreshResult = pager.refresh()
+            val page = assertIs<PagingSource.LoadResult.Page<Int, DbPagingTimelineWithStatus>>(refreshResult)
+            val dbItem =
+                assertNotNull(
+                    page.data.firstOrNull {
+                        it.status.status.data.statusKey == post.statusKey
+                    },
+                )
+
+            val rendered =
+                assertIs<UiTimelineV2.Post>(
+                    TimelinePagingMapper.toUi(
+                        dbItem,
+                        pagingKey = "home",
+                        useDbKeyInItemKey = false,
+                    ),
+                )
+            assertEquals("Embedded User", rendered.user?.name?.raw)
+        }
+
     @Test
     fun toUiFlattensInternalRepostButKeepsReferencePayload() =
         runTest {
@@ -382,6 +572,12 @@ class MicroblogTest : RobolectricTest() {
             val savedRepost = db.statusDao().get(repostPost.statusKey, AccountType.Specific(accountKey)).first()
             assertNotNull(savedWrapper)
             assertNotNull(savedRepost)
+            val savedWrapperPost = assertIs<UiTimelineV2.Post>(savedWrapper.content)
+            assertTrue(savedWrapperPost.quote.isEmpty())
+            assertTrue(savedWrapperPost.parents.isEmpty())
+            kotlin.test.assertNull(savedWrapperPost.internalRepost)
+            assertEquals(1, savedWrapperPost.references.size)
+            assertEquals(ReferenceType.Retweet, savedWrapperPost.references.first().type)
 
             val roundTrip = TimelinePagingMapper.toUi(mapped, pagingKey = "home", useDbKeyInItemKey = false)
             val rendered = assertIs<UiTimelineV2.Post>(roundTrip)
@@ -694,6 +890,7 @@ class MicroblogTest : RobolectricTest() {
             sourceChannel = null,
             visibility = null,
             replyToHandle = null,
+            references = persistentListOf(),
             parents = parents.toPersistentList(),
             clickEvent = ClickEvent.Noop,
             accountType = AccountType.Specific(accountKey),
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/PostEventHandlerTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/PostEventHandlerTest.kt
index 3619bd9f0..949d9fe56 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/PostEventHandlerTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/PostEventHandlerTest.kt
@@ -236,6 +236,7 @@ class PostEventHandlerTest : RobolectricTest() {
             sourceChannel = null,
             visibility = null,
             replyToHandle = null,
+            references = persistentListOf(),
             parents = persistentListOf(),
             clickEvent = ClickEvent.Noop,
             accountType = AccountType.Specific(accountKey),
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandlerTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandlerTest.kt
index f61ad0318..ab8d807ab 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandlerTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostHandlerTest.kt
@@ -7,14 +7,17 @@ import dev.dimension.flare.RobolectricTest
 import dev.dimension.flare.common.CacheState
 import dev.dimension.flare.common.TestFormatter
 import dev.dimension.flare.data.database.cache.CacheDatabase
+import dev.dimension.flare.data.database.cache.mapper.saveToDatabase
 import dev.dimension.flare.data.database.cache.model.DbPagingTimeline
 import dev.dimension.flare.data.database.cache.model.DbStatus
 import dev.dimension.flare.data.database.cache.model.DbStatusReference
 import dev.dimension.flare.data.datasource.microblog.loader.PostLoader
+import dev.dimension.flare.data.datasource.microblog.paging.TimelinePagingMapper
 import dev.dimension.flare.memoryDatabaseBuilder
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
+import dev.dimension.flare.model.ReferenceType
 import dev.dimension.flare.ui.humanizer.PlatformFormatter
 import dev.dimension.flare.ui.model.ClickEvent
 import dev.dimension.flare.ui.model.UiTimelineV2
@@ -109,6 +112,92 @@ class PostHandlerTest : RobolectricTest() {
             assertTrue(pagingExists)
         }
 
+    @Test
+    fun postUsesLocalStatusCacheBeforeRefreshCreatesPagingRow() =
+        runTest {
+            startKoin {
+                modules(
+                    module {
+                        single { db }
+                        single<CoroutineScope> { this@runTest }
+                        single<PlatformFormatter> { TestFormatter() }
+                    },
+                )
+            }
+
+            val local = createPost(statusKey = postKey)
+            db.statusDao().insert(
+                DbStatus(
+                    statusKey = postKey,
+                    accountType = accountType,
+                    content = local,
+                    text = "text",
+                ),
+            )
+
+            val handler = PostHandler(accountType = accountType, loader = fakeLoader)
+            val cacheable = handler.post(postKey)
+
+            val cached =
+                cacheable.data
+                    .filterIsInstance<CacheState.Success<UiTimelineV2>>()
+                    .first()
+                    .data
+
+            assertEquals(postKey, cached.statusKey)
+            assertEquals(0, fakeLoader.statusCallCount)
+        }
+
+    @Test
+    fun postUsesInnerRepostWhenOnlyLocalStatusCacheExists() =
+        runTest {
+            startKoin {
+                modules(
+                    module {
+                        single { db }
+                        single<CoroutineScope> { this@runTest }
+                        single<PlatformFormatter> { TestFormatter() }
+                    },
+                )
+            }
+
+            val repostKey = MicroBlogKey(id = "repost-1", host = "test.social")
+            val repost = createPost(statusKey = repostKey)
+            val wrapper =
+                createPost(statusKey = postKey).copy(
+                    content = Element("span").apply { appendText("wrapper content") }.toUi(),
+                    internalRepost = repost,
+                )
+
+            saveToDatabase(
+                db,
+                listOf(
+                    TimelinePagingMapper.toDb(
+                        wrapper,
+                        pagingKey = "post_only_$postKey",
+                    ),
+                ),
+            )
+            db.pagingTimelineDao().delete("post_only_$postKey")
+
+            val handler = PostHandler(accountType = accountType, loader = fakeLoader)
+            val cacheable = handler.post(postKey)
+
+            val cached =
+                cacheable.data
+                    .filterIsInstance<CacheState.Success<UiTimelineV2>>()
+                    .first()
+                    .data
+
+            val cachedPost = assertNotNull(cached as? UiTimelineV2.Post)
+            val internalRepost = assertNotNull(cachedPost.internalRepost)
+            assertEquals(postKey, cachedPost.statusKey)
+            assertEquals(repostKey, internalRepost.statusKey)
+            assertEquals(repost.content.raw, cachedPost.content.raw)
+            assertEquals(repost.user?.key, cachedPost.user?.key)
+            assertEquals(0, fakeLoader.statusCallCount)
+        }
+
     @Test
     fun postRefreshKeepsLocalParentsWhenRemoteParentsIsEmpty() =
         runTest {
@@ -123,7 +212,16 @@ class PostHandlerTest : RobolectricTest() {
             }
 
             val parentKey = MicroBlogKey(id = "parent-1", host = "test.social")
-            val localWithParents = createPost(statusKey = postKey, parents = persistentListOf(createPost(statusKey = parentKey)))
+            val localWithParents =
+                createPost(statusKey = postKey).copy(
+                    references =
+                        persistentListOf(
+                            UiTimelineV2.Post.Reference(
+                                statusKey = parentKey,
+                                type = ReferenceType.Reply,
+                            ),
+                        ),
+                )
             db.statusDao().insert(
                 DbStatus(
                     statusKey = postKey,
@@ -142,8 +240,8 @@ class PostHandlerTest : RobolectricTest() {
             val savedStatus = db.statusDao().get(postKey, accountType).first()
             val savedPost = savedStatus?.content as? UiTimelineV2.Post
             assertNotNull(savedPost)
-            assertEquals(1, savedPost.parents.size)
-            assertEquals(parentKey, savedPost.parents.first().statusKey)
+            assertEquals(1, savedPost.references.size)
+            assertEquals(parentKey, savedPost.references.first().statusKey)
         }
 
     @Test
@@ -161,7 +259,16 @@ class PostHandlerTest : RobolectricTest() {
 
             val localParentKey = MicroBlogKey(id = "local-parent", host = "test.social")
             val remoteParentKey = MicroBlogKey(id = "remote-parent", host = "test.social")
-            val local = createPost(statusKey = postKey, parents = persistentListOf(createPost(statusKey = localParentKey)))
+            val local =
+                createPost(statusKey = postKey).copy(
+                    references =
+                        persistentListOf(
+                            UiTimelineV2.Post.Reference(
+                                statusKey = localParentKey,
+                                type = ReferenceType.Reply,
+                            ),
+                        ),
+                )
             db.statusDao().insert(
                 DbStatus(
                     statusKey = postKey,
@@ -180,8 +287,8 @@ class PostHandlerTest : RobolectricTest() {
             val savedStatus = db.statusDao().get(postKey, accountType).first()
             val savedPost = savedStatus?.content as? UiTimelineV2.Post
             assertNotNull(savedPost)
-            assertEquals(1, savedPost.parents.size)
-            assertEquals(remoteParentKey, savedPost.parents.first().statusKey)
+            assertEquals(1, savedPost.references.size)
+            assertEquals(remoteParentKey, savedPost.references.first().statusKey)
         }
 
     @Test
@@ -306,6 +413,7 @@ class PostHandlerTest : RobolectricTest() {
             sourceChannel = null,
             visibility = null,
             replyToHandle = null,
+            references = persistentListOf(),
             parents = parents,
             clickEvent = ClickEvent.Noop,
             accountType = accountType,
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/RelationHandlerTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/RelationHandlerTest.kt
index e06e6590b..ba08157b7 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/RelationHandlerTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/RelationHandlerTest.kt
@@ -7,6 +7,7 @@ import dev.dimension.flare.RobolectricTest
 import dev.dimension.flare.common.CacheState
 import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.model.DbUserRelation
+import dev.dimension.flare.data.datasource.microblog.loader.RelationActionType
 import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
 import dev.dimension.flare.memoryDatabaseBuilder
 import dev.dimension.flare.model.MicroBlogKey
@@ -48,7 +49,7 @@ class RelationHandlerTest : RobolectricTest() {
                 .setQueryCoroutineContext(Dispatchers.Unconfined)
                 .build()
 
-        loader = FakeRelationLoader(accountKey = accountKey)
+        loader = FakeRelationLoader(accountKey = accountKey, supportedTypes = RelationActionType.entries.toSet())
     }
 
     @AfterTest
@@ -193,6 +194,7 @@ class RelationHandlerTest : RobolectricTest() {
 
     private class FakeRelationLoader(
         override val accountKey: MicroBlogKey,
+        override val supportedTypes: Set<RelationActionType>,
     ) : RelationLoader {
         var nextRelation: UiRelation = UiRelation()
         var relationCallCount: Int = 0
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/XQTRenderTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/XQTRenderTest.kt
index d7a56a283..fa279d45d 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/XQTRenderTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/ui/model/mapper/XQTRenderTest.kt
@@ -216,6 +216,33 @@ class XQTRenderTest {
         )
     }
 
+    @Test
+    fun repostMessageUserComesFromWrapperTweetUser() {
+        val original =
+            createTweet(
+                id = "2029481529815253017",
+                user = createUser("3656078773", "papeushikaeru"),
+                text = "恋人の聖地に行った時の写真です",
+            )
+        val repostWrapper =
+            createTweet(
+                id = "2029691916246515890",
+                user = createUser("128843027", "Moo_YOSHIO"),
+                text = "RT @papeushikaeru: 恋人の聖地に行った時の写真です",
+                retweetedStatus = original,
+            )
+
+        val rendered = assertIs<UiTimelineV2.Post>(createTimeline(repostWrapper).render(accountKey))
+        val message = assertNotNull(rendered.message)
+        val repostInternal = assertNotNull(rendered.internalRepost)
+
+        assertEquals("128843027", rendered.user?.key?.id)
+        assertEquals("128843027", message.user?.key?.id)
+        assertEquals("3656078773", repostInternal.user?.key?.id)
+        assertEquals("2029691916246515890", rendered.statusKey.id)
+        assertEquals("2029481529815253017", repostInternal.statusKey.id)
+    }
+
     private fun createTimeline(
         tweet: Tweet,
         parents: List<XQTTimeline> = emptyList(),

From 3cfb7f298d1a2eb9b884099959a377e0e1b85355 Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Fri, 6 Mar 2026 23:10:37 +0900
Subject: [PATCH 28/33] update ios text rendering

---
 .../flare/ui/controllers/ComposeUIHelper.kt   |   5 +
 .../flare/Common/PlatformTextRenderer.swift   | 230 ++++++++++++++++++
 iosApp/flare/FlareApp.swift                   |   1 +
 iosApp/flare/UI/Component/RichText.swift      | 189 ++------------
 .../Status/StatusTopMessageView.swift         |   2 +
 .../flare/ui/render/UiRichText.androidJvm.kt  |   5 +
 .../flare/ui/render/UiRichText.apple.kt       |  15 ++
 .../microblog/paging/TimelinePagingMapper.kt  |  79 +++---
 .../dimension/flare/ui/render/UiRichText.kt   |  20 +-
 .../database/cache/mapper/MicroblogTest.kt    |  86 ++++++-
 10 files changed, 429 insertions(+), 203 deletions(-)
 create mode 100644 iosApp/flare/Common/PlatformTextRenderer.swift

diff --git a/compose-ui/src/iosMain/kotlin/dev/dimension/flare/ui/controllers/ComposeUIHelper.kt b/compose-ui/src/iosMain/kotlin/dev/dimension/flare/ui/controllers/ComposeUIHelper.kt
index 07627503f..e4340dcf1 100644
--- a/compose-ui/src/iosMain/kotlin/dev/dimension/flare/ui/controllers/ComposeUIHelper.kt
+++ b/compose-ui/src/iosMain/kotlin/dev/dimension/flare/ui/controllers/ComposeUIHelper.kt
@@ -11,6 +11,7 @@ import dev.dimension.flare.common.SwiftOnDeviceAI
 import dev.dimension.flare.data.network.ktorClient
 import dev.dimension.flare.di.KoinHelper
 import dev.dimension.flare.ui.humanizer.SwiftFormatter
+import dev.dimension.flare.ui.render.SwiftPlatformTextRenderer
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -24,6 +25,7 @@ public object ComposeUIHelper {
     public fun initialize(
         inAppNotification: InAppNotification,
         swiftFormatter: SwiftFormatter,
+        swiftPlatformTextRenderer: SwiftPlatformTextRenderer,
         swiftOnDeviceAI: SwiftOnDeviceAI,
     ) {
         startKoin {
@@ -39,6 +41,9 @@ public object ComposeUIHelper {
                     single {
                         swiftOnDeviceAI
                     } bind SwiftOnDeviceAI::class
+                    single {
+                        swiftPlatformTextRenderer
+                    } bind SwiftPlatformTextRenderer::class
                 },
             )
             modules(dev.dimension.flare.di.composeUiModule)
diff --git a/iosApp/flare/Common/PlatformTextRenderer.swift b/iosApp/flare/Common/PlatformTextRenderer.swift
new file mode 100644
index 000000000..515c24431
--- /dev/null
+++ b/iosApp/flare/Common/PlatformTextRenderer.swift
@@ -0,0 +1,230 @@
+import SwiftUI
+@preconcurrency import KotlinSharedUI
+
+class PlatformTextContent: NSObject {}
+
+final class PlatformTextTextContent: PlatformTextContent {
+    let runs: [PlatformTextRun]
+
+    init(runs: [PlatformTextRun]) {
+        self.runs = runs
+        super.init()
+    }
+}
+
+final class PlatformTextBlockImageContent: PlatformTextContent {
+    let url: String
+    let href: String?
+
+    init(url: String, href: String?) {
+        self.url = url
+        self.href = href
+        super.init()
+    }
+}
+
+class PlatformTextRun: NSObject {}
+
+final class PlatformTextAttributedRun: PlatformTextRun {
+    let text: AttributedString
+
+    init(text: AttributedString) {
+        self.text = text
+        super.init()
+    }
+}
+
+final class PlatformTextImageRun: PlatformTextRun {
+    let url: String
+    let alt: String
+
+    init(url: String, alt: String) {
+        self.url = url
+        self.alt = alt
+        super.init()
+    }
+}
+
+final class PlatformTextRenderer: SwiftPlatformTextRenderer {
+    static let shared = PlatformTextRenderer()
+
+    private init() {}
+
+    func render(richText: UiRichText) -> [Any] {
+        let context = RenderContext()
+
+        func renderNode(_ node: KsoupNode) {
+            if let element = node as? KsoupElement {
+                renderElement(element)
+            } else if let textNode = node as? KsoupTextNode {
+                context.appendAttributedText(
+                    AttributedString(
+                        textNode.text(),
+                        attributes: context.attributeContainer
+                    )
+                )
+            }
+        }
+
+        func renderChildren(of element: KsoupElement) {
+            element.childNodes().forEach { renderNode($0) }
+        }
+
+        func renderElement(_ element: KsoupElement) {
+            switch element.tagName().lowercased() {
+            case "a":
+                let href = element.attribute(key: "href")?.value ?? ""
+                context.withAttributes {
+                    $0.link = URL(string: href)
+                } render: {
+                    renderChildren(of: element)
+                }
+            case "strong", "b":
+                context.withAttributes {
+                    $0.font = .system(size: UIFont.systemFontSize, weight: .bold)
+                } render: {
+                    renderChildren(of: element)
+                }
+            case "em", "i":
+                context.withAttributes {
+                    $0.font = .system(size: UIFont.systemFontSize, weight: .regular).italic()
+                } render: {
+                    renderChildren(of: element)
+                }
+            case "br":
+                context.appendAttributedText(
+                    AttributedString(
+                        "\n",
+                        attributes: context.attributeContainer
+                    )
+                )
+            case "p", "div":
+                renderChildren(of: element)
+                if element.parent()?.childNodes().last != element {
+                    context.appendAttributedText(
+                        AttributedString(
+                            "\n\n",
+                            attributes: context.attributeContainer
+                        )
+                    )
+                }
+            case "span":
+                renderChildren(of: element)
+            case "del", "s":
+                context.withAttributes {
+                    $0.strikethroughStyle = .single
+                } render: {
+                    renderChildren(of: element)
+                }
+            case "code":
+                context.withAttributes {
+                    $0.font = .system(.body, design: .monospaced)
+                } render: {
+                    renderChildren(of: element)
+                }
+            case "blockquote":
+                context.withAttributes {
+                    $0.font = .system(size: UIFont.systemFontSize, weight: .regular).italic()
+                    $0.foregroundColor = .secondary
+                } render: {
+                    renderChildren(of: element)
+                }
+            case "u":
+                context.withAttributes {
+                    $0.underlineStyle = .single
+                } render: {
+                    renderChildren(of: element)
+                }
+            case "small":
+                context.withAttributes {
+                    $0.font = .system(size: UIFont.smallSystemFontSize)
+                } render: {
+                    renderChildren(of: element)
+                }
+            case "emoji":
+                context.appendImage(
+                    url: element.attribute(key: "target")?.value ?? "",
+                    alt: element.attribute(key: "alt")?.value ?? ""
+                )
+            case "figure":
+                context.pushBlockState()
+                renderChildren(of: element)
+                context.popBlockState()
+            case "img":
+                let src = element.attribute(key: "src")?.value ?? ""
+                if context.isInBlockState {
+                    context.appendBlockImage(
+                        url: src,
+                        href: element.attribute(key: "href")?.value
+                    )
+                } else {
+                    context.appendImage(
+                        url: src,
+                        alt: element.attribute(key: "alt")?.value ?? ""
+                    )
+                }
+            default:
+                renderChildren(of: element)
+            }
+        }
+
+        renderElement(richText.data)
+        context.flushTextContent()
+        return context.contents
+    }
+}
+
+private final class RenderContext {
+    var contents: [PlatformTextContent] = []
+    var currentRuns: [PlatformTextRun] = []
+    var attributedString = AttributedString()
+    var attributeContainer = AttributeContainer()
+    private(set) var isInBlockState = false
+
+    func appendAttributedText(_ text: AttributedString) {
+        attributedString = attributedString + text
+    }
+
+    func appendImage(url: String, alt: String) {
+        commitAttributedString()
+        currentRuns.append(PlatformTextImageRun(url: url, alt: alt))
+    }
+
+    func appendBlockImage(url: String, href: String?) {
+        flushTextContent()
+        contents.append(PlatformTextBlockImageContent(url: url, href: href))
+    }
+
+    func flushTextContent() {
+        commitAttributedString()
+        guard !currentRuns.isEmpty else { return }
+        contents.append(PlatformTextTextContent(runs: currentRuns))
+        currentRuns = []
+    }
+
+    func pushBlockState() {
+        isInBlockState = true
+    }
+
+    func popBlockState() {
+        isInBlockState = false
+    }
+
+    func withAttributes(
+        _ update: (inout AttributeContainer) -> Void,
+        render: () -> Void
+    ) {
+        let currentAttributes = attributeContainer
+        var nextAttributes = currentAttributes
+        update(&nextAttributes)
+        attributeContainer = nextAttributes
+        render()
+        attributeContainer = currentAttributes
+    }
+
+    private func commitAttributedString() {
+        guard attributedString.characters.count > 0 else { return }
+        currentRuns.append(PlatformTextAttributedRun(text: attributedString))
+        attributedString = AttributedString()
+    }
+}
diff --git a/iosApp/flare/FlareApp.swift b/iosApp/flare/FlareApp.swift
index 4047a583d..402013123 100644
--- a/iosApp/flare/FlareApp.swift
+++ b/iosApp/flare/FlareApp.swift
@@ -9,6 +9,7 @@ struct FlareApp: App {
         ComposeUIHelper.shared.initialize(
             inAppNotification: SwiftInAppNotification.shared,
             swiftFormatter: Formatter.shared,
+            swiftPlatformTextRenderer: PlatformTextRenderer.shared,
             swiftOnDeviceAI: FoundationModelOnDeviceAI.shared
         )
     }
diff --git a/iosApp/flare/UI/Component/RichText.swift b/iosApp/flare/UI/Component/RichText.swift
index 6050fc7b4..e4ca993b7 100644
--- a/iosApp/flare/UI/Component/RichText.swift
+++ b/iosApp/flare/UI/Component/RichText.swift
@@ -1,46 +1,34 @@
 import SwiftUI
 import KotlinSharedUI
 import Kingfisher
-import SwiftUIBackports
 
 struct RichText: View {
     let text: UiRichText
     @State private var images: [String: Image] = [:]
     @ScaledMetric(relativeTo: .body) var imageSize = 17
     @Environment(\.openURL) var openURL
-    
-    enum RichTextContent: Identifiable {
-        var id: String {
-            switch self {
-            case .text(let text):
-                return "text-\(text)"
-            case .blockImage(let url, let href):
-                return "img-\(url)-\(href ?? "")"
-            }
-        }
-        case text(Text)
-        case blockImage(url: String, href: String?)
-    }
 
     var body: some View {
         VStack(alignment: .leading, spacing: 8) {
-            ForEach(render(text: text, images: images)) { content in
+            ForEach(Array(contents.enumerated()), id: \.offset) { _, content in
                 switch content {
-                case .text(let text):
-                    text
-                case .blockImage(let url, let href):
-                    if let url = URL(string: url) {
+                case let textContent as PlatformTextTextContent:
+                    render(textContent: textContent)
+                case let imageContent as PlatformTextBlockImageContent:
+                    if let url = URL(string: imageContent.url) {
                         KFImage(url)
                             .resizable()
                             .scaledToFit()
                             .clipShape(RoundedRectangle(cornerRadius: 12))
                             .contentShape(Rectangle())
                             .onTapGesture {
-                                if let href, let link = URL(string: href) {
+                                if let href = imageContent.href, let link = URL(string: href) {
                                     openURL(link)
                                 }
                             }
                     }
+                default:
+                    EmptyView()
                 }
             }
         }
@@ -64,7 +52,7 @@ struct RichText: View {
                         }
                     }
                 }
-                
+
                 for await (urlString, image) in group {
                     if let image = image {
                         images[urlString] = image
@@ -74,157 +62,28 @@ struct RichText: View {
         }
     }
 
-    func render(text: UiRichText, images: [String: Image]) -> [RichTextContent] {
-        var contents: [RichTextContent] = []
-        
-        // Context to maintain state during traversal
-        class RenderContext {
-            var currentText = Text("")
-            var attributedString = AttributedString()
-            var attributeContainer = AttributeContainer()
-            var isEmpty = true
-            var isBlockState = false
-            
-            func flush(to list: inout [RichTextContent]) {
-                if !isEmpty {
-                    // Combine result+Text(attributedString)
-                    // But `Text` doesn't expose concatenation easily outside of ViewBuilder or `+` operator on Text values
-                    // We must commit attributedString to currentText first
-                    commitAttributedString()
-                    list.append(.text(currentText))
-                    currentText = Text("")
-                    isEmpty = true
-                }
-            }
-            
-            func commitAttributedString() {
-                if attributedString.characters.count > 0 {
-                    currentText = currentText + Text(attributedString)
-                    attributedString = AttributedString()
-                }
-            }
-            
-            func appendText(_ text: Text) {
-                commitAttributedString()
-                currentText = currentText + text
-                isEmpty = false
-            }
-        }
-        
-        let context = RenderContext()
-        
-        func renderNode(_ node: KsoupNode) {
-            if let element = node as? KsoupElement {
-                renderElement(element)
-            } else if let textNode = node as? KsoupTextNode {
-                context.attributedString = context.attributedString + AttributedString(textNode.text(), attributes: context.attributeContainer)
-                // Text added implicitly makes it not empty, but we verify emptiness on flush by character count or flag
-                context.isEmpty = false
-            }
-        }
-        
-        func renderElement(_ element: KsoupElement) {
-            switch element.tagName().lowercased() {
-            case "a":
-                let href = element.attribute(key: "href")?.value ?? ""
-                let currentAttributes = context.attributeContainer
-                context.attributeContainer = AttributeContainer()
-                context.attributeContainer.link = URL(string: href)
-                element.childNodes().forEach { renderNode($0) }
-                context.attributeContainer = currentAttributes
-            case "strong", "b":
-                let currentAttributes = context.attributeContainer
-                context.attributeContainer = AttributeContainer()
-                context.attributeContainer.font = .system(size: UIFont.systemFontSize, weight: .bold)
-                element.childNodes().forEach { renderNode($0) }
-                context.attributeContainer = currentAttributes
-            case "em", "i":
-                let currentAttributes = context.attributeContainer
-                context.attributeContainer = AttributeContainer()
-                context.attributeContainer.font = .system(size: UIFont.systemFontSize, weight: .regular).italic()
-                element.childNodes().forEach { renderNode($0) }
-                context.attributeContainer = currentAttributes
-            case "br":
-                context.attributedString = context.attributedString + AttributedString("\n", attributes: context.attributeContainer)
-                context.isEmpty = false
-            case "p", "div":
-                element.childNodes().forEach { renderNode($0) }
-                if element.parent()?.childNodes().last != element {
-                    context.attributedString = context.attributedString + AttributedString("\n\n", attributes: context.attributeContainer)
-                    context.isEmpty = false
-                }
-            case "span":
-                element.childNodes().forEach { renderNode($0) }
-            case "del", "s":
-                let currentAttributes = context.attributeContainer
-                context.attributeContainer = AttributeContainer()
-                context.attributeContainer.strikethroughStyle = .single
-                element.childNodes().forEach { renderNode($0) }
-                context.attributeContainer = currentAttributes
-            case "code":
-                context.commitAttributedString()
-                let codeText = element.text()
-                let codeView = Text(codeText).font(.system(.body, design: .monospaced))
-                context.appendText(codeView)
-            case "blockquote":
-                context.commitAttributedString()
-                let blockquoteText = element.text()
-                let quoteView = Text(blockquoteText).foregroundColor(.secondary).italic()
-                context.appendText(quoteView)
-            case "u":
-                let currentAttributes = context.attributeContainer
-                context.attributeContainer = AttributeContainer()
-                context.attributeContainer.underlineStyle = .single
-                element.childNodes().forEach { renderNode($0) }
-                context.attributeContainer = currentAttributes
-            case "small":
-                let currentAttributes = context.attributeContainer
-                context.attributeContainer = AttributeContainer()
-                context.attributeContainer.font = .system(size: UIFont.smallSystemFontSize)
-                element.childNodes().forEach { renderNode($0) }
-                context.attributeContainer = currentAttributes
-            case "emoji":
-                let src = element.attribute(key: "target")?.value ?? ""
-                if let image = images[src] {
-                    context.commitAttributedString()
-                    context.appendText(Text(image).baselineOffset(-3))
-                } else {
-                    let alt = element.attribute(key: "alt")?.value ?? ""
-                    context.attributedString = context.attributedString + AttributedString(alt, attributes: context.attributeContainer)
-                    context.isEmpty = false
-                }
-            case "figure":
-                context.isBlockState = true
-                element.childNodes().forEach { renderNode($0) }
-                context.isBlockState = false
-            case "img":
-                let src = element.attribute(key: "src")?.value ?? ""
-                if context.isBlockState {
-                    // Block image: Flush text, add image
-                    context.flush(to: &contents)
-                    let href = element.attribute(key: "href")?.value
-                    contents.append(.blockImage(url: src, href: href))
+    private var contents: [PlatformTextContent] {
+        (text.platformText as? NSArray)?.compactMap { $0 as? PlatformTextContent } ?? []
+    }
+
+    private func render(textContent: PlatformTextTextContent) -> Text {
+        textContent.runs.reduce(Text("")) { partial, run in
+            switch run {
+            case let attributedRun as PlatformTextAttributedRun:
+                partial + Text(attributedRun.text)
+            case let imageRun as PlatformTextImageRun:
+                if let image = images[imageRun.url] {
+                    partial + Text(image).baselineOffset(-3)
                 } else {
-                    // Inline image
-                    if let image = images[src] {
-                        context.commitAttributedString()
-                        context.appendText(Text(image).baselineOffset(-3))
-                    } else {
-                        let alt = element.attribute(key: "alt")?.value ?? ""
-                        context.attributedString = context.attributedString + AttributedString(alt, attributes: context.attributeContainer)
-                        context.isEmpty = false
-                    }
+                    partial + Text(imageRun.alt)
                 }
             default:
-                element.childNodes().forEach { renderNode($0) }
+                partial
             }
         }
-        
-        renderNode(text.data)
-        context.flush(to: &contents)
-        return contents
     }
 }
+
 extension UIImage {
     func resize(height: CGFloat) -> UIImage? {
         let heightRatio = height / size.height
diff --git a/iosApp/flare/UI/Component/Status/StatusTopMessageView.swift b/iosApp/flare/UI/Component/Status/StatusTopMessageView.swift
index a77cafdf7..84319c947 100644
--- a/iosApp/flare/UI/Component/Status/StatusTopMessageView.swift
+++ b/iosApp/flare/UI/Component/Status/StatusTopMessageView.swift
@@ -9,9 +9,11 @@ struct StatusTopMessageView: View {
             topMessage.icon.image
             if let user = topMessage.user {
                 RichText(text: user.name)
+                    .fixedSize(horizontal: false, vertical: true)
             }
             if let text = topMessage.type.localizedText {
                 Text(text)
+                    .fixedSize(horizontal: false, vertical: true)
             }
         }
         .onTapGesture {
diff --git a/shared/src/androidJvmMain/kotlin/dev/dimension/flare/ui/render/UiRichText.androidJvm.kt b/shared/src/androidJvmMain/kotlin/dev/dimension/flare/ui/render/UiRichText.androidJvm.kt
index ec752b2fc..2512cd406 100644
--- a/shared/src/androidJvmMain/kotlin/dev/dimension/flare/ui/render/UiRichText.androidJvm.kt
+++ b/shared/src/androidJvmMain/kotlin/dev/dimension/flare/ui/render/UiRichText.androidJvm.kt
@@ -2,4 +2,9 @@ package dev.dimension.flare.ui.render
 
 import java.text.Bidi
 
+public actual typealias PlatformText = Unit
+
+// Android/JVM does not use this
+internal actual fun UiRichText.renderPlatformText(): PlatformText = Unit
+
 internal actual fun String.isRtl(): Boolean = !Bidi(this, Bidi.DIRECTION_DEFAULT_LEFT_TO_RIGHT).baseIsLeftToRight()
diff --git a/shared/src/appleMain/kotlin/dev/dimension/flare/ui/render/UiRichText.apple.kt b/shared/src/appleMain/kotlin/dev/dimension/flare/ui/render/UiRichText.apple.kt
index 940f74623..482811122 100644
--- a/shared/src/appleMain/kotlin/dev/dimension/flare/ui/render/UiRichText.apple.kt
+++ b/shared/src/appleMain/kotlin/dev/dimension/flare/ui/render/UiRichText.apple.kt
@@ -2,11 +2,26 @@ package dev.dimension.flare.ui.render
 
 import kotlinx.cinterop.BetaInteropApi
 import kotlinx.cinterop.autoreleasepool
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+import platform.Foundation.NSArray
 import platform.Foundation.NSLocale
 import platform.Foundation.NSLocaleLanguageDirectionRightToLeft
 import platform.Foundation.characterDirectionForLanguage
 import platform.NaturalLanguage.NLLanguageRecognizer
 
+public actual typealias PlatformText = NSArray
+
+public interface SwiftPlatformTextRenderer {
+    public fun render(richText: UiRichText): PlatformText
+}
+
+private object PlatformTextRendererHolder : KoinComponent {
+    val renderer: SwiftPlatformTextRenderer by inject()
+}
+
+internal actual fun UiRichText.renderPlatformText(): PlatformText = PlatformTextRendererHolder.renderer.render(this)
+
 internal actual fun String.isRtl(): Boolean = isRightToLeft()
 
 @OptIn(BetaInteropApi::class)
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelinePagingMapper.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelinePagingMapper.kt
index 9b671f89e..1e0b210bf 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelinePagingMapper.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelinePagingMapper.kt
@@ -35,42 +35,20 @@ internal object TimelinePagingMapper {
                         when (data) {
                             is UiTimelineV2.Feed -> emptyList()
                             is UiTimelineV2.Message -> emptyList()
-                            is UiTimelineV2.Post ->
-                                data.quote.map {
-                                    uiTimelineToDbStatusReferenceWithStatus(
-                                        data = it,
-                                        referenceType = ReferenceType.Quote,
-                                        rootStatusKey = data.statusKey,
-                                    )
-                                } +
-                                    data.parents.map {
-                                        uiTimelineToDbStatusReferenceWithStatus(
-                                            data = it,
-                                            referenceType = ReferenceType.Reply,
-                                            rootStatusKey = data.statusKey,
-                                        )
-                                    } +
-                                    listOfNotNull(
-                                        data.internalRepost?.let {
-                                            uiTimelineToDbStatusReferenceWithStatus(
-                                                data = it,
-                                                referenceType = ReferenceType.Retweet,
-                                                rootStatusKey = data.statusKey,
-                                            )
-                                        },
-                                    )
+                            is UiTimelineV2.Post -> collectPostReferences(data, data.statusKey)
 
                             is UiTimelineV2.User -> emptyList()
                             is UiTimelineV2.UserList ->
-                                listOfNotNull(
-                                    data.post?.let {
-                                        uiTimelineToDbStatusReferenceWithStatus(
-                                            data = it,
-                                            referenceType = ReferenceType.Quote,
-                                            rootStatusKey = data.statusKey,
-                                        )
-                                    },
-                                )
+                                data.post
+                                    ?.let {
+                                        listOf(
+                                            uiTimelineToDbStatusReferenceWithStatus(
+                                                data = it,
+                                                referenceType = ReferenceType.Quote,
+                                                rootStatusKey = data.statusKey,
+                                            ),
+                                        ) + collectPostReferences(it, data.statusKey)
+                                    }.orEmpty()
                         },
                 ),
         )
@@ -175,9 +153,42 @@ internal object TimelinePagingMapper {
                 referenceStatusKey = data.statusKey,
                 _id = Uuid.random().toString(),
             ),
-        status = uiTimelineToDbStatusWithUser(data, sanitizePostReferences = false),
+        status = uiTimelineToDbStatusWithUser(data, sanitizePostReferences = true),
     )
 
+    private fun collectPostReferences(
+        data: UiTimelineV2.Post,
+        rootStatusKey: MicroBlogKey,
+    ): List<DbStatusReferenceWithStatus> {
+        val visited = mutableSetOf<MicroBlogKey>()
+
+        fun visit(post: UiTimelineV2.Post): List<DbStatusReferenceWithStatus> =
+            post.directReferencePosts().flatMap { (referenceType, referencedPost) ->
+                listOf(
+                    uiTimelineToDbStatusReferenceWithStatus(
+                        data = referencedPost,
+                        referenceType = referenceType,
+                        rootStatusKey = rootStatusKey,
+                    ),
+                ) +
+                    if (visited.add(referencedPost.statusKey)) {
+                        visit(referencedPost)
+                    } else {
+                        emptyList()
+                    }
+            }
+
+        return visit(data)
+            .distinctBy {
+                it.reference.referenceType to it.reference.referenceStatusKey
+            }
+    }
+
+    private fun UiTimelineV2.Post.directReferencePosts(): List<Pair<ReferenceType, UiTimelineV2.Post>> =
+        quote.map { ReferenceType.Quote to it } +
+            parents.map { ReferenceType.Reply to it } +
+            listOfNotNull(internalRepost?.let { ReferenceType.Retweet to it })
+
     private fun uiTimelineToDbStatusWithUser(
         data: UiTimelineV2,
         sanitizePostReferences: Boolean,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/render/UiRichText.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/render/UiRichText.kt
index 33eba09dc..cf5b936d4 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/render/UiRichText.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/render/UiRichText.kt
@@ -5,6 +5,8 @@ import com.fleeksoft.ksoup.Ksoup
 import com.fleeksoft.ksoup.nodes.Element
 import com.fleeksoft.ksoup.nodes.TextNode
 import de.cketti.codepoints.codePointCount
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.descriptors.PrimitiveKind
@@ -12,6 +14,10 @@ import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 
+public expect class PlatformText
+
+internal expect fun UiRichText.renderPlatformText(): PlatformText
+
 @Serializable(with = UiRichTextSerializer::class)
 @Immutable
 public data class UiRichText(
@@ -36,9 +42,17 @@ public data class UiRichText(
     public val isEmpty: Boolean = raw.isEmpty() && data.getAllElements().size <= 1
     public val isLongText: Boolean = innerText.codePointCount() > 480
 
-    public val imageUrls: List<String> =
-        data.getElementsByTag("img").mapNotNull { it.attr("src").ifEmpty { null } } +
-            data.getElementsByTag("emoji").mapNotNull { it.attr("target").ifEmpty { null } }
+    public val imageUrls: ImmutableList<String> =
+        data
+            .getElementsByTag("img")
+            .mapNotNull { it.attr("src").ifEmpty { null } }
+            .plus(
+                data
+                    .getElementsByTag("emoji")
+                    .mapNotNull { it.attr("target").ifEmpty { null } },
+            ).toImmutableList()
+
+    public val platformText: PlatformText = renderPlatformText()
 }
 
 internal object UiRichTextSerializer : KSerializer<UiRichText> {
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt
index dc78e3af8..b29c42239 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/database/cache/mapper/MicroblogTest.kt
@@ -645,7 +645,8 @@ class MicroblogTest : RobolectricTest() {
             val quoteRefs = mapped.status.references.filter { it.reference.referenceType == ReferenceType.Quote }
             assertEquals(1, retweetRefs.size)
             assertEquals(postB.statusKey, retweetRefs.first().reference.referenceStatusKey)
-            assertTrue(quoteRefs.isEmpty())
+            assertEquals(1, quoteRefs.size)
+            assertEquals(postC.statusKey, quoteRefs.first().reference.referenceStatusKey)
 
             saveToDatabase(db, listOf(mapped))
             val savedA = db.statusDao().get(postA.statusKey, AccountType.Specific(accountKey)).first()
@@ -678,6 +679,89 @@ class MicroblogTest : RobolectricTest() {
             assertEquals(postC.statusKey, repost.quote.first().statusKey)
         }
 
+    @Test
+    fun databaseRoundTripKeepsQuoteOnInternalRepostForRetweetWrapper() =
+        runTest {
+            val accountKey = MicroBlogKey(id = "account", host = "test.com")
+            val wrapperUser = createUser(MicroBlogKey(id = "wrapper-user-quote", host = "test.com"), "Wrapper User")
+            val repostUser = createUser(MicroBlogKey(id = "repost-user-quote", host = "test.com"), "Repost User")
+            val quoteUser = createUser(MicroBlogKey(id = "quote-user", host = "test.com"), "Quote User")
+
+            val quotePost =
+                createPost(
+                    accountKey = accountKey,
+                    user = quoteUser,
+                    statusKey = MicroBlogKey(id = "quote-status", host = "test.com"),
+                    text = "quoted content",
+                )
+            val repostPost =
+                createPost(
+                    accountKey = accountKey,
+                    user = repostUser,
+                    statusKey = MicroBlogKey(id = "repost-status-without-quote", host = "test.com"),
+                    text = "repost content",
+                    quote = listOf(quotePost),
+                )
+            val repostMessage =
+                UiTimelineV2.Message(
+                    user = wrapperUser,
+                    statusKey = MicroBlogKey(id = "wrapper-status-with-quote", host = "test.com"),
+                    icon = dev.dimension.flare.ui.model.UiIcon.Retweet,
+                    type =
+                        UiTimelineV2.Message.Type.Localized(
+                            UiTimelineV2.Message.Type.Localized.MessageId.Repost,
+                        ),
+                    createdAt = Clock.System.now().toUi(),
+                    clickEvent = ClickEvent.Noop,
+                    accountType = AccountType.Specific(accountKey),
+                )
+            val wrapperPost =
+                createPost(
+                    accountKey = accountKey,
+                    user = wrapperUser,
+                    statusKey = MicroBlogKey(id = "wrapper-status-with-quote", host = "test.com"),
+                    text = "wrapper content",
+                ).copy(
+                    message = repostMessage,
+                    internalRepost = repostPost,
+                )
+
+            val mapped = TimelinePagingMapper.toDb(wrapperPost, pagingKey = "home")
+            saveToDatabase(db, listOf(mapped))
+
+            val paging = db.pagingTimelineDao().getPagingSource("home")
+            val pager = TestPager(config = PagingConfig(pageSize = 20), paging)
+            val refreshResult = pager.refresh()
+            val page = assertIs<PagingSource.LoadResult.Page<Int, DbPagingTimelineWithStatus>>(refreshResult)
+            val dbItem =
+                assertNotNull(
+                    page.data.firstOrNull {
+                        it.status.status.data.statusKey == wrapperPost.statusKey
+                    },
+                )
+            val rendered =
+                assertIs<UiTimelineV2.Post>(
+                    TimelinePagingMapper.toUi(
+                        dbItem,
+                        pagingKey = "home",
+                        useDbKeyInItemKey = false,
+                    ),
+                )
+            val internalRepost = assertNotNull(rendered.internalRepost)
+
+            assertEquals(wrapperPost.statusKey, rendered.statusKey)
+            assertEquals(repostPost.content.raw, rendered.content.raw)
+            assertEquals(repostPost.statusKey, internalRepost.statusKey)
+            assertEquals(1, internalRepost.quote.size)
+            assertEquals(quotePost.statusKey, internalRepost.quote.first().statusKey)
+            assertEquals(
+                "quoted content",
+                internalRepost.quote
+                    .first()
+                    .content.raw,
+            )
+        }
+
     @Test
     fun quoteAndRetweetTogetherKeepsRetweetMessageOnSharedStatus() =
         runTest {

From 73588378020b5d4b9a97d1136e45dec9f165697a Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Sat, 7 Mar 2026 00:12:16 +0900
Subject: [PATCH 29/33] fix ios

---
 iosApp/flare/UI/Component/ListCardView.swift  | 37 ++++++++++++-------
 .../dimension/flare/ui/render/UiRichText.kt   |  4 +-
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/iosApp/flare/UI/Component/ListCardView.swift b/iosApp/flare/UI/Component/ListCardView.swift
index 7b6c2a3f8..2c7c1ddd5 100644
--- a/iosApp/flare/UI/Component/ListCardView.swift
+++ b/iosApp/flare/UI/Component/ListCardView.swift
@@ -10,22 +10,31 @@ struct ListCardView<Content: View>: View {
 
     var body: some View {
         content()
-            .background(Color(.secondarySystemGroupedBackground))
-            .clipShape(
-                !isMultipleColumn ?
-                .rect(
-                    topLeadingRadius: index == 0 ? cornerRadius : 4,
-                    bottomLeadingRadius: index == totalCount - 1 ? cornerRadius : 4,
-                    bottomTrailingRadius: index == totalCount - 1 ? cornerRadius : 4,
-                    topTrailingRadius: index == 0 ? cornerRadius : 4,
-                ) :
-                .rect(
-                    topLeadingRadius: cornerRadius,
-                    bottomLeadingRadius: cornerRadius,
-                    bottomTrailingRadius: cornerRadius,
-                    topTrailingRadius: cornerRadius,
+            .background {
+                UnevenRoundedRectangle(
+                    cornerRadii: cornerRadii,
+                    style: .continuous
                 )
+                .fill(Color(.secondarySystemGroupedBackground))
+            }
+    }
+
+    private var cornerRadii: RectangleCornerRadii {
+        if isMultipleColumn {
+            RectangleCornerRadii(
+                topLeading: cornerRadius,
+                bottomLeading: cornerRadius,
+                bottomTrailing: cornerRadius,
+                topTrailing: cornerRadius
+            )
+        } else {
+            RectangleCornerRadii(
+                topLeading: index == 0 ? cornerRadius : 4,
+                bottomLeading: index == totalCount - 1 ? cornerRadius : 4,
+                bottomTrailing: index == totalCount - 1 ? cornerRadius : 4,
+                topTrailing: index == 0 ? cornerRadius : 4
             )
+        }
     }
 }
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/render/UiRichText.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/render/UiRichText.kt
index cf5b936d4..c355b8173 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/render/UiRichText.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/render/UiRichText.kt
@@ -52,7 +52,9 @@ public data class UiRichText(
                     .mapNotNull { it.attr("target").ifEmpty { null } },
             ).toImmutableList()
 
-    public val platformText: PlatformText = renderPlatformText()
+    public val platformText: PlatformText by lazy {
+        renderPlatformText()
+    }
 }
 
 internal object UiRichTextSerializer : KSerializer<UiRichText> {

From f056319a48ab803bef7983ea7a3c5b15731c5bab Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Sat, 7 Mar 2026 11:20:22 +0900
Subject: [PATCH 30/33] fix ios renderer crash

---
 .../dev/dimension/flare/di/PlatformModule.apple.kt   |  3 +++
 .../dimension/flare/ui/render/UiRichText.apple.kt    | 12 +++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/shared/src/appleMain/kotlin/dev/dimension/flare/di/PlatformModule.apple.kt b/shared/src/appleMain/kotlin/dev/dimension/flare/di/PlatformModule.apple.kt
index 32a2cfe38..1d24f28be 100644
--- a/shared/src/appleMain/kotlin/dev/dimension/flare/di/PlatformModule.apple.kt
+++ b/shared/src/appleMain/kotlin/dev/dimension/flare/di/PlatformModule.apple.kt
@@ -9,6 +9,8 @@ import dev.dimension.flare.shared.image.ImageCompressor
 import dev.dimension.flare.shared.image.IosImageCompressor
 import dev.dimension.flare.ui.humanizer.AppleFormatter
 import dev.dimension.flare.ui.humanizer.PlatformFormatter
+import dev.dimension.flare.ui.render.ApplePlatformTextRenderer
+import dev.dimension.flare.ui.render.PlatformTextRendering
 import org.koin.core.module.Module
 import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.bind
@@ -21,6 +23,7 @@ internal actual val platformModule: Module =
         singleOf(::PlatformPathProducer)
         singleOf(::NativeWebScraper)
         singleOf(::AppleFormatter) bind PlatformFormatter::class
+        singleOf(::ApplePlatformTextRenderer) bind PlatformTextRendering::class
         singleOf(::IosImageCompressor) bind ImageCompressor::class
         singleOf(::OnDeviceAI)
     }
diff --git a/shared/src/appleMain/kotlin/dev/dimension/flare/ui/render/UiRichText.apple.kt b/shared/src/appleMain/kotlin/dev/dimension/flare/ui/render/UiRichText.apple.kt
index 482811122..9534b5aa8 100644
--- a/shared/src/appleMain/kotlin/dev/dimension/flare/ui/render/UiRichText.apple.kt
+++ b/shared/src/appleMain/kotlin/dev/dimension/flare/ui/render/UiRichText.apple.kt
@@ -16,8 +16,18 @@ public interface SwiftPlatformTextRenderer {
     public fun render(richText: UiRichText): PlatformText
 }
 
+internal class ApplePlatformTextRenderer(
+    private val renderer: SwiftPlatformTextRenderer,
+) : PlatformTextRendering {
+    override fun render(richText: UiRichText): PlatformText = renderer.render(richText)
+}
+
+internal interface PlatformTextRendering {
+    fun render(richText: UiRichText): PlatformText
+}
+
 private object PlatformTextRendererHolder : KoinComponent {
-    val renderer: SwiftPlatformTextRenderer by inject()
+    val renderer: PlatformTextRendering by inject()
 }
 
 internal actual fun UiRichText.renderPlatformText(): PlatformText = PlatformTextRendererHolder.renderer.render(this)

From 5f428274bfdcdd9c14b51864e5422477b1e2c7bb Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Sat, 7 Mar 2026 12:19:25 +0900
Subject: [PATCH 31/33] fix guest mode

---
 .../flare/ui/screen/profile/ProfileScreen.kt  |  2 +-
 .../data/database/cache/CacaheDatabase.kt     |  2 +-
 .../database/cache/dao/PagingTimelineDao.kt   |  8 ---
 .../flare/data/database/cache/dao/UserDao.kt  |  8 +--
 .../flare/data/database/cache/model/DbUser.kt |  7 +-
 .../datasource/bluesky/BlueskyDataSource.kt   |  5 +-
 .../data/datasource/bluesky/BlueskyLoader.kt  |  2 +-
 .../guest/mastodon/GuestMastodonDataSource.kt | 58 ++++++++++++++++
 .../guest/mastodon/GuestMastodonLoader.kt     | 69 +++++++++++++++++++
 .../datasource/mastodon/MastodonDataSource.kt |  5 +-
 .../datasource/mastodon/MastodonLoader.kt     |  2 +-
 .../microblog/handler/PostEventHandler.kt     | 24 ++++---
 .../microblog/handler/RelationHandler.kt      | 11 +--
 .../microblog/handler/UserHandler.kt          |  4 +-
 .../microblog/loader/RelationLoader.kt        |  1 -
 .../datasource/misskey/MisskeyDataSource.kt   |  5 +-
 .../data/datasource/misskey/MisskeyLoader.kt  |  2 +-
 .../datasource/vvo/CommentPagingSource.kt     |  2 +-
 .../data/datasource/vvo/VVODataSource.kt      |  5 +-
 .../flare/data/datasource/vvo/VVOLoader.kt    |  2 +-
 .../data/datasource/xqt/XQTDataSource.kt      |  5 +-
 .../flare/data/datasource/xqt/XQTLoader.kt    |  2 +-
 .../dev/dimension/flare/model/AccountType.kt  |  1 +
 .../ui/presenter/home/DeepLinkPresenter.kt    |  8 +--
 .../ui/presenter/profile/ProfilePresenter.kt  |  9 ++-
 .../status/StatusContextPresenter.kt          | 18 +++--
 .../microblog/PostEventHandlerTest.kt         | 10 +--
 .../microblog/handler/RelationHandlerTest.kt  | 30 ++++----
 .../microblog/handler/UserHandlerTest.kt      |  2 +-
 29 files changed, 225 insertions(+), 84 deletions(-)
 create mode 100644 shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestMastodonLoader.kt

diff --git a/app/src/main/java/dev/dimension/flare/ui/screen/profile/ProfileScreen.kt b/app/src/main/java/dev/dimension/flare/ui/screen/profile/ProfileScreen.kt
index a6e61882b..6a8a9097b 100644
--- a/app/src/main/java/dev/dimension/flare/ui/screen/profile/ProfileScreen.kt
+++ b/app/src/main/java/dev/dimension/flare/ui/screen/profile/ProfileScreen.kt
@@ -564,7 +564,7 @@ private fun ProfileMediaTab(
                                         .clip(MaterialTheme.shapes.medium)
                                         .clipToBounds()
                                         .clickable {
-                                            val content = item.status as? UiTimelineV2.Post
+                                            val content = item.status
                                             if (content is UiTimelineV2.Post) {
                                                 onItemClicked(
                                                     item.statusKey,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/CacaheDatabase.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/CacaheDatabase.kt
index 66f5681ad..f116142dd 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/CacaheDatabase.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/CacaheDatabase.kt
@@ -8,7 +8,7 @@ import androidx.room.TypeConverters
 import androidx.room.immediateTransaction
 import androidx.room.useWriterConnection
 
-internal const val CACHE_DATABASE_VERSION = 26
+internal const val CACHE_DATABASE_VERSION = 27
 
 @Database(
     entities = [
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
index fc8473439..1284bbc1e 100644
--- 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
@@ -126,14 +126,6 @@ internal interface PagingTimelineDao {
         statusKey: MicroBlogKey,
     )
 
-    suspend fun deleteStatus(
-        statusKey: MicroBlogKey,
-        accountKey: MicroBlogKey,
-    ) = deleteStatus(
-        accountType = AccountType.Specific(accountKey),
-        statusKey = statusKey,
-    )
-
     @Query(
         "SELECT EXISTS(" +
             "SELECT 1 FROM DbPagingTimeline " +
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt
index 189780f0b..6262dbec4 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/dao/UserDao.kt
@@ -64,18 +64,18 @@ internal interface UserDao {
     @Query("DELETE FROM DbUserHistory WHERE accountType = :accountType")
     suspend fun deleteHistoryByAccountType(accountType: DbAccountType)
 
-    @Query("SELECT * FROM DbUserRelation WHERE accountKey = :accountKey AND userKey = :userKey")
+    @Query("SELECT * FROM DbUserRelation WHERE accountType = :accountType AND userKey = :userKey")
     fun getUserRelation(
-        accountKey: MicroBlogKey,
+        accountType: DbAccountType,
         userKey: MicroBlogKey,
     ): Flow<DbUserRelation?>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertUserRelation(relation: DbUserRelation)
 
-    @Query("DELETE FROM DbUserRelation WHERE accountKey = :accountKey AND userKey = :userKey")
+    @Query("DELETE FROM DbUserRelation WHERE accountType = :accountType AND userKey = :userKey")
     suspend fun deleteUserRelation(
-        accountKey: MicroBlogKey,
+        accountType: DbAccountType,
         userKey: MicroBlogKey,
     )
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbUser.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbUser.kt
index 6772ce387..bcaf3ec15 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbUser.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/model/DbUser.kt
@@ -3,6 +3,7 @@ package dev.dimension.flare.data.database.cache.model
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
+import dev.dimension.flare.model.DbAccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.UiRelation
@@ -22,13 +23,13 @@ internal data class DbUser(
 )
 
 @Entity(
-    primaryKeys = ["accountKey", "userKey"],
+    primaryKeys = ["accountType", "userKey"],
     indices = [
-        Index(value = ["accountKey", "userKey"], unique = true),
+        Index(value = ["accountType", "userKey"], unique = true),
     ],
 )
 internal data class DbUserRelation(
-    val accountKey: MicroBlogKey,
+    val accountType: DbAccountType,
     val userKey: MicroBlogKey,
     val relation: UiRelation,
 )
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
index ccaaeab61..63717a25b 100644
--- 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
@@ -192,7 +192,7 @@ internal class BlueskyDataSource(
 
     override val userHandler by lazy {
         UserHandler(
-            accountKey = accountKey,
+            host = accountKey.host,
             loader = loader,
         )
     }
@@ -207,6 +207,7 @@ internal class BlueskyDataSource(
     override val relationHandler by lazy {
         RelationHandler(
             dataSource = loader,
+            accountType = AccountType.Specific(accountKey),
         )
     }
 
@@ -215,7 +216,7 @@ internal class BlueskyDataSource(
 
     override val postEventHandler by lazy {
         PostEventHandler(
-            accountKey = accountKey,
+            accountType = AccountType.Specific(accountKey),
             handler = this,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyLoader.kt
index 87577af60..3d3e84b09 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyLoader.kt
@@ -29,7 +29,7 @@ import sh.christian.ozone.api.RKey
 import kotlin.time.Clock
 
 internal class BlueskyLoader(
-    override val accountKey: MicroBlogKey,
+    val accountKey: MicroBlogKey,
     private val service: BlueskyService,
 ) : NotificationLoader,
     UserLoader,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestMastodonDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestMastodonDataSource.kt
index 66189867d..517d65772 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestMastodonDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestMastodonDataSource.kt
@@ -4,12 +4,23 @@ import dev.dimension.flare.data.datasource.mastodon.MastodonFansPagingSource
 import dev.dimension.flare.data.datasource.mastodon.MastodonFollowingPagingSource
 import dev.dimension.flare.data.datasource.mastodon.SearchUserPagingSource
 import dev.dimension.flare.data.datasource.mastodon.TrendHashtagPagingSource
+import dev.dimension.flare.data.datasource.microblog.DatabaseUpdater
 import dev.dimension.flare.data.datasource.microblog.MicroblogDataSource
+import dev.dimension.flare.data.datasource.microblog.PostEvent
 import dev.dimension.flare.data.datasource.microblog.ProfileTab
+import dev.dimension.flare.data.datasource.microblog.datasource.PostDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.RelationDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.UserDataSource
+import dev.dimension.flare.data.datasource.microblog.handler.PostEventHandler
+import dev.dimension.flare.data.datasource.microblog.handler.PostHandler
+import dev.dimension.flare.data.datasource.microblog.handler.RelationHandler
+import dev.dimension.flare.data.datasource.microblog.handler.UserHandler
+import dev.dimension.flare.data.datasource.microblog.loader.RelationActionType
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
 import dev.dimension.flare.data.datasource.microblog.paging.RemoteLoader
 import dev.dimension.flare.data.network.mastodon.GuestMastodonService
+import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiHashtag
 import dev.dimension.flare.ui.model.UiProfile
@@ -22,11 +33,58 @@ internal class GuestMastodonDataSource(
     private val host: String,
     private val locale: String,
 ) : MicroblogDataSource,
+    UserDataSource,
+    RelationDataSource,
+    PostDataSource,
+    PostEventHandler.Handler,
     KoinComponent {
     private val service by lazy {
         GuestMastodonService("https://$host/", locale)
     }
 
+    private val loader by lazy {
+        GuestMastodonLoader(
+            host = host,
+            service = service,
+        )
+    }
+
+    override val userHandler by lazy {
+        UserHandler(
+            host = host,
+            loader = loader,
+        )
+    }
+
+    override val relationHandler by lazy {
+        RelationHandler(
+            dataSource = loader,
+            accountType = AccountType.Guest,
+        )
+    }
+
+    override val postHandler by lazy {
+        PostHandler(
+            accountType = AccountType.Guest,
+            loader = loader,
+        )
+    }
+
+    override val postEventHandler by lazy {
+        PostEventHandler(
+            accountType = AccountType.Guest,
+            handler = this,
+        )
+    }
+
+    override val supportedRelationTypes: Set<RelationActionType>
+        get() = loader.supportedTypes
+
+    override suspend fun handle(
+        event: PostEvent,
+        updater: DatabaseUpdater,
+    ): Unit = throw UnsupportedOperationException("Guest Mastodon data source does not support post events")
+
     override fun homeTimeline(): RemoteLoader<UiTimelineV2> = GuestTimelinePagingSource(service = service, host = host)
 
     override fun userTimeline(
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestMastodonLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestMastodonLoader.kt
new file mode 100644
index 000000000..7a46ef71a
--- /dev/null
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/guest/mastodon/GuestMastodonLoader.kt
@@ -0,0 +1,69 @@
+package dev.dimension.flare.data.datasource.guest.mastodon
+
+import dev.dimension.flare.data.datasource.microblog.loader.PostLoader
+import dev.dimension.flare.data.datasource.microblog.loader.RelationActionType
+import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
+import dev.dimension.flare.data.datasource.microblog.loader.UserLoader
+import dev.dimension.flare.data.network.mastodon.GuestMastodonService
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiHandle
+import dev.dimension.flare.ui.model.UiProfile
+import dev.dimension.flare.ui.model.UiRelation
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
+
+internal class GuestMastodonLoader(
+    private val host: String,
+    private val service: GuestMastodonService,
+) : UserLoader,
+    RelationLoader,
+    PostLoader {
+    override val supportedTypes: Set<RelationActionType> = RelationActionType.entries.toSet()
+
+    override suspend fun userByHandleAndHost(uiHandle: UiHandle): UiProfile =
+        service
+            .lookupUserByAcct("${uiHandle.normalizedRaw}@${uiHandle.normalizedHost}")
+            ?.render(
+                accountKey = null,
+                host = host,
+            ) ?: throw Exception("User not found")
+
+    override suspend fun userById(id: String): UiProfile =
+        service
+            .lookupUser(id)
+            .render(
+                accountKey = null,
+                host = host,
+            )
+
+    override suspend fun relation(userKey: MicroBlogKey): UiRelation = UiRelation()
+
+    override suspend fun status(statusKey: MicroBlogKey): UiTimelineV2 =
+        service
+            .lookupStatus(statusKey.id)
+            .render(
+                accountKey = null,
+                host = host,
+            )
+
+    override suspend fun deleteStatus(statusKey: MicroBlogKey): Unit =
+        throw UnsupportedOperationException("Guest Mastodon data source does not support delete status")
+
+    override suspend fun follow(userKey: MicroBlogKey): Unit =
+        throw UnsupportedOperationException("Guest Mastodon data source does not support follow")
+
+    override suspend fun unfollow(userKey: MicroBlogKey): Unit =
+        throw UnsupportedOperationException("Guest Mastodon data source does not support unfollow")
+
+    override suspend fun block(userKey: MicroBlogKey): Unit =
+        throw UnsupportedOperationException("Guest Mastodon data source does not support block")
+
+    override suspend fun unblock(userKey: MicroBlogKey): Unit =
+        throw UnsupportedOperationException("Guest Mastodon data source does not support unblock")
+
+    override suspend fun mute(userKey: MicroBlogKey): Unit =
+        throw UnsupportedOperationException("Guest Mastodon data source does not support mute")
+
+    override suspend fun unmute(userKey: MicroBlogKey): Unit =
+        throw UnsupportedOperationException("Guest Mastodon data source does not support unmute")
+}
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt
index 730505455..ae5da7d58 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt
@@ -99,7 +99,7 @@ internal open class MastodonDataSource(
 
     override val userHandler by lazy {
         UserHandler(
-            accountKey = accountKey,
+            host = accountKey.host,
             loader = loader,
         )
     }
@@ -113,6 +113,7 @@ internal open class MastodonDataSource(
 
     override val relationHandler by lazy {
         RelationHandler(
+            accountType = AccountType.Specific(accountKey),
             dataSource = loader,
         )
     }
@@ -122,7 +123,7 @@ internal open class MastodonDataSource(
 
     override val postEventHandler by lazy {
         PostEventHandler(
-            accountKey = accountKey,
+            accountType = AccountType.Specific(accountKey),
             handler = this,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonLoader.kt
index f45c08f5d..7a2f8fcfb 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonLoader.kt
@@ -21,7 +21,7 @@ import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableMap
 
 internal class MastodonLoader(
-    override val accountKey: MicroBlogKey,
+    val accountKey: MicroBlogKey,
     private val service: MastodonService,
 ) : NotificationLoader,
     UserLoader,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostEventHandler.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostEventHandler.kt
index 3d87f0d25..97f4b0799 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostEventHandler.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/PostEventHandler.kt
@@ -8,6 +8,7 @@ import dev.dimension.flare.data.datasource.microblog.PostEvent
 import dev.dimension.flare.data.datasource.microblog.UpdatePostActionMenuEvent
 import dev.dimension.flare.data.repository.tryRun
 import dev.dimension.flare.model.AccountType
+import dev.dimension.flare.model.DbAccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiTimelineV2
 import kotlinx.collections.immutable.ImmutableList
@@ -19,12 +20,13 @@ import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
 internal class PostEventHandler(
-    private val accountKey: MicroBlogKey,
+    private val accountType: AccountType,
     private val handler: Handler,
 ) : KoinComponent,
     DatabaseUpdater {
     private val coroutineScope: CoroutineScope by inject()
     private val database: CacheDatabase by inject()
+    private val dbAccountType = accountType as DbAccountType
 
     interface Handler {
         suspend fun handle(
@@ -40,7 +42,7 @@ internal class PostEventHandler(
                     .statusDao()
                     .get(
                         statusKey = event.postKey,
-                        accountType = AccountType.Specific(accountKey),
+                        accountType = dbAccountType,
                     ).firstOrNull()
                     ?.content
             if (event is UpdatePostActionMenuEvent && originalData is UiTimelineV2.Post) {
@@ -54,7 +56,7 @@ internal class PostEventHandler(
                     )
                 database.statusDao().update(
                     statusKey = event.postKey,
-                    accountType = AccountType.Specific(accountKey),
+                    accountType = dbAccountType,
                     content = updatedData,
                 )
             }
@@ -82,7 +84,7 @@ internal class PostEventHandler(
                     )
                 database.statusDao().update(
                     statusKey = event.postKey,
-                    accountType = AccountType.Specific(accountKey),
+                    accountType = dbAccountType,
                     content = updatedData,
                 )
             }
@@ -96,7 +98,7 @@ internal class PostEventHandler(
                 if (originalData != null) {
                     database.statusDao().update(
                         statusKey = event.postKey,
-                        accountType = AccountType.Specific(accountKey),
+                        accountType = dbAccountType,
                         content = originalData,
                     )
                 }
@@ -108,10 +110,10 @@ internal class PostEventHandler(
         database.connect {
             database.statusDao().delete(
                 statusKey = postKey,
-                accountType = AccountType.Specific(accountKey),
+                accountType = dbAccountType,
             )
             database.pagingTimelineDao().deleteStatus(
-                accountKey = accountKey,
+                accountType = dbAccountType,
                 statusKey = postKey,
             )
         }
@@ -127,14 +129,14 @@ internal class PostEventHandler(
                     .statusDao()
                     .get(
                         statusKey = postKey,
-                        accountType = AccountType.Specific(accountKey),
+                        accountType = dbAccountType,
                     ).firstOrNull()
                     ?.content
             if (currentData != null) {
                 val updatedData = update(currentData)
                 database.statusDao().update(
                     statusKey = postKey,
-                    accountType = AccountType.Specific(accountKey),
+                    accountType = dbAccountType,
                     content = updatedData,
                 )
             }
@@ -151,7 +153,7 @@ internal class PostEventHandler(
                     .statusDao()
                     .get(
                         statusKey = postKey,
-                        accountType = AccountType.Specific(accountKey),
+                        accountType = dbAccountType,
                     ).firstOrNull()
                     ?.content
             if (currentData != null && currentData is UiTimelineV2.Post) {
@@ -165,7 +167,7 @@ internal class PostEventHandler(
                     )
                 database.statusDao().update(
                     statusKey = postKey,
-                    accountType = AccountType.Specific(accountKey),
+                    accountType = dbAccountType,
                     content = updatedData,
                 )
             }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/RelationHandler.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/RelationHandler.kt
index 91fda1dd8..cca502a8b 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/RelationHandler.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/RelationHandler.kt
@@ -5,6 +5,8 @@ import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.model.DbUserRelation
 import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
 import dev.dimension.flare.data.repository.tryRun
+import dev.dimension.flare.model.AccountType
+import dev.dimension.flare.model.DbAccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiRelation
 import kotlinx.coroutines.CoroutineScope
@@ -15,6 +17,7 @@ import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
 internal class RelationHandler(
+    val accountType: AccountType,
     val dataSource: RelationLoader,
 ) : KoinComponent {
     private val database: CacheDatabase by inject()
@@ -26,7 +29,7 @@ internal class RelationHandler(
                 val result = dataSource.relation(userKey)
                 database.userDao().insertUserRelation(
                     DbUserRelation(
-                        accountKey = dataSource.accountKey,
+                        accountType = accountType as DbAccountType,
                         userKey = userKey,
                         relation = result,
                     ),
@@ -36,7 +39,7 @@ internal class RelationHandler(
                 database
                     .userDao()
                     .getUserRelation(
-                        accountKey = dataSource.accountKey,
+                        accountType = accountType as DbAccountType,
                         userKey = userKey,
                     ).mapNotNull { it?.relation }
             },
@@ -218,14 +221,14 @@ internal class RelationHandler(
             database
                 .userDao()
                 .getUserRelation(
-                    accountKey = dataSource.accountKey,
+                    accountType = accountType as DbAccountType,
                     userKey = userKey,
                 ).mapNotNull { it?.relation }
                 .firstOrNull() ?: return
         val newRelation = update(currentRelation)
         database.userDao().insertUserRelation(
             DbUserRelation(
-                accountKey = dataSource.accountKey,
+                accountType = accountType as DbAccountType,
                 userKey = userKey,
                 relation = newRelation,
             ),
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandler.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandler.kt
index f9d52e155..2b9c24dd1 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandler.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandler.kt
@@ -13,7 +13,7 @@ import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
 internal class UserHandler(
-    val accountKey: MicroBlogKey,
+    val host: String,
     val loader: UserLoader,
 ) : KoinComponent {
     private val database: CacheDatabase by inject()
@@ -51,7 +51,7 @@ internal class UserHandler(
                     .findByKey(
                         MicroBlogKey(
                             id = id,
-                            host = accountKey.host,
+                            host = host,
                         ),
                     ).distinctUntilChanged()
                     .mapNotNull { it?.content }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/RelationLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/RelationLoader.kt
index b4e88b9c4..c3638e723 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/RelationLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/loader/RelationLoader.kt
@@ -10,7 +10,6 @@ internal enum class RelationActionType {
 }
 
 internal interface RelationLoader {
-    val accountKey: MicroBlogKey
     val supportedTypes: Set<RelationActionType>
 
     suspend fun relation(userKey: MicroBlogKey): UiRelation
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
index d359b03eb..56ababa9d 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
@@ -109,7 +109,7 @@ internal class MisskeyDataSource(
 
     override val userHandler by lazy {
         UserHandler(
-            accountKey = accountKey,
+            host = accountKey.host,
             loader = loader,
         )
     }
@@ -123,6 +123,7 @@ internal class MisskeyDataSource(
 
     override val relationHandler by lazy {
         RelationHandler(
+            accountType = AccountType.Specific(accountKey),
             dataSource = loader,
         )
     }
@@ -132,7 +133,7 @@ internal class MisskeyDataSource(
 
     override val postEventHandler by lazy {
         PostEventHandler(
-            accountKey = accountKey,
+            accountType = AccountType.Specific(accountKey),
             handler = this,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyLoader.kt
index f69c89303..b8b612243 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyLoader.kt
@@ -24,7 +24,7 @@ import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableMap
 
 internal class MisskeyLoader(
-    override val accountKey: MicroBlogKey,
+    val accountKey: MicroBlogKey,
     private val service: MisskeyService,
 ) : UserLoader,
     PostLoader,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/CommentPagingSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/CommentPagingSource.kt
index a18438636..7479e9ab2 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/CommentPagingSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/CommentPagingSource.kt
@@ -50,7 +50,7 @@ internal class CommentPagingSource(
         return PagingResult(
             data = data,
             endOfPaginationReached = data.isEmpty(),
-            nextKey = (page + 1).toString(),
+            nextKey = (page + 1).takeIf { data.isNotEmpty() }?.toString(),
         )
     }
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt
index 5fc130123..8a7f28078 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt
@@ -97,7 +97,7 @@ internal class VVODataSource(
 
     override val userHandler by lazy {
         UserHandler(
-            accountKey = accountKey,
+            host = accountKey.host,
             loader = loader,
         )
     }
@@ -112,6 +112,7 @@ internal class VVODataSource(
     override val relationHandler by lazy {
         RelationHandler(
             dataSource = loader,
+            accountType = AccountType.Specific(accountKey),
         )
     }
 
@@ -120,7 +121,7 @@ internal class VVODataSource(
 
     override val postEventHandler by lazy {
         PostEventHandler(
-            accountKey = accountKey,
+            accountType = AccountType.Specific(accountKey),
             handler = this,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVOLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVOLoader.kt
index 27a732a9c..32362aaaa 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVOLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVOLoader.kt
@@ -25,7 +25,7 @@ import kotlinx.collections.immutable.toImmutableMap
 import kotlin.time.Clock
 
 internal class VVOLoader(
-    override val accountKey: MicroBlogKey,
+    val accountKey: MicroBlogKey,
     private val service: VVOService,
 ) : NotificationLoader,
     UserLoader,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt
index c5abbee50..a8168ef01 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt
@@ -152,7 +152,7 @@ internal class XQTDataSource(
 
     override val userHandler by lazy {
         UserHandler(
-            accountKey = accountKey,
+            host = accountKey.host,
             loader = loader,
         )
     }
@@ -166,6 +166,7 @@ internal class XQTDataSource(
 
     override val relationHandler by lazy {
         RelationHandler(
+            accountType = AccountType.Specific(accountKey),
             dataSource = loader,
         )
     }
@@ -175,7 +176,7 @@ internal class XQTDataSource(
 
     override val postEventHandler by lazy {
         PostEventHandler(
-            accountKey = accountKey,
+            accountType = AccountType.Specific(accountKey),
             handler = this,
         )
     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTLoader.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTLoader.kt
index b0be4c544..c14c6b7d3 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTLoader.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTLoader.kt
@@ -22,7 +22,7 @@ import dev.dimension.flare.ui.model.mapper.screenName
 import dev.dimension.flare.ui.model.mapper.toUi
 
 internal class XQTLoader(
-    override val accountKey: MicroBlogKey,
+    val accountKey: MicroBlogKey,
     private val service: XQTService,
 ) : NotificationLoader,
     UserLoader,
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/model/AccountType.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/model/AccountType.kt
index 598832ae0..cb7ecbcab 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/model/AccountType.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/model/AccountType.kt
@@ -3,6 +3,7 @@ package dev.dimension.flare.model
 import androidx.compose.runtime.Immutable
 import kotlinx.serialization.Serializable
 
+@Immutable
 @Serializable
 internal sealed interface DbAccountType
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/DeepLinkPresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/DeepLinkPresenter.kt
index 1f0d61c4b..92d4a694f 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/DeepLinkPresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/home/DeepLinkPresenter.kt
@@ -7,7 +7,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import dev.dimension.flare.common.deeplink.DeepLinkMapping
-import dev.dimension.flare.data.datasource.microblog.AuthenticatedMicroblogDataSource
 import dev.dimension.flare.data.datasource.microblog.datasource.PostDataSource
 import dev.dimension.flare.data.repository.AccountRepository
 import dev.dimension.flare.data.repository.accountServiceFlow
@@ -21,6 +20,7 @@ import io.ktor.http.buildUrl
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
 import org.koin.core.component.KoinComponent
@@ -62,9 +62,9 @@ public class DeepLinkPresenter(
                         accountServiceFlow(
                             accountType = AccountType.Specific(event.accountKey),
                             repository = accountRepository,
-                        ).collect { service ->
-                            if (service is AuthenticatedMicroblogDataSource) {
-                                (service as PostDataSource).postEventHandler.handleEvent(event.postEvent)
+                        ).firstOrNull()?.let { service ->
+                            if (service is PostDataSource) {
+                                service.postEventHandler.handleEvent(event.postEvent)
                             }
                         }
                     }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt
index 4887cf49f..8920d9927 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/profile/ProfilePresenter.kt
@@ -78,8 +78,13 @@ public class ProfilePresenter(
 
     private val relationStateFlow by lazy {
         serviceFlow.flatMapLatest { service ->
-            require(service is AuthenticatedMicroblogDataSource)
-            val actualUserKey = userKey ?: service.accountKey
+            require(service is RelationDataSource)
+            val actualUserKey =
+                userKey ?: if (service is AuthenticatedMicroblogDataSource) {
+                    service.accountKey
+                } else {
+                    null
+                } ?: throw NoActiveAccountException
             (service as RelationDataSource).relationHandler.relation(actualUserKey).toUi()
         }
     }
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
index acc12e785..203932947 100644
--- 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
@@ -17,7 +17,7 @@ import dev.dimension.flare.model.DbAccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiState
 import dev.dimension.flare.ui.model.UiTimelineV2
-import dev.dimension.flare.ui.model.collectAsUiState
+import dev.dimension.flare.ui.model.flattenUiState
 import dev.dimension.flare.ui.model.onSuccess
 import dev.dimension.flare.ui.model.takeSuccess
 import dev.dimension.flare.ui.model.toUi
@@ -32,6 +32,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
 import org.koin.core.component.KoinComponent
@@ -56,9 +57,14 @@ public class StatusContextPresenter(
             accountType = accountType,
             repository = accountRepository,
         ).flatMapLatest { service ->
-            (service as PostDataSource).postHandler.post(statusKey).toUi()
-        }.mapNotNull { it.takeSuccess() }
-            .distinctUntilChanged()
+            if (service is PostDataSource) {
+                service.postHandler.post(statusKey).toUi()
+            } else {
+                flowOf(null)
+            }
+        }.mapNotNull {
+            it ?: UiState.Error(Exception("Current service does not support post data source"))
+        }.distinctUntilChanged()
     }
 
     private val timelinePresenter by lazy {
@@ -101,7 +107,7 @@ public class StatusContextPresenter(
             }
 
             override suspend fun transform(data: UiTimelineV2): UiTimelineV2 {
-                val currentCreatedAt = currentStatusFlow.firstOrNull()?.createdAt
+                val currentCreatedAt = currentStatusFlow.firstOrNull()?.takeSuccess()?.createdAt
                 if (data !is UiTimelineV2.Post || currentCreatedAt == null) {
                     return data
                 }
@@ -124,7 +130,7 @@ public class StatusContextPresenter(
 
     @Composable
     override fun body(): State {
-        val current by currentStatusFlow.collectAsUiState()
+        val current by currentStatusFlow.flattenUiState()
         val listState = timelinePresenter.body()
         current.onSuccess {
             remember {
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/PostEventHandlerTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/PostEventHandlerTest.kt
index 949d9fe56..535d86bfa 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/PostEventHandlerTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/PostEventHandlerTest.kt
@@ -84,7 +84,7 @@ class PostEventHandlerTest : RobolectricTest() {
             val original = createPost(actions = persistentListOf(createMenuItem(updateKey = "like", count = 1)))
             insertPost(original)
 
-            handler = PostEventHandler(accountKey = accountKey, handler = fakeRemoteHandler)
+            handler = PostEventHandler(accountType = AccountType.Specific(accountKey), handler = fakeRemoteHandler)
             handler.handleEvent(TestUpdateMenuEvent(postKey = postKey, updateKey = "like", nextCount = 2))
             advanceUntilIdle()
 
@@ -112,7 +112,7 @@ class PostEventHandlerTest : RobolectricTest() {
             insertPost(original)
 
             fakeRemoteHandler.shouldFail = true
-            handler = PostEventHandler(accountKey = accountKey, handler = fakeRemoteHandler)
+            handler = PostEventHandler(accountType = AccountType.Specific(accountKey), handler = fakeRemoteHandler)
             handler.handleEvent(TestUpdateMenuEvent(postKey = postKey, updateKey = "like", nextCount = 2))
             advanceUntilIdle()
 
@@ -151,7 +151,7 @@ class PostEventHandlerTest : RobolectricTest() {
                 )
             insertPost(createPost(poll = poll))
 
-            handler = PostEventHandler(accountKey = accountKey, handler = fakeRemoteHandler)
+            handler = PostEventHandler(accountType = AccountType.Specific(accountKey), handler = fakeRemoteHandler)
             handler.handleEvent(
                 PostEvent.Mastodon.Vote(
                     id = "poll-1",
@@ -187,12 +187,12 @@ class PostEventHandlerTest : RobolectricTest() {
             insertPost(createPost())
             db.pagingTimelineDao().insertAll(listOf(DbPagingTimeline(pagingKey = "home", statusKey = postKey, sortId = 1L)))
 
-            handler = PostEventHandler(accountKey = accountKey, handler = fakeRemoteHandler)
+            handler = PostEventHandler(accountType = AccountType.Specific(accountKey), handler = fakeRemoteHandler)
             handler.deleteFromCache(postKey)
 
             val saved = db.statusDao().get(postKey, AccountType.Specific(accountKey)).first()
             assertNull(saved)
-            val exists = db.pagingTimelineDao().existsPaging(accountKey, "home")
+            val exists = db.pagingTimelineDao().existsPaging(AccountType.Specific(accountKey), "home")
             assertTrue(!exists)
         }
 
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/RelationHandlerTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/RelationHandlerTest.kt
index ba08157b7..d360d8978 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/RelationHandlerTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/RelationHandlerTest.kt
@@ -10,6 +10,7 @@ import dev.dimension.flare.data.database.cache.model.DbUserRelation
 import dev.dimension.flare.data.datasource.microblog.loader.RelationActionType
 import dev.dimension.flare.data.datasource.microblog.loader.RelationLoader
 import dev.dimension.flare.memoryDatabaseBuilder
+import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiRelation
 import kotlinx.coroutines.CoroutineScope
@@ -49,7 +50,7 @@ class RelationHandlerTest : RobolectricTest() {
                 .setQueryCoroutineContext(Dispatchers.Unconfined)
                 .build()
 
-        loader = FakeRelationLoader(accountKey = accountKey, supportedTypes = RelationActionType.entries.toSet())
+        loader = FakeRelationLoader(supportedTypes = RelationActionType.entries.toSet())
     }
 
     @AfterTest
@@ -72,7 +73,7 @@ class RelationHandlerTest : RobolectricTest() {
 
             val expected = UiRelation(following = true, muted = true)
             loader.nextRelation = expected
-            handler = RelationHandler(dataSource = loader)
+            handler = RelationHandler(accountType = AccountType.Specific(accountKey), dataSource = loader)
             val cacheable = handler.relation(userKey)
 
             val valueDeferred =
@@ -87,7 +88,7 @@ class RelationHandlerTest : RobolectricTest() {
             assertTrue(refreshState is LoadState.NotLoading)
             assertEquals(expected, valueDeferred.await())
 
-            val saved = db.userDao().getUserRelation(accountKey, userKey).first()
+            val saved = db.userDao().getUserRelation(AccountType.Specific(accountKey), userKey).first()
             assertEquals(expected, saved?.relation)
             assertEquals(1, loader.relationCallCount)
         }
@@ -106,17 +107,17 @@ class RelationHandlerTest : RobolectricTest() {
 
             db.userDao().insertUserRelation(
                 DbUserRelation(
-                    accountKey = accountKey,
+                    accountType = AccountType.Specific(accountKey),
                     userKey = userKey,
                     relation = UiRelation(following = false),
                 ),
             )
 
-            handler = RelationHandler(dataSource = loader)
+            handler = RelationHandler(accountType = AccountType.Specific(accountKey), dataSource = loader)
             handler.follow(userKey)
             advanceUntilIdle()
 
-            val saved = db.userDao().getUserRelation(accountKey, userKey).first()
+            val saved = db.userDao().getUserRelation(AccountType.Specific(accountKey), userKey).first()
             assertTrue(saved?.relation?.following == true)
             assertEquals(1, loader.followCallCount)
         }
@@ -135,18 +136,18 @@ class RelationHandlerTest : RobolectricTest() {
 
             db.userDao().insertUserRelation(
                 DbUserRelation(
-                    accountKey = accountKey,
+                    accountType = AccountType.Specific(accountKey),
                     userKey = userKey,
                     relation = UiRelation(following = false),
                 ),
             )
             loader.failFollow = true
 
-            handler = RelationHandler(dataSource = loader)
+            handler = RelationHandler(accountType = AccountType.Specific(accountKey), dataSource = loader)
             handler.follow(userKey)
             advanceUntilIdle()
 
-            val saved = db.userDao().getUserRelation(accountKey, userKey).first()
+            val saved = db.userDao().getUserRelation(AccountType.Specific(accountKey), userKey).first()
             assertTrue(saved?.relation?.following == false)
             assertEquals(1, loader.followCallCount)
         }
@@ -165,35 +166,34 @@ class RelationHandlerTest : RobolectricTest() {
 
             db.userDao().insertUserRelation(
                 DbUserRelation(
-                    accountKey = accountKey,
+                    accountType = AccountType.Specific(accountKey),
                     userKey = userKey,
                     relation = UiRelation(hasPendingFollowRequestToYou = true, isFans = false),
                 ),
             )
 
-            handler = RelationHandler(dataSource = loader)
+            handler = RelationHandler(accountType = AccountType.Specific(accountKey), dataSource = loader)
             handler.approveFollowRequest(userKey)
 
-            val afterApprove = assertNotNull(db.userDao().getUserRelation(accountKey, userKey).first())
+            val afterApprove = assertNotNull(db.userDao().getUserRelation(AccountType.Specific(accountKey), userKey).first())
             assertTrue(afterApprove.relation.hasPendingFollowRequestToYou == false)
             assertTrue(afterApprove.relation.isFans == true)
 
             db.userDao().insertUserRelation(
                 DbUserRelation(
-                    accountKey = accountKey,
+                    accountType = AccountType.Specific(accountKey),
                     userKey = userKey,
                     relation = UiRelation(hasPendingFollowRequestToYou = true, isFans = true),
                 ),
             )
             handler.rejectFollowRequest(userKey)
 
-            val afterReject = assertNotNull(db.userDao().getUserRelation(accountKey, userKey).first())
+            val afterReject = assertNotNull(db.userDao().getUserRelation(AccountType.Specific(accountKey), userKey).first())
             assertTrue(afterReject.relation.hasPendingFollowRequestToYou == false)
             assertTrue(afterReject.relation.isFans == false)
         }
 
     private class FakeRelationLoader(
-        override val accountKey: MicroBlogKey,
         override val supportedTypes: Set<RelationActionType>,
     ) : RelationLoader {
         var nextRelation: UiRelation = UiRelation()
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandlerTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandlerTest.kt
index 2b53f5a8b..922284628 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandlerTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/handler/UserHandlerTest.kt
@@ -64,7 +64,7 @@ class UserHandlerTest : RobolectricTest() {
             )
         }
 
-        handler = UserHandler(accountKey = accountKey, loader = loader)
+        handler = UserHandler(host = accountKey.host, loader = loader)
     }
 
     @AfterTest

From 43527b9836f698364e2792a85baa1d381dd5d037 Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Sat, 7 Mar 2026 12:43:26 +0900
Subject: [PATCH 32/33] update ios follow button

---
 .../UI/Component/CommonProfileHeader.swift    | 103 +++++++++++++-----
 1 file changed, 78 insertions(+), 25 deletions(-)

diff --git a/iosApp/flare/UI/Component/CommonProfileHeader.swift b/iosApp/flare/UI/Component/CommonProfileHeader.swift
index 7ddae75d5..2cae8d920 100644
--- a/iosApp/flare/UI/Component/CommonProfileHeader.swift
+++ b/iosApp/flare/UI/Component/CommonProfileHeader.swift
@@ -7,6 +7,38 @@ enum CommonProfileHeaderConstants {
     static let avatarSize: CGFloat = 96
 }
 
+private enum FollowButtonState: Equatable {
+    case blocked
+    case following
+    case requested
+    case follow
+
+    init(_ relation: UiRelation) {
+        if relation.blocking {
+            self = .blocked
+        } else if relation.following {
+            self = .following
+        } else if relation.hasPendingFollowRequestFromYou {
+            self = .requested
+        } else {
+            self = .follow
+        }
+    }
+
+    var titleKey: LocalizedStringKey {
+        switch self {
+        case .blocked:
+            "relation_blocked"
+        case .following:
+            "relation_following"
+        case .requested:
+            "relation_requested"
+        case .follow:
+            "relation_follow"
+        }
+    }
+}
+
 struct CommonProfileHeader: View {
     @Environment(\.horizontalSizeClass) private var horizontalSizeClass
     @Environment(\.openURL) private var openURL
@@ -53,37 +85,34 @@ struct CommonProfileHeader: View {
                     VStack {
                         Spacer()
                             .frame(height: CommonProfileHeaderConstants.headerHeight)
-                            if case .success(let data) = onEnum(of: isMe), !data.data.boolValue {
-                                switch onEnum(of: relation) {
-                                case .success(let relationState):
-                                    Button(action: {
+                        if case .success(let data) = onEnum(of: isMe), !data.data.boolValue {
+                            switch onEnum(of: relation) {
+                            case .success(let relationState):
+                                let buttonState = FollowButtonState(relationState.data)
+                                VStack(spacing: 4) {
+                                    followButton(state: buttonState) {
                                         onFollowClick(relationState.data)
-                                    }, label: {
-                                        let text = if relationState.data.blocking {
-                                            String(localized: "relation_blocked")
-                                        } else if relationState.data.following {
-                                            String(localized: "relation_following")
-                                        } else if relationState.data.hasPendingFollowRequestFromYou {
-                                            String(localized: "relation_requested")
-                                        } else {
-                                            String(localized: "relation_follow")
-                                        }
-                                        Text(text)
-                                    })
-                                    .backport
-                                    .glassProminentButtonStyle()
+                                    }
+                                    .id(buttonState)
+                                    .transition(.opacity.combined(with: .scale(scale: 0.92)))
+
                                     if relationState.data.isFans {
                                         Text("relation_is_fans")
+                                            .font(.caption)
+                                            .foregroundStyle(.secondary)
+                                            .multilineTextAlignment(.center)
                                     }
-                                case .loading: Button(action: {}, label: {
-                                    Text("#loading")
-                                })
-                                .backport
-                                .glassProminentButtonStyle()
-                                .redacted(reason: .placeholder)
-                                case .error: EmptyView()
                                 }
+                                .animation(.spring(response: 0.25, dampingFraction: 0.86), value: buttonState)
+                            case .loading: Button(action: {}, label: {
+                                Text("#loading")
+                            })
+                            .backport
+                            .glassProminentButtonStyle()
+                            .redacted(reason: .placeholder)
+                            case .error: EmptyView()
                             }
+                        }
                     }
                 }
 
@@ -99,6 +128,30 @@ struct CommonProfileHeader: View {
             .padding([.horizontal])
         }
     }
+
+    @ViewBuilder
+    private func followButton(state: FollowButtonState, action: @escaping () -> Void) -> some View {
+        switch state {
+        case .blocked:
+            Button(action: action) {
+                Text(state.titleKey)
+            }
+            .tint(.red)
+            .buttonStyle(.borderedProminent)
+        case .following, .requested:
+            Button(action: action) {
+                Text(state.titleKey)
+            }
+            .backport
+            .glassButtonStyle(fallbackStyle: .bordered)
+        case .follow:
+            Button(action: action) {
+                Text(state.titleKey)
+            }
+            .backport
+            .glassProminentButtonStyle()
+        }
+    }
     
     var content: some View {
         VStack(

From 3111d3bcb0fa04ba8c9390d4463398d61e18e638 Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Sat, 7 Mar 2026 13:50:22 +0900
Subject: [PATCH 33/33] fix #1671

---
 .../paging/TimelineRemoteMediator.kt          |  70 ++++++++-
 .../flare/ui/model/mapper/Bluesky.kt          |   1 -
 .../microblog/MixedRemoteMediatorTest.kt      | 148 +++++++++++++++++-
 3 files changed, 213 insertions(+), 6 deletions(-)

diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelineRemoteMediator.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelineRemoteMediator.kt
index 13772125d..de4ceeae4 100644
--- a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelineRemoteMediator.kt
+++ b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/paging/TimelineRemoteMediator.kt
@@ -4,7 +4,10 @@ import androidx.paging.ExperimentalPagingApi
 import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.database.cache.mapper.saveToDatabase
 import dev.dimension.flare.data.database.cache.model.DbPagingTimelineWithStatus
+import dev.dimension.flare.model.AccountType
+import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiTimelineV2
+import kotlinx.collections.immutable.toImmutableList
 
 @OptIn(ExperimentalPagingApi::class)
 internal class TimelineRemoteMediator(
@@ -44,10 +47,15 @@ internal class TimelineRemoteMediator(
         pageSize: Int,
         request: PagingRequest,
     ): PagingResult<UiTimelineV2> =
-        loader.load(
-            pageSize = pageSize,
-            request = request,
-        )
+        loader
+            .load(
+                pageSize = pageSize,
+                request = request,
+            ).let { result ->
+                result.copy(
+                    data = result.data.collapseReplyChains(),
+                )
+            }
 
     override suspend fun onSaveCache(
         request: PagingRequest,
@@ -63,3 +71,57 @@ internal class TimelineRemoteMediator(
         saveToDatabase(database, data)
     }
 }
+
+private fun List<UiTimelineV2>.collapseReplyChains(): List<UiTimelineV2> {
+    val rootPosts =
+        asSequence()
+            .filterIsInstance<UiTimelineV2.Post>()
+            .associateBy { it.accountType to it.statusKey }
+    if (rootPosts.isEmpty()) {
+        return this
+    }
+
+    val collapsedPosts = mutableMapOf<Pair<AccountType, MicroBlogKey>, UiTimelineV2.Post>()
+    val ancestorKeys = mutableSetOf<Pair<AccountType, MicroBlogKey>>()
+
+    fun collapse(post: UiTimelineV2.Post): UiTimelineV2.Post {
+        val key = post.accountType to post.statusKey
+        collapsedPosts[key]?.let {
+            return it
+        }
+
+        val directParent =
+            post.parents
+                .lastOrNull()
+                ?.takeIf { rootPosts.containsKey(it.accountType to it.statusKey) }
+                ?.let { rootPosts.getValue(it.accountType to it.statusKey) }
+
+        val collapsed =
+            if (directParent == null || directParent.accountType != post.accountType) {
+                post
+            } else {
+                ancestorKeys += directParent.accountType to directParent.statusKey
+                val collapsedParent = collapse(directParent)
+                post.copy(
+                    parents =
+                        (
+                            collapsedParent.parents +
+                                listOf(collapsedParent) +
+                                post.parents.dropLast(1)
+                        ).distinctBy { it.statusKey }
+                            .toImmutableList(),
+                )
+            }
+        collapsedPosts[key] = collapsed
+        return collapsed
+    }
+
+    return mapNotNull { item ->
+        if (item !is UiTimelineV2.Post) {
+            item
+        } else {
+            val key = item.accountType to item.statusKey
+            collapse(item).takeUnless { key in ancestorKeys }
+        }
+    }
+}
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
index 153573271..fd92d77e5 100644
--- 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
@@ -417,7 +417,6 @@ private val ListNotificationsNotificationReason.type: UiTimelineV2.Message.Type
         }
 
 internal fun List<FeedViewPost>.render(accountKey: MicroBlogKey): List<UiTimelineV2> {
-    // TODO: https://github.com/DimensionDev/Flare/issues/1671
     return this.map { it.render(accountKey) }
 }
 
diff --git a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediatorTest.kt b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediatorTest.kt
index 8fb9db406..f6019a0ac 100644
--- a/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediatorTest.kt
+++ b/shared/src/commonTest/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediatorTest.kt
@@ -7,18 +7,27 @@ import androidx.paging.PagingSource
 import androidx.paging.PagingState
 import androidx.room.Room
 import androidx.sqlite.driver.bundled.BundledSQLiteDriver
+import com.fleeksoft.ksoup.nodes.Element
 import dev.dimension.flare.RobolectricTest
 import dev.dimension.flare.common.TestFormatter
 import dev.dimension.flare.data.database.cache.CacheDatabase
 import dev.dimension.flare.data.datasource.microblog.paging.CacheableRemoteLoader
 import dev.dimension.flare.data.datasource.microblog.paging.PagingRequest
 import dev.dimension.flare.data.datasource.microblog.paging.PagingResult
+import dev.dimension.flare.data.datasource.microblog.paging.TimelinePagingMapper
 import dev.dimension.flare.data.datasource.microblog.paging.TimelineRemoteMediator
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.model.PlatformType
 import dev.dimension.flare.memoryDatabaseBuilder
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.ui.humanizer.PlatformFormatter
+import dev.dimension.flare.ui.model.ClickEvent
+import dev.dimension.flare.ui.model.UiHandle
+import dev.dimension.flare.ui.model.UiProfile
 import dev.dimension.flare.ui.model.UiTimelineV2
 import dev.dimension.flare.ui.render.toUi
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toPersistentList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
@@ -27,11 +36,13 @@ import org.koin.core.context.stopKoin
 import org.koin.dsl.module
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
-import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertIs
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
+import kotlin.test.Test
 import kotlin.test.assertTrue
+import kotlin.time.Clock
 import kotlin.time.Instant
 
 @OptIn(ExperimentalCoroutinesApi::class)
@@ -243,6 +254,88 @@ class MixedRemoteMediatorTest : RobolectricTest() {
             )
         }
 
+    @OptIn(ExperimentalPagingApi::class)
+    @Test
+    fun refreshCollapsesLinearReplyChainIntoLatestPost() =
+        runTest {
+            val accountKey = MicroBlogKey("mastodon.example", "timeline")
+            val accountType = AccountType.Specific(accountKey)
+            val user = profile(MicroBlogKey("mastodon.example", "user"), "User")
+            val postA =
+                createPost(
+                    accountType = accountType,
+                    user = user,
+                    statusKey = MicroBlogKey("mastodon.example", "a"),
+                    text = "A",
+                )
+            val postB =
+                createPost(
+                    accountType = accountType,
+                    user = user,
+                    statusKey = MicroBlogKey("mastodon.example", "b"),
+                    text = "B",
+                    parents = listOf(postA),
+                )
+            val postC =
+                createPost(
+                    accountType = accountType,
+                    user = user,
+                    statusKey = MicroBlogKey("mastodon.example", "c"),
+                    text = "C",
+                    parents = listOf(postB),
+                )
+            val loader =
+                FakeLoader("reply_chain") { request ->
+                    when (request) {
+                        PagingRequest.Refresh ->
+                            PagingResult(
+                                data = listOf(postC, postB, postA),
+                                nextKey = null,
+                            )
+
+                        is PagingRequest.Append -> error("No append expected")
+                        is PagingRequest.Prepend -> error("No prepend expected")
+                    }
+                }
+
+            val mediator = TimelineRemoteMediator(loader = loader, database = db)
+            val mediatorResult =
+                mediator.load(
+                    loadType = LoadType.REFRESH,
+                    state =
+                        PagingState(
+                            pages = emptyList(),
+                            anchorPosition = null,
+                            config = PagingConfig(pageSize = 20),
+                            leadingPlaceholderCount = 0,
+                        ),
+                )
+            assertTrue(mediatorResult is androidx.paging.RemoteMediator.MediatorResult.Success)
+
+            val pagingSource = db.pagingTimelineDao().getPagingSource(mediator.pagingKey)
+            val page =
+                pagingSource.load(
+                    PagingSource.LoadParams.Refresh(
+                        key = null,
+                        loadSize = 20,
+                        placeholdersEnabled = false,
+                    ),
+                )
+            assertTrue(page is PagingSource.LoadResult.Page)
+            assertEquals(1, page.data.size)
+
+            val post =
+                assertIs<UiTimelineV2.Post>(
+                    TimelinePagingMapper.toUi(
+                        item = page.data.single(),
+                        pagingKey = mediator.pagingKey,
+                        useDbKeyInItemKey = false,
+                    ),
+                )
+            assertEquals(postC.statusKey, post.statusKey)
+            assertEquals(listOf(postA.statusKey, postB.statusKey), post.parents.map { it.statusKey })
+        }
+
     private class FakeLoader(
         override val pagingKey: String,
         private val onLoad: suspend (PagingRequest) -> PagingResult<UiTimelineV2>,
@@ -274,4 +367,57 @@ class MixedRemoteMediatorTest : RobolectricTest() {
         openInBrowser = false,
         accountType = AccountType.Guest,
     )
+
+    private fun profile(
+        key: MicroBlogKey,
+        name: String,
+    ): UiProfile =
+        UiProfile(
+            key = key,
+            handle =
+                UiHandle(
+                    raw = key.id,
+                    host = key.host,
+                ),
+            avatar = "https://${key.host}/${key.id}.png",
+            nameInternal = Element("span").apply { appendText(name) }.toUi(),
+            platformType = PlatformType.Mastodon,
+            clickEvent = ClickEvent.Noop,
+            banner = null,
+            description = null,
+            matrices = UiProfile.Matrices(fansCount = 0, followsCount = 0, statusesCount = 0, platformFansCount = "0"),
+            mark = persistentListOf(),
+            bottomContent = null,
+        )
+
+    private fun createPost(
+        accountType: AccountType,
+        user: UiProfile,
+        statusKey: MicroBlogKey,
+        text: String,
+        parents: List<UiTimelineV2.Post> = emptyList(),
+    ): UiTimelineV2.Post =
+        UiTimelineV2.Post(
+            message = null,
+            platformType = PlatformType.Mastodon,
+            images = persistentListOf(),
+            sensitive = false,
+            contentWarning = null,
+            user = user,
+            quote = persistentListOf(),
+            content = Element("span").apply { appendText(text) }.toUi(),
+            actions = persistentListOf(),
+            poll = null,
+            statusKey = statusKey,
+            card = null,
+            createdAt = Clock.System.now().toUi(),
+            emojiReactions = persistentListOf(),
+            sourceChannel = null,
+            visibility = null,
+            replyToHandle = null,
+            references = persistentListOf(),
+            parents = parents.toPersistentList(),
+            clickEvent = ClickEvent.Noop,
+            accountType = accountType,
+        )
 }