PushNotify

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

@@ -7,6 +7,7 @@ import net.mamoe.mirai.qqandroid.QQAndroidBot
 import net.mamoe.mirai.qqandroid.network.io.JceInput
 import net.mamoe.mirai.qqandroid.network.protocol.jce.RequestPacket
 import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.receive.OnlinePush
+import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.receive.PushNotify
 import net.mamoe.mirai.qqandroid.network.protocol.packet.login.LoginPacket
 import net.mamoe.mirai.qqandroid.network.protocol.packet.login.StatSvc
 import net.mamoe.mirai.utils.DefaultLogger
@@ -51,7 +52,8 @@ internal val PacketLogger: MiraiLogger = DefaultLogger("Packet")
 internal object KnownPacketFactories : List<PacketFactory<*>> by mutableListOf(
     LoginPacket,
     StatSvc.Register,
-    OnlinePush.PbPushGroupMsg
+    OnlinePush.PbPushGroupMsg,
+    PushNotify
 ) {
 
     fun findPacketFactory(commandName: String): PacketFactory<*>? = this.firstOrNull { it.commandName == commandName }

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

+package net.mamoe.mirai.qqandroid.network.protocol.packet.chat.receive
+
+import kotlinx.io.core.ByteReadPacket
+import net.mamoe.mirai.data.Packet
+import net.mamoe.mirai.qqandroid.QQAndroidBot
+import net.mamoe.mirai.qqandroid.network.io.JceInput
+import net.mamoe.mirai.qqandroid.network.io.JceOutput
+import net.mamoe.mirai.qqandroid.network.io.JceStruct
+import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
+import net.mamoe.mirai.qqandroid.network.protocol.packet.PacketFactory
+import net.mamoe.mirai.utils.io.discardExact
+import net.mamoe.mirai.utils.io.readIoBuffer
+import net.mamoe.mirai.utils.io.toUHexString
+
+internal object PushNotify : PacketFactory<PushNotify.MessageNotification>("MessageSvc.PushNotify") {
+    override suspend fun ByteReadPacket.decode(bot: QQAndroidBot): MessageNotification {
+        return MessageNotification.newInstanceFrom(JceInput(this.apply { discardExact(4) }.readIoBuffer()))
+    }
+
+    class MessageNotification(
+        val luni: Long,
+        val ctype: Byte,
+        val strService: String,
+        val strCmd: String,
+        val vNotifyCookie: ByteArray,
+        val usMsgType: Int,
+        val wUserActive: Int,
+        val wGeneralFlag: Int,
+        val lBindedUni: Long
+    ) : Packet, JceStruct() {
+        init {
+            println(this.luni)
+            println(this.ctype)
+            println(this.strService)
+            println(this.strCmd)
+            println(this.vNotifyCookie.toUHexString())
+            println(this.usMsgType)
+            println(this.wUserActive)
+            println(this.wGeneralFlag)
+            println(this.lBindedUni)
+        }
+
+        override fun writeTo(builder: JceOutput) {
+            //not needed
+        }
+
+        companion object : Factory<MessageNotification> {
+            override fun newInstanceFrom(input: JceInput): MessageNotification {
+                return MessageNotification(
+                    input.read(0L, 0),
+                    input.read(0.toByte(), 1),
+                    input.readString(2),
+                    input.readString(3),
+                    input.read(EMPTY_BYTE_ARRAY, 4),
+                    input.read(0, 5),
+                    input.read(0, 6),
+                    input.read(0, 7),
+                    input.read(0L, 8)
+                )
+            }
+        }
+
+    }
+
+    class MsgInfo(
+        val lFromUin: Long,
+        val uMsgTime: Long,
+        val shMsgType: Short,
+        val shMsgSeq: Short,
+        val strMsg: String,
+        val uRealMsgTime: Int,
+        val vMsg: ByteArray,
+        val uAppShareID: Long,
+        val vMsgCookies: ByteArray,
+        val vAppShareCookie: ByteArray,
+        val lMsgUid: Long,
+        val lLastChangeTime: Long,
+        //val vCPicInfo: List<CPicInfo?>,
+        //val stShareData: shareData,
+        val lFromInstId: Long,
+        val vRemarkOfSender: ByteArray,
+        val strFromMobile: String,
+        val strFromName: String,
+        val vNickName: List<String>
+        //val stC2CTmpMsgHead: TempMsgHead
+    )
+
+}
\ No newline at end of file