github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-10 02:20:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Him188 2020-01-30 21:11:38 +08:00
commit d3557c92a7
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
View File

@ -98,9 +98,9 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
val data = FriendList.GetFriendGroupList( val data = FriendList.GetFriendGroupList(
bot.client, bot.client,
0, 0,
20, 10,
0, 0,
10 0
).sendAndExpect<FriendList.GetFriendGroupList.Response>() ).sendAndExpect<FriendList.GetFriendGroupList.Response>()
println(data.contentToString()) println(data.contentToString())
} }

4
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/list/FriendListPacket.kt
View File

@ -32,7 +32,9 @@ internal class FriendList {
override suspend fun ByteReadPacket.decode(bot: QQAndroidBot): Response { override suspend fun ByteReadPacket.decode(bot: QQAndroidBot): Response {
println(this println(this
.apply { discardExact(4) } .apply {
this.discardExact(4)
}
.decodeUniPacket(GetFriendListResp.serializer()) .decodeUniPacket(GetFriendListResp.serializer())
.contentToString() .contentToString()
) )