feat(weibo): support groups, friends circle and private following

app/src/main/java/dev/dimension/flare/ui/screen/settings/EditTabDialog.kt

@@ -222,6 +222,8 @@ private val UiStrings.androidStringRes: Int
             UiStrings.Reposts -> R.string.tab_settings_filter_repost
 
             UiStrings.Articles -> R.string.profile_tab_articles
+            UiStrings.WeiboFriendsCircle -> R.string.weibo_friends_circle_title
+            UiStrings.WeiboPrivateFollowing -> R.string.weibo_private_following_title
 
             UiStrings.Media -> R.string.profile_tab_media
 

app/src/main/res/values-zh-rCN/strings.xml

@@ -927,4 +927,6 @@
     <string name="agent_error_details">错误详情</string>
     <string name="agent_error_retry">重试</string>
     <string name="agent_error_interrupted">执行已中断，请确认已完成的操作后再发送新消息。</string>
+    <string name="weibo_friends_circle_title">好友圈</string>
+    <string name="weibo_private_following_title">悄悄关注</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -798,4 +798,6 @@
     <string name="agent_error_retry">重試</string>
     <string name="agent_error_interrupted">執行已中斷，請確認已完成的操作後再傳送新訊息。</string>
     <string name="plugin_uninstall_confirm_message">從本機刪除 %1$s 及其帳號、憑證和帳號資料？刪除後立即生效。</string>
+    <string name="weibo_friends_circle_title">好友圈</string>
+    <string name="weibo_private_following_title">悄悄關注</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -992,4 +992,6 @@
     <string name="agent_error_details">Error details</string>
     <string name="agent_error_retry">Retry</string>
     <string name="agent_error_interrupted">This run was interrupted. Check what was completed before sending another message.</string>
+    <string name="weibo_friends_circle_title">Friends Circle</string>
+    <string name="weibo_private_following_title">Private Following</string>
 </resources>

appleApp/Shared/FlareAppleCore/Sources/FlareAppleCore/PresentationMappings.swift

@@ -226,6 +226,10 @@ public extension UiStrings {
             localizedPresentationString("vvo_status_reposts", fallback: "Reposts")
         case .articles:
             localizedPresentationString("profile_tab_articles", fallback: "Articles")
+        case .weiboFriendsCircle:
+            localizedPresentationString("weibo_friends_circle_title", fallback: "Friends Circle")
+        case .weiboPrivateFollowing:
+            localizedPresentationString("weibo_private_following_title", fallback: "Private Following")
         case .media:
             localizedPresentationString("appearance_media_group_title", fallback: "Media")
         }

appleApp/Shared/FlareAppleResource/Resources/Localizable.xcstrings

@@ -1,6 +1,50 @@
 {
   "sourceLanguage" : "en",
   "strings" : {
+    "weibo_friends_circle_title" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Friends Circle"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "好友圈"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "好友圈"
+          }
+        }
+      }
+    },
+    "weibo_private_following_title" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Private Following"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "悄悄关注"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "悄悄關注"
+          }
+        }
+      }
+    },
   "agent_error_interrupted": {
     "localizations": {
       "en": {

compose-ui/src/commonMain/composeResources/values-zh-rCN/strings.xml

@@ -446,4 +446,6 @@
     <string name="share_replies_retry">重试</string>
     <string name="share_replies_children">加载这条评论的回复</string>
 
+    <string name="weibo_friends_circle_title">好友圈</string>
+    <string name="weibo_private_following_title">悄悄关注</string>
 </resources>

compose-ui/src/commonMain/composeResources/values-zh-rTW/strings.xml

@@ -436,4 +436,6 @@
     <string name="fanbox_recommended_creators_title">推薦創作者</string>
 <string name="ugoira_play">播放動圖</string>
 <string name="ugoira_loading">正在載入動圖</string>
+    <string name="weibo_friends_circle_title">好友圈</string>
+    <string name="weibo_private_following_title">悄悄關注</string>
 </resources>

compose-ui/src/commonMain/composeResources/values/strings.xml

@@ -587,4 +587,6 @@
     <string name="share_replies_retry">Retry</string>
     <string name="share_replies_children">Load replies to this comment</string>
 
+    <string name="weibo_friends_circle_title">Friends Circle</string>
+    <string name="weibo_private_following_title">Private Following</string>
 </resources>

compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/TabIcon.kt

@@ -76,6 +76,8 @@ import dev.dimension.flare.compose.ui.settings_title
 import dev.dimension.flare.compose.ui.social_title
 import dev.dimension.flare.compose.ui.tab_settings_default
 import dev.dimension.flare.compose.ui.tab_settings_filter_repost
+import dev.dimension.flare.compose.ui.weibo_friends_circle_title
+import dev.dimension.flare.compose.ui.weibo_private_following_title
 import dev.dimension.flare.data.model.IconType
 import dev.dimension.flare.data.model.ProxyRef
 import dev.dimension.flare.data.model.tab.UiTimelineTabItem
@@ -357,6 +359,8 @@ internal val UiStrings.res: StringResource
             UiStrings.Reposts -> Res.string.tab_settings_filter_repost
 
             UiStrings.Articles -> Res.string.profile_tab_articles
+            UiStrings.WeiboFriendsCircle -> Res.string.weibo_friends_circle_title
+            UiStrings.WeiboPrivateFollowing -> Res.string.weibo_private_following_title
 
             UiStrings.Media -> Res.string.media_title
 

desktopApp/src/main/composeResources/values-zh-rCN/strings.xml

@@ -854,4 +854,6 @@
     <string name="agent_error_details">错误详情</string>
     <string name="agent_error_retry">重试</string>
     <string name="agent_error_interrupted">执行已中断，请确认已完成的操作后再发送新消息。</string>
+    <string name="weibo_friends_circle_title">好友圈</string>
+    <string name="weibo_private_following_title">悄悄关注</string>
 </resources>

desktopApp/src/main/composeResources/values-zh-rTW/strings.xml

@@ -714,4 +714,6 @@
     <string name="agent_error_retry">重試</string>
     <string name="agent_error_interrupted">執行已中斷，請確認已完成的操作後再傳送新訊息。</string>
     <string name="plugin_uninstall_confirm_message">從本機刪除 %1$s 及其帳號、憑證和帳號資料？刪除後立即生效。</string>
+    <string name="weibo_friends_circle_title">好友圈</string>
+    <string name="weibo_private_following_title">悄悄關注</string>
 </resources>

desktopApp/src/main/composeResources/values/strings.xml

@@ -903,4 +903,6 @@
     <string name="agent_error_details">Error details</string>
     <string name="agent_error_retry">Retry</string>
     <string name="agent_error_interrupted">This run was interrupted. Check what was completed before sending another message.</string>
+    <string name="weibo_friends_circle_title">Friends Circle</string>
+    <string name="weibo_private_following_title">Private Following</string>
 </resources>

desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/EditTabDialog.kt

@@ -80,6 +80,8 @@ import dev.dimension.flare.ui.model.UiStrings
 import dev.dimension.flare.ui.model.onSuccess
 import dev.dimension.flare.ui.presenter.invoke
 import dev.dimension.flare.ui.screen.settings.EditTabPresenter
+import dev.dimension.flare.weibo_friends_circle_title
+import dev.dimension.flare.weibo_private_following_title
 import io.github.composefluent.component.ContentDialog
 import io.github.composefluent.component.ContentDialogButton
 import io.github.composefluent.component.Text
@@ -276,6 +278,8 @@ private val UiStrings.desktopStringResource: StringResource
             UiStrings.Reposts -> Res.string.tab_settings_filter_repost
 
             UiStrings.Articles -> Res.string.profile_tab_articles
+            UiStrings.WeiboFriendsCircle -> Res.string.weibo_friends_circle_title
+            UiStrings.WeiboPrivateFollowing -> Res.string.weibo_private_following_title
 
             UiStrings.Media -> Res.string.profile_tab_media
 

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

@@ -65,6 +65,8 @@ public enum class UiStrings {
     Popular,
     Reposts,
     Articles,
+    WeiboFriendsCircle,
+    WeiboPrivateFollowing,
 }
 
 public fun UiStrings.asText(): UiText = UiText.Localized(this)

social/vvo/build.gradle.kts

@@ -57,6 +57,7 @@ kotlin {
         val commonTest by getting {
             dependencies {
                 implementation(kotlin("test"))
+                implementation(libs.kotlinx.serialization.protobuf)
                 implementation(libs.kotlinx.coroutines.test)
                 implementation(libs.paging.testing)
                 implementation(libs.ktor.client.mock)

social/vvo/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt

@@ -1,6 +1,7 @@
 package dev.dimension.flare.data.datasource.vvo
 
 import androidx.paging.ExperimentalPagingApi
+import androidx.paging.Pager
 import dev.dimension.flare.common.CacheData
 import dev.dimension.flare.common.FileItem
 import dev.dimension.flare.common.MemCacheable
@@ -16,6 +17,8 @@ import dev.dimension.flare.data.datasource.microblog.NotificationTimelineDataSou
 import dev.dimension.flare.data.datasource.microblog.PostEvent
 import dev.dimension.flare.data.datasource.microblog.ProfileTab
 import dev.dimension.flare.data.datasource.microblog.datasource.NotificationDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.PinnableTimelineTabDataSource
+import dev.dimension.flare.data.datasource.microblog.datasource.PinnableTimelineTabSection
 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.TimelineTabConfigurationDataSource
@@ -30,6 +33,7 @@ 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.ShareRepliesLoader
+import dev.dimension.flare.data.datasource.microblog.pagingConfig
 import dev.dimension.flare.data.model.IconType
 import dev.dimension.flare.data.model.ProxyRef
 import dev.dimension.flare.data.model.tab.ShortcutSpec
@@ -80,6 +84,7 @@ internal class VVODataSource(
     UserDataSource,
     RelationDataSource,
     TimelineTabConfigurationDataSource,
+    PinnableTimelineTabDataSource,
     PostDataSource,
     PostEventHandler.Handler {
     private val imageCompressor: ImageCompressor by koinInject()
@@ -107,6 +112,22 @@ internal class VVODataSource(
         }
     }
 
+    override val pinnableTimelineTabs: List<PinnableTimelineTabSection> by lazy {
+        listOf(
+            PinnableTimelineTabSection(
+                title = UiStrings.List,
+                data = Pager(config = pagingConfig) { VVOGroupPagingSource(service, accountKey) }.flow,
+            ),
+        )
+    }
+
+    fun groupTimeline(groupId: String): RemoteLoader<UiTimelineV2> =
+        VVOFeedTimelineRemoteMediator(service, accountKey, VVOFeed.Group(groupId))
+
+    fun friendsCircleTimeline(): RemoteLoader<UiTimelineV2> = VVOFeedTimelineRemoteMediator(service, accountKey, VVOFeed.Circle)
+
+    fun privateFollowingTimeline(): RemoteLoader<UiTimelineV2> = VVOFeedTimelineRemoteMediator(service, accountKey, VVOFeed.Private)
+
     override val defaultTabs by lazy {
         persistentListOf(
             CommonTimelineSpecs.home
@@ -130,6 +151,8 @@ internal class VVODataSource(
             ),
             VvoPlatformSpec.favoriteTimelineSpec.candidate(TimelineSpec.AccountBasedData(accountKey)),
             VvoPlatformSpec.likedTimelineSpec.candidate(TimelineSpec.AccountBasedData(accountKey)),
+            VvoPlatformSpec.friendsCircleTimelineSpec.candidate(TimelineSpec.AccountBasedData(accountKey)),
+            VvoPlatformSpec.privateFollowingTimelineSpec.candidate(TimelineSpec.AccountBasedData(accountKey)),
         )
     }
 
@@ -159,6 +182,22 @@ internal class VVODataSource(
                         VvoPlatformSpec.likedTimelineSpec.candidate(TimelineSpec.AccountBasedData(accountKey)),
                     ),
             ),
+            ShortcutSpec(
+                title = UiStrings.WeiboFriendsCircle,
+                icon = UiIcon.Follow,
+                target =
+                    ShortcutSpec.Target.Timeline(
+                        VvoPlatformSpec.friendsCircleTimelineSpec.candidate(TimelineSpec.AccountBasedData(accountKey)),
+                    ),
+            ),
+            ShortcutSpec(
+                title = UiStrings.WeiboPrivateFollowing,
+                icon = UiIcon.Eye,
+                target =
+                    ShortcutSpec.Target.Timeline(
+                        VvoPlatformSpec.privateFollowingTimelineSpec.candidate(TimelineSpec.AccountBasedData(accountKey)),
+                    ),
+            ),
         )
     }
 

social/vvo/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVOFeedTimelineRemoteMediator.kt

@@ -0,0 +1,66 @@
+package dev.dimension.flare.data.datasource.vvo
+
+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.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiTimelineV2
+import dev.dimension.flare.ui.model.mapper.render
+
+internal sealed interface VVOFeed {
+    data class Group(
+        val id: String,
+    ) : VVOFeed {
+        init {
+            require(id.isNotBlank()) { "Weibo group ID is required" }
+        }
+    }
+
+    data object Circle : VVOFeed
+
+    data object Private : VVOFeed
+}
+
+internal class VVOFeedTimelineRemoteMediator(
+    private val service: VVOService,
+    private val accountKey: MicroBlogKey,
+    private val feed: VVOFeed,
+) : CacheableRemoteLoader<UiTimelineV2> {
+    // shortcut: Keep conservative cache boundaries until feed ordering is verified with a logged-in account.
+    override val pagingKey: String =
+        when (feed) {
+            is VVOFeed.Group -> "vvo_group_${accountKey}_${feed.id}"
+            VVOFeed.Circle -> "vvo_circle_$accountKey"
+            VVOFeed.Private -> "vvo_private_$accountKey"
+        }
+
+    override suspend fun load(
+        pageSize: Int,
+        request: PagingRequest,
+    ): PagingResult<UiTimelineV2> {
+        if (request is PagingRequest.Prepend) {
+            return PagingResult(endOfPaginationReached = true)
+        }
+        service.ensureGroupLogin(accountKey)
+        val cursor = (request as? PagingRequest.Append)?.nextKey
+        val response =
+            when (feed) {
+                is VVOFeed.Group -> service.getGroupTimeline(groupId = feed.id, maxId = cursor)
+                VVOFeed.Circle -> service.getCircleTimeline(maxId = cursor)
+                VVOFeed.Private -> service.getPrivateTimeline(maxId = cursor)
+            }.requireGroupData(accountKey)
+        val statuses =
+            checkNotNull(response.statuses ?: response.cards?.mapNotNull { it.mblog }) {
+                "Invalid Weibo timeline"
+            }
+        val nextKey =
+            response.maxId?.takeIf {
+                statuses.isNotEmpty() && it.isNotBlank() && it != "0" && it != cursor
+            }
+        return PagingResult(
+            data = statuses.map { it.render(accountKey) },
+            nextKey = nextKey,
+        )
+    }
+}

social/vvo/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVOGroupPagingSource.kt

@@ -0,0 +1,57 @@
+package dev.dimension.flare.data.datasource.vvo
+
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+import dev.dimension.flare.data.model.tab.TimelineCandidate
+import dev.dimension.flare.data.model.tab.TimelineSpec
+import dev.dimension.flare.data.network.vvo.VVOService
+import dev.dimension.flare.data.network.vvo.model.VVOResponse
+import dev.dimension.flare.data.platform.VVO_PLATFORM_ID
+import dev.dimension.flare.data.platform.VvoPlatformSpec
+import dev.dimension.flare.data.repository.LoginExpiredException
+import dev.dimension.flare.model.MicroBlogKey
+import dev.dimension.flare.ui.model.UiText
+import kotlinx.coroutines.CancellationException
+
+internal class VVOGroupPagingSource(
+    private val service: VVOService,
+    private val accountKey: MicroBlogKey,
+) : PagingSource<Int, TimelineCandidate<*>>() {
+    override fun getRefreshKey(state: PagingState<Int, TimelineCandidate<*>>): Int? = null
+
+    override suspend fun load(params: LoadParams<Int>): LoadResult<Int, TimelineCandidate<*>> =
+        try {
+            service.ensureGroupLogin(accountKey)
+            val groups = service.getGroupList().requireGroupData(accountKey).groups
+            LoadResult.Page(
+                data =
+                    groups.distinctBy { it.gid }.map { group ->
+                        check(group.gid.isNotBlank() && group.name.isNotBlank()) { "Invalid Weibo group" }
+                        VvoPlatformSpec.groupTimelineSpec.candidate(
+                            data = TimelineSpec.AccountResourceData(accountKey, group.gid),
+                            title = UiText.Raw(group.name),
+                        )
+                    },
+                prevKey = null,
+                nextKey = null,
+            )
+        } catch (error: CancellationException) {
+            throw error
+        } catch (error: Exception) {
+            LoadResult.Error(error)
+        }
+}
+
+internal suspend fun VVOService.ensureGroupLogin(accountKey: MicroBlogKey) {
+    if (config().data?.login != true) {
+        throw LoginExpiredException(accountKey = accountKey, platformId = VVO_PLATFORM_ID)
+    }
+}
+
+internal fun <T : Any> VVOResponse<T>.requireGroupData(accountKey: MicroBlogKey): T {
+    if (ok == -100L) {
+        throw LoginExpiredException(accountKey = accountKey, platformId = VVO_PLATFORM_ID)
+    }
+    check(ok == 1L) { "Weibo group request failed" }
+    return checkNotNull(data) { "Invalid Weibo group response" }
+}