Merge pull request #1095 from DimensionDev/feature/misskey_social_timeline

Tlaster · web-flow · commit f5757b4f82c0 · 2025-07-14T15:09:10.000+09:00
add social timeline support for misskey
diff --git a/app/src/main/java/dev/dimension/flare/data/model/TabSettings.kt b/app/src/main/java/dev/dimension/flare/data/model/TabSettings.kt
@@ -46,6 +46,7 @@ internal val TitleType.Localized.resId: Int
             TitleType.Localized.LocalizedKey.Rss -> R.string.rss_title
             TitleType.Localized.LocalizedKey.Antenna -> R.string.home_tab_antennas_title
             TitleType.Localized.LocalizedKey.MixedTimeline -> R.string.home_tab_mixed_timeline_title
+            TitleType.Localized.LocalizedKey.Social -> R.string.home_tab_social_timeline_title
         }
 
 internal fun IconType.Material.MaterialIcon.toIcon(): ImageVector =
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -323,6 +323,7 @@
     <string name="home_tab_mixed_timeline_title">Mixed</string>
     <string name="tab_settings_mixed_timeline">Add mixed timeline tab</string>
     <string name="tab_settings_mixed_timeline_desc">Mixed timeline will mix all tabs timeline result in one tab</string>
+    <string name="home_tab_social_timeline_title">Social</string>
 
     <string name="changelog_current">
         <![CDATA[
diff --git a/desktopApp/src/main/composeResources/values/strings.xml b/desktopApp/src/main/composeResources/values/strings.xml
@@ -114,4 +114,6 @@
     <string name="feeds_discover_feeds_created_by">Created by %1$s</string>
     <string name="feeds_unsubscribe">Unsubscribe</string>
     <string name="feeds_subscribe">Subscribe</string>
+
+    <string name="social_title">Social</string>
 </resources>
diff --git a/desktopApp/src/main/kotlin/dev/dimension/flare/data/model/TabSettings.kt b/desktopApp/src/main/kotlin/dev/dimension/flare/data/model/TabSettings.kt
@@ -35,6 +35,7 @@ import dev.dimension.flare.mastodon_tab_local_title
 import dev.dimension.flare.mastodon_tab_public_title
 import dev.dimension.flare.rss_title
 import dev.dimension.flare.settings_title
+import dev.dimension.flare.social_title
 import dev.dimension.flare.ui.icons.Misskey
 import org.jetbrains.compose.resources.StringResource
 
@@ -55,6 +56,7 @@ internal val TitleType.Localized.res: StringResource
             TitleType.Localized.LocalizedKey.Feeds -> Res.string.home_tab_feeds_title
             TitleType.Localized.LocalizedKey.DirectMessage -> Res.string.dm_list_title
             TitleType.Localized.LocalizedKey.Rss -> Res.string.rss_title
+            TitleType.Localized.LocalizedKey.Social -> Res.string.social_title
         }
 
 internal fun IconType.Material.MaterialIcon.toIcon(): ImageVector =
diff --git a/shared/src/androidJvmMain/kotlin/dev/dimension/flare/data/model/TabSettings.kt b/shared/src/androidJvmMain/kotlin/dev/dimension/flare/data/model/TabSettings.kt
@@ -75,6 +75,7 @@ public sealed interface TitleType {
             Rss,
             Antenna,
             MixedTimeline,
+            Social,
         }
     }
 }
@@ -399,6 +400,14 @@ public sealed interface TimelineTabItem : TabItem {
                             icon = IconType.Mixed(IconType.Material.MaterialIcon.List, accountKey),
                         ),
                 ),
