diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.ReqPush.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.ReqPush.kt index bed662bed..49c893fd7 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.ReqPush.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.ReqPush.kt @@ -378,21 +378,16 @@ internal object Transformers528 : Map by mapOf( @ProtoNumber(5) val v5: ByteArray? = null // struct{ boolean(1), boolean(2) } ) : ProtoBuf - val sub8A = vProtobuf.loadAs(Sub8A.serializer()).inner - - if (sub8A.botUin == bot.id) { - return@lambda528 sequenceOf( + return@lambda528 vProtobuf.loadAs(Sub8A.serializer()).msgInfo.asSequence() + .filter { it.botUin == bot.id }.map { MessageRecallEvent.FriendRecall( bot = bot, - messageId = sub8A.srcId, - messageInternalId = sub8A.srcInternalId, - messageTime = sub8A.time, - operator = sub8A.fromUin + messageId = it.srcId, + messageInternalId = it.srcInternalId, + messageTime = it.time, + operator = it.fromUin ) - ) - } - - return@lambda528 emptySequence() + } }, // Network(1994701021) 16:03:54 : unknown group 528 type 0x0000000000000026, data: 08 01 12 40 0A 06 08 F4 EF BB 8F 04 10 E7 C1 AD B8 02 18 01 22 2C 10 01 1A 1A 18 B4 DC F8 9B 0C 20 E7 C1 AD B8 02 28 06 30 02 A2 01 04 08 93 D6 03 A8 01 08 20 00 28 00 32 08 18 01 20 FE AF AF F5 05 28 00