github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-10 10:30:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

No more data class for ProtoBuf and JceStruct

Browse Source
This commit is contained in:
Him188 2020-03-21 13:48:39 +08:00
parent 7fff235aa9
commit 40f157978f
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/ConfigPush.kt
View File

@ -103,7 +103,7 @@ internal class NetSegConf(
@Suppress("ArrayInDataClass") @Suppress("ArrayInDataClass")
@Serializable @Serializable
internal data class PushReq( internal class PushReq(
@JceId(1) val type: Int, @JceId(1) val type: Int,
@JceId(2) val jcebuf: ByteArray, @JceId(2) val jcebuf: ByteArray,
@JceId(3) val seq: Long @JceId(3) val seq: Long

2
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt
View File

@ -17,7 +17,7 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
@Suppress("ArrayInDataClass") @Suppress("ArrayInDataClass")
@Serializable @Serializable
internal data class RequestPushNotify( internal class RequestPushNotify(
@JceId(0) val uin: Long? = 0L, @JceId(0) val uin: Long? = 0L,
@JceId(1) val ctype: Byte = 0, @JceId(1) val ctype: Byte = 0,
@JceId(2) val strService: String?, @JceId(2) val strService: String?,

2
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x352.kt
View File

@ -78,7 +78,7 @@ internal class Cmd0x352 : ProtoBuf {
@Suppress("ArrayInDataClass") @Suppress("ArrayInDataClass")
@Serializable @Serializable
data class ImgInfo( class ImgInfo(
@ProtoId(1) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(1) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY,
@ProtoId(2) val fileType: Int = 0, @ProtoId(2) val fileType: Int = 0,
@ProtoId(3) val fileSize: Long = 0L, @ProtoId(3) val fileSize: Long = 0L,

2
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x388.kt
View File

@ -147,7 +147,7 @@ internal class Cmd0x388 : ProtoBuf {
@Suppress("ArrayInDataClass") @Suppress("ArrayInDataClass")
@Serializable @Serializable
data class ImgInfo( class ImgInfo(
@ProtoId(1) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(1) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY,
@ProtoId(2) val fileType: Int = 0, @ProtoId(2) val fileType: Int = 0,
@ProtoId(3) val fileSize: Long = 0L, @ProtoId(3) val fileSize: Long = 0L,

4
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Msg.kt
View File

@ -664,7 +664,7 @@ internal class ImMsgBody : ProtoBuf {
) : ProtoBuf ) : ProtoBuf
@Serializable // 非官方. @Serializable // 非官方.
internal data class PbReserve( internal class PbReserve(
@ProtoId(1) val unknown1: Int = 1, @ProtoId(1) val unknown1: Int = 1,
@ProtoId(2) val unknown2: Int = 0, @ProtoId(2) val unknown2: Int = 0,
@ProtoId(6) val unknown3: Int = 0, @ProtoId(6) val unknown3: Int = 0,
@ -1142,7 +1142,7 @@ internal class ImReceipt : ProtoBuf {
) : ProtoBuf ) : ProtoBuf
@Serializable @Serializable
internal data class ReceiptResp( internal class ReceiptResp(
@ProtoId(1) val command: Int /* enum */ = 1, @ProtoId(1) val command: Int /* enum */ = 1,
@ProtoId(2) val receiptInfo: ReceiptInfo? = null @ProtoId(2) val receiptInfo: ReceiptInfo? = null
) : ProtoBuf ) : ProtoBuf

4
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgSvc.kt
View File

@ -112,7 +112,7 @@ internal class MsgSvc : ProtoBuf {
) : ProtoBuf ) : ProtoBuf
@Serializable @Serializable
internal data class MsgSendInfo( internal class MsgSendInfo(
@ProtoId(1) val receiver: Int = 0 @ProtoId(1) val receiver: Int = 0
) : ProtoBuf ) : ProtoBuf
@ -456,7 +456,7 @@ internal class MsgSvc : ProtoBuf {
) : ProtoBuf ) : ProtoBuf
@Serializable @Serializable
internal data class PbSendMsgResp( internal class PbSendMsgResp(
@ProtoId(1) val result: Int = 0, @ProtoId(1) val result: Int = 0,
@ProtoId(2) val errmsg: String = "", @ProtoId(2) val errmsg: String = "",
@ProtoId(3) val sendTime: Int = 0, @ProtoId(3) val sendTime: Int = 0,