From 4ae589bb478dbc5e0c5525b82f757d90148f0e2a Mon Sep 17 00:00:00 2001
From: "jiahua.liu" <n@mamoe.net>
Date: Sun, 2 Feb 2020 16:14:35 +0800
Subject: [PATCH] Troop List complete

---
 .../qqandroid/network/QQAndroidBotNetworkHandler.kt  | 12 +++++++-----
 .../network/protocol/packet/list/FriendListPacket.kt |  1 -
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
index 6a09c78f9..a55425da5 100644
--- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
+++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
@@ -138,23 +138,25 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
                         currentFriendCount++
                     })
                 }
-                bot.logger.verbose("正在加载好友信息 ${currentFriendCount}/${totalFriendCount}")
+                bot.logger.verbose("正在加载好友列表 ${currentFriendCount}/${totalFriendCount}")
                 if (currentFriendCount >= totalFriendCount) {
                     break
                 }
                 delay(200)
             }
-            bot.logger.info("好友信息加载完成, 共 ${currentFriendCount}个")
+            bot.logger.info("好友列表加载完成, 共 ${currentFriendCount}个")
         } catch (e: Exception) {
-            bot.logger.info("加载好友信息失败|一般这是由于加载过于频繁导致/将以热加载方式加载好友列表")
+            bot.logger.info("加载好友列表失败|一般这是由于加载过于频繁导致/将以热加载方式加载好友列表")
         }
 
         try {
-            bot.logger.info("开始加载组信息")
+            bot.logger.info("开始加载组列表")
             val troopData = FriendList.GetTroopListSimplify(
                 bot.client
             ).sendAndExpect<FriendList.GetTroopListSimplify.Response>(10000)
-            println(troopData.contentToString())
+            println(troopData.groups.contentToString())
+            bot.logger.info("加载组列表成功")
+
         } catch (e: Exception) {
             bot.logger.info("加载组信息失败|一般这是由于加载过于频繁导致/将以热加载方式加载群列表")
         }
diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/list/FriendListPacket.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/list/FriendListPacket.kt
index 0d03ee0be..0d301896a 100644
--- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/list/FriendListPacket.kt
+++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/list/FriendListPacket.kt
@@ -67,7 +67,6 @@ internal class FriendList {
     internal object GetTroopListSimplify :
         PacketFactory<GetTroopListSimplify.Response>("friendlist.GetTroopListReqV2") {
         override suspend fun ByteReadPacket.decode(bot: QQAndroidBot): GetTroopListSimplify.Response {
-            this.discardExact(4)
             val res = this.decodeUniPacket(GetTroopListRespV2.serializer())
             return Response(res.vecTroopList.orEmpty())
         }