+                Misskey.HybridTimelineTabItem(
+                    account = AccountType.Specific(accountKey),
+                    metaData =
+                        TabMetaData(
+                            title = TitleType.Localized(TitleType.Localized.LocalizedKey.Social),
+                            icon = IconType.Mixed(IconType.Material.MaterialIcon.Featured, accountKey),
+                        ),
+                ),
                 Misskey.LocalTimelineTabItem(
                     account = AccountType.Specific(accountKey),
                     metaData =
@@ -753,6 +762,20 @@ public object Misskey {
         override fun update(metaData: TabMetaData): TabItem = copy(metaData = metaData)
     }
 
+    @Serializable
+    public data class HybridTimelineTabItem(
+        override val account: AccountType,
+        override val metaData: TabMetaData,
+    ) : TimelineTabItem {
+        override val key: String = "hybrid_$account"
+
+        override fun createPresenter(): TimelinePresenter =
+            dev.dimension.flare.ui.presenter.home.misskey
+                .MisskeyHybridTimelinePresenter(account)
+
+        override fun update(metaData: TabMetaData): TabItem = copy(metaData = metaData)
+    }
+
     @Serializable
     public data class FavouriteTimelineTabItem(
         override val account: AccountType,
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
@@ -0,0 +1,65 @@
+package dev.dimension.flare.data.datasource.misskey
+
+import androidx.paging.LoadType
+import androidx.paging.PagingState
+import dev.dimension.flare.common.BaseTimelineRemoteMediator
+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.network.misskey.MisskeyService
+import dev.dimension.flare.data.network.misskey.api.model.NotesHybridTimelineRequest
+import dev.dimension.flare.model.MicroBlogKey
+
+internal class HybridTimelineRemoteMediator(
+    private val accountKey: MicroBlogKey,
+    private val service: MisskeyService,
+    private val database: CacheDatabase,
+) : BaseTimelineRemoteMediator(
+        database = database,
+    ) {
+    override val pagingKey = "hybrid_timeline_$accountKey"
+
+    override suspend fun timeline(
+        loadType: LoadType,
+        state: PagingState<Int, DbPagingTimelineWithStatus>,
+    ): Result {
+        val response =
+            when (loadType) {
+                LoadType.PREPEND -> return Result(
+                    endOfPaginationReached = true,
+                )
+                LoadType.REFRESH -> {
+                    service.notesHybridTimeline(
+                        NotesHybridTimelineRequest(
+                            limit = state.config.pageSize,
+                        ),
+                    )
+                }
+
+                LoadType.APPEND -> {
+                    val lastItem =
+                        database.pagingTimelineDao().getLastPagingTimeline(pagingKey)
+                            ?: return Result(
+                                endOfPaginationReached = true,
+                            )
+                    service.notesHybridTimeline(
+                        NotesHybridTimelineRequest(
+                            limit = state.config.pageSize,
+                            untilId = lastItem.timeline.statusKey.id,
+                        ),
+                    )
+                }
+            } ?: return Result(
+                endOfPaginationReached = true,
+            )
+
+        return Result(
+            endOfPaginationReached = response.isEmpty(),
+            data =
+                response.toDbPagingTimeline(
+                    accountKey = accountKey,
+                    pagingKey = pagingKey,
+                ),
+        )
+    }
+}
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
@@ -111,7 +111,6 @@ internal class MisskeyDataSource(
 
     fun localTimeline(
         pageSize: Int = 20,
-        pagingKey: String = "local_$accountKey",
         scope: CoroutineScope,
     ): Flow<PagingData<UiTimeline>> =
         timelinePager(
@@ -130,9 +129,15 @@ internal class MisskeyDataSource(
             database,
         )
 
+    fun hybridTimelineLoader() =
+        HybridTimelineRemoteMediator(
+            accountKey,
+            service,
+            database,
+        )
+
     fun publicTimeline(
         pageSize: Int = 20,
-        pagingKey: String = "public_$accountKey",
         scope: CoroutineScope,
     ): Flow<PagingData<UiTimeline>> =
         timelinePager(
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
@@ -0,0 +1,29 @@
+package dev.dimension.flare.ui.presenter.home.misskey
+
+import dev.dimension.flare.common.BaseTimelineLoader
+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.presenter.home.TimelinePresenter
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+
+public class MisskeyHybridTimelinePresenter(
+    private val accountType: AccountType,
+) : TimelinePresenter(),
+    KoinComponent {
+    private val accountRepository: AccountRepository by inject()
+
+    override val loader: Flow<BaseTimelineLoader> by lazy {
+        accountServiceFlow(
+            accountType = accountType,
+            repository = accountRepository,
+        ).map { service ->
+            require(service is MisskeyDataSource)
+            service.hybridTimelineLoader()
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ internal val TitleType.Localized.resId: Int`
`46`	`46`	`TitleType.Localized.LocalizedKey.Rss -> R.string.rss_title`
`47`	`47`	`TitleType.Localized.LocalizedKey.Antenna -> R.string.home_tab_antennas_title`
`48`	`48`	`TitleType.Localized.LocalizedKey.MixedTimeline -> R.string.home_tab_mixed_timeline_title`
	`49`	`+ TitleType.Localized.LocalizedKey.Social -> R.string.home_tab_social_timeline_title`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`internal fun IconType.Material.MaterialIcon.toIcon(): ImageVector =`