refactor(friend): 重构好友相关功能

- 将 FriendListPagerModel 和 FriendLocationPagerModel 中的 friendsApi 调用替换为 friendService
- 更新 UserProfileScreenModel 中的好友操作逻辑，使用 friendService 替代 friendsApi- 修改 FriendService 中的 refreshFriendList 方法，支持离线模式和回调函数
- 优化好友列表获取逻辑，提高数据同步效率

Signed-off-by: KAMOsama <kamosama.dev@gmail.com>

Author: KAMO030

composeApp/src/commonMain/kotlin/presentation/screens/home/pager/FriendListPagerModel.kt

@@ -60,7 +60,7 @@ class FriendListPagerModel(
     private val _worldGroupOptions = MutableStateFlow(WorldGroupOptions())
     var worldGroupOptions = _worldGroupOptions.asStateFlow()
 
-    private val _friendList = MutableStateFlow(emptyList<FriendData>())
+    private val _friendList = MutableStateFlow(friendService.friendMap.values.toList().sortedUserByStatus())
     val friendList: StateFlow<List<FriendData>> = _friendList.asStateFlow()
 
     private val _friendTotal = MutableStateFlow(0)

composeApp/src/commonMain/kotlin/presentation/screens/home/pager/FriendLocationPagerModel.kt

@@ -6,13 +6,11 @@ import cafe.adriel.voyager.core.model.screenModelScope
 import io.github.vrcmteam.vrcm.core.shared.SharedFlowCentre
 import io.github.vrcmteam.vrcm.network.api.attributes.BlueprintType
 import io.github.vrcmteam.vrcm.network.api.attributes.LocationType
-import io.github.vrcmteam.vrcm.network.api.friends.FriendsApi
 import io.github.vrcmteam.vrcm.network.api.friends.date.FriendData
 import io.github.vrcmteam.vrcm.network.api.groups.GroupsApi
 import io.github.vrcmteam.vrcm.network.api.instances.InstancesApi
 import io.github.vrcmteam.vrcm.network.api.instances.data.InstanceData
 import io.github.vrcmteam.vrcm.network.api.users.UsersApi
-import io.github.vrcmteam.vrcm.network.supports.VRCApiException
 import io.github.vrcmteam.vrcm.network.websocket.data.WebSocketEvent
 import io.github.vrcmteam.vrcm.network.websocket.data.content.FriendActiveContent
 import io.github.vrcmteam.vrcm.network.websocket.data.content.FriendLocationContent
@@ -23,17 +21,16 @@ import io.github.vrcmteam.vrcm.presentation.extensions.onApiFailure
 import io.github.vrcmteam.vrcm.presentation.screens.home.data.FriendLocation
 import io.github.vrcmteam.vrcm.presentation.screens.home.data.HomeInstanceVo
 import io.github.vrcmteam.vrcm.service.AuthService
+import io.github.vrcmteam.vrcm.service.FriendService
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.IO
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.retry
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.serialization.json.Json
 
 class FriendLocationPagerModel(
-    private val friendsApi: FriendsApi,
+    private val friendService: FriendService,
     private val usersApi: UsersApi,
     private val groupsApi: GroupsApi,
     private val instancesApi: InstancesApi,
@@ -120,18 +117,12 @@ class FriendLocationPagerModel(
         // 防止再次更新时拉取到的与上次相同的instanceId导致item的key冲突
         val includedIdList: MutableList<String> = mutableListOf()
         screenModelScope.launch(Dispatchers.IO) {
-            friendsApi.friendsFlow()
-                .retry(1) {
-                    // 如果是登录失效了就会重新登录并重试一次
-                    if (it is VRCApiException) authService.doReTryAuth() else false
-                }.catch {
-                    SharedFlowCentre.toastText.emit(ToastText.Error(it.message.toString()))
-                }.collect { friends ->
-                    update(friends)
-                    if (removeNotIncluded) {
-                        includedIdList.addAll(friends.map { it.id })
-                    }
+            friendService.refreshFriendList(offline = false) { friends ->
+                update(friends)
+                if (removeNotIncluded) {
+                    includedIdList.addAll(friends.map { it.id })
                 }
+            }
         }.join()
         if (removeNotIncluded) {
             friendMap.keys

composeApp/src/commonMain/kotlin/presentation/screens/user/UserProfileScreenModel.kt

@@ -7,13 +7,13 @@ import cafe.adriel.voyager.core.model.screenModelScope
 import io.github.vrcmteam.vrcm.core.extensions.pretty
 import io.github.vrcmteam.vrcm.core.shared.SharedFlowCentre
 import io.github.vrcmteam.vrcm.network.api.attributes.NotificationType
-import io.github.vrcmteam.vrcm.network.api.friends.FriendsApi
 import io.github.vrcmteam.vrcm.network.api.notification.NotificationApi
 import io.github.vrcmteam.vrcm.network.api.users.UsersApi
 import io.github.vrcmteam.vrcm.network.api.users.data.UserData
 import io.github.vrcmteam.vrcm.presentation.compoments.ToastText
 import io.github.vrcmteam.vrcm.presentation.screens.user.data.UserProfileVo
 import io.github.vrcmteam.vrcm.service.AuthService
+import io.github.vrcmteam.vrcm.service.FriendService
 import io.ktor.client.call.*
 import io.ktor.client.statement.*
 import kotlinx.coroutines.Dispatchers
@@ -25,7 +25,7 @@ import org.koin.core.logger.Logger
 class UserProfileScreenModel(
     private val authService: AuthService,
     private val usersApi: UsersApi,
-    private val friendsApi: FriendsApi,
+    private val friendService: FriendService,
     private val notificationApi: NotificationApi,
     private val logger: Logger,
 ) : ScreenModel {
@@ -58,38 +58,38 @@ class UserProfileScreenModel(
 
     suspend fun sendFriendRequest(userId: String, message: String): Boolean =
         friendAction(message) {
-            friendsApi.sendFriendRequest(userId)
+            friendService.sendFriendRequest(userId)
         }
 
     suspend fun deleteFriendRequest(userId: String, message: String): Boolean = friendAction(message) {
-        friendsApi.deleteFriendRequest(userId)
+        friendService.deleteFriendRequest(userId)
     }
 
     suspend fun unfriend(userId: String, message: String): Boolean = friendAction(message) {
-        friendsApi.unfriend(userId)
+        friendService.unfriend(userId)
     }
 
     suspend fun acceptFriendRequest(userId: String, message: String) = friendAction(message) {
         // 看看要不要加载大于 100 条的通知
         // 先看没有hidden的, 如果没有再看hidden的 TODO:是不是要单独抽成一个独立方法
-        return@friendAction (notificationApi.fetchNotificationsV2(
-            type = NotificationType.FriendRequest.value,
-        ).firstOrNull { it.senderUserId == userId }
-            ?: notificationApi.fetchNotificationsV2(
+        return@friendAction authService.reTryAuthCatching {
+            (notificationApi.fetchNotificationsV2(
                 type = NotificationType.FriendRequest.value,
-                hidden = true
-            ).firstOrNull { it.senderUserId == userId })
-            ?.let {
-                notificationApi.acceptFriendRequest(it.id).isSuccess
-            } ?: error("Not found notification")
-
+            ).firstOrNull { it.senderUserId == userId }
+                ?: notificationApi.fetchNotificationsV2(
+                    type = NotificationType.FriendRequest.value,
+                    hidden = true
+                ).firstOrNull { it.senderUserId == userId })
+                ?.let {
+                    notificationApi.acceptFriendRequest(it.id).isSuccess
+                } ?: error("Not found notification")
+        }
     }
 
-    private suspend fun friendAction(message: String, action: suspend () -> Any): Boolean =
+    private suspend fun friendAction(message: String, action: suspend () ->  Result<*>): Boolean =
         screenModelScope.async(Dispatchers.IO) {
-            authService.reTryAuthCatching {
-                action()
-            }.onFailure {
+            action()
+                .onFailure {
                 handleError(it)
             }.onSuccess {
                 SharedFlowCentre.toastText.emit(ToastText.Success(message))

composeApp/src/commonMain/kotlin/service/FriendService.kt

@@ -55,10 +55,10 @@ class FriendService(
      * 刷新好友列表
      * @return 是否成功获取到数据
      */
-    suspend fun refreshFriendList(onUpdater: () -> Unit = {}) {
+    suspend fun refreshFriendList(offline: Boolean? = null, onUpdater: (List<FriendData>) -> Unit = {}) {
 
         try {
-            val count = friendsApi.allFriendsFlow()
+            val count = (offline?.run(friendsApi::friendsFlow) ?: friendsApi.allFriendsFlow())
                 .retry(1) {
                     // 如果是登录失效了就会重新登录并重试一次
                     if (it is VRCApiException) authService.doReTryAuth() else false
@@ -68,7 +68,7 @@ class FriendService(
                 }
                 .onEach { friends ->
                     updateFriendMap(friends)
-                    onUpdater()
+                    onUpdater(friends)
                 }
                 .count()