request contact list fail is ok

MrXiaoM · Jan 19, 2024 · a1e9d27 · a1e9d27
1 parent 3efe7e0
commit a1e9d27
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/BotWrapper.kt b/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/BotWrapper.kt
@@ -49,10 +49,10 @@ internal class BotWrapper private constructor(
         loginInfo = impl.getLoginInfo().data
     }
     suspend fun updateContacts() {
-        friendsInternal.update(impl.getFriendList().data.map {
+        friendsInternal.update(impl.getFriendList().data?.map {
             FriendWrapper(this, it)
         }) { impl = it.impl }
-        groupsInternal.update(impl.getGroupList().data.map {
+        groupsInternal.update(impl.getGroupList().data?.map {
             GroupWrapper(this, it)
         }) { impl = it.impl }
     }

diff --git a/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/GroupWrapper.kt b/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/GroupWrapper.kt
@@ -78,8 +78,8 @@ internal class GroupWrapper(
     @JvmBlockingBridge
     override suspend fun updateGroupMemberList(): ContactList<MemberWrapper> {
         return (membersInternal ?: ContactList()).apply {
-            val data = botWrapper.impl.getGroupMemberList(id).data ?: return@apply
-            update(data.map {
+            val data = botWrapper.impl.getGroupMemberList(id).data
+            update(data?.map {
                 MemberWrapper(botWrapper, this@GroupWrapper, it)
             }) { setImpl(it.impl) }
             membersInternal = this

diff --git a/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/utils/TransformerUtils.kt b/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/utils/TransformerUtils.kt
@@ -22,9 +22,10 @@ import top.mrxiaom.overflow.internal.contact.data.FolderWrapper
  * @param updater this 是旧的，it 是新的，应当把新的内容放进旧的
  */
 internal inline fun <reified T : Contact> ContactList<T>.update(
-    list: List<T>,
+    list: List<T>?,
     updater: T.(T) -> Unit
 ) {
+    if (list == null) return
     // 删除旧的
     delegate.removeIf { old -> list.none { old.id == it.id } }
     // 更新旧的