diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/OnlinePushPack.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/OnlinePushPack.kt index 770eb0bb6..c3e2c801f 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/OnlinePushPack.kt +++ b/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? = null, - @SerialId(6) val mPreviews: Map? = null, - @SerialId(7) val wUserActive: Int? = null, - @SerialId(12) val wGeneralFlag: Int? = null + @SerialId(6) val mPreviews: Map? = null + // @SerialId(7) val wUserActive: Int? = null, + //@SerialId(12) val wGeneralFlag: Int? = null ) : JceStruct @Serializable diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/PacketFactory.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/PacketFactory.kt index 3c9db01f2..04a87cdee 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/PacketFactory.kt +++ b/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> by mutableListOf( OnlinePush.PbPushGroupMsg, + OnlinePush.ReqPush, MessageSvc.PushNotify, ConfigPushSvc.PushReq diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.kt index cfd3fb275..da63cda7a 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.kt +++ b/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 }