Revert "Fix potential packet missing in NewContact"

This reverts commit 636f4cbe

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

@@ -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> = emptyList(),
-        @ProtoNumber(10) @JvmField val groupmsgs: List<StructMsg> = emptyList(),
+        @ProtoNumber(9) @JvmField val friendmsgs: List<StructMsg>? = null,
+        @ProtoNumber(10) @JvmField val groupmsgs: List<StructMsg>? = null,
         @ProtoNumber(11) @JvmField val msgRibbonFriend: StructMsg? = null,
         @ProtoNumber(12) @JvmField val msgRibbonGroup: StructMsg? = null,
         @ProtoNumber(13) @JvmField val msgDisplay: String = "",

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

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