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

Fix potential NoSuchElementException when member is kicked

Browse Source
This commit is contained in:
Him188 2020-06-14 19:53:50 +08:00
parent 35f2335a5f
commit d7ab2c1bae
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/NewContact.kt
View File

@ -185,8 +185,24 @@ internal class NewContact {
}
5 -> {
val group = bot.getGroupOrNull(groupCode) ?: return null
val operator = group[actionUin]
BotLeaveEvent.Kick(operator)
when (groupMsgType) {
13 -> { // 成员主动退出, 机器人是管理员, 接到通知
// 但无法获取是哪个成员.
null
}
7 -> { // 机器人被踢
val operator = group[actionUin]
BotLeaveEvent.Kick(operator)
}
else -> {
throw contextualBugReportException(
"解析 NewContact.SystemMsgNewGroup, subType=5",
this._miraiContentToString(),
null,
"并描述此时机器人是否被踢出群等"
)
}
}
}
else -> throw contextualBugReportException(
"parse SystemMsgNewGroup",