Make protocol structure classes internal

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<TryUpImgReq>? = null,// optional
         @ProtoId(3) val msgGetimgUrlReq: List<GetImgUrlReq>? = 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<TryUpImgRsp>? = null,
         @ProtoId(3) val msgGetimgUrlRsp: List<GetImgUrlRsp>? = 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,

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<ByteArray>? = null
     ) : ProtoBuf
 
     @Serializable
-    class ExtensionExpRoamTryUp(
+internal class ExtensionExpRoamTryUp(
         @ProtoId(1) val msgExproamPicInfo: List<ExpRoamPicInfo>? = 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<TryUpImgReq>? = 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<TryUpImgRsp>? = 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,

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<InstInfo>? = null,
         @ProtoId(2) val msgExcludeInst: List<InstInfo>? = 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<MessageMeta> = 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<Long>? = 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<Long>? = 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,

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<MessageMeta> = 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,

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<GroupLabel.GroupInfo>? = 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<GroupLabel.Label>? = 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

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

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<LongMsg.MsgUpRsp>? = null,
         @ProtoId(3) val msgDownRsp: List<LongMsg.MsgDownRsp>? = null,

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<MsgInfoDef>? = null,
         @ProtoId(3) val fileUuid: List<String> = 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<String> = listOf()

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<MsgComm.Msg>? = null
     ) : ProtoBuf
 
     @Serializable
-    class PbMultiMsgTransmit(
+internal class PbMultiMsgTransmit(
         @ProtoId(1) val msg: List<MsgComm.Msg>? = null,
         @ProtoId(2) val pbItemList: List<MsgTransmit.PbMultiMsgItem>? = null
     ) : ProtoBuf

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<MultiMsg.MultiMsgApplyUpRsp>? = null,
         @ProtoId(3) val multimsgApplydownRsp: List<MultiMsg.MultiMsgApplyDownRsp>? = null

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<KickResult>? = null
+        @ProtoId(2) val msgKickResult: List<Oidb0x8a0.KickResult>? = 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<KickMemberInfo>? = null,
+        @ProtoId(2) val msgKickList: List<Oidb0x8a0.KickMemberInfo>? = null,
         @ProtoId(3) val kickList: List<Long>? = null,
         @ProtoId(4) val kickFlag: Int = 0,
         @ProtoId(5) val kickMsg: ByteArray = EMPTY_BYTE_ARRAY

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<ConfigSeq>
        // @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

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,

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,

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,

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/StructMsg.kt

 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

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