Skip to content

M
Mirai
Commit 5635509c authored by ryoii's avatar ryoii
Browse files
Options

Calculate groupCode, fixes #301

parent bd742915
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/NewContact.kt
View file @ 5635509c
......@@ -2,6 +2,7 @@ package net.mamoe.mirai.qqandroid.network.protocol.packet.chat
import kotlinx.io.core.ByteReadPacket
import kotlinx.io.core.readBytes
import net.mamoe.mirai.contact.Group
import net.mamoe.mirai.event.events.BotInvitedJoinGroupRequestEvent
import net.mamoe.mirai.event.events.MemberJoinRequestEvent
import net.mamoe.mirai.event.events.NewFriendRequestEvent
......@@ -51,7 +52,7 @@ internal class NewContact {
struct.msgSeq,
msgAdditional,
struct.reqUin,
groupCode,
Group.calculateGroupUinByGroupCode(groupCode),
reqUinNick
)
}
......@@ -141,7 +142,7 @@ internal class NewContact {
bot,
struct.msgSeq,
actionUin,
groupCode,
Group.calculateGroupUinByGroupCode(groupCode),
groupName,
actionUinNick
)
......@@ -152,7 +153,7 @@ internal class NewContact {
struct.msgSeq,
msgAdditional,
struct.reqUin,
groupCode,
Group.calculateGroupUinByGroupCode(groupCode),
groupName,
reqUinNick
)
......@@ -180,7 +181,7 @@ internal class NewContact {
true -> 11 // accept
false -> 12 // reject
},
groupCode = event.groupId,
groupCode = Group.calculateGroupCodeByGroupUin(event.groupId),
msg = "",
remark = "",
blacklist = blackList
......@@ -207,7 +208,7 @@ internal class NewContact {
Structmsg.ReqSystemMsgAction(
actionInfo = Structmsg.SystemMsgActionInfo(
type = if (accept) 11 else 12,
groupCode = event.groupId
groupCode = Group.calculateGroupCodeByGroupUin(event.groupId)
),
groupMsgType = 2,
language = 1000,
......
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