github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2026-08-22 14:13:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

[core] 移除 Sub8AMsgInfo 中未使用的字段, 以修复序列化问题, close #2784

Browse Source
This commit is contained in:
Him188
2023-08-27 12:31:00 +08:00
parent 790ad7f035
commit 684b003764
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mirai-core/src/commonMain/kotlin/network/notice/priv/FriendNoticeProcessor.kt
View File

@@ -102,10 +102,12 @@ internal class FriendNoticeProcessor(
val body: SubMsgType0xb3.MsgBody = vProtobuf.loadAs(SubMsgType0xb3.MsgBody.serializer()) val body: SubMsgType0xb3.MsgBody = vProtobuf.loadAs(SubMsgType0xb3.MsgBody.serializer())
handleFriendAddedB(data, body) handleFriendAddedB(data, body)
} }
0x44L -> { 0x44L -> {
val body = vProtobuf.loadAs(Submsgtype0x44.MsgBody.serializer()) val body = vProtobuf.loadAs(Submsgtype0x44.MsgBody.serializer())
handleFriendAddedA(body) handleFriendAddedA(body)
} }
0x27L -> { 0x27L -> {
val body = vProtobuf.loadAs(SubMsgType0x27MsgBody.serializer()) val body = vProtobuf.loadAs(SubMsgType0x27MsgBody.serializer())
for (msgModInfo in body.msgModInfos) { for (msgModInfo in body.msgModInfos) {
@@ -117,10 +119,12 @@ internal class FriendNoticeProcessor(
} }
} }
} }
0x115L -> { 0x115L -> {
val body = vProtobuf.loadAs(SubMsgType0x115.MsgBody.serializer()) val body = vProtobuf.loadAs(SubMsgType0x115.MsgBody.serializer())
handleInputStatusChanged(body) handleInputStatusChanged(body)
} }
0x122L -> { 0x122L -> {
val body = vProtobuf.loadAs(Submsgtype0x122.Submsgtype0x122.MsgBody.serializer()) val body = vProtobuf.loadAs(Submsgtype0x122.Submsgtype0x122.MsgBody.serializer())
when (body.templId) { when (body.templId) {
@@ -128,10 +132,12 @@ internal class FriendNoticeProcessor(
1132L, 1133L, 1134L, 1135L, 1136L, 10043L -> handlePrivateNudge(body) 1132L, 1133L, 1134L, 1135L, 1136L, 10043L -> handlePrivateNudge(body)
} }
} }
0x8AL -> { 0x8AL -> {
val body = vProtobuf.loadAs(Sub8A.serializer()) val body = vProtobuf.loadAs(Sub8A.serializer())
processFriendRecall(body) processFriendRecall(body)
} }
else -> markNotConsumed() else -> markNotConsumed()
} }
} }
@@ -150,12 +156,13 @@ internal class FriendNoticeProcessor(
@ProtoNumber(3) val srcId: Int, @ProtoNumber(3) val srcId: Int,
@ProtoNumber(4) val srcInternalId: Long, @ProtoNumber(4) val srcInternalId: Long,
@ProtoNumber(5) val time: Long, @ProtoNumber(5) val time: Long,
@ProtoNumber(6) val random: Int, // see #2784
@ProtoNumber(7) val pkgNum: Int, // 1 // @ProtoNumber(6) val random: Int,
@ProtoNumber(8) val pkgIndex: Int, // 0 // @ProtoNumber(7) val pkgNum: Int, // 1
@ProtoNumber(9) val devSeq: Int, // 0 // @ProtoNumber(8) val pkgIndex: Int, // 0
@ProtoNumber(12) val flag: Int, // 1 // @ProtoNumber(9) val devSeq: Int, // 0
@ProtoNumber(13) val wording: Wording, // @ProtoNumber(12) val flag: Int, // 1
// @ProtoNumber(13) val wording: Wording,
) : ProtoBuf ) : ProtoBuf
@Serializable @Serializable
@@ -207,6 +214,7 @@ internal class FriendNoticeProcessor(
friend.info.nick = to friend.info.nick = to
} }
} }
else -> containsUnknown = true else -> containsUnknown = true
} }
} }