Skip to content

M
Mirai
Commit 79426f3b authored by Him188's avatar Him188
Browse files
Options

Add coroutineScope

parent 224b8058
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 52 deletions
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
View file @ 79426f3b
...@@ -155,63 +155,63 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler ...@@ -155,63 +155,63 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
val friendLoadFinish = currentTimeMillis val friendLoadFinish = currentTimeMillis
val groupInfo = mutableMapOf<Long, Int>() val groupInfo = mutableMapOf<Long, Int>()
try { coroutineScope {
bot.logger.info("开始加载群组列表与群成员列表") try {
val troopListData = FriendList.GetTroopListSimplify( bot.logger.info("开始加载群组列表与群成员列表")
bot.client val troopListData = FriendList.GetTroopListSimplify(bot.client)
).sendAndExpect<FriendList.GetTroopListSimplify.Response>(timeoutMillis = 5000) .sendAndExpect<FriendList.GetTroopListSimplify.Response>(timeoutMillis = 5000, retry = 2)
// println("获取到群数量" + troopData.groups.size) // println("获取到群数量" + troopData.groups.size)
val toGet: MutableMap<GroupImpl, ContactList<Member>> = mutableMapOf() val toGet: MutableMap<GroupImpl, ContactList<Member>> = mutableMapOf()
troopListData.groups.forEach { troopListData.groups.forEach {
val contactList = ContactList(LockFreeLinkedList<Member>()) val contactList = ContactList(LockFreeLinkedList<Member>())
val groupInfoResponse = try { val groupInfoResponse = try {
TroopManagement.GetGroupOperationInfo( TroopManagement.GetGroupOperationInfo(
client = bot.client, client = bot.client,
groupCode = it.groupCode groupCode = it.groupCode
).sendAndExpect<TroopManagement.GetGroupOperationInfo.Response>() ).sendAndExpect<TroopManagement.GetGroupOperationInfo.Response>()
} catch (e: Exception) {
bot.logger.info("获取" + it.groupCode + "的群设置失败")
TroopManagement.GetGroupOperationInfo.Response(
allowAnonymousChat = false,
allowMemberInvite = false,
autoApprove = false,
confessTalk = false
)
}
val group =
GroupImpl(
bot = bot,
coroutineContext = this.coroutineContext,
id = it.groupCode,
uin = it.groupUin,
initName = it.groupName,
initAnnouncement = it.groupMemo,
initAllowMemberInvite = groupInfoResponse.allowMemberInvite,
initConfessTalk = groupInfoResponse.confessTalk,
initMuteAll = false,//todo
initAutoApprove = groupInfoResponse.autoApprove,
initAnonymousChat = groupInfoResponse.allowAnonymousChat,
members = contactList
)
toGet[group] = contactList
bot.groups.delegate.addLast(group)
launch {
try {
getTroopMemberList(group, contactList, it.dwGroupOwnerUin)
groupInfo[it.groupCode] = contactList.size
} catch (e: Exception) { } catch (e: Exception) {
groupInfo[it.groupCode] = -1 bot.logger.info("获取" + it.groupCode + "的群设置失败")
bot.logger.info("群${it.groupCode}的列表拉取失败, 将采用动态加入") TroopManagement.GetGroupOperationInfo.Response(
bot.logger.error(e) allowAnonymousChat = false,
allowMemberInvite = false,
autoApprove = false,
confessTalk = false
)
}
val group =
GroupImpl(
bot = bot,
coroutineContext = this.coroutineContext,
id = it.groupCode,
uin = it.groupUin,
initName = it.groupName,
initAnnouncement = it.groupMemo,
initAllowMemberInvite = groupInfoResponse.allowMemberInvite,
initConfessTalk = groupInfoResponse.confessTalk,
initMuteAll = false,//todo
initAutoApprove = groupInfoResponse.autoApprove,
initAnonymousChat = groupInfoResponse.allowAnonymousChat,
members = contactList
)
toGet[group] = contactList
bot.groups.delegate.addLast(group)
launch {
try {
getTroopMemberList(group, contactList, it.dwGroupOwnerUin)
groupInfo[it.groupCode] = contactList.size
} catch (e: Exception) {
groupInfo[it.groupCode] = -1
bot.logger.info("群${it.groupCode}的列表拉取失败, 将采用动态加入")
bot.logger.error(e)
}
} }
} }
bot.logger.info("群组列表与群成员加载完成, 共 ${troopListData.groups.size}个")
} catch (e: Exception) {
bot.logger.error("加载组信息失败|一般这是由于加载过于频繁导致/将以热加载方式加载群列表")
bot.logger.error(e)
} }
bot.logger.info("群组列表与群成员加载完成, 共 ${troopListData.groups.size}个")
} catch (e: Exception) {
bot.logger.error("加载组信息失败|一般这是由于加载过于频繁导致/将以热加载方式加载群列表")
bot.logger.error(e)
} }
//===log===// //===log===//
fun fillUntil(long: Number, size: Int): String { fun fillUntil(long: Number, size: Int): String {
val x = long.toString() val x = long.toString()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment