Skip to content

M
Mirai
Commit 01d16253 authored by ryoii's avatar ryoii
Browse files
Options

Fix a possible bug

parent 5635509c
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 21 deletions
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/NewContact.kt
View file @ 01d16253
......@@ -136,27 +136,31 @@ internal class NewContact {
return if (struct == null) null else {
struct.msg?.run<Structmsg.SystemMsg, Packet> {
if (c2cInviteJoinGroupFlag == 1) {
// 被邀请入群
BotInvitedJoinGroupRequestEvent(
bot,
struct.msgSeq,
actionUin,
Group.calculateGroupUinByGroupCode(groupCode),
groupName,
actionUinNick
)
} else {
// 成员申请入群
MemberJoinRequestEvent(
bot,
struct.msgSeq,
msgAdditional,
struct.reqUin,
Group.calculateGroupUinByGroupCode(groupCode),
groupName,
reqUinNick
)
when (c2cInviteJoinGroupFlag) {
1 -> {
// 被邀请入群
BotInvitedJoinGroupRequestEvent(
bot,
struct.msgSeq,
actionUin,
Group.calculateGroupUinByGroupCode(groupCode),
groupName,
actionUinNick
)
}
0 -> {
// 成员申请入群
MemberJoinRequestEvent(
bot,
struct.msgSeq,
msgAdditional,
struct.reqUin,
Group.calculateGroupUinByGroupCode(groupCode),
groupName,
reqUinNick
)
}
else -> throw IllegalStateException("Unknown c2cInviteJoinGroupFlag: $c2cInviteJoinGroupFlag in SystemMsgNewGroup packet")
}
} as Packet // 没有 as Packet 垃圾 kotlin 会把类型推断为Any
}
......
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