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

Less retry for friendlist

Browse Source
This commit is contained in:
Him188 2020-02-02 00:55:14 +08:00
parent 54e494f2a5
commit 26c86129c6
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,10 +126,7 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
20, 20,
0, 0,
0 0
).sendAndExpect<FriendList.GetFriendGroupList.Response>( ).sendAndExpect<FriendList.GetFriendGroupList.Response>()
timeoutMillis = 8000,
retry = 5
)
totalFriendCount = data.totalFriendCount totalFriendCount = data.totalFriendCount
data.friendList.forEach { data.friendList.forEach {
@ -153,7 +150,7 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
bot.logger.info("开始加载组信息") bot.logger.info("开始加载组信息")
val troopData = FriendList.GetTroopListSimplify( val troopData = FriendList.GetTroopListSimplify(
bot.client bot.client
).sendAndExpect<FriendList.GetTroopListSimplify.Response>(10000) ).sendAndExpect<FriendList.GetTroopListSimplify.Response>()
println(troopData.contentToString()) println(troopData.contentToString())
} catch (e: Exception) { } catch (e: Exception) {
bot.logger.info("加载组信息失败|一般这是由于加载过于频繁导致/将以热加载方式加载群列表") bot.logger.info("加载组信息失败|一般这是由于加载过于频繁导致/将以热加载方式加载群列表")

2
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/ConfigPushSvc.kt
View File

@ -27,7 +27,7 @@ internal class ConfigPushSvc {
network.run { network.run {
buildOutgoingUniPacket( buildOutgoingUniPacket(
client, client,
sequenceId = client.configPushSvcPushReqSequenceId.also { println("configPushSvcPushReqSequenceId=${client.configPushSvcPushReqSequenceId}") }, sequenceId = client.configPushSvcPushReqSequenceId,
commandName = "ConfigPushSvc.PushResp", commandName = "ConfigPushSvc.PushResp",
name = "ConfigPushSvc.PushResp" name = "ConfigPushSvc.PushResp"
) { ) {