Commit becc54dd authored by ryoii's avatar ryoii

Close #402

parent a74e895c
...@@ -148,22 +148,22 @@ internal class NewContact { ...@@ -148,22 +148,22 @@ internal class NewContact {
return struct?.msg?.run { return struct?.msg?.run {
//this.soutv("SystemMsg") //this.soutv("SystemMsg")
when (subType) { when (subType) {
1 -> { //管理员邀 1 -> { // 处理被邀请入群 或 处理成员入群申
when (c2cInviteJoinGroupFlag) { when (groupMsgType) {
1 -> { 1 -> {
// 被邀请入群
BotInvitedJoinGroupRequestEvent(
bot, struct.msgSeq, actionUin,
groupCode, groupName, actionUinNick
)
}
0 -> {
// 成员申请入群 // 成员申请入群
MemberJoinRequestEvent( MemberJoinRequestEvent(
bot, struct.msgSeq, msgAdditional, bot, struct.msgSeq, msgAdditional,
struct.reqUin, groupCode, groupName, reqUinNick struct.reqUin, groupCode, groupName, reqUinNick
) )
} }
2 -> {
// 被邀请入群
BotInvitedJoinGroupRequestEvent(
bot, struct.msgSeq, actionUin,
groupCode, groupName, actionUinNick
)
}
else -> throw contextualBugReportException( else -> throw contextualBugReportException(
"parse SystemMsgNewGroup, subType=1", "parse SystemMsgNewGroup, subType=1",
this._miraiContentToString(), this._miraiContentToString(),
...@@ -171,16 +171,14 @@ internal class NewContact { ...@@ -171,16 +171,14 @@ internal class NewContact {
) )
} }
} }
2 -> { 2 -> { // 被邀请入群, 自动同意, 不需处理
// 被邀请入群, 自动同意
val group = bot.getNewGroup(groupCode) ?: return null val group = bot.getNewGroup(groupCode) ?: return null
val invitor = group[actionUin] val invitor = group[actionUin]
BotJoinGroupEvent.Invite(invitor) BotJoinGroupEvent.Invite(invitor)
} }
3 -> { 3 -> { // 已被请他管理员处理
// 已被请他管理员处理
null null
} }
5 -> { 5 -> {
......
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