github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-17 05:04:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential packet missing in NewContact

Browse Source
This commit is contained in:
Him188 2020-09-16 10:24:17 +08:00
parent 247a37da42
commit 636f4cbead
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/StructMsg.kt
View File

@ -186,8 +186,8 @@ internal class Structmsg : ProtoBuf {
@ProtoNumber(5) @JvmField val latestGroupSeq: Long = 0L,
@ProtoNumber(6) @JvmField val followingFriendSeq: Long = 0L,
@ProtoNumber(7) @JvmField val followingGroupSeq: Long = 0L,
@ProtoNumber(9) @JvmField val friendmsgs: List<StructMsg>? = null,
@ProtoNumber(10) @JvmField val groupmsgs: List<StructMsg>? = null,
@ProtoNumber(9) @JvmField val friendmsgs: List<StructMsg> = emptyList(),
@ProtoNumber(10) @JvmField val groupmsgs: List<StructMsg> = emptyList(),
@ProtoNumber(11) @JvmField val msgRibbonFriend: StructMsg? = null,
@ProtoNumber(12) @JvmField val msgRibbonGroup: StructMsg? = null,
@ProtoNumber(13) @JvmField val msgDisplay: String = "",

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

@ -20,6 +20,8 @@ import net.mamoe.mirai.event.events.NewFriendRequestEvent
import net.mamoe.mirai.getGroupOrNull
import net.mamoe.mirai.qqandroid.QQAndroidBot
import net.mamoe.mirai.qqandroid.message.contextualBugReportException
import net.mamoe.mirai.qqandroid.network.MultiPacket
import net.mamoe.mirai.qqandroid.network.MultiPacketByIterable
import net.mamoe.mirai.qqandroid.network.Packet
import net.mamoe.mirai.qqandroid.network.QQAndroidClient
import net.mamoe.mirai.qqandroid.network.protocol.data.proto.Structmsg
@ -32,7 +34,7 @@ import net.mamoe.mirai.qqandroid.utils.io.serialization.writeProtoBuf
internal class NewContact {
internal object SystemMsgNewFriend :
OutgoingPacketFactory<NewFriendRequestEvent?>("ProfileService.Pb.ReqSystemMsgNew.Friend") {
OutgoingPacketFactory<MultiPacket<NewFriendRequestEvent>?>("ProfileService.Pb.ReqSystemMsgNew.Friend") {
operator fun invoke(client: QQAndroidClient) = buildOutgoingUniPacket(client) {
writeProtoBuf(
@ -56,20 +58,21 @@ internal class NewContact {
}
override suspend fun ByteReadPacket.decode(bot: QQAndroidBot): NewFriendRequestEvent? {
readBytes().loadAs(Structmsg.RspSystemMsgNew.serializer()).run {
val struct = friendmsgs?.firstOrNull()
return struct?.msg?.run {
NewFriendRequestEvent(
bot,
struct.msgSeq,
msgAdditional,
struct.reqUin,
groupCode,
reqUinNick
)
override suspend fun ByteReadPacket.decode(bot: QQAndroidBot): MultiPacket<NewFriendRequestEvent>? {
return readBytes().loadAs(Structmsg.RspSystemMsgNew.serializer()).run {
friendmsgs.mapNotNull { struct ->
struct.msg?.run {
NewFriendRequestEvent(
bot,
struct.msgSeq,
msgAdditional,
struct.reqUin,
groupCode,
reqUinNick
)
}
}
}
}.let { MultiPacketByIterable(it) }
}
internal object Action : OutgoingPacketFactory<Nothing?>("ProfileService.Pb.ReqSystemMsgAction.Friend") {
@ -107,7 +110,7 @@ internal class NewContact {
internal object SystemMsgNewGroup :
OutgoingPacketFactory<Packet?>("ProfileService.Pb.ReqSystemMsgNew.Group") {
OutgoingPacketFactory<MultiPacket<Packet>?>("ProfileService.Pb.ReqSystemMsgNew.Group") {
operator fun invoke(client: QQAndroidClient) = buildOutgoingUniPacket(client) {
writeProtoBuf(
@ -143,11 +146,9 @@ internal class NewContact {
}
override suspend fun ByteReadPacket.decode(bot: QQAndroidBot): Packet? {
readBytes().loadAs(Structmsg.RspSystemMsgNew.serializer()).run {
val struct = groupmsgs?.firstOrNull()
return struct?.msg?.run {
override suspend fun ByteReadPacket.decode(bot: QQAndroidBot): MultiPacket<Packet>? {
return readBytes().loadAs(Structmsg.RspSystemMsgNew.serializer()).groupmsgs.mapNotNull { struct ->
struct.msg?.run {
//this.soutv("SystemMsg")
when (subType) {
1 -> { // 处理被邀请入群 或 处理成员入群申请
@ -212,7 +213,7 @@ internal class NewContact {
)
}
}
}
}.let { MultiPacketByIterable(it) }
}
internal object Action : OutgoingPacketFactory<Nothing?>("ProfileService.Pb.ReqSystemMsgAction.Group") {