From acd11b6edaacb04dfd9db8842c2d3709af0f7caf Mon Sep 17 00:00:00 2001 From: Him188 Date: Wed, 8 Apr 2020 10:42:59 +0800 Subject: [PATCH] Make protocol structure classes internal --- .../network/protocol/data/proto/Cmd0x352.kt | 20 ++-- .../network/protocol/data/proto/Cmd0x388.kt | 40 +++---- .../network/protocol/data/proto/Cmd0x857.kt | 72 ++++++------ .../network/protocol/data/proto/Cmd0x858.kt | 14 +-- .../network/protocol/data/proto/Define.kt | 104 +++++++++--------- .../network/protocol/data/proto/Group.kt | 16 +-- .../network/protocol/data/proto/Highway.kt | 98 ++++++++--------- .../protocol/data/proto/HummerCommelem.kt | 56 +++++----- .../network/protocol/data/proto/LongMsg.kt | 16 +-- .../protocol/data/proto/MsgRevokeUserDef.kt | 6 +- .../protocol/data/proto/MsgTransmit.kt | 6 +- .../network/protocol/data/proto/MultiMsg.kt | 14 +-- .../network/protocol/data/proto/OIDB.kt | 4 +- .../network/protocol/data/proto/Oidb0x769.kt | 20 ++-- .../network/protocol/data/proto/OnlinePush.kt | 6 +- .../network/protocol/data/proto/PbReserve.kt | 12 +- .../protocol/data/proto/StatSvcGetOnline.kt | 6 +- .../network/protocol/data/proto/StructMsg.kt | 4 +- .../network/protocol/data/proto/SyncCookie.kt | 4 +- 19 files changed, 259 insertions(+), 259 deletions(-) diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x352.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x352.kt index ffc6466a8..1e8ef3ab3 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x352.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x352.kt @@ -17,7 +17,7 @@ import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf @Serializable internal class Cmd0x352 : ProtoBuf { @Serializable - class DelImgReq( +internal class DelImgReq( @ProtoId(1) val srcUin: Long = 0L, @ProtoId(2) val dstUin: Long = 0L, @ProtoId(3) val reqTerm: Int = 0, @@ -30,14 +30,14 @@ internal class Cmd0x352 : ProtoBuf { ) : ProtoBuf @Serializable - class DelImgRsp( +internal class DelImgRsp( @ProtoId(1) val result: Int = 0, @ProtoId(2) val failMsg: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val fileResid: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class GetImgUrlReq( +internal class GetImgUrlReq( @ProtoId(1) val srcUin: Long = 0L, @ProtoId(2) val dstUin: Long = 0L, @ProtoId(3) val fileResid: ByteArray = EMPTY_BYTE_ARRAY, @@ -55,7 +55,7 @@ internal class Cmd0x352 : ProtoBuf { ) : ProtoBuf @Serializable - class GetImgUrlRsp( +internal class GetImgUrlRsp( @ProtoId(1) val fileResid: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val clientIp: Int = 0, @ProtoId(3) val result: Int = 0, @@ -78,7 +78,7 @@ internal class Cmd0x352 : ProtoBuf { @Suppress("ArrayInDataClass") @Serializable - class ImgInfo( +internal class ImgInfo( @ProtoId(1) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val fileType: Int = 0, @ProtoId(3) val fileSize: Long = 0L, @@ -89,13 +89,13 @@ internal class Cmd0x352 : ProtoBuf { ) : ProtoBuf @Serializable - class IPv6Info( +internal class IPv6Info( @ProtoId(1) val ip6: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val port: Int = 0 ) : ProtoBuf @Serializable - class ReqBody( +internal class ReqBody( @ProtoId(1) val subcmd: Int = 0, //2是GetImgUrlReq 1是UploadImgReq @ProtoId(2) val msgTryupImgReq: List? = null,// optional @ProtoId(3) val msgGetimgUrlReq: List? = null,// optional @@ -104,7 +104,7 @@ internal class Cmd0x352 : ProtoBuf { ) : ProtoBuf @Serializable - class RspBody( +internal class RspBody( @ProtoId(1) val subcmd: Int = 0, @ProtoId(2) val msgTryupImgRsp: List? = null, @ProtoId(3) val msgGetimgUrlRsp: List? = null, @@ -151,7 +151,7 @@ internal class Cmd0x352 : ProtoBuf { ) : ImgReq @Serializable - class TryUpImgRsp( +internal class TryUpImgRsp( @ProtoId(1) val fileId: Long = 0L, @ProtoId(2) val clientIp: Int = 0, @ProtoId(3) val result: Int = 0, @@ -179,7 +179,7 @@ internal class Cmd0x352 : ProtoBuf { ) : ProtoBuf @Serializable - class TryUpInfo4Busi( +internal class TryUpInfo4Busi( @ProtoId(1) val fileResid: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val downDomain: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val thumbDownUrl: ByteArray = EMPTY_BYTE_ARRAY, diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x388.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x388.kt index 85a68a6c0..bfef4d837 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x388.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x388.kt @@ -17,7 +17,7 @@ import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf @Serializable internal class Cmd0x388 : ProtoBuf { @Serializable - class DelImgReq( +internal class DelImgReq( @ProtoId(1) val srcUin: Long = 0L, @ProtoId(2) val dstUin: Long = 0L, @ProtoId(3) val reqTerm: Int = 0, @@ -30,36 +30,36 @@ internal class Cmd0x388 : ProtoBuf { ) : ProtoBuf @Serializable - class DelImgRsp( +internal class DelImgRsp( @ProtoId(1) val result: Int = 0, @ProtoId(2) val failMsg: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val fileResid: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class ExpRoamExtendInfo( +internal class ExpRoamExtendInfo( @ProtoId(1) val resid: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class ExpRoamPicInfo( +internal class ExpRoamPicInfo( @ProtoId(1) val shopFlag: Int = 0, @ProtoId(2) val pkgId: Int = 0, @ProtoId(3) val picId: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class ExtensionCommPicTryUp( +internal class ExtensionCommPicTryUp( @ProtoId(1) val bytesExtinfo: List? = null ) : ProtoBuf @Serializable - class ExtensionExpRoamTryUp( +internal class ExtensionExpRoamTryUp( @ProtoId(1) val msgExproamPicInfo: List? = null ) : ProtoBuf @Serializable - class GetImgUrlReq( +internal class GetImgUrlReq( @ProtoId(1) val groupCode: Long = 0L, @ProtoId(2) val dstUin: Long = 0L, @ProtoId(3) val fileid: Long = 0L, @@ -83,7 +83,7 @@ internal class Cmd0x388 : ProtoBuf { ) : ProtoBuf @Serializable - class GetImgUrlRsp( +internal class GetImgUrlRsp( @ProtoId(1) val fileid: Long = 0L, @ProtoId(2) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val result: Int = 0, @@ -108,7 +108,7 @@ internal class Cmd0x388 : ProtoBuf { ) : ProtoBuf @Serializable - class GetPttUrlReq( +internal class GetPttUrlReq( @ProtoId(1) val groupCode: Long = 0L, @ProtoId(2) val dstUin: Long = 0L, @ProtoId(3) val fileid: Long = 0L, @@ -127,7 +127,7 @@ internal class Cmd0x388 : ProtoBuf { ) : ProtoBuf @Serializable - class GetPttUrlRsp( +internal class GetPttUrlRsp( @ProtoId(1) val fileid: Long = 0L, @ProtoId(2) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val result: Int = 0, @@ -147,7 +147,7 @@ internal class Cmd0x388 : ProtoBuf { @Suppress("ArrayInDataClass") @Serializable - class ImgInfo( +internal class ImgInfo( @ProtoId(1) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val fileType: Int = 0, @ProtoId(3) val fileSize: Long = 0L, @@ -160,20 +160,20 @@ internal class Cmd0x388 : ProtoBuf { } @Serializable - class IPv6Info( +internal class IPv6Info( @ProtoId(1) val ip6: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val port: Int = 0 ) : ProtoBuf @Serializable - class PicSize( +internal class PicSize( @ProtoId(1) val original: Int = 0, @ProtoId(2) val thumb: Int = 0, @ProtoId(3) val high: Int = 0 ) : ProtoBuf @Serializable - class ReqBody( +internal class ReqBody( @ProtoId(1) val netType: Int = 0, @ProtoId(2) val subcmd: Int = 0, @ProtoId(3) val msgTryupImgReq: List? = null, @@ -186,7 +186,7 @@ internal class Cmd0x388 : ProtoBuf { ) : ProtoBuf @Serializable - class RspBody( +internal class RspBody( @ProtoId(1) val clientIp: Int = 0, @ProtoId(2) val subcmd: Int = 0, @ProtoId(3) val msgTryupImgRsp: List? = null, @@ -197,7 +197,7 @@ internal class Cmd0x388 : ProtoBuf { ) : ProtoBuf @Serializable - class TryUpImgReq( +internal class TryUpImgReq( @ProtoId(1) val groupCode: Long = 0L, @ProtoId(2) val srcUin: Long = 0L, @ProtoId(3) val fileId: Long = 0L, @@ -221,7 +221,7 @@ internal class Cmd0x388 : ProtoBuf { ) : ImgReq @Serializable - class TryUpImgRsp( +internal class TryUpImgRsp( @ProtoId(1) val fileId: Long = 0L, @ProtoId(2) val result: Int = 0, @ProtoId(3) val failMsg: String = "", @@ -240,7 +240,7 @@ internal class Cmd0x388 : ProtoBuf { ) : ProtoBuf @Serializable - class TryUpInfo4Busi( +internal class TryUpInfo4Busi( @ProtoId(1) val downDomain: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val thumbDownUrl: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val originalDownUrl: ByteArray = EMPTY_BYTE_ARRAY, @@ -249,7 +249,7 @@ internal class Cmd0x388 : ProtoBuf { ) : ProtoBuf @Serializable - class TryUpPttReq( +internal class TryUpPttReq( @ProtoId(1) val groupCode: Long = 0L, @ProtoId(2) val srcUin: Long = 0L, @ProtoId(3) val fileId: Long = 0L, @@ -269,7 +269,7 @@ internal class Cmd0x388 : ProtoBuf { ) : ProtoBuf @Serializable - class TryUpPttRsp( +internal class TryUpPttRsp( @ProtoId(1) val fileId: Long = 0L, @ProtoId(2) val result: Int = 0, @ProtoId(3) val failMsg: ByteArray = EMPTY_BYTE_ARRAY, diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x857.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x857.kt index ca4b1a0ae..babb620c3 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x857.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x857.kt @@ -20,7 +20,7 @@ import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf class GroupOpenSysMsg : ProtoBuf { @Serializable - class LightApp( +internal class LightApp( @ProtoId(1) val app: String = "", @ProtoId(2) val view: String = "", @ProtoId(3) val desc: String = "", @@ -32,7 +32,7 @@ class GroupOpenSysMsg : ProtoBuf { ) : ProtoBuf @Serializable - class RichMsg( +internal class RichMsg( @ProtoId(1) val title: String = "", @ProtoId(2) val desc: String = "", @ProtoId(3) val brief: String = "", @@ -42,7 +42,7 @@ class GroupOpenSysMsg : ProtoBuf { ) : ProtoBuf @Serializable - class Sender( +internal class Sender( @ProtoId(1) val uin: Long = 0L, @ProtoId(2) val nick: String = "", @ProtoId(3) val avatar: String = "", @@ -50,14 +50,14 @@ class GroupOpenSysMsg : ProtoBuf { ) : ProtoBuf @Serializable - class Source( +internal class Source( @ProtoId(1) val name: String = "", @ProtoId(2) val icon: String = "", @ProtoId(3) val url: String = "" ) : ProtoBuf @Serializable - class SysMsgBody( +internal class SysMsgBody( @ProtoId(1) val groupId: Long = 0L, @ProtoId(2) val appid: Long = 0L, @ProtoId(3) val sender: Sender? = null, @@ -69,9 +69,9 @@ class GroupOpenSysMsg : ProtoBuf { } @Serializable -class TroopTips0x857 : ProtoBuf { +internal class TroopTips0x857 : ProtoBuf { @Serializable - class AIOGrayTipsInfo( +internal class AIOGrayTipsInfo( @ProtoId(1) val optUint32ShowLastest: Int = 0, @ProtoId(2) val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val optUint32Remind: Int = 0, @@ -82,7 +82,7 @@ class TroopTips0x857 : ProtoBuf { ) : ProtoBuf @Serializable - class AIOTopTipsInfo( +internal class AIOTopTipsInfo( @ProtoId(1) val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val optUint32Icon: Int = 0, @ProtoId(3) val optEnumAction: Int /* enum */ = 1, @@ -94,12 +94,12 @@ class TroopTips0x857 : ProtoBuf { ) : ProtoBuf @Serializable - class FloatedTipsInfo( +internal class FloatedTipsInfo( @ProtoId(1) val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class GeneralGrayTipInfo( +internal class GeneralGrayTipInfo( @ProtoId(1) val busiType: Long = 0L, @ProtoId(2) val busiId: Long = 0L, @ProtoId(3) val ctrlFlag: Int = 0, @@ -113,7 +113,7 @@ class TroopTips0x857 : ProtoBuf { ) : ProtoBuf @Serializable - class GoldMsgTipsElem( +internal class GoldMsgTipsElem( @ProtoId(1) val type: Int = 0, @ProtoId(2) val billno: String = "", @ProtoId(3) val result: Int = 0, @@ -126,25 +126,25 @@ class TroopTips0x857 : ProtoBuf { ) : ProtoBuf @Serializable - class GroupInfoChange( +internal class GroupInfoChange( @ProtoId(1) val groupHonorSwitch: Int = 0 ) : ProtoBuf @Serializable - class GroupNotifyInfo( +internal class GroupNotifyInfo( @ProtoId(1) val optUint32AutoPullFlag: Int = 0, @ProtoId(2) val optBytesFeedsId: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class InstCtrl( +internal class InstCtrl( @ProtoId(1) val msgSendToInst: List? = null, @ProtoId(2) val msgExcludeInst: List? = null, @ProtoId(3) val msgFromInst: InstInfo? = null ) : ProtoBuf @Serializable - class InstInfo( +internal class InstInfo( @ProtoId(1) val apppid: Int = 0, @ProtoId(2) val instid: Int = 0, @ProtoId(3) val platform: Int = 0, @@ -157,7 +157,7 @@ class TroopTips0x857 : ProtoBuf { ) : ProtoBuf @Serializable - class LbsShareChangePushInfo( +internal class LbsShareChangePushInfo( @ProtoId(1) val msgType: Int = 0, @ProtoId(2) val msgInfo: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val versionCtrl: ByteArray = EMPTY_BYTE_ARRAY, @@ -171,12 +171,12 @@ class TroopTips0x857 : ProtoBuf { ) : ProtoBuf @Serializable - class LuckyBagNotify( +internal class LuckyBagNotify( @ProtoId(1) val msgTips: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class MediaChangePushInfo( +internal class MediaChangePushInfo( @ProtoId(1) val msgType: Int = 0, @ProtoId(2) val msgInfo: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val versionCtrl: ByteArray = EMPTY_BYTE_ARRAY, @@ -191,7 +191,7 @@ class TroopTips0x857 : ProtoBuf { @ProtoId(100) val extInfo: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf { @Serializable - class PersonalSetting( +internal class PersonalSetting( @ProtoId(1) val themeId: Int = 0, @ProtoId(2) val playerId: Int = 0, @ProtoId(3) val fontId: Int = 0 @@ -199,14 +199,14 @@ class TroopTips0x857 : ProtoBuf { } @Serializable - class MessageBoxInfo( +internal class MessageBoxInfo( @ProtoId(1) val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val optBytesTitle: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val optBytesButton: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class MessageRecallReminder( +internal class MessageRecallReminder( @ProtoId(1) val uin: Long = 0L, @ProtoId(2) val nickname: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val recalledMsgList: List = listOf(), @@ -216,7 +216,7 @@ class TroopTips0x857 : ProtoBuf { @ProtoId(7) val opType: Int = 0 ) : ProtoBuf { @Serializable - class MessageMeta( +internal class MessageMeta( @ProtoId(1) val seq: Int = 0, @ProtoId(2) val time: Int = 0, @ProtoId(3) val msgRandom: Int = 0, @@ -227,12 +227,12 @@ class TroopTips0x857 : ProtoBuf { } @Serializable - class MiniAppNotify( +internal class MiniAppNotify( @ProtoId(1) val msg: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class NotifyMsgBody( +internal class NotifyMsgBody( @ProtoId(1) val optEnumType: Int /* enum */ = 1, @ProtoId(2) val optUint64MsgTime: Long = 0L, @ProtoId(3) val optUint64MsgExpires: Long = 0L, @@ -264,14 +264,14 @@ class TroopTips0x857 : ProtoBuf { ) : ProtoBuf @Serializable - class NotifyObjmsgUpdate( +internal class NotifyObjmsgUpdate( @ProtoId(1) val objmsgId: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val updateType: Int = 0, @ProtoId(3) val extMsg: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class RedGrayTipsInfo( +internal class RedGrayTipsInfo( @ProtoId(1) val optUint32ShowLastest: Int = 0, @ProtoId(2) val senderUin: Long = 0L, @ProtoId(3) val receiverUin: Long = 0L, @@ -294,7 +294,7 @@ class TroopTips0x857 : ProtoBuf { ) : ProtoBuf @Serializable - class ReqBody( +internal class ReqBody( @ProtoId(1) val optUint64GroupCode: Long = 0L, @ProtoId(2) val uint64Memberuins: List? = null, @ProtoId(3) val optUint32Offline: Int = 0, @@ -304,12 +304,12 @@ class TroopTips0x857 : ProtoBuf { ) : ProtoBuf @Serializable - class RspBody( +internal class RspBody( @ProtoId(1) val optUint64GroupCode: Long = 0L ) : ProtoBuf @Serializable - class SingChangePushInfo( +internal class SingChangePushInfo( @ProtoId(1) val seq: Long = 0L, @ProtoId(2) val actionType: Int = 0, @ProtoId(3) val groupId: Long = 0L, @@ -319,13 +319,13 @@ class TroopTips0x857 : ProtoBuf { ) : ProtoBuf @Serializable - class TemplParam( +internal class TemplParam( @ProtoId(1) val name: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val value: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class ThemeStateNotify( +internal class ThemeStateNotify( @ProtoId(1) val state: Int = 0, @ProtoId(2) val feedsId: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val themeName: ByteArray = EMPTY_BYTE_ARRAY, @@ -334,7 +334,7 @@ class TroopTips0x857 : ProtoBuf { ) : ProtoBuf @Serializable - class TroopFormGrayTipsInfo( +internal class TroopFormGrayTipsInfo( @ProtoId(1) val writerUin: Long = 0L, @ProtoId(2) val creatorUin: Long = 0L, @ProtoId(3) val richContent: ByteArray = EMPTY_BYTE_ARRAY, @@ -343,7 +343,7 @@ class TroopTips0x857 : ProtoBuf { ) : ProtoBuf @Serializable - class VideoChangePushInfo( +internal class VideoChangePushInfo( @ProtoId(1) val seq: Long = 0L, @ProtoId(2) val actionType: Int = 0, @ProtoId(3) val groupId: Long = 0L, @@ -354,7 +354,7 @@ class TroopTips0x857 : ProtoBuf { ) : ProtoBuf @Serializable - class WereWolfPush( +internal class WereWolfPush( @ProtoId(1) val pushType: Int = 0, @ProtoId(2) val gameRoom: Long = 0L, @ProtoId(3) val enumGameState: Int = 0, @@ -374,7 +374,7 @@ class TroopTips0x857 : ProtoBuf { @ProtoId(17) val votedTieUsers: List? = null ) : ProtoBuf { @Serializable - class GameRecord( +internal class GameRecord( @ProtoId(1) val total: Int = 0, @ProtoId(2) val win: Int = 0, @ProtoId(3) val lose: Int = 0, @@ -382,7 +382,7 @@ class TroopTips0x857 : ProtoBuf { ) : ProtoBuf @Serializable - class Role( +internal class Role( @ProtoId(1) val uin: Long = 0L, @ProtoId(2) val enumType: Int = 0, @ProtoId(3) val enumState: Int = 0, diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x858.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x858.kt index b4ca46452..f669ccb41 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x858.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x858.kt @@ -19,9 +19,9 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf @Serializable -class Oidb0x858 : ProtoBuf { +internal class Oidb0x858 : ProtoBuf { @Serializable - class GoldMsgTipsElem( +internal class GoldMsgTipsElem( @ProtoId(1) val type: Int = 0, @ProtoId(2) val billno: String = "", @ProtoId(3) val result: Int = 0, @@ -34,7 +34,7 @@ class Oidb0x858 : ProtoBuf { ) : ProtoBuf @Serializable - class MessageRecallReminder( +internal class MessageRecallReminder( @ProtoId(1) val uin: Long = 0L, @ProtoId(2) val nickname: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val recalledMsgList: List = listOf(), @@ -42,7 +42,7 @@ class Oidb0x858 : ProtoBuf { @ProtoId(5) val userdef: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf { @Serializable - class MessageMeta( +internal class MessageMeta( @ProtoId(1) val seq: Int = 0, @ProtoId(2) val time: Int = 0, @ProtoId(3) val msgRandom: Int = 0 @@ -50,7 +50,7 @@ class Oidb0x858 : ProtoBuf { } @Serializable - class NotifyMsgBody( +internal class NotifyMsgBody( @ProtoId(1) val optEnumType: Int /* enum */ = 5, @ProtoId(2) val optUint64MsgTime: Long = 0L, @ProtoId(3) val optUint64MsgExpires: Long = 0L, @@ -64,14 +64,14 @@ class Oidb0x858 : ProtoBuf { ) : ProtoBuf @Serializable - class NotifyObjmsgUpdate( +internal class NotifyObjmsgUpdate( @ProtoId(1) val objmsgId: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val updateType: Int = 0, @ProtoId(3) val extMsg: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class RedGrayTipsInfo( +internal class RedGrayTipsInfo( @ProtoId(1) val optUint32ShowLastest: Int = 0, @ProtoId(2) val senderUin: Long = 0L, @ProtoId(3) val receiverUin: Long = 0L, diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Define.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Define.kt index 08b3fad69..78983648f 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Define.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Define.kt @@ -15,9 +15,9 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf @Serializable -class Common : ProtoBuf { +internal class Common : ProtoBuf { @Serializable - class BindInfo( +internal class BindInfo( @ProtoId(1) val friUin: Long = 0L, @ProtoId(2) val friNick: String = "", @ProtoId(3) val time: Long = 0L, @@ -25,7 +25,7 @@ class Common : ProtoBuf { ) : ProtoBuf @Serializable - class MedalInfo( +internal class MedalInfo( @ProtoId(1) val id: Int = 0, @ProtoId(2) val type: Int = 0, @ProtoId(4) val seq: Long = 0, @@ -62,7 +62,7 @@ class Common : ProtoBuf { ) : ProtoBuf @Serializable - class MedalTaskInfo( +internal class MedalTaskInfo( @ProtoId(1) val taskid: Int = 0, @ProtoId(32) val int32TaskValue: Int = 0, @ProtoId(33) val tarValue: Int = 0, @@ -72,9 +72,9 @@ class Common : ProtoBuf { } @Serializable -class AppointDefine : ProtoBuf { +internal class AppointDefine : ProtoBuf { @Serializable - class ADFeedContent( +internal class ADFeedContent( @ProtoId(1) val msgUserInfo: AppointDefine.UserInfo? = null, @ProtoId(2) val strPicUrl: List = listOf(), @ProtoId(3) val msgText: AppointDefine.RichText? = null, @@ -87,12 +87,12 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class RichText( +internal class RichText( @ProtoId(1) val msgElems: List? = null ) : ProtoBuf @Serializable - class RankEvent( +internal class RankEvent( @ProtoId(1) val listtype: Int = 0, @ProtoId(2) val notifytype: Int = 0, @ProtoId(3) val eventtime: Int = 0, @@ -101,13 +101,13 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class Wifi( +internal class Wifi( @ProtoId(1) val mac: Long = 0L, @ProtoId(2) val int32Rssi: Int = 0 ) : ProtoBuf @Serializable - class InterestItem( +internal class InterestItem( @ProtoId(1) val tagId: Long = 0L, @ProtoId(2) val tagName: String = "", @ProtoId(3) val tagIconUrl: String = "", @@ -123,13 +123,13 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class ShopID( +internal class ShopID( @ProtoId(1) val shopid: String = "", @ProtoId(2) val sp: Int = 0 ) : ProtoBuf @Serializable - class FeedComment( +internal class FeedComment( @ProtoId(1) val commentId: String = "", @ProtoId(2) val feedId: String = "", @ProtoId(3) val msgPublisherInfo: AppointDefine.StrangerInfo? = null, @@ -141,14 +141,14 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class ADFeed( +internal class ADFeed( @ProtoId(1) val taskId: Int = 0, @ProtoId(2) val style: Int = 0, @ProtoId(3) val content: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class Cell( +internal class Cell( @ProtoId(1) val int32Mcc: Int = -1, @ProtoId(2) val int32Mnc: Int = -1, @ProtoId(3) val int32Lac: Int = -1, @@ -157,27 +157,27 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class RecentVistorEvent( +internal class RecentVistorEvent( @ProtoId(1) val eventtype: Int = 0, @ProtoId(2) val eventTinyid: Long = 0L, @ProtoId(3) val unreadCount: Int = 0 ) : ProtoBuf @Serializable - class OrganizerInfo( +internal class OrganizerInfo( @ProtoId(1) val hostName: String = "", @ProtoId(2) val hostUrl: String = "", @ProtoId(3) val hostCover: String = "" ) : ProtoBuf @Serializable - class InterestTag( +internal class InterestTag( @ProtoId(1) val tagType: Int = 0, @ProtoId(2) val msgTagList: List? = null ) : ProtoBuf @Serializable - class AppointInfoEx( +internal class AppointInfoEx( @ProtoId(1) val feedsPicUrl: String = "", @ProtoId(2) val feedsUrl: String = "", @ProtoId(3) val detailTitle: String = "", @@ -189,7 +189,7 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class DateComment( +internal class DateComment( @ProtoId(1) val commentId: String = "", @ProtoId(2) val msgAppointId: AppointDefine.AppointID? = null, @ProtoId(3) val msgPublisherInfo: AppointDefine.StrangerInfo? = null, @@ -200,7 +200,7 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class AppointContent( +internal class AppointContent( @ProtoId(1) val appointSubject: Int = 0, @ProtoId(2) val payType: Int = 0, @ProtoId(3) val appointDate: Int = 0, @@ -211,7 +211,7 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class FeedInfo( +internal class FeedInfo( @ProtoId(1) val feedType: Long = 0L, @ProtoId(2) val feedId: String = "", @ProtoId(3) val msgFeedContent: AppointDefine.FeedContent? = null, @@ -229,12 +229,12 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class HotTopicList( +internal class HotTopicList( @ProtoId(1) val topicList: List? = null ) : ProtoBuf @Serializable - class FeedContent( +internal class FeedContent( @ProtoId(1) val strPicUrl: List = listOf(), @ProtoId(2) val msgText: AppointDefine.RichText? = null, @ProtoId(3) val hrefUrl: String = "", @@ -252,7 +252,7 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class TravelInfo( +internal class TravelInfo( @ProtoId(1) val msgDepartLocale: AppointDefine.LocaleInfo? = null, @ProtoId(2) val msgDestination: AppointDefine.LocaleInfo? = null, @ProtoId(3) val vehicle: Int = 0, @@ -262,13 +262,13 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class RecentFreshFeed( +internal class RecentFreshFeed( @ProtoId(1) val freshFeedInfo: List? = null, @ProtoId(2) val uid: Long = 0L ) : ProtoBuf @Serializable - class GPS( +internal class GPS( @ProtoId(1) val int32Lat: Int = 900000000, @ProtoId(2) val int32Lon: Int = 900000000, @ProtoId(3) val int32Alt: Int = -10000000, @@ -276,12 +276,12 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class AppointID( +internal class AppointID( @ProtoId(1) val requestId: String = "" ) : ProtoBuf @Serializable - class LocaleInfo( +internal class LocaleInfo( @ProtoId(1) val name: String = "", @ProtoId(2) val country: String = "", @ProtoId(3) val province: String = "", @@ -293,14 +293,14 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class LBSInfo( +internal class LBSInfo( @ProtoId(1) val msgGps: AppointDefine.GPS? = null, @ProtoId(2) val msgWifis: List? = null, @ProtoId(3) val msgCells: List? = null ) : ProtoBuf @Serializable - class FeedEvent( +internal class FeedEvent( @ProtoId(1) val eventId: Long = 0L, @ProtoId(2) val time: Int = 0, @ProtoId(3) val eventtype: Int = 0, @@ -312,7 +312,7 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class FeedsCookie( +internal class FeedsCookie( @ProtoId(1) val strList: List = listOf(), @ProtoId(2) val pose: Int = 0, @ProtoId(3) val cookie: ByteArray = EMPTY_BYTE_ARRAY, @@ -320,7 +320,7 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class NearbyTopic( +internal class NearbyTopic( @ProtoId(1) val topicId: Long = 0L, @ProtoId(2) val topic: String = "", @ProtoId(3) val foreword: String = "", @@ -342,7 +342,7 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class NearbyEvent( +internal class NearbyEvent( @ProtoId(1) val eventtype: Int = 0, @ProtoId(2) val msgRankevent: AppointDefine.RankEvent? = null, @ProtoId(3) val eventUin: Long = 0L, @@ -350,14 +350,14 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class Feed( +internal class Feed( @ProtoId(1) val msgUserInfo: AppointDefine.PublisherInfo? = null, @ProtoId(2) val msgFeedInfo: AppointDefine.FeedInfo? = null, @ProtoId(3) val ownerFlag: Int = 0 ) : ProtoBuf @Serializable - class ActivityInfo( +internal class ActivityInfo( @ProtoId(2) val name: String = "", @ProtoId(3) val cover: String = "", @ProtoId(4) val url: String = "", @@ -372,7 +372,7 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class HotEntry( +internal class HotEntry( @ProtoId(1) val openFlag: Int = 0, @ProtoId(2) val restTime: Int = 0, @ProtoId(3) val foreword: String = "", @@ -380,7 +380,7 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class UserFeed( +internal class UserFeed( @ProtoId(1) val msgUserInfo: AppointDefine.PublisherInfo? = null, @ProtoId(2) val msgFeedInfo: AppointDefine.FeedInfo? = null, @ProtoId(3) val ownerFlag: Int = 0, @@ -388,24 +388,24 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class Elem( +internal class Elem( @ProtoId(1) val content: String = "", @ProtoId(2) val msgFaceInfo: AppointDefine.Face? = null ) : ProtoBuf @Serializable - class HotFreshFeedList( +internal class HotFreshFeedList( @ProtoId(1) val msgFeeds: List? = null, @ProtoId(2) val updateTime: Int = 0 ) : ProtoBuf @Serializable - class RptInterestTag( +internal class RptInterestTag( @ProtoId(1) val interestTags: List? = null ) : ProtoBuf @Serializable - class AddressInfo( +internal class AddressInfo( @ProtoId(1) val companyZone: String = "", @ProtoId(2) val companyName: String = "", @ProtoId(3) val companyAddr: String = "", @@ -415,7 +415,7 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class PublisherInfo( +internal class PublisherInfo( @ProtoId(1) val tinyid: Long = 0L, @ProtoId(2) val nickname: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val age: Int = 0, @@ -441,7 +441,7 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class HotUserFeed( +internal class HotUserFeed( @ProtoId(1) val feedId: String = "", @ProtoId(2) val praiseCount: Int = 0, @ProtoId(3) val publishUid: Long = 0L, @@ -449,7 +449,7 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class FreshFeedInfo( +internal class FreshFeedInfo( @ProtoId(1) val uin: Long = 0L, @ProtoId(2) val time: Int = 0, @ProtoId(3) val feedId: String = "", @@ -457,7 +457,7 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class CommonLabel( +internal class CommonLabel( @ProtoId(1) val lableId: Int = 0, @ProtoId(2) val lableMsgPre: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val lableMsgLast: ByteArray = EMPTY_BYTE_ARRAY, @@ -466,12 +466,12 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class Face( +internal class Face( @ProtoId(1) val index: Int = 0 ) : ProtoBuf @Serializable - class StrangerInfo( +internal class StrangerInfo( @ProtoId(1) val tinyid: Long = 0L, @ProtoId(2) val nickname: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val age: Int = 0, @@ -490,7 +490,7 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class HotTopic( +internal class HotTopic( @ProtoId(1) val id: Long = 0L, @ProtoId(2) val title: String = "", @ProtoId(3) val topicType: Long = 0L, @@ -503,7 +503,7 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class DateEvent( +internal class DateEvent( @ProtoId(1) val eventId: Long = 0L, @ProtoId(2) val time: Int = 0, @ProtoId(3) val type: Int = 0, @@ -516,7 +516,7 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class AppointInfo( +internal class AppointInfo( @ProtoId(1) val msgAppointId: AppointDefine.AppointID? = null, @ProtoId(2) val msgAppointment: AppointDefine.AppointContent? = null, @ProtoId(3) val appointStatus: Int = 0, @@ -533,7 +533,7 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class UserInfo( +internal class UserInfo( @ProtoId(1) val uin: Long = 0L, @ProtoId(2) val nickname: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val age: Int = 0, @@ -542,7 +542,7 @@ class AppointDefine : ProtoBuf { ) : ProtoBuf @Serializable - class ReplyInfo( +internal class ReplyInfo( @ProtoId(1) val commentId: String = "", @ProtoId(2) val msgStrangerInfo: AppointDefine.StrangerInfo? = null ) : ProtoBuf diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Group.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Group.kt index 2ed48a7a8..76ef805e9 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Group.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Group.kt @@ -15,9 +15,9 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf @Serializable -class GroupLabel : ProtoBuf { +internal class GroupLabel : ProtoBuf { @Serializable - class Label( +internal class Label( @ProtoId(1) val name: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val enumType: Int /* enum */ = 1, @ProtoId(3) val textColor: GroupLabel.Color? = null, @@ -27,32 +27,32 @@ class GroupLabel : ProtoBuf { ) : ProtoBuf @Serializable - class RspBody( +internal class RspBody( @ProtoId(1) val error: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val groupInfo: List? = null ) : ProtoBuf @Serializable - class SourceId( +internal class SourceId( @ProtoId(1) val sourceId: Int = 0 ) : ProtoBuf @Serializable - class GroupInfo( +internal class GroupInfo( @ProtoId(1) val int32Result: Int = 0, @ProtoId(2) val groupCode: Long = 0L, @ProtoId(3) val groupLabel: List? = null ) : ProtoBuf @Serializable - class Color( +internal class Color( @ProtoId(1) val r: Int = 0, @ProtoId(2) val g: Int = 0, @ProtoId(3) val b: Int = 0 ) : ProtoBuf @Serializable - class ReqBody( +internal class ReqBody( @ProtoId(1) val sourceId: GroupLabel.SourceId? = null, @ProtoId(2) val uinInfo: GroupLabel.UinInfo? = null, @ProtoId(3) val numberLabel: Int = 5, @@ -61,7 +61,7 @@ class GroupLabel : ProtoBuf { ) : ProtoBuf @Serializable - class UinInfo( +internal class UinInfo( @ProtoId(1) val int64Longitude: Long = 0L, @ProtoId(2) val int64Latitude: Long = 0L ) : ProtoBuf diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Highway.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Highway.kt index 45584319f..e7521dff7 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Highway.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Highway.kt @@ -19,19 +19,19 @@ import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf @Serializable internal class BdhExtinfo : ProtoBuf { @Serializable - class CommFileExtReq( +internal class CommFileExtReq( @ProtoId(1) val actionType: Int = 0, @ProtoId(2) val uuid: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class CommFileExtRsp( +internal class CommFileExtRsp( @ProtoId(1) val int32Retcode: Int = 0, @ProtoId(2) val downloadUrl: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class PicInfo( +internal class PicInfo( @ProtoId(1) val idx: Int = 0, @ProtoId(2) val size: Int = 0, @ProtoId(3) val binMd5: ByteArray = EMPTY_BYTE_ARRAY, @@ -39,7 +39,7 @@ internal class BdhExtinfo : ProtoBuf { ) : ProtoBuf @Serializable - class QQVoiceExtReq( +internal class QQVoiceExtReq( @ProtoId(1) val qid: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val fmt: Int = 0, @ProtoId(3) val rate: Int = 0, @@ -49,21 +49,21 @@ internal class BdhExtinfo : ProtoBuf { ) : ProtoBuf @Serializable - class QQVoiceExtRsp( +internal class QQVoiceExtRsp( @ProtoId(1) val qid: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val int32Retcode: Int = 0, @ProtoId(3) val msgResult: List? = null ) : ProtoBuf @Serializable - class QQVoiceResult( +internal class QQVoiceResult( @ProtoId(1) val text: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val pinyin: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val source: Int = 0 ) : ProtoBuf @Serializable - class ShortVideoReqExtInfo( +internal class ShortVideoReqExtInfo( @ProtoId(1) val cmd: Int = 0, @ProtoId(2) val sessionId: Long = 0L, @ProtoId(3) val msgThumbinfo: PicInfo? = null, @@ -73,7 +73,7 @@ internal class BdhExtinfo : ProtoBuf { ) : ProtoBuf @Serializable - class ShortVideoRspExtInfo( +internal class ShortVideoRspExtInfo( @ProtoId(1) val cmd: Int = 0, @ProtoId(2) val sessionId: Long = 0L, @ProtoId(3) val int32Retcode: Int = 0, @@ -85,7 +85,7 @@ internal class BdhExtinfo : ProtoBuf { ) : ProtoBuf @Serializable - class ShortVideoSureReqInfo( +internal class ShortVideoSureReqInfo( @ProtoId(1) val fromuin: Long = 0L, @ProtoId(2) val chatType: Int = 0, @ProtoId(3) val touin: Long = 0L, @@ -99,7 +99,7 @@ internal class BdhExtinfo : ProtoBuf { ) : ProtoBuf @Serializable - class ShortVideoSureRspInfo( +internal class ShortVideoSureRspInfo( @ProtoId(1) val fileid: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val ukey: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val msgVideoinfo: VideoInfo? = null, @@ -107,10 +107,10 @@ internal class BdhExtinfo : ProtoBuf { ) : ProtoBuf @Serializable - class StoryVideoExtReq : ProtoBuf +internal class StoryVideoExtReq : ProtoBuf @Serializable - class StoryVideoExtRsp( +internal class StoryVideoExtRsp( @ProtoId(1) val int32Retcode: Int = 0, @ProtoId(2) val msg: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val cdnUrl: ByteArray = EMPTY_BYTE_ARRAY, @@ -119,14 +119,14 @@ internal class BdhExtinfo : ProtoBuf { ) : ProtoBuf @Serializable - class UploadPicExtInfo( +internal class UploadPicExtInfo( @ProtoId(1) val fileResid: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val downloadUrl: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val thumbDownloadUrl: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class VideoInfo( +internal class VideoInfo( @ProtoId(1) val idx: Int = 0, @ProtoId(2) val size: Int = 0, @ProtoId(3) val binMd5: ByteArray = EMPTY_BYTE_ARRAY, @@ -142,13 +142,13 @@ internal class BdhExtinfo : ProtoBuf { @Serializable internal class CSDataHighwayHead : ProtoBuf { @Serializable - class C2CCommonExtendinfo( +internal class C2CCommonExtendinfo( @ProtoId(1) val infoId: Int = 0, @ProtoId(2) val msgFilterExtendinfo: FilterExtendinfo? = null ) : ProtoBuf @Serializable - class DataHighwayHead( +internal class DataHighwayHead( @ProtoId(1) val version: Int = 0, @ProtoId(2) val uin: String = "", // yes @ProtoId(3) val command: String = "", @@ -162,25 +162,25 @@ internal class CSDataHighwayHead : ProtoBuf { ) : ProtoBuf @Serializable - class DataHole( +internal class DataHole( @ProtoId(1) val begin: Long = 0L, @ProtoId(2) val end: Long = 0L ) : ProtoBuf @Serializable - class FilterExtendinfo( +internal class FilterExtendinfo( @ProtoId(1) val filterFlag: Int = 0, @ProtoId(2) val msgImageFilterRequest: ImageFilterRequest? = null ) : ProtoBuf @Serializable - class FilterStyle( +internal class FilterStyle( @ProtoId(1) val styleId: Int = 0, @ProtoId(2) val styleName: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class ImageFilterRequest( +internal class ImageFilterRequest( @ProtoId(1) val sessionId: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val clientIp: Int = 0, @ProtoId(3) val uin: Long = 0L, @@ -191,26 +191,26 @@ internal class CSDataHighwayHead : ProtoBuf { ) : ProtoBuf @Serializable - class ImageFilterResponse( +internal class ImageFilterResponse( @ProtoId(1) val retCode: Int = 0, @ProtoId(2) val imageData: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val costTime: Int = 0 ) : ProtoBuf @Serializable - class LoginSigHead( +internal class LoginSigHead( @ProtoId(1) val loginsigType: Int = 0, @ProtoId(2) val loginsig: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class NewServiceTicket( +internal class NewServiceTicket( @ProtoId(1) val signature: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val ukey: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class PicInfoExt( +internal class PicInfoExt( @ProtoId(1) val picWidth: Int = 0, @ProtoId(2) val picHeight: Int = 0, @ProtoId(3) val picFlag: Int = 0, @@ -223,7 +223,7 @@ internal class CSDataHighwayHead : ProtoBuf { ) : ProtoBuf @Serializable - class PicRspExtInfo( +internal class PicRspExtInfo( @ProtoId(1) val skey: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val clientIp: Int = 0, @ProtoId(3) val upOffset: Long = 0L, @@ -231,14 +231,14 @@ internal class CSDataHighwayHead : ProtoBuf { ) : ProtoBuf @Serializable - class QueryHoleRsp( +internal class QueryHoleRsp( @ProtoId(1) val result: Int = 0, @ProtoId(2) val dataHole: List? = null, @ProtoId(3) val boolCompFlag: Boolean = false ) : ProtoBuf @Serializable - class ReqDataHighwayHead( +internal class ReqDataHighwayHead( @ProtoId(1) val msgBasehead: DataHighwayHead? = null, @ProtoId(2) val msgSeghead: SegHead? = null, @ProtoId(3) val reqExtendinfo: ByteArray = EMPTY_BYTE_ARRAY, @@ -247,12 +247,12 @@ internal class CSDataHighwayHead : ProtoBuf { ) : ProtoBuf @Serializable - class RspBody( +internal class RspBody( @ProtoId(1) val msgQueryHoleRsp: QueryHoleRsp? = null ) : ProtoBuf @Serializable - class RspDataHighwayHead( +internal class RspDataHighwayHead( @ProtoId(1) val msgBasehead: DataHighwayHead? = null, @ProtoId(2) val msgSeghead: SegHead? = null, @ProtoId(3) val errorCode: Int = 0, @@ -266,7 +266,7 @@ internal class CSDataHighwayHead : ProtoBuf { ) : ProtoBuf @Serializable - class SegHead( +internal class SegHead( @ProtoId(1) val serviceid: Int = 0, @ProtoId(2) val filesize: Long = 0L, @ProtoId(3) val dataoffset: Long = 0L, @@ -285,13 +285,13 @@ internal class CSDataHighwayHead : ProtoBuf { @Serializable internal class HwConfigPersistentPB : ProtoBuf { @Serializable - class HwConfigItemPB( +internal class HwConfigItemPB( @ProtoId(1) val ingKey: String = "", @ProtoId(2) val endPointList: List? = null ) : ProtoBuf @Serializable - class HwConfigPB( +internal class HwConfigPB( @ProtoId(1) val configItemList: List? = null, @ProtoId(2) val netSegConfList: List? = null, @ProtoId(3) val shortVideoNetConf: List? = null, @@ -299,14 +299,14 @@ internal class HwConfigPersistentPB : ProtoBuf { ) : ProtoBuf @Serializable - class HwEndPointPB( +internal class HwEndPointPB( @ProtoId(1) val ingHost: String = "", @ProtoId(2) val int32Port: Int = 0, @ProtoId(3) val int64Timestampe: Long = 0L ) : ProtoBuf @Serializable - class HwNetSegConfPB( +internal class HwNetSegConfPB( @ProtoId(1) val int64NetType: Long = 0L, @ProtoId(2) val int64SegSize: Long = 0L, @ProtoId(3) val int64SegNum: Long = 0L, @@ -317,7 +317,7 @@ internal class HwConfigPersistentPB : ProtoBuf { @Serializable internal class HwSessionInfoPersistentPB : ProtoBuf { @Serializable - class HwSessionInfoPB( +internal class HwSessionInfoPB( @ProtoId(1) val httpconnSigSession: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val sessionKey: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @@ -326,17 +326,17 @@ internal class HwSessionInfoPersistentPB : ProtoBuf { @Serializable internal class Subcmd0x501 : ProtoBuf { @Serializable - class ReqBody( +internal class ReqBody( @ProtoId(1281) val msgSubcmd0x501ReqBody: SubCmd0x501ReqBody? = null ) : ProtoBuf @Serializable - class RspBody( +internal class RspBody( @ProtoId(1281) val msgSubcmd0x501RspBody: SubCmd0x501Rspbody? = null ) : ProtoBuf @Serializable - class SubCmd0x501ReqBody( +internal class SubCmd0x501ReqBody( @ProtoId(1) val uin: Long = 0L, @ProtoId(2) val idcId: Int = 0, @ProtoId(3) val appid: Int = 0, @@ -352,7 +352,7 @@ internal class Subcmd0x501 : ProtoBuf { ) : ProtoBuf @Serializable - class SubCmd0x501Rspbody( +internal class SubCmd0x501Rspbody( @ProtoId(1) val httpconnSigSession: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val sessionKey: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val msgHttpconnAddrs: List? = null, @@ -366,14 +366,14 @@ internal class Subcmd0x501 : ProtoBuf { @ProtoId(11) val msgPtvConf: PTVConf? = null ) : ProtoBuf { @Serializable - class DownloadEncryptConf( +internal class DownloadEncryptConf( @ProtoId(1) val boolEnableEncryptRequest: Boolean = false, @ProtoId(2) val boolEnableEncryptedPic: Boolean = false, @ProtoId(3) val ctrlFlag: Int = 0 ) : ProtoBuf @Serializable - class DynTimeOutConf( +internal class DynTimeOutConf( @ProtoId(1) val tbase2g: Int = 0, @ProtoId(2) val tbase3g: Int = 0, @ProtoId(3) val tbase4g: Int = 0, @@ -396,7 +396,7 @@ internal class Subcmd0x501 : ProtoBuf { ) : ProtoBuf @Serializable - class Ip6Addr( +internal class Ip6Addr( @ProtoId(1) val type: Int = 0, @ProtoId(2) val ip6: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val port: Int = 0, @@ -405,7 +405,7 @@ internal class Subcmd0x501 : ProtoBuf { ) : ProtoBuf @Serializable - class IpAddr( +internal class IpAddr( @ProtoId(1) val type: Int = 0, @ProtoType(ProtoNumberType.FIXED) @ProtoId(2) val ip: Int = 0, @ProtoId(3) val port: Int = 0, @@ -414,13 +414,13 @@ internal class Subcmd0x501 : ProtoBuf { ) : ProtoBuf @Serializable - class IpLearnConf( +internal class IpLearnConf( @ProtoId(1) val refreshCachedIp: Int = 0, @ProtoId(2) val enableIpLearn: Int = 0 ) : ProtoBuf @Serializable - class NetSegConf( +internal class NetSegConf( @ProtoId(1) val netType: Int = 0, @ProtoId(2) val segsize: Int = 0, @ProtoId(3) val segnum: Int = 0, @@ -428,7 +428,7 @@ internal class Subcmd0x501 : ProtoBuf { ) : ProtoBuf @Serializable - class OpenUpConf( +internal class OpenUpConf( @ProtoId(1) val boolEnableOpenup: Boolean = false, @ProtoId(2) val preSendSegnum: Int = 0, @ProtoId(3) val preSendSegnum3g: Int = 0, @@ -437,14 +437,14 @@ internal class Subcmd0x501 : ProtoBuf { ) : ProtoBuf @Serializable - class PTVConf( +internal class PTVConf( @ProtoId(1) val channelType: Int = 0, @ProtoId(2) val msgNetsegconf: List? = null, @ProtoId(3) val boolOpenHardwareCodec: Boolean = false ) : ProtoBuf @Serializable - class ShortVideoConf( +internal class ShortVideoConf( @ProtoId(1) val channelType: Int = 0, @ProtoId(2) val msgNetsegconf: List? = null, @ProtoId(3) val boolOpenHardwareCodec: Boolean = false, @@ -452,7 +452,7 @@ internal class Subcmd0x501 : ProtoBuf { ) : ProtoBuf @Serializable - class SrvAddrs( +internal class SrvAddrs( @ProtoId(1) val serviceType: Int = 0, @ProtoId(2) val msgAddrs: List? = null, @ProtoId(3) val fragmentSize: Int = 0, diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/HummerCommelem.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/HummerCommelem.kt index b6dfb9b10..3b42900c4 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/HummerCommelem.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/HummerCommelem.kt @@ -16,7 +16,7 @@ import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf internal class HummerCommelem : ProtoBuf { @Serializable - class MsgElemInfoServtype1( +internal class MsgElemInfoServtype1( @ProtoId(1) val rewardId: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val senderUin: Long = 0L, @ProtoId(3) val picType: Int = 0, @@ -32,7 +32,7 @@ internal class HummerCommelem : ProtoBuf { ) : ProtoBuf @Serializable - class MsgElemInfoServtype11( +internal class MsgElemInfoServtype11( @ProtoId(1) val resID: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val resMD5: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val reserveInfo1: ByteArray = EMPTY_BYTE_ARRAY, @@ -44,19 +44,19 @@ internal class HummerCommelem : ProtoBuf { ) : ProtoBuf @Serializable - class MsgElemInfoServtype13( +internal class MsgElemInfoServtype13( @ProtoId(1) val sysHeadId: Int = 0, @ProtoId(2) val headFlag: Int = 0 ) : ProtoBuf @Serializable - class MsgElemInfoServtype14( +internal class MsgElemInfoServtype14( @ProtoId(1) val id: Int = 0, @ProtoId(2) val reserveInfo: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class MsgElemInfoServtype15( +internal class MsgElemInfoServtype15( @ProtoId(1) val vid: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val cover: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val title: ByteArray = EMPTY_BYTE_ARRAY, @@ -68,7 +68,7 @@ internal class HummerCommelem : ProtoBuf { ) : ProtoBuf @Serializable - class MsgElemInfoServtype16( +internal class MsgElemInfoServtype16( @ProtoId(1) val uid: Long = 0L, @ProtoId(2) val unionID: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val storyID: ByteArray = EMPTY_BYTE_ARRAY, @@ -84,7 +84,7 @@ internal class HummerCommelem : ProtoBuf { ) : ProtoBuf @Serializable - class MsgElemInfoServtype18( +internal class MsgElemInfoServtype18( @ProtoId(1) val currentAmount: Long = 0L, @ProtoId(2) val totalAmount: Long = 0L, @ProtoId(3) val listid: ByteArray = EMPTY_BYTE_ARRAY, @@ -93,12 +93,12 @@ internal class HummerCommelem : ProtoBuf { ) : ProtoBuf @Serializable - class MsgElemInfoServtype19( +internal class MsgElemInfoServtype19( @ProtoId(1) val data: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class MsgElemInfoServtype2( +internal class MsgElemInfoServtype2( @ProtoId(1) val pokeType: Int = 0, @ProtoId(2) val pokeSummary: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val doubleHit: Int = 0, @@ -112,12 +112,12 @@ internal class HummerCommelem : ProtoBuf { ) : ProtoBuf @Serializable - class MsgElemInfoServtype20( +internal class MsgElemInfoServtype20( @ProtoId(1) val data: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class MsgElemInfoServtype21( +internal class MsgElemInfoServtype21( @ProtoId(1) val topicId: Int = 0, @ProtoId(2) val confessorUin: Long = 0L, @ProtoId(3) val confessorNick: ByteArray = EMPTY_BYTE_ARRAY, @@ -130,7 +130,7 @@ internal class HummerCommelem : ProtoBuf { @ProtoId(10) val groupConfessCtx: HummerCommelem.MsgElemInfoServtype21.GroupConfessContext? = null ) : ProtoBuf { @Serializable - class C2CConfessContext( +internal class C2CConfessContext( @ProtoId(1) val confessorUin: Long = 0L, @ProtoId(2) val confessToUin: Long = 0L, @ProtoId(3) val sendUin: Long = 0L, @@ -146,7 +146,7 @@ internal class HummerCommelem : ProtoBuf { ) : ProtoBuf @Serializable - class GroupConfessContext( +internal class GroupConfessContext( @ProtoId(1) val confessorUin: Long = 0L, @ProtoId(2) val confessToUin: Long = 0L, @ProtoId(3) val sendUin: Long = 0L, @@ -160,7 +160,7 @@ internal class HummerCommelem : ProtoBuf { ) : ProtoBuf @Serializable - class GroupConfessItem( +internal class GroupConfessItem( @ProtoId(1) val topicId: Int = 0, @ProtoId(2) val confessToUin: Long = 0L, @ProtoId(3) val confessToNick: ByteArray = EMPTY_BYTE_ARRAY, @@ -169,7 +169,7 @@ internal class HummerCommelem : ProtoBuf { ) : ProtoBuf @Serializable - class GroupConfessMsg( +internal class GroupConfessMsg( @ProtoId(1) val confessTime: Long = 0L, @ProtoId(2) val confessorUin: Long = 0L, @ProtoId(3) val confessorSex: Int = 0, @@ -180,7 +180,7 @@ internal class HummerCommelem : ProtoBuf { } @Serializable - class MsgElemInfoServtype23( +internal class MsgElemInfoServtype23( @ProtoId(1) val faceType: Int = 0, @ProtoId(2) val faceBubbleCount: Int = 0, @ProtoId(3) val faceSummary: ByteArray = EMPTY_BYTE_ARRAY, @@ -189,12 +189,12 @@ internal class HummerCommelem : ProtoBuf { ) : ProtoBuf @Serializable - class MsgElemInfoServtype24( +internal class MsgElemInfoServtype24( @ProtoId(1) val limitChatEnter: HummerCommelem.MsgElemInfoServtype24.LimitChatEnter? = null, @ProtoId(2) val limitChatExit: HummerCommelem.MsgElemInfoServtype24.LimitChatExit? = null ) : ProtoBuf { @Serializable - class LimitChatEnter( +internal class LimitChatEnter( @ProtoId(1) val tipsWording: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val leftChatTime: Int = 0, @ProtoId(3) val matchTs: Long = 0L, @@ -205,42 +205,42 @@ internal class HummerCommelem : ProtoBuf { ) : ProtoBuf @Serializable - class LimitChatExit( +internal class LimitChatExit( @ProtoId(1) val exitMethod: Int = 0, @ProtoId(2) val matchTs: Long = 0L ) : ProtoBuf } @Serializable - class MsgElemInfoServtype27( +internal class MsgElemInfoServtype27( @ProtoId(1) val videoFile: ImMsgBody.VideoFile? = null ) : ProtoBuf @Serializable - class MsgElemInfoServtype29( +internal class MsgElemInfoServtype29( @ProtoId(1) val luckybagMsg: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class MsgElemInfoServtype3( +internal class MsgElemInfoServtype3( @ProtoId(1) val flashTroopPic: ImMsgBody.CustomFace? = null, @ProtoId(2) val flashC2cPic: ImMsgBody.NotOnlineImage? = null ) : ProtoBuf @Serializable - class MsgElemInfoServtype31( +internal class MsgElemInfoServtype31( @ProtoId(1) val text: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val ext: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class MsgElemInfoServtype4( +internal class MsgElemInfoServtype4( @ProtoId(1) val imsgType: Int = 0, @ProtoId(4) val stStoryAioObjMsg: HummerCommelem.StoryAioObjMsg? = null ) : ProtoBuf @Serializable - class MsgElemInfoServtype5( +internal class MsgElemInfoServtype5( @ProtoId(1) val vid: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val cover: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val title: ByteArray = EMPTY_BYTE_ARRAY, @@ -251,12 +251,12 @@ internal class HummerCommelem : ProtoBuf { ) : ProtoBuf @Serializable - class MsgElemInfoServtype8( +internal class MsgElemInfoServtype8( @ProtoId(1) val wifiDeliverGiftMsg: ImMsgBody.DeliverGiftMsg? = null ) : ProtoBuf @Serializable - class MsgElemInfoServtype9( +internal class MsgElemInfoServtype9( @ProtoId(1) val anchorStatus: Int = 0, @ProtoId(2) val jumpSchema: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val anchorNickname: String = "", @@ -265,7 +265,7 @@ internal class HummerCommelem : ProtoBuf { ) : ProtoBuf @Serializable - class StoryAioObjMsg( +internal class StoryAioObjMsg( @ProtoId(1) val uiUrl: String = "", @ProtoId(2) val jmpUrl: String = "" ) : ProtoBuf diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/LongMsg.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/LongMsg.kt index c916b3042..d3c9cfb71 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/LongMsg.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/LongMsg.kt @@ -7,19 +7,19 @@ import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf internal class LongMsg : ProtoBuf { @Serializable - class MsgDeleteReq( +internal class MsgDeleteReq( @ProtoId(1) val msgResid: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val msgType: Int = 0 ) : ProtoBuf @Serializable - class MsgDeleteRsp( +internal class MsgDeleteRsp( @ProtoId(1) val result: Int = 0, @ProtoId(2) val msgResid: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class MsgDownReq( +internal class MsgDownReq( @ProtoId(1) val srcUin: Int = 0, @ProtoId(2) val msgResid: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val msgType: Int = 0, @@ -27,14 +27,14 @@ internal class LongMsg : ProtoBuf { ) : ProtoBuf @Serializable - class MsgDownRsp( +internal class MsgDownRsp( @ProtoId(1) val result: Int = 0, @ProtoId(2) val msgResid: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val msgContent: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class MsgUpReq( +internal class MsgUpReq( @ProtoId(1) val msgType: Int = 0, @ProtoId(2) val dstUin: Long = 0L, @ProtoId(3) val msgId: Int = 0, @@ -45,14 +45,14 @@ internal class LongMsg : ProtoBuf { ) : ProtoBuf @Serializable - class MsgUpRsp( +internal class MsgUpRsp( @ProtoId(1) val result: Int = 0, @ProtoId(2) val msgId: Int = 0, @ProtoId(3) val msgResid: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class ReqBody( +internal class ReqBody( @ProtoId(1) val subcmd: Int = 0, @ProtoId(2) val termType: Int = 0, @ProtoId(3) val platformType: Int = 0, @@ -63,7 +63,7 @@ internal class LongMsg : ProtoBuf { ) : ProtoBuf @Serializable - class RspBody( +internal class RspBody( @ProtoId(1) val subcmd: Int = 0, @ProtoId(2) val msgUpRsp: List? = null, @ProtoId(3) val msgDownRsp: List? = null, diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgRevokeUserDef.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgRevokeUserDef.kt index c9ec688d9..609c0b0d2 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgRevokeUserDef.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgRevokeUserDef.kt @@ -15,13 +15,13 @@ import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf class MsgRevokeUserDef : ProtoBuf { @Serializable - class MsgInfoUserDef( +internal class MsgInfoUserDef( @ProtoId(1) val longMessageFlag: Int = 0, @ProtoId(2) val longMsgInfo: List? = null, @ProtoId(3) val fileUuid: List = listOf() ) : ProtoBuf { @Serializable - class MsgInfoDef( +internal class MsgInfoDef( @ProtoId(1) val msgSeq: Int = 0, @ProtoId(2) val longMsgId: Int = 0, @ProtoId(3) val longMsgNum: Int = 0, @@ -30,7 +30,7 @@ class MsgRevokeUserDef : ProtoBuf { } @Serializable - class UinTypeUserDef( +internal class UinTypeUserDef( @ProtoId(1) val fromUinType: Int = 0, @ProtoId(2) val fromGroupCode: Long = 0L, @ProtoId(3) val fileUuid: List = listOf() diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgTransmit.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgTransmit.kt index 84ab5856f..e9f42628c 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgTransmit.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgTransmit.kt @@ -7,18 +7,18 @@ import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf internal class MsgTransmit : ProtoBuf { @Serializable - class PbMultiMsgItem( +internal class PbMultiMsgItem( @ProtoId(1) val fileName: String = "", @ProtoId(2) val buffer: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class PbMultiMsgNew( +internal class PbMultiMsgNew( @ProtoId(1) val msg: List? = null ) : ProtoBuf @Serializable - class PbMultiMsgTransmit( +internal class PbMultiMsgTransmit( @ProtoId(1) val msg: List? = null, @ProtoId(2) val pbItemList: List? = null ) : ProtoBuf diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MultiMsg.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MultiMsg.kt index 7f6f392f9..0c72f08be 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MultiMsg.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MultiMsg.kt @@ -8,19 +8,19 @@ import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf @Serializable internal class MultiMsg : ProtoBuf { @Serializable - class ExternMsg( +internal class ExternMsg( @ProtoId(1) val channelType: Int = 0 ) : ProtoBuf @Serializable - class MultiMsgApplyDownReq( +internal class MultiMsgApplyDownReq( @ProtoId(1) val msgResid: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val msgType: Int = 0, @ProtoId(3) val srcUin: Long = 0L ) : ProtoBuf @Serializable - class MultiMsgApplyDownRsp( +internal class MultiMsgApplyDownRsp( @ProtoId(1) val result: Int = 0, @ProtoId(2) val thumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val msgKey: ByteArray = EMPTY_BYTE_ARRAY, @@ -33,7 +33,7 @@ internal class MultiMsg : ProtoBuf { ) : ProtoBuf @Serializable - class MultiMsgApplyUpReq( +internal class MultiMsgApplyUpReq( @ProtoId(1) val dstUin: Long = 0L, @ProtoId(2) val msgSize: Long = 0L, @ProtoId(3) val msgMd5: ByteArray = EMPTY_BYTE_ARRAY, @@ -42,7 +42,7 @@ internal class MultiMsg : ProtoBuf { ) : ProtoBuf @Serializable - class MultiMsgApplyUpRsp( +internal class MultiMsgApplyUpRsp( @ProtoId(1) val result: Int = 0, @ProtoId(2) val msgResid: String = "", @ProtoId(3) val msgUkey: ByteArray = EMPTY_BYTE_ARRAY, @@ -59,7 +59,7 @@ internal class MultiMsg : ProtoBuf { ) : ProtoBuf @Serializable - class ReqBody( +internal class ReqBody( @ProtoId(1) val subcmd: Int = 0, @ProtoId(2) val termType: Int = 0, @ProtoId(3) val platformType: Int = 0, @@ -72,7 +72,7 @@ internal class MultiMsg : ProtoBuf { ) : ProtoBuf @Serializable - class RspBody( +internal class RspBody( @ProtoId(1) val subcmd: Int = 0, @ProtoId(2) val multimsgApplyupRsp: List? = null, @ProtoId(3) val multimsgApplydownRsp: List? = null diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/OIDB.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/OIDB.kt index 6297591a6..808b13e13 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/OIDB.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/OIDB.kt @@ -19,7 +19,7 @@ internal class Oidb0x8a0 : ProtoBuf { @Serializable internal class RspBody( @ProtoId(1) val optUint64GroupCode: Long = 0L, - @ProtoId(2) val msgKickResult: List? = null + @ProtoId(2) val msgKickResult: List? = null ) : ProtoBuf @Serializable @@ -39,7 +39,7 @@ internal class Oidb0x8a0 : ProtoBuf { @Serializable internal class ReqBody( @ProtoId(1) val optUint64GroupCode: Long = 0L, - @ProtoId(2) val msgKickList: List? = null, + @ProtoId(2) val msgKickList: List? = null, @ProtoId(3) val kickList: List? = null, @ProtoId(4) val kickFlag: Int = 0, @ProtoId(5) val kickMsg: ByteArray = EMPTY_BYTE_ARRAY diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Oidb0x769.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Oidb0x769.kt index a2ba16a1f..d066a17e7 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Oidb0x769.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Oidb0x769.kt @@ -15,7 +15,7 @@ import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf class Oidb0x769 { @Serializable - class RequestBody( +internal class RequestBody( @ProtoId(1) val rpt_config_list: List // @SerialId(2) val msg_device_info: DeviceInfo, // @SerialId(3) val str_info: String = "", @@ -26,19 +26,19 @@ class Oidb0x769 { ) : ProtoBuf @Serializable - class QueryUinPackageUsageReq( +internal class QueryUinPackageUsageReq( @ProtoId(1) val type: Int, @ProtoId(2) val uinFileSize: Long = 0 ): ProtoBuf @Serializable - class ConfigSeq( +internal class ConfigSeq( @ProtoId(1) val type: Int, // uint @ProtoId(2) val version: Int // uint ): ProtoBuf @Serializable - class DeviceInfo( +internal class DeviceInfo( @ProtoId(1) val brand: String, @ProtoId(2) val model: String //@SerialId(3) val os: OS, @@ -50,7 +50,7 @@ class Oidb0x769 { ): ProtoBuf @Serializable - class OS( +internal class OS( @ProtoId(1) val type: Int = 1, @ProtoId(2) val version: String, @ProtoId(3) val sdk: String, @@ -59,27 +59,27 @@ class Oidb0x769 { ): ProtoBuf @Serializable - class Camera( +internal class Camera( @ProtoId(1) val primary: Long, @ProtoId(2) val secondary: Long, @ProtoId(3) val flag: Boolean ): ProtoBuf @Serializable - class CPU( +internal class CPU( @ProtoId(1) val model: String, @ProtoId(2) val frequency: Int, @ProtoId(3) val cores: Int ): ProtoBuf @Serializable - class Memory( +internal class Memory( @ProtoId(1) val total: Int, @ProtoId(2) val process: Int ): ProtoBuf @Serializable - class Screen( +internal class Screen( @ProtoId(1) val model: String, @ProtoId(2) val width: Int, @ProtoId(3) val height: Int, @@ -88,7 +88,7 @@ class Oidb0x769 { ): ProtoBuf @Serializable - class Storage( +internal class Storage( @ProtoId(1) val builtin: Int, @ProtoId(2) val external: Int ): ProtoBuf diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/OnlinePush.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/OnlinePush.kt index 0c8b53c36..4f945e3fb 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/OnlinePush.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/OnlinePush.kt @@ -27,15 +27,15 @@ internal class MsgOnlinePush { } @Serializable -class OnlinePushTrans : ProtoBuf { +internal class OnlinePushTrans : ProtoBuf { @Serializable - class ExtGroupKeyInfo( +internal class ExtGroupKeyInfo( @ProtoId(1) val curMaxSeq: Int = 0, @ProtoId(2) val curTime: Long = 0L ) : ProtoBuf @Serializable - class PbMsgInfo( +internal class PbMsgInfo( @ProtoId(1) val fromUin: Long = 0L, @ProtoId(2) val toUin: Long = 0L, @ProtoId(3) val msgType: Int = 0, diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/PbReserve.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/PbReserve.kt index 9cdbda5ba..ea21a5896 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/PbReserve.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/PbReserve.kt @@ -16,7 +16,7 @@ import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf internal class Generalflags : ProtoBuf { @Serializable - class ResvAttr( +internal class ResvAttr( @ProtoId(1) val globalGroupLevel: Int = 0, @ProtoId(2) val nearbyCharmLevel: Int = 0, @ProtoId(3) val redbagMsgSenderUin: Long = 0L, @@ -85,7 +85,7 @@ internal class Generalflags : ProtoBuf { @Serializable internal class ResvAttrForGiftMsg : ProtoBuf { @Serializable - class ActivityGiftInfo( +internal class ActivityGiftInfo( @ProtoId(1) val isActivityGift: Int = 0, @ProtoId(2) val textColor: String = "", @ProtoId(3) val text: String = "", @@ -93,12 +93,12 @@ internal class ResvAttrForGiftMsg : ProtoBuf { ) : ProtoBuf @Serializable - class InteractGift( +internal class InteractGift( @ProtoId(1) val interactId: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable - class ResvAttr( +internal class ResvAttr( @ProtoId(1) val int32SendScore: Int = 0, @ProtoId(2) val int32RecvScore: Int = 0, @ProtoId(3) val charmHeroism: ByteArray = EMPTY_BYTE_ARRAY, @@ -113,7 +113,7 @@ internal class ResvAttrForGiftMsg : ProtoBuf { @Serializable internal class SourceMsg : ProtoBuf { @Serializable - class ResvAttr( +internal class ResvAttr( @ProtoId(1) val richMsg2: ByteArray? = null, @ProtoId(2) val oriMsgtype: Int? = null, @ProtoId(3) val origUids: Long? = null // 原来是 list @@ -123,7 +123,7 @@ internal class SourceMsg : ProtoBuf { @Serializable internal class VideoFile : ProtoBuf { @Serializable - class ResvAttr( +internal class ResvAttr( @ProtoId(1) val hotvideoIcon: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(2) val hotvideoTitle: ByteArray = EMPTY_BYTE_ARRAY, @ProtoId(3) val hotvideoUrl: ByteArray = EMPTY_BYTE_ARRAY, diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/StatSvcGetOnline.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/StatSvcGetOnline.kt index fa5bc726c..4d5c04ee0 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/StatSvcGetOnline.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/StatSvcGetOnline.kt @@ -15,19 +15,19 @@ import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf class StatSvcGetOnline { @Serializable - class Instance( +internal class Instance( @ProtoId(1) val instanceId: Int = 0, @ProtoId(2) val clientType: Int = 0 ) : ProtoBuf @Serializable - class ReqBody( +internal class ReqBody( @ProtoId(1) val uin: Long = 0L, @ProtoId(2) val appid: Int = 0 ) : ProtoBuf @Serializable - class RspBody( +internal class RspBody( @ProtoId(1) val errorCode: Int = 0, @ProtoId(2) val errorMsg: String = "", @ProtoId(3) val uin: Long = 0L, diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/StructMsg.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/StructMsg.kt index 64a64e665..7d771a3af 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/StructMsg.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/StructMsg.kt @@ -1,8 +1,8 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto -import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY -import kotlinx.serialization.protobuf.ProtoId import kotlinx.serialization.Serializable +import kotlinx.serialization.protobuf.ProtoId +import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf @Serializable diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/SyncCookie.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/SyncCookie.kt index 452745f94..fecc7f8b1 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/SyncCookie.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/SyncCookie.kt @@ -16,7 +16,7 @@ import kotlin.math.absoluteValue import kotlin.random.Random @Serializable -class SyncCookie( +internal class SyncCookie( @ProtoId(1) val time1: Long? = null, // 1580277992 @ProtoId(2) val time: Long, // 1580277992 @ProtoId(3) val unknown1: Long = Random.nextLong().absoluteValue,// 678328038 @@ -33,7 +33,7 @@ private val const2_: Long = Random.nextLong().absoluteValue /* @Serializable -class SyncCookie( +internal class SyncCookie( @SerialId(1) val time1: Long? = null, // 1580277992 @SerialId(2) val time: Long, // 1580277992 @SerialId(3) val unknown1: Long = 678328038,// 678328038