Merge remote-tracking branch 'origin/master'

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/OnlinePushPack.kt

@@ -62,9 +62,9 @@ class OnlinePushPack {
         @SerialId(3) val svrip: Int? = 0,
         @SerialId(4) val vSyncCookie: ByteArray? = null,
         @SerialId(5) val vUinPairMsg: List<UinPairMsg>? = null,
-        @SerialId(6) val mPreviews: Map<String, ByteArray>? = null,
-        @SerialId(7) val wUserActive: Int? = null,
-        @SerialId(12) val wGeneralFlag: Int? = null
+        @SerialId(6) val mPreviews: Map<String, ByteArray>? = null
+        // @SerialId(7) val wUserActive: Int? = null,
+        //@SerialId(12) val wGeneralFlag: Int? = null
     ) : JceStruct
 
     @Serializable

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

@@ -131,6 +131,7 @@ internal object KnownPacketFactories {
 
     object IncomingFactories : List<IncomingPacketFactory<*>> by mutableListOf(
         OnlinePush.PbPushGroupMsg,
+        OnlinePush.ReqPush,
         MessageSvc.PushNotify,
         ConfigPushSvc.PushReq
 

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

@@ -80,10 +80,10 @@ internal class OnlinePush {
         @UseExperimental(ExperimentalStdlibApi::class)
         override suspend fun ByteReadPacket.decode(bot: QQAndroidBot, sequenceId: Int): Packet {
             val reqPushMsg = decodeUniPacket(OnlinePushPack.SvcReqPushMsg.serializer(), "req")
+            println(reqPushMsg.contentToString())
             reqPushMsg.vMsgInfos.forEach { msgInfo: MsgInfo ->
 
             }
-            println(reqPushMsg.contentToString())
             return NoPakcet
         }