Jelajahi Sumber

Reformat and cleanup code

Him188 4 tahun lalu
induk
melakukan
b9eb654a51
100 mengubah file dengan 893 tambahan dan 874 penghapusan
  1. 2 1
      buildSrc/src/main/kotlin/analyzes/AndroidApiLevelCheck.kt
  2. 1 1
      mirai-core-api/src/commonMain/kotlin/LowLevelApiAccessor.kt
  3. 0 1
      mirai-core-api/src/commonMain/kotlin/contact/Group.kt
  4. 4 2
      mirai-core-api/src/commonMain/kotlin/event/events/group.kt
  5. 1 0
      mirai-core-api/src/commonMain/kotlin/internal/utils/StdoutLogger.kt
  6. 1 1
      mirai-core-api/src/commonMain/kotlin/message/code/internal/impl.kt
  7. 2 1
      mirai-core-api/src/commonMain/kotlin/message/data/Deprecated.kt
  8. 2 1
      mirai-core-api/src/commonMain/kotlin/message/data/MessageOrigin.kt
  9. 2 0
      mirai-core-api/src/commonMain/kotlin/message/data/MusicShare.kt
  10. 2 1
      mirai-core-api/src/commonMain/kotlin/message/data/UnsupportedMessage.kt
  11. 6 6
      mirai-core-api/src/commonMain/kotlin/utils/ExternalResource.kt
  12. 6 6
      mirai-core-api/src/commonMain/kotlin/utils/RemoteFile.kt
  13. 1 1
      mirai-core-api/src/jvmTest/kotlin/event/EventChannelTest.kt
  14. 1 1
      mirai-core-api/src/jvmTest/kotlin/event/EventTests.kt
  15. 13 12
      mirai-core-utils/src/commonMain/kotlin/CoroutineUtils.kt
  16. 1 1
      mirai-core-utils/src/commonMain/kotlin/Either.kt
  17. 1 1
      mirai-core/src/commonMain/kotlin/QQAndroidBot.kt
  18. 1 1
      mirai-core/src/commonMain/kotlin/contact/AbstractMember.kt
  19. 1 1
      mirai-core/src/commonMain/kotlin/contact/AnonymousMemberImpl.kt
  20. 1 1
      mirai-core/src/commonMain/kotlin/contact/FriendImpl.kt
  21. 5 2
      mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt
  22. 1 1
      mirai-core/src/commonMain/kotlin/contact/GroupSendMessageImpl.kt
  23. 1 1
      mirai-core/src/commonMain/kotlin/contact/GroupSettingsImpl.kt
  24. 1 1
      mirai-core/src/commonMain/kotlin/contact/NormalMemberImpl.kt
  25. 11 11
      mirai-core/src/commonMain/kotlin/contact/SendMessageHandler.kt
  26. 4 2
      mirai-core/src/commonMain/kotlin/contact/StrangerImpl.kt
  27. 2 2
      mirai-core/src/commonMain/kotlin/contact/info/MemberInfoImpl.kt
  28. 1 1
      mirai-core/src/commonMain/kotlin/contact/info/StrangerInfoImpl.kt
  29. 4 4
      mirai-core/src/commonMain/kotlin/contact/util.kt
  30. 24 21
      mirai-core/src/commonMain/kotlin/message/ReceiveMessageHandler.kt
  31. 3 3
      mirai-core/src/commonMain/kotlin/message/RefinableMessage.kt
  32. 1 1
      mirai-core/src/commonMain/kotlin/message/UnsupportedMessageImpl.kt
  33. 1 1
      mirai-core/src/commonMain/kotlin/message/contextualBugReportException.kt
  34. 7 7
      mirai-core/src/commonMain/kotlin/message/imagesImpl.kt
  35. 7 7
      mirai-core/src/commonMain/kotlin/message/incomingSourceImpl.kt
  36. 6 6
      mirai-core/src/commonMain/kotlin/message/lightApp.kt
  37. 1 1
      mirai-core/src/commonMain/kotlin/message/messageToElems.kt
  38. 1 1
      mirai-core/src/commonMain/kotlin/message/offlineSourceImpl.kt
  39. 9 9
      mirai-core/src/commonMain/kotlin/message/outgoingSourceImpl.kt
  40. 1 1
      mirai-core/src/commonMain/kotlin/network/context/AccountSecrets.kt
  41. 1 1
      mirai-core/src/commonMain/kotlin/network/context/SsoProcessorContext.kt
  42. 3 3
      mirai-core/src/commonMain/kotlin/network/handler/NetworkHandler.kt
  43. 1 1
      mirai-core/src/commonMain/kotlin/network/handler/NetworkHandlerContext.kt
  44. 1 1
      mirai-core/src/commonMain/kotlin/network/handler/selector/ExceptionInSelectorResumeException.kt
  45. 1 1
      mirai-core/src/commonMain/kotlin/network/handler/selector/MaxAttemptsReachedException.kt
  46. 5 5
      mirai-core/src/commonMain/kotlin/network/handler/state/CombinedStateObserver.kt
  47. 1 1
      mirai-core/src/commonMain/kotlin/network/handler/state/ExceptionInStateObserverException.kt
  48. 1 1
      mirai-core/src/commonMain/kotlin/network/handler/state/JobAttachStateObserver.kt
  49. 5 5
      mirai-core/src/commonMain/kotlin/network/handler/state/LoggingStateObserver.kt
  50. 3 3
      mirai-core/src/commonMain/kotlin/network/handler/state/SafeStateObserver.kt
  51. 8 8
      mirai-core/src/commonMain/kotlin/network/handler/state/StateChangedObserver.kt
  52. 2 2
      mirai-core/src/commonMain/kotlin/network/handler/state/StateObserver.kt
  53. 8 8
      mirai-core/src/commonMain/kotlin/network/highway/Highway.kt
  54. 1 1
      mirai-core/src/commonMain/kotlin/network/highway/Http.kt
  55. 1 1
      mirai-core/src/commonMain/kotlin/network/impl/netty/HeartbeatFailedException.kt
  56. 1 1
      mirai-core/src/commonMain/kotlin/network/impl/netty/NettyChannelException.kt
  57. 5 5
      mirai-core/src/commonMain/kotlin/network/impl/netty/NettyNetworkHandler.kt
  58. 1 1
      mirai-core/src/commonMain/kotlin/network/impl/netty/nettyUtils.kt
  59. 10 10
      mirai-core/src/commonMain/kotlin/network/keys.kt
  60. 1 0
      mirai-core/src/commonMain/kotlin/network/protocol/LoginType.kt
  61. 20 19
      mirai-core/src/commonMain/kotlin/network/protocol/data/jce/ConfigPush.kt
  62. 1 1
      mirai-core/src/commonMain/kotlin/network/protocol/data/jce/DeviceItemDes.kt
  63. 11 11
      mirai-core/src/commonMain/kotlin/network/protocol/data/jce/FriendList.kt
  64. 2 2
      mirai-core/src/commonMain/kotlin/network/protocol/data/jce/GroupMngReq.kt
  65. 1 1
      mirai-core/src/commonMain/kotlin/network/protocol/data/jce/InstanceInfo.kt
  66. 23 23
      mirai-core/src/commonMain/kotlin/network/protocol/data/jce/MsgType0x210.kt
  67. 23 23
      mirai-core/src/commonMain/kotlin/network/protocol/data/jce/OnlinePushPack.kt
  68. 5 5
      mirai-core/src/commonMain/kotlin/network/protocol/data/jce/PushNotifyPack.kt
  69. 1 1
      mirai-core/src/commonMain/kotlin/network/protocol/data/jce/ReqPushStatus.kt
  70. 37 37
      mirai-core/src/commonMain/kotlin/network/protocol/data/jce/ReqSummaryCard.kt
  71. 2 2
      mirai-core/src/commonMain/kotlin/network/protocol/data/jce/RequestMSFForceOffline.kt
  72. 4 4
      mirai-core/src/commonMain/kotlin/network/protocol/data/jce/RequestPacket.kt
  73. 1 1
      mirai-core/src/commonMain/kotlin/network/protocol/data/jce/RequestPushForceOffline.kt
  74. 2 2
      mirai-core/src/commonMain/kotlin/network/protocol/data/jce/SvcDevLoginInfo.kt
  75. 1 1
      mirai-core/src/commonMain/kotlin/network/protocol/data/jce/SvcReqMSFLoginNotifyData.kt
  76. 1 1
      mirai-core/src/commonMain/kotlin/network/protocol/data/jce/SvcReqRegister.kt
  77. 7 7
      mirai-core/src/commonMain/kotlin/network/protocol/data/jce/SvcRequestPushReadedNotify.kt
  78. 2 2
      mirai-core/src/commonMain/kotlin/network/protocol/data/jce/SvcRespRegister.kt
  79. 1 1
      mirai-core/src/commonMain/kotlin/network/protocol/data/jce/SvcRspGetDevLoginInfo.kt
  80. 11 11
      mirai-core/src/commonMain/kotlin/network/protocol/data/jce/TroopList.kt
  81. 50 50
      mirai-core/src/commonMain/kotlin/network/protocol/data/proto/Cmd0x346.kt
  82. 25 25
      mirai-core/src/commonMain/kotlin/network/protocol/data/proto/Cmd0x352.kt
  83. 40 40
      mirai-core/src/commonMain/kotlin/network/protocol/data/proto/Cmd0x388.kt
  84. 35 35
      mirai-core/src/commonMain/kotlin/network/protocol/data/proto/Cmd0x857.kt
  85. 12 12
      mirai-core/src/commonMain/kotlin/network/protocol/data/proto/Cmd0x858.kt
  86. 50 50
      mirai-core/src/commonMain/kotlin/network/protocol/data/proto/Define.kt
  87. 14 14
      mirai-core/src/commonMain/kotlin/network/protocol/data/proto/FrdSysMsg.kt
  88. 7 7
      mirai-core/src/commonMain/kotlin/network/protocol/data/proto/Group.kt
  89. 52 52
      mirai-core/src/commonMain/kotlin/network/protocol/data/proto/Highway.kt
  90. 2 2
      mirai-core/src/commonMain/kotlin/network/protocol/data/proto/HummerResv12.kt
  91. 4 4
      mirai-core/src/commonMain/kotlin/network/protocol/data/proto/HummerResv21.kt
  92. 2 2
      mirai-core/src/commonMain/kotlin/network/protocol/data/proto/HummerResv3.kt
  93. 10 10
      mirai-core/src/commonMain/kotlin/network/protocol/data/proto/ImageRequest.kt
  94. 16 16
      mirai-core/src/commonMain/kotlin/network/protocol/data/proto/LongMsg.kt
  95. 100 100
      mirai-core/src/commonMain/kotlin/network/protocol/data/proto/Msg.kt
  96. 13 13
      mirai-core/src/commonMain/kotlin/network/protocol/data/proto/MsgCommon.kt
  97. 1 1
      mirai-core/src/commonMain/kotlin/network/protocol/data/proto/MsgRevokeUserDef.kt
  98. 94 94
      mirai-core/src/commonMain/kotlin/network/protocol/data/proto/MsgSvc.kt
  99. 3 3
      mirai-core/src/commonMain/kotlin/network/protocol/data/proto/MsgTransmit.kt
  100. 7 7
      mirai-core/src/commonMain/kotlin/network/protocol/data/proto/MultiMsg.kt

+ 2 - 1
buildSrc/src/main/kotlin/analyzes/AndroidApiLevelCheck.kt

@@ -209,7 +209,8 @@ object AndroidApiLevelCheck {
 
 
     @Suppress("UNCHECKED_CAST")
     @Suppress("UNCHECKED_CAST")
     fun check(classes: File, level: Int, project: Project) {
     fun check(classes: File, level: Int, project: Project) {
-        val apiVersionsFile = project.rootProject.projectDir.resolve("buildSrc/src/main/resources/androidutil/api-versions.xml")
+        val apiVersionsFile =
+            project.rootProject.projectDir.resolve("buildSrc/src/main/resources/androidutil/api-versions.xml")
         val classesInfos = mutableMapOf<String, ClassInfo>()
         val classesInfos = mutableMapOf<String, ClassInfo>()
         XmlParser().parse(apiVersionsFile).children().forEach { classNode ->
         XmlParser().parse(apiVersionsFile).children().forEach { classNode ->
             classNode as Node
             classNode as Node

+ 1 - 1
mirai-core-api/src/commonMain/kotlin/LowLevelApiAccessor.kt

@@ -179,7 +179,7 @@ public interface LowLevelApiAccessor {
         groupId: Long,
         groupId: Long,
         image: GroupAnnouncementImage,
         image: GroupAnnouncementImage,
         announcement: GroupAnnouncement
         announcement: GroupAnnouncement
-    ):String
+    ): String
 
 
     /**
     /**
      * 删除群公告
      * 删除群公告

+ 0 - 1
mirai-core-api/src/commonMain/kotlin/contact/Group.kt

@@ -158,7 +158,6 @@ public interface Group : Contact, CoroutineScope, FileSupported, VoiceSupported
         this.sendMessage(message.toPlainText())
         this.sendMessage(message.toPlainText())
 
 
 
 
-
     /**
     /**
      * 将一条消息设置为群精华消息, 需要管理员或群主权限.
      * 将一条消息设置为群精华消息, 需要管理员或群主权限.
      * 操作成功返回 `true`.
      * 操作成功返回 `true`.

+ 4 - 2
mirai-core-api/src/commonMain/kotlin/event/events/group.kt

@@ -9,7 +9,8 @@
 
 
 @file:JvmMultifileClass
 @file:JvmMultifileClass
 @file:JvmName("BotEventsKt")
 @file:JvmName("BotEventsKt")
-@file:Suppress("unused", "FunctionName", "INVISIBLE_REFERENCE", "INVISIBLE_MEMBER", "DEPRECATION_ERROR",
+@file:Suppress(
+    "unused", "FunctionName", "INVISIBLE_REFERENCE", "INVISIBLE_MEMBER", "DEPRECATION_ERROR",
     "MemberVisibilityCanBePrivate"
     "MemberVisibilityCanBePrivate"
 )
 )
 
 
@@ -98,7 +99,8 @@ public data class BotUnmuteEvent @MiraiInternalApi constructor(
 /**
 /**
  * Bot 成功加入了一个新群
  * Bot 成功加入了一个新群
  */
  */
-public sealed class BotJoinGroupEvent : GroupEvent, BotPassiveEvent, Packet, AbstractEvent(), GroupMemberInfoChangeEvent {
+public sealed class BotJoinGroupEvent : GroupEvent, BotPassiveEvent, Packet, AbstractEvent(),
+    GroupMemberInfoChangeEvent {
     public abstract override val group: Group
     public abstract override val group: Group
 
 
     /**
     /**

+ 1 - 0
mirai-core-api/src/commonMain/kotlin/internal/utils/StdoutLogger.kt

@@ -101,6 +101,7 @@ internal open class StdoutLogger constructor(
         if (e != null) debug((message ?: e.toString()) + "\n${e.stackTraceToString()}")
         if (e != null) debug((message ?: e.toString()) + "\n${e.stackTraceToString()}")
         else debug(message.toString())
         else debug(message.toString())
     }
     }
+
     protected open val timeFormat: DateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.SIMPLIFIED_CHINESE)
     protected open val timeFormat: DateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.SIMPLIFIED_CHINESE)
 
 
     private val currentTimeFormatted get() = timeFormat.format(Date())
     private val currentTimeFormatted get() = timeFormat.format(Date())

+ 1 - 1
mirai-core-api/src/commonMain/kotlin/message/code/internal/impl.kt

@@ -92,7 +92,7 @@ private fun String.forEachMiraiCode(block: (origin: String, name: String?, args:
 }
 }
 
 
 @Suppress("DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE")
 @Suppress("DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE")
-private object MiraiCodeParsers: AbstractMap<String, MiraiCodeParser>(), Map<String, MiraiCodeParser> by mapOf(
+private object MiraiCodeParsers : AbstractMap<String, MiraiCodeParser>(), Map<String, MiraiCodeParser> by mapOf(
     "at" to MiraiCodeParser(Regex("""(\d*)""")) { (target) ->
     "at" to MiraiCodeParser(Regex("""(\d*)""")) { (target) ->
         At(target.toLong())
         At(target.toLong())
     },
     },

+ 2 - 1
mirai-core-api/src/commonMain/kotlin/message/data/Deprecated.kt

@@ -65,7 +65,8 @@ constructor(
     public val kind: RichMessageKind,
     public val kind: RichMessageKind,
 ) : MessageMetadata, ConstrainSingle {
 ) : MessageMetadata, ConstrainSingle {
     @Suppress("DEPRECATION_ERROR")
     @Suppress("DEPRECATION_ERROR")
-    override val key: Key get() = Key
+    override val key: Key
+        get() = Key
 
 
     override fun toString(): String {
     override fun toString(): String {
         val resourceId = resourceId
         val resourceId = resourceId

+ 2 - 1
mirai-core-api/src/commonMain/kotlin/message/data/MessageOrigin.kt

@@ -39,7 +39,8 @@ import net.mamoe.mirai.utils.safeCast
 @Serializable
 @Serializable
 @SerialName(MessageOrigin.SERIAL_NAME)
 @SerialName(MessageOrigin.SERIAL_NAME)
 @MiraiExperimentalApi
 @MiraiExperimentalApi
-public class MessageOrigin( // [2.3, 2.6-M1) 类名为 RichMessageOrigin
+public class MessageOrigin(
+    // [2.3, 2.6-M1) 类名为 RichMessageOrigin
     /**
     /**
      * 原 [SingleMessage].
      * 原 [SingleMessage].
      */
      */

+ 2 - 0
mirai-core-api/src/commonMain/kotlin/message/data/MusicShare.kt

@@ -177,6 +177,7 @@ public enum class MusicKind constructor(
         "cmccwm.mobilemusic",
         "cmccwm.mobilemusic",
         "6cdc72a439cef99a3418d2a78aa28c73"
         "6cdc72a439cef99a3418d2a78aa28c73"
     ),
     ),
+
     /**
     /**
      * @since 2.7
      * @since 2.7
      */
      */
@@ -187,6 +188,7 @@ public enum class MusicKind constructor(
         "com.kugou.android",
         "com.kugou.android",
         "fe4a24d80fcf253a00676a808f62c2c6"
         "fe4a24d80fcf253a00676a808f62c2c6"
     ),
     ),
+
     /**
     /**
      * @since 2.7
      * @since 2.7
      */
      */

+ 2 - 1
mirai-core-api/src/commonMain/kotlin/message/data/UnsupportedMessage.kt

@@ -33,7 +33,8 @@ import net.mamoe.mirai.utils.toUHexString
 @SerialName(UnsupportedMessage.SERIAL_NAME)
 @SerialName(UnsupportedMessage.SERIAL_NAME)
 @Serializable(UnsupportedMessage.Serializer::class)
 @Serializable(UnsupportedMessage.Serializer::class)
 public interface UnsupportedMessage : MessageContent {
 public interface UnsupportedMessage : MessageContent {
-    override fun contentToString(): String = "[不支持的消息#${struct.contentHashCode()}]" // to produce 'stable' and reliable text
+    override fun contentToString(): String =
+        "[不支持的消息#${struct.contentHashCode()}]" // to produce 'stable' and reliable text
 
 
     /**
     /**
      * 原生消息数据
      * 原生消息数据

+ 6 - 6
mirai-core-api/src/commonMain/kotlin/utils/ExternalResource.kt

@@ -151,7 +151,7 @@ public interface ExternalResource : Closeable {
         @JvmName("create")
         @JvmName("create")
         public fun RandomAccessFile.toExternalResource(
         public fun RandomAccessFile.toExternalResource(
             formatName: String? = null,
             formatName: String? = null,
-            closeOriginalFileOnClose: Boolean = true
+            closeOriginalFileOnClose: Boolean = true,
         ): ExternalResource =
         ): ExternalResource =
             ExternalResourceImplByFile(this, formatName, closeOriginalFileOnClose)
             ExternalResourceImplByFile(this, formatName, closeOriginalFileOnClose)
 
 
@@ -212,7 +212,7 @@ public interface ExternalResource : Closeable {
         @JvmOverloads
         @JvmOverloads
         public suspend fun <C : Contact> InputStream.sendAsImageTo(
         public suspend fun <C : Contact> InputStream.sendAsImageTo(
             contact: C,
             contact: C,
-            formatName: String? = null
+            formatName: String? = null,
         ): MessageReceipt<C> =
         ): MessageReceipt<C> =
             runBIO {
             runBIO {
                 // toExternalResource throws IOException however we're in BIO context so not propagating IOException to sendAsImageTo
                 // toExternalResource throws IOException however we're in BIO context so not propagating IOException to sendAsImageTo
@@ -303,7 +303,7 @@ public interface ExternalResource : Closeable {
         public suspend fun File.uploadTo(
         public suspend fun File.uploadTo(
             contact: FileSupported,
             contact: FileSupported,
             path: String,
             path: String,
-            callback: RemoteFile.ProgressionCallback? = null
+            callback: RemoteFile.ProgressionCallback? = null,
         ): FileMessage = toExternalResource().use { contact.uploadFile(path, it, callback) }
         ): FileMessage = toExternalResource().use { contact.uploadFile(path, it, callback) }
 
 
         /**
         /**
@@ -337,7 +337,7 @@ public interface ExternalResource : Closeable {
         public suspend fun ExternalResource.uploadAsFile(
         public suspend fun ExternalResource.uploadAsFile(
             contact: FileSupported,
             contact: FileSupported,
             path: String,
             path: String,
-            callback: RemoteFile.ProgressionCallback? = null
+            callback: RemoteFile.ProgressionCallback? = null,
         ): FileMessage = contact.uploadFile(path, this, callback)
         ): FileMessage = contact.uploadFile(path, this, callback)
 
 
         /**
         /**
@@ -356,7 +356,7 @@ public interface ExternalResource : Closeable {
         public suspend fun <C : FileSupported> File.sendTo(
         public suspend fun <C : FileSupported> File.sendTo(
             contact: C,
             contact: C,
             path: String,
             path: String,
-            callback: RemoteFile.ProgressionCallback? = null
+            callback: RemoteFile.ProgressionCallback? = null,
         ): MessageReceipt<C> = toExternalResource().use { contact.sendFile(path, it, callback) }
         ): MessageReceipt<C> = toExternalResource().use { contact.sendFile(path, it, callback) }
 
 
         /**
         /**
@@ -376,7 +376,7 @@ public interface ExternalResource : Closeable {
         public suspend fun <C : FileSupported> ExternalResource.sendAsFileTo(
         public suspend fun <C : FileSupported> ExternalResource.sendAsFileTo(
             contact: C,
             contact: C,
             path: String,
             path: String,
-            callback: RemoteFile.ProgressionCallback? = null
+            callback: RemoteFile.ProgressionCallback? = null,
         ): MessageReceipt<C> = contact.sendFile(path, this, callback)
         ): MessageReceipt<C> = contact.sendFile(path, this, callback)
 
 
         /**
         /**

+ 6 - 6
mirai-core-api/src/commonMain/kotlin/utils/RemoteFile.kt

@@ -450,7 +450,7 @@ public interface RemoteFile {
     ) // deprecated since 2.7-M1
     ) // deprecated since 2.7-M1
     public suspend fun upload(
     public suspend fun upload(
         resource: ExternalResource,
         resource: ExternalResource,
-        callback: ProgressionCallback? = null
+        callback: ProgressionCallback? = null,
     ): FileMessage
     ): FileMessage
 
 
     /**
     /**
@@ -477,7 +477,7 @@ public interface RemoteFile {
     ) // deprecated since 2.7-M1
     ) // deprecated since 2.7-M1
     public suspend fun upload(
     public suspend fun upload(
         file: File,
         file: File,
-        callback: ProgressionCallback? = null
+        callback: ProgressionCallback? = null,
     ): FileMessage = file.toExternalResource().use { upload(it, callback) }
     ): FileMessage = file.toExternalResource().use { upload(it, callback) }
 
 
     /**
     /**
@@ -575,7 +575,7 @@ public interface RemoteFile {
         public suspend fun FileSupported.uploadFile(
         public suspend fun FileSupported.uploadFile(
             path: String,
             path: String,
             resource: ExternalResource,
             resource: ExternalResource,
-            callback: ProgressionCallback? = null
+            callback: ProgressionCallback? = null,
         ): FileMessage = @Suppress("DEPRECATION") this.filesRoot.resolve(path).upload(resource, callback)
         ): FileMessage = @Suppress("DEPRECATION") this.filesRoot.resolve(path).upload(resource, callback)
 
 
         /**
         /**
@@ -599,7 +599,7 @@ public interface RemoteFile {
         public suspend fun FileSupported.uploadFile(
         public suspend fun FileSupported.uploadFile(
             path: String,
             path: String,
             file: File,
             file: File,
-            callback: ProgressionCallback? = null
+            callback: ProgressionCallback? = null,
         ): FileMessage = @Suppress("DEPRECATION") this.filesRoot.resolve(path).upload(file, callback)
         ): FileMessage = @Suppress("DEPRECATION") this.filesRoot.resolve(path).upload(file, callback)
 
 
         /**
         /**
@@ -612,7 +612,7 @@ public interface RemoteFile {
         public suspend fun <C : FileSupported> C.sendFile(
         public suspend fun <C : FileSupported> C.sendFile(
             path: String,
             path: String,
             resource: ExternalResource,
             resource: ExternalResource,
-            callback: ProgressionCallback? = null
+            callback: ProgressionCallback? = null,
         ): MessageReceipt<C> =
         ): MessageReceipt<C> =
             @Suppress("DEPRECATION")
             @Suppress("DEPRECATION")
             this.filesRoot.resolve(path).upload(resource, callback).sendTo(this)
             this.filesRoot.resolve(path).upload(resource, callback).sendTo(this)
@@ -626,7 +626,7 @@ public interface RemoteFile {
         public suspend fun <C : FileSupported> C.sendFile(
         public suspend fun <C : FileSupported> C.sendFile(
             path: String,
             path: String,
             file: File,
             file: File,
-            callback: ProgressionCallback? = null
+            callback: ProgressionCallback? = null,
         ): MessageReceipt<C> =
         ): MessageReceipt<C> =
             @Suppress("DEPRECATION")
             @Suppress("DEPRECATION")
             this.filesRoot.resolve(path).upload(file, callback).sendTo(this)
             this.filesRoot.resolve(path).upload(file, callback).sendTo(this)

+ 1 - 1
mirai-core-api/src/jvmTest/kotlin/event/EventChannelTest.kt

@@ -185,7 +185,7 @@ internal class EventChannelTest : AbstractEventTest() {
         val messageEventChannel = a.filterIsInstance<MessageEvent>()
         val messageEventChannel = a.filterIsInstance<MessageEvent>()
         // group.asChannel<GroupMessageEvent>()
         // group.asChannel<GroupMessageEvent>()
 
 
-        val listener: Listener<GroupMessageEvent> = messageEventChannel.subscribeAlways<GroupEvent>() {
+        val listener: Listener<GroupMessageEvent> = messageEventChannel.subscribeAlways<GroupEvent> {
 
 
         }
         }
 
 

+ 1 - 1
mirai-core-api/src/jvmTest/kotlin/event/EventTests.kt

@@ -187,7 +187,7 @@ internal class EventTests : AbstractEventTest() {
         }
         }
     }
     }
 
 
-    open class PriorityTestEvent : AbstractEvent() {}
+    open class PriorityTestEvent : AbstractEvent()
 
 
     fun singleThreaded(step: StepUtil, invoke: suspend EventChannel<Event>.() -> Unit) {
     fun singleThreaded(step: StepUtil, invoke: suspend EventChannel<Event>.() -> Unit) {
         // runBlocking 会完全堵死, 没法退出
         // runBlocking 会完全堵死, 没法退出

+ 13 - 12
mirai-core-utils/src/commonMain/kotlin/CoroutineUtils.kt

@@ -26,21 +26,21 @@ import kotlin.coroutines.EmptyCoroutineContext
 )
 )
 @kotlin.internal.LowPriorityInOverloadResolution
 @kotlin.internal.LowPriorityInOverloadResolution
 public suspend inline fun <R> runBIO(
 public suspend inline fun <R> runBIO(
-    noinline block: suspend CoroutineScope.() -> R
+    noinline block: suspend CoroutineScope.() -> R,
 ): R = withContext(Dispatchers.IO, block)
 ): R = withContext(Dispatchers.IO, block)
 
 
 public suspend inline fun <R> runBIO(
 public suspend inline fun <R> runBIO(
-    noinline block: () -> R
+    noinline block: () -> R,
 ): R = runInterruptible(context = Dispatchers.IO, block = block)
 ): R = runInterruptible(context = Dispatchers.IO, block = block)
 
 
 public suspend inline fun <T, R> T.runBIO(
 public suspend inline fun <T, R> T.runBIO(
-    crossinline block: T.() -> R
+    crossinline block: T.() -> R,
 ): R = runInterruptible(context = Dispatchers.IO, block = { block() })
 ): R = runInterruptible(context = Dispatchers.IO, block = { block() })
 
 
 public inline fun CoroutineScope.launchWithPermit(
 public inline fun CoroutineScope.launchWithPermit(
     semaphore: Semaphore,
     semaphore: Semaphore,
     coroutineContext: CoroutineContext = EmptyCoroutineContext,
     coroutineContext: CoroutineContext = EmptyCoroutineContext,
-    crossinline block: suspend () -> Unit
+    crossinline block: suspend () -> Unit,
 ): Job {
 ): Job {
     return launch(coroutineContext) {
     return launch(coroutineContext) {
         semaphore.withPermit { block() }
         semaphore.withPermit { block() }
@@ -74,28 +74,28 @@ public fun CoroutineContext.childScopeContext(
 
 
 public inline fun <E : U, U : CoroutineContext.Element> CoroutineContext.getOrElse(
 public inline fun <E : U, U : CoroutineContext.Element> CoroutineContext.getOrElse(
     key: CoroutineContext.Key<E>,
     key: CoroutineContext.Key<E>,
-    default: () -> U
+    default: () -> U,
 ): U = this[key] ?: default()
 ): U = this[key] ?: default()
 
 
 public inline fun <E : CoroutineContext.Element> CoroutineContext.addIfAbsent(
 public inline fun <E : CoroutineContext.Element> CoroutineContext.addIfAbsent(
     key: CoroutineContext.Key<E>,
     key: CoroutineContext.Key<E>,
-    default: () -> CoroutineContext.Element
+    default: () -> CoroutineContext.Element,
 ): CoroutineContext = if (this[key] == null) this + default() else this
 ): CoroutineContext = if (this[key] == null) this + default() else this
 
 
 public inline fun CoroutineContext.addNameIfAbsent(
 public inline fun CoroutineContext.addNameIfAbsent(
-    name: () -> String
+    name: () -> String,
 ): CoroutineContext = addIfAbsent(CoroutineName) { CoroutineName(name()) }
 ): CoroutineContext = addIfAbsent(CoroutineName) { CoroutineName(name()) }
 
 
 public fun CoroutineContext.addNameHierarchically(
 public fun CoroutineContext.addNameHierarchically(
-    name: String
+    name: String,
 ): CoroutineContext = this + CoroutineName(this[CoroutineName]?.name?.plus('.')?.plus(name) ?: name)
 ): CoroutineContext = this + CoroutineName(this[CoroutineName]?.name?.plus('.')?.plus(name) ?: name)
 
 
 public fun CoroutineContext.hierarchicalName(
 public fun CoroutineContext.hierarchicalName(
-    name: String
+    name: String,
 ): CoroutineName = CoroutineName(this[CoroutineName]?.name?.plus('.')?.plus(name) ?: name)
 ): CoroutineName = CoroutineName(this[CoroutineName]?.name?.plus('.')?.plus(name) ?: name)
 
 
 public fun CoroutineScope.hierarchicalName(
 public fun CoroutineScope.hierarchicalName(
-    name: String
+    name: String,
 ): CoroutineName = this.coroutineContext.hierarchicalName(name)
 ): CoroutineName = this.coroutineContext.hierarchicalName(name)
 
 
 public inline fun <R> runUnwrapCancellationException(block: () -> R): R {
 public inline fun <R> runUnwrapCancellationException(block: () -> R): R {
@@ -163,6 +163,7 @@ public inline fun <reified E> Throwable.unwrap(): Throwable {
     if (suppressed.isNotEmpty()) return this
     if (suppressed.isNotEmpty()) return this
     return this.findCause { it !is E }
     return this.findCause { it !is E }
         ?.also { it.addSuppressed(this) }
         ?.also { it.addSuppressed(this) }
-        ?.fillInStackTrace() // add the unwrapped CancellationException to suppress so we loss no information
         ?: this
         ?: this
-}
+}
+
+public val CoroutineContext.coroutineName: String get() = this[CoroutineName]?.name ?: "unnamed"

+ 1 - 1
mirai-core-utils/src/commonMain/kotlin/Either.kt

@@ -18,7 +18,7 @@ package net.mamoe.mirai.utils
 public value class Either<out L : Any, out R : Any?> private constructor(
 public value class Either<out L : Any, out R : Any?> private constructor(
     @PublishedApi
     @PublishedApi
     @JvmField
     @JvmField
-    internal val value: Any?
+    internal val value: Any?,
 ) {
 ) {
     override fun toString(): String = value.toString()
     override fun toString(): String = value.toString()
 
 

+ 1 - 1
mirai-core/src/commonMain/kotlin/QQAndroidBot.kt

@@ -91,7 +91,7 @@ internal open class QQAndroidBot constructor(
                 override fun stateChanged0(
                 override fun stateChanged0(
                     networkHandler: NetworkHandlerSupport,
                     networkHandler: NetworkHandlerSupport,
                     previous: BaseStateImpl,
                     previous: BaseStateImpl,
-                    new: BaseStateImpl
+                    new: BaseStateImpl,
                 ) {
                 ) {
                     eventDispatcher.broadcastAsync(BotOnlineEvent(bot)).thenBroadcast(eventDispatcher) {
                     eventDispatcher.broadcastAsync(BotOnlineEvent(bot)).thenBroadcast(eventDispatcher) {
                         if (!shouldBroadcastRelogin.compareAndSet(false, true)) {
                         if (!shouldBroadcastRelogin.compareAndSet(false, true)) {

+ 1 - 1
mirai-core/src/commonMain/kotlin/contact/AbstractMember.kt

@@ -21,7 +21,7 @@ import kotlin.coroutines.CoroutineContext
 internal abstract class AbstractMember(
 internal abstract class AbstractMember(
     group: GroupImpl,
     group: GroupImpl,
     coroutineContext: CoroutineContext,
     coroutineContext: CoroutineContext,
-    memberInfo: MemberInfo
+    memberInfo: MemberInfo,
 ) : AbstractUser(group.bot, coroutineContext, memberInfo), Member {
 ) : AbstractUser(group.bot, coroutineContext, memberInfo), Member {
     final override val group: GroupImpl by group.unsafeWeakRef()
     final override val group: GroupImpl by group.unsafeWeakRef()
 
 

+ 1 - 1
mirai-core/src/commonMain/kotlin/contact/AnonymousMemberImpl.kt

@@ -20,7 +20,7 @@ internal class AnonymousMemberImpl(
     group: GroupImpl,
     group: GroupImpl,
     coroutineContext: CoroutineContext,
     coroutineContext: CoroutineContext,
     memberInfo: MemberInfo,
     memberInfo: MemberInfo,
-    override val anonymousId: String
+    override val anonymousId: String,
 ) : AnonymousMember, AbstractMember(group, coroutineContext, memberInfo) {
 ) : AnonymousMember, AbstractMember(group, coroutineContext, memberInfo) {
     override suspend fun mute(durationSeconds: Int) {
     override suspend fun mute(durationSeconds: Int) {
         checkBotPermissionHigherThanThis("mute")
         checkBotPermissionHigherThanThis("mute")

+ 1 - 1
mirai-core/src/commonMain/kotlin/contact/FriendImpl.kt

@@ -67,7 +67,7 @@ internal inline fun Friend.checkIsFriendImpl(): FriendImpl {
 internal class FriendImpl(
 internal class FriendImpl(
     bot: QQAndroidBot,
     bot: QQAndroidBot,
     coroutineContext: CoroutineContext,
     coroutineContext: CoroutineContext,
-    internal val friendInfo: FriendInfo
+    internal val friendInfo: FriendInfo,
 ) : Friend, AbstractUser(bot, coroutineContext, friendInfo) {
 ) : Friend, AbstractUser(bot, coroutineContext, friendInfo) {
     @Suppress("unused") // bug
     @Suppress("unused") // bug
     val lastMessageSequence: AtomicInt = atomic(-1)
     val lastMessageSequence: AtomicInt = atomic(-1)

+ 5 - 2
mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt

@@ -16,7 +16,10 @@ import kotlinx.coroutines.flow.*
 import net.mamoe.mirai.LowLevelApi
 import net.mamoe.mirai.LowLevelApi
 import net.mamoe.mirai.Mirai
 import net.mamoe.mirai.Mirai
 import net.mamoe.mirai.contact.*
 import net.mamoe.mirai.contact.*
-import net.mamoe.mirai.data.*
+import net.mamoe.mirai.data.GroupInfo
+import net.mamoe.mirai.data.MemberInfo
+import net.mamoe.mirai.data.ReceiveAnnouncement
+import net.mamoe.mirai.data.covertToAnnouncement
 import net.mamoe.mirai.event.broadcast
 import net.mamoe.mirai.event.broadcast
 import net.mamoe.mirai.event.events.*
 import net.mamoe.mirai.event.events.*
 import net.mamoe.mirai.internal.QQAndroidBot
 import net.mamoe.mirai.internal.QQAndroidBot
@@ -64,7 +67,7 @@ internal class GroupImpl(
     coroutineContext: CoroutineContext,
     coroutineContext: CoroutineContext,
     override val id: Long,
     override val id: Long,
     groupInfo: GroupInfo,
     groupInfo: GroupInfo,
-    members: Sequence<MemberInfo>
+    members: Sequence<MemberInfo>,
 ) : Group, AbstractContact(bot, coroutineContext) {
 ) : Group, AbstractContact(bot, coroutineContext) {
     companion object
     companion object
 
 

+ 1 - 1
mirai-core/src/commonMain/kotlin/contact/GroupSendMessageImpl.kt

@@ -24,7 +24,7 @@ import net.mamoe.mirai.message.data.toMessageChain
  */
  */
 internal suspend fun <C : Contact> C.broadcastMessagePreSendEvent(
 internal suspend fun <C : Contact> C.broadcastMessagePreSendEvent(
     message: Message,
     message: Message,
-    eventConstructor: (C, Message) -> MessagePreSendEvent
+    eventConstructor: (C, Message) -> MessagePreSendEvent,
 ): MessageChain {
 ): MessageChain {
     return kotlin.runCatching {
     return kotlin.runCatching {
         eventConstructor(this, message).broadcast()
         eventConstructor(this, message).broadcast()

+ 1 - 1
mirai-core/src/commonMain/kotlin/contact/GroupSettingsImpl.kt

@@ -35,7 +35,7 @@ internal class GroupSettingsImpl(
         getter: () -> T,
         getter: () -> T,
         setter: (T) -> Unit,
         setter: (T) -> Unit,
         crossinline packetConstructor: (client: QQAndroidClient, groupCode: Long, newValue: T) -> OutgoingPacket,
         crossinline packetConstructor: (client: QQAndroidClient, groupCode: Long, newValue: T) -> OutgoingPacket,
-        crossinline eventConstructor: (old: T) -> Event
+        crossinline eventConstructor: (old: T) -> Event,
     ) {
     ) {
         checkBotPermission(MemberPermission.ADMINISTRATOR)
         checkBotPermission(MemberPermission.ADMINISTRATOR)
         val oldValue = getter()
         val oldValue = getter()

+ 1 - 1
mirai-core/src/commonMain/kotlin/contact/NormalMemberImpl.kt

@@ -36,7 +36,7 @@ import kotlin.coroutines.CoroutineContext
 internal class NormalMemberImpl constructor(
 internal class NormalMemberImpl constructor(
     group: GroupImpl,
     group: GroupImpl,
     coroutineContext: CoroutineContext,
     coroutineContext: CoroutineContext,
-    memberInfo: MemberInfo
+    memberInfo: MemberInfo,
 ) : NormalMember, AbstractMember(group, coroutineContext, memberInfo) {
 ) : NormalMember, AbstractMember(group, coroutineContext, memberInfo) {
 
 
     @Suppress("unused") // false positive
     @Suppress("unused") // false positive

+ 11 - 11
mirai-core/src/commonMain/kotlin/contact/SendMessageHandler.kt

@@ -168,12 +168,12 @@ internal abstract class SendMessageHandler<C : Contact> {
 
 
                         source = CompletableDeferred(constructSourceForSpecialMessage(finalMessage, 3116))
                         source = CompletableDeferred(constructSourceForSpecialMessage(finalMessage, 3116))
                     }
                     }
-//                    is CommonOidbResponse<*> -> {
-//                        when (resp.toResult("send message").getOrThrow()) {
-//                            is Oidb0x6d9.FeedsRspBody -> {
-//                            }
-//                        }
-//                    }
+                    //                    is CommonOidbResponse<*> -> {
+                    //                        when (resp.toResult("send message").getOrThrow()) {
+                    //                            is Oidb0x6d9.FeedsRspBody -> {
+                    //                            }
+                    //                        }
+                    //                    }
                 }
                 }
             }
             }
 
 
@@ -196,7 +196,7 @@ internal abstract class SendMessageHandler<C : Contact> {
         client: QQAndroidClient,
         client: QQAndroidClient,
         message: MessageChain,
         message: MessageChain,
         fragmented: Boolean,
         fragmented: Boolean,
-        sourceCallback: (Deferred<OnlineMessageSource.Outgoing>) -> Unit
+        sourceCallback: (Deferred<OnlineMessageSource.Outgoing>) -> Unit,
     ): List<OutgoingPacket> {
     ): List<OutgoingPacket> {
         message.takeSingleContent<MusicShare>()?.let { musicShare ->
         message.takeSingleContent<MusicShare>()?.let { musicShare ->
             return listOf(
             return listOf(
@@ -230,7 +230,7 @@ internal abstract class SendMessageHandler<C : Contact> {
     ): OnlineMessageSource.Outgoing
     ): OnlineMessageSource.Outgoing
 
 
     open suspend fun uploadLongMessageHighway(
     open suspend fun uploadLongMessageHighway(
-        chain: MessageChain
+        chain: MessageChain,
     ): String = with(contact) {
     ): String = with(contact) {
         return MiraiImpl.uploadMessageHighway(
         return MiraiImpl.uploadMessageHighway(
             bot, this@SendMessageHandler,
             bot, this@SendMessageHandler,
@@ -263,7 +263,7 @@ internal abstract class SendMessageHandler<C : Contact> {
  */
  */
 internal suspend fun <C : Contact> SendMessageHandler<C>.transformSpecialMessages(message: Message): MessageChain {
 internal suspend fun <C : Contact> SendMessageHandler<C>.transformSpecialMessages(message: Message): MessageChain {
     suspend fun processForwardMessage(
     suspend fun processForwardMessage(
-        forward: ForwardMessage
+        forward: ForwardMessage,
     ): ForwardMessageInternal {
     ): ForwardMessageInternal {
         if (!(message is MessageChain && message.contains(IgnoreLengthCheck))) {
         if (!(message is MessageChain && message.contains(IgnoreLengthCheck))) {
             check(forward.nodeList.size <= 200) {
             check(forward.nodeList.size <= 200) {
@@ -336,7 +336,7 @@ internal sealed class UserSendMessageHandler<C : AbstractUser>(
 
 
     override suspend fun constructSourceForSpecialMessage(
     override suspend fun constructSourceForSpecialMessage(
         finalMessage: MessageChain,
         finalMessage: MessageChain,
-        fromAppId: Int
+        fromAppId: Int,
     ): OnlineMessageSource.Outgoing {
     ): OnlineMessageSource.Outgoing {
         throw UnsupportedOperationException("Sending MusicShare or FileMessage to User is not yet supported")
         throw UnsupportedOperationException("Sending MusicShare or FileMessage to User is not yet supported")
     }
     }
@@ -386,7 +386,7 @@ internal class GroupSendMessageHandler(
 
 
     override suspend fun constructSourceForSpecialMessage(
     override suspend fun constructSourceForSpecialMessage(
         finalMessage: MessageChain,
         finalMessage: MessageChain,
-        fromAppId: Int
+        fromAppId: Int,
     ): OnlineMessageSource.Outgoing {
     ): OnlineMessageSource.Outgoing {
 
 
         val receipt: OnlinePushPbPushGroupMsg.SendGroupMessageReceipt =
         val receipt: OnlinePushPbPushGroupMsg.SendGroupMessageReceipt =

+ 4 - 2
mirai-core/src/commonMain/kotlin/contact/StrangerImpl.kt

@@ -20,7 +20,9 @@ package net.mamoe.mirai.internal.contact
 import kotlinx.atomicfu.AtomicInt
 import kotlinx.atomicfu.AtomicInt
 import kotlinx.atomicfu.atomic
 import kotlinx.atomicfu.atomic
 import net.mamoe.mirai.LowLevelApi
 import net.mamoe.mirai.LowLevelApi
-import net.mamoe.mirai.contact.*
+import net.mamoe.mirai.contact.Stranger
+import net.mamoe.mirai.contact.User
+import net.mamoe.mirai.contact.asFriendOrNull
 import net.mamoe.mirai.data.StrangerInfo
 import net.mamoe.mirai.data.StrangerInfo
 import net.mamoe.mirai.event.events.StrangerMessagePostSendEvent
 import net.mamoe.mirai.event.events.StrangerMessagePostSendEvent
 import net.mamoe.mirai.event.events.StrangerMessagePreSendEvent
 import net.mamoe.mirai.event.events.StrangerMessagePreSendEvent
@@ -47,7 +49,7 @@ internal inline fun Stranger.checkIsImpl(): StrangerImpl {
 internal class StrangerImpl(
 internal class StrangerImpl(
     bot: QQAndroidBot,
     bot: QQAndroidBot,
     coroutineContext: CoroutineContext,
     coroutineContext: CoroutineContext,
-    internal val strangerInfo: StrangerInfo
+    internal val strangerInfo: StrangerInfo,
 ) : Stranger, AbstractUser(bot, coroutineContext, strangerInfo) {
 ) : Stranger, AbstractUser(bot, coroutineContext, strangerInfo) {
     @Suppress("unused") // bug
     @Suppress("unused") // bug
     val lastMessageSequence: AtomicInt = atomic(-1)
     val lastMessageSequence: AtomicInt = atomic(-1)

+ 2 - 2
mirai-core/src/commonMain/kotlin/contact/info/MemberInfoImpl.kt

@@ -28,12 +28,12 @@ internal data class MemberInfoImpl(
     override val anonymousId: String?,
     override val anonymousId: String?,
     override val joinTimestamp: Int = currentTimeSeconds().toInt(),
     override val joinTimestamp: Int = currentTimeSeconds().toInt(),
     override var lastSpeakTimestamp: Int = 0,
     override var lastSpeakTimestamp: Int = 0,
-    override val isOfficialBot: Boolean = false
+    override val isOfficialBot: Boolean = false,
 ) : MemberInfo {
 ) : MemberInfo {
     constructor(
     constructor(
         client: QQAndroidClient,
         client: QQAndroidClient,
         jceInfo: StTroopMemberInfo,
         jceInfo: StTroopMemberInfo,
-        groupOwnerId: Long
+        groupOwnerId: Long,
     ) : this(
     ) : this(
         uin = jceInfo.memberUin,
         uin = jceInfo.memberUin,
         nick = jceInfo.nick,
         nick = jceInfo.nick,

+ 1 - 1
mirai-core/src/commonMain/kotlin/contact/info/StrangerInfoImpl.kt

@@ -19,5 +19,5 @@ internal class StrangerInfoImpl(
     override val uin: Long,
     override val uin: Long,
     override val nick: String,
     override val nick: String,
     override val fromGroup: Long = 0,
     override val fromGroup: Long = 0,
-    override val remark: String = ""
+    override val remark: String = "",
 ) : StrangerInfo
 ) : StrangerInfo

+ 4 - 4
mirai-core/src/commonMain/kotlin/contact/util.kt

@@ -13,10 +13,8 @@ package net.mamoe.mirai.internal.contact
 
 
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.contact.*
 import net.mamoe.mirai.contact.*
-import net.mamoe.mirai.event.events.*
 import net.mamoe.mirai.internal.message.LongMessageInternal
 import net.mamoe.mirai.internal.message.LongMessageInternal
 import net.mamoe.mirai.internal.utils.estimateLength
 import net.mamoe.mirai.internal.utils.estimateLength
-import net.mamoe.mirai.message.*
 import net.mamoe.mirai.message.data.*
 import net.mamoe.mirai.message.data.*
 import net.mamoe.mirai.utils.cast
 import net.mamoe.mirai.utils.cast
 import net.mamoe.mirai.utils.castOrNull
 import net.mamoe.mirai.utils.castOrNull
@@ -92,11 +90,13 @@ internal fun net.mamoe.mirai.event.events.MessageEvent.logMessageReceived() {
                 renderGroupTempMessage(group, senderName, sender, message)
                 renderGroupTempMessage(group, senderName, sender, message)
 
 
             is net.mamoe.mirai.event.events.StrangerMessageEvent,
             is net.mamoe.mirai.event.events.StrangerMessageEvent,
-            is net.mamoe.mirai.event.events.StrangerMessageSyncEvent ->
+            is net.mamoe.mirai.event.events.StrangerMessageSyncEvent,
+            ->
                 renderStrangerMessage(senderName, sender, message)
                 renderStrangerMessage(senderName, sender, message)
 
 
             is net.mamoe.mirai.event.events.FriendMessageEvent,
             is net.mamoe.mirai.event.events.FriendMessageEvent,
-            is net.mamoe.mirai.event.events.FriendMessageSyncEvent ->
+            is net.mamoe.mirai.event.events.FriendMessageSyncEvent,
+            ->
                 renderFriendMessage(sender, message)
                 renderFriendMessage(sender, message)
 
 
             is net.mamoe.mirai.event.events.OtherClientMessageEvent ->
             is net.mamoe.mirai.event.events.OtherClientMessageEvent ->

+ 24 - 21
mirai-core/src/commonMain/kotlin/message/ReceiveMessageHandler.kt

@@ -23,7 +23,10 @@ import net.mamoe.mirai.internal.network.protocol.data.proto.*
 import net.mamoe.mirai.internal.utils.io.serialization.loadAs
 import net.mamoe.mirai.internal.utils.io.serialization.loadAs
 import net.mamoe.mirai.internal.utils.io.serialization.readProtoBuf
 import net.mamoe.mirai.internal.utils.io.serialization.readProtoBuf
 import net.mamoe.mirai.message.data.*
 import net.mamoe.mirai.message.data.*
-import net.mamoe.mirai.utils.*
+import net.mamoe.mirai.utils.encodeToString
+import net.mamoe.mirai.utils.read
+import net.mamoe.mirai.utils.toUHexString
+import net.mamoe.mirai.utils.unzip
 
 
 /**
 /**
  * 只在手动构造 [OfflineMessageSource] 时调用
  * 只在手动构造 [OfflineMessageSource] 时调用
@@ -72,7 +75,7 @@ private fun List<MsgComm.Msg>.toMessageChain(
     bot: Bot,
     bot: Bot,
     groupIdOrZero: Long,
     groupIdOrZero: Long,
     onlineSource: Boolean?,
     onlineSource: Boolean?,
-    messageSourceKind: MessageSourceKind
+    messageSourceKind: MessageSourceKind,
 ): MessageChain {
 ): MessageChain {
     val messageList = this
     val messageList = this
 
 
@@ -125,9 +128,9 @@ internal object ReceiveMessageTransformer {
         groupIdOrZero: Long,
         groupIdOrZero: Long,
         messageSourceKind: MessageSourceKind,
         messageSourceKind: MessageSourceKind,
         bot: Bot,
         bot: Bot,
-        builder: MessageChainBuilder
+        builder: MessageChainBuilder,
     ) {
     ) {
-//        ProtoBuf.encodeToHexString(elements).soutv("join")
+        //        ProtoBuf.encodeToHexString(elements).soutv("join")
         // (this._miraiContentToString().soutv())
         // (this._miraiContentToString().soutv())
         for (element in elements) {
         for (element in elements) {
             transformElement(element, groupIdOrZero, messageSourceKind, bot, builder)
             transformElement(element, groupIdOrZero, messageSourceKind, bot, builder)
@@ -142,7 +145,7 @@ internal object ReceiveMessageTransformer {
         groupIdOrZero: Long,
         groupIdOrZero: Long,
         messageSourceKind: MessageSourceKind,
         messageSourceKind: MessageSourceKind,
         bot: Bot,
         bot: Bot,
-        builder: MessageChainBuilder
+        builder: MessageChainBuilder,
     ) {
     ) {
         when {
         when {
             element.srcMsg != null -> decodeSrcMsg(element.srcMsg, builder, bot, messageSourceKind, groupIdOrZero)
             element.srcMsg != null -> decodeSrcMsg(element.srcMsg, builder, bot, messageSourceKind, groupIdOrZero)
@@ -290,7 +293,7 @@ internal object ReceiveMessageTransformer {
         list: MessageChainBuilder,
         list: MessageChainBuilder,
         bot: Bot,
         bot: Bot,
         messageSourceKind: MessageSourceKind,
         messageSourceKind: MessageSourceKind,
-        groupIdOrZero: Long
+        groupIdOrZero: Long,
     ) {
     ) {
         list.add(QuoteReply(OfflineMessageSourceImplData(srcMsg, bot, messageSourceKind, groupIdOrZero)))
         list.add(QuoteReply(OfflineMessageSourceImplData(srcMsg, bot, messageSourceKind, groupIdOrZero)))
     }
     }
@@ -309,7 +312,7 @@ internal object ReceiveMessageTransformer {
 
 
     private fun decodeLightApp(
     private fun decodeLightApp(
         lightApp: ImMsgBody.LightAppElem,
         lightApp: ImMsgBody.LightAppElem,
-        list: MessageChainBuilder
+        list: MessageChainBuilder,
     ) {
     ) {
         val content = runWithBugReport("解析 lightApp",
         val content = runWithBugReport("解析 lightApp",
             { "resId=" + lightApp.msgResid + "data=" + lightApp.data.toUHexString() }) {
             { "resId=" + lightApp.msgResid + "data=" + lightApp.data.toUHexString() }) {
@@ -325,7 +328,7 @@ internal object ReceiveMessageTransformer {
 
 
     private fun decodeCustomElem(
     private fun decodeCustomElem(
         customElem: ImMsgBody.CustomElem,
         customElem: ImMsgBody.CustomElem,
-        list: MessageChainBuilder
+        list: MessageChainBuilder,
     ) {
     ) {
         customElem.data.read {
         customElem.data.read {
             kotlin.runCatching {
             kotlin.runCatching {
@@ -359,7 +362,7 @@ internal object ReceiveMessageTransformer {
 
 
     private fun decodeTransElem(
     private fun decodeTransElem(
         transElement: ImMsgBody.TransElem,
         transElement: ImMsgBody.TransElem,
-        list: MessageChainBuilder
+        list: MessageChainBuilder,
     ) {
     ) {
         // file
         // file
         // type=24
         // type=24
@@ -367,14 +370,14 @@ internal object ReceiveMessageTransformer {
             24 -> transElement.elemValue.read {
             24 -> transElement.elemValue.read {
                 // group file feed
                 // group file feed
                 // 01 00 77 08 06 12 0A 61 61 61 61 61 61 2E 74 78 74 1A 06 31 35 42 79 74 65 3A 5F 12 5D 08 66 12 25 2F 64 37 34 62 62 66 33 61 2D 37 62 32 35 2D 31 31 65 62 2D 38 34 66 38 2D 35 34 35 32 30 30 37 62 35 64 39 66 18 0F 22 0A 61 61 61 61 61 61 2E 74 78 74 28 00 3A 00 42 20 61 33 32 35 66 36 33 34 33 30 65 37 61 30 31 31 66 37 64 30 38 37 66 63 33 32 34 37 35 34 39 63
                 // 01 00 77 08 06 12 0A 61 61 61 61 61 61 2E 74 78 74 1A 06 31 35 42 79 74 65 3A 5F 12 5D 08 66 12 25 2F 64 37 34 62 62 66 33 61 2D 37 62 32 35 2D 31 31 65 62 2D 38 34 66 38 2D 35 34 35 32 30 30 37 62 35 64 39 66 18 0F 22 0A 61 61 61 61 61 61 2E 74 78 74 28 00 3A 00 42 20 61 33 32 35 66 36 33 34 33 30 65 37 61 30 31 31 66 37 64 30 38 37 66 63 33 32 34 37 35 34 39 63
-//                fun getFileRsrvAttr(file: ObjMsg.MsgContentInfo.MsgFile): HummerResv21.ResvAttr? {
-//                    if (file.ext.isEmpty()) return null
-//                    val element = kotlin.runCatching {
-//                        jsonForFileDecode.parseToJsonElement(file.ext) as? JsonObject
-//                    }.getOrNull() ?: return null
-//                    val extInfo = element["ExtInfo"]?.toString()?.decodeBase64() ?: return null
-//                    return extInfo.loadAs(HummerResv21.ResvAttr.serializer())
-//                }
+                //                fun getFileRsrvAttr(file: ObjMsg.MsgContentInfo.MsgFile): HummerResv21.ResvAttr? {
+                //                    if (file.ext.isEmpty()) return null
+                //                    val element = kotlin.runCatching {
+                //                        jsonForFileDecode.parseToJsonElement(file.ext) as? JsonObject
+                //                    }.getOrNull() ?: return null
+                //                    val extInfo = element["ExtInfo"]?.toString()?.decodeBase64() ?: return null
+                //                    return extInfo.loadAs(HummerResv21.ResvAttr.serializer())
+                //                }
 
 
                 val var7 = readByte()
                 val var7 = readByte()
                 if (var7 == 1.toByte()) {
                 if (var7 == 1.toByte()) {
@@ -383,8 +386,8 @@ internal object ReceiveMessageTransformer {
                         // proto.msgType=6
                         // proto.msgType=6
 
 
                         val file = proto.msgContentInfo.firstOrNull()?.msgFile ?: continue // officially get(0) only.
                         val file = proto.msgContentInfo.firstOrNull()?.msgFile ?: continue // officially get(0) only.
-//                        val attr = getFileRsrvAttr(file) ?: continue
-//                        val info = attr.forwardExtFileInfo ?: continue
+                        //                        val attr = getFileRsrvAttr(file) ?: continue
+                        //                        val info = attr.forwardExtFileInfo ?: continue
 
 
                         list.add(
                         list.add(
                             FileMessageImpl(
                             FileMessageImpl(
@@ -408,7 +411,7 @@ internal object ReceiveMessageTransformer {
 
 
     private fun decodeCommonElem(
     private fun decodeCommonElem(
         commonElem: ImMsgBody.CommonElem,
         commonElem: ImMsgBody.CommonElem,
-        list: MessageChainBuilder
+        list: MessageChainBuilder,
     ) {
     ) {
         when (commonElem.serviceType) {
         when (commonElem.serviceType) {
             23 -> {
             23 -> {
@@ -449,7 +452,7 @@ internal object ReceiveMessageTransformer {
 
 
     private fun decodeRichMessage(
     private fun decodeRichMessage(
         richMsg: ImMsgBody.RichMsg,
         richMsg: ImMsgBody.RichMsg,
-        builder: MessageChainBuilder
+        builder: MessageChainBuilder,
     ) {
     ) {
         val content = runWithBugReport("解析 richMsg", { richMsg.template1.toUHexString() }) {
         val content = runWithBugReport("解析 richMsg", { richMsg.template1.toUHexString() }) {
             when (richMsg.template1[0].toInt()) {
             when (richMsg.template1[0].toInt()) {

+ 3 - 3
mirai-core/src/commonMain/kotlin/message/RefinableMessage.kt

@@ -45,7 +45,7 @@ internal interface RefinableMessage : SingleMessage {
 internal sealed class MessageRefiner {
 internal sealed class MessageRefiner {
     protected inline fun MessageChain.refineImpl(
     protected inline fun MessageChain.refineImpl(
         bot: Bot,
         bot: Bot,
-        refineAction: (message: RefinableMessage) -> Message?
+        refineAction: (message: RefinableMessage) -> Message?,
     ): MessageChain {
     ): MessageChain {
         val convertLineSeparator = bot.configuration.convertLineSeparator
         val convertLineSeparator = bot.configuration.convertLineSeparator
 
 
@@ -84,7 +84,7 @@ internal sealed class MessageRefiner {
 
 
 @Suppress("unused")
 @Suppress("unused")
 internal class RefineContextKey<T : Any>(
 internal class RefineContextKey<T : Any>(
-    val name: String?
+    val name: String?,
 ) {
 ) {
     override fun toString(): String {
     override fun toString(): String {
         return buildString {
         return buildString {
@@ -121,7 +121,7 @@ internal object EmptyRefineContext : RefineContext {
 
 
 @Suppress("UNCHECKED_CAST")
 @Suppress("UNCHECKED_CAST")
 internal class SimpleRefineContext(
 internal class SimpleRefineContext(
-    private val delegate: MutableMap<RefineContextKey<*>, Any> = mutableMapOf()
+    private val delegate: MutableMap<RefineContextKey<*>, Any> = mutableMapOf(),
 ) : MutableRefineContext {
 ) : MutableRefineContext {
 
 
     override fun contains(key: RefineContextKey<*>): Boolean = delegate.containsKey(key)
     override fun contains(key: RefineContextKey<*>): Boolean = delegate.containsKey(key)

+ 1 - 1
mirai-core/src/commonMain/kotlin/message/UnsupportedMessageImpl.kt

@@ -25,7 +25,7 @@ import net.mamoe.mirai.utils.copy
 @SerialName(UnsupportedMessage.SERIAL_NAME)
 @SerialName(UnsupportedMessage.SERIAL_NAME)
 @Serializable(UnsupportedMessageImpl.Serializer::class)
 @Serializable(UnsupportedMessageImpl.Serializer::class)
 internal data class UnsupportedMessageImpl(
 internal data class UnsupportedMessageImpl(
-    val structElem: ImMsgBody.Elem
+    val structElem: ImMsgBody.Elem,
 ) : UnsupportedMessage {
 ) : UnsupportedMessage {
     override val struct: ByteArray by lazy { structElem.toByteArray(ImMsgBody.Elem.serializer()) }
     override val struct: ByteArray by lazy { structElem.toByteArray(ImMsgBody.Elem.serializer()) }
     override fun toString(): String = content
     override fun toString(): String = content

+ 1 - 1
mirai-core/src/commonMain/kotlin/message/contextualBugReportException.kt

@@ -18,7 +18,7 @@ internal fun contextualBugReportException(
     context: String,
     context: String,
     forDebug: String,
     forDebug: String,
     e: Throwable? = null,
     e: Throwable? = null,
-    additional: String = ""
+    additional: String = "",
 ): IllegalStateException {
 ): IllegalStateException {
     return IllegalStateException(
     return IllegalStateException(
         "在 $context 时遇到了意料之中的问题. 请完整复制此日志提交给 mirai: https://github.com/mamoe/mirai/issues/new   $additional 调试信息: $forDebug",
         "在 $context 时遇到了意料之中的问题. 请完整复制此日志提交给 mirai: https://github.com/mamoe/mirai/issues/new   $additional 调试信息: $forDebug",

+ 7 - 7
mirai-core/src/commonMain/kotlin/message/imagesImpl.kt

@@ -30,7 +30,7 @@ import net.mamoe.mirai.utils.ExternalResource.Companion.DEFAULT_FORMAT_NAME
 
 
 @Serializable(with = OnlineGroupImageImpl.Serializer::class)
 @Serializable(with = OnlineGroupImageImpl.Serializer::class)
 internal class OnlineGroupImageImpl(
 internal class OnlineGroupImageImpl(
-    internal val delegate: ImMsgBody.CustomFace
+    internal val delegate: ImMsgBody.CustomFace,
 ) : OnlineGroupImage() {
 ) : OnlineGroupImage() {
     object Serializer : Image.FallbackSerializer("OnlineGroupImage")
     object Serializer : Image.FallbackSerializer("OnlineGroupImage")
 
 
@@ -59,7 +59,7 @@ internal class OnlineGroupImageImpl(
 
 
 @Serializable(with = OnlineFriendImageImpl.Serializer::class)
 @Serializable(with = OnlineFriendImageImpl.Serializer::class)
 internal class OnlineFriendImageImpl(
 internal class OnlineFriendImageImpl(
-    internal val delegate: ImMsgBody.NotOnlineImage
+    internal val delegate: ImMsgBody.NotOnlineImage,
 ) : @Suppress("DEPRECATION")
 ) : @Suppress("DEPRECATION")
 OnlineFriendImage() {
 OnlineFriendImage() {
     object Serializer : Image.FallbackSerializer("OnlineFriendImage")
     object Serializer : Image.FallbackSerializer("OnlineFriendImage")
@@ -182,8 +182,8 @@ internal fun OfflineGroupImage.toJceData(): ImMsgBody.CustomFace {
         //_400Url = "/gchatpic_new/000000000/1041235568-2195821338-01E9451B70EDEAE3B37C101F1EEBF5B5/400?term=2",
         //_400Url = "/gchatpic_new/000000000/1041235568-2195821338-01E9451B70EDEAE3B37C101F1EEBF5B5/400?term=2",
         //_400Width = 351,
         //_400Width = 351,
         oldData = oldData,
         oldData = oldData,
-//        pbReserve = "08 00 10 00 32 00 50 00 78 08".autoHexToBytes(),
-//        useful = 1,
+        //        pbReserve = "08 00 10 00 32 00 50 00 78 08".autoHexToBytes(),
+        //        useful = 1,
         //  pbReserve = CustomFaceExtPb.ResvAttr().toByteArray(CustomFaceExtPb.ResvAttr.serializer())
         //  pbReserve = CustomFaceExtPb.ResvAttr().toByteArray(CustomFaceExtPb.ResvAttr.serializer())
     )
     )
 }
 }
@@ -236,7 +236,7 @@ internal interface OfflineImage : Image
  */
  */
 @Serializable(with = OfflineGroupImage.Serializer::class)
 @Serializable(with = OfflineGroupImage.Serializer::class)
 internal data class OfflineGroupImage(
 internal data class OfflineGroupImage(
-    override val imageId: String
+    override val imageId: String,
 ) : GroupImage(), OfflineImage, DeferredOriginUrlAware {
 ) : GroupImage(), OfflineImage, DeferredOriginUrlAware {
     @Transient
     @Transient
     internal var fileId: Int? = null
     internal var fileId: Int? = null
@@ -266,7 +266,7 @@ internal abstract class OnlineGroupImage : GroupImage(), OnlineImage
 
 
 internal val Image.friendImageId: String
 internal val Image.friendImageId: String
     get() {
     get() {
-//    /1234567890-3666252994-EFF4427CE3D27DB6B1D9A8AB72E7A29C
+        //    /1234567890-3666252994-EFF4427CE3D27DB6B1D9A8AB72E7A29C
         return "/000000000-000000000-${md5.toUHexString("")}"
         return "/000000000-000000000-${md5.toUHexString("")}"
     }
     }
 
 
@@ -277,7 +277,7 @@ internal val Image.friendImageId: String
  */
  */
 @Serializable(with = OfflineFriendImage.Serializer::class)
 @Serializable(with = OfflineFriendImage.Serializer::class)
 internal data class OfflineFriendImage(
 internal data class OfflineFriendImage(
-    override val imageId: String
+    override val imageId: String,
 ) : FriendImage(), OfflineImage, DeferredOriginUrlAware {
 ) : FriendImage(), OfflineImage, DeferredOriginUrlAware {
     object Serializer : Image.FallbackSerializer("OfflineFriendImage")
     object Serializer : Image.FallbackSerializer("OfflineFriendImage")
 
 

+ 7 - 7
mirai-core/src/commonMain/kotlin/message/incomingSourceImpl.kt

@@ -36,13 +36,13 @@ import java.util.concurrent.atomic.AtomicBoolean
 @Serializable(OnlineMessageSourceFromFriendImpl.Serializer::class)
 @Serializable(OnlineMessageSourceFromFriendImpl.Serializer::class)
 internal class OnlineMessageSourceFromFriendImpl(
 internal class OnlineMessageSourceFromFriendImpl(
     override val bot: Bot,
     override val bot: Bot,
-    msg: List<MsgComm.Msg>
+    msg: List<MsgComm.Msg>,
 ) : OnlineMessageSource.Incoming.FromFriend(), MessageSourceInternal {
 ) : OnlineMessageSource.Incoming.FromFriend(), MessageSourceInternal {
     object Serializer : MessageSourceSerializerImpl("OnlineMessageSourceFromFriend")
     object Serializer : MessageSourceSerializerImpl("OnlineMessageSourceFromFriend")
 
 
     override val sequenceIds: IntArray = msg.mapToIntArray { it.msgHead.msgSeq }
     override val sequenceIds: IntArray = msg.mapToIntArray { it.msgHead.msgSeq }
     override var isRecalledOrPlanned: AtomicBoolean = AtomicBoolean(false)
     override var isRecalledOrPlanned: AtomicBoolean = AtomicBoolean(false)
-    override val ids: IntArray get() = sequenceIds// msg.msgBody.richText.attr!!.random
+    override val ids: IntArray get() = sequenceIds // msg.msgBody.richText.attr!!.random
     override val internalIds: IntArray = msg.mapToIntArray {
     override val internalIds: IntArray = msg.mapToIntArray {
         it.msgBody.richText.attr?.random ?: 0
         it.msgBody.richText.attr?.random ?: 0
     } // other client 消息的这个是0
     } // other client 消息的这个是0
@@ -60,13 +60,13 @@ internal class OnlineMessageSourceFromFriendImpl(
 @Serializable(OnlineMessageSourceFromStrangerImpl.Serializer::class)
 @Serializable(OnlineMessageSourceFromStrangerImpl.Serializer::class)
 internal class OnlineMessageSourceFromStrangerImpl(
 internal class OnlineMessageSourceFromStrangerImpl(
     override val bot: Bot,
     override val bot: Bot,
-    msg: List<MsgComm.Msg>
+    msg: List<MsgComm.Msg>,
 ) : OnlineMessageSource.Incoming.FromStranger(), MessageSourceInternal {
 ) : OnlineMessageSource.Incoming.FromStranger(), MessageSourceInternal {
     object Serializer : MessageSourceSerializerImpl("OnlineMessageSourceFromStranger")
     object Serializer : MessageSourceSerializerImpl("OnlineMessageSourceFromStranger")
 
 
     override val sequenceIds: IntArray = msg.mapToIntArray { it.msgHead.msgSeq }
     override val sequenceIds: IntArray = msg.mapToIntArray { it.msgHead.msgSeq }
     override var isRecalledOrPlanned: AtomicBoolean = AtomicBoolean(false)
     override var isRecalledOrPlanned: AtomicBoolean = AtomicBoolean(false)
-    override val ids: IntArray get() = sequenceIds// msg.msgBody.richText.attr!!.random
+    override val ids: IntArray get() = sequenceIds // msg.msgBody.richText.attr!!.random
     override val internalIds: IntArray = msg.mapToIntArray {
     override val internalIds: IntArray = msg.mapToIntArray {
         it.msgBody.richText.attr?.random ?: 0
         it.msgBody.richText.attr?.random ?: 0
     } // other client 消息的这个是0
     } // other client 消息的这个是0
@@ -123,14 +123,14 @@ private fun List<MsgComm.Msg>.toJceDataPrivate(ids: IntArray): ImMsgBody.SourceM
 @Serializable(OnlineMessageSourceFromTempImpl.Serializer::class)
 @Serializable(OnlineMessageSourceFromTempImpl.Serializer::class)
 internal class OnlineMessageSourceFromTempImpl(
 internal class OnlineMessageSourceFromTempImpl(
     override val bot: Bot,
     override val bot: Bot,
-    msg: List<MsgComm.Msg>
+    msg: List<MsgComm.Msg>,
 ) : OnlineMessageSource.Incoming.FromTemp(), MessageSourceInternal {
 ) : OnlineMessageSource.Incoming.FromTemp(), MessageSourceInternal {
     object Serializer : MessageSourceSerializerImpl("OnlineMessageSourceFromTemp")
     object Serializer : MessageSourceSerializerImpl("OnlineMessageSourceFromTemp")
 
 
     override val sequenceIds: IntArray = msg.mapToIntArray { it.msgHead.msgSeq }
     override val sequenceIds: IntArray = msg.mapToIntArray { it.msgHead.msgSeq }
     override val internalIds: IntArray = msg.mapToIntArray { it.msgBody.richText.attr!!.random }
     override val internalIds: IntArray = msg.mapToIntArray { it.msgBody.richText.attr!!.random }
     override var isRecalledOrPlanned: AtomicBoolean = AtomicBoolean(false)
     override var isRecalledOrPlanned: AtomicBoolean = AtomicBoolean(false)
-    override val ids: IntArray get() = sequenceIds//
+    override val ids: IntArray get() = sequenceIds //
     override val time: Int = msg.first().msgHead.msgTime
     override val time: Int = msg.first().msgHead.msgTime
     override val originalMessage: MessageChain by lazy {
     override val originalMessage: MessageChain by lazy {
         msg.toMessageChainNoSource(bot, groupIdOrZero = 0, MessageSourceKind.TEMP)
         msg.toMessageChainNoSource(bot, groupIdOrZero = 0, MessageSourceKind.TEMP)
@@ -146,7 +146,7 @@ internal class OnlineMessageSourceFromTempImpl(
 @Serializable(OnlineMessageSourceFromGroupImpl.Serializer::class)
 @Serializable(OnlineMessageSourceFromGroupImpl.Serializer::class)
 internal class OnlineMessageSourceFromGroupImpl(
 internal class OnlineMessageSourceFromGroupImpl(
     override val bot: Bot,
     override val bot: Bot,
-    msg: List<MsgComm.Msg>
+    msg: List<MsgComm.Msg>,
 ) : OnlineMessageSource.Incoming.FromGroup(), MessageSourceInternal {
 ) : OnlineMessageSource.Incoming.FromGroup(), MessageSourceInternal {
     object Serializer : MessageSourceSerializerImpl("OnlineMessageSourceFromGroupImpl")
     object Serializer : MessageSourceSerializerImpl("OnlineMessageSourceFromGroupImpl")
 
 

+ 6 - 6
mirai-core/src/commonMain/kotlin/message/lightApp.kt

@@ -17,7 +17,7 @@ import net.mamoe.mirai.message.data.*
 import net.mamoe.mirai.utils.safeCast
 import net.mamoe.mirai.utils.safeCast
 
 
 internal data class LightAppInternal(
 internal data class LightAppInternal(
-    override val content: String
+    override val content: String,
 ) : RichMessage, RefinableMessage {
 ) : RichMessage, RefinableMessage {
     companion object Key :
     companion object Key :
         AbstractPolymorphicMessageKey<RichMessage, LightAppInternal>(RichMessage, { it.safeCast() })
         AbstractPolymorphicMessageKey<RichMessage, LightAppInternal>(RichMessage, { it.safeCast() })
@@ -114,7 +114,7 @@ internal data class LightAppStruct(
     @SerialName("ver")
     @SerialName("ver")
     val ver: String = "",
     val ver: String = "",
     @SerialName("view")
     @SerialName("view")
-    val view: String = ""
+    val view: String = "",
 ) {
 ) {
     @Serializable
     @Serializable
     data class Config(
     data class Config(
@@ -127,7 +127,7 @@ internal data class LightAppStruct(
         @SerialName("token")
         @SerialName("token")
         val token: String = "",
         val token: String = "",
         @SerialName("type")
         @SerialName("type")
-        val type: String = ""
+        val type: String = "",
     )
     )
 
 
     @Serializable
     @Serializable
@@ -137,13 +137,13 @@ internal data class LightAppStruct(
         @SerialName("appid")
         @SerialName("appid")
         val appid: Int = 0,
         val appid: Int = 0,
         @SerialName("uin")
         @SerialName("uin")
-        val uin: Int = 0
+        val uin: Int = 0,
     )
     )
 
 
     @Serializable
     @Serializable
     data class Meta(
     data class Meta(
         @SerialName("music")
         @SerialName("music")
-        val music: Music? = null
+        val music: Music? = null,
     ) {
     ) {
         @Serializable
         @Serializable
         data class Music(
         data class Music(
@@ -172,7 +172,7 @@ internal data class LightAppStruct(
             @SerialName("tag")
             @SerialName("tag")
             val tag: String = "",
             val tag: String = "",
             @SerialName("title")
             @SerialName("title")
-            val title: String = ""
+            val title: String = "",
         )
         )
     }
     }
 }
 }

+ 1 - 1
mirai-core/src/commonMain/kotlin/message/messageToElems.kt

@@ -241,7 +241,7 @@ internal fun MessageChain.toRichTextElems(
 
 
             is ForwardMessage,
             is ForwardMessage,
             is MessageSource, // mirai metadata only
             is MessageSource, // mirai metadata only
-            is RichMessage // already transformed above
+            is RichMessage, // already transformed above
             -> {
             -> {
 
 
             }
             }

+ 1 - 1
mirai-core/src/commonMain/kotlin/message/offlineSourceImpl.kt

@@ -109,7 +109,7 @@ internal class OfflineMessageSourceImplData(
 internal fun OfflineMessageSourceImplData(
 internal fun OfflineMessageSourceImplData(
     bot: Bot,
     bot: Bot,
     delegate: List<MsgComm.Msg>,
     delegate: List<MsgComm.Msg>,
-    kind: MessageSourceKind
+    kind: MessageSourceKind,
 ): OfflineMessageSourceImplData {
 ): OfflineMessageSourceImplData {
     val head = delegate.first().msgHead
     val head = delegate.first().msgHead
     return OfflineMessageSourceImplData(
     return OfflineMessageSourceImplData(

+ 9 - 9
mirai-core/src/commonMain/kotlin/message/outgoingSourceImpl.kt

@@ -81,7 +81,7 @@ internal class OnlineMessageSourceToFriendImpl(
     override val time: Int,
     override val time: Int,
     override val originalMessage: MessageChain,
     override val originalMessage: MessageChain,
     override val sender: Bot,
     override val sender: Bot,
-    override val target: Friend
+    override val target: Friend,
 ) : OnlineMessageSource.Outgoing.ToFriend(), MessageSourceInternal {
 ) : OnlineMessageSource.Outgoing.ToFriend(), MessageSourceInternal {
     object Serializer : MessageSourceSerializerImpl("OnlineMessageSourceToFriend")
     object Serializer : MessageSourceSerializerImpl("OnlineMessageSourceToFriend")
 
 
@@ -101,12 +101,12 @@ internal class OnlineMessageSourceToStrangerImpl(
     override val time: Int,
     override val time: Int,
     override val originalMessage: MessageChain,
     override val originalMessage: MessageChain,
     override val sender: Bot,
     override val sender: Bot,
-    override val target: Stranger
+    override val target: Stranger,
 ) : OnlineMessageSource.Outgoing.ToStranger(), MessageSourceInternal {
 ) : OnlineMessageSource.Outgoing.ToStranger(), MessageSourceInternal {
 
 
     constructor(
     constructor(
         delegate: Outgoing,
         delegate: Outgoing,
-        target: Stranger
+        target: Stranger,
     ) : this(delegate.ids, delegate.internalIds, delegate.time, delegate.originalMessage, delegate.sender, target)
     ) : this(delegate.ids, delegate.internalIds, delegate.time, delegate.originalMessage, delegate.sender, target)
 
 
     object Serializer : MessageSourceSerializerImpl("OnlineMessageSourceToStranger")
     object Serializer : MessageSourceSerializerImpl("OnlineMessageSourceToStranger")
@@ -127,11 +127,11 @@ internal class OnlineMessageSourceToTempImpl(
     override val time: Int,
     override val time: Int,
     override val originalMessage: MessageChain,
     override val originalMessage: MessageChain,
     override val sender: Bot,
     override val sender: Bot,
-    override val target: Member
+    override val target: Member,
 ) : OnlineMessageSource.Outgoing.ToTemp(), MessageSourceInternal {
 ) : OnlineMessageSource.Outgoing.ToTemp(), MessageSourceInternal {
     constructor(
     constructor(
         delegate: Outgoing,
         delegate: Outgoing,
-        target: Member
+        target: Member,
     ) : this(delegate.ids, delegate.internalIds, delegate.time, delegate.originalMessage, delegate.sender, target)
     ) : this(delegate.ids, delegate.internalIds, delegate.time, delegate.originalMessage, delegate.sender, target)
 
 
     object Serializer : MessageSourceSerializerImpl("OnlineMessageSourceToTemp")
     object Serializer : MessageSourceSerializerImpl("OnlineMessageSourceToTemp")
@@ -182,10 +182,10 @@ internal class OnlineMessageSourceToGroupImpl(
     @OptIn(ExperimentalCoroutinesApi::class)
     @OptIn(ExperimentalCoroutinesApi::class)
     override val sequenceIds: IntArray
     override val sequenceIds: IntArray
         get() = when {
         get() = when {
-                sequenceIdDeferred.isCompleted -> sequenceIdDeferred.getCompleted() ?: intArrayOf()
-                !sequenceIdDeferred.isActive -> intArrayOf()
-                else -> error("sequenceIds not yet available")
-            }
+            sequenceIdDeferred.isCompleted -> sequenceIdDeferred.getCompleted() ?: intArrayOf()
+            !sequenceIdDeferred.isActive -> intArrayOf()
+            else -> error("sequenceIds not yet available")
+        }
 
 
 
 
     suspend fun ensureSequenceIdAvailable() = kotlin.run { sequenceIdDeferred.await() }
     suspend fun ensureSequenceIdAvailable() = kotlin.run { sequenceIdDeferred.await() }

+ 1 - 1
mirai-core/src/commonMain/kotlin/network/context/AccountSecrets.kt

@@ -88,7 +88,7 @@ internal fun AccountSecretsImpl(
 }
 }
 
 
 internal fun AccountSecretsImpl(
 internal fun AccountSecretsImpl(
-    device: DeviceInfo, account: BotAccount
+    device: DeviceInfo, account: BotAccount,
 ): AccountSecretsImpl {
 ): AccountSecretsImpl {
     return AccountSecretsImpl(
     return AccountSecretsImpl(
         loginExtraData = CopyOnWriteArraySet(),
         loginExtraData = CopyOnWriteArraySet(),

+ 1 - 1
mirai-core/src/commonMain/kotlin/network/context/SsoProcessorContext.kt

@@ -37,7 +37,7 @@ internal interface SsoProcessorContext {
 }
 }
 
 
 internal class SsoProcessorContextImpl(
 internal class SsoProcessorContextImpl(
-    override val bot: QQAndroidBot
+    override val bot: QQAndroidBot,
 ) : SsoProcessorContext {
 ) : SsoProcessorContext {
     override val account: BotAccount get() = bot.account
     override val account: BotAccount get() = bot.account
     override val device: DeviceInfo = configuration.createDeviceInfo(bot)
     override val device: DeviceInfo = configuration.createDeviceInfo(bot)

+ 3 - 3
mirai-core/src/commonMain/kotlin/network/handler/NetworkHandler.kt

@@ -161,7 +161,7 @@ internal interface NetworkHandler : CoroutineScope {
      * @suppress This is for compatibility with old code. Use [sendWithoutExpect] without extension receiver instead.
      * @suppress This is for compatibility with old code. Use [sendWithoutExpect] without extension receiver instead.
      */
      */
     suspend fun OutgoingPacket.sendWithoutExpect(
     suspend fun OutgoingPacket.sendWithoutExpect(
-        antiCollisionParam: Any? = null
+        antiCollisionParam: Any? = null,
     ) = this@NetworkHandler.sendWithoutExpect(this)
     ) = this@NetworkHandler.sendWithoutExpect(this)
 
 
     /**
     /**
@@ -171,7 +171,7 @@ internal interface NetworkHandler : CoroutineScope {
     suspend fun <R> OutgoingPacket.sendAndExpect(
     suspend fun <R> OutgoingPacket.sendAndExpect(
         timeoutMillis: Long = 5000,
         timeoutMillis: Long = 5000,
         retry: Int = 2,
         retry: Int = 2,
-        antiCollisionParam: Any? = null // signature collision
+        antiCollisionParam: Any? = null, // signature collision
     ): R = sendAndExpect(this, timeoutMillis, retry) as R
     ): R = sendAndExpect(this, timeoutMillis, retry) as R
 
 
     /**
     /**
@@ -180,7 +180,7 @@ internal interface NetworkHandler : CoroutineScope {
     @Suppress("UNCHECKED_CAST")
     @Suppress("UNCHECKED_CAST")
     suspend fun <R : Packet?> OutgoingPacketWithRespType<R>.sendAndExpect(
     suspend fun <R : Packet?> OutgoingPacketWithRespType<R>.sendAndExpect(
         timeoutMillis: Long = 5000,
         timeoutMillis: Long = 5000,
-        retry: Int = 2
+        retry: Int = 2,
     ): R = sendAndExpect(this, timeoutMillis, retry) as R
     ): R = sendAndExpect(this, timeoutMillis, retry) as R
 }
 }
 
 

+ 1 - 1
mirai-core/src/commonMain/kotlin/network/handler/NetworkHandlerContext.kt

@@ -31,7 +31,7 @@ internal inline fun NetworkHandlerContext.mapComponents(action: (ComponentStorag
 internal class NetworkHandlerContextImpl(
 internal class NetworkHandlerContextImpl(
     override val bot: QQAndroidBot,
     override val bot: QQAndroidBot,
     override val logger: MiraiLogger,
     override val logger: MiraiLogger,
-    private val storage: ComponentStorage // should be the same as bot.components
+    private val storage: ComponentStorage, // should be the same as bot.components
 ) : NetworkHandlerContext, ComponentStorage by storage {
 ) : NetworkHandlerContext, ComponentStorage by storage {
     override fun toString(): String {
     override fun toString(): String {
         return "NetworkHandlerContextImpl(bot=${bot.id}, storage=$storage)"
         return "NetworkHandlerContextImpl(bot=${bot.id}, storage=$storage)"

+ 1 - 1
mirai-core/src/commonMain/kotlin/network/handler/selector/ExceptionInSelectorResumeException.kt

@@ -10,5 +10,5 @@
 package net.mamoe.mirai.internal.network.handler.selector
 package net.mamoe.mirai.internal.network.handler.selector
 
 
 internal class ExceptionInSelectorResumeException(
 internal class ExceptionInSelectorResumeException(
-    cause: Throwable
+    cause: Throwable,
 ) : RuntimeException(cause)
 ) : RuntimeException(cause)

+ 1 - 1
mirai-core/src/commonMain/kotlin/network/handler/selector/MaxAttemptsReachedException.kt

@@ -10,5 +10,5 @@
 package net.mamoe.mirai.internal.network.handler.selector
 package net.mamoe.mirai.internal.network.handler.selector
 
 
 internal data class MaxAttemptsReachedException(
 internal data class MaxAttemptsReachedException(
-    override val cause: Throwable?
+    override val cause: Throwable?,
 ) : IllegalStateException("Failed to resume instance. Maximum attempts reached.")
 ) : IllegalStateException("Failed to resume instance. Maximum attempts reached.")

+ 5 - 5
mirai-core/src/commonMain/kotlin/network/handler/state/CombinedStateObserver.kt

@@ -13,12 +13,12 @@ import net.mamoe.mirai.internal.network.handler.NetworkHandler
 import net.mamoe.mirai.internal.network.handler.NetworkHandlerSupport
 import net.mamoe.mirai.internal.network.handler.NetworkHandlerSupport
 
 
 internal class CombinedStateObserver(
 internal class CombinedStateObserver(
-    private val list: List<StateObserver>
+    private val list: List<StateObserver>,
 ) : StateObserver {
 ) : StateObserver {
     override fun beforeStateChanged(
     override fun beforeStateChanged(
         networkHandler: NetworkHandlerSupport,
         networkHandler: NetworkHandlerSupport,
         previous: NetworkHandlerSupport.BaseStateImpl,
         previous: NetworkHandlerSupport.BaseStateImpl,
-        new: NetworkHandlerSupport.BaseStateImpl
+        new: NetworkHandlerSupport.BaseStateImpl,
     ) {
     ) {
         list.forEach { it.beforeStateChanged(networkHandler, previous, new) }
         list.forEach { it.beforeStateChanged(networkHandler, previous, new) }
     }
     }
@@ -26,7 +26,7 @@ internal class CombinedStateObserver(
     override fun stateChanged(
     override fun stateChanged(
         networkHandler: NetworkHandlerSupport,
         networkHandler: NetworkHandlerSupport,
         previous: NetworkHandlerSupport.BaseStateImpl,
         previous: NetworkHandlerSupport.BaseStateImpl,
-        new: NetworkHandlerSupport.BaseStateImpl
+        new: NetworkHandlerSupport.BaseStateImpl,
     ) {
     ) {
         list.forEach { it.stateChanged(networkHandler, previous, new) }
         list.forEach { it.stateChanged(networkHandler, previous, new) }
     }
     }
@@ -34,7 +34,7 @@ internal class CombinedStateObserver(
     override fun exceptionOnCreatingNewState(
     override fun exceptionOnCreatingNewState(
         networkHandler: NetworkHandlerSupport,
         networkHandler: NetworkHandlerSupport,
         previousState: NetworkHandlerSupport.BaseStateImpl,
         previousState: NetworkHandlerSupport.BaseStateImpl,
-        exception: Throwable
+        exception: Throwable,
     ) {
     ) {
         list.forEach { it.exceptionOnCreatingNewState(networkHandler, previousState, exception) }
         list.forEach { it.exceptionOnCreatingNewState(networkHandler, previousState, exception) }
     }
     }
@@ -46,7 +46,7 @@ internal class CombinedStateObserver(
     override fun afterStateResume(
     override fun afterStateResume(
         networkHandler: NetworkHandler,
         networkHandler: NetworkHandler,
         state: NetworkHandlerSupport.BaseStateImpl,
         state: NetworkHandlerSupport.BaseStateImpl,
-        result: Result<Unit>
+        result: Result<Unit>,
     ) {
     ) {
         list.forEach { it.afterStateResume(networkHandler, state, result) }
         list.forEach { it.afterStateResume(networkHandler, state, result) }
     }
     }

+ 1 - 1
mirai-core/src/commonMain/kotlin/network/handler/state/ExceptionInStateObserverException.kt

@@ -10,5 +10,5 @@
 package net.mamoe.mirai.internal.network.handler.state
 package net.mamoe.mirai.internal.network.handler.state
 
 
 internal class ExceptionInStateObserverException(
 internal class ExceptionInStateObserverException(
-    override val cause: Throwable
+    override val cause: Throwable,
 ) : RuntimeException()
 ) : RuntimeException()

+ 1 - 1
mirai-core/src/commonMain/kotlin/network/handler/state/JobAttachStateObserver.kt

@@ -31,7 +31,7 @@ internal class JobAttachStateObserver(
     override fun stateChanged0(
     override fun stateChanged0(
         networkHandler: NetworkHandlerSupport,
         networkHandler: NetworkHandlerSupport,
         previous: NetworkHandlerSupport.BaseStateImpl,
         previous: NetworkHandlerSupport.BaseStateImpl,
-        new: NetworkHandlerSupport.BaseStateImpl
+        new: NetworkHandlerSupport.BaseStateImpl,
     ) {
     ) {
         new.launch(CoroutineName(name) + coroutineContext, start = CoroutineStart.UNDISPATCHED) {
         new.launch(CoroutineName(name) + coroutineContext, start = CoroutineStart.UNDISPATCHED) {
             try {
             try {

+ 5 - 5
mirai-core/src/commonMain/kotlin/network/handler/state/LoggingStateObserver.kt

@@ -17,14 +17,14 @@ import net.mamoe.mirai.utils.systemProp
 
 
 internal class LoggingStateObserver(
 internal class LoggingStateObserver(
     val logger: MiraiLogger,
     val logger: MiraiLogger,
-    private val showStacktrace: Boolean = false
+    private val showStacktrace: Boolean = false,
 ) : StateObserver {
 ) : StateObserver {
     override fun toString(): String = "LoggingStateObserver(logger=${logger.identity})"
     override fun toString(): String = "LoggingStateObserver(logger=${logger.identity})"
 
 
     override fun beforeStateChanged(
     override fun beforeStateChanged(
         networkHandler: NetworkHandlerSupport,
         networkHandler: NetworkHandlerSupport,
         previous: NetworkHandlerSupport.BaseStateImpl,
         previous: NetworkHandlerSupport.BaseStateImpl,
-        new: NetworkHandlerSupport.BaseStateImpl
+        new: NetworkHandlerSupport.BaseStateImpl,
     ) {
     ) {
         logger.debug(
         logger.debug(
             { "Before change: ${previous.correspondingState} -> ${new.correspondingState}" },
             { "Before change: ${previous.correspondingState} -> ${new.correspondingState}" },
@@ -35,7 +35,7 @@ internal class LoggingStateObserver(
     override fun stateChanged(
     override fun stateChanged(
         networkHandler: NetworkHandlerSupport,
         networkHandler: NetworkHandlerSupport,
         previous: NetworkHandlerSupport.BaseStateImpl,
         previous: NetworkHandlerSupport.BaseStateImpl,
-        new: NetworkHandlerSupport.BaseStateImpl
+        new: NetworkHandlerSupport.BaseStateImpl,
     ) {
     ) {
         logger.debug(
         logger.debug(
             { "State changed: ${previous.correspondingState} -> ${new.correspondingState}" },
             { "State changed: ${previous.correspondingState} -> ${new.correspondingState}" },
@@ -46,7 +46,7 @@ internal class LoggingStateObserver(
     override fun exceptionOnCreatingNewState(
     override fun exceptionOnCreatingNewState(
         networkHandler: NetworkHandlerSupport,
         networkHandler: NetworkHandlerSupport,
         previousState: NetworkHandlerSupport.BaseStateImpl,
         previousState: NetworkHandlerSupport.BaseStateImpl,
-        exception: Throwable
+        exception: Throwable,
     ) {
     ) {
         logger.debug { "State changed: ${previousState.correspondingState} -> $exception" }
         logger.debug { "State changed: ${previousState.correspondingState} -> $exception" }
     }
     }
@@ -58,7 +58,7 @@ internal class LoggingStateObserver(
     override fun afterStateResume(
     override fun afterStateResume(
         networkHandler: NetworkHandler,
         networkHandler: NetworkHandler,
         state: NetworkHandlerSupport.BaseStateImpl,
         state: NetworkHandlerSupport.BaseStateImpl,
-        result: Result<Unit>
+        result: Result<Unit>,
     ) {
     ) {
         result.fold(
         result.fold(
             onSuccess = {
             onSuccess = {

+ 3 - 3
mirai-core/src/commonMain/kotlin/network/handler/state/SafeStateObserver.kt

@@ -34,7 +34,7 @@ internal class SafeStateObserver(
     override fun stateChanged(
     override fun stateChanged(
         networkHandler: NetworkHandlerSupport,
         networkHandler: NetworkHandlerSupport,
         previous: NetworkHandlerSupport.BaseStateImpl,
         previous: NetworkHandlerSupport.BaseStateImpl,
-        new: NetworkHandlerSupport.BaseStateImpl
+        new: NetworkHandlerSupport.BaseStateImpl,
     ) {
     ) {
         try {
         try {
             delegate.stateChanged(networkHandler, previous, new)
             delegate.stateChanged(networkHandler, previous, new)
@@ -49,7 +49,7 @@ internal class SafeStateObserver(
     override fun exceptionOnCreatingNewState(
     override fun exceptionOnCreatingNewState(
         networkHandler: NetworkHandlerSupport,
         networkHandler: NetworkHandlerSupport,
         previousState: NetworkHandlerSupport.BaseStateImpl,
         previousState: NetworkHandlerSupport.BaseStateImpl,
-        exception: Throwable
+        exception: Throwable,
     ) {
     ) {
         try {
         try {
             delegate.exceptionOnCreatingNewState(networkHandler, previousState, exception)
             delegate.exceptionOnCreatingNewState(networkHandler, previousState, exception)
@@ -75,7 +75,7 @@ internal class SafeStateObserver(
     override fun afterStateResume(
     override fun afterStateResume(
         networkHandler: NetworkHandler,
         networkHandler: NetworkHandler,
         state: NetworkHandlerSupport.BaseStateImpl,
         state: NetworkHandlerSupport.BaseStateImpl,
-        result: Result<Unit>
+        result: Result<Unit>,
     ) {
     ) {
         try {
         try {
             delegate.afterStateResume(networkHandler, state, result)
             delegate.afterStateResume(networkHandler, state, result)

+ 8 - 8
mirai-core/src/commonMain/kotlin/network/handler/state/StateChangedObserver.kt

@@ -16,13 +16,13 @@ import net.mamoe.mirai.internal.network.handler.NetworkHandlerSupport
 internal fun StateChangedObserver(
 internal fun StateChangedObserver(
     name: String,
     name: String,
     to: State,
     to: State,
-    action: (new: NetworkHandlerSupport.BaseStateImpl) -> Unit
+    action: (new: NetworkHandlerSupport.BaseStateImpl) -> Unit,
 ): StateObserver {
 ): StateObserver {
     return object : StateChangedObserver(to) {
     return object : StateChangedObserver(to) {
         override fun stateChanged0(
         override fun stateChanged0(
             networkHandler: NetworkHandlerSupport,
             networkHandler: NetworkHandlerSupport,
             previous: NetworkHandlerSupport.BaseStateImpl,
             previous: NetworkHandlerSupport.BaseStateImpl,
-            new: NetworkHandlerSupport.BaseStateImpl
+            new: NetworkHandlerSupport.BaseStateImpl,
         ) {
         ) {
             action(new)
             action(new)
         }
         }
@@ -36,13 +36,13 @@ internal fun StateChangedObserver(
     name: String,
     name: String,
     from: State,
     from: State,
     to: State,
     to: State,
-    action: (new: NetworkHandlerSupport.BaseStateImpl) -> Unit
+    action: (new: NetworkHandlerSupport.BaseStateImpl) -> Unit,
 ): StateObserver {
 ): StateObserver {
     return object : StateObserver {
     return object : StateObserver {
         override fun stateChanged(
         override fun stateChanged(
             networkHandler: NetworkHandlerSupport,
             networkHandler: NetworkHandlerSupport,
             previous: NetworkHandlerSupport.BaseStateImpl,
             previous: NetworkHandlerSupport.BaseStateImpl,
-            new: NetworkHandlerSupport.BaseStateImpl
+            new: NetworkHandlerSupport.BaseStateImpl,
         ) {
         ) {
             if (previous.correspondingState == from && new.correspondingState == to) {
             if (previous.correspondingState == from && new.correspondingState == to) {
                 action(new)
                 action(new)
@@ -58,13 +58,13 @@ internal fun BeforeStateChangedObserver(
     name: String,
     name: String,
     from: State,
     from: State,
     to: State,
     to: State,
-    action: (new: NetworkHandlerSupport.BaseStateImpl) -> Unit
+    action: (new: NetworkHandlerSupport.BaseStateImpl) -> Unit,
 ): StateObserver {
 ): StateObserver {
     return object : StateObserver {
     return object : StateObserver {
         override fun beforeStateChanged(
         override fun beforeStateChanged(
             networkHandler: NetworkHandlerSupport,
             networkHandler: NetworkHandlerSupport,
             previous: NetworkHandlerSupport.BaseStateImpl,
             previous: NetworkHandlerSupport.BaseStateImpl,
-            new: NetworkHandlerSupport.BaseStateImpl
+            new: NetworkHandlerSupport.BaseStateImpl,
         ) {
         ) {
             if (previous.correspondingState == from && new.correspondingState == to) {
             if (previous.correspondingState == from && new.correspondingState == to) {
                 action(new)
                 action(new)
@@ -81,13 +81,13 @@ internal abstract class StateChangedObserver(
     protected abstract fun stateChanged0(
     protected abstract fun stateChanged0(
         networkHandler: NetworkHandlerSupport,
         networkHandler: NetworkHandlerSupport,
         previous: NetworkHandlerSupport.BaseStateImpl,
         previous: NetworkHandlerSupport.BaseStateImpl,
-        new: NetworkHandlerSupport.BaseStateImpl
+        new: NetworkHandlerSupport.BaseStateImpl,
     )
     )
 
 
     override fun stateChanged(
     override fun stateChanged(
         networkHandler: NetworkHandlerSupport,
         networkHandler: NetworkHandlerSupport,
         previous: NetworkHandlerSupport.BaseStateImpl,
         previous: NetworkHandlerSupport.BaseStateImpl,
-        new: NetworkHandlerSupport.BaseStateImpl
+        new: NetworkHandlerSupport.BaseStateImpl,
     ) {
     ) {
         if (previous.correspondingState != state && new.correspondingState == state) {
         if (previous.correspondingState != state && new.correspondingState == state) {
             stateChanged0(networkHandler, previous, new)
             stateChanged0(networkHandler, previous, new)

+ 2 - 2
mirai-core/src/commonMain/kotlin/network/handler/state/StateObserver.kt

@@ -27,7 +27,7 @@ internal interface StateObserver {
     fun beforeStateChanged(
     fun beforeStateChanged(
         networkHandler: NetworkHandlerSupport,
         networkHandler: NetworkHandlerSupport,
         previous: NetworkHandlerSupport.BaseStateImpl,
         previous: NetworkHandlerSupport.BaseStateImpl,
-        new: NetworkHandlerSupport.BaseStateImpl
+        new: NetworkHandlerSupport.BaseStateImpl,
     ) {
     ) {
 
 
     }
     }
@@ -38,7 +38,7 @@ internal interface StateObserver {
     fun stateChanged(
     fun stateChanged(
         networkHandler: NetworkHandlerSupport,
         networkHandler: NetworkHandlerSupport,
         previous: NetworkHandlerSupport.BaseStateImpl,
         previous: NetworkHandlerSupport.BaseStateImpl,
-        new: NetworkHandlerSupport.BaseStateImpl
+        new: NetworkHandlerSupport.BaseStateImpl,
     ) {
     ) {
     }
     }
 
 

+ 8 - 8
mirai-core/src/commonMain/kotlin/network/highway/Highway.kt

@@ -118,7 +118,7 @@ internal object Highway {
 }
 }
 
 
 internal enum class ResourceKind(
 internal enum class ResourceKind(
-    private val display: String
+    private val display: String,
 ) {
 ) {
     PRIVATE_IMAGE("private image"),
     PRIVATE_IMAGE("private image"),
     GROUP_IMAGE("group image"),
     GROUP_IMAGE("group image"),
@@ -135,7 +135,7 @@ internal enum class ResourceKind(
 }
 }
 
 
 internal enum class ChannelKind(
 internal enum class ChannelKind(
-    private val display: String
+    private val display: String,
 ) {
 ) {
     HIGHWAY("Highway"),
     HIGHWAY("Highway"),
     HTTP("Http")
     HTTP("Http")
@@ -150,7 +150,7 @@ internal suspend inline fun <reified R, reified IP> tryServersUpload(
     resourceSize: Long,
     resourceSize: Long,
     resourceKind: ResourceKind,
     resourceKind: ResourceKind,
     channelKind: ChannelKind,
     channelKind: ChannelKind,
-    crossinline implOnEachServer: suspend (ip: String, port: Int) -> R
+    crossinline implOnEachServer: suspend (ip: String, port: Int) -> R,
 ) = servers.retryWithServers(
 ) = servers.retryWithServers(
     (resourceSize * 1000 / 1024 / 10).coerceAtLeast(5000),
     (resourceSize * 1000 / 1024 / 10).coerceAtLeast(5000),
     onFail = { throw IllegalStateException("cannot upload $resourceKind, failed on all servers.", it) }
     onFail = { throw IllegalStateException("cannot upload $resourceKind, failed on all servers.", it) }
@@ -185,7 +185,7 @@ internal suspend inline fun <reified R> tryServersDownload(
     servers: Collection<Pair<Int, Int>>,
     servers: Collection<Pair<Int, Int>>,
     resourceKind: ResourceKind,
     resourceKind: ResourceKind,
     channelKind: ChannelKind,
     channelKind: ChannelKind,
-    crossinline implOnEachServer: suspend (ip: String, port: Int) -> R
+    crossinline implOnEachServer: suspend (ip: String, port: Int) -> R,
 ) = servers.retryWithServers(
 ) = servers.retryWithServers(
     5000,
     5000,
     onFail = { throw IllegalStateException("cannot download $resourceKind, failed on all servers.", it) }
     onFail = { throw IllegalStateException("cannot download $resourceKind, failed on all servers.", it) }
@@ -200,7 +200,7 @@ internal suspend inline fun <reified R> tryDownload(
     times: Int = 1,
     times: Int = 1,
     resourceKind: ResourceKind,
     resourceKind: ResourceKind,
     channelKind: ChannelKind,
     channelKind: ChannelKind,
-    crossinline implOnEachServer: suspend (ip: String, port: Int) -> R
+    crossinline implOnEachServer: suspend (ip: String, port: Int) -> R,
 ) = retryCatching(times) {
 ) = retryCatching(times) {
     tryDownloadImplEach(bot, channelKind, resourceKind, host, port, implOnEachServer)
     tryDownloadImplEach(bot, channelKind, resourceKind, host, port, implOnEachServer)
 }.getOrElse { throw IllegalStateException("Cannot download $resourceKind", it) }
 }.getOrElse { throw IllegalStateException("Cannot download $resourceKind", it) }
@@ -212,7 +212,7 @@ private suspend inline fun <reified R> tryDownloadImplEach(
     resourceKind: ResourceKind,
     resourceKind: ResourceKind,
     host: String,
     host: String,
     port: Int,
     port: Int,
-    crossinline implOnEachServer: suspend (ip: String, port: Int) -> R
+    crossinline implOnEachServer: suspend (ip: String, port: Int) -> R,
 ): R {
 ): R {
     bot.network.logger.verbose {
     bot.network.logger.verbose {
         "[${channelKind}] Downloading $resourceKind from ${host}:$port"
         "[${channelKind}] Downloading $resourceKind from ${host}:$port"
@@ -237,7 +237,7 @@ private suspend inline fun <reified R> tryDownloadImplEach(
 
 
 internal suspend fun ChunkedFlowSession<ByteReadPacket>.sendSequentially(
 internal suspend fun ChunkedFlowSession<ByteReadPacket>.sendSequentially(
     socket: PlatformSocket,
     socket: PlatformSocket,
-    respCallback: (resp: CSDataHighwayHead.RspDataHighwayHead) -> Unit = {}
+    respCallback: (resp: CSDataHighwayHead.RspDataHighwayHead) -> Unit = {},
 ) {
 ) {
     contract { callsInPlace(respCallback, InvocationKind.UNKNOWN) }
     contract { callsInPlace(respCallback, InvocationKind.UNKNOWN) }
     useAll {
     useAll {
@@ -299,7 +299,7 @@ internal interface HighwayProtocolChannel {
 //            }
 //            }
 
 
 internal class SynchronousHighwayProtocolChannel(
 internal class SynchronousHighwayProtocolChannel(
-    val action: suspend (ByteReadPacket) -> ByteArray
+    val action: suspend (ByteReadPacket) -> ByteArray,
 ) : HighwayProtocolChannel {
 ) : HighwayProtocolChannel {
     @Volatile
     @Volatile
     var result: ByteArray? = null
     var result: ByteArray? = null

+ 1 - 1
mirai-core/src/commonMain/kotlin/network/highway/Http.kt

@@ -46,7 +46,7 @@ internal suspend fun HttpClient.postImage(
     uin: Long,
     uin: Long,
     groupcode: Long?,
     groupcode: Long?,
     imageInput: ExternalResource,
     imageInput: ExternalResource,
-    uKeyHex: String
+    uKeyHex: String,
 ): Boolean = post<HttpStatusCode> {
 ): Boolean = post<HttpStatusCode> {
     url {
     url {
         protocol = URLProtocol.HTTP
         protocol = URLProtocol.HTTP

+ 1 - 1
mirai-core/src/commonMain/kotlin/network/impl/netty/HeartbeatFailedException.kt

@@ -13,7 +13,7 @@ import net.mamoe.mirai.internal.network.handler.selector.NetworkException
 
 
 internal class HeartbeatFailedException(
 internal class HeartbeatFailedException(
     private val name: String, // kind of HB
     private val name: String, // kind of HB
-    override val cause: Throwable? = null
+    override val cause: Throwable? = null,
 ) : NetworkException(true) {
 ) : NetworkException(true) {
     override val message: String = "Exception in $name job"
     override val message: String = "Exception in $name job"
     override fun toString(): String = "HeartbeatFailedException: $name, cause=$cause"
     override fun toString(): String = "HeartbeatFailedException: $name, cause=$cause"

+ 1 - 1
mirai-core/src/commonMain/kotlin/network/impl/netty/NettyChannelException.kt

@@ -13,5 +13,5 @@ import net.mamoe.mirai.internal.network.handler.selector.NetworkException
 
 
 internal data class NettyChannelException(
 internal data class NettyChannelException(
     override val message: String? = null,
     override val message: String? = null,
-    override val cause: Throwable? = null
+    override val cause: Throwable? = null,
 ) : NetworkException(true)
 ) : NetworkException(true)

+ 5 - 5
mirai-core/src/commonMain/kotlin/network/impl/netty/NettyNetworkHandler.kt

@@ -85,7 +85,7 @@ internal open class NettyNetworkHandler(
     }
     }
 
 
     private inner class RawIncomingPacketCollector(
     private inner class RawIncomingPacketCollector(
-        private val decodePipeline: PacketDecodePipeline
+        private val decodePipeline: PacketDecodePipeline,
     ) : SimpleChannelInboundHandler<RawIncomingPacket>(RawIncomingPacket::class.java) {
     ) : SimpleChannelInboundHandler<RawIncomingPacket>(RawIncomingPacket::class.java) {
         override fun channelRead0(ctx: ChannelHandlerContext, msg: RawIncomingPacket) {
         override fun channelRead0(ctx: ChannelHandlerContext, msg: RawIncomingPacket) {
             decodePipeline.send(msg)
             decodePipeline.send(msg)
@@ -214,7 +214,7 @@ internal open class NettyNetworkHandler(
      * @see StateObserver
      * @see StateObserver
      */
      */
     protected abstract inner class NettyState(
     protected abstract inner class NettyState(
-        correspondingState: State
+        correspondingState: State,
     ) : BaseStateImpl(correspondingState) {
     ) : BaseStateImpl(correspondingState) {
         /**
         /**
          * @return `true` if packet has been sent, `false` if state is not ready for send.
          * @return `true` if packet has been sent, `false` if state is not ready for send.
@@ -225,7 +225,7 @@ internal open class NettyNetworkHandler(
 
 
     protected inner class StateInitialized : NettyState(State.INITIALIZED) {
     protected inner class StateInitialized : NettyState(State.INITIALIZED) {
         override suspend fun sendPacketImpl(packet: OutgoingPacket): Boolean {
         override suspend fun sendPacketImpl(packet: OutgoingPacket): Boolean {
-//            error("Cannot send packet when connection is not set. (resumeConnection not called.)")
+            //            error("Cannot send packet when connection is not set. (resumeConnection not called.)")
             return false
             return false
         }
         }
 
 
@@ -307,7 +307,7 @@ internal open class NettyNetworkHandler(
      * @see StateObserver
      * @see StateObserver
      */
      */
     protected inner class StateLoading(
     protected inner class StateLoading(
-        private val connection: NettyChannel
+        private val connection: NettyChannel,
     ) : NettyState(State.LOADING) {
     ) : NettyState(State.LOADING) {
         init {
         init {
             coroutineContext.job.invokeOnCompletion {
             coroutineContext.job.invokeOnCompletion {
@@ -380,7 +380,7 @@ internal open class NettyNetworkHandler(
     }
     }
 
 
     protected inner class StateClosed(
     protected inner class StateClosed(
-        val exception: Throwable?
+        val exception: Throwable?,
     ) : NettyState(State.CLOSED) {
     ) : NettyState(State.CLOSED) {
         init {
         init {
             close(exception)
             close(exception)

+ 1 - 1
mirai-core/src/commonMain/kotlin/network/impl/netty/nettyUtils.kt

@@ -52,7 +52,7 @@ internal fun ByteBuf.toReadPacket(): ByteReadPacket {
 
 
 
 
 internal fun MiraiLogger.asCoroutineExceptionHandler(
 internal fun MiraiLogger.asCoroutineExceptionHandler(
-    priority: SimpleLogger.LogPriority = ERROR
+    priority: SimpleLogger.LogPriority = ERROR,
 ): CoroutineExceptionHandler {
 ): CoroutineExceptionHandler {
     return CoroutineExceptionHandler { context, e ->
     return CoroutineExceptionHandler { context, e ->
         call(
         call(

+ 10 - 10
mirai-core/src/commonMain/kotlin/network/keys.kt

@@ -20,7 +20,7 @@ import net.mamoe.mirai.utils.*
 internal class ReserveUinInfo(
 internal class ReserveUinInfo(
     val imgType: ByteArray,
     val imgType: ByteArray,
     val imgFormat: ByteArray,
     val imgFormat: ByteArray,
-    val imgUrl: ByteArray
+    val imgUrl: ByteArray,
 ) {
 ) {
     override fun toString(): String {
     override fun toString(): String {
         return "ReserveUinInfo(imgType=${imgType.toUHexString()}, imgFormat=${imgFormat.toUHexString()}, imgUrl=${imgUrl.toUHexString()})"
         return "ReserveUinInfo(imgType=${imgType.toUHexString()}, imgFormat=${imgFormat.toUHexString()}, imgUrl=${imgUrl.toUHexString()})"
@@ -32,7 +32,7 @@ internal class WFastLoginInfo(
     var adUrl: String = "",
     var adUrl: String = "",
     var iconUrl: String = "",
     var iconUrl: String = "",
     var profileUrl: String = "",
     var profileUrl: String = "",
-    var userJson: String = ""
+    var userJson: String = "",
 ) {
 ) {
     override fun toString(): String {
     override fun toString(): String {
         return "WFastLoginInfo(outA1=$outA1, adUrl='$adUrl', iconUrl='$iconUrl', profileUrl='$profileUrl', userJson='$userJson')"
         return "WFastLoginInfo(outA1=$outA1, adUrl='$adUrl', iconUrl='$iconUrl', profileUrl='$profileUrl', userJson='$userJson')"
@@ -45,7 +45,7 @@ internal class WLoginSimpleInfo(
     val imgType: ByteArray,
     val imgType: ByteArray,
     val imgFormat: ByteArray,
     val imgFormat: ByteArray,
     val imgUrl: ByteArray,
     val imgUrl: ByteArray,
-    val mainDisplayName: ByteArray
+    val mainDisplayName: ByteArray,
 ) {
 ) {
     override fun toString(): String {
     override fun toString(): String {
         return "WLoginSimpleInfo(uin=$uin, imgType=${imgType.toUHexString()}, imgFormat=${imgFormat.toUHexString()}, imgUrl=${imgUrl.toUHexString()}, mainDisplayName=${mainDisplayName.toUHexString()})"
         return "WLoginSimpleInfo(uin=$uin, imgType=${imgType.toUHexString()}, imgFormat=${imgFormat.toUHexString()}, imgUrl=${imgUrl.toUHexString()}, mainDisplayName=${mainDisplayName.toUHexString()})"
@@ -57,7 +57,7 @@ internal class LoginExtraData(
     val uin: Long,
     val uin: Long,
     val ip: ByteArray,
     val ip: ByteArray,
     val time: Int,
     val time: Int,
-    val version: Int
+    val version: Int,
 ) {
 ) {
     override fun toString(): String {
     override fun toString(): String {
         return "LoginExtraData(uin=$uin, ip=${ip.toUHexString()}, time=$time, version=$version)"
         return "LoginExtraData(uin=$uin, ip=${ip.toUHexString()}, time=$time, version=$version)"
@@ -122,16 +122,16 @@ internal data class WLoginSigInfo(
     var wtSessionTicket: KeyWithCreationTime,
     var wtSessionTicket: KeyWithCreationTime,
     var wtSessionTicketKey: ByteArray,
     var wtSessionTicketKey: ByteArray,
     var deviceToken: ByteArray,
     var deviceToken: ByteArray,
-    var encryptedDownloadSession: EncryptedDownloadSession? = null
+    var encryptedDownloadSession: EncryptedDownloadSession? = null,
 ) {
 ) {
 
 
     //图片加密下载
     //图片加密下载
     //是否加密从bigdatachannel处得知
     //是否加密从bigdatachannel处得知
     @Serializable
     @Serializable
     internal class EncryptedDownloadSession(
     internal class EncryptedDownloadSession(
-        val appId: Long,//1600000226L
+        val appId: Long, //1600000226L
         val stKey: ByteArray,
         val stKey: ByteArray,
-        val stSig: ByteArray
+        val stSig: ByteArray,
     )
     )
 
 
     override fun toString(): String {
     override fun toString(): String {
@@ -147,7 +147,7 @@ internal fun parsePSKeyMapAndPt4TokenMap(
     creationTime: Long,
     creationTime: Long,
     expireTime: Long,
     expireTime: Long,
     outPSKeyMap: PSKeyMap,
     outPSKeyMap: PSKeyMap,
-    outPt4TokenMap: Pt4TokenMap
+    outPt4TokenMap: Pt4TokenMap,
 ) =
 ) =
     data.read {
     data.read {
         repeat(readShort().toInt()) {
         repeat(readShort().toInt()) {
@@ -166,7 +166,7 @@ internal fun parsePSKeyMapAndPt4TokenMap(
 internal open class KeyWithExpiry(
 internal open class KeyWithExpiry(
     @SerialName("data1") override val data: ByteArray,
     @SerialName("data1") override val data: ByteArray,
     @SerialName("creationTime1") override val creationTime: Long,
     @SerialName("creationTime1") override val creationTime: Long,
-    val expireTime: Long
+    val expireTime: Long,
 ) : KeyWithCreationTime(data, creationTime) {
 ) : KeyWithCreationTime(data, creationTime) {
     override fun toString(): String {
     override fun toString(): String {
         return "KeyWithExpiry(data=${data.toUHexString()}, creationTime=$creationTime)"
         return "KeyWithExpiry(data=${data.toUHexString()}, creationTime=$creationTime)"
@@ -176,7 +176,7 @@ internal open class KeyWithExpiry(
 @Serializable
 @Serializable
 internal open class KeyWithCreationTime(
 internal open class KeyWithCreationTime(
     open val data: ByteArray,
     open val data: ByteArray,
-    open val creationTime: Long
+    open val creationTime: Long,
 ) {
 ) {
     override fun toString(): String {
     override fun toString(): String {
         return "KeyWithCreationTime(data=${data.toUHexString()}, creationTime=$creationTime)"
         return "KeyWithCreationTime(data=${data.toUHexString()}, creationTime=$creationTime)"

+ 1 - 0
mirai-core/src/commonMain/kotlin/network/protocol/LoginType.kt

@@ -23,6 +23,7 @@ internal value class LoginType(
          * 密码登录
          * 密码登录
          */
          */
         val PASSWORD = LoginType(1)
         val PASSWORD = LoginType(1)
+
         /**
         /**
          * 微信一键登录
          * 微信一键登录
          */
          */

+ 20 - 19
mirai-core/src/commonMain/kotlin/network/protocol/data/jce/ConfigPush.kt

@@ -21,14 +21,14 @@ internal class BigDataChannel(
     @TarsId(2) @JvmField val sBigdataKeySession: ByteArray? = null,
     @TarsId(2) @JvmField val sBigdataKeySession: ByteArray? = null,
     @TarsId(3) @JvmField val uSigUin: Long? = null,
     @TarsId(3) @JvmField val uSigUin: Long? = null,
     @TarsId(4) @JvmField val iConnectFlag: Int? = 1,
     @TarsId(4) @JvmField val iConnectFlag: Int? = 1,
-    @TarsId(5) @JvmField val vBigdataPbBuf: ByteArray? = null
+    @TarsId(5) @JvmField val vBigdataPbBuf: ByteArray? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class BigDataIpInfo(
 internal class BigDataIpInfo(
     @TarsId(0) @JvmField val uType: Long,
     @TarsId(0) @JvmField val uType: Long,
     @TarsId(1) @JvmField val sIp: String = "",
     @TarsId(1) @JvmField val sIp: String = "",
-    @TarsId(2) @JvmField val uPort: Long
+    @TarsId(2) @JvmField val uPort: Long,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -36,7 +36,7 @@ internal class BigDataIpList(
     @TarsId(0) @JvmField val uServiceType: Long,
     @TarsId(0) @JvmField val uServiceType: Long,
     @TarsId(1) @JvmField val vIplist: List<BigDataIpInfo>,
     @TarsId(1) @JvmField val vIplist: List<BigDataIpInfo>,
     @TarsId(2) @JvmField val netSegConfs: List<NetSegConf>? = null,
     @TarsId(2) @JvmField val netSegConfs: List<NetSegConf>? = null,
-    @TarsId(3) @JvmField val ufragmentSize: Long? = null
+    @TarsId(3) @JvmField val ufragmentSize: Long? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -46,18 +46,18 @@ internal class ClientLogConfig(
     @TarsId(3) @JvmField val timeFinish: TimeStamp? = null,
     @TarsId(3) @JvmField val timeFinish: TimeStamp? = null,
     @TarsId(4) @JvmField val loglevel: Byte? = null,
     @TarsId(4) @JvmField val loglevel: Byte? = null,
     @TarsId(5) @JvmField val cookie: Int? = null,
     @TarsId(5) @JvmField val cookie: Int? = null,
-    @TarsId(6) @JvmField val lseq: Long? = null
+    @TarsId(6) @JvmField val lseq: Long? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class DomainIpChannel(
 internal class DomainIpChannel(
-    @TarsId(0) @JvmField val vDomainIplists: List<DomainIpList>
+    @TarsId(0) @JvmField val vDomainIplists: List<DomainIpList>,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class DomainIpInfo(
 internal class DomainIpInfo(
     @TarsId(1) @JvmField val uIp: Int,
     @TarsId(1) @JvmField val uIp: Int,
-    @TarsId(2) @JvmField val uPort: Int
+    @TarsId(2) @JvmField val uPort: Int,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -65,7 +65,7 @@ internal class DomainIpList(
     @TarsId(0) @JvmField val uDomainType: Int,
     @TarsId(0) @JvmField val uDomainType: Int,
     @TarsId(1) @JvmField val vIplist: List<DomainIpInfo>,
     @TarsId(1) @JvmField val vIplist: List<DomainIpInfo>,
     @TarsId(2) @JvmField val unknown: ByteArray? = null,
     @TarsId(2) @JvmField val unknown: ByteArray? = null,
-    @TarsId(4) @JvmField val int: Int? = null// added
+    @TarsId(4) @JvmField val int: Int? = null, // added
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -84,7 +84,7 @@ internal class _340(
     @TarsId(13) @JvmField val field1326: List<_339>? = null,
     @TarsId(13) @JvmField val field1326: List<_339>? = null,
     @TarsId(14) @JvmField val netType: Byte? = 0,
     @TarsId(14) @JvmField val netType: Byte? = 0,
     @TarsId(15) @JvmField val heThreshold: Int? = 0,
     @TarsId(15) @JvmField val heThreshold: Int? = 0,
-    @TarsId(16) @JvmField val policyId: String? = ""
+    @TarsId(16) @JvmField val policyId: String? = "",
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -97,7 +97,7 @@ internal class _339(
     @TarsId(6) @JvmField val field1303: Int? = 8,
     @TarsId(6) @JvmField val field1303: Int? = 8,
     @TarsId(7) @JvmField val field1304: Byte? = 0,
     @TarsId(7) @JvmField val field1304: Byte? = 0,
     @TarsId(8) @JvmField val field1305: String = "",
     @TarsId(8) @JvmField val field1305: String = "",
-    @TarsId(9) @JvmField val field1306: String = ""
+    @TarsId(9) @JvmField val field1306: String = "",
 ) : JceStruct
 ) : JceStruct
 
 
 
 
@@ -122,13 +122,13 @@ internal class FileStoragePushFSSvcList(
 @Serializable
 @Serializable
 internal class FileStorageServerListInfo(
 internal class FileStorageServerListInfo(
     @TarsId(1) @JvmField val sIP: String = "",
     @TarsId(1) @JvmField val sIP: String = "",
-    @TarsId(2) @JvmField val iPort: Int
+    @TarsId(2) @JvmField val iPort: Int,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class FmtIPInfo(
 internal class FmtIPInfo(
     @TarsId(0) @JvmField val sGateIp: String = "",
     @TarsId(0) @JvmField val sGateIp: String = "",
-    @TarsId(1) @JvmField val iGateIpOper: Long
+    @TarsId(1) @JvmField val iGateIpOper: Long,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -136,7 +136,7 @@ internal class NetSegConf(
     @TarsId(0) @JvmField val uint32NetType: Long? = null,
     @TarsId(0) @JvmField val uint32NetType: Long? = null,
     @TarsId(1) @JvmField val uint32Segsize: Long? = null,
     @TarsId(1) @JvmField val uint32Segsize: Long? = null,
     @TarsId(2) @JvmField val uint32Segnum: Long? = null,
     @TarsId(2) @JvmField val uint32Segnum: Long? = null,
-    @TarsId(3) @JvmField val uint32Curconnnum: Long? = null
+    @TarsId(3) @JvmField val uint32Curconnnum: Long? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Suppress("ArrayInDataClass")
 @Suppress("ArrayInDataClass")
@@ -144,7 +144,7 @@ internal class NetSegConf(
 internal class PushReq(
 internal class PushReq(
     @TarsId(1) @JvmField val type: Int,
     @TarsId(1) @JvmField val type: Int,
     @TarsId(2) @JvmField val jcebuf: ByteArray,
     @TarsId(2) @JvmField val jcebuf: ByteArray,
-    @TarsId(3) @JvmField val seq: Long
+    @TarsId(3) @JvmField val seq: Long,
 ) : JceStruct, Packet
 ) : JceStruct, Packet
 
 
 @Serializable
 @Serializable
@@ -167,7 +167,7 @@ internal data class ServerListPush(
      */
      */
     @TarsId(14) val ipv6ConfigVal: Byte? = 0,
     @TarsId(14) val ipv6ConfigVal: Byte? = 0,
     //@JvmField @TarsId(15) val netTestDelay:Int? = 0,
     //@JvmField @TarsId(15) val netTestDelay:Int? = 0,
-    @TarsId(16) val configDesc: String? = ""
+    @TarsId(16) val configDesc: String? = "",
 ) : JceStruct {
 ) : JceStruct {
 
 
     @Serializable
     @Serializable
@@ -189,18 +189,19 @@ internal data class ServerListPush(
          * uni->China unicom 中国联通
          * uni->China unicom 中国联通
          * others->其他
          * others->其他
          */
          */
-        @TarsId(9) val ispName: String = ""
+        @TarsId(9) val ispName: String = "",
     ) : JceStruct {
     ) : JceStruct {
         override fun toString(): String {
         override fun toString(): String {
             return "$host:$port"
             return "$host:$port"
         }
         }
     }
     }
 }
 }
+
 @Serializable
 @Serializable
 internal class PushResp(
 internal class PushResp(
     @TarsId(1) @JvmField val type: Int,
     @TarsId(1) @JvmField val type: Int,
     @TarsId(2) @JvmField val seq: Long,
     @TarsId(2) @JvmField val seq: Long,
-    @TarsId(3) @JvmField val jcebuf: ByteArray? = null
+    @TarsId(3) @JvmField val jcebuf: ByteArray? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -212,7 +213,7 @@ internal class SsoServerList(
     @TarsId(6) @JvmField val useNewList: Byte? = null,
     @TarsId(6) @JvmField val useNewList: Byte? = null,
     @TarsId(7) @JvmField val iMultiConn: Int? = 1,
     @TarsId(7) @JvmField val iMultiConn: Int? = 1,
     @TarsId(8) @JvmField val vHttp2g3glist: List<SsoServerListInfo>? = null,
     @TarsId(8) @JvmField val vHttp2g3glist: List<SsoServerListInfo>? = null,
-    @TarsId(9) @JvmField val vHttpWifilist: List<SsoServerListInfo>? = null
+    @TarsId(9) @JvmField val vHttpWifilist: List<SsoServerListInfo>? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -222,7 +223,7 @@ internal class SsoServerListInfo(
     @TarsId(3) @JvmField val linkType: Byte,
     @TarsId(3) @JvmField val linkType: Byte,
     @TarsId(4) @JvmField val proxy: Byte,
     @TarsId(4) @JvmField val proxy: Byte,
     @TarsId(5) @JvmField val protocolType: Byte? = null,
     @TarsId(5) @JvmField val protocolType: Byte? = null,
-    @TarsId(6) @JvmField val iTimeOut: Int? = 10
+    @TarsId(6) @JvmField val iTimeOut: Int? = 10,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -230,5 +231,5 @@ internal class TimeStamp(
     @TarsId(1) @JvmField val year: Int,
     @TarsId(1) @JvmField val year: Int,
     @TarsId(2) @JvmField val month: Byte,
     @TarsId(2) @JvmField val month: Byte,
     @TarsId(3) @JvmField val day: Byte,
     @TarsId(3) @JvmField val day: Byte,
-    @TarsId(4) @JvmField val hour: Byte
+    @TarsId(4) @JvmField val hour: Byte,
 ) : JceStruct
 ) : JceStruct

+ 1 - 1
mirai-core/src/commonMain/kotlin/network/protocol/data/jce/DeviceItemDes.kt

@@ -14,5 +14,5 @@ import net.mamoe.mirai.internal.utils.io.serialization.tars.TarsId
 
 
 @Serializable
 @Serializable
 internal class DeviceItemDes(
 internal class DeviceItemDes(
-    @JvmField @TarsId(0) val vecItemDes: ByteArray
+    @JvmField @TarsId(0) val vecItemDes: ByteArray,
 ) : JceStruct
 ) : JceStruct

+ 11 - 11
mirai-core/src/commonMain/kotlin/network/protocol/data/jce/FriendList.kt

@@ -19,7 +19,7 @@ internal class DelFriendReq(
     @JvmField @TarsId(0) val uin: Long,
     @JvmField @TarsId(0) val uin: Long,
     @JvmField @TarsId(1) val delUin: Long,
     @JvmField @TarsId(1) val delUin: Long,
     @JvmField @TarsId(2) val delType: Byte,
     @JvmField @TarsId(2) val delType: Byte,
-    @JvmField @TarsId(3) val version: Int? = null
+    @JvmField @TarsId(3) val version: Int? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -27,7 +27,7 @@ internal class DelFriendResp(
     @JvmField @TarsId(0) val uin: Long,
     @JvmField @TarsId(0) val uin: Long,
     @JvmField @TarsId(1) val delUin: Long,
     @JvmField @TarsId(1) val delUin: Long,
     @JvmField @TarsId(2) val result: Int,
     @JvmField @TarsId(2) val result: Int,
-    @JvmField @TarsId(3) val errorCode: Short? = null
+    @JvmField @TarsId(3) val errorCode: Short? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -35,7 +35,7 @@ internal class ModifyGroupCardReq(
     @TarsId(0) @JvmField val dwZero: Long,
     @TarsId(0) @JvmField val dwZero: Long,
     @TarsId(1) @JvmField val dwGroupCode: Long,
     @TarsId(1) @JvmField val dwGroupCode: Long,
     @TarsId(2) @JvmField val dwNewSeq: Long,
     @TarsId(2) @JvmField val dwNewSeq: Long,
-    @TarsId(3) @JvmField val vecUinInfo: List<stUinInfo>
+    @TarsId(3) @JvmField val vecUinInfo: List<stUinInfo>,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -46,7 +46,7 @@ internal class stUinInfo(
     @TarsId(3) @JvmField val gender: Byte,
     @TarsId(3) @JvmField val gender: Byte,
     @TarsId(4) @JvmField val sPhone: String = "",
     @TarsId(4) @JvmField val sPhone: String = "",
     @TarsId(5) @JvmField val sEmail: String = "",
     @TarsId(5) @JvmField val sEmail: String = "",
-    @TarsId(6) @JvmField val sRemark: String = ""
+    @TarsId(6) @JvmField val sRemark: String = "",
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -69,7 +69,7 @@ internal class GetFriendListReq(
     @TarsId(15) @JvmField val ifGetBothFlag: Byte? = null,
     @TarsId(15) @JvmField val ifGetBothFlag: Byte? = null,
     @TarsId(16) @JvmField val vec0xd50Req: ByteArray? = null,
     @TarsId(16) @JvmField val vec0xd50Req: ByteArray? = null,
     @TarsId(17) @JvmField val vec0xd6bReq: ByteArray? = null,
     @TarsId(17) @JvmField val vec0xd6bReq: ByteArray? = null,
-    @TarsId(18) @JvmField val vecSnsTypelist: List<Long>? = null
+    @TarsId(18) @JvmField val vecSnsTypelist: List<Long>? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 
 
@@ -101,13 +101,13 @@ internal class GetFriendListResp(
     @TarsId(23) @JvmField val stSelfInfo: FriendInfo? = null,
     @TarsId(23) @JvmField val stSelfInfo: FriendInfo? = null,
     @TarsId(24) @JvmField val showPcIcon: Byte? = null,
     @TarsId(24) @JvmField val showPcIcon: Byte? = null,
     @TarsId(25) @JvmField val wGetExtSnsRspCode: Short? = null,
     @TarsId(25) @JvmField val wGetExtSnsRspCode: Short? = null,
-    @TarsId(26) @JvmField val stSubSrvRspCode: FriendListSubSrvRspCode? = null
+    @TarsId(26) @JvmField val stSubSrvRspCode: FriendListSubSrvRspCode? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class FriendListSubSrvRspCode(
 internal class FriendListSubSrvRspCode(
     @TarsId(0) @JvmField val wGetMutualMarkRspCode: Short? = null,
     @TarsId(0) @JvmField val wGetMutualMarkRspCode: Short? = null,
-    @TarsId(1) @JvmField val wGetIntimateInfoRspCode: Short? = null
+    @TarsId(1) @JvmField val wGetIntimateInfoRspCode: Short? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -168,7 +168,7 @@ internal class FriendInfo(
     @TarsId(53) @JvmField val showNameplate: Byte? = null,
     @TarsId(53) @JvmField val showNameplate: Byte? = null,
     @TarsId(54) @JvmField val newLoverDiamondFlag: Byte? = null,
     @TarsId(54) @JvmField val newLoverDiamondFlag: Byte? = null,
     @TarsId(55) @JvmField val vecExtSnsFrdData: ByteArray? = null,
     @TarsId(55) @JvmField val vecExtSnsFrdData: ByteArray? = null,
-    @TarsId(56) @JvmField val vecMutualMarkData: ByteArray? = null
+    @TarsId(56) @JvmField val vecMutualMarkData: ByteArray? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -176,7 +176,7 @@ internal class VipBaseInfo(
     @TarsId(0) @JvmField val mOpenInfo: Map<Int, VipOpenInfo>? = null,
     @TarsId(0) @JvmField val mOpenInfo: Map<Int, VipOpenInfo>? = null,
     // 1, 2 are since 8.2.7
     // 1, 2 are since 8.2.7
     @TarsId(1) @JvmField val iNameplateVipType: Int? = 0,
     @TarsId(1) @JvmField val iNameplateVipType: Int? = 0,
-    @TarsId(2) @JvmField val iGrayNameplateFlag: Int? = 0
+    @TarsId(2) @JvmField val iGrayNameplateFlag: Int? = 0,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -185,7 +185,7 @@ internal class VipOpenInfo(
     @TarsId(1) @JvmField val iVipType: Int = -1,
     @TarsId(1) @JvmField val iVipType: Int = -1,
     @TarsId(2) @JvmField val iVipLevel: Int = -1,
     @TarsId(2) @JvmField val iVipLevel: Int = -1,
     @TarsId(3) @JvmField val iVipFlag: Int? = null,
     @TarsId(3) @JvmField val iVipFlag: Int? = null,
-    @TarsId(4) @JvmField val nameplateId: Long? = null
+    @TarsId(4) @JvmField val nameplateId: Long? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -195,6 +195,6 @@ internal class GroupInfo(
     @TarsId(2) @JvmField val friendCount: Int,
     @TarsId(2) @JvmField val friendCount: Int,
     @TarsId(3) @JvmField val onlineFriendCount: Int,
     @TarsId(3) @JvmField val onlineFriendCount: Int,
     @TarsId(4) @JvmField val seqid: Byte? = null,
     @TarsId(4) @JvmField val seqid: Byte? = null,
-    @TarsId(5) @JvmField val sqqOnLineCount: Int? = null
+    @TarsId(5) @JvmField val sqqOnLineCount: Int? = null,
 ) : JceStruct
 ) : JceStruct
 
 

+ 2 - 2
mirai-core/src/commonMain/kotlin/network/protocol/data/jce/GroupMngReq.kt

@@ -31,7 +31,7 @@ internal class GroupMngReqJce(
     @TarsId(13) @JvmField val vecJoinGroupRichMsg: ByteArray? = null,
     @TarsId(13) @JvmField val vecJoinGroupRichMsg: ByteArray? = null,
     @TarsId(14) @JvmField val sJoinGroupAuth: String? = "",
     @TarsId(14) @JvmField val sJoinGroupAuth: String? = "",
     @TarsId(15) @JvmField val sJoinGroupVerifyToken: String? = "",
     @TarsId(15) @JvmField val sJoinGroupVerifyToken: String? = "",
-    @TarsId(16) @JvmField val dwJoinVerifyType: Long? = null
+    @TarsId(16) @JvmField val dwJoinVerifyType: Long? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -47,5 +47,5 @@ internal class GroupMngRes(
     @TarsId(8) @JvmField val sAuthGrpInfo: String? = "",
     @TarsId(8) @JvmField val sAuthGrpInfo: String? = "",
     @TarsId(9) @JvmField val sJoinQuestion: String? = "",
     @TarsId(9) @JvmField val sJoinQuestion: String? = "",
     @TarsId(10) @JvmField val sJoinAnswer: String? = "",
     @TarsId(10) @JvmField val sJoinAnswer: String? = "",
-    @TarsId(11) @JvmField val dwDis2GrpLimitType: Long? = null
+    @TarsId(11) @JvmField val dwDis2GrpLimitType: Long? = null,
 ) : JceStruct
 ) : JceStruct

+ 1 - 1
mirai-core/src/commonMain/kotlin/network/protocol/data/jce/InstanceInfo.kt

@@ -23,5 +23,5 @@ internal data class InstanceInfo(
      * @see ClientKind
      * @see ClientKind
      */
      */
     @JvmField @TarsId(3) val iProductType: Long? = null,
     @JvmField @TarsId(3) val iProductType: Long? = null,
-    @JvmField @TarsId(4) val iClientType: Long? = null
+    @JvmField @TarsId(4) val iClientType: Long? = null,
 ) : JceStruct
 ) : JceStruct

+ 23 - 23
mirai-core/src/commonMain/kotlin/network/protocol/data/jce/MsgType0x210.kt

@@ -18,47 +18,47 @@ import net.mamoe.mirai.utils.EMPTY_BYTE_ARRAY
 internal class AddGroup(
 internal class AddGroup(
     @TarsId(0) @JvmField val dwGroupID: Long? = null,
     @TarsId(0) @JvmField val dwGroupID: Long? = null,
     @TarsId(1) @JvmField val dwSortID: Long? = null,
     @TarsId(1) @JvmField val dwSortID: Long? = null,
-    @TarsId(2) @JvmField val groupName: String? = ""
+    @TarsId(2) @JvmField val groupName: String? = "",
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class DelGroup(
 internal class DelGroup(
-    @TarsId(0) @JvmField val dwGroupID: Long? = null
+    @TarsId(0) @JvmField val dwGroupID: Long? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class FriendGroup(
 internal class FriendGroup(
     @TarsId(0) @JvmField val dwFuin: Long? = null,
     @TarsId(0) @JvmField val dwFuin: Long? = null,
     @TarsId(1) @JvmField val vOldGroupID: List<Long>? = null,
     @TarsId(1) @JvmField val vOldGroupID: List<Long>? = null,
-    @TarsId(2) @JvmField val vNewGroupID: List<Long>? = null
+    @TarsId(2) @JvmField val vNewGroupID: List<Long>? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class GroupSort(
 internal class GroupSort(
     @TarsId(0) @JvmField val dwGroupID: Long? = null,
     @TarsId(0) @JvmField val dwGroupID: Long? = null,
-    @TarsId(1) @JvmField val dwSortID: Long? = null
+    @TarsId(1) @JvmField val dwSortID: Long? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class MarketFaceInfo(
 internal class MarketFaceInfo(
     @TarsId(0) @JvmField val insertIdx: Long,
     @TarsId(0) @JvmField val insertIdx: Long,
-    @TarsId(1) @JvmField val marketFaceBuff: ByteArray
+    @TarsId(1) @JvmField val marketFaceBuff: ByteArray,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class ModFriendGroup(
 internal class ModFriendGroup(
-    @TarsId(0) @JvmField val vMsgFrdGroup: List<FriendGroup>? = null
+    @TarsId(0) @JvmField val vMsgFrdGroup: List<FriendGroup>? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class ModGroupName(
 internal class ModGroupName(
     @TarsId(0) @JvmField val dwGroupID: Long? = null,
     @TarsId(0) @JvmField val dwGroupID: Long? = null,
-    @TarsId(1) @JvmField val groupName: String? = ""
+    @TarsId(1) @JvmField val groupName: String? = "",
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class ModGroupSort(
 internal class ModGroupSort(
-    @TarsId(0) @JvmField val vMsgGroupSort: List<GroupSort>? = null
+    @TarsId(0) @JvmField val vMsgGroupSort: List<GroupSort>? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -72,7 +72,7 @@ internal class MsgType0x210(
     @TarsId(7) @JvmField val stMsgInfo0x20: MsgType0x210SubMsgType0x20? = null,
     @TarsId(7) @JvmField val stMsgInfo0x20: MsgType0x210SubMsgType0x20? = null,
     @TarsId(8) @JvmField val stMsgInfo0x1d: MsgType0x210SubMsgType0x1d? = null,
     @TarsId(8) @JvmField val stMsgInfo0x1d: MsgType0x210SubMsgType0x1d? = null,
     @TarsId(9) @JvmField val stMsgInfo0x24: MsgType0x210SubMsgType0x24? = null,
     @TarsId(9) @JvmField val stMsgInfo0x24: MsgType0x210SubMsgType0x24? = null,
-    @TarsId(10) @JvmField val vProtobuf: ByteArray = EMPTY_BYTE_ARRAY
+    @TarsId(10) @JvmField val vProtobuf: ByteArray = EMPTY_BYTE_ARRAY,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -86,13 +86,13 @@ internal class MsgType0x210SubMsgType0x13(
     @TarsId(6) @JvmField val uint32Size: Long? = null,
     @TarsId(6) @JvmField val uint32Size: Long? = null,
     @TarsId(7) @JvmField val uint32Index: Long? = null,
     @TarsId(7) @JvmField val uint32Index: Long? = null,
     @TarsId(8) @JvmField val uint32Type: Long? = null,
     @TarsId(8) @JvmField val uint32Type: Long? = null,
-    @TarsId(9) @JvmField val buf: ByteArray? = null
+    @TarsId(9) @JvmField val buf: ByteArray? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class MsgType0x210SubMsgType0x13_MsgItem(
 internal class MsgType0x210SubMsgType0x13_MsgItem(
     @TarsId(0) @JvmField val uint32Type: Long? = null,
     @TarsId(0) @JvmField val uint32Type: Long? = null,
-    @TarsId(1) @JvmField val text: ByteArray? = null
+    @TarsId(1) @JvmField val text: ByteArray? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -102,7 +102,7 @@ internal class MsgType0x210SubMsgType0x17(
     @TarsId(2) @JvmField val stDelGroup: DelGroup? = null,
     @TarsId(2) @JvmField val stDelGroup: DelGroup? = null,
     @TarsId(3) @JvmField val stModGroupName: ModGroupName? = null,
     @TarsId(3) @JvmField val stModGroupName: ModGroupName? = null,
     @TarsId(4) @JvmField val stModGroupSort: ModGroupSort? = null,
     @TarsId(4) @JvmField val stModGroupSort: ModGroupSort? = null,
-    @TarsId(5) @JvmField val stModFriendGroup: ModFriendGroup? = null
+    @TarsId(5) @JvmField val stModFriendGroup: ModFriendGroup? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -110,7 +110,7 @@ internal class MsgType0x210SubMsgType0x1d(
     @TarsId(0) @JvmField val dwOpType: Long? = null,
     @TarsId(0) @JvmField val dwOpType: Long? = null,
     @TarsId(1) @JvmField val dwUin: Long? = null,
     @TarsId(1) @JvmField val dwUin: Long? = null,
     @TarsId(2) @JvmField val dwID: Long? = null,
     @TarsId(2) @JvmField val dwID: Long? = null,
-    @TarsId(3) @JvmField val value: String? = ""
+    @TarsId(3) @JvmField val value: String? = "",
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -130,7 +130,7 @@ internal class MsgType0x210SubMsgType0x2(
     @TarsId(12) @JvmField val sessionId: Long? = null,
     @TarsId(12) @JvmField val sessionId: Long? = null,
     @TarsId(13) @JvmField val originfileMd5: ByteArray? = null,
     @TarsId(13) @JvmField val originfileMd5: ByteArray? = null,
     @TarsId(14) @JvmField val uOriginfiletype: Long? = null,
     @TarsId(14) @JvmField val uOriginfiletype: Long? = null,
-    @TarsId(15) @JvmField val uSeq: Long? = null
+    @TarsId(15) @JvmField val uSeq: Long? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -138,12 +138,12 @@ internal class MsgType0x210SubMsgType0x20(
     @TarsId(0) @JvmField val dwOpType: Long? = null,
     @TarsId(0) @JvmField val dwOpType: Long? = null,
     @TarsId(1) @JvmField val dwType: Long? = null,
     @TarsId(1) @JvmField val dwType: Long? = null,
     @TarsId(2) @JvmField val dwUin: Long? = null,
     @TarsId(2) @JvmField val dwUin: Long? = null,
-    @TarsId(3) @JvmField val remaek: String? = ""
+    @TarsId(3) @JvmField val remaek: String? = "",
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class MsgType0x210SubMsgType0x24(
 internal class MsgType0x210SubMsgType0x24(
-    @TarsId(0) @JvmField val vPluginNumList: List<PluginNum>? = null
+    @TarsId(0) @JvmField val vPluginNumList: List<PluginNum>? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -164,7 +164,7 @@ internal class MsgType0x210SubMsgType0xa(
     @TarsId(13) @JvmField val sessionId: Long? = null,
     @TarsId(13) @JvmField val sessionId: Long? = null,
     @TarsId(14) @JvmField val originfileMd5: ByteArray? = null,
     @TarsId(14) @JvmField val originfileMd5: ByteArray? = null,
     @TarsId(15) @JvmField val uOriginfiletype: Long? = null,
     @TarsId(15) @JvmField val uOriginfiletype: Long? = null,
-    @TarsId(16) @JvmField val uSeq: Long? = null
+    @TarsId(16) @JvmField val uSeq: Long? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -178,25 +178,25 @@ internal class MsgType0x210SubMsgType0xe(
     @TarsId(6) @JvmField val uint32Operate: Long? = null,
     @TarsId(6) @JvmField val uint32Operate: Long? = null,
     @TarsId(7) @JvmField val uint32Seq: Long? = null,
     @TarsId(7) @JvmField val uint32Seq: Long? = null,
     @TarsId(8) @JvmField val uint32Code: Long? = null,
     @TarsId(8) @JvmField val uint32Code: Long? = null,
-    @TarsId(9) @JvmField val msg: String? = ""
+    @TarsId(9) @JvmField val msg: String? = "",
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class PersonInfoChange(
 internal class PersonInfoChange(
     @TarsId(0) @JvmField val type: Byte? = null,
     @TarsId(0) @JvmField val type: Byte? = null,
-    @TarsId(1) @JvmField val vChgField: List<PersonInfoField>? = null
+    @TarsId(1) @JvmField val vChgField: List<PersonInfoField>? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class PersonInfoField(
 internal class PersonInfoField(
-    @TarsId(0) @JvmField val uField: Long? = null
+    @TarsId(0) @JvmField val uField: Long? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class PluginNum(
 internal class PluginNum(
     @TarsId(0) @JvmField val dwID: Long? = null,
     @TarsId(0) @JvmField val dwID: Long? = null,
     @TarsId(1) @JvmField val dwNUm: Long? = null,
     @TarsId(1) @JvmField val dwNUm: Long? = null,
-    @TarsId(2) @JvmField val flag: Byte? = null
+    @TarsId(2) @JvmField val flag: Byte? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -214,11 +214,11 @@ internal class SlaveMasterMsg(
     @TarsId(10) @JvmField val uLastChangeTime: Long? = null,
     @TarsId(10) @JvmField val uLastChangeTime: Long? = null,
     @TarsId(11) @JvmField val vReserved: ByteArray? = null,
     @TarsId(11) @JvmField val vReserved: ByteArray? = null,
     @TarsId(12) @JvmField val vMarketFace: List<MarketFaceInfo>? = null,
     @TarsId(12) @JvmField val vMarketFace: List<MarketFaceInfo>? = null,
-    @TarsId(13) @JvmField val uSuperQQBubbleId: Long? = null
+    @TarsId(13) @JvmField val uSuperQQBubbleId: Long? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class Type_1_QQDataTextMsg(
 internal class Type_1_QQDataTextMsg(
-    @TarsId(0) @JvmField val msgItem: List<MsgType0x210SubMsgType0x13_MsgItem>? = null
+    @TarsId(0) @JvmField val msgItem: List<MsgType0x210SubMsgType0x13_MsgItem>? = null,
 ) : JceStruct
 ) : JceStruct
 
 

+ 23 - 23
mirai-core/src/commonMain/kotlin/network/protocol/data/jce/OnlinePushPack.kt

@@ -26,7 +26,7 @@ internal class OnlinePushPack {
         @TarsId(7) @JvmField val sendTime: Long? = null,
         @TarsId(7) @JvmField val sendTime: Long? = null,
         @TarsId(8) @JvmField val ssoSeq: Int? = null,
         @TarsId(8) @JvmField val ssoSeq: Int? = null,
         @TarsId(9) @JvmField val ssoIp: Int? = null,
         @TarsId(9) @JvmField val ssoIp: Int? = null,
-        @TarsId(10) @JvmField val clientIp: Int? = null
+        @TarsId(10) @JvmField val clientIp: Int? = null,
     ) : JceStruct
     ) : JceStruct
 
 
     @Serializable
     @Serializable
@@ -36,7 +36,7 @@ internal class OnlinePushPack {
         @TarsId(2) @JvmField val oSVer: String? = "",
         @TarsId(2) @JvmField val oSVer: String? = "",
         @TarsId(3) @JvmField val vendorName: String? = "",
         @TarsId(3) @JvmField val vendorName: String? = "",
         @TarsId(4) @JvmField val vendorOSName: String? = "",
         @TarsId(4) @JvmField val vendorOSName: String? = "",
-        @TarsId(5) @JvmField val iOSIdfa: String? = ""
+        @TarsId(5) @JvmField val iOSIdfa: String? = "",
     ) : JceStruct
     ) : JceStruct
 
 
     @Serializable
     @Serializable
@@ -60,7 +60,7 @@ internal class OnlinePushPack {
         @TarsId(16) @JvmField val fromMobile: String? = "",
         @TarsId(16) @JvmField val fromMobile: String? = "",
         @TarsId(17) @JvmField val fromName: String? = "",
         @TarsId(17) @JvmField val fromName: String? = "",
         @TarsId(18) @JvmField val vNickName: List<String>? = null,
         @TarsId(18) @JvmField val vNickName: List<String>? = null,
-        @TarsId(19) @JvmField val stC2CTmpMsgHead: TempMsgHead? = null
+        @TarsId(19) @JvmField val stC2CTmpMsgHead: TempMsgHead? = null,
     ) : JceStruct
     ) : JceStruct
 
 
     @Serializable
     @Serializable
@@ -71,7 +71,7 @@ internal class OnlinePushPack {
         @TarsId(3) @JvmField val svrip: Int? = 0,
         @TarsId(3) @JvmField val svrip: Int? = 0,
         @TarsId(4) @JvmField val vSyncCookie: ByteArray? = null,
         @TarsId(4) @JvmField val vSyncCookie: ByteArray? = null,
         @TarsId(5) @JvmField val vUinPairMsg: List<UinPairMsg>? = null,
         @TarsId(5) @JvmField val vUinPairMsg: List<UinPairMsg>? = null,
-        @TarsId(6) @JvmField val mPreviews: Map<String, ByteArray>? = null
+        @TarsId(6) @JvmField val mPreviews: Map<String, ByteArray>? = null,
         // @SerialId(7) @JvmField val wUserActive: Int? = null,
         // @SerialId(7) @JvmField val wUserActive: Int? = null,
         //@SerialId(12) @JvmField val wGeneralFlag: Int? = null
         //@SerialId(12) @JvmField val wGeneralFlag: Int? = null
     ) : JceStruct
     ) : JceStruct
@@ -83,7 +83,7 @@ internal class OnlinePushPack {
         @TarsId(2) @JvmField val svrip: Int = 0,
         @TarsId(2) @JvmField val svrip: Int = 0,
         @TarsId(3) @JvmField val pushToken: ByteArray? = null,
         @TarsId(3) @JvmField val pushToken: ByteArray? = null,
         @TarsId(4) @JvmField val serviceType: Int? = null,
         @TarsId(4) @JvmField val serviceType: Int? = null,
-        @TarsId(5) @JvmField val deviceInfo: DeviceInfo? = null
+        @TarsId(5) @JvmField val deviceInfo: DeviceInfo? = null,
     ) : JceStruct
     ) : JceStruct
 
 
     @Serializable
     @Serializable
@@ -91,7 +91,7 @@ internal class OnlinePushPack {
         @TarsId(1) @JvmField val uLastReadTime: Long? = null,
         @TarsId(1) @JvmField val uLastReadTime: Long? = null,
         @TarsId(2) @JvmField val peerUin: Long? = null,
         @TarsId(2) @JvmField val peerUin: Long? = null,
         @TarsId(3) @JvmField val uMsgCompleted: Long? = null,
         @TarsId(3) @JvmField val uMsgCompleted: Long? = null,
-        @TarsId(4) @JvmField val vMsgInfos: List<MsgInfo>? = null
+        @TarsId(4) @JvmField val vMsgInfos: List<MsgInfo>? = null,
     ) : JceStruct
     ) : JceStruct
 
 
     @Serializable
     @Serializable
@@ -105,7 +105,7 @@ internal class OnlinePushPack {
         @TarsId(7) @JvmField val stMsgInfo0x20: MsgType0x210SubMsgType0x20? = null,
         @TarsId(7) @JvmField val stMsgInfo0x20: MsgType0x210SubMsgType0x20? = null,
         @TarsId(8) @JvmField val stMsgInfo0x1d: MsgType0x210SubMsgType0x1d? = null,
         @TarsId(8) @JvmField val stMsgInfo0x1d: MsgType0x210SubMsgType0x1d? = null,
         @TarsId(9) @JvmField val stMsgInfo0x24: MsgType0x210SubMsgType0x24? = null,
         @TarsId(9) @JvmField val stMsgInfo0x24: MsgType0x210SubMsgType0x24? = null,
-        @TarsId(10) @JvmField val vProtobuf: ByteArray? = null
+        @TarsId(10) @JvmField val vProtobuf: ByteArray? = null,
     ) : JceStruct
     ) : JceStruct
 
 
     @Serializable
     @Serializable
@@ -119,7 +119,7 @@ internal class OnlinePushPack {
         @TarsId(6) @JvmField val uint32Size: Long? = null,
         @TarsId(6) @JvmField val uint32Size: Long? = null,
         @TarsId(7) @JvmField val uint32Index: Long? = null,
         @TarsId(7) @JvmField val uint32Index: Long? = null,
         @TarsId(8) @JvmField val uint32Type: Long? = null,
         @TarsId(8) @JvmField val uint32Type: Long? = null,
-        @TarsId(9) @JvmField val buf: ByteArray? = null
+        @TarsId(9) @JvmField val buf: ByteArray? = null,
     ) : JceStruct
     ) : JceStruct
 
 
     @Serializable
     @Serializable
@@ -129,48 +129,48 @@ internal class OnlinePushPack {
         @TarsId(2) @JvmField val stDelGroup: DelGroup? = null,
         @TarsId(2) @JvmField val stDelGroup: DelGroup? = null,
         @TarsId(3) @JvmField val stModGroupName: ModGroupName? = null,
         @TarsId(3) @JvmField val stModGroupName: ModGroupName? = null,
         @TarsId(4) @JvmField val stModGroupSort: ModGroupSort? = null,
         @TarsId(4) @JvmField val stModGroupSort: ModGroupSort? = null,
-        @TarsId(5) @JvmField val stModFriendGroup: ModFriendGroup? = null
+        @TarsId(5) @JvmField val stModFriendGroup: ModFriendGroup? = null,
     ) : JceStruct
     ) : JceStruct
 
 
     @Serializable
     @Serializable
     internal class AddGroup(
     internal class AddGroup(
         @TarsId(0) @JvmField val dwGroupID: Long? = null,
         @TarsId(0) @JvmField val dwGroupID: Long? = null,
         @TarsId(1) @JvmField val dwSortID: Long? = null,
         @TarsId(1) @JvmField val dwSortID: Long? = null,
-        @TarsId(2) @JvmField val groupName: String? = ""
+        @TarsId(2) @JvmField val groupName: String? = "",
     ) : JceStruct
     ) : JceStruct
 
 
     @Serializable
     @Serializable
     internal class DelGroup(
     internal class DelGroup(
-        @TarsId(0) @JvmField val dwGroupID: Long? = null
+        @TarsId(0) @JvmField val dwGroupID: Long? = null,
     ) : JceStruct
     ) : JceStruct
 
 
     @Serializable
     @Serializable
     internal class ModFriendGroup(
     internal class ModFriendGroup(
-        @TarsId(0) @JvmField val vMsgFrdGroup: List<FriendGroup>? = null
+        @TarsId(0) @JvmField val vMsgFrdGroup: List<FriendGroup>? = null,
     ) : JceStruct
     ) : JceStruct
 
 
     @Serializable
     @Serializable
     internal class FriendGroup(
     internal class FriendGroup(
         @TarsId(0) @JvmField val dwFuin: Long? = null,
         @TarsId(0) @JvmField val dwFuin: Long? = null,
         @TarsId(1) @JvmField val vOldGroupID: List<Long>? = null,
         @TarsId(1) @JvmField val vOldGroupID: List<Long>? = null,
-        @TarsId(2) @JvmField val vNewGroupID: List<Long>? = null
+        @TarsId(2) @JvmField val vNewGroupID: List<Long>? = null,
     ) : JceStruct
     ) : JceStruct
 
 
     @Serializable
     @Serializable
     internal class ModGroupName(
     internal class ModGroupName(
         @TarsId(0) @JvmField val dwGroupID: Long? = null,
         @TarsId(0) @JvmField val dwGroupID: Long? = null,
-        @TarsId(1) @JvmField val groupName: String? = ""
+        @TarsId(1) @JvmField val groupName: String? = "",
     ) : JceStruct
     ) : JceStruct
 
 
     @Serializable
     @Serializable
     internal class ModGroupSort(
     internal class ModGroupSort(
-        @TarsId(0) @JvmField val vMsgGroupSort: List<GroupSort>? = null
+        @TarsId(0) @JvmField val vMsgGroupSort: List<GroupSort>? = null,
     ) : JceStruct
     ) : JceStruct
 
 
     @Serializable
     @Serializable
     internal class GroupSort(
     internal class GroupSort(
         @TarsId(0) @JvmField val dwGroupID: Long? = null,
         @TarsId(0) @JvmField val dwGroupID: Long? = null,
-        @TarsId(1) @JvmField val dwSortID: Long? = null
+        @TarsId(1) @JvmField val dwSortID: Long? = null,
     ) : JceStruct
     ) : JceStruct
 
 
     @Serializable
     @Serializable
@@ -178,7 +178,7 @@ internal class OnlinePushPack {
         @TarsId(0) @JvmField val dwOpType: Long? = null,
         @TarsId(0) @JvmField val dwOpType: Long? = null,
         @TarsId(1) @JvmField val dwUin: Long? = null,
         @TarsId(1) @JvmField val dwUin: Long? = null,
         @TarsId(2) @JvmField val dwID: Long? = null,
         @TarsId(2) @JvmField val dwID: Long? = null,
-        @TarsId(3) @JvmField val value: String? = ""
+        @TarsId(3) @JvmField val value: String? = "",
     ) : JceStruct
     ) : JceStruct
 
 
     @Serializable
     @Serializable
@@ -198,7 +198,7 @@ internal class OnlinePushPack {
         @TarsId(12) @JvmField val sessionId: Long? = null,
         @TarsId(12) @JvmField val sessionId: Long? = null,
         @TarsId(13) @JvmField val originfileMd5: ByteArray? = null,
         @TarsId(13) @JvmField val originfileMd5: ByteArray? = null,
         @TarsId(14) @JvmField val uOriginfiletype: Long? = null,
         @TarsId(14) @JvmField val uOriginfiletype: Long? = null,
-        @TarsId(15) @JvmField val uSeq: Long? = null
+        @TarsId(15) @JvmField val uSeq: Long? = null,
     ) : JceStruct
     ) : JceStruct
 
 
     @Serializable
     @Serializable
@@ -206,19 +206,19 @@ internal class OnlinePushPack {
         @TarsId(0) @JvmField val dwOpType: Long? = null,
         @TarsId(0) @JvmField val dwOpType: Long? = null,
         @TarsId(1) @JvmField val dwType: Long? = null,
         @TarsId(1) @JvmField val dwType: Long? = null,
         @TarsId(2) @JvmField val dwUin: Long? = null,
         @TarsId(2) @JvmField val dwUin: Long? = null,
-        @TarsId(3) @JvmField val remaek: String? = ""
+        @TarsId(3) @JvmField val remaek: String? = "",
     ) : JceStruct
     ) : JceStruct
 
 
     @Serializable
     @Serializable
     internal class MsgType0x210SubMsgType0x24(
     internal class MsgType0x210SubMsgType0x24(
-        @TarsId(0) @JvmField val vPluginNumList: List<PluginNum>? = null
+        @TarsId(0) @JvmField val vPluginNumList: List<PluginNum>? = null,
     ) : JceStruct
     ) : JceStruct
 
 
     @Serializable
     @Serializable
     internal class PluginNum(
     internal class PluginNum(
         @TarsId(0) @JvmField val dwID: Long? = null,
         @TarsId(0) @JvmField val dwID: Long? = null,
         @TarsId(1) @JvmField val dwNUm: Long? = null,
         @TarsId(1) @JvmField val dwNUm: Long? = null,
-        @TarsId(2) @JvmField val flag: Byte? = null
+        @TarsId(2) @JvmField val flag: Byte? = null,
     ) : JceStruct
     ) : JceStruct
 
 
     @Serializable
     @Serializable
@@ -239,7 +239,7 @@ internal class OnlinePushPack {
         @TarsId(13) @JvmField val sessionId: Long? = null,
         @TarsId(13) @JvmField val sessionId: Long? = null,
         @TarsId(14) @JvmField val originfileMd5: ByteArray? = null,
         @TarsId(14) @JvmField val originfileMd5: ByteArray? = null,
         @TarsId(15) @JvmField val uOriginfiletype: Long? = null,
         @TarsId(15) @JvmField val uOriginfiletype: Long? = null,
-        @TarsId(16) @JvmField val uSeq: Long? = null
+        @TarsId(16) @JvmField val uSeq: Long? = null,
     ) : JceStruct
     ) : JceStruct
 
 
     @Serializable
     @Serializable
@@ -253,6 +253,6 @@ internal class OnlinePushPack {
         @TarsId(6) @JvmField val uint32Operate: Long? = null,
         @TarsId(6) @JvmField val uint32Operate: Long? = null,
         @TarsId(7) @JvmField val uint32Seq: Long? = null,
         @TarsId(7) @JvmField val uint32Seq: Long? = null,
         @TarsId(8) @JvmField val uint32Code: Long? = null,
         @TarsId(8) @JvmField val uint32Code: Long? = null,
-        @TarsId(9) @JvmField val msg: String? = ""
+        @TarsId(9) @JvmField val msg: String? = "",
     ) : JceStruct
     ) : JceStruct
 }
 }

+ 5 - 5
mirai-core/src/commonMain/kotlin/network/protocol/data/jce/PushNotifyPack.kt

@@ -31,7 +31,7 @@ internal class RequestPushNotify(
     @TarsId(10) @JvmField val msgCtrlBuf: String?,
     @TarsId(10) @JvmField val msgCtrlBuf: String?,
     @TarsId(11) @JvmField val serverBuf: ByteArray?,
     @TarsId(11) @JvmField val serverBuf: ByteArray?,
     @TarsId(12) @JvmField val pingFlag: Long?,
     @TarsId(12) @JvmField val pingFlag: Long?,
-    @TarsId(13) @JvmField val svrip: Int?
+    @TarsId(13) @JvmField val svrip: Int?,
 ) : JceStruct, Packet {
 ) : JceStruct, Packet {
     override fun toString(): String {
     override fun toString(): String {
         return "RequestPushNotify(usMsgType=$usMsgType)"
         return "RequestPushNotify(usMsgType=$usMsgType)"
@@ -58,7 +58,7 @@ internal class MsgInfo(
     @TarsId(15) @JvmField val vRemarkOfSender: ByteArray?,
     @TarsId(15) @JvmField val vRemarkOfSender: ByteArray?,
     @TarsId(16) @JvmField val strFromMobile: String?,
     @TarsId(16) @JvmField val strFromMobile: String?,
     @TarsId(17) @JvmField val strFromName: String?,
     @TarsId(17) @JvmField val strFromName: String?,
-    @TarsId(18) @JvmField val vNickName: List<String>?//,
+    @TarsId(18) @JvmField val vNickName: List<String>?, //,
     //@SerialId(19) @JvmField val stC2CTmpMsgHead: TempMsgHead?
     //@SerialId(19) @JvmField val stC2CTmpMsgHead: TempMsgHead?
 ) : JceStruct
 ) : JceStruct
 
 
@@ -68,17 +68,17 @@ internal class ShareData(
     @TarsId(0) @JvmField val pkgname: String = "",
     @TarsId(0) @JvmField val pkgname: String = "",
     @TarsId(1) @JvmField val msgtail: String = "",
     @TarsId(1) @JvmField val msgtail: String = "",
     @TarsId(2) @JvmField val picurl: String = "",
     @TarsId(2) @JvmField val picurl: String = "",
-    @TarsId(3) @JvmField val url: String = ""
+    @TarsId(3) @JvmField val url: String = "",
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class TempMsgHead(
 internal class TempMsgHead(
     @TarsId(0) @JvmField val c2c_type: Int? = 0,
     @TarsId(0) @JvmField val c2c_type: Int? = 0,
-    @TarsId(1) @JvmField val serviceType: Int? = 0
+    @TarsId(1) @JvmField val serviceType: Int? = 0,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class CPicInfo(
 internal class CPicInfo(
     @TarsId(0) @JvmField val vPath: ByteArray = EMPTY_BYTE_ARRAY,
     @TarsId(0) @JvmField val vPath: ByteArray = EMPTY_BYTE_ARRAY,
-    @TarsId(1) @JvmField val vHost: ByteArray? = EMPTY_BYTE_ARRAY
+    @TarsId(1) @JvmField val vHost: ByteArray? = EMPTY_BYTE_ARRAY,
 ) : JceStruct
 ) : JceStruct

+ 1 - 1
mirai-core/src/commonMain/kotlin/network/protocol/data/jce/ReqPushStatus.kt

@@ -24,7 +24,7 @@ internal class RequestPushStatus(
     @JvmField @TarsId(5) val nPCVer: Long? = null,
     @JvmField @TarsId(5) val nPCVer: Long? = null,
     @JvmField @TarsId(6) val nClientType: Long? = null,
     @JvmField @TarsId(6) val nClientType: Long? = null,
     @JvmField @TarsId(7) val nInstanceId: Long? = null,
     @JvmField @TarsId(7) val nInstanceId: Long? = null,
-    @JvmField @TarsId(8) val vecInstanceList: List<InstanceInfo>? = null
+    @JvmField @TarsId(8) val vecInstanceList: List<InstanceInfo>? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 
 

+ 37 - 37
mirai-core/src/commonMain/kotlin/network/protocol/data/jce/ReqSummaryCard.kt

@@ -16,7 +16,7 @@ import net.mamoe.mirai.internal.utils.io.serialization.tars.TarsId
 
 
 @Serializable
 @Serializable
 internal class ReqHead(
 internal class ReqHead(
-    @JvmField @TarsId(0) val iVersion: Int = 1
+    @JvmField @TarsId(0) val iVersion: Int = 1,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -53,19 +53,19 @@ internal class RespHead(
     @JvmField @TarsId(0) val iVersion: Int,
     @JvmField @TarsId(0) val iVersion: Int,
     @JvmField @TarsId(1) val iResult: Int,
     @JvmField @TarsId(1) val iResult: Int,
     @JvmField @TarsId(2) val errorMsg: String = "",
     @JvmField @TarsId(2) val errorMsg: String = "",
-    @JvmField @TarsId(3) val vCookies: ByteArray? = null
+    @JvmField @TarsId(3) val vCookies: ByteArray? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class RespSearch(
 internal class RespSearch(
     @JvmField @TarsId(0) val vRecords: List<SearchInfo>,
     @JvmField @TarsId(0) val vRecords: List<SearchInfo>,
     @JvmField @TarsId(1) val vSecureSig: ByteArray? = null,
     @JvmField @TarsId(1) val vSecureSig: ByteArray? = null,
-    @JvmField @TarsId(2) val vvRespServices: List<ByteArray>? = null
+    @JvmField @TarsId(2) val vvRespServices: List<ByteArray>? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class RespSummaryCard(
 internal class RespSummaryCard(
-//    @JvmField @TarsId(0) val iFace: Int? = null,
+    //    @JvmField @TarsId(0) val iFace: Int? = null,
     @JvmField @TarsId(1) val sex: Byte? = null,
     @JvmField @TarsId(1) val sex: Byte? = null,
     @JvmField @TarsId(2) val age: Byte? = null,
     @JvmField @TarsId(2) val age: Byte? = null,
     @JvmField @TarsId(3) val nick: String? = "",
     @JvmField @TarsId(3) val nick: String? = "",
@@ -80,7 +80,7 @@ internal class RespSummaryCard(
     @JvmField @TarsId(12) val contactName: String? = "",
     @JvmField @TarsId(12) val contactName: String? = "",
     @JvmField @TarsId(13) val ulShowControl: Long? = null,
     @JvmField @TarsId(13) val ulShowControl: Long? = null,
     @JvmField @TarsId(14) val qzoneFeedsDesc: String? = "",
     @JvmField @TarsId(14) val qzoneFeedsDesc: String? = "",
-//    @JvmField @TarsId(15)  val oLatestPhotos:AlbumInfo? = null,
+    //    @JvmField @TarsId(15)  val oLatestPhotos:AlbumInfo? = null,
     @JvmField @TarsId(16) val iVoteCount: Int? = null,
     @JvmField @TarsId(16) val iVoteCount: Int? = null,
     @JvmField @TarsId(17) val iLastestVoteCount: Int? = null,
     @JvmField @TarsId(17) val iLastestVoteCount: Int? = null,
     @JvmField @TarsId(18) val valid4Vote: Byte? = null,
     @JvmField @TarsId(18) val valid4Vote: Byte? = null,
@@ -113,20 +113,20 @@ internal class RespSummaryCard(
     @JvmField @TarsId(45) val uAccelerateMultiple: Long? = null,
     @JvmField @TarsId(45) val uAccelerateMultiple: Long? = null,
     @JvmField @TarsId(46) val vvRespServices: List<ByteArray>? = null,
     @JvmField @TarsId(46) val vvRespServices: List<ByteArray>? = null,
     @JvmField @TarsId(47) val spaceName: String? = "",
     @JvmField @TarsId(47) val spaceName: String? = "",
-//    @JvmField @TarsId(48)  val stDateCard:DateCard? = null,
+    //    @JvmField @TarsId(48)  val stDateCard:DateCard? = null,
     @JvmField @TarsId(49) val iBirthday: Int? = null,
     @JvmField @TarsId(49) val iBirthday: Int? = null,
-//    @JvmField @TarsId(50)  val stQCallInfo:QCallInfo? = null,
-//    @JvmField @TarsId(51)  val stGiftInfo:GiftInfo? = null,
-//    @JvmField @TarsId(52)  val stPanSocialInfo:PanSocialInfo? = null,
-//    @JvmField @TarsId(53)  val stVideoInfo:QQVideoInfo? = null,
+    //    @JvmField @TarsId(50)  val stQCallInfo:QCallInfo? = null,
+    //    @JvmField @TarsId(51)  val stGiftInfo:GiftInfo? = null,
+    //    @JvmField @TarsId(52)  val stPanSocialInfo:PanSocialInfo? = null,
+    //    @JvmField @TarsId(53)  val stVideoInfo:QQVideoInfo? = null,
     @JvmField @TarsId(54) val vTempChatSig: ByteArray? = null,
     @JvmField @TarsId(54) val vTempChatSig: ByteArray? = null,
-//    @JvmField @TarsId(55)  val stInterestTag:InterestTagInfo? = null,
-//    @JvmField @TarsId(56) val stUserFeed: UserFeed? = null,
-//    @JvmField @TarsId(57)  val stQiqiVideoInfo:QiqiVideoInfo? = null,
-//    @JvmField @TarsId(58)  val stPrivInfo:PrivilegeBaseInfo? = null,
-//    @JvmField @TarsId(59)  val stApollo:QQApolloInfo? = null,
-//    @JvmField @TarsId(60)  val stAddFrdSrcInfo:AddFrdSrcInfo? = null,
-//    @JvmField @TarsId(61)  val stBindPhoneInfo:BindPhoneInfo? = null,
+    //    @JvmField @TarsId(55)  val stInterestTag:InterestTagInfo? = null,
+    //    @JvmField @TarsId(56) val stUserFeed: UserFeed? = null,
+    //    @JvmField @TarsId(57)  val stQiqiVideoInfo:QiqiVideoInfo? = null,
+    //    @JvmField @TarsId(58)  val stPrivInfo:PrivilegeBaseInfo? = null,
+    //    @JvmField @TarsId(59)  val stApollo:QQApolloInfo? = null,
+    //    @JvmField @TarsId(60)  val stAddFrdSrcInfo:AddFrdSrcInfo? = null,
+    //    @JvmField @TarsId(61)  val stBindPhoneInfo:BindPhoneInfo? = null,
     @JvmField @TarsId(62) val vVisitingCardInfo: ByteArray? = null,
     @JvmField @TarsId(62) val vVisitingCardInfo: ByteArray? = null,
     @JvmField @TarsId(63) val voteLimitedNotice: String? = "",
     @JvmField @TarsId(63) val voteLimitedNotice: String? = "",
     @JvmField @TarsId(64) val haveVotedCnt: Short? = null,
     @JvmField @TarsId(64) val haveVotedCnt: Short? = null,
@@ -137,13 +137,13 @@ internal class RespSummaryCard(
     @JvmField @TarsId(69) val uCareer: Long? = null,
     @JvmField @TarsId(69) val uCareer: Long? = null,
     @JvmField @TarsId(70) val personal: String? = "",
     @JvmField @TarsId(70) val personal: String? = "",
     @JvmField @TarsId(71) val vHotChatInfo: ByteArray? = null,
     @JvmField @TarsId(71) val vHotChatInfo: ByteArray? = null,
-//    @JvmField @TarsId(72)  val stOlympicInfo:OlympicInfo? = null,
+    //    @JvmField @TarsId(72)  val stOlympicInfo:OlympicInfo? = null,
     @JvmField @TarsId(73) val stCoverInfo: TCoverInfo? = null,
     @JvmField @TarsId(73) val stCoverInfo: TCoverInfo? = null,
     @JvmField @TarsId(74) val stNowBroadcastInfo: TNowBroadcastInfo? = null,
     @JvmField @TarsId(74) val stNowBroadcastInfo: TNowBroadcastInfo? = null,
-//    @JvmField @TarsId(75)  val stEimInfo:TEIMInfo? = null,
+    //    @JvmField @TarsId(75)  val stEimInfo:TEIMInfo? = null,
     @JvmField @TarsId(78) val stVideoHeadInfo: TVideoHeadInfo? = null,
     @JvmField @TarsId(78) val stVideoHeadInfo: TVideoHeadInfo? = null,
     @JvmField @TarsId(79) val iContactNotBindQQ: Int? = null,
     @JvmField @TarsId(79) val iContactNotBindQQ: Int? = null,
-//    @JvmField @TarsId(80)  val stMedalWallInfo:TMedalWallInfo? = null,
+    //    @JvmField @TarsId(80)  val stMedalWallInfo:TMedalWallInfo? = null,
     @JvmField @TarsId(81) val vvRespServicesBigOrder: List<ByteArray>? = null,
     @JvmField @TarsId(81) val vvRespServicesBigOrder: List<ByteArray>? = null,
     @JvmField @TarsId(82) val vResp0x5ebInfo: ByteArray? = null,
     @JvmField @TarsId(82) val vResp0x5ebInfo: ByteArray? = null,
     @JvmField @TarsId(83) val stNearbyGodInfo: TNearbyGodInfo? = null,
     @JvmField @TarsId(83) val stNearbyGodInfo: TNearbyGodInfo? = null,
@@ -153,7 +153,7 @@ internal class RespSummaryCard(
     @JvmField @TarsId(87) val stCampusCircleInfo: TCampusCircleInfo? = null,
     @JvmField @TarsId(87) val stCampusCircleInfo: TCampusCircleInfo? = null,
     @JvmField @TarsId(88) val stTimInfo: TTimInfo? = null,
     @JvmField @TarsId(88) val stTimInfo: TTimInfo? = null,
     @JvmField @TarsId(89) val stQimInfo: TQimInfo? = null,
     @JvmField @TarsId(89) val stQimInfo: TQimInfo? = null,
-//    @JvmField @TarsId(90)  val stHeartInfo:HeartInfo? = null,
+    //    @JvmField @TarsId(90)  val stHeartInfo:HeartInfo? = null,
     @JvmField @TarsId(91) val vQzoneCoverInfo: ByteArray? = null,
     @JvmField @TarsId(91) val vQzoneCoverInfo: ByteArray? = null,
     @JvmField @TarsId(92) val vNearbyTaskInfo: ByteArray? = null,
     @JvmField @TarsId(92) val vNearbyTaskInfo: ByteArray? = null,
     @JvmField @TarsId(93) val vNowInfo: ByteArray? = null,
     @JvmField @TarsId(93) val vNowInfo: ByteArray? = null,
@@ -163,15 +163,15 @@ internal class RespSummaryCard(
     @JvmField @TarsId(97) val qzoneHeader: String? = "",
     @JvmField @TarsId(97) val qzoneHeader: String? = "",
     @JvmField @TarsId(98) val mapQzoneEx: Map<String, String>? = null,
     @JvmField @TarsId(98) val mapQzoneEx: Map<String, String>? = null,
     @JvmField @TarsId(99) val vRespKandianInfo: ByteArray? = null,
     @JvmField @TarsId(99) val vRespKandianInfo: ByteArray? = null,
-//    @JvmField @TarsId(100) val stWeishiInfo:WeishiInfo? = null,
+    //    @JvmField @TarsId(100) val stWeishiInfo:WeishiInfo? = null,
     @JvmField @TarsId(101) val uRichCardNameVer: Long? = null,
     @JvmField @TarsId(101) val uRichCardNameVer: Long? = null,
     @JvmField @TarsId(102) val uCurMulType: Long? = null,
     @JvmField @TarsId(102) val uCurMulType: Long? = null,
-    @JvmField @TarsId(103) val vLongNickTopicInfo: ByteArray? = null
+    @JvmField @TarsId(103) val vLongNickTopicInfo: ByteArray? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class RespVoiceManage(
 internal class RespVoiceManage(
-    @JvmField @TarsId(0) val eOpType: Int
+    @JvmField @TarsId(0) val eOpType: Int,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -182,7 +182,7 @@ internal class SearchInfo(
     @JvmField @TarsId(3) val mobile: String? = "",
     @JvmField @TarsId(3) val mobile: String? = "",
     @JvmField @TarsId(4) val isFriend: Byte? = null,
     @JvmField @TarsId(4) val isFriend: Byte? = null,
     @JvmField @TarsId(5) val inContact: Byte? = null,
     @JvmField @TarsId(5) val inContact: Byte? = null,
-    @JvmField @TarsId(6) val isEnterpriseQQ: Byte? = null
+    @JvmField @TarsId(6) val isEnterpriseQQ: Byte? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -191,26 +191,26 @@ internal class TCampusCircleInfo(
     @JvmField @TarsId(1) val name: String? = "",
     @JvmField @TarsId(1) val name: String? = "",
     @JvmField @TarsId(2) val academy: String? = "",
     @JvmField @TarsId(2) val academy: String? = "",
     @JvmField @TarsId(3) val eStatus: Int? = null,
     @JvmField @TarsId(3) val eStatus: Int? = null,
-    @JvmField @TarsId(4) val stSchoolInfo: TCampusSchoolInfo? = null
+    @JvmField @TarsId(4) val stSchoolInfo: TCampusSchoolInfo? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class TCampusSchoolInfo(
 internal class TCampusSchoolInfo(
     @JvmField @TarsId(0) val uTimestamp: Long? = null,
     @JvmField @TarsId(0) val uTimestamp: Long? = null,
     @JvmField @TarsId(1) val uSchoolId: Long? = null,
     @JvmField @TarsId(1) val uSchoolId: Long? = null,
-    @JvmField @TarsId(2) val iIsValidForCertified: Int? = null
+    @JvmField @TarsId(2) val iIsValidForCertified: Int? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class TCoverInfo(
 internal class TCoverInfo(
-    @JvmField @TarsId(0) val vTagInfo: ByteArray? = null
+    @JvmField @TarsId(0) val vTagInfo: ByteArray? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 
 
 @Serializable
 @Serializable
 internal class TNearbyGodInfo(
 internal class TNearbyGodInfo(
     @JvmField @TarsId(0) val iIsGodFlag: Int? = null,
     @JvmField @TarsId(0) val iIsGodFlag: Int? = null,
-    @JvmField @TarsId(1) val jumpUrl: String? = ""
+    @JvmField @TarsId(1) val jumpUrl: String? = "",
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -218,42 +218,42 @@ internal class TNowBroadcastInfo(
     @JvmField @TarsId(0) val iFlag: Int? = null,
     @JvmField @TarsId(0) val iFlag: Int? = null,
     @JvmField @TarsId(1) val iconURL: String? = "",
     @JvmField @TarsId(1) val iconURL: String? = "",
     @JvmField @TarsId(2) val hrefURL: String? = "",
     @JvmField @TarsId(2) val hrefURL: String? = "",
-    @JvmField @TarsId(3) val vAnchorDataRsp: ByteArray? = null
+    @JvmField @TarsId(3) val vAnchorDataRsp: ByteArray? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class TPraiseInfo(
 internal class TPraiseInfo(
     @JvmField @TarsId(0) val uCustomId: Long? = null,
     @JvmField @TarsId(0) val uCustomId: Long? = null,
-    @JvmField @TarsId(1) val iIsPayed: Int? = null
+    @JvmField @TarsId(1) val iIsPayed: Int? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class TQimInfo(
 internal class TQimInfo(
-    @JvmField @TarsId(0) val iIsOnline: Int? = null
+    @JvmField @TarsId(0) val iIsOnline: Int? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class TTimInfo(
 internal class TTimInfo(
-    @JvmField @TarsId(0) val iIsOnline: Int? = null
+    @JvmField @TarsId(0) val iIsOnline: Int? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class TVideoHeadInfo(
 internal class TVideoHeadInfo(
     @JvmField @TarsId(0) val iNearbyFlag: Int? = null,
     @JvmField @TarsId(0) val iNearbyFlag: Int? = null,
     @JvmField @TarsId(1) val iBasicFlag: Int? = null,
     @JvmField @TarsId(1) val iBasicFlag: Int? = null,
-    @JvmField @TarsId(2) val vMsg: ByteArray? = null
+    @JvmField @TarsId(2) val vMsg: ByteArray? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class UserFeed(
 internal class UserFeed(
     @JvmField @TarsId(0) val uFlag: Long? = null,
     @JvmField @TarsId(0) val uFlag: Long? = null,
-    @JvmField @TarsId(1) val vFeedInfo: ByteArray? = null
+    @JvmField @TarsId(1) val vFeedInfo: ByteArray? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class UserLocaleInfo(
 internal class UserLocaleInfo(
     @JvmField @TarsId(1) val longitude: Long? = null,
     @JvmField @TarsId(1) val longitude: Long? = null,
-    @JvmField @TarsId(2) val latitude: Long? = null
+    @JvmField @TarsId(2) val latitude: Long? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -261,5 +261,5 @@ internal class VoiceInfo(
     @JvmField @TarsId(0) val vVoiceId: ByteArray? = null,
     @JvmField @TarsId(0) val vVoiceId: ByteArray? = null,
     @JvmField @TarsId(1) val shDuration: Short? = null,
     @JvmField @TarsId(1) val shDuration: Short? = null,
     @JvmField @TarsId(2) val read: Byte? = 2,
     @JvmField @TarsId(2) val read: Byte? = 2,
-    @JvmField @TarsId(3) val url: String? = ""
+    @JvmField @TarsId(3) val url: String? = "",
 ) : JceStruct
 ) : JceStruct

+ 2 - 2
mirai-core/src/commonMain/kotlin/network/protocol/data/jce/RequestMSFForceOffline.kt

@@ -22,7 +22,7 @@ internal class RequestMSFForceOffline(
     @TarsId(4) @JvmField val title: String? = "",
     @TarsId(4) @JvmField val title: String? = "",
     @TarsId(5) @JvmField val sigKick: Byte? = 0,
     @TarsId(5) @JvmField val sigKick: Byte? = 0,
     @TarsId(6) @JvmField val vecSigKickData: ByteArray? = null,
     @TarsId(6) @JvmField val vecSigKickData: ByteArray? = null,
-    @TarsId(7) @JvmField val sameDevice: Byte? = 0
+    @TarsId(7) @JvmField val sameDevice: Byte? = 0,
 ) : JceStruct
 ) : JceStruct
 
 
 
 
@@ -30,5 +30,5 @@ internal class RequestMSFForceOffline(
 internal class RspMSFForceOffline(
 internal class RspMSFForceOffline(
     @TarsId(0) @JvmField val uin: Long,
     @TarsId(0) @JvmField val uin: Long,
     @TarsId(1) @JvmField val seq: Long,
     @TarsId(1) @JvmField val seq: Long,
-    @TarsId(2) @JvmField val const: Byte = 0
+    @TarsId(2) @JvmField val const: Byte = 0,
 ) : JceStruct
 ) : JceStruct

+ 4 - 4
mirai-core/src/commonMain/kotlin/network/protocol/data/jce/RequestPacket.kt

@@ -27,20 +27,20 @@ internal class RequestPacket(
     @TarsId(7) @JvmField val sBuffer: ByteArray = EMPTY_BYTE_ARRAY,
     @TarsId(7) @JvmField val sBuffer: ByteArray = EMPTY_BYTE_ARRAY,
     @TarsId(8) @JvmField val iTimeout: Int? = 0,
     @TarsId(8) @JvmField val iTimeout: Int? = 0,
     @TarsId(9) @JvmField val context: Map<String, String>? = EMPTY_MAP,
     @TarsId(9) @JvmField val context: Map<String, String>? = EMPTY_MAP,
-    @TarsId(10) @JvmField val status: Map<String, String>? = EMPTY_MAP
+    @TarsId(10) @JvmField val status: Map<String, String>? = EMPTY_MAP,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class RequestDataVersion3(
 internal class RequestDataVersion3(
-    @TarsId(0) @JvmField val map: Map<String, ByteArray> // 注意: ByteArray 不能直接放序列化的 JceStruct!! 要放类似 RequestDataStructSvcReqRegister 的
+    @TarsId(0) @JvmField val map: Map<String, ByteArray>, // 注意: ByteArray 不能直接放序列化的 JceStruct!! 要放类似 RequestDataStructSvcReqRegister 的
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class RequestDataVersion2(
 internal class RequestDataVersion2(
-    @TarsId(0) @JvmField val map: Map<String, Map<String, ByteArray>>
+    @TarsId(0) @JvmField val map: Map<String, Map<String, ByteArray>>,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class RequestDataStructSvcReqRegister(
 internal class RequestDataStructSvcReqRegister(
-    @TarsId(0) @JvmField val struct: SvcReqRegister
+    @TarsId(0) @JvmField val struct: SvcReqRegister,
 ) : JceStruct
 ) : JceStruct

+ 1 - 1
mirai-core/src/commonMain/kotlin/network/protocol/data/jce/RequestPushForceOffline.kt

@@ -19,5 +19,5 @@ internal class RequestPushForceOffline(
     @TarsId(0) @JvmField val uin: Long,
     @TarsId(0) @JvmField val uin: Long,
     @TarsId(1) @JvmField val title: String = "",
     @TarsId(1) @JvmField val title: String = "",
     @TarsId(2) @JvmField val tips: String = "",
     @TarsId(2) @JvmField val tips: String = "",
-    @TarsId(3) @JvmField val sameDevice: Byte? = null
+    @TarsId(3) @JvmField val sameDevice: Byte? = null,
 ) : JceStruct, Packet
 ) : JceStruct, Packet

+ 2 - 2
mirai-core/src/commonMain/kotlin/network/protocol/data/jce/SvcDevLoginInfo.kt

@@ -25,7 +25,7 @@ internal data class SvcDevLoginInfo(
     // @JvmField @TarsId(7) val stDeviceItemDes: DeviceItemDes? = null,
     // @JvmField @TarsId(7) val stDeviceItemDes: DeviceItemDes? = null,
     @JvmField @TarsId(8) val iTerType: Long? = null, // 1:windows, 2: mobile, 3: ios
     @JvmField @TarsId(8) val iTerType: Long? = null, // 1:windows, 2: mobile, 3: ios
     @JvmField @TarsId(9) val iProductType: Long? = null, // always 0
     @JvmField @TarsId(9) val iProductType: Long? = null, // always 0
-    @JvmField @TarsId(10) val iCanBeKicked: Long? = null // isOnline
+    @JvmField @TarsId(10) val iCanBeKicked: Long? = null, // isOnline
 ) : JceStruct
 ) : JceStruct
 
 
 /*
 /*
@@ -76,6 +76,6 @@ internal class SvcReqGetDevLoginInfo(
     @JvmField @TarsId(3) val iTimeStamp: Long,
     @JvmField @TarsId(3) val iTimeStamp: Long,
     @JvmField @TarsId(4) val iNextItemIndex: Long,
     @JvmField @TarsId(4) val iNextItemIndex: Long,
     @JvmField @TarsId(5) val iRequireMax: Long,
     @JvmField @TarsId(5) val iRequireMax: Long,
-    @JvmField @TarsId(6) val iGetDevListType: Long? = 7L // 1: online list 2: recent list? 4: getAuthLoginDevList?
+    @JvmField @TarsId(6) val iGetDevListType: Long? = 7L, // 1: online list 2: recent list? 4: getAuthLoginDevList?
 ) : JceStruct
 ) : JceStruct
 
 

+ 1 - 1
mirai-core/src/commonMain/kotlin/network/protocol/data/jce/SvcReqMSFLoginNotifyData.kt

@@ -43,5 +43,5 @@ internal data class SvcReqMSFLoginNotifyData(
     @JvmField @TarsId(5) val info: String? = "",
     @JvmField @TarsId(5) val info: String? = "",
     @JvmField @TarsId(6) val iProductType: Long? = null,
     @JvmField @TarsId(6) val iProductType: Long? = null,
     @JvmField @TarsId(7) val iClientType: Long? = null,
     @JvmField @TarsId(7) val iClientType: Long? = null,
-    @JvmField @TarsId(8) val vecInstanceList: List<InstanceInfo>? = null
+    @JvmField @TarsId(8) val vecInstanceList: List<InstanceInfo>? = null,
 ) : JceStruct
 ) : JceStruct

+ 1 - 1
mirai-core/src/commonMain/kotlin/network/protocol/data/jce/SvcReqRegister.kt

@@ -50,6 +50,6 @@ internal class SvcReqRegister(
     @TarsId(33) @JvmField var bytes_0x769_reqbody: ByteArray? = null,
     @TarsId(33) @JvmField var bytes_0x769_reqbody: ByteArray? = null,
     @TarsId(34) @JvmField var bIsSetStatus: Byte = 0,
     @TarsId(34) @JvmField var bIsSetStatus: Byte = 0,
     @TarsId(35) @JvmField var vecServerBuf: ByteArray? = null,
     @TarsId(35) @JvmField var vecServerBuf: ByteArray? = null,
-    @TarsId(36) @JvmField var bSetMute: Byte = 0
+    @TarsId(36) @JvmField var bSetMute: Byte = 0,
     // @SerialId(25) var vecBindUin: ArrayList<*>? = null // ?? 未知泛型
     // @SerialId(25) var vecBindUin: ArrayList<*>? = null // ?? 未知泛型
 ) : JceStruct
 ) : JceStruct

+ 7 - 7
mirai-core/src/commonMain/kotlin/network/protocol/data/jce/SvcRequestPushReadedNotify.kt

@@ -20,7 +20,7 @@ internal class SvcRequestPushReadedNotify(
     @JvmField @TarsId(0) val notifyType: Byte,
     @JvmField @TarsId(0) val notifyType: Byte,
     @JvmField @TarsId(1) val vC2CReadedNotify: List<C2CMsgReadedNotify>? = null,
     @JvmField @TarsId(1) val vC2CReadedNotify: List<C2CMsgReadedNotify>? = null,
     @JvmField @TarsId(2) val vGroupReadedNotify: List<GroupMsgReadedNotify>? = null,
     @JvmField @TarsId(2) val vGroupReadedNotify: List<GroupMsgReadedNotify>? = null,
-    @JvmField @TarsId(3) val vDisReadedNotify: List<DisMsgReadedNotify>? = null
+    @JvmField @TarsId(3) val vDisReadedNotify: List<DisMsgReadedNotify>? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 
 
@@ -30,7 +30,7 @@ internal class C2CMsgReadedNotify(
     @JvmField @TarsId(1) val lastReadTime: Long? = null,
     @JvmField @TarsId(1) val lastReadTime: Long? = null,
     @JvmField @TarsId(2) val flag: Long? = null,
     @JvmField @TarsId(2) val flag: Long? = null,
     @JvmField @TarsId(3) val phoneNum: String? = "",
     @JvmField @TarsId(3) val phoneNum: String? = "",
-    @JvmField @TarsId(4) val bindedUin: Long? = null
+    @JvmField @TarsId(4) val bindedUin: Long? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -38,14 +38,14 @@ internal class DisMsgReadedNotify(
     @JvmField @TarsId(0) val disUin: Long? = null,
     @JvmField @TarsId(0) val disUin: Long? = null,
     @JvmField @TarsId(1) val opType: Long? = null,
     @JvmField @TarsId(1) val opType: Long? = null,
     @JvmField @TarsId(2) val memberSeq: Long? = null,
     @JvmField @TarsId(2) val memberSeq: Long? = null,
-    @JvmField @TarsId(3) val disMsgSeq: Long? = null
+    @JvmField @TarsId(3) val disMsgSeq: Long? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 
 
 @Serializable
 @Serializable
 internal class GPicInfo(
 internal class GPicInfo(
     @JvmField @TarsId(0) val vPath: ByteArray,
     @JvmField @TarsId(0) val vPath: ByteArray,
-    @JvmField @TarsId(1) val vHost: ByteArray? = null
+    @JvmField @TarsId(1) val vHost: ByteArray? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 
 
@@ -55,7 +55,7 @@ internal class GroupMsgHead(
     @JvmField @TarsId(1) val totalPkg: Byte,
     @JvmField @TarsId(1) val totalPkg: Byte,
     @JvmField @TarsId(2) val curPkg: Byte,
     @JvmField @TarsId(2) val curPkg: Byte,
     @JvmField @TarsId(3) val usPkgSeq: Int,
     @JvmField @TarsId(3) val usPkgSeq: Int,
-    @JvmField @TarsId(4) val dwReserved: Long
+    @JvmField @TarsId(4) val dwReserved: Long,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -63,7 +63,7 @@ internal class GroupMsgReadedNotify(
     @JvmField @TarsId(0) val groupCode: Long? = null,
     @JvmField @TarsId(0) val groupCode: Long? = null,
     @JvmField @TarsId(1) val opType: Long? = null,
     @JvmField @TarsId(1) val opType: Long? = null,
     @JvmField @TarsId(2) val memberSeq: Long? = null,
     @JvmField @TarsId(2) val memberSeq: Long? = null,
-    @JvmField @TarsId(3) val groupMsgSeq: Long? = null
+    @JvmField @TarsId(3) val groupMsgSeq: Long? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -89,6 +89,6 @@ internal class RequestPushGroupMsg(
     @JvmField @TarsId(18) val stGroupMsgHead: GroupMsgHead? = null,
     @JvmField @TarsId(18) val stGroupMsgHead: GroupMsgHead? = null,
     @JvmField @TarsId(19) val wUserActive: Int? = null,
     @JvmField @TarsId(19) val wUserActive: Int? = null,
     @JvmField @TarsId(20) val vMarketFace: List<MarketFaceInfo>? = null,
     @JvmField @TarsId(20) val vMarketFace: List<MarketFaceInfo>? = null,
-    @JvmField @TarsId(21) val uSuperQQBubbleId: Long? = null
+    @JvmField @TarsId(21) val uSuperQQBubbleId: Long? = null,
 ) : JceStruct
 ) : JceStruct
 
 

+ 2 - 2
mirai-core/src/commonMain/kotlin/network/protocol/data/jce/SvcRespRegister.kt

@@ -36,10 +36,10 @@ internal class SvcRespRegister(
      */
      */
     @JvmField @TarsId(14) val largeSeqUpdate: Byte = 0,
     @JvmField @TarsId(14) val largeSeqUpdate: Byte = 0,
     @JvmField @TarsId(15) val bytes_0x769_rspBody: ByteArray? = null,
     @JvmField @TarsId(15) val bytes_0x769_rspBody: ByteArray? = null,
-    @JvmField @TarsId(16) val iStatus: Int? = 0
+    @JvmField @TarsId(16) val iStatus: Int? = 0,
 ) : JceStruct
 ) : JceStruct
 
 
 internal fun FriendListCache.isValid(svcRespRegister: SvcRespRegister): Boolean {
 internal fun FriendListCache.isValid(svcRespRegister: SvcRespRegister): Boolean {
     return svcRespRegister.iLargeSeq == friendListSeq && svcRespRegister.timeStamp == timeStamp
     return svcRespRegister.iLargeSeq == friendListSeq && svcRespRegister.timeStamp == timeStamp
-//    return this.largeSeqUpdate != 0.toByte()
+    //    return this.largeSeqUpdate != 0.toByte()
 }
 }

+ 1 - 1
mirai-core/src/commonMain/kotlin/network/protocol/data/jce/SvcRspGetDevLoginInfo.kt

@@ -21,6 +21,6 @@ internal class SvcRspGetDevLoginInfo(
     @JvmField @TarsId(3) val iTotalItemCount: Long,
     @JvmField @TarsId(3) val iTotalItemCount: Long,
     @JvmField @TarsId(4) val vecCurrentLoginDevInfo: List<SvcDevLoginInfo>? = null,
     @JvmField @TarsId(4) val vecCurrentLoginDevInfo: List<SvcDevLoginInfo>? = null,
     @JvmField @TarsId(5) val vecHistoryLoginDevInfo: List<SvcDevLoginInfo>? = null,
     @JvmField @TarsId(5) val vecHistoryLoginDevInfo: List<SvcDevLoginInfo>? = null,
-    @JvmField @TarsId(6) val vecAuthLoginDevInfo: List<SvcDevLoginInfo>? = null
+    @JvmField @TarsId(6) val vecAuthLoginDevInfo: List<SvcDevLoginInfo>? = null,
 ) : JceStruct
 ) : JceStruct
 
 

+ 11 - 11
mirai-core/src/commonMain/kotlin/network/protocol/data/jce/TroopList.kt

@@ -23,7 +23,7 @@ internal class GetTroopListReqV2Simplify(
     @TarsId(5) @JvmField val shVersion: Int? = null,
     @TarsId(5) @JvmField val shVersion: Int? = null,
     @TarsId(6) @JvmField val dwCompanyId: Long? = null,
     @TarsId(6) @JvmField val dwCompanyId: Long? = null,
     @TarsId(7) @JvmField val versionNum: Long? = null,
     @TarsId(7) @JvmField val versionNum: Long? = null,
-    @TarsId(8) @JvmField val getLongGroupName: Byte? = null
+    @TarsId(8) @JvmField val getLongGroupName: Byte? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -31,7 +31,7 @@ internal class StTroopNumSimplify(
     @TarsId(0) @JvmField val groupCode: Long,
     @TarsId(0) @JvmField val groupCode: Long,
     @TarsId(1) @JvmField val dwGroupInfoSeq: Long? = null,
     @TarsId(1) @JvmField val dwGroupInfoSeq: Long? = null,
     @TarsId(2) @JvmField val dwGroupFlagExt: Long? = null,
     @TarsId(2) @JvmField val dwGroupFlagExt: Long? = null,
-    @TarsId(3) @JvmField val dwGroupRankSeq: Long? = null
+    @TarsId(3) @JvmField val dwGroupRankSeq: Long? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 
 
@@ -46,7 +46,7 @@ internal class GetTroopListRespV2(
     @TarsId(6) @JvmField val vecTroopListDel: List<StTroopNum>? = null,
     @TarsId(6) @JvmField val vecTroopListDel: List<StTroopNum>? = null,
     @TarsId(7) @JvmField val vecTroopRank: List<StGroupRankInfo>? = null,
     @TarsId(7) @JvmField val vecTroopRank: List<StGroupRankInfo>? = null,
     @TarsId(8) @JvmField val vecFavGroup: List<StFavoriteGroup>? = null,
     @TarsId(8) @JvmField val vecFavGroup: List<StFavoriteGroup>? = null,
-    @TarsId(9) @JvmField val vecTroopListExt: List<StTroopNum>? = null
+    @TarsId(9) @JvmField val vecTroopListExt: List<StTroopNum>? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 
 
@@ -86,7 +86,7 @@ internal class StTroopNum(
     @TarsId(31) @JvmField val udwHLGuildAppid: Long? = null,
     @TarsId(31) @JvmField val udwHLGuildAppid: Long? = null,
     @TarsId(32) @JvmField val udwHLGuildSubType: Long? = null,
     @TarsId(32) @JvmField val udwHLGuildSubType: Long? = null,
     @TarsId(33) @JvmField val udwCmdUinRingtoneID: Long? = null,
     @TarsId(33) @JvmField val udwCmdUinRingtoneID: Long? = null,
-    @TarsId(34) @JvmField val udwCmdUinFlagEx2: Long? = null
+    @TarsId(34) @JvmField val udwCmdUinFlagEx2: Long? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -99,7 +99,7 @@ internal class StGroupRankInfo(
     @TarsId(5) @JvmField val ownerName: String? = "",
     @TarsId(5) @JvmField val ownerName: String? = "",
     @TarsId(6) @JvmField val adminName: String? = "",
     @TarsId(6) @JvmField val adminName: String? = "",
     @TarsId(7) @JvmField val dwOfficeMode: Long? = null,
     @TarsId(7) @JvmField val dwOfficeMode: Long? = null,
-    @TarsId(9) @JvmField val fuckIssue405: List<FuckIssue405?>? = null // fake
+    @TarsId(9) @JvmField val fuckIssue405: List<FuckIssue405?>? = null, // fake
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -110,13 +110,13 @@ internal class StFavoriteGroup(
     @TarsId(0) @JvmField val dwGroupCode: Long,
     @TarsId(0) @JvmField val dwGroupCode: Long,
     @TarsId(1) @JvmField val dwTimestamp: Long? = null,
     @TarsId(1) @JvmField val dwTimestamp: Long? = null,
     @TarsId(2) @JvmField val dwSnsFlag: Long? = 1L,
     @TarsId(2) @JvmField val dwSnsFlag: Long? = 1L,
-    @TarsId(3) @JvmField val dwOpenTimestamp: Long? = null
+    @TarsId(3) @JvmField val dwOpenTimestamp: Long? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class StLevelRankPair(
 internal class StLevelRankPair(
     @TarsId(0) @JvmField val dwLevel: Long? = null,
     @TarsId(0) @JvmField val dwLevel: Long? = null,
-    @TarsId(1) @JvmField val rank: String? = ""
+    @TarsId(1) @JvmField val rank: String? = "",
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -128,7 +128,7 @@ internal class GetTroopMemberListReq(
     @TarsId(4) @JvmField val version: Long? = null,
     @TarsId(4) @JvmField val version: Long? = null,
     @TarsId(5) @JvmField val reqType: Long? = null,
     @TarsId(5) @JvmField val reqType: Long? = null,
     @TarsId(6) @JvmField val getListAppointTime: Long? = null,
     @TarsId(6) @JvmField val getListAppointTime: Long? = null,
-    @TarsId(7) @JvmField val richCardNameVer: Byte? = null
+    @TarsId(7) @JvmField val richCardNameVer: Byte? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 
 
@@ -142,7 +142,7 @@ internal class GetTroopMemberListResp(
     @TarsId(5) @JvmField val result: Int,
     @TarsId(5) @JvmField val result: Int,
     @TarsId(6) @JvmField val errorCode: Short? = null,
     @TarsId(6) @JvmField val errorCode: Short? = null,
     @TarsId(7) @JvmField val officeMode: Long? = null,
     @TarsId(7) @JvmField val officeMode: Long? = null,
-    @TarsId(8) @JvmField val nextGetTime: Long? = null
+    @TarsId(8) @JvmField val nextGetTime: Long? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
@@ -185,11 +185,11 @@ internal class StTroopMemberInfo(
     @TarsId(36) @JvmField val dwBigClubLevel: Long? = null,
     @TarsId(36) @JvmField val dwBigClubLevel: Long? = null,
     @TarsId(37) @JvmField val dwBigClubFlag: Long? = null,
     @TarsId(37) @JvmField val dwBigClubFlag: Long? = null,
     @TarsId(38) @JvmField val dwNameplate: Long? = null,
     @TarsId(38) @JvmField val dwNameplate: Long? = null,
-    @TarsId(39) @JvmField val vecGroupHonor: ByteArray? = null
+    @TarsId(39) @JvmField val vecGroupHonor: ByteArray? = null,
 ) : JceStruct
 ) : JceStruct
 
 
 @Serializable
 @Serializable
 internal class QzoneUserInfo(
 internal class QzoneUserInfo(
     @TarsId(0) @JvmField val eStarState: Int? = null,
     @TarsId(0) @JvmField val eStarState: Int? = null,
-    @TarsId(1) @JvmField val extendInfo: Map<String, String>? = null
+    @TarsId(1) @JvmField val extendInfo: Map<String, String>? = null,
 ) : JceStruct
 ) : JceStruct

+ 50 - 50
mirai-core/src/commonMain/kotlin/network/protocol/data/proto/Cmd0x346.kt

@@ -21,7 +21,7 @@ internal class Cmd0x346 : ProtoBuf {
     internal class AddrList(
     internal class AddrList(
         @JvmField @ProtoNumber(2) val strIp: List<String> = emptyList(),
         @JvmField @ProtoNumber(2) val strIp: List<String> = emptyList(),
         @JvmField @ProtoNumber(3) val strDomain: String = "",
         @JvmField @ProtoNumber(3) val strDomain: String = "",
-        @JvmField @ProtoNumber(4) val port: Int = 0
+        @JvmField @ProtoNumber(4) val port: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -30,7 +30,7 @@ internal class Cmd0x346 : ProtoBuf {
     @Serializable
     @Serializable
     internal class ApplyCleanTrafficRsp(
     internal class ApplyCleanTrafficRsp(
         @JvmField @ProtoNumber(10) val int32RetCode: Int = 0,
         @JvmField @ProtoNumber(10) val int32RetCode: Int = 0,
-        @JvmField @ProtoNumber(20) val retMsg: String = ""
+        @JvmField @ProtoNumber(20) val retMsg: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -45,7 +45,7 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(80) val fileSize: Long = 0L,
         @JvmField @ProtoNumber(80) val fileSize: Long = 0L,
         @JvmField @ProtoNumber(90) val fileName: String = "",
         @JvmField @ProtoNumber(90) val fileName: String = "",
         @JvmField @ProtoNumber(100) val dangerLevel: Int = 0,
         @JvmField @ProtoNumber(100) val dangerLevel: Int = 0,
-        @JvmField @ProtoNumber(110) val totalSpace: Long = 0L
+        @JvmField @ProtoNumber(110) val totalSpace: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -53,7 +53,7 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(10) val int32RetCode: Int = 0,
         @JvmField @ProtoNumber(10) val int32RetCode: Int = 0,
         @JvmField @ProtoNumber(20) val retMsg: String = "",
         @JvmField @ProtoNumber(20) val retMsg: String = "",
         @JvmField @ProtoNumber(30) val uuid: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(30) val uuid: ByteArray = EMPTY_BYTE_ARRAY,
-        @JvmField @ProtoNumber(40) val totalSpace: Long = 0L
+        @JvmField @ProtoNumber(40) val totalSpace: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -65,27 +65,27 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(50) val fileSize: Long = 0L,
         @JvmField @ProtoNumber(50) val fileSize: Long = 0L,
         @JvmField @ProtoNumber(60) val fileName: String = "",
         @JvmField @ProtoNumber(60) val fileName: String = "",
         @JvmField @ProtoNumber(70) val localFilepath: String = "",
         @JvmField @ProtoNumber(70) val localFilepath: String = "",
-        @JvmField @ProtoNumber(80) val uuid: ByteArray = EMPTY_BYTE_ARRAY
+        @JvmField @ProtoNumber(80) val uuid: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class ApplyCopyToRsp(
     internal class ApplyCopyToRsp(
         @JvmField @ProtoNumber(10) val int32RetCode: Int = 0,
         @JvmField @ProtoNumber(10) val int32RetCode: Int = 0,
         @JvmField @ProtoNumber(20) val retMsg: String = "",
         @JvmField @ProtoNumber(20) val retMsg: String = "",
-        @JvmField @ProtoNumber(30) val fileKey: String = ""
+        @JvmField @ProtoNumber(30) val fileKey: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class ApplyDownloadAbsReq(
     internal class ApplyDownloadAbsReq(
         @JvmField @ProtoNumber(10) val uin: Long = 0L,
         @JvmField @ProtoNumber(10) val uin: Long = 0L,
-        @JvmField @ProtoNumber(20) val uuid: ByteArray = EMPTY_BYTE_ARRAY
+        @JvmField @ProtoNumber(20) val uuid: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class ApplyDownloadAbsRsp(
     internal class ApplyDownloadAbsRsp(
         @JvmField @ProtoNumber(10) val int32RetCode: Int = 0,
         @JvmField @ProtoNumber(10) val int32RetCode: Int = 0,
         @JvmField @ProtoNumber(20) val retMsg: String = "",
         @JvmField @ProtoNumber(20) val retMsg: String = "",
-        @JvmField @ProtoNumber(30) val msgDownloadInfo: Cmd0x346.DownloadInfo? = null
+        @JvmField @ProtoNumber(30) val msgDownloadInfo: Cmd0x346.DownloadInfo? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -94,7 +94,7 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(20) val uuid: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(20) val uuid: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(30) val ownerType: Int = 0,
         @JvmField @ProtoNumber(30) val ownerType: Int = 0,
         @JvmField @ProtoNumber(500) val extUintype: Int = 0,
         @JvmField @ProtoNumber(500) val extUintype: Int = 0,
-        @JvmField @ProtoNumber(501) val needHttpsUrl: Int = 0
+        @JvmField @ProtoNumber(501) val needHttpsUrl: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -102,7 +102,7 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(10) val int32RetCode: Int = 0,
         @JvmField @ProtoNumber(10) val int32RetCode: Int = 0,
         @JvmField @ProtoNumber(20) val retMsg: String = "",
         @JvmField @ProtoNumber(20) val retMsg: String = "",
         @JvmField @ProtoNumber(30) val msgDownloadInfo: Cmd0x346.DownloadInfo? = null,
         @JvmField @ProtoNumber(30) val msgDownloadInfo: Cmd0x346.DownloadInfo? = null,
-        @JvmField @ProtoNumber(40) val msgFileInfo: Cmd0x346.FileInfo? = null
+        @JvmField @ProtoNumber(40) val msgFileInfo: Cmd0x346.FileInfo? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -111,7 +111,7 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(20) val recverUin: Long = 0L,
         @JvmField @ProtoNumber(20) val recverUin: Long = 0L,
         @JvmField @ProtoNumber(30) val uuid: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(30) val uuid: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(40) val dangerLevel: Int = 0,
         @JvmField @ProtoNumber(40) val dangerLevel: Int = 0,
-        @JvmField @ProtoNumber(50) val totalSpace: Long = 0L
+        @JvmField @ProtoNumber(50) val totalSpace: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -120,7 +120,7 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(20) val retMsg: String = "",
         @JvmField @ProtoNumber(20) val retMsg: String = "",
         @JvmField @ProtoNumber(30) val totalSpace: Long = 0L,
         @JvmField @ProtoNumber(30) val totalSpace: Long = 0L,
         @JvmField @ProtoNumber(40) val usedSpace: Long = 0L,
         @JvmField @ProtoNumber(40) val usedSpace: Long = 0L,
-        @JvmField @ProtoNumber(50) val uuid: ByteArray = EMPTY_BYTE_ARRAY
+        @JvmField @ProtoNumber(50) val uuid: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -133,14 +133,14 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(30) val useFileSize: Long = 0L,
         @JvmField @ProtoNumber(30) val useFileSize: Long = 0L,
         @JvmField @ProtoNumber(40) val useFileNum: Int = 0,
         @JvmField @ProtoNumber(40) val useFileNum: Int = 0,
         @JvmField @ProtoNumber(50) val allFileSize: Long = 0L,
         @JvmField @ProtoNumber(50) val allFileSize: Long = 0L,
-        @JvmField @ProtoNumber(60) val allFileNum: Int = 0
+        @JvmField @ProtoNumber(60) val allFileNum: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class ApplyListDownloadReq(
     internal class ApplyListDownloadReq(
         @JvmField @ProtoNumber(10) val uin: Long = 0L,
         @JvmField @ProtoNumber(10) val uin: Long = 0L,
         @JvmField @ProtoNumber(20) val beginIndex: Int = 0,
         @JvmField @ProtoNumber(20) val beginIndex: Int = 0,
-        @JvmField @ProtoNumber(30) val reqCount: Int = 0
+        @JvmField @ProtoNumber(30) val reqCount: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -151,7 +151,7 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(40) val beginIndex: Int = 0,
         @JvmField @ProtoNumber(40) val beginIndex: Int = 0,
         @JvmField @ProtoNumber(50) val rspCount: Int = 0,
         @JvmField @ProtoNumber(50) val rspCount: Int = 0,
         @JvmField @ProtoNumber(60) val isEnd: Int = 0,
         @JvmField @ProtoNumber(60) val isEnd: Int = 0,
-        @JvmField @ProtoNumber(70) val msgFileList: List<Cmd0x346.FileInfo> = emptyList()
+        @JvmField @ProtoNumber(70) val msgFileList: List<Cmd0x346.FileInfo> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -163,7 +163,7 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(50) val _10mMd5: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(50) val _10mMd5: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(60) val localFilepath: String = "",
         @JvmField @ProtoNumber(60) val localFilepath: String = "",
         @JvmField @ProtoNumber(70) val dangerLevel: Int = 0,
         @JvmField @ProtoNumber(70) val dangerLevel: Int = 0,
-        @JvmField @ProtoNumber(80) val totalSpace: Long = 0L
+        @JvmField @ProtoNumber(80) val totalSpace: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -177,7 +177,7 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(70) val sha: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(70) val sha: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(80) val localFilepath: String = "",
         @JvmField @ProtoNumber(80) val localFilepath: String = "",
         @JvmField @ProtoNumber(90) val dangerLevel: Int = 0,
         @JvmField @ProtoNumber(90) val dangerLevel: Int = 0,
-        @JvmField @ProtoNumber(100) val totalSpace: Long = 0L
+        @JvmField @ProtoNumber(100) val totalSpace: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -190,7 +190,7 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(60) val sha: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(60) val sha: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(70) val localFilepath: String = "",
         @JvmField @ProtoNumber(70) val localFilepath: String = "",
         @JvmField @ProtoNumber(80) val dangerLevel: Int = 0,
         @JvmField @ProtoNumber(80) val dangerLevel: Int = 0,
-        @JvmField @ProtoNumber(90) val totalSpace: Long = 0L
+        @JvmField @ProtoNumber(90) val totalSpace: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -204,7 +204,7 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(70) val uploadKey: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(70) val uploadKey: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(80) val totalSpace: Long = 0L,
         @JvmField @ProtoNumber(80) val totalSpace: Long = 0L,
         @JvmField @ProtoNumber(90) val usedSpace: Long = 0L,
         @JvmField @ProtoNumber(90) val usedSpace: Long = 0L,
-        @JvmField @ProtoNumber(100) val uploadDns: String = ""
+        @JvmField @ProtoNumber(100) val uploadDns: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -220,7 +220,7 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(90) val usedSpace: Long = 0L,
         @JvmField @ProtoNumber(90) val usedSpace: Long = 0L,
         @JvmField @ProtoNumber(100) val uploadHttpsPort: Int = 443,
         @JvmField @ProtoNumber(100) val uploadHttpsPort: Int = 443,
         @JvmField @ProtoNumber(110) val uploadHttpsDomain: String = "",
         @JvmField @ProtoNumber(110) val uploadHttpsDomain: String = "",
-        @JvmField @ProtoNumber(120) val uploadDns: String = ""
+        @JvmField @ProtoNumber(120) val uploadDns: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -234,7 +234,7 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(70) val uploadKey: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(70) val uploadKey: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(80) val totalSpace: Long = 0L,
         @JvmField @ProtoNumber(80) val totalSpace: Long = 0L,
         @JvmField @ProtoNumber(90) val usedSpace: Long = 0L,
         @JvmField @ProtoNumber(90) val usedSpace: Long = 0L,
-        @JvmField @ProtoNumber(100) val uploadDns: String = ""
+        @JvmField @ProtoNumber(100) val uploadDns: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -247,7 +247,7 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(60) val _10mMd5: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(60) val _10mMd5: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(70) val localFilepath: String = "",
         @JvmField @ProtoNumber(70) val localFilepath: String = "",
         @JvmField @ProtoNumber(80) val dangerLevel: Int = 0,
         @JvmField @ProtoNumber(80) val dangerLevel: Int = 0,
-        @JvmField @ProtoNumber(90) val totalSpace: Long = 0L
+        @JvmField @ProtoNumber(90) val totalSpace: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -260,7 +260,7 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(60) val _3sha: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(60) val _3sha: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(70) val localFilepath: String = "",
         @JvmField @ProtoNumber(70) val localFilepath: String = "",
         @JvmField @ProtoNumber(80) val dangerLevel: Int = 0,
         @JvmField @ProtoNumber(80) val dangerLevel: Int = 0,
-        @JvmField @ProtoNumber(90) val totalSpace: Long = 0L
+        @JvmField @ProtoNumber(90) val totalSpace: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -273,7 +273,7 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(60) val sha: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(60) val sha: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(70) val localFilepath: String = "",
         @JvmField @ProtoNumber(70) val localFilepath: String = "",
         @JvmField @ProtoNumber(80) val dangerLevel: Int = 0,
         @JvmField @ProtoNumber(80) val dangerLevel: Int = 0,
-        @JvmField @ProtoNumber(90) val totalSpace: Long = 0L
+        @JvmField @ProtoNumber(90) val totalSpace: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -291,7 +291,7 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(110) val boolFileExist: Boolean = false,
         @JvmField @ProtoNumber(110) val boolFileExist: Boolean = false,
         @JvmField @ProtoNumber(120) val packSize: Int = 0,
         @JvmField @ProtoNumber(120) val packSize: Int = 0,
         @JvmField @ProtoNumber(130) val strUploadipList: List<String> = emptyList(),
         @JvmField @ProtoNumber(130) val strUploadipList: List<String> = emptyList(),
-        @JvmField @ProtoNumber(140) val uploadDns: String = ""
+        @JvmField @ProtoNumber(140) val uploadDns: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -314,7 +314,7 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(142) val uploadHttpsPort: Int = 443,
         @JvmField @ProtoNumber(142) val uploadHttpsPort: Int = 443,
         @JvmField @ProtoNumber(143) val uploadHttpsDomain: String = "",
         @JvmField @ProtoNumber(143) val uploadHttpsDomain: String = "",
         @JvmField @ProtoNumber(150) val uploadDns: String = "",
         @JvmField @ProtoNumber(150) val uploadDns: String = "",
-        @JvmField @ProtoNumber(160) val uploadLanip: String = ""
+        @JvmField @ProtoNumber(160) val uploadLanip: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -335,7 +335,7 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(140) val uploadHttpsPort: Int = 443,
         @JvmField @ProtoNumber(140) val uploadHttpsPort: Int = 443,
         @JvmField @ProtoNumber(150) val uploadHttpsDomain: String = "",
         @JvmField @ProtoNumber(150) val uploadHttpsDomain: String = "",
         @JvmField @ProtoNumber(160) val uploadDns: String = "",
         @JvmField @ProtoNumber(160) val uploadDns: String = "",
-        @JvmField @ProtoNumber(170) val uploadLanip: String = ""
+        @JvmField @ProtoNumber(170) val uploadLanip: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -343,13 +343,13 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(10) val uin: Long = 0L,
         @JvmField @ProtoNumber(10) val uin: Long = 0L,
         @JvmField @ProtoNumber(20) val peerUin: Long = 0L,
         @JvmField @ProtoNumber(20) val peerUin: Long = 0L,
         @JvmField @ProtoNumber(30) val deleteType: Int = 0,
         @JvmField @ProtoNumber(30) val deleteType: Int = 0,
-        @JvmField @ProtoNumber(40) val uuid: ByteArray = EMPTY_BYTE_ARRAY
+        @JvmField @ProtoNumber(40) val uuid: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class DeleteFileRsp(
     internal class DeleteFileRsp(
         @JvmField @ProtoNumber(10) val int32RetCode: Int = 0,
         @JvmField @ProtoNumber(10) val int32RetCode: Int = 0,
-        @JvmField @ProtoNumber(20) val retMsg: String = ""
+        @JvmField @ProtoNumber(20) val retMsg: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -358,7 +358,7 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(2) val uinReceiver: Long = 0L,
         @JvmField @ProtoNumber(2) val uinReceiver: Long = 0L,
         @JvmField @ProtoNumber(10) val msgTime: Int = 0,
         @JvmField @ProtoNumber(10) val msgTime: Int = 0,
         @JvmField @ProtoNumber(20) val msgRandom: Int = 0,
         @JvmField @ProtoNumber(20) val msgRandom: Int = 0,
-        @JvmField @ProtoNumber(30) val msgSeqNo: Int = 0
+        @JvmField @ProtoNumber(30) val msgSeqNo: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -372,20 +372,20 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(70) val cookie: String = "",
         @JvmField @ProtoNumber(70) val cookie: String = "",
         @JvmField @ProtoNumber(80) val httpsPort: Int = 443,
         @JvmField @ProtoNumber(80) val httpsPort: Int = 443,
         @JvmField @ProtoNumber(90) val httpsDownloadDomain: String = "",
         @JvmField @ProtoNumber(90) val httpsDownloadDomain: String = "",
-        @JvmField @ProtoNumber(110) val downloadDns: String = ""
+        @JvmField @ProtoNumber(110) val downloadDns: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class DownloadSuccReq(
     internal class DownloadSuccReq(
         @JvmField @ProtoNumber(10) val uin: Long = 0L,
         @JvmField @ProtoNumber(10) val uin: Long = 0L,
-        @JvmField @ProtoNumber(20) val uuid: ByteArray = EMPTY_BYTE_ARRAY
+        @JvmField @ProtoNumber(20) val uuid: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class DownloadSuccRsp(
     internal class DownloadSuccRsp(
         @JvmField @ProtoNumber(10) val int32RetCode: Int = 0,
         @JvmField @ProtoNumber(10) val int32RetCode: Int = 0,
         @JvmField @ProtoNumber(20) val retMsg: String = "",
         @JvmField @ProtoNumber(20) val retMsg: String = "",
-        @JvmField @ProtoNumber(30) val int32DownStat: Int = 0
+        @JvmField @ProtoNumber(30) val int32DownStat: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -406,7 +406,7 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(90800) val pttTime: Int = 0,
         @JvmField @ProtoNumber(90800) val pttTime: Int = 0,
         @JvmField @ProtoNumber(90900) val bdhCmdid: Int = 0,
         @JvmField @ProtoNumber(90900) val bdhCmdid: Int = 0,
         @JvmField @ProtoNumber(91000) val reqTransferType: Int = 0,
         @JvmField @ProtoNumber(91000) val reqTransferType: Int = 0,
-        @JvmField @ProtoNumber(91100) val isAuto: Int = 0
+        @JvmField @ProtoNumber(91100) val isAuto: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -414,7 +414,7 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(1) val transferType: Int = 0,
         @JvmField @ProtoNumber(1) val transferType: Int = 0,
         @JvmField @ProtoNumber(2) val channelType: Int = 0,
         @JvmField @ProtoNumber(2) val channelType: Int = 0,
         @JvmField @ProtoNumber(3) val allowRetry: Int = 0,
         @JvmField @ProtoNumber(3) val allowRetry: Int = 0,
-        @JvmField @ProtoNumber(4) val serverAddrIpv6List: Cmd0x346.AddrList? = null
+        @JvmField @ProtoNumber(4) val serverAddrIpv6List: Cmd0x346.AddrList? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -432,39 +432,39 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(110) val clientType: Int = 0,
         @JvmField @ProtoNumber(110) val clientType: Int = 0,
         @JvmField @ProtoNumber(120) val ownerUin: Long = 0L,
         @JvmField @ProtoNumber(120) val ownerUin: Long = 0L,
         @JvmField @ProtoNumber(121) val peerUin: Long = 0L,
         @JvmField @ProtoNumber(121) val peerUin: Long = 0L,
-        @JvmField @ProtoNumber(130) val expireTime: Int = 0
+        @JvmField @ProtoNumber(130) val expireTime: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class FileQueryReq(
     internal class FileQueryReq(
         @JvmField @ProtoNumber(10) val uin: Long = 0L,
         @JvmField @ProtoNumber(10) val uin: Long = 0L,
-        @JvmField @ProtoNumber(20) val uuid: ByteArray = EMPTY_BYTE_ARRAY
+        @JvmField @ProtoNumber(20) val uuid: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class FileQueryRsp(
     internal class FileQueryRsp(
         @JvmField @ProtoNumber(10) val int32RetCode: Int = 0,
         @JvmField @ProtoNumber(10) val int32RetCode: Int = 0,
         @JvmField @ProtoNumber(20) val retMsg: String = "",
         @JvmField @ProtoNumber(20) val retMsg: String = "",
-        @JvmField @ProtoNumber(30) val msgFileInfo: Cmd0x346.FileInfo? = null
+        @JvmField @ProtoNumber(30) val msgFileInfo: Cmd0x346.FileInfo? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class RecallFileReq(
     internal class RecallFileReq(
         @JvmField @ProtoNumber(1) val uin: Long = 0L,
         @JvmField @ProtoNumber(1) val uin: Long = 0L,
-        @JvmField @ProtoNumber(2) val uuid: ByteArray = EMPTY_BYTE_ARRAY
+        @JvmField @ProtoNumber(2) val uuid: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class RecallFileRsp(
     internal class RecallFileRsp(
         @JvmField @ProtoNumber(1) val int32RetCode: Int = 0,
         @JvmField @ProtoNumber(1) val int32RetCode: Int = 0,
-        @JvmField @ProtoNumber(2) val retMsg: String = ""
+        @JvmField @ProtoNumber(2) val retMsg: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class RecvListQueryReq(
     internal class RecvListQueryReq(
         @JvmField @ProtoNumber(1) val uin: Long = 0L,
         @JvmField @ProtoNumber(1) val uin: Long = 0L,
         @JvmField @ProtoNumber(2) val beginIndex: Int = 0,
         @JvmField @ProtoNumber(2) val beginIndex: Int = 0,
-        @JvmField @ProtoNumber(3) val reqCount: Int = 0
+        @JvmField @ProtoNumber(3) val reqCount: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -475,20 +475,20 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(4) val beginIndex: Int = 0,
         @JvmField @ProtoNumber(4) val beginIndex: Int = 0,
         @JvmField @ProtoNumber(5) val rspFileCount: Int = 0,
         @JvmField @ProtoNumber(5) val rspFileCount: Int = 0,
         @JvmField @ProtoNumber(6) val isEnd: Int = 0,
         @JvmField @ProtoNumber(6) val isEnd: Int = 0,
-        @JvmField @ProtoNumber(7) val msgFileList: List<Cmd0x346.FileInfo> = emptyList()
+        @JvmField @ProtoNumber(7) val msgFileList: List<Cmd0x346.FileInfo> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class RenewFileReq(
     internal class RenewFileReq(
         @JvmField @ProtoNumber(1) val uin: Long = 0L,
         @JvmField @ProtoNumber(1) val uin: Long = 0L,
         @JvmField @ProtoNumber(2) val uuid: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(2) val uuid: ByteArray = EMPTY_BYTE_ARRAY,
-        @JvmField @ProtoNumber(3) val addTtl: Int = 0
+        @JvmField @ProtoNumber(3) val addTtl: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class RenewFileRsp(
     internal class RenewFileRsp(
         @JvmField @ProtoNumber(1) val int32RetCode: Int = 0,
         @JvmField @ProtoNumber(1) val int32RetCode: Int = 0,
-        @JvmField @ProtoNumber(2) val retMsg: String = ""
+        @JvmField @ProtoNumber(2) val retMsg: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -519,7 +519,7 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(90000) val msgApplyCopyToReq: Cmd0x346.ApplyCopyToReq? = null,
         @JvmField @ProtoNumber(90000) val msgApplyCopyToReq: Cmd0x346.ApplyCopyToReq? = null,
         @JvmField @ProtoNumber(90001) val msgApplyCleanTrafficReq: Cmd0x346.ApplyCleanTrafficReq? = null,
         @JvmField @ProtoNumber(90001) val msgApplyCleanTrafficReq: Cmd0x346.ApplyCleanTrafficReq? = null,
         @JvmField @ProtoNumber(90002) val msgApplyGetTrafficReq: Cmd0x346.ApplyGetTrafficReq? = null,
         @JvmField @ProtoNumber(90002) val msgApplyGetTrafficReq: Cmd0x346.ApplyGetTrafficReq? = null,
-        @JvmField @ProtoNumber(99999) val msgExtensionReq: Cmd0x346.ExtensionReq? = null
+        @JvmField @ProtoNumber(99999) val msgExtensionReq: Cmd0x346.ExtensionReq? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -548,14 +548,14 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(90000) val msgApplyCopyToRsp: Cmd0x346.ApplyCopyToRsp? = null,
         @JvmField @ProtoNumber(90000) val msgApplyCopyToRsp: Cmd0x346.ApplyCopyToRsp? = null,
         @JvmField @ProtoNumber(90001) val msgApplyCleanTrafficRsp: Cmd0x346.ApplyCleanTrafficRsp? = null,
         @JvmField @ProtoNumber(90001) val msgApplyCleanTrafficRsp: Cmd0x346.ApplyCleanTrafficRsp? = null,
         @JvmField @ProtoNumber(90002) val msgApplyGetTrafficRsp: Cmd0x346.ApplyGetTrafficRsp? = null,
         @JvmField @ProtoNumber(90002) val msgApplyGetTrafficRsp: Cmd0x346.ApplyGetTrafficRsp? = null,
-        @JvmField @ProtoNumber(99999) val msgExtensionRsp: Cmd0x346.ExtensionRsp? = null
+        @JvmField @ProtoNumber(99999) val msgExtensionRsp: Cmd0x346.ExtensionRsp? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class SendListQueryReq(
     internal class SendListQueryReq(
         @JvmField @ProtoNumber(1) val uin: Long = 0L,
         @JvmField @ProtoNumber(1) val uin: Long = 0L,
         @JvmField @ProtoNumber(2) val beginIndex: Int = 0,
         @JvmField @ProtoNumber(2) val beginIndex: Int = 0,
-        @JvmField @ProtoNumber(3) val reqCount: Int = 0
+        @JvmField @ProtoNumber(3) val reqCount: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -568,21 +568,21 @@ internal class Cmd0x346 : ProtoBuf {
         @JvmField @ProtoNumber(6) val isEnd: Int = 0,
         @JvmField @ProtoNumber(6) val isEnd: Int = 0,
         @JvmField @ProtoNumber(7) val totLimit: Long = 0L,
         @JvmField @ProtoNumber(7) val totLimit: Long = 0L,
         @JvmField @ProtoNumber(8) val usedLimit: Long = 0L,
         @JvmField @ProtoNumber(8) val usedLimit: Long = 0L,
-        @JvmField @ProtoNumber(9) val msgFileList: List<Cmd0x346.FileInfo> = emptyList()
+        @JvmField @ProtoNumber(9) val msgFileList: List<Cmd0x346.FileInfo> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class UploadSuccReq(
     internal class UploadSuccReq(
         @JvmField @ProtoNumber(10) val senderUin: Long = 0L,
         @JvmField @ProtoNumber(10) val senderUin: Long = 0L,
         @JvmField @ProtoNumber(20) val recverUin: Long = 0L,
         @JvmField @ProtoNumber(20) val recverUin: Long = 0L,
-        @JvmField @ProtoNumber(30) val uuid: ByteArray = EMPTY_BYTE_ARRAY
+        @JvmField @ProtoNumber(30) val uuid: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class UploadSuccRsp(
     internal class UploadSuccRsp(
         @JvmField @ProtoNumber(10) val int32RetCode: Int = 0,
         @JvmField @ProtoNumber(10) val int32RetCode: Int = 0,
         @JvmField @ProtoNumber(20) val retMsg: String = "",
         @JvmField @ProtoNumber(20) val retMsg: String = "",
-        @JvmField @ProtoNumber(30) val msgFileInfo: Cmd0x346.FileInfo? = null
+        @JvmField @ProtoNumber(30) val msgFileInfo: Cmd0x346.FileInfo? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }
         
         

+ 25 - 25
mirai-core/src/commonMain/kotlin/network/protocol/data/proto/Cmd0x352.kt

@@ -26,14 +26,14 @@ internal class Cmd0x352 : ProtoBuf {
         @ProtoNumber(6) @JvmField val buildVer: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(6) @JvmField val buildVer: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(7) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(7) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(8) @JvmField val picWidth: Int = 0,
         @ProtoNumber(8) @JvmField val picWidth: Int = 0,
-        @ProtoNumber(9) @JvmField val picHeight: Int = 0
+        @ProtoNumber(9) @JvmField val picHeight: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class DelImgRsp(
     internal class DelImgRsp(
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(2) @JvmField val failMsg: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val failMsg: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(3) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(3) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -51,7 +51,7 @@ internal class Cmd0x352 : ProtoBuf {
         @ProtoNumber(12) @JvmField val buType: Int = 0,
         @ProtoNumber(12) @JvmField val buType: Int = 0,
         @ProtoNumber(13) @JvmField val buildVer: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(13) @JvmField val buildVer: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(14) @JvmField val picUpTimestamp: Int = 0,
         @ProtoNumber(14) @JvmField val picUpTimestamp: Int = 0,
-        @ProtoNumber(15) @JvmField val reqTransferType: Int = 0
+        @ProtoNumber(15) @JvmField val reqTransferType: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -73,7 +73,7 @@ internal class Cmd0x352 : ProtoBuf {
         @ProtoNumber(15) @JvmField val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(15) @JvmField val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(16) @JvmField val httpsUrlFlag: Int = 0,
         @ProtoNumber(16) @JvmField val httpsUrlFlag: Int = 0,
         @ProtoNumber(26) @JvmField val msgDownIp6: List<IPv6Info> = emptyList(),
         @ProtoNumber(26) @JvmField val msgDownIp6: List<IPv6Info> = emptyList(),
-        @ProtoNumber(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Suppress("ArrayInDataClass")
     @Suppress("ArrayInDataClass")
@@ -85,22 +85,22 @@ internal class Cmd0x352 : ProtoBuf {
         @ProtoNumber(4) @JvmField val fileWidth: Int = 0,
         @ProtoNumber(4) @JvmField val fileWidth: Int = 0,
         @ProtoNumber(5) @JvmField val fileHeight: Int = 0,
         @ProtoNumber(5) @JvmField val fileHeight: Int = 0,
         @ProtoNumber(6) @JvmField val fileFlag: Long = 0L,
         @ProtoNumber(6) @JvmField val fileFlag: Long = 0L,
-        @ProtoNumber(7) @JvmField val fileCutPos: Int = 0
+        @ProtoNumber(7) @JvmField val fileCutPos: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class IPv6Info(
     internal class IPv6Info(
         @ProtoNumber(1) @JvmField val ip6: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(1) @JvmField val ip6: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(2) @JvmField val port: Int = 0
+        @ProtoNumber(2) @JvmField val port: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class ReqBody(
     internal class ReqBody(
         @ProtoNumber(1) @JvmField val subcmd: Int = 0, //2是GetImgUrlReq 1是UploadImgReq
         @ProtoNumber(1) @JvmField val subcmd: Int = 0, //2是GetImgUrlReq 1是UploadImgReq
-        @ProtoNumber(2) @JvmField val msgTryupImgReq: List<TryUpImgReq> = emptyList(),// optional
-        @ProtoNumber(3) @JvmField val msgGetimgUrlReq: List<GetImgUrlReq> = emptyList(),// optional
+        @ProtoNumber(2) @JvmField val msgTryupImgReq: List<TryUpImgReq> = emptyList(), // optional
+        @ProtoNumber(3) @JvmField val msgGetimgUrlReq: List<GetImgUrlReq> = emptyList(), // optional
         @ProtoNumber(4) @JvmField val msgDelImgReq: List<DelImgReq> = emptyList(),
         @ProtoNumber(4) @JvmField val msgDelImgReq: List<DelImgReq> = emptyList(),
-        @ProtoNumber(10) @JvmField val netType: Int = 0// 数据网络=5, wifi=3
+        @ProtoNumber(10) @JvmField val netType: Int = 0, // 数据网络=5, wifi=3
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -110,24 +110,24 @@ internal class Cmd0x352 : ProtoBuf {
         @ProtoNumber(3) @JvmField val msgGetimgUrlRsp: List<GetImgUrlRsp> = emptyList(),
         @ProtoNumber(3) @JvmField val msgGetimgUrlRsp: List<GetImgUrlRsp> = emptyList(),
         @ProtoNumber(4) @JvmField val boolNewBigchan: Boolean = false,
         @ProtoNumber(4) @JvmField val boolNewBigchan: Boolean = false,
         @ProtoNumber(5) @JvmField val msgDelImgRsp: List<DelImgRsp> = emptyList(),
         @ProtoNumber(5) @JvmField val msgDelImgRsp: List<DelImgRsp> = emptyList(),
-        @ProtoNumber(10) @JvmField val failMsg: String? = ""
+        @ProtoNumber(10) @JvmField val failMsg: String? = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class TryUpImgReq(
     internal class TryUpImgReq(
         @ProtoNumber(1) @JvmField val srcUin: Long,
         @ProtoNumber(1) @JvmField val srcUin: Long,
         @ProtoNumber(2) @JvmField val dstUin: Long,
         @ProtoNumber(2) @JvmField val dstUin: Long,
-        @ProtoNumber(3) @JvmField val fileId: Long = 0L,//从0开始的自增数?貌似有一个连接就要自增1, 但是又会重置回0
+        @ProtoNumber(3) @JvmField val fileId: Long = 0L, //从0开始的自增数?貌似有一个连接就要自增1, 但是又会重置回0
         @ProtoNumber(4) @JvmField val fileMd5: ByteArray,
         @ProtoNumber(4) @JvmField val fileMd5: ByteArray,
-        @ProtoNumber(5) @JvmField val fileSize: Long,//默认为md5+".jpg"
+        @ProtoNumber(5) @JvmField val fileSize: Long, //默认为md5+".jpg"
         @ProtoNumber(6) @JvmField val fileName: String,
         @ProtoNumber(6) @JvmField val fileName: String,
         @ProtoNumber(7) @JvmField val srcTerm: Int = 5,
         @ProtoNumber(7) @JvmField val srcTerm: Int = 5,
         @ProtoNumber(8) @JvmField val platformType: Int = 9,
         @ProtoNumber(8) @JvmField val platformType: Int = 9,
         @ProtoNumber(9) @JvmField val innerIP: Int = 0,
         @ProtoNumber(9) @JvmField val innerIP: Int = 0,
-        @ProtoNumber(10) @JvmField val addressBook: Boolean = false,//chatType == 1006为true 我觉得发false没问题
-        @ProtoNumber(11) @JvmField val retry: Int = 0,//default
-        @ProtoNumber(12) @JvmField val buType: Int = 1,//1或96 不确定
-        @ProtoNumber(13) @JvmField val imgOriginal: Boolean = false,//是否为原图
+        @ProtoNumber(10) @JvmField val addressBook: Boolean = false, //chatType == 1006为true 我觉得发false没问题
+        @ProtoNumber(11) @JvmField val retry: Int = 0, //default
+        @ProtoNumber(12) @JvmField val buType: Int = 1, //1或96 不确定
+        @ProtoNumber(13) @JvmField val imgOriginal: Boolean = false, //是否为原图
         @ProtoNumber(14) @JvmField val imgWidth: Int = 0,
         @ProtoNumber(14) @JvmField val imgWidth: Int = 0,
         @ProtoNumber(15) @JvmField val imgHeight: Int = 0,
         @ProtoNumber(15) @JvmField val imgHeight: Int = 0,
         /**
         /**
@@ -141,13 +141,13 @@ internal class Cmd0x352 : ProtoBuf {
          *  SHARPP: 1004
          *  SHARPP: 1004
          */
          */
         @ProtoNumber(16) @JvmField val imgType: Int = 1000,
         @ProtoNumber(16) @JvmField val imgType: Int = 1000,
-        @ProtoNumber(17) @JvmField val buildVer: String = "8.2.7.4410",//版本号
-        @ProtoNumber(18) @JvmField val fileIndex: ByteArray = EMPTY_BYTE_ARRAY,//default
-        @ProtoNumber(19) @JvmField val fileStoreDays: Int = 0,//default
-        @ProtoNumber(20) @JvmField val stepFlag: Int = 0,//default
-        @ProtoNumber(21) @JvmField val rejectTryFast: Boolean = false,//bool
-        @ProtoNumber(22) @JvmField val srvUpload: Int = 1,//typeHotPic[1/2/3]
-        @ProtoNumber(23) @JvmField val transferUrl: ByteArray = EMPTY_BYTE_ARRAY//rawDownloadUrl, 如果没有就是EMPTY_BYTE_ARRAY
+        @ProtoNumber(17) @JvmField val buildVer: String = "8.2.7.4410", //版本号
+        @ProtoNumber(18) @JvmField val fileIndex: ByteArray = EMPTY_BYTE_ARRAY, //default
+        @ProtoNumber(19) @JvmField val fileStoreDays: Int = 0, //default
+        @ProtoNumber(20) @JvmField val stepFlag: Int = 0, //default
+        @ProtoNumber(21) @JvmField val rejectTryFast: Boolean = false, //bool
+        @ProtoNumber(22) @JvmField val srvUpload: Int = 1, //typeHotPic[1/2/3]
+        @ProtoNumber(23) @JvmField val transferUrl: ByteArray = EMPTY_BYTE_ARRAY, //rawDownloadUrl, 如果没有就是EMPTY_BYTE_ARRAY
     ) : ImgReq
     ) : ImgReq
 
 
     @Serializable
     @Serializable
@@ -175,7 +175,7 @@ internal class Cmd0x352 : ProtoBuf {
         @ProtoNumber(64) @JvmField val bigDownPara: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(64) @JvmField val bigDownPara: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(65) @JvmField val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(65) @JvmField val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(66) @JvmField val httpsUrlFlag: Int = 0,
         @ProtoNumber(66) @JvmField val httpsUrlFlag: Int = 0,
-        @ProtoNumber(1001) @JvmField val msgInfo4busi: TryUpInfo4Busi? = null
+        @ProtoNumber(1001) @JvmField val msgInfo4busi: TryUpInfo4Busi? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -184,6 +184,6 @@ internal class Cmd0x352 : ProtoBuf {
         @ProtoNumber(2) @JvmField val downDomain: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val downDomain: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val thumbDownUrl: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val thumbDownUrl: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(4) @JvmField val originalDownUrl: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(4) @JvmField val originalDownUrl: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(5) @JvmField val bigDownUrl: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(5) @JvmField val bigDownUrl: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }

+ 40 - 40
mirai-core/src/commonMain/kotlin/network/protocol/data/proto/Cmd0x388.kt

@@ -17,7 +17,7 @@ import net.mamoe.mirai.utils.EMPTY_BYTE_ARRAY
 @Serializable
 @Serializable
 internal class Cmd0x388 : ProtoBuf {
 internal class Cmd0x388 : ProtoBuf {
     @Serializable
     @Serializable
-internal class DelImgReq(
+    internal class DelImgReq(
         @ProtoNumber(1) @JvmField val srcUin: Long = 0L,
         @ProtoNumber(1) @JvmField val srcUin: Long = 0L,
         @ProtoNumber(2) @JvmField val dstUin: Long = 0L,
         @ProtoNumber(2) @JvmField val dstUin: Long = 0L,
         @ProtoNumber(3) @JvmField val reqTerm: Int = 0,
         @ProtoNumber(3) @JvmField val reqTerm: Int = 0,
@@ -26,40 +26,40 @@ internal class DelImgReq(
         @ProtoNumber(6) @JvmField val buildVer: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(6) @JvmField val buildVer: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(7) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(7) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(8) @JvmField val picWidth: Int = 0,
         @ProtoNumber(8) @JvmField val picWidth: Int = 0,
-        @ProtoNumber(9) @JvmField val picHeight: Int = 0
+        @ProtoNumber(9) @JvmField val picHeight: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class DelImgRsp(
+    internal class DelImgRsp(
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(2) @JvmField val failMsg: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val failMsg: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(3) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(3) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class ExpRoamExtendInfo(
-        @ProtoNumber(1) @JvmField val resid: ByteArray = EMPTY_BYTE_ARRAY
+    internal class ExpRoamExtendInfo(
+        @ProtoNumber(1) @JvmField val resid: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class ExpRoamPicInfo(
+    internal class ExpRoamPicInfo(
         @ProtoNumber(1) @JvmField val shopFlag: Int = 0,
         @ProtoNumber(1) @JvmField val shopFlag: Int = 0,
         @ProtoNumber(2) @JvmField val pkgId: Int = 0,
         @ProtoNumber(2) @JvmField val pkgId: Int = 0,
-        @ProtoNumber(3) @JvmField val picId: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(3) @JvmField val picId: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class ExtensionCommPicTryUp(
-        @ProtoNumber(1) @JvmField val bytesExtinfo: List<ByteArray> = emptyList()
+    internal class ExtensionCommPicTryUp(
+        @ProtoNumber(1) @JvmField val bytesExtinfo: List<ByteArray> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class ExtensionExpRoamTryUp(
-        @ProtoNumber(1) @JvmField val msgExproamPicInfo: List<ExpRoamPicInfo> = emptyList()
+    internal class ExtensionExpRoamTryUp(
+        @ProtoNumber(1) @JvmField val msgExproamPicInfo: List<ExpRoamPicInfo> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class GetImgUrlReq(
+    internal class GetImgUrlReq(
         @ProtoNumber(1) @JvmField val groupCode: Long = 0L,
         @ProtoNumber(1) @JvmField val groupCode: Long = 0L,
         @ProtoNumber(2) @JvmField val dstUin: Long = 0L,
         @ProtoNumber(2) @JvmField val dstUin: Long = 0L,
         @ProtoNumber(3) @JvmField val fileid: Long = 0L,
         @ProtoNumber(3) @JvmField val fileid: Long = 0L,
@@ -79,11 +79,11 @@ internal class GetImgUrlReq(
         @ProtoNumber(17) @JvmField val fileWidth: Int = 0,
         @ProtoNumber(17) @JvmField val fileWidth: Int = 0,
         @ProtoNumber(18) @JvmField val picType: Int = 0,
         @ProtoNumber(18) @JvmField val picType: Int = 0,
         @ProtoNumber(19) @JvmField val picUpTimestamp: Int = 0,
         @ProtoNumber(19) @JvmField val picUpTimestamp: Int = 0,
-        @ProtoNumber(20) @JvmField val reqTransferType: Int = 0
+        @ProtoNumber(20) @JvmField val reqTransferType: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class GetImgUrlRsp(
+    internal class GetImgUrlRsp(
         @ProtoNumber(1) @JvmField val fileid: Long = 0L,
         @ProtoNumber(1) @JvmField val fileid: Long = 0L,
         @ProtoNumber(2) @JvmField val fileMd5: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val fileMd5: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val result: Int = 0,
         @ProtoNumber(3) @JvmField val result: Int = 0,
@@ -104,11 +104,11 @@ internal class GetImgUrlRsp(
         @ProtoNumber(19) @JvmField val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(19) @JvmField val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(20) @JvmField val httpsUrlFlag: Int = 0,
         @ProtoNumber(20) @JvmField val httpsUrlFlag: Int = 0,
         @ProtoNumber(26) @JvmField val msgDownIp6: List<IPv6Info> = emptyList(),
         @ProtoNumber(26) @JvmField val msgDownIp6: List<IPv6Info> = emptyList(),
-        @ProtoNumber(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class GetPttUrlReq(
+    internal class GetPttUrlReq(
         @ProtoNumber(1) @JvmField val groupCode: Long = 0L,
         @ProtoNumber(1) @JvmField val groupCode: Long = 0L,
         @ProtoNumber(2) @JvmField val dstUin: Long = 0L,
         @ProtoNumber(2) @JvmField val dstUin: Long = 0L,
         @ProtoNumber(3) @JvmField val fileid: Long = 0L,
         @ProtoNumber(3) @JvmField val fileid: Long = 0L,
@@ -123,11 +123,11 @@ internal class GetPttUrlReq(
         @ProtoNumber(12) @JvmField val codec: Int = 0,
         @ProtoNumber(12) @JvmField val codec: Int = 0,
         @ProtoNumber(13) @JvmField val buId: Int = 0,
         @ProtoNumber(13) @JvmField val buId: Int = 0,
         @ProtoNumber(14) @JvmField val reqTransferType: Int = 0,
         @ProtoNumber(14) @JvmField val reqTransferType: Int = 0,
-        @ProtoNumber(15) @JvmField val isAuto: Int = 0
+        @ProtoNumber(15) @JvmField val isAuto: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class GetPttUrlRsp(
+    internal class GetPttUrlRsp(
         @ProtoNumber(1) @JvmField val fileid: Long = 0L,
         @ProtoNumber(1) @JvmField val fileid: Long = 0L,
         @ProtoNumber(2) @JvmField val fileMd5: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val fileMd5: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val result: Int = 0,
         @ProtoNumber(3) @JvmField val result: Int = 0,
@@ -142,17 +142,17 @@ internal class GetPttUrlRsp(
         @ProtoNumber(12) @JvmField val allowRetry: Int = 0,
         @ProtoNumber(12) @JvmField val allowRetry: Int = 0,
         @ProtoNumber(26) @JvmField val msgDownIp6: List<IPv6Info> = emptyList(),
         @ProtoNumber(26) @JvmField val msgDownIp6: List<IPv6Info> = emptyList(),
         @ProtoNumber(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(28) @JvmField val strDomain: String = ""
+        @ProtoNumber(28) @JvmField val strDomain: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Suppress("ArrayInDataClass")
     @Suppress("ArrayInDataClass")
     @Serializable
     @Serializable
-internal class ImgInfo(
+    internal class ImgInfo(
         @ProtoNumber(1) @JvmField val fileMd5: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(1) @JvmField val fileMd5: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val fileType: Int = 0,
         @ProtoNumber(2) @JvmField val fileType: Int = 0,
         @ProtoNumber(3) @JvmField val fileSize: Long = 0L,
         @ProtoNumber(3) @JvmField val fileSize: Long = 0L,
         @ProtoNumber(4) @JvmField val fileWidth: Int = 0,
         @ProtoNumber(4) @JvmField val fileWidth: Int = 0,
-        @ProtoNumber(5) @JvmField val fileHeight: Int = 0
+        @ProtoNumber(5) @JvmField val fileHeight: Int = 0,
     ) : ProtoBuf {
     ) : ProtoBuf {
         override fun toString(): String {
         override fun toString(): String {
             return "ImgInfo(fileMd5=${fileMd5.contentToString()}, fileType=$fileType, fileSize=$fileSize, fileWidth=$fileWidth, fileHeight=$fileHeight)"
             return "ImgInfo(fileMd5=${fileMd5.contentToString()}, fileType=$fileType, fileSize=$fileSize, fileWidth=$fileWidth, fileHeight=$fileHeight)"
@@ -160,20 +160,20 @@ internal class ImgInfo(
     }
     }
 
 
     @Serializable
     @Serializable
-internal class IPv6Info(
+    internal class IPv6Info(
         @ProtoNumber(1) @JvmField val ip6: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(1) @JvmField val ip6: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(2) @JvmField val port: Int = 0
+        @ProtoNumber(2) @JvmField val port: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class PicSize(
+    internal class PicSize(
         @ProtoNumber(1) @JvmField val original: Int = 0,
         @ProtoNumber(1) @JvmField val original: Int = 0,
         @ProtoNumber(2) @JvmField val thumb: Int = 0,
         @ProtoNumber(2) @JvmField val thumb: Int = 0,
-        @ProtoNumber(3) @JvmField val high: Int = 0
+        @ProtoNumber(3) @JvmField val high: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class ReqBody(
+    internal class ReqBody(
         @ProtoNumber(1) @JvmField val netType: Int = 0,
         @ProtoNumber(1) @JvmField val netType: Int = 0,
         @ProtoNumber(2) @JvmField val subcmd: Int = 0,
         @ProtoNumber(2) @JvmField val subcmd: Int = 0,
         @ProtoNumber(3) @JvmField val msgTryupImgReq: List<TryUpImgReq> = emptyList(),
         @ProtoNumber(3) @JvmField val msgTryupImgReq: List<TryUpImgReq> = emptyList(),
@@ -182,22 +182,22 @@ internal class ReqBody(
         @ProtoNumber(6) @JvmField val msgGetpttUrlReq: List<GetPttUrlReq> = emptyList(),
         @ProtoNumber(6) @JvmField val msgGetpttUrlReq: List<GetPttUrlReq> = emptyList(),
         @ProtoNumber(7) @JvmField val commandId: Int = 0,
         @ProtoNumber(7) @JvmField val commandId: Int = 0,
         @ProtoNumber(8) @JvmField val msgDelImgReq: List<DelImgReq> = emptyList(),
         @ProtoNumber(8) @JvmField val msgDelImgReq: List<DelImgReq> = emptyList(),
-        @ProtoNumber(1001) @JvmField val extension: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(1001) @JvmField val extension: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class RspBody(
+    internal class RspBody(
         @ProtoNumber(1) @JvmField val clientIp: Int = 0,
         @ProtoNumber(1) @JvmField val clientIp: Int = 0,
         @ProtoNumber(2) @JvmField val subcmd: Int = 0,
         @ProtoNumber(2) @JvmField val subcmd: Int = 0,
         @ProtoNumber(3) @JvmField val msgTryupImgRsp: List<TryUpImgRsp> = emptyList(),
         @ProtoNumber(3) @JvmField val msgTryupImgRsp: List<TryUpImgRsp> = emptyList(),
         @ProtoNumber(4) @JvmField val msgGetimgUrlRsp: List<GetImgUrlRsp> = emptyList(),
         @ProtoNumber(4) @JvmField val msgGetimgUrlRsp: List<GetImgUrlRsp> = emptyList(),
         @ProtoNumber(5) @JvmField val msgTryupPttRsp: List<TryUpPttRsp> = emptyList(),
         @ProtoNumber(5) @JvmField val msgTryupPttRsp: List<TryUpPttRsp> = emptyList(),
         @ProtoNumber(6) @JvmField val msgGetpttUrlRsp: List<GetPttUrlRsp> = emptyList(),
         @ProtoNumber(6) @JvmField val msgGetpttUrlRsp: List<GetPttUrlRsp> = emptyList(),
-        @ProtoNumber(7) @JvmField val msgDelImgRsp: List<DelImgRsp> = emptyList()
+        @ProtoNumber(7) @JvmField val msgDelImgRsp: List<DelImgRsp> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class TryUpImgReq(
+    internal class TryUpImgReq(
         @ProtoNumber(1) @JvmField val groupCode: Long = 0L,
         @ProtoNumber(1) @JvmField val groupCode: Long = 0L,
         @ProtoNumber(2) @JvmField val srcUin: Long = 0L,
         @ProtoNumber(2) @JvmField val srcUin: Long = 0L,
         @ProtoNumber(3) @JvmField val fileId: Long = 0L,
         @ProtoNumber(3) @JvmField val fileId: Long = 0L,
@@ -224,11 +224,11 @@ internal class TryUpImgReq(
         @ProtoNumber(17) @JvmField val fileIndex: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(17) @JvmField val fileIndex: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(18) @JvmField val dstUin: Long = 0L,
         @ProtoNumber(18) @JvmField val dstUin: Long = 0L,
         @ProtoNumber(19) @JvmField val srvUpload: Int = 0,
         @ProtoNumber(19) @JvmField val srvUpload: Int = 0,
-        @ProtoNumber(20) @JvmField val transferUrl: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(20) @JvmField val transferUrl: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ImgReq
     ) : ImgReq
 
 
     @Serializable
     @Serializable
-internal class TryUpImgRsp(
+    internal class TryUpImgRsp(
         @ProtoNumber(1) @JvmField val fileId: Long = 0L,
         @ProtoNumber(1) @JvmField val fileId: Long = 0L,
         @ProtoNumber(2) @JvmField val result: Int = 0,
         @ProtoNumber(2) @JvmField val result: Int = 0,
         @ProtoNumber(3) @JvmField val failMsg: String = "",
         @ProtoNumber(3) @JvmField val failMsg: String = "",
@@ -243,20 +243,20 @@ internal class TryUpImgRsp(
         @ProtoNumber(12) @JvmField val boolNewBigChan: Boolean = false,
         @ProtoNumber(12) @JvmField val boolNewBigChan: Boolean = false,
         @ProtoNumber(26) @JvmField val msgUpIp6: List<IPv6Info> = emptyList(),
         @ProtoNumber(26) @JvmField val msgUpIp6: List<IPv6Info> = emptyList(),
         @ProtoNumber(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(1001) @JvmField val msgInfo4busi: TryUpInfo4Busi? = null
+        @ProtoNumber(1001) @JvmField val msgInfo4busi: TryUpInfo4Busi? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class TryUpInfo4Busi(
+    internal class TryUpInfo4Busi(
         @ProtoNumber(1) @JvmField val downDomain: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(1) @JvmField val downDomain: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val thumbDownUrl: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val thumbDownUrl: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val originalDownUrl: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val originalDownUrl: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(4) @JvmField val bigDownUrl: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(4) @JvmField val bigDownUrl: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(5) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(5) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class TryUpPttReq(
+    internal class TryUpPttReq(
         @ProtoNumber(1) @JvmField val groupCode: Long = 0L,
         @ProtoNumber(1) @JvmField val groupCode: Long = 0L,
         @ProtoNumber(2) @JvmField val srcUin: Long = 0L,
         @ProtoNumber(2) @JvmField val srcUin: Long = 0L,
         @ProtoNumber(3) @JvmField val fileId: Long = 0L,
         @ProtoNumber(3) @JvmField val fileId: Long = 0L,
@@ -272,11 +272,11 @@ internal class TryUpPttReq(
         @ProtoNumber(13) @JvmField val boolNewUpChan: Boolean = false,
         @ProtoNumber(13) @JvmField val boolNewUpChan: Boolean = false,
         @ProtoNumber(14) @JvmField val codec: Int = 0,
         @ProtoNumber(14) @JvmField val codec: Int = 0,
         @ProtoNumber(15) @JvmField val voiceType: Int = 0,
         @ProtoNumber(15) @JvmField val voiceType: Int = 0,
-        @ProtoNumber(16) @JvmField val buId: Int = 0
+        @ProtoNumber(16) @JvmField val buId: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class TryUpPttRsp(
+    internal class TryUpPttRsp(
         @ProtoNumber(1) @JvmField val fileId: Long = 0L,
         @ProtoNumber(1) @JvmField val fileId: Long = 0L,
         @ProtoNumber(2) @JvmField val result: Int = 0,
         @ProtoNumber(2) @JvmField val result: Int = 0,
         @ProtoNumber(3) @JvmField val failMsg: ByteArray? = null,
         @ProtoNumber(3) @JvmField val failMsg: ByteArray? = null,
@@ -290,6 +290,6 @@ internal class TryUpPttRsp(
         @ProtoNumber(11) @JvmField val fileKey: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(11) @JvmField val fileKey: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(12) @JvmField val channelType: Int = 0,
         @ProtoNumber(12) @JvmField val channelType: Int = 0,
         @ProtoNumber(26) @JvmField val msgUpIp6: List<IPv6Info> = emptyList(),
         @ProtoNumber(26) @JvmField val msgUpIp6: List<IPv6Info> = emptyList(),
-        @ProtoNumber(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }

+ 35 - 35
mirai-core/src/commonMain/kotlin/network/protocol/data/proto/Cmd0x857.kt

@@ -28,7 +28,7 @@ internal class GroupOpenSysMsg : ProtoBuf {
         @ProtoNumber(5) @JvmField val ver: String = "",
         @ProtoNumber(5) @JvmField val ver: String = "",
         @ProtoNumber(6) @JvmField val meta: String = "",
         @ProtoNumber(6) @JvmField val meta: String = "",
         @ProtoNumber(7) @JvmField val config: String = "",
         @ProtoNumber(7) @JvmField val config: String = "",
-        @ProtoNumber(8) @JvmField val source: Source? = null
+        @ProtoNumber(8) @JvmField val source: Source? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -38,7 +38,7 @@ internal class GroupOpenSysMsg : ProtoBuf {
         @ProtoNumber(3) @JvmField val brief: String = "",
         @ProtoNumber(3) @JvmField val brief: String = "",
         @ProtoNumber(4) @JvmField val cover: String = "",
         @ProtoNumber(4) @JvmField val cover: String = "",
         @ProtoNumber(5) @JvmField val url: String = "",
         @ProtoNumber(5) @JvmField val url: String = "",
-        @ProtoNumber(6) @JvmField val source: Source? = null
+        @ProtoNumber(6) @JvmField val source: Source? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -46,14 +46,14 @@ internal class GroupOpenSysMsg : ProtoBuf {
         @ProtoNumber(1) @JvmField val uin: Long = 0L,
         @ProtoNumber(1) @JvmField val uin: Long = 0L,
         @ProtoNumber(2) @JvmField val nick: String = "",
         @ProtoNumber(2) @JvmField val nick: String = "",
         @ProtoNumber(3) @JvmField val avatar: String = "",
         @ProtoNumber(3) @JvmField val avatar: String = "",
-        @ProtoNumber(4) @JvmField val url: String = ""
+        @ProtoNumber(4) @JvmField val url: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class Source(
     internal class Source(
         @ProtoNumber(1) @JvmField val name: String = "",
         @ProtoNumber(1) @JvmField val name: String = "",
         @ProtoNumber(2) @JvmField val icon: String = "",
         @ProtoNumber(2) @JvmField val icon: String = "",
-        @ProtoNumber(3) @JvmField val url: String = ""
+        @ProtoNumber(3) @JvmField val url: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -64,7 +64,7 @@ internal class GroupOpenSysMsg : ProtoBuf {
         @ProtoNumber(4) @JvmField val msgType: Int = 0,
         @ProtoNumber(4) @JvmField val msgType: Int = 0,
         @ProtoNumber(5) @JvmField val content: String = "",
         @ProtoNumber(5) @JvmField val content: String = "",
         @ProtoNumber(6) @JvmField val richMsg: RichMsg? = null,
         @ProtoNumber(6) @JvmField val richMsg: RichMsg? = null,
-        @ProtoNumber(7) @JvmField val lightApp: LightApp? = null
+        @ProtoNumber(7) @JvmField val lightApp: LightApp? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }
 
 
@@ -78,7 +78,7 @@ internal class TroopTips0x857 : ProtoBuf {
         @ProtoNumber(4) @JvmField val optBytesBrief: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(4) @JvmField val optBytesBrief: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(5) @JvmField val receiverUin: Long = 0L,
         @ProtoNumber(5) @JvmField val receiverUin: Long = 0L,
         @ProtoNumber(6) @JvmField val reliaoAdminOpt: Int = 0,
         @ProtoNumber(6) @JvmField val reliaoAdminOpt: Int = 0,
-        @ProtoNumber(7) @JvmField val robotGroupOpt: Int = 0
+        @ProtoNumber(7) @JvmField val robotGroupOpt: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -90,12 +90,12 @@ internal class TroopTips0x857 : ProtoBuf {
         @ProtoNumber(5) @JvmField val optBytesData: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(5) @JvmField val optBytesData: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(6) @JvmField val optBytesDataI: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(6) @JvmField val optBytesDataI: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(7) @JvmField val optBytesDataA: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(7) @JvmField val optBytesDataA: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(8) @JvmField val optBytesDataP: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(8) @JvmField val optBytesDataP: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class FloatedTipsInfo(
     internal class FloatedTipsInfo(
-        @ProtoNumber(1) @JvmField val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(1) @JvmField val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -109,7 +109,7 @@ internal class TroopTips0x857 : ProtoBuf {
         @ProtoNumber(7) @JvmField val msgTemplParam: List<TemplParam> = emptyList(),
         @ProtoNumber(7) @JvmField val msgTemplParam: List<TemplParam> = emptyList(),
         @ProtoNumber(8) @JvmField val content: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(8) @JvmField val content: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(10) @JvmField val tipsSeqId: Long = 0L,
         @ProtoNumber(10) @JvmField val tipsSeqId: Long = 0L,
-        @ProtoNumber(100) @JvmField val pbReserv: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(100) @JvmField val pbReserv: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -122,25 +122,25 @@ internal class TroopTips0x857 : ProtoBuf {
         @ProtoNumber(6) @JvmField val interval: Int = 0,
         @ProtoNumber(6) @JvmField val interval: Int = 0,
         @ProtoNumber(7) @JvmField val finish: Int = 0,
         @ProtoNumber(7) @JvmField val finish: Int = 0,
         @ProtoNumber(8) @JvmField val uin: List<Long> = emptyList(),
         @ProtoNumber(8) @JvmField val uin: List<Long> = emptyList(),
-        @ProtoNumber(9) @JvmField val action: Int = 0
+        @ProtoNumber(9) @JvmField val action: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class GroupInfoChange(
     internal class GroupInfoChange(
-        @ProtoNumber(1) @JvmField val groupHonorSwitch: Int = 0
+        @ProtoNumber(1) @JvmField val groupHonorSwitch: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class GroupNotifyInfo(
     internal class GroupNotifyInfo(
         @ProtoNumber(1) @JvmField val optUint32AutoPullFlag: Int = 0,
         @ProtoNumber(1) @JvmField val optUint32AutoPullFlag: Int = 0,
-        @ProtoNumber(2) @JvmField val optBytesFeedsId: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(2) @JvmField val optBytesFeedsId: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class InstCtrl(
     internal class InstCtrl(
         @ProtoNumber(1) @JvmField val msgSendToInst: List<InstInfo> = emptyList(),
         @ProtoNumber(1) @JvmField val msgSendToInst: List<InstInfo> = emptyList(),
         @ProtoNumber(2) @JvmField val msgExcludeInst: List<InstInfo> = emptyList(),
         @ProtoNumber(2) @JvmField val msgExcludeInst: List<InstInfo> = emptyList(),
-        @ProtoNumber(3) @JvmField val msgFromInst: InstInfo? = null
+        @ProtoNumber(3) @JvmField val msgFromInst: InstInfo? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -153,7 +153,7 @@ internal class TroopTips0x857 : ProtoBuf {
         @ProtoNumber(6) @JvmField val ssoBid: Int = 0,
         @ProtoNumber(6) @JvmField val ssoBid: Int = 0,
         @ProtoNumber(7) @JvmField val guid: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(7) @JvmField val guid: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(8) @JvmField val verMin: Int = 0,
         @ProtoNumber(8) @JvmField val verMin: Int = 0,
-        @ProtoNumber(9) @JvmField val verMax: Int = 0
+        @ProtoNumber(9) @JvmField val verMax: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -167,12 +167,12 @@ internal class TroopTips0x857 : ProtoBuf {
         @ProtoNumber(7) @JvmField val msgSeq: Long = 0L,
         @ProtoNumber(7) @JvmField val msgSeq: Long = 0L,
         @ProtoNumber(8) @JvmField val joinNums: Int = 0,
         @ProtoNumber(8) @JvmField val joinNums: Int = 0,
         @ProtoNumber(99) @JvmField val pushType: Int = 0,
         @ProtoNumber(99) @JvmField val pushType: Int = 0,
-        @ProtoNumber(100) @JvmField val extInfo: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(100) @JvmField val extInfo: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class LuckyBagNotify(
     internal class LuckyBagNotify(
-        @ProtoNumber(1) @JvmField val msgTips: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(1) @JvmField val msgTips: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -188,13 +188,13 @@ internal class TroopTips0x857 : ProtoBuf {
         @ProtoNumber(9) @JvmField val msgPerSetting: PersonalSetting? = null,
         @ProtoNumber(9) @JvmField val msgPerSetting: PersonalSetting? = null,
         @ProtoNumber(10) @JvmField val playMode: Int = 0,
         @ProtoNumber(10) @JvmField val playMode: Int = 0,
         @ProtoNumber(99) @JvmField val mediaType: Int = 0,
         @ProtoNumber(99) @JvmField val mediaType: Int = 0,
-        @ProtoNumber(100) @JvmField val extInfo: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(100) @JvmField val extInfo: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf {
     ) : ProtoBuf {
         @Serializable
         @Serializable
         internal class PersonalSetting(
         internal class PersonalSetting(
             @ProtoNumber(1) @JvmField val themeId: Int = 0,
             @ProtoNumber(1) @JvmField val themeId: Int = 0,
             @ProtoNumber(2) @JvmField val playerId: Int = 0,
             @ProtoNumber(2) @JvmField val playerId: Int = 0,
-            @ProtoNumber(3) @JvmField val fontId: Int = 0
+            @ProtoNumber(3) @JvmField val fontId: Int = 0,
         ) : ProtoBuf
         ) : ProtoBuf
     }
     }
 
 
@@ -202,7 +202,7 @@ internal class TroopTips0x857 : ProtoBuf {
     internal class MessageBoxInfo(
     internal class MessageBoxInfo(
         @ProtoNumber(1) @JvmField val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(1) @JvmField val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val optBytesTitle: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val optBytesTitle: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(3) @JvmField val optBytesButton: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(3) @JvmField val optBytesButton: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -213,7 +213,7 @@ internal class TroopTips0x857 : ProtoBuf {
         @ProtoNumber(4) @JvmField val reminderContent: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(4) @JvmField val reminderContent: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(5) @JvmField val userdef: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(5) @JvmField val userdef: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(6) @JvmField val groupType: Int = 0,
         @ProtoNumber(6) @JvmField val groupType: Int = 0,
-        @ProtoNumber(7) @JvmField val opType: Int = 0
+        @ProtoNumber(7) @JvmField val opType: Int = 0,
     ) : ProtoBuf {
     ) : ProtoBuf {
         @Serializable
         @Serializable
         internal class MessageMeta(
         internal class MessageMeta(
@@ -222,13 +222,13 @@ internal class TroopTips0x857 : ProtoBuf {
             @ProtoNumber(3) @JvmField val msgRandom: Int = 0,
             @ProtoNumber(3) @JvmField val msgRandom: Int = 0,
             @ProtoNumber(4) @JvmField val msgType: Int = 0,
             @ProtoNumber(4) @JvmField val msgType: Int = 0,
             @ProtoNumber(5) @JvmField val msgFlag: Int = 0,
             @ProtoNumber(5) @JvmField val msgFlag: Int = 0,
-            @ProtoNumber(6) @JvmField val authorUin: Long = 0L
+            @ProtoNumber(6) @JvmField val authorUin: Long = 0L,
         ) : ProtoBuf
         ) : ProtoBuf
     }
     }
 
 
     @Serializable
     @Serializable
     internal class MiniAppNotify(
     internal class MiniAppNotify(
-        @ProtoNumber(1) @JvmField val msg: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(1) @JvmField val msg: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -260,14 +260,14 @@ internal class TroopTips0x857 : ProtoBuf {
         @ProtoNumber(27) @JvmField val optMsgVideoPush: VideoChangePushInfo? = null,
         @ProtoNumber(27) @JvmField val optMsgVideoPush: VideoChangePushInfo? = null,
         @ProtoNumber(28) @JvmField val optLbsShareChangePlusInfo: LbsShareChangePushInfo? = null,
         @ProtoNumber(28) @JvmField val optLbsShareChangePlusInfo: LbsShareChangePushInfo? = null,
         @ProtoNumber(29) @JvmField val optMsgSingPush: SingChangePushInfo? = null,
         @ProtoNumber(29) @JvmField val optMsgSingPush: SingChangePushInfo? = null,
-        @ProtoNumber(30) @JvmField val optMsgGroupInfoChange: GroupInfoChange? = null
+        @ProtoNumber(30) @JvmField val optMsgGroupInfoChange: GroupInfoChange? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class NotifyObjmsgUpdate(
     internal class NotifyObjmsgUpdate(
         @ProtoNumber(1) @JvmField val objmsgId: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(1) @JvmField val objmsgId: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val updateType: Int = 0,
         @ProtoNumber(2) @JvmField val updateType: Int = 0,
-        @ProtoNumber(3) @JvmField val extMsg: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(3) @JvmField val extMsg: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -290,7 +290,7 @@ internal class TroopTips0x857 : ProtoBuf {
         @ProtoNumber(16) @JvmField val idiom: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(16) @JvmField val idiom: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(17) @JvmField val idiomSeq: Int = 0,
         @ProtoNumber(17) @JvmField val idiomSeq: Int = 0,
         @ProtoNumber(18) @JvmField val idiomAlpha: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(18) @JvmField val idiomAlpha: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(19) @JvmField val jumpurl: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(19) @JvmField val jumpurl: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -300,12 +300,12 @@ internal class TroopTips0x857 : ProtoBuf {
         @ProtoNumber(3) @JvmField val optUint32Offline: Int = 0,
         @ProtoNumber(3) @JvmField val optUint32Offline: Int = 0,
         @ProtoNumber(4) @JvmField val msgInstCtrl: InstCtrl? = null,
         @ProtoNumber(4) @JvmField val msgInstCtrl: InstCtrl? = null,
         @ProtoNumber(5) @JvmField val optBytesMsg: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(5) @JvmField val optBytesMsg: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(6) @JvmField val optUint32BusiType: Int = 0
+        @ProtoNumber(6) @JvmField val optUint32BusiType: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class RspBody(
     internal class RspBody(
-        @ProtoNumber(1) @JvmField val optUint64GroupCode: Long = 0L
+        @ProtoNumber(1) @JvmField val optUint64GroupCode: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -315,13 +315,13 @@ internal class TroopTips0x857 : ProtoBuf {
         @ProtoNumber(3) @JvmField val groupId: Long = 0L,
         @ProtoNumber(3) @JvmField val groupId: Long = 0L,
         @ProtoNumber(4) @JvmField val operUin: Long = 0L,
         @ProtoNumber(4) @JvmField val operUin: Long = 0L,
         @ProtoNumber(5) @JvmField val grayTips: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(5) @JvmField val grayTips: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(6) @JvmField val joinNums: Int = 0
+        @ProtoNumber(6) @JvmField val joinNums: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class TemplParam(
     internal class TemplParam(
         @ProtoNumber(1) @JvmField val name: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(1) @JvmField val name: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(2) @JvmField val value: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(2) @JvmField val value: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -330,7 +330,7 @@ internal class TroopTips0x857 : ProtoBuf {
         @ProtoNumber(2) @JvmField val feedsId: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val feedsId: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val themeName: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val themeName: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(4) @JvmField val actionUin: Long = 0L,
         @ProtoNumber(4) @JvmField val actionUin: Long = 0L,
-        @ProtoNumber(5) @JvmField val createUin: Long = 0L
+        @ProtoNumber(5) @JvmField val createUin: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -339,7 +339,7 @@ internal class TroopTips0x857 : ProtoBuf {
         @ProtoNumber(2) @JvmField val creatorUin: Long = 0L,
         @ProtoNumber(2) @JvmField val creatorUin: Long = 0L,
         @ProtoNumber(3) @JvmField val richContent: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val richContent: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(4) @JvmField val optBytesUrl: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(4) @JvmField val optBytesUrl: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(5) @JvmField val creatorNick: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(5) @JvmField val creatorNick: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -350,7 +350,7 @@ internal class TroopTips0x857 : ProtoBuf {
         @ProtoNumber(4) @JvmField val operUin: Long = 0L,
         @ProtoNumber(4) @JvmField val operUin: Long = 0L,
         @ProtoNumber(5) @JvmField val grayTips: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(5) @JvmField val grayTips: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(6) @JvmField val joinNums: Int = 0,
         @ProtoNumber(6) @JvmField val joinNums: Int = 0,
-        @ProtoNumber(100) @JvmField val extInfo: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(100) @JvmField val extInfo: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -371,14 +371,14 @@ internal class TroopTips0x857 : ProtoBuf {
         @ProtoNumber(14) @JvmField val timeoutSec: Int = 0,
         @ProtoNumber(14) @JvmField val timeoutSec: Int = 0,
         @ProtoNumber(15) @JvmField val killConfirmed: Int = 0,
         @ProtoNumber(15) @JvmField val killConfirmed: Int = 0,
         @ProtoNumber(16) @JvmField val judgeNickname: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(16) @JvmField val judgeNickname: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(17) @JvmField val votedTieUsers: List<Long> = emptyList()
+        @ProtoNumber(17) @JvmField val votedTieUsers: List<Long> = emptyList(),
     ) : ProtoBuf {
     ) : ProtoBuf {
         @Serializable
         @Serializable
         internal class GameRecord(
         internal class GameRecord(
             @ProtoNumber(1) @JvmField val total: Int = 0,
             @ProtoNumber(1) @JvmField val total: Int = 0,
             @ProtoNumber(2) @JvmField val win: Int = 0,
             @ProtoNumber(2) @JvmField val win: Int = 0,
             @ProtoNumber(3) @JvmField val lose: Int = 0,
             @ProtoNumber(3) @JvmField val lose: Int = 0,
-            @ProtoNumber(4) @JvmField val draw: Int = 0
+            @ProtoNumber(4) @JvmField val draw: Int = 0,
         ) : ProtoBuf
         ) : ProtoBuf
 
 
         @Serializable
         @Serializable
@@ -402,7 +402,7 @@ internal class TroopTips0x857 : ProtoBuf {
             @ProtoNumber(17) @JvmField val msgGameRecord: GameRecord? = null,
             @ProtoNumber(17) @JvmField val msgGameRecord: GameRecord? = null,
             @ProtoNumber(18) @JvmField val isWerewolf: Int = 0,
             @ProtoNumber(18) @JvmField val isWerewolf: Int = 0,
             @ProtoNumber(19) @JvmField val defendedUser: Long = 0L,
             @ProtoNumber(19) @JvmField val defendedUser: Long = 0L,
-            @ProtoNumber(20) @JvmField val isSheriff: Int = 0
+            @ProtoNumber(20) @JvmField val isSheriff: Int = 0,
         ) : ProtoBuf
         ) : ProtoBuf
     }
     }
 }
 }

+ 12 - 12
mirai-core/src/commonMain/kotlin/network/protocol/data/proto/Cmd0x858.kt

@@ -21,7 +21,7 @@ import net.mamoe.mirai.utils.EMPTY_BYTE_ARRAY
 @Serializable
 @Serializable
 internal class Oidb0x858 : ProtoBuf {
 internal class Oidb0x858 : ProtoBuf {
     @Serializable
     @Serializable
-internal class GoldMsgTipsElem(
+    internal class GoldMsgTipsElem(
         @ProtoNumber(1) @JvmField val type: Int = 0,
         @ProtoNumber(1) @JvmField val type: Int = 0,
         @ProtoNumber(2) @JvmField val billno: String = "",
         @ProtoNumber(2) @JvmField val billno: String = "",
         @ProtoNumber(3) @JvmField val result: Int = 0,
         @ProtoNumber(3) @JvmField val result: Int = 0,
@@ -30,27 +30,27 @@ internal class GoldMsgTipsElem(
         @ProtoNumber(6) @JvmField val interval: Int = 0,
         @ProtoNumber(6) @JvmField val interval: Int = 0,
         @ProtoNumber(7) @JvmField val finish: Int = 0,
         @ProtoNumber(7) @JvmField val finish: Int = 0,
         @ProtoNumber(8) @JvmField val uin: List<Long> = emptyList(),
         @ProtoNumber(8) @JvmField val uin: List<Long> = emptyList(),
-        @ProtoNumber(9) @JvmField val action: Int = 0
+        @ProtoNumber(9) @JvmField val action: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class MessageRecallReminder(
+    internal class MessageRecallReminder(
         @ProtoNumber(1) @JvmField val uin: Long = 0L,
         @ProtoNumber(1) @JvmField val uin: Long = 0L,
         @ProtoNumber(2) @JvmField val nickname: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val nickname: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val recalledMsgList: List<MessageMeta> = emptyList(),
         @ProtoNumber(3) @JvmField val recalledMsgList: List<MessageMeta> = emptyList(),
         @ProtoNumber(4) @JvmField val reminderContent: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(4) @JvmField val reminderContent: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(5) @JvmField val userdef: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(5) @JvmField val userdef: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf {
     ) : ProtoBuf {
         @Serializable
         @Serializable
-internal class MessageMeta(
+        internal class MessageMeta(
             @ProtoNumber(1) @JvmField val seq: Int = 0,
             @ProtoNumber(1) @JvmField val seq: Int = 0,
             @ProtoNumber(2) @JvmField val time: Int = 0,
             @ProtoNumber(2) @JvmField val time: Int = 0,
-            @ProtoNumber(3) @JvmField val msgRandom: Int = 0
+            @ProtoNumber(3) @JvmField val msgRandom: Int = 0,
         ) : ProtoBuf
         ) : ProtoBuf
     }
     }
 
 
     @Serializable
     @Serializable
-internal class NotifyMsgBody(
+    internal class NotifyMsgBody(
         @ProtoNumber(1) @JvmField val optEnumType: Int /* enum */ = 5,
         @ProtoNumber(1) @JvmField val optEnumType: Int /* enum */ = 5,
         @ProtoNumber(2) @JvmField val optUint64MsgTime: Long = 0L,
         @ProtoNumber(2) @JvmField val optUint64MsgTime: Long = 0L,
         @ProtoNumber(3) @JvmField val optUint64MsgExpires: Long = 0L,
         @ProtoNumber(3) @JvmField val optUint64MsgExpires: Long = 0L,
@@ -60,18 +60,18 @@ internal class NotifyMsgBody(
         @ProtoNumber(7) @JvmField val optMsgObjUpdate: NotifyObjmsgUpdate? = null,
         @ProtoNumber(7) @JvmField val optMsgObjUpdate: NotifyObjmsgUpdate? = null,
         // @SerialId(8) @JvmField val optStcmGameState: ApolloGameStatus.STCMGameMessage? = null,
         // @SerialId(8) @JvmField val optStcmGameState: ApolloGameStatus.STCMGameMessage? = null,
         // @SerialId(9) @JvmField val aplloMsgPush: ApolloPushMsgInfo.STPushMsgElem? = null,
         // @SerialId(9) @JvmField val aplloMsgPush: ApolloPushMsgInfo.STPushMsgElem? = null,
-        @ProtoNumber(10) @JvmField val optMsgGoldtips: GoldMsgTipsElem? = null
+        @ProtoNumber(10) @JvmField val optMsgGoldtips: GoldMsgTipsElem? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class NotifyObjmsgUpdate(
+    internal class NotifyObjmsgUpdate(
         @ProtoNumber(1) @JvmField val objmsgId: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(1) @JvmField val objmsgId: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val updateType: Int = 0,
         @ProtoNumber(2) @JvmField val updateType: Int = 0,
-        @ProtoNumber(3) @JvmField val extMsg: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(3) @JvmField val extMsg: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class RedGrayTipsInfo(
+    internal class RedGrayTipsInfo(
         @ProtoNumber(1) @JvmField val optUint32ShowLastest: Int = 0,
         @ProtoNumber(1) @JvmField val optUint32ShowLastest: Int = 0,
         @ProtoNumber(2) @JvmField val senderUin: Long = 0L,
         @ProtoNumber(2) @JvmField val senderUin: Long = 0L,
         @ProtoNumber(3) @JvmField val receiverUin: Long = 0L,
         @ProtoNumber(3) @JvmField val receiverUin: Long = 0L,
@@ -90,6 +90,6 @@ internal class RedGrayTipsInfo(
         @ProtoNumber(16) @JvmField val idiom: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(16) @JvmField val idiom: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(17) @JvmField val idiomSeq: Int = 0,
         @ProtoNumber(17) @JvmField val idiomSeq: Int = 0,
         @ProtoNumber(18) @JvmField val idiomAlpha: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(18) @JvmField val idiomAlpha: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(19) @JvmField val jumpurl: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(19) @JvmField val jumpurl: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }

+ 50 - 50
mirai-core/src/commonMain/kotlin/network/protocol/data/proto/Define.kt

@@ -20,7 +20,7 @@ internal class Common : ProtoBuf {
         @ProtoNumber(1) @JvmField val friUin: Long = 0L,
         @ProtoNumber(1) @JvmField val friUin: Long = 0L,
         @ProtoNumber(2) @JvmField val friNick: String = "",
         @ProtoNumber(2) @JvmField val friNick: String = "",
         @ProtoNumber(3) @JvmField val time: Long = 0L,
         @ProtoNumber(3) @JvmField val time: Long = 0L,
-        @ProtoNumber(4) @JvmField val bindStatus: Int = 0
+        @ProtoNumber(4) @JvmField val bindStatus: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -57,7 +57,7 @@ internal class Common : ProtoBuf {
         @ProtoNumber(59) @JvmField val fromuinLevel: Int = 0,
         @ProtoNumber(59) @JvmField val fromuinLevel: Int = 0,
         @ProtoNumber(60) @JvmField val unread: Int = 0,
         @ProtoNumber(60) @JvmField val unread: Int = 0,
         @ProtoNumber(61) @JvmField val unread2: Int = 0,
         @ProtoNumber(61) @JvmField val unread2: Int = 0,
-        @ProtoNumber(62) @JvmField val unread3: Int = 0
+        @ProtoNumber(62) @JvmField val unread3: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -66,7 +66,7 @@ internal class Common : ProtoBuf {
         @ProtoNumber(32) @JvmField val int32TaskValue: Int = 0,
         @ProtoNumber(32) @JvmField val int32TaskValue: Int = 0,
         @ProtoNumber(33) @JvmField val tarValue: Int = 0,
         @ProtoNumber(33) @JvmField val tarValue: Int = 0,
         @ProtoNumber(34) @JvmField val tarValueLevel2: Int = 0,
         @ProtoNumber(34) @JvmField val tarValueLevel2: Int = 0,
-        @ProtoNumber(35) @JvmField val tarValueLevel3: Int = 0
+        @ProtoNumber(35) @JvmField val tarValueLevel3: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }
 
 
@@ -82,12 +82,12 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(6) @JvmField val publishTime: Int = 0,
         @ProtoNumber(6) @JvmField val publishTime: Int = 0,
         @ProtoNumber(7) @JvmField val msgHotTopicList: HotTopicList? = null,
         @ProtoNumber(7) @JvmField val msgHotTopicList: HotTopicList? = null,
         @ProtoNumber(8) @JvmField val moreUrl: String = "",
         @ProtoNumber(8) @JvmField val moreUrl: String = "",
-        @ProtoNumber(9) @JvmField val recordDuration: String = ""
+        @ProtoNumber(9) @JvmField val recordDuration: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class RichText(
     internal class RichText(
-        @ProtoNumber(1) @JvmField val msgElems: List<Elem> = emptyList()
+        @ProtoNumber(1) @JvmField val msgElems: List<Elem> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -96,13 +96,13 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(2) @JvmField val notifytype: Int = 0,
         @ProtoNumber(2) @JvmField val notifytype: Int = 0,
         @ProtoNumber(3) @JvmField val eventtime: Int = 0,
         @ProtoNumber(3) @JvmField val eventtime: Int = 0,
         @ProtoNumber(4) @JvmField val seq: Int = 0,
         @ProtoNumber(4) @JvmField val seq: Int = 0,
-        @ProtoNumber(5) @JvmField val notifyTips: String = ""
+        @ProtoNumber(5) @JvmField val notifyTips: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class Wifi(
     internal class Wifi(
         @ProtoNumber(1) @JvmField val mac: Long = 0L,
         @ProtoNumber(1) @JvmField val mac: Long = 0L,
-        @ProtoNumber(2) @JvmField val int32Rssi: Int = 0
+        @ProtoNumber(2) @JvmField val int32Rssi: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -118,13 +118,13 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(9) @JvmField val addTime: Int = 0,
         @ProtoNumber(9) @JvmField val addTime: Int = 0,
         @ProtoNumber(10) @JvmField val tagCategory: String = "",
         @ProtoNumber(10) @JvmField val tagCategory: String = "",
         @ProtoNumber(11) @JvmField val tagOtherUrl: String = "",
         @ProtoNumber(11) @JvmField val tagOtherUrl: String = "",
-        @ProtoNumber(12) @JvmField val bid: Int = 0
+        @ProtoNumber(12) @JvmField val bid: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class ShopID(
     internal class ShopID(
         @ProtoNumber(1) @JvmField val shopid: String = "",
         @ProtoNumber(1) @JvmField val shopid: String = "",
-        @ProtoNumber(2) @JvmField val sp: Int = 0
+        @ProtoNumber(2) @JvmField val sp: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -136,14 +136,14 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(6) @JvmField val msgReplyInfo: ReplyInfo? = null,
         @ProtoNumber(6) @JvmField val msgReplyInfo: ReplyInfo? = null,
         @ProtoNumber(7) @JvmField val flag: Int = 0,
         @ProtoNumber(7) @JvmField val flag: Int = 0,
         @ProtoNumber(8) @JvmField val msgContent: RichText? = null,
         @ProtoNumber(8) @JvmField val msgContent: RichText? = null,
-        @ProtoNumber(9) @JvmField val hot: Int = 0
+        @ProtoNumber(9) @JvmField val hot: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class ADFeed(
     internal class ADFeed(
         @ProtoNumber(1) @JvmField val taskId: Int = 0,
         @ProtoNumber(1) @JvmField val taskId: Int = 0,
         @ProtoNumber(2) @JvmField val style: Int = 0,
         @ProtoNumber(2) @JvmField val style: Int = 0,
-        @ProtoNumber(3) @JvmField val content: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(3) @JvmField val content: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -152,27 +152,27 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(2) @JvmField val int32Mnc: Int = -1,
         @ProtoNumber(2) @JvmField val int32Mnc: Int = -1,
         @ProtoNumber(3) @JvmField val int32Lac: Int = -1,
         @ProtoNumber(3) @JvmField val int32Lac: Int = -1,
         @ProtoNumber(4) @JvmField val int32Cellid: Int = -1,
         @ProtoNumber(4) @JvmField val int32Cellid: Int = -1,
-        @ProtoNumber(5) @JvmField val int32Rssi: Int = 0
+        @ProtoNumber(5) @JvmField val int32Rssi: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class RecentVistorEvent(
     internal class RecentVistorEvent(
         @ProtoNumber(1) @JvmField val eventtype: Int = 0,
         @ProtoNumber(1) @JvmField val eventtype: Int = 0,
         @ProtoNumber(2) @JvmField val eventTinyid: Long = 0L,
         @ProtoNumber(2) @JvmField val eventTinyid: Long = 0L,
-        @ProtoNumber(3) @JvmField val unreadCount: Int = 0
+        @ProtoNumber(3) @JvmField val unreadCount: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class OrganizerInfo(
     internal class OrganizerInfo(
         @ProtoNumber(1) @JvmField val hostName: String = "",
         @ProtoNumber(1) @JvmField val hostName: String = "",
         @ProtoNumber(2) @JvmField val hostUrl: String = "",
         @ProtoNumber(2) @JvmField val hostUrl: String = "",
-        @ProtoNumber(3) @JvmField val hostCover: String = ""
+        @ProtoNumber(3) @JvmField val hostCover: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class InterestTag(
     internal class InterestTag(
         @ProtoNumber(1) @JvmField val tagType: Int = 0,
         @ProtoNumber(1) @JvmField val tagType: Int = 0,
-        @ProtoNumber(2) @JvmField val msgTagList: List<InterestItem> = emptyList()
+        @ProtoNumber(2) @JvmField val msgTagList: List<InterestItem> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -184,7 +184,7 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(5) @JvmField val showPublisher: Int = 0,
         @ProtoNumber(5) @JvmField val showPublisher: Int = 0,
         @ProtoNumber(6) @JvmField val detailPicUrl: String = "",
         @ProtoNumber(6) @JvmField val detailPicUrl: String = "",
         @ProtoNumber(7) @JvmField val detailUrl: String = "",
         @ProtoNumber(7) @JvmField val detailUrl: String = "",
-        @ProtoNumber(8) @JvmField val showAttend: Int = 0
+        @ProtoNumber(8) @JvmField val showAttend: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -195,7 +195,7 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(4) @JvmField val time: Int = 0,
         @ProtoNumber(4) @JvmField val time: Int = 0,
         @ProtoNumber(6) @JvmField val msgReplyInfo: ReplyInfo? = null,
         @ProtoNumber(6) @JvmField val msgReplyInfo: ReplyInfo? = null,
         @ProtoNumber(7) @JvmField val flag: Int = 0,
         @ProtoNumber(7) @JvmField val flag: Int = 0,
-        @ProtoNumber(8) @JvmField val msgContent: RichText? = null
+        @ProtoNumber(8) @JvmField val msgContent: RichText? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -206,7 +206,7 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(4) @JvmField val appointGender: Int = 0,
         @ProtoNumber(4) @JvmField val appointGender: Int = 0,
         @ProtoNumber(5) @JvmField val appointIntroduce: String = "",
         @ProtoNumber(5) @JvmField val appointIntroduce: String = "",
         @ProtoNumber(6) @JvmField val msgAppointAddress: AddressInfo? = null,
         @ProtoNumber(6) @JvmField val msgAppointAddress: AddressInfo? = null,
-        @ProtoNumber(7) @JvmField val msgTravelInfo: TravelInfo? = null
+        @ProtoNumber(7) @JvmField val msgTravelInfo: TravelInfo? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -224,12 +224,12 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(11) @JvmField val commentRetAll: Int = 0,
         @ProtoNumber(11) @JvmField val commentRetAll: Int = 0,
         @ProtoNumber(12) @JvmField val hotFlag: Int = 0,
         @ProtoNumber(12) @JvmField val hotFlag: Int = 0,
         @ProtoNumber(13) @JvmField val svrReserved: Long = 0L,
         @ProtoNumber(13) @JvmField val svrReserved: Long = 0L,
-        @ProtoNumber(14) @JvmField val msgHotEntry: HotEntry? = null
+        @ProtoNumber(14) @JvmField val msgHotEntry: HotEntry? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class HotTopicList(
     internal class HotTopicList(
-        @ProtoNumber(1) @JvmField val topicList: List<HotTopic> = emptyList()
+        @ProtoNumber(1) @JvmField val topicList: List<HotTopic> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -247,7 +247,7 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(22) @JvmField val msgLocale: LocaleInfo? = null,
         @ProtoNumber(22) @JvmField val msgLocale: LocaleInfo? = null,
         @ProtoNumber(23) @JvmField val feedsIndex: Int = 0,
         @ProtoNumber(23) @JvmField val feedsIndex: Int = 0,
         @ProtoNumber(24) @JvmField val msgAd: ADFeed? = null,
         @ProtoNumber(24) @JvmField val msgAd: ADFeed? = null,
-        @ProtoNumber(25) @JvmField val privateData: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(25) @JvmField val privateData: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -257,13 +257,13 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(3) @JvmField val vehicle: Int = 0,
         @ProtoNumber(3) @JvmField val vehicle: Int = 0,
         @ProtoNumber(4) @JvmField val partnerCount: Int = 0,
         @ProtoNumber(4) @JvmField val partnerCount: Int = 0,
         @ProtoNumber(5) @JvmField val placePicUrl: String = "",
         @ProtoNumber(5) @JvmField val placePicUrl: String = "",
-        @ProtoNumber(6) @JvmField val placeUrl: String = ""
+        @ProtoNumber(6) @JvmField val placeUrl: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class RecentFreshFeed(
     internal class RecentFreshFeed(
         @ProtoNumber(1) @JvmField val freshFeedInfo: List<FreshFeedInfo> = emptyList(),
         @ProtoNumber(1) @JvmField val freshFeedInfo: List<FreshFeedInfo> = emptyList(),
-        @ProtoNumber(2) @JvmField val uid: Long = 0L
+        @ProtoNumber(2) @JvmField val uid: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -271,12 +271,12 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(1) @JvmField val int32Lat: Int = 900000000,
         @ProtoNumber(1) @JvmField val int32Lat: Int = 900000000,
         @ProtoNumber(2) @JvmField val int32Lon: Int = 900000000,
         @ProtoNumber(2) @JvmField val int32Lon: Int = 900000000,
         @ProtoNumber(3) @JvmField val int32Alt: Int = -10000000,
         @ProtoNumber(3) @JvmField val int32Alt: Int = -10000000,
-        @ProtoNumber(4) @JvmField val int32Type: Int = 0
+        @ProtoNumber(4) @JvmField val int32Type: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class AppointID(
     internal class AppointID(
-        @ProtoNumber(1) @JvmField val requestId: String = ""
+        @ProtoNumber(1) @JvmField val requestId: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -288,14 +288,14 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(5) @JvmField val region: String = "",
         @ProtoNumber(5) @JvmField val region: String = "",
         @ProtoNumber(6) @JvmField val poi: String = "",
         @ProtoNumber(6) @JvmField val poi: String = "",
         @ProtoNumber(7) @JvmField val msgGps: GPS? = null,
         @ProtoNumber(7) @JvmField val msgGps: GPS? = null,
-        @ProtoNumber(8) @JvmField val address: String = ""
+        @ProtoNumber(8) @JvmField val address: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class LBSInfo(
     internal class LBSInfo(
         @ProtoNumber(1) @JvmField val msgGps: GPS? = null,
         @ProtoNumber(1) @JvmField val msgGps: GPS? = null,
         @ProtoNumber(2) @JvmField val msgWifis: List<Wifi> = emptyList(),
         @ProtoNumber(2) @JvmField val msgWifis: List<Wifi> = emptyList(),
-        @ProtoNumber(3) @JvmField val msgCells: List<Cell> = emptyList()
+        @ProtoNumber(3) @JvmField val msgCells: List<Cell> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -307,7 +307,7 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(5) @JvmField val msgFeedInfo: FeedInfo? = null,
         @ProtoNumber(5) @JvmField val msgFeedInfo: FeedInfo? = null,
         @ProtoNumber(6) @JvmField val eventTips: String = "",
         @ProtoNumber(6) @JvmField val eventTips: String = "",
         @ProtoNumber(7) @JvmField val msgComment: FeedComment? = null,
         @ProtoNumber(7) @JvmField val msgComment: FeedComment? = null,
-        @ProtoNumber(8) @JvmField val cancelEventId: Long = 0L
+        @ProtoNumber(8) @JvmField val cancelEventId: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -315,7 +315,7 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(1) @JvmField val strList: List<String> = emptyList(),
         @ProtoNumber(1) @JvmField val strList: List<String> = emptyList(),
         @ProtoNumber(2) @JvmField val pose: Int = 0,
         @ProtoNumber(2) @JvmField val pose: Int = 0,
         @ProtoNumber(3) @JvmField val cookie: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val cookie: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(4) @JvmField val uint64Topics: List<Long> = emptyList()
+        @ProtoNumber(4) @JvmField val uint64Topics: List<Long> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -337,7 +337,7 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(15) @JvmField val pushedUsrCount: Int = 0,
         @ProtoNumber(15) @JvmField val pushedUsrCount: Int = 0,
         @ProtoNumber(16) @JvmField val timerangeLeft: Int = 0,
         @ProtoNumber(16) @JvmField val timerangeLeft: Int = 0,
         @ProtoNumber(17) @JvmField val timerangeRight: Int = 0,
         @ProtoNumber(17) @JvmField val timerangeRight: Int = 0,
-        @ProtoNumber(18) @JvmField val area: String = ""
+        @ProtoNumber(18) @JvmField val area: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -345,14 +345,14 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(1) @JvmField val eventtype: Int = 0,
         @ProtoNumber(1) @JvmField val eventtype: Int = 0,
         @ProtoNumber(2) @JvmField val msgRankevent: RankEvent? = null,
         @ProtoNumber(2) @JvmField val msgRankevent: RankEvent? = null,
         @ProtoNumber(3) @JvmField val eventUin: Long = 0L,
         @ProtoNumber(3) @JvmField val eventUin: Long = 0L,
-        @ProtoNumber(4) @JvmField val eventTinyid: Long = 0L
+        @ProtoNumber(4) @JvmField val eventTinyid: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class Feed(
     internal class Feed(
         @ProtoNumber(1) @JvmField val msgUserInfo: PublisherInfo? = null,
         @ProtoNumber(1) @JvmField val msgUserInfo: PublisherInfo? = null,
         @ProtoNumber(2) @JvmField val msgFeedInfo: FeedInfo? = null,
         @ProtoNumber(2) @JvmField val msgFeedInfo: FeedInfo? = null,
-        @ProtoNumber(3) @JvmField val ownerFlag: Int = 0
+        @ProtoNumber(3) @JvmField val ownerFlag: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -367,7 +367,7 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(9) @JvmField val createUin: Long = 0L,
         @ProtoNumber(9) @JvmField val createUin: Long = 0L,
         @ProtoNumber(10) @JvmField val createTime: Int = 0,
         @ProtoNumber(10) @JvmField val createTime: Int = 0,
         @ProtoNumber(11) @JvmField val organizerInfo: OrganizerInfo = OrganizerInfo(),
         @ProtoNumber(11) @JvmField val organizerInfo: OrganizerInfo = OrganizerInfo(),
-        @ProtoNumber(12) @JvmField val flag: Long? = null
+        @ProtoNumber(12) @JvmField val flag: Long? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -375,7 +375,7 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(1) @JvmField val openFlag: Int = 0,
         @ProtoNumber(1) @JvmField val openFlag: Int = 0,
         @ProtoNumber(2) @JvmField val restTime: Int = 0,
         @ProtoNumber(2) @JvmField val restTime: Int = 0,
         @ProtoNumber(3) @JvmField val foreword: String = "",
         @ProtoNumber(3) @JvmField val foreword: String = "",
-        @ProtoNumber(4) @JvmField val backgroundSrc: String = ""
+        @ProtoNumber(4) @JvmField val backgroundSrc: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -383,24 +383,24 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(1) @JvmField val msgUserInfo: PublisherInfo? = null,
         @ProtoNumber(1) @JvmField val msgUserInfo: PublisherInfo? = null,
         @ProtoNumber(2) @JvmField val msgFeedInfo: FeedInfo? = null,
         @ProtoNumber(2) @JvmField val msgFeedInfo: FeedInfo? = null,
         @ProtoNumber(3) @JvmField val ownerFlag: Int = 0,
         @ProtoNumber(3) @JvmField val ownerFlag: Int = 0,
-        @ProtoNumber(4) @JvmField val msgActivityInfo: ActivityInfo? = null
+        @ProtoNumber(4) @JvmField val msgActivityInfo: ActivityInfo? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class Elem(
     internal class Elem(
         @ProtoNumber(1) @JvmField val content: String = "",
         @ProtoNumber(1) @JvmField val content: String = "",
-        @ProtoNumber(2) @JvmField val msgFaceInfo: Face? = null
+        @ProtoNumber(2) @JvmField val msgFaceInfo: Face? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class HotFreshFeedList(
     internal class HotFreshFeedList(
         @ProtoNumber(1) @JvmField val msgFeeds: List<HotUserFeed> = emptyList(),
         @ProtoNumber(1) @JvmField val msgFeeds: List<HotUserFeed> = emptyList(),
-        @ProtoNumber(2) @JvmField val updateTime: Int = 0
+        @ProtoNumber(2) @JvmField val updateTime: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class RptInterestTag(
     internal class RptInterestTag(
-        @ProtoNumber(1) @JvmField val interestTags: List<InterestTag> = emptyList()
+        @ProtoNumber(1) @JvmField val interestTags: List<InterestTag> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -410,7 +410,7 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(3) @JvmField val companyAddr: String = "",
         @ProtoNumber(3) @JvmField val companyAddr: String = "",
         @ProtoNumber(4) @JvmField val companyPicUrl: String = "",
         @ProtoNumber(4) @JvmField val companyPicUrl: String = "",
         @ProtoNumber(5) @JvmField val companyUrl: String = "",
         @ProtoNumber(5) @JvmField val companyUrl: String = "",
-        @ProtoNumber(6) @JvmField val msgCompanyId: ShopID? = null
+        @ProtoNumber(6) @JvmField val msgCompanyId: ShopID? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -436,7 +436,7 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(19) @JvmField val strangerDeclare: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(19) @JvmField val strangerDeclare: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(20) @JvmField val friendUin: Long = 0L,
         @ProtoNumber(20) @JvmField val friendUin: Long = 0L,
         @ProtoNumber(21) @JvmField val historyFlag: Int = 0,
         @ProtoNumber(21) @JvmField val historyFlag: Int = 0,
-        @ProtoNumber(22) @JvmField val followflag: Long = 0L
+        @ProtoNumber(22) @JvmField val followflag: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -444,7 +444,7 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(1) @JvmField val feedId: String = "",
         @ProtoNumber(1) @JvmField val feedId: String = "",
         @ProtoNumber(2) @JvmField val praiseCount: Int = 0,
         @ProtoNumber(2) @JvmField val praiseCount: Int = 0,
         @ProtoNumber(3) @JvmField val publishUid: Long = 0L,
         @ProtoNumber(3) @JvmField val publishUid: Long = 0L,
-        @ProtoNumber(4) @JvmField val publishTime: Int = 0
+        @ProtoNumber(4) @JvmField val publishTime: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -452,7 +452,7 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(1) @JvmField val uin: Long = 0L,
         @ProtoNumber(1) @JvmField val uin: Long = 0L,
         @ProtoNumber(2) @JvmField val time: Int = 0,
         @ProtoNumber(2) @JvmField val time: Int = 0,
         @ProtoNumber(3) @JvmField val feedId: String = "",
         @ProtoNumber(3) @JvmField val feedId: String = "",
-        @ProtoNumber(4) @JvmField val feedType: Long = 0L
+        @ProtoNumber(4) @JvmField val feedType: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -461,12 +461,12 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(2) @JvmField val lableMsgPre: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val lableMsgPre: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val lableMsgLast: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val lableMsgLast: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(4) @JvmField val interstName: List<ByteArray> = emptyList(),
         @ProtoNumber(4) @JvmField val interstName: List<ByteArray> = emptyList(),
-        @ProtoNumber(5) @JvmField val interstType: List<Int> = emptyList()
+        @ProtoNumber(5) @JvmField val interstType: List<Int> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class Face(
     internal class Face(
-        @ProtoNumber(1) @JvmField val index: Int = 0
+        @ProtoNumber(1) @JvmField val index: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -485,7 +485,7 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(12) @JvmField val godflag: Int = 0,
         @ProtoNumber(12) @JvmField val godflag: Int = 0,
         @ProtoNumber(13) @JvmField val charm: Int = 0,
         @ProtoNumber(13) @JvmField val charm: Int = 0,
         @ProtoNumber(14) @JvmField val charmLevel: Int = 0,
         @ProtoNumber(14) @JvmField val charmLevel: Int = 0,
-        @ProtoNumber(15) @JvmField val uin: Long = 0L
+        @ProtoNumber(15) @JvmField val uin: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -498,7 +498,7 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(6) @JvmField val historyTimes: Long = 0L,
         @ProtoNumber(6) @JvmField val historyTimes: Long = 0L,
         @ProtoNumber(7) @JvmField val bgUrl: String = "",
         @ProtoNumber(7) @JvmField val bgUrl: String = "",
         @ProtoNumber(8) @JvmField val url: String = "",
         @ProtoNumber(8) @JvmField val url: String = "",
-        @ProtoNumber(9) @JvmField val extraInfo: String = ""
+        @ProtoNumber(9) @JvmField val extraInfo: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -511,7 +511,7 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(6) @JvmField val attendIdx: Int = 0,
         @ProtoNumber(6) @JvmField val attendIdx: Int = 0,
         @ProtoNumber(7) @JvmField val eventTips: String = "",
         @ProtoNumber(7) @JvmField val eventTips: String = "",
         @ProtoNumber(8) @JvmField val msgComment: DateComment? = null,
         @ProtoNumber(8) @JvmField val msgComment: DateComment? = null,
-        @ProtoNumber(9) @JvmField val cancelEventId: Long = 0L
+        @ProtoNumber(9) @JvmField val cancelEventId: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -528,7 +528,7 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(10) @JvmField val commentWording: String = "",
         @ProtoNumber(10) @JvmField val commentWording: String = "",
         @ProtoNumber(11) @JvmField val commentNum: Int = 0,
         @ProtoNumber(11) @JvmField val commentNum: Int = 0,
         @ProtoNumber(12) @JvmField val attendStatus: Int = 0,
         @ProtoNumber(12) @JvmField val attendStatus: Int = 0,
-        @ProtoNumber(13) @JvmField val msgAppointmentEx: AppointInfoEx? = null
+        @ProtoNumber(13) @JvmField val msgAppointmentEx: AppointInfoEx? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -537,12 +537,12 @@ internal class AppointDefine : ProtoBuf {
         @ProtoNumber(2) @JvmField val nickname: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val nickname: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val age: Int = 0,
         @ProtoNumber(3) @JvmField val age: Int = 0,
         @ProtoNumber(4) @JvmField val gender: Int = 0,
         @ProtoNumber(4) @JvmField val gender: Int = 0,
-        @ProtoNumber(5) @JvmField val avatar: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(5) @JvmField val avatar: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class ReplyInfo(
     internal class ReplyInfo(
         @ProtoNumber(1) @JvmField val commentId: String = "",
         @ProtoNumber(1) @JvmField val commentId: String = "",
-        @ProtoNumber(2) @JvmField val msgStrangerInfo: StrangerInfo? = null
+        @ProtoNumber(2) @JvmField val msgStrangerInfo: StrangerInfo? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }

+ 14 - 14
mirai-core/src/commonMain/kotlin/network/protocol/data/proto/FrdSysMsg.kt

@@ -19,14 +19,14 @@ internal class FrdSysMsg {
     @Serializable
     @Serializable
     internal class AddFrdSNInfo(
     internal class AddFrdSNInfo(
         @JvmField @ProtoNumber(1) val notSeeDynamic: Int = 0,
         @JvmField @ProtoNumber(1) val notSeeDynamic: Int = 0,
-        @JvmField @ProtoNumber(2) val setSn: Int = 0
+        @JvmField @ProtoNumber(2) val setSn: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class AddFriendVerifyInfo(
     internal class AddFriendVerifyInfo(
         @JvmField @ProtoNumber(1) val type: Int = 0,
         @JvmField @ProtoNumber(1) val type: Int = 0,
         @JvmField @ProtoNumber(2) val url: String = "",
         @JvmField @ProtoNumber(2) val url: String = "",
-        @JvmField @ProtoNumber(3) val verifyInfo: String = ""
+        @JvmField @ProtoNumber(3) val verifyInfo: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -35,14 +35,14 @@ internal class FrdSysMsg {
         @JvmField @ProtoNumber(2) val format: Int = 0,
         @JvmField @ProtoNumber(2) val format: Int = 0,
         @JvmField @ProtoNumber(3) val entityCategory: String = "",
         @JvmField @ProtoNumber(3) val entityCategory: String = "",
         @JvmField @ProtoNumber(4) val entityName: String = "",
         @JvmField @ProtoNumber(4) val entityName: String = "",
-        @JvmField @ProtoNumber(5) val entityUrl: String = ""
+        @JvmField @ProtoNumber(5) val entityUrl: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class DiscussInfo(
     internal class DiscussInfo(
         @JvmField @ProtoNumber(1) val discussUin: Long = 0L,
         @JvmField @ProtoNumber(1) val discussUin: Long = 0L,
         @JvmField @ProtoNumber(2) val discussName: String = "",
         @JvmField @ProtoNumber(2) val discussName: String = "",
-        @JvmField @ProtoNumber(3) val discussNick: String = ""
+        @JvmField @ProtoNumber(3) val discussNick: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -50,17 +50,17 @@ internal class FrdSysMsg {
         @JvmField @ProtoNumber(1) val eimFuin: Long = 0L,
         @JvmField @ProtoNumber(1) val eimFuin: Long = 0L,
         @JvmField @ProtoNumber(2) val eimId: String = "",
         @JvmField @ProtoNumber(2) val eimId: String = "",
         @JvmField @ProtoNumber(3) val eimTelno: String = "",
         @JvmField @ProtoNumber(3) val eimTelno: String = "",
-        @JvmField @ProtoNumber(4) val groupId: Long = 0L
+        @JvmField @ProtoNumber(4) val groupId: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class FriendHelloInfo(
     internal class FriendHelloInfo(
-        @JvmField @ProtoNumber(1) val sourceName: String = ""
+        @JvmField @ProtoNumber(1) val sourceName: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class FriendMiscInfo(
     internal class FriendMiscInfo(
-        @JvmField @ProtoNumber(1) val fromuinNick: String = ""
+        @JvmField @ProtoNumber(1) val fromuinNick: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -68,43 +68,43 @@ internal class FrdSysMsg {
         @JvmField @ProtoNumber(11) val msgGroupExt: GroupInfoExt? = null,
         @JvmField @ProtoNumber(11) val msgGroupExt: GroupInfoExt? = null,
         @JvmField @ProtoNumber(12) val msgIntiteInfo: InviteInfo? = null,
         @JvmField @ProtoNumber(12) val msgIntiteInfo: InviteInfo? = null,
         @JvmField @ProtoNumber(13) val msgSchoolInfo: SchoolInfo? = null,
         @JvmField @ProtoNumber(13) val msgSchoolInfo: SchoolInfo? = null,
-        @JvmField @ProtoNumber(100) val doubtFlag: Int = 0
+        @JvmField @ProtoNumber(100) val doubtFlag: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class GroupInfo(
     internal class GroupInfo(
         @JvmField @ProtoNumber(1) val groupUin: Long = 0L,
         @JvmField @ProtoNumber(1) val groupUin: Long = 0L,
         @JvmField @ProtoNumber(2) val groupName: String = "",
         @JvmField @ProtoNumber(2) val groupName: String = "",
-        @JvmField @ProtoNumber(3) val groupNick: String = ""
+        @JvmField @ProtoNumber(3) val groupNick: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class GroupInfoExt(
     internal class GroupInfoExt(
         @JvmField @ProtoNumber(1) val notifyType: Int = 0,
         @JvmField @ProtoNumber(1) val notifyType: Int = 0,
         @JvmField @ProtoNumber(2) val groupCode: Long = 0L,
         @JvmField @ProtoNumber(2) val groupCode: Long = 0L,
-        @JvmField @ProtoNumber(3) val fromGroupadmlist: Int = 0
+        @JvmField @ProtoNumber(3) val fromGroupadmlist: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class InviteInfo(
     internal class InviteInfo(
-        @JvmField @ProtoNumber(1) val recommendUin: Long = 0L
+        @JvmField @ProtoNumber(1) val recommendUin: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class MsgEncodeFlag(
     internal class MsgEncodeFlag(
-        @JvmField @ProtoNumber(1) val isUtf8: Int = 0
+        @JvmField @ProtoNumber(1) val isUtf8: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class SchoolInfo(
     internal class SchoolInfo(
         @JvmField @ProtoNumber(1) val schoolId: String = "",
         @JvmField @ProtoNumber(1) val schoolId: String = "",
-        @JvmField @ProtoNumber(2) val schoolName: String = ""
+        @JvmField @ProtoNumber(2) val schoolName: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class TongXunLuNickInfo(
     internal class TongXunLuNickInfo(
         @JvmField @ProtoNumber(1) val fromuin: Long = 0L,
         @JvmField @ProtoNumber(1) val fromuin: Long = 0L,
         @JvmField @ProtoNumber(2) val touin: Long = 0L,
         @JvmField @ProtoNumber(2) val touin: Long = 0L,
-        @JvmField @ProtoNumber(3) val tongxunluNickname: String = ""
+        @JvmField @ProtoNumber(3) val tongxunluNickname: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }

+ 7 - 7
mirai-core/src/commonMain/kotlin/network/protocol/data/proto/Group.kt

@@ -23,32 +23,32 @@ internal class GroupLabel : ProtoBuf {
         @ProtoNumber(3) @JvmField val textColor: Color? = null,
         @ProtoNumber(3) @JvmField val textColor: Color? = null,
         @ProtoNumber(4) @JvmField val edgingColor: Color? = null,
         @ProtoNumber(4) @JvmField val edgingColor: Color? = null,
         @ProtoNumber(5) @JvmField val labelAttr: Int = 0,
         @ProtoNumber(5) @JvmField val labelAttr: Int = 0,
-        @ProtoNumber(6) @JvmField val labelType: Int = 0
+        @ProtoNumber(6) @JvmField val labelType: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class RspBody(
     internal class RspBody(
         @ProtoNumber(1) @JvmField val error: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(1) @JvmField val error: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(2) @JvmField val groupInfo: List<GroupInfo> = emptyList()
+        @ProtoNumber(2) @JvmField val groupInfo: List<GroupInfo> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class SourceId(
     internal class SourceId(
-        @ProtoNumber(1) @JvmField val sourceId: Int = 0
+        @ProtoNumber(1) @JvmField val sourceId: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class GroupInfo(
     internal class GroupInfo(
         @ProtoNumber(1) @JvmField val int32Result: Int = 0,
         @ProtoNumber(1) @JvmField val int32Result: Int = 0,
         @ProtoNumber(2) @JvmField val groupCode: Long = 0L,
         @ProtoNumber(2) @JvmField val groupCode: Long = 0L,
-        @ProtoNumber(3) @JvmField val groupLabel: List<Label> = emptyList()
+        @ProtoNumber(3) @JvmField val groupLabel: List<Label> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class Color(
     internal class Color(
         @ProtoNumber(1) @JvmField val r: Int = 0,
         @ProtoNumber(1) @JvmField val r: Int = 0,
         @ProtoNumber(2) @JvmField val g: Int = 0,
         @ProtoNumber(2) @JvmField val g: Int = 0,
-        @ProtoNumber(3) @JvmField val b: Int = 0
+        @ProtoNumber(3) @JvmField val b: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -57,12 +57,12 @@ internal class GroupLabel : ProtoBuf {
         @ProtoNumber(2) @JvmField val uinInfo: UinInfo? = null,
         @ProtoNumber(2) @JvmField val uinInfo: UinInfo? = null,
         @ProtoNumber(3) @JvmField val numberLabel: Int = 5,
         @ProtoNumber(3) @JvmField val numberLabel: Int = 5,
         @ProtoNumber(4) @JvmField val groupCode: List<Long> = emptyList(),
         @ProtoNumber(4) @JvmField val groupCode: List<Long> = emptyList(),
-        @ProtoNumber(5) @JvmField val labelStyle: Int = 0
+        @ProtoNumber(5) @JvmField val labelStyle: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class UinInfo(
     internal class UinInfo(
         @ProtoNumber(1) @JvmField val int64Longitude: Long = 0L,
         @ProtoNumber(1) @JvmField val int64Longitude: Long = 0L,
-        @ProtoNumber(2) @JvmField val int64Latitude: Long = 0L
+        @ProtoNumber(2) @JvmField val int64Latitude: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }

+ 52 - 52
mirai-core/src/commonMain/kotlin/network/protocol/data/proto/Highway.kt

@@ -28,13 +28,13 @@ internal class BdhExtinfo : ProtoBuf {
     @Serializable
     @Serializable
     internal class CommFileExtReq(
     internal class CommFileExtReq(
         @JvmField @ProtoNumber(1) val actionType: Int = 0,
         @JvmField @ProtoNumber(1) val actionType: Int = 0,
-        @JvmField @ProtoNumber(2) val uuid: ByteArray = EMPTY_BYTE_ARRAY
+        @JvmField @ProtoNumber(2) val uuid: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class CommFileExtRsp(
     internal class CommFileExtRsp(
         @JvmField @ProtoNumber(1) val int32Retcode: Int = 0,
         @JvmField @ProtoNumber(1) val int32Retcode: Int = 0,
-        @JvmField @ProtoNumber(2) val downloadUrl: ByteArray = EMPTY_BYTE_ARRAY
+        @JvmField @ProtoNumber(2) val downloadUrl: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -42,7 +42,7 @@ internal class BdhExtinfo : ProtoBuf {
         @JvmField @ProtoNumber(1) val idx: Int = 0,
         @JvmField @ProtoNumber(1) val idx: Int = 0,
         @JvmField @ProtoNumber(2) val size: Int = 0,
         @JvmField @ProtoNumber(2) val size: Int = 0,
         @JvmField @ProtoNumber(3) val binMd5: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(3) val binMd5: ByteArray = EMPTY_BYTE_ARRAY,
-        @JvmField @ProtoNumber(4) val type: Int = 0
+        @JvmField @ProtoNumber(4) val type: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -52,21 +52,21 @@ internal class BdhExtinfo : ProtoBuf {
         @JvmField @ProtoNumber(3) val rate: Int = 0,
         @JvmField @ProtoNumber(3) val rate: Int = 0,
         @JvmField @ProtoNumber(4) val bits: Int = 0,
         @JvmField @ProtoNumber(4) val bits: Int = 0,
         @JvmField @ProtoNumber(5) val channel: Int = 0,
         @JvmField @ProtoNumber(5) val channel: Int = 0,
-        @JvmField @ProtoNumber(6) val pinyin: Int = 0
+        @JvmField @ProtoNumber(6) val pinyin: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class QQVoiceExtRsp(
     internal class QQVoiceExtRsp(
         @JvmField @ProtoNumber(1) val qid: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(1) val qid: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(2) val int32Retcode: Int = 0,
         @JvmField @ProtoNumber(2) val int32Retcode: Int = 0,
-        @JvmField @ProtoNumber(3) val msgResult: List<QQVoiceResult> = emptyList()
+        @JvmField @ProtoNumber(3) val msgResult: List<QQVoiceResult> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class QQVoiceResult(
     internal class QQVoiceResult(
         @JvmField @ProtoNumber(1) val text: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(1) val text: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(2) val pinyin: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(2) val pinyin: ByteArray = EMPTY_BYTE_ARRAY,
-        @JvmField @ProtoNumber(3) val source: Int = 0
+        @JvmField @ProtoNumber(3) val source: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -76,7 +76,7 @@ internal class BdhExtinfo : ProtoBuf {
         @JvmField @ProtoNumber(3) val msgThumbinfo: PicInfo? = null,
         @JvmField @ProtoNumber(3) val msgThumbinfo: PicInfo? = null,
         @JvmField @ProtoNumber(4) val msgVideoinfo: VideoInfo? = null,
         @JvmField @ProtoNumber(4) val msgVideoinfo: VideoInfo? = null,
         @JvmField @ProtoNumber(5) val msgShortvideoSureReq: ShortVideoSureReqInfo? = null,
         @JvmField @ProtoNumber(5) val msgShortvideoSureReq: ShortVideoSureReqInfo? = null,
-        @JvmField @ProtoNumber(6) val boolIsMergeCmdBeforeData: Boolean = false
+        @JvmField @ProtoNumber(6) val boolIsMergeCmdBeforeData: Boolean = false,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -88,7 +88,7 @@ internal class BdhExtinfo : ProtoBuf {
         @JvmField @ProtoNumber(5) val msgThumbinfo: PicInfo? = null,
         @JvmField @ProtoNumber(5) val msgThumbinfo: PicInfo? = null,
         @JvmField @ProtoNumber(6) val msgVideoinfo: VideoInfo? = null,
         @JvmField @ProtoNumber(6) val msgVideoinfo: VideoInfo? = null,
         @JvmField @ProtoNumber(7) val msgShortvideoSureRsp: ShortVideoSureRspInfo? = null,
         @JvmField @ProtoNumber(7) val msgShortvideoSureRsp: ShortVideoSureRspInfo? = null,
-        @JvmField @ProtoNumber(8) val retryFlag: Int = 0
+        @JvmField @ProtoNumber(8) val retryFlag: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -102,7 +102,7 @@ internal class BdhExtinfo : ProtoBuf {
         @JvmField @ProtoNumber(7) val msgMergeVideoinfo: List<VideoInfo> = emptyList(),
         @JvmField @ProtoNumber(7) val msgMergeVideoinfo: List<VideoInfo> = emptyList(),
         @JvmField @ProtoNumber(8) val msgDropVideoinfo: List<VideoInfo> = emptyList(),
         @JvmField @ProtoNumber(8) val msgDropVideoinfo: List<VideoInfo> = emptyList(),
         @JvmField @ProtoNumber(9) val businessType: Int = 0,
         @JvmField @ProtoNumber(9) val businessType: Int = 0,
-        @JvmField @ProtoNumber(10) val subBusinessType: Int = 0
+        @JvmField @ProtoNumber(10) val subBusinessType: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -110,7 +110,7 @@ internal class BdhExtinfo : ProtoBuf {
         @JvmField @ProtoNumber(1) val fileid: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(1) val fileid: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(2) val ukey: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(2) val ukey: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(3) val msgVideoinfo: VideoInfo? = null,
         @JvmField @ProtoNumber(3) val msgVideoinfo: VideoInfo? = null,
-        @JvmField @ProtoNumber(4) val mergeCost: Int = 0
+        @JvmField @ProtoNumber(4) val mergeCost: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -122,14 +122,14 @@ internal class BdhExtinfo : ProtoBuf {
         @JvmField @ProtoNumber(2) val msg: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(2) val msg: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(3) val cdnUrl: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(3) val cdnUrl: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(4) val fileKey: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(4) val fileKey: ByteArray = EMPTY_BYTE_ARRAY,
-        @JvmField @ProtoNumber(5) val fileId: ByteArray = EMPTY_BYTE_ARRAY
+        @JvmField @ProtoNumber(5) val fileId: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class UploadPicExtInfo(
     internal class UploadPicExtInfo(
         @JvmField @ProtoNumber(1) val fileResid: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(1) val fileResid: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(2) val downloadUrl: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(2) val downloadUrl: ByteArray = EMPTY_BYTE_ARRAY,
-        @JvmField @ProtoNumber(3) val thumbDownloadUrl: ByteArray = EMPTY_BYTE_ARRAY
+        @JvmField @ProtoNumber(3) val thumbDownloadUrl: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -142,7 +142,7 @@ internal class BdhExtinfo : ProtoBuf {
         @JvmField @ProtoNumber(6) val resWidth: Int = 0,
         @JvmField @ProtoNumber(6) val resWidth: Int = 0,
         @JvmField @ProtoNumber(7) val time: Int = 0,
         @JvmField @ProtoNumber(7) val time: Int = 0,
         @JvmField @ProtoNumber(8) val starttime: Long = 0L,
         @JvmField @ProtoNumber(8) val starttime: Long = 0L,
-        @JvmField @ProtoNumber(9) val isAudio: Int = 0
+        @JvmField @ProtoNumber(9) val isAudio: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }
 
 
@@ -151,7 +151,7 @@ internal class CSDataHighwayHead : ProtoBuf {
     @Serializable
     @Serializable
     internal class C2CCommonExtendinfo(
     internal class C2CCommonExtendinfo(
         @JvmField @ProtoNumber(1) val infoId: Int = 0,
         @JvmField @ProtoNumber(1) val infoId: Int = 0,
-        @JvmField @ProtoNumber(2) val msgFilterExtendinfo: FilterExtendinfo? = null
+        @JvmField @ProtoNumber(2) val msgFilterExtendinfo: FilterExtendinfo? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -160,31 +160,31 @@ internal class CSDataHighwayHead : ProtoBuf {
         @JvmField @ProtoNumber(2) val uin: String = "",
         @JvmField @ProtoNumber(2) val uin: String = "",
         @JvmField @ProtoNumber(3) val command: String = "",
         @JvmField @ProtoNumber(3) val command: String = "",
         @JvmField @ProtoNumber(4) val seq: Int = 0,
         @JvmField @ProtoNumber(4) val seq: Int = 0,
-        @JvmField @ProtoNumber(5) val retryTimes: Int? = null,// = 0,
-        @JvmField @ProtoNumber(6) val appid: Int? = null,// = 0,
-        @JvmField @ProtoNumber(7) val dataflag: Int? = null,// = 0,
-        @JvmField @ProtoNumber(8) val commandId: Int? = null,// = 0,
+        @JvmField @ProtoNumber(5) val retryTimes: Int? = null, // = 0,
+        @JvmField @ProtoNumber(6) val appid: Int? = null, // = 0,
+        @JvmField @ProtoNumber(7) val dataflag: Int? = null, // = 0,
+        @JvmField @ProtoNumber(8) val commandId: Int? = null, // = 0,
         @JvmField @ProtoNumber(9) val buildVer: String = "",
         @JvmField @ProtoNumber(9) val buildVer: String = "",
         @JvmField @ProtoNumber(10) val localeId: Int = 0,
         @JvmField @ProtoNumber(10) val localeId: Int = 0,
-        @JvmField @ProtoNumber(11) val envId: Int = 0
+        @JvmField @ProtoNumber(11) val envId: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class DataHole(
     internal class DataHole(
         @JvmField @ProtoNumber(1) val begin: Long = 0L,
         @JvmField @ProtoNumber(1) val begin: Long = 0L,
-        @JvmField @ProtoNumber(2) val end: Long = 0L
+        @JvmField @ProtoNumber(2) val end: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class FilterExtendinfo(
     internal class FilterExtendinfo(
         @JvmField @ProtoNumber(1) val filterFlag: Int = 0,
         @JvmField @ProtoNumber(1) val filterFlag: Int = 0,
-        @JvmField @ProtoNumber(2) val msgImageFilterRequest: ImageFilterRequest? = null
+        @JvmField @ProtoNumber(2) val msgImageFilterRequest: ImageFilterRequest? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class FilterStyle(
     internal class FilterStyle(
         @JvmField @ProtoNumber(1) val styleId: Int = 0,
         @JvmField @ProtoNumber(1) val styleId: Int = 0,
-        @JvmField @ProtoNumber(2) val styleName: ByteArray = EMPTY_BYTE_ARRAY
+        @JvmField @ProtoNumber(2) val styleName: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -195,26 +195,26 @@ internal class CSDataHighwayHead : ProtoBuf {
         @JvmField @ProtoNumber(4) val style: FilterStyle? = null,
         @JvmField @ProtoNumber(4) val style: FilterStyle? = null,
         @JvmField @ProtoNumber(5) val width: Int = 0,
         @JvmField @ProtoNumber(5) val width: Int = 0,
         @JvmField @ProtoNumber(6) val height: Int = 0,
         @JvmField @ProtoNumber(6) val height: Int = 0,
-        @JvmField @ProtoNumber(7) val imageData: ByteArray = EMPTY_BYTE_ARRAY
+        @JvmField @ProtoNumber(7) val imageData: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class ImageFilterResponse(
     internal class ImageFilterResponse(
         @JvmField @ProtoNumber(1) val retCode: Int = 0,
         @JvmField @ProtoNumber(1) val retCode: Int = 0,
         @JvmField @ProtoNumber(2) val imageData: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(2) val imageData: ByteArray = EMPTY_BYTE_ARRAY,
-        @JvmField @ProtoNumber(3) val costTime: Int = 0
+        @JvmField @ProtoNumber(3) val costTime: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class LoginSigHead(
     internal class LoginSigHead(
         @JvmField @ProtoNumber(1) val loginsigType: Int = 0,
         @JvmField @ProtoNumber(1) val loginsigType: Int = 0,
-        @JvmField @ProtoNumber(2) val loginsig: ByteArray = EMPTY_BYTE_ARRAY
+        @JvmField @ProtoNumber(2) val loginsig: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class NewServiceTicket(
     internal class NewServiceTicket(
         @JvmField @ProtoNumber(1) val signature: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(1) val signature: ByteArray = EMPTY_BYTE_ARRAY,
-        @JvmField @ProtoNumber(2) val ukey: ByteArray = EMPTY_BYTE_ARRAY
+        @JvmField @ProtoNumber(2) val ukey: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -227,7 +227,7 @@ internal class CSDataHighwayHead : ProtoBuf {
         @JvmField @ProtoNumber(6) val platType: Int = 0,
         @JvmField @ProtoNumber(6) val platType: Int = 0,
         @JvmField @ProtoNumber(7) val netType: Int = 0,
         @JvmField @ProtoNumber(7) val netType: Int = 0,
         @JvmField @ProtoNumber(8) val imgType: Int = 0,
         @JvmField @ProtoNumber(8) val imgType: Int = 0,
-        @JvmField @ProtoNumber(9) val appPicType: Int = 0
+        @JvmField @ProtoNumber(9) val appPicType: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -235,14 +235,14 @@ internal class CSDataHighwayHead : ProtoBuf {
         @JvmField @ProtoNumber(1) val skey: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(1) val skey: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(2) val clientIp: Int = 0,
         @JvmField @ProtoNumber(2) val clientIp: Int = 0,
         @JvmField @ProtoNumber(3) val upOffset: Long = 0L,
         @JvmField @ProtoNumber(3) val upOffset: Long = 0L,
-        @JvmField @ProtoNumber(4) val blockSize: Long = 0L
+        @JvmField @ProtoNumber(4) val blockSize: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class QueryHoleRsp(
     internal class QueryHoleRsp(
         @JvmField @ProtoNumber(1) val result: Int = 0,
         @JvmField @ProtoNumber(1) val result: Int = 0,
         @JvmField @ProtoNumber(2) val dataHole: List<DataHole> = emptyList(),
         @JvmField @ProtoNumber(2) val dataHole: List<DataHole> = emptyList(),
-        @JvmField @ProtoNumber(3) val boolCompFlag: Boolean = false
+        @JvmField @ProtoNumber(3) val boolCompFlag: Boolean = false,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -251,12 +251,12 @@ internal class CSDataHighwayHead : ProtoBuf {
         @JvmField @ProtoNumber(2) val msgSeghead: SegHead? = null,
         @JvmField @ProtoNumber(2) val msgSeghead: SegHead? = null,
         @JvmField @ProtoNumber(3) val reqExtendinfo: ByteArray? = null, // = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(3) val reqExtendinfo: ByteArray? = null, // = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(4) val timestamp: Long = 0L,
         @JvmField @ProtoNumber(4) val timestamp: Long = 0L,
-        @JvmField @ProtoNumber(5) val msgLoginSigHead: LoginSigHead? = null
+        @JvmField @ProtoNumber(5) val msgLoginSigHead: LoginSigHead? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class RspBody(
     internal class RspBody(
-        @JvmField @ProtoNumber(1) val msgQueryHoleRsp: QueryHoleRsp? = null
+        @JvmField @ProtoNumber(1) val msgQueryHoleRsp: QueryHoleRsp? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -270,7 +270,7 @@ internal class CSDataHighwayHead : ProtoBuf {
         @JvmField @ProtoNumber(7) val rspExtendinfo: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(7) val rspExtendinfo: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(8) val timestamp: Long = 0L,
         @JvmField @ProtoNumber(8) val timestamp: Long = 0L,
         @JvmField @ProtoNumber(9) val range: Long = 0L,
         @JvmField @ProtoNumber(9) val range: Long = 0L,
-        @JvmField @ProtoNumber(10) val isReset: Int = 0
+        @JvmField @ProtoNumber(10) val isReset: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -286,7 +286,7 @@ internal class CSDataHighwayHead : ProtoBuf {
         @JvmField @ProtoNumber(9) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(9) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(10) val cacheAddr: Int = 0,
         @JvmField @ProtoNumber(10) val cacheAddr: Int = 0,
         @JvmField @ProtoNumber(11) val queryTimes: Int = 0,
         @JvmField @ProtoNumber(11) val queryTimes: Int = 0,
-        @JvmField @ProtoNumber(12) val updateCacheip: Int = 0
+        @JvmField @ProtoNumber(12) val updateCacheip: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }
 
 
@@ -295,7 +295,7 @@ internal class HwConfigPersistentPB : ProtoBuf {
     @Serializable
     @Serializable
     internal class HwConfigItemPB(
     internal class HwConfigItemPB(
         @JvmField @ProtoNumber(1) val key: String = "",
         @JvmField @ProtoNumber(1) val key: String = "",
-        @JvmField @ProtoNumber(2) val endPointList: List<HwEndPointPB> = emptyList()
+        @JvmField @ProtoNumber(2) val endPointList: List<HwEndPointPB> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -303,14 +303,14 @@ internal class HwConfigPersistentPB : ProtoBuf {
         @JvmField @ProtoNumber(1) val configItemList: List<HwConfigItemPB> = emptyList(),
         @JvmField @ProtoNumber(1) val configItemList: List<HwConfigItemPB> = emptyList(),
         @JvmField @ProtoNumber(2) val netSegConfList: List<HwNetSegConfPB> = emptyList(),
         @JvmField @ProtoNumber(2) val netSegConfList: List<HwNetSegConfPB> = emptyList(),
         @JvmField @ProtoNumber(3) val shortVideoNetConf: List<HwNetSegConfPB> = emptyList(),
         @JvmField @ProtoNumber(3) val shortVideoNetConf: List<HwNetSegConfPB> = emptyList(),
-        @JvmField @ProtoNumber(4) val configItemListIp6: List<HwConfigItemPB> = emptyList()
+        @JvmField @ProtoNumber(4) val configItemListIp6: List<HwConfigItemPB> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class HwEndPointPB(
     internal class HwEndPointPB(
         @JvmField @ProtoNumber(1) val host: String = "",
         @JvmField @ProtoNumber(1) val host: String = "",
         @JvmField @ProtoNumber(2) val int32Port: Int = 0,
         @JvmField @ProtoNumber(2) val int32Port: Int = 0,
-        @JvmField @ProtoNumber(3) val int64Timestampe: Long = 0L
+        @JvmField @ProtoNumber(3) val int64Timestampe: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -318,7 +318,7 @@ internal class HwConfigPersistentPB : ProtoBuf {
         @JvmField @ProtoNumber(1) val int64NetType: Long = 0L,
         @JvmField @ProtoNumber(1) val int64NetType: Long = 0L,
         @JvmField @ProtoNumber(2) val int64SegSize: Long = 0L,
         @JvmField @ProtoNumber(2) val int64SegSize: Long = 0L,
         @JvmField @ProtoNumber(3) val int64SegNum: Long = 0L,
         @JvmField @ProtoNumber(3) val int64SegNum: Long = 0L,
-        @JvmField @ProtoNumber(4) val int64CurConnNum: Long = 0L
+        @JvmField @ProtoNumber(4) val int64CurConnNum: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }
 
 
@@ -327,7 +327,7 @@ internal class HwSessionInfoPersistentPB : ProtoBuf {
     @Serializable
     @Serializable
     internal class HwSessionInfoPB(
     internal class HwSessionInfoPB(
         @JvmField @ProtoNumber(1) val httpconnSigSession: ByteArray = EMPTY_BYTE_ARRAY,
         @JvmField @ProtoNumber(1) val httpconnSigSession: ByteArray = EMPTY_BYTE_ARRAY,
-        @JvmField @ProtoNumber(2) val sessionKey: ByteArray = EMPTY_BYTE_ARRAY
+        @JvmField @ProtoNumber(2) val sessionKey: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }
 
 
@@ -335,12 +335,12 @@ internal class HwSessionInfoPersistentPB : ProtoBuf {
 internal class Subcmd0x501 : ProtoBuf {
 internal class Subcmd0x501 : ProtoBuf {
     @Serializable
     @Serializable
     internal class ReqBody(
     internal class ReqBody(
-        @JvmField @ProtoNumber(1281) val msgSubcmd0x501ReqBody: SubCmd0x501ReqBody? = null
+        @JvmField @ProtoNumber(1281) val msgSubcmd0x501ReqBody: SubCmd0x501ReqBody? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class RspBody(
     internal class RspBody(
-        @JvmField @ProtoNumber(1281) val msgSubcmd0x501RspBody: SubCmd0x501Rspbody? = null
+        @JvmField @ProtoNumber(1281) val msgSubcmd0x501RspBody: SubCmd0x501Rspbody? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -356,7 +356,7 @@ internal class Subcmd0x501 : ProtoBuf {
         @JvmField @ProtoNumber(9) val term: Int = 0,
         @JvmField @ProtoNumber(9) val term: Int = 0,
         @JvmField @ProtoNumber(10) val plat: Int = 0,
         @JvmField @ProtoNumber(10) val plat: Int = 0,
         @JvmField @ProtoNumber(11) val net: Int = 0,
         @JvmField @ProtoNumber(11) val net: Int = 0,
-        @JvmField @ProtoNumber(12) val caller: Int = 0
+        @JvmField @ProtoNumber(12) val caller: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -376,13 +376,13 @@ internal class Subcmd0x501 : ProtoBuf {
         @JvmField @ProtoNumber(13) val shareChannel: Int = 0,
         @JvmField @ProtoNumber(13) val shareChannel: Int = 0,
         @JvmField @ProtoNumber(14) val fmtPolicy: Int = 0,
         @JvmField @ProtoNumber(14) val fmtPolicy: Int = 0,
         @JvmField @ProtoNumber(15) val bigdataPolicy: Int = 0,
         @JvmField @ProtoNumber(15) val bigdataPolicy: Int = 0,
-        @JvmField @ProtoNumber(16) val connAttemptDelay: Int = 0
+        @JvmField @ProtoNumber(16) val connAttemptDelay: Int = 0,
     ) : ProtoBuf {
     ) : ProtoBuf {
         @Serializable
         @Serializable
         internal class DownloadEncryptConf(
         internal class DownloadEncryptConf(
             @JvmField @ProtoNumber(1) val boolEnableEncryptRequest: Boolean = false,
             @JvmField @ProtoNumber(1) val boolEnableEncryptRequest: Boolean = false,
             @JvmField @ProtoNumber(2) val boolEnableEncryptedPic: Boolean = false,
             @JvmField @ProtoNumber(2) val boolEnableEncryptedPic: Boolean = false,
-            @JvmField @ProtoNumber(3) val ctrlFlag: Int = 0
+            @JvmField @ProtoNumber(3) val ctrlFlag: Int = 0,
         ) : ProtoBuf
         ) : ProtoBuf
 
 
         @Serializable
         @Serializable
@@ -405,7 +405,7 @@ internal class Subcmd0x501 : ProtoBuf {
             @JvmField @ProtoNumber(16) val hbTimeout3g: Int = 0,
             @JvmField @ProtoNumber(16) val hbTimeout3g: Int = 0,
             @JvmField @ProtoNumber(17) val hbTimeout4g: Int = 0,
             @JvmField @ProtoNumber(17) val hbTimeout4g: Int = 0,
             @JvmField @ProtoNumber(18) val hbTimeoutWifi: Int = 0,
             @JvmField @ProtoNumber(18) val hbTimeoutWifi: Int = 0,
-            @JvmField @ProtoNumber(19) val hbTimeoutDefault: Int = 0
+            @JvmField @ProtoNumber(19) val hbTimeoutDefault: Int = 0,
         ) : ProtoBuf
         ) : ProtoBuf
 
 
         @Serializable
         @Serializable
@@ -414,7 +414,7 @@ internal class Subcmd0x501 : ProtoBuf {
             @JvmField @ProtoNumber(2) val ip6: ByteArray = EMPTY_BYTE_ARRAY,
             @JvmField @ProtoNumber(2) val ip6: ByteArray = EMPTY_BYTE_ARRAY,
             @JvmField @ProtoNumber(3) val port: Int = 0,
             @JvmField @ProtoNumber(3) val port: Int = 0,
             @JvmField @ProtoNumber(4) val area: Int = 0,
             @JvmField @ProtoNumber(4) val area: Int = 0,
-            @JvmField @ProtoNumber(5) val sameIsp: Int = 0
+            @JvmField @ProtoNumber(5) val sameIsp: Int = 0,
         ) : ProtoBuf
         ) : ProtoBuf
 
 
         @Serializable
         @Serializable
@@ -423,7 +423,7 @@ internal class Subcmd0x501 : ProtoBuf {
             @ProtoType(ProtoIntegerType.FIXED) @JvmField @ProtoNumber(2) val ip: Int = 0,
             @ProtoType(ProtoIntegerType.FIXED) @JvmField @ProtoNumber(2) val ip: Int = 0,
             @JvmField @ProtoNumber(3) val port: Int = 0,
             @JvmField @ProtoNumber(3) val port: Int = 0,
             @JvmField @ProtoNumber(4) val area: Int = 0,
             @JvmField @ProtoNumber(4) val area: Int = 0,
-            @JvmField @ProtoNumber(5) val sameIsp: Int = 0
+            @JvmField @ProtoNumber(5) val sameIsp: Int = 0,
         ) : ProtoBuf {
         ) : ProtoBuf {
             fun decode(): Pair<Int, Int> = ip to port
             fun decode(): Pair<Int, Int> = ip to port
         }
         }
@@ -431,7 +431,7 @@ internal class Subcmd0x501 : ProtoBuf {
         @Serializable
         @Serializable
         internal class IpLearnConf(
         internal class IpLearnConf(
             @JvmField @ProtoNumber(1) val refreshCachedIp: Int = 0,
             @JvmField @ProtoNumber(1) val refreshCachedIp: Int = 0,
-            @JvmField @ProtoNumber(2) val enableIpLearn: Int = 0
+            @JvmField @ProtoNumber(2) val enableIpLearn: Int = 0,
         ) : ProtoBuf
         ) : ProtoBuf
 
 
         @Serializable
         @Serializable
@@ -439,7 +439,7 @@ internal class Subcmd0x501 : ProtoBuf {
             @JvmField @ProtoNumber(1) val netType: Int = 0,
             @JvmField @ProtoNumber(1) val netType: Int = 0,
             @JvmField @ProtoNumber(2) val segsize: Int = 0,
             @JvmField @ProtoNumber(2) val segsize: Int = 0,
             @JvmField @ProtoNumber(3) val segnum: Int = 0,
             @JvmField @ProtoNumber(3) val segnum: Int = 0,
-            @JvmField @ProtoNumber(4) val curconnnum: Int = 0
+            @JvmField @ProtoNumber(4) val curconnnum: Int = 0,
         ) : ProtoBuf
         ) : ProtoBuf
 
 
         @Serializable
         @Serializable
@@ -448,14 +448,14 @@ internal class Subcmd0x501 : ProtoBuf {
             @JvmField @ProtoNumber(2) val preSendSegnum: Int = 0,
             @JvmField @ProtoNumber(2) val preSendSegnum: Int = 0,
             @JvmField @ProtoNumber(3) val preSendSegnum3g: Int = 0,
             @JvmField @ProtoNumber(3) val preSendSegnum3g: Int = 0,
             @JvmField @ProtoNumber(4) val preSendSegnum4g: Int = 0,
             @JvmField @ProtoNumber(4) val preSendSegnum4g: Int = 0,
-            @JvmField @ProtoNumber(5) val preSendSegnumWifi: Int = 0
+            @JvmField @ProtoNumber(5) val preSendSegnumWifi: Int = 0,
         ) : ProtoBuf
         ) : ProtoBuf
 
 
         @Serializable
         @Serializable
         internal class PTVConf(
         internal class PTVConf(
             @JvmField @ProtoNumber(1) val channelType: Int = 0,
             @JvmField @ProtoNumber(1) val channelType: Int = 0,
             @JvmField @ProtoNumber(2) val msgNetsegconf: List<NetSegConf> = emptyList(),
             @JvmField @ProtoNumber(2) val msgNetsegconf: List<NetSegConf> = emptyList(),
-            @JvmField @ProtoNumber(3) val boolOpenHardwareCodec: Boolean = false
+            @JvmField @ProtoNumber(3) val boolOpenHardwareCodec: Boolean = false,
         ) : ProtoBuf
         ) : ProtoBuf
 
 
         @Serializable
         @Serializable
@@ -463,7 +463,7 @@ internal class Subcmd0x501 : ProtoBuf {
             @JvmField @ProtoNumber(1) val channelType: Int = 0,
             @JvmField @ProtoNumber(1) val channelType: Int = 0,
             @JvmField @ProtoNumber(2) val msgNetsegconf: List<NetSegConf> = emptyList(),
             @JvmField @ProtoNumber(2) val msgNetsegconf: List<NetSegConf> = emptyList(),
             @JvmField @ProtoNumber(3) val boolOpenHardwareCodec: Boolean = false,
             @JvmField @ProtoNumber(3) val boolOpenHardwareCodec: Boolean = false,
-            @JvmField @ProtoNumber(4) val boolSendAheadSignal: Boolean = false
+            @JvmField @ProtoNumber(4) val boolSendAheadSignal: Boolean = false,
         ) : ProtoBuf
         ) : ProtoBuf
 
 
         @Serializable
         @Serializable
@@ -472,7 +472,7 @@ internal class Subcmd0x501 : ProtoBuf {
             @JvmField @ProtoNumber(2) val msgAddrs: List<IpAddr> = emptyList(),
             @JvmField @ProtoNumber(2) val msgAddrs: List<IpAddr> = emptyList(),
             @JvmField @ProtoNumber(3) val fragmentSize: Int = 0,
             @JvmField @ProtoNumber(3) val fragmentSize: Int = 0,
             @JvmField @ProtoNumber(4) val msgNetsegconf: List<NetSegConf> = emptyList(),
             @JvmField @ProtoNumber(4) val msgNetsegconf: List<NetSegConf> = emptyList(),
-            @JvmField @ProtoNumber(5) val msgAddrsV6: List<Ip6Addr> = emptyList()
+            @JvmField @ProtoNumber(5) val msgAddrsV6: List<Ip6Addr> = emptyList(),
         ) : ProtoBuf
         ) : ProtoBuf
     }
     }
 }
 }

+ 2 - 2
mirai-core/src/commonMain/kotlin/network/protocol/data/proto/HummerResv12.kt

@@ -28,13 +28,13 @@ internal class MarketFaceExtPb : ProtoBuf {
         @JvmField @ProtoNumber(7) val endTime: Int = 0,
         @JvmField @ProtoNumber(7) val endTime: Int = 0,
         @JvmField @ProtoNumber(8) val emojiType: Int = 0,
         @JvmField @ProtoNumber(8) val emojiType: Int = 0,
         @JvmField @ProtoNumber(9) val apngSupportSize: List<SupportSize> = emptyList(),
         @JvmField @ProtoNumber(9) val apngSupportSize: List<SupportSize> = emptyList(),
-        @JvmField @ProtoNumber(10) val hasIpProduct: Int = 0
+        @JvmField @ProtoNumber(10) val hasIpProduct: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class SupportSize(
     internal class SupportSize(
         @JvmField @ProtoNumber(1) val width: Int = 0,
         @JvmField @ProtoNumber(1) val width: Int = 0,
-        @JvmField @ProtoNumber(2) val height: Int = 0
+        @JvmField @ProtoNumber(2) val height: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }
         
         

+ 4 - 4
mirai-core/src/commonMain/kotlin/network/protocol/data/proto/HummerResv21.kt

@@ -20,7 +20,7 @@ internal class HummerResv21 : ProtoBuf {
     @Serializable
     @Serializable
     internal class FileImgInfo(
     internal class FileImgInfo(
         @JvmField @ProtoNumber(1) val fileWidth: Int = 0,
         @JvmField @ProtoNumber(1) val fileWidth: Int = 0,
-        @JvmField @ProtoNumber(2) val fileHeight: Int = 0
+        @JvmField @ProtoNumber(2) val fileHeight: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -37,20 +37,20 @@ internal class HummerResv21 : ProtoBuf {
         @JvmField @ProtoNumber(10) val imgWidth: Int = 0,
         @JvmField @ProtoNumber(10) val imgWidth: Int = 0,
         @JvmField @ProtoNumber(11) val imgHeight: Int = 0,
         @JvmField @ProtoNumber(11) val imgHeight: Int = 0,
         @JvmField @ProtoNumber(12) val videoDuration: Long = 0L,
         @JvmField @ProtoNumber(12) val videoDuration: Long = 0L,
-        @JvmField @ProtoNumber(13) val busId: Int = 0
+        @JvmField @ProtoNumber(13) val busId: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class ResvAttr(
     internal class ResvAttr(
         @JvmField @ProtoNumber(1) val fileImageInfo: FileImgInfo? = null,
         @JvmField @ProtoNumber(1) val fileImageInfo: FileImgInfo? = null,
-        @JvmField @ProtoNumber(2) val forwardExtFileInfo: ForwardExtFileInfo? = null
+        @JvmField @ProtoNumber(2) val forwardExtFileInfo: ForwardExtFileInfo? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class XtfSenderInfo(
     internal class XtfSenderInfo(
         @JvmField @ProtoNumber(1) val lanIp: Int = 0,
         @JvmField @ProtoNumber(1) val lanIp: Int = 0,
         @JvmField @ProtoNumber(2) val lanPort: Int = 0,
         @JvmField @ProtoNumber(2) val lanPort: Int = 0,
-        @JvmField @ProtoNumber(3) val lanSrkey: Long = 0L
+        @JvmField @ProtoNumber(3) val lanSrkey: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }
         
         

+ 2 - 2
mirai-core/src/commonMain/kotlin/network/protocol/data/proto/HummerResv3.kt

@@ -24,7 +24,7 @@ internal class CustomFaceExtPb : ProtoBuf {
     @Serializable
     @Serializable
     internal class AnimationImageShow(
     internal class AnimationImageShow(
         @JvmField @ProtoNumber(1) val int32EffectId: Int = 0,
         @JvmField @ProtoNumber(1) val int32EffectId: Int = 0,
-        @JvmField @ProtoNumber(2) val animationParam: ByteArray = EMPTY_BYTE_ARRAY
+        @JvmField @ProtoNumber(2) val animationParam: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -46,7 +46,7 @@ internal class CustomFaceExtPb : ProtoBuf {
         @JvmField @ProtoNumber(16) val cameraCaptureTemplateinfo: String = "",
         @JvmField @ProtoNumber(16) val cameraCaptureTemplateinfo: String = "",
         @JvmField @ProtoNumber(17) val cameraCaptureMaterialname: String = "",
         @JvmField @ProtoNumber(17) val cameraCaptureMaterialname: String = "",
         @JvmField @ProtoNumber(18) val adEmoJumpUrl: String = "",
         @JvmField @ProtoNumber(18) val adEmoJumpUrl: String = "",
-        @JvmField @ProtoNumber(19) val adEmoDescStr: String = ""
+        @JvmField @ProtoNumber(19) val adEmoDescStr: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }
         
         

+ 10 - 10
mirai-core/src/commonMain/kotlin/network/protocol/data/proto/ImageRequest.kt

@@ -22,20 +22,20 @@ internal interface ImgReq : ProtoBuf
 internal class GetImgUrlReq(
 internal class GetImgUrlReq(
     @ProtoNumber(1) @JvmField val srcUni: Int,
     @ProtoNumber(1) @JvmField val srcUni: Int,
     @ProtoNumber(2) @JvmField val dstUni: Int,
     @ProtoNumber(2) @JvmField val dstUni: Int,
-    @ProtoNumber(3) @JvmField val fileResID: String,//UUID
+    @ProtoNumber(3) @JvmField val fileResID: String, //UUID
     /**
     /**
      * UUID例子: 没有找到
      * UUID例子: 没有找到
      */
      */
     @ProtoNumber(4) @JvmField val urlFlag: Int = 1,
     @ProtoNumber(4) @JvmField val urlFlag: Int = 1,
     //5 unknown, 好像没用
     //5 unknown, 好像没用
     @ProtoNumber(6) @JvmField val urlType: Int = 4,
     @ProtoNumber(6) @JvmField val urlType: Int = 4,
-    @ProtoNumber(7) @JvmField val requestTerm: Int = 5,//确定
-    @ProtoNumber(8) @JvmField val requestPlatformType: Int = 9,//确定
-    @ProtoNumber(9) @JvmField val srcFileType: Int = 1,//2=ftn,1=picplatform,255
-    @ProtoNumber(10) @JvmField val innerIP: Int = 0,//确定
-    @ProtoNumber(11) @JvmField val addressBook: Int = 0,//[ChatType.internalID]== 1006为1[为CONTACT时] 我觉得发0没问题
-    @ProtoNumber(12) @JvmField val buType: Int = 1,//确定
-    @ProtoNumber(13) @JvmField val buildVer: String = "8.2.7.4410",//版本号
-    @ProtoNumber(14) @JvmField val timestamp: Int = currentTimeSeconds().toInt(),//(pic_up_timestamp)
-    @ProtoNumber(15) @JvmField val requestTransferType: Int = 1
+    @ProtoNumber(7) @JvmField val requestTerm: Int = 5, //确定
+    @ProtoNumber(8) @JvmField val requestPlatformType: Int = 9, //确定
+    @ProtoNumber(9) @JvmField val srcFileType: Int = 1, //2=ftn,1=picplatform,255
+    @ProtoNumber(10) @JvmField val innerIP: Int = 0, //确定
+    @ProtoNumber(11) @JvmField val addressBook: Int = 0, //[ChatType.internalID]== 1006为1[为CONTACT时] 我觉得发0没问题
+    @ProtoNumber(12) @JvmField val buType: Int = 1, //确定
+    @ProtoNumber(13) @JvmField val buildVer: String = "8.2.7.4410", //版本号
+    @ProtoNumber(14) @JvmField val timestamp: Int = currentTimeSeconds().toInt(), //(pic_up_timestamp)
+    @ProtoNumber(15) @JvmField val requestTransferType: Int = 1,
 ) : ImgReq
 ) : ImgReq

+ 16 - 16
mirai-core/src/commonMain/kotlin/network/protocol/data/proto/LongMsg.kt

@@ -16,66 +16,66 @@ import net.mamoe.mirai.utils.EMPTY_BYTE_ARRAY
 
 
 internal class LongMsg : ProtoBuf {
 internal class LongMsg : ProtoBuf {
     @Serializable
     @Serializable
-internal class MsgDeleteReq(
+    internal class MsgDeleteReq(
         @ProtoNumber(1) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(1) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(2) @JvmField val msgType: Int = 0
+        @ProtoNumber(2) @JvmField val msgType: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class MsgDeleteRsp(
+    internal class MsgDeleteRsp(
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(1) @JvmField val result: Int = 0,
-        @ProtoNumber(2) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(2) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class MsgDownReq(
+    internal class MsgDownReq(
         @ProtoNumber(1) @JvmField val srcUin: Int = 0,
         @ProtoNumber(1) @JvmField val srcUin: Int = 0,
         @ProtoNumber(2) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val msgType: Int = 0,
         @ProtoNumber(3) @JvmField val msgType: Int = 0,
-        @ProtoNumber(4) @JvmField val needCache: Int = 0
+        @ProtoNumber(4) @JvmField val needCache: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class MsgDownRsp(
+    internal class MsgDownRsp(
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(2) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(3) @JvmField val msgContent: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(3) @JvmField val msgContent: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class MsgUpReq(
+    internal class MsgUpReq(
         @ProtoNumber(1) @JvmField val msgType: Int = 0,
         @ProtoNumber(1) @JvmField val msgType: Int = 0,
         @ProtoNumber(2) @JvmField val dstUin: Long = 0L,
         @ProtoNumber(2) @JvmField val dstUin: Long = 0L,
         @ProtoNumber(3) @JvmField val msgId: Int = 0,
         @ProtoNumber(3) @JvmField val msgId: Int = 0,
         @ProtoNumber(4) @JvmField val msgContent: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(4) @JvmField val msgContent: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(5) @JvmField val storeType: Int = 0,
         @ProtoNumber(5) @JvmField val storeType: Int = 0,
         @ProtoNumber(6) @JvmField val msgUkey: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(6) @JvmField val msgUkey: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(7) @JvmField val needCache: Int = 0
+        @ProtoNumber(7) @JvmField val needCache: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class MsgUpRsp(
+    internal class MsgUpRsp(
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(2) @JvmField val msgId: Int = 0,
         @ProtoNumber(2) @JvmField val msgId: Int = 0,
-        @ProtoNumber(3) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(3) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class ReqBody(
+    internal class ReqBody(
         @ProtoNumber(1) @JvmField val subcmd: Int = 0,
         @ProtoNumber(1) @JvmField val subcmd: Int = 0,
         @ProtoNumber(2) @JvmField val termType: Int = 0,
         @ProtoNumber(2) @JvmField val termType: Int = 0,
         @ProtoNumber(3) @JvmField val platformType: Int = 0,
         @ProtoNumber(3) @JvmField val platformType: Int = 0,
         @ProtoNumber(4) @JvmField val msgUpReq: List<LongMsg.MsgUpReq> = emptyList(),
         @ProtoNumber(4) @JvmField val msgUpReq: List<LongMsg.MsgUpReq> = emptyList(),
         @ProtoNumber(5) @JvmField val msgDownReq: List<LongMsg.MsgDownReq> = emptyList(),
         @ProtoNumber(5) @JvmField val msgDownReq: List<LongMsg.MsgDownReq> = emptyList(),
         @ProtoNumber(6) @JvmField val msgDelReq: List<LongMsg.MsgDeleteReq> = emptyList(),
         @ProtoNumber(6) @JvmField val msgDelReq: List<LongMsg.MsgDeleteReq> = emptyList(),
-        @ProtoNumber(10) @JvmField val agentType: Int = 0
+        @ProtoNumber(10) @JvmField val agentType: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
-internal class RspBody(
+    internal class RspBody(
         @ProtoNumber(1) @JvmField val subcmd: Int = 0,
         @ProtoNumber(1) @JvmField val subcmd: Int = 0,
         @ProtoNumber(2) @JvmField val msgUpRsp: List<LongMsg.MsgUpRsp> = emptyList(),
         @ProtoNumber(2) @JvmField val msgUpRsp: List<LongMsg.MsgUpRsp> = emptyList(),
         @ProtoNumber(3) @JvmField val msgDownRsp: List<LongMsg.MsgDownRsp> = emptyList(),
         @ProtoNumber(3) @JvmField val msgDownRsp: List<LongMsg.MsgDownRsp> = emptyList(),
-        @ProtoNumber(4) @JvmField val msgDelRsp: List<LongMsg.MsgDeleteRsp> = emptyList()
+        @ProtoNumber(4) @JvmField val msgDelRsp: List<LongMsg.MsgDeleteRsp> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }

+ 100 - 100
mirai-core/src/commonMain/kotlin/network/protocol/data/proto/Msg.kt

@@ -21,21 +21,21 @@ internal class ImCommon : ProtoBuf {
     @Serializable
     @Serializable
     internal class GroupInfo(
     internal class GroupInfo(
         @ProtoNumber(1) @JvmField val groupId: Long = 0L,
         @ProtoNumber(1) @JvmField val groupId: Long = 0L,
-        @ProtoNumber(2) @JvmField val groupType: Int /* enum */ = 1
+        @ProtoNumber(2) @JvmField val groupType: Int /* enum */ = 1,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class Signature(
     internal class Signature(
         @ProtoNumber(1) @JvmField val keyType: Int = 0,
         @ProtoNumber(1) @JvmField val keyType: Int = 0,
         @ProtoNumber(2) @JvmField val sessionAppId: Int = 0,
         @ProtoNumber(2) @JvmField val sessionAppId: Int = 0,
-        @ProtoNumber(3) @JvmField val sessionKey: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(3) @JvmField val sessionKey: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class Token(
     internal class Token(
         @ProtoNumber(1) @JvmField val buf: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(1) @JvmField val buf: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val c2cType: Int = 0,
         @ProtoNumber(2) @JvmField val c2cType: Int = 0,
-        @ProtoNumber(3) @JvmField val serviceType: Int = 0
+        @ProtoNumber(3) @JvmField val serviceType: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -49,7 +49,7 @@ internal class ImCommon : ProtoBuf {
         @ProtoNumber(7) @JvmField val phoneNumber: String = "",
         @ProtoNumber(7) @JvmField val phoneNumber: String = "",
         @ProtoNumber(8) @JvmField val platformId: Int = 0,
         @ProtoNumber(8) @JvmField val platformId: Int = 0,
         @ProtoNumber(9) @JvmField val language: Int = 0,
         @ProtoNumber(9) @JvmField val language: Int = 0,
-        @ProtoNumber(10) @JvmField val equipKey: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(10) @JvmField val equipKey: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }
 
 
@@ -66,28 +66,28 @@ internal class ImImagent : ProtoBuf {
         @ProtoNumber(7) @JvmField val reqInfo: Requestinfo? = null,
         @ProtoNumber(7) @JvmField val reqInfo: Requestinfo? = null,
         @ProtoNumber(8) @JvmField val signature: Signature? = null,
         @ProtoNumber(8) @JvmField val signature: Signature? = null,
         @ProtoNumber(9) @JvmField val subCmd: Int = 0,
         @ProtoNumber(9) @JvmField val subCmd: Int = 0,
-        @ProtoNumber(10) @JvmField val serverIp: Int = 0
+        @ProtoNumber(10) @JvmField val serverIp: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class ImAgentPackage(
     internal class ImAgentPackage(
         @ProtoNumber(1) @JvmField val head: ImAgentHead? = null,
         @ProtoNumber(1) @JvmField val head: ImAgentHead? = null,
         @ProtoNumber(11) @JvmField val msgSendReq: ImMsg.MsgSendReq? = null,
         @ProtoNumber(11) @JvmField val msgSendReq: ImMsg.MsgSendReq? = null,
-        @ProtoNumber(12) @JvmField val msgSendResp: ImMsg.MsgSendResp? = null
+        @ProtoNumber(12) @JvmField val msgSendResp: ImMsg.MsgSendResp? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class Requestinfo(
     internal class Requestinfo(
         @ProtoType(ProtoIntegerType.FIXED) @ProtoNumber(1) @JvmField val reqIp: Int = 0,
         @ProtoType(ProtoIntegerType.FIXED) @ProtoNumber(1) @JvmField val reqIp: Int = 0,
         @ProtoNumber(2) @JvmField val reqPort: Int = 0,
         @ProtoNumber(2) @JvmField val reqPort: Int = 0,
-        @ProtoNumber(3) @JvmField val reqFlag: Int = 0
+        @ProtoNumber(3) @JvmField val reqFlag: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class Signature(
     internal class Signature(
         @ProtoNumber(1) @JvmField val keyType: Int = 0,
         @ProtoNumber(1) @JvmField val keyType: Int = 0,
         @ProtoNumber(2) @JvmField val sessionAppId: Int = 0,
         @ProtoNumber(2) @JvmField val sessionAppId: Int = 0,
-        @ProtoNumber(3) @JvmField val sessionKey: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(3) @JvmField val sessionKey: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }
 
 
@@ -97,14 +97,14 @@ internal class ImMsg : ProtoBuf {
     internal class C2C(
     internal class C2C(
         @ProtoNumber(1) @JvmField val sender: ImCommon.User? = null,
         @ProtoNumber(1) @JvmField val sender: ImCommon.User? = null,
         @ProtoNumber(2) @JvmField val receiver: ImCommon.User? = null,
         @ProtoNumber(2) @JvmField val receiver: ImCommon.User? = null,
-        @ProtoNumber(3) @JvmField val c2cRelation: C2CRelation? = null
+        @ProtoNumber(3) @JvmField val c2cRelation: C2CRelation? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class C2CRelation(
     internal class C2CRelation(
         @ProtoNumber(1) @JvmField val c2cType: Int /* enum */ = 0,
         @ProtoNumber(1) @JvmField val c2cType: Int /* enum */ = 0,
         @ProtoNumber(2) @JvmField val groupInfo: ImCommon.GroupInfo? = null,
         @ProtoNumber(2) @JvmField val groupInfo: ImCommon.GroupInfo? = null,
-        @ProtoNumber(3) @JvmField val token: ImCommon.Token? = null
+        @ProtoNumber(3) @JvmField val token: ImCommon.Token? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -118,27 +118,27 @@ internal class ImMsg : ProtoBuf {
         @ProtoNumber(7) @JvmField val msgdbUin: Long = 0L,
         @ProtoNumber(7) @JvmField val msgdbUin: Long = 0L,
         @ProtoNumber(8) @JvmField val msgdbSeq: Int = 0,
         @ProtoNumber(8) @JvmField val msgdbSeq: Int = 0,
         @ProtoNumber(9) @JvmField val wordMsgSeq: Int = 0,
         @ProtoNumber(9) @JvmField val wordMsgSeq: Int = 0,
-        @ProtoNumber(10) @JvmField val msgRand: Int = 0
+        @ProtoNumber(10) @JvmField val msgRand: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class Group(
     internal class Group(
         @ProtoNumber(1) @JvmField val sender: ImCommon.User? = null,
         @ProtoNumber(1) @JvmField val sender: ImCommon.User? = null,
         @ProtoNumber(2) @JvmField val receiver: ImCommon.User? = null,
         @ProtoNumber(2) @JvmField val receiver: ImCommon.User? = null,
-        @ProtoNumber(3) @JvmField val groupInfo: ImCommon.GroupInfo? = null
+        @ProtoNumber(3) @JvmField val groupInfo: ImCommon.GroupInfo? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class Msg(
     internal class Msg(
         @ProtoNumber(1) @JvmField val head: MsgHead? = null,
         @ProtoNumber(1) @JvmField val head: MsgHead? = null,
-        @ProtoNumber(2) @JvmField val body: ImMsgBody.MsgBody? = null
+        @ProtoNumber(2) @JvmField val body: ImMsgBody.MsgBody? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class MsgHead(
     internal class MsgHead(
         @ProtoNumber(1) @JvmField val routingHead: RoutingHead? = null,
         @ProtoNumber(1) @JvmField val routingHead: RoutingHead? = null,
         @ProtoNumber(2) @JvmField val contentHead: ContentHead? = null,
         @ProtoNumber(2) @JvmField val contentHead: ContentHead? = null,
-        @ProtoNumber(3) @JvmField val gbkTmpMsgBody: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(3) @JvmField val gbkTmpMsgBody: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -147,7 +147,7 @@ internal class ImMsg : ProtoBuf {
         @ProtoNumber(2) @JvmField val buMsg: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val buMsg: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val msgTailId: Int = 0,
         @ProtoNumber(3) @JvmField val msgTailId: Int = 0,
         @ProtoNumber(4) @JvmField val connMsgFlag: Int = 0,
         @ProtoNumber(4) @JvmField val connMsgFlag: Int = 0,
-        @ProtoNumber(5) @JvmField val cookie: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(5) @JvmField val cookie: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -156,7 +156,7 @@ internal class ImMsg : ProtoBuf {
     @Serializable
     @Serializable
     internal class RoutingHead(
     internal class RoutingHead(
         @ProtoNumber(1) @JvmField val c2c: C2C? = null,
         @ProtoNumber(1) @JvmField val c2c: C2C? = null,
-        @ProtoNumber(2) @JvmField val group: Group? = null
+        @ProtoNumber(2) @JvmField val group: Group? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }
 
 
@@ -170,7 +170,7 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(4) @JvmField val headPortrait: Int = 0,
         @ProtoNumber(4) @JvmField val headPortrait: Int = 0,
         @ProtoNumber(5) @JvmField val expireTime: Int = 0,
         @ProtoNumber(5) @JvmField val expireTime: Int = 0,
         @ProtoNumber(6) @JvmField val bubbleId: Int = 0,
         @ProtoNumber(6) @JvmField val bubbleId: Int = 0,
-        @ProtoNumber(7) @JvmField val rankColor: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(7) @JvmField val rankColor: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -187,7 +187,7 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(10) @JvmField val diytextId: Int = 0,
         @ProtoNumber(10) @JvmField val diytextId: Int = 0,
         @ProtoNumber(11) @JvmField val diytextContent: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(11) @JvmField val diytextContent: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(12) @JvmField val inputText: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(12) @JvmField val inputText: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(13) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(13) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -195,7 +195,7 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(1) @JvmField val appName: String = "",
         @ProtoNumber(1) @JvmField val appName: String = "",
         @ProtoNumber(2) @JvmField val minVersion: String = "",
         @ProtoNumber(2) @JvmField val minVersion: String = "",
         @ProtoNumber(3) @JvmField val xmlTemplate: String = "",
         @ProtoNumber(3) @JvmField val xmlTemplate: String = "",
-        @ProtoNumber(4) @JvmField val data: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(4) @JvmField val data: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -209,32 +209,32 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(7) @JvmField val charSet: Int = 78,
         @ProtoNumber(7) @JvmField val charSet: Int = 78,
         @ProtoNumber(8) @JvmField val pitchAndFamily: Int = 90,
         @ProtoNumber(8) @JvmField val pitchAndFamily: Int = 90,
         @ProtoNumber(9) @JvmField val fontName: String = "Times New Roman",
         @ProtoNumber(9) @JvmField val fontName: String = "Times New Roman",
-        @ProtoNumber(10) @JvmField val reserveData: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(10) @JvmField val reserveData: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class BitAppMsg(
     internal class BitAppMsg(
-        @ProtoNumber(1) @JvmField val buf: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(1) @JvmField val buf: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class BlessingMessage(
     internal class BlessingMessage(
         @ProtoNumber(1) @JvmField val msgType: Int = 0,
         @ProtoNumber(1) @JvmField val msgType: Int = 0,
-        @ProtoNumber(2) @JvmField val exFlag: Int = 0
+        @ProtoNumber(2) @JvmField val exFlag: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class CommonElem(
     internal class CommonElem(
         @ProtoNumber(1) @JvmField val serviceType: Int = 0,
         @ProtoNumber(1) @JvmField val serviceType: Int = 0,
         @ProtoNumber(2) @JvmField val pbElem: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val pbElem: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(3) @JvmField val businessType: Int = 0
+        @ProtoNumber(3) @JvmField val businessType: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class ConferenceTipsInfo(
     internal class ConferenceTipsInfo(
         @ProtoNumber(1) @JvmField val sessionType: Int = 0,
         @ProtoNumber(1) @JvmField val sessionType: Int = 0,
         @ProtoNumber(2) @JvmField val sessionUin: Long = 0L,
         @ProtoNumber(2) @JvmField val sessionUin: Long = 0L,
-        @ProtoNumber(3) @JvmField val text: String = ""
+        @ProtoNumber(3) @JvmField val text: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -243,7 +243,7 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(2) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val qidianFlag: Int = 0,
         @ProtoNumber(3) @JvmField val qidianFlag: Int = 0,
         @ProtoNumber(4) @JvmField val pushFlag: Int = 0,
         @ProtoNumber(4) @JvmField val pushFlag: Int = 0,
-        @ProtoNumber(5) @JvmField val countFlag: Int = 0
+        @ProtoNumber(5) @JvmField val countFlag: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -252,7 +252,7 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(2) @JvmField val data: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val data: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val enumType: Int /* enum */ = 1,
         @ProtoNumber(3) @JvmField val enumType: Int /* enum */ = 1,
         @ProtoNumber(4) @JvmField val ext: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(4) @JvmField val ext: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(5) @JvmField val sound: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(5) @JvmField val sound: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -290,7 +290,7 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(31) override val _400Url: String = "",
         @ProtoNumber(31) override val _400Url: String = "",
         @ProtoNumber(32) @JvmField val _400Width: Int = 0,
         @ProtoNumber(32) @JvmField val _400Width: Int = 0,
         @ProtoNumber(33) @JvmField val _400Height: Int = 0,
         @ProtoNumber(33) @JvmField val _400Height: Int = 0,
-        @ProtoNumber(34) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(34) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf, NotOnlineImageOrCustomFace
     ) : ProtoBuf, NotOnlineImageOrCustomFace
 
 
     @Serializable
     @Serializable
@@ -316,13 +316,13 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(19) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(19) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(20) @JvmField val receiverName: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(20) @JvmField val receiverName: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(21) @JvmField val receiverPic: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(21) @JvmField val receiverPic: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(22) @JvmField val stmessageGifturl: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(22) @JvmField val stmessageGifturl: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class EIMInfo(
     internal class EIMInfo(
         @ProtoNumber(1) @JvmField val rootId: Long = 0L,
         @ProtoNumber(1) @JvmField val rootId: Long = 0L,
-        @ProtoNumber(2) @JvmField val flag: Int = 0
+        @ProtoNumber(2) @JvmField val flag: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -379,13 +379,13 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(50) @JvmField val groupPostElem: GroupPostElem? = null,
         @ProtoNumber(50) @JvmField val groupPostElem: GroupPostElem? = null,
         @ProtoNumber(51) @JvmField val lightApp: LightAppElem? = null,
         @ProtoNumber(51) @JvmField val lightApp: LightAppElem? = null,
         @ProtoNumber(52) @JvmField val eimInfo: EIMInfo? = null,
         @ProtoNumber(52) @JvmField val eimInfo: EIMInfo? = null,
-        @ProtoNumber(53) @JvmField val commonElem: CommonElem? = null
+        @ProtoNumber(53) @JvmField val commonElem: CommonElem? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class ElemFlags(
     internal class ElemFlags(
         @ProtoNumber(1) @JvmField val flags1: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(1) @JvmField val flags1: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(2) @JvmField val businessData: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(2) @JvmField val businessData: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -403,12 +403,12 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(11) @JvmField val latitude: Int = 0,
         @ProtoNumber(11) @JvmField val latitude: Int = 0,
         @ProtoNumber(12) @JvmField val customFont: Int = 0,
         @ProtoNumber(12) @JvmField val customFont: Int = 0,
         @ProtoNumber(13) @JvmField val pcSupportDef: PcSupportDef? = null,
         @ProtoNumber(13) @JvmField val pcSupportDef: PcSupportDef? = null,
-        @ProtoNumber(14) @JvmField val crmFlags: Int = 0
+        @ProtoNumber(14) @JvmField val crmFlags: Int = 0,
     ) : ProtoBuf {
     ) : ProtoBuf {
         @Serializable
         @Serializable
         internal class Inst(
         internal class Inst(
             @ProtoNumber(1) @JvmField val appId: Int = 0,
             @ProtoNumber(1) @JvmField val appId: Int = 0,
-            @ProtoNumber(2) @JvmField val instId: Int = 0
+            @ProtoNumber(2) @JvmField val instId: Int = 0,
         )
         )
     }
     }
 
 
@@ -425,36 +425,36 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(9) @JvmField val uin: Long = 0L,
         @ProtoNumber(9) @JvmField val uin: Long = 0L,
         @ProtoNumber(10) @JvmField val msgStateFlag: Int = 0,
         @ProtoNumber(10) @JvmField val msgStateFlag: Int = 0,
         @ProtoNumber(11) @JvmField val apnsSoundType: Int = 0,
         @ProtoNumber(11) @JvmField val apnsSoundType: Int = 0,
-        @ProtoNumber(12) @JvmField val newGroupFlag: Int = 0
+        @ProtoNumber(12) @JvmField val newGroupFlag: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class Face(
     internal class Face(
         @ProtoNumber(1) @JvmField val index: Int = 0,
         @ProtoNumber(1) @JvmField val index: Int = 0,
         @ProtoNumber(2) @JvmField val old: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val old: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(11) @JvmField val buf: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(11) @JvmField val buf: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class FSJMessageElem(
     internal class FSJMessageElem(
-        @ProtoNumber(1) @JvmField val msgType: Int = 0
+        @ProtoNumber(1) @JvmField val msgType: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class FunFace(
     internal class FunFace(
         @ProtoNumber(1) @JvmField val msgTurntable: Turntable? = null,
         @ProtoNumber(1) @JvmField val msgTurntable: Turntable? = null,
-        @ProtoNumber(2) @JvmField val msgBomb: Bomb? = null
+        @ProtoNumber(2) @JvmField val msgBomb: Bomb? = null,
     ) {
     ) {
         @Serializable
         @Serializable
         internal class Bomb(
         internal class Bomb(
-            @ProtoNumber(1) @JvmField val boolBurst: Boolean = false
+            @ProtoNumber(1) @JvmField val boolBurst: Boolean = false,
         )
         )
 
 
         @Serializable
         @Serializable
         internal class Turntable(
         internal class Turntable(
             @ProtoNumber(1) @JvmField val uint64UinList: List<Long> = emptyList(),
             @ProtoNumber(1) @JvmField val uint64UinList: List<Long> = emptyList(),
             @ProtoNumber(2) @JvmField val hitUin: Long = 0L,
             @ProtoNumber(2) @JvmField val hitUin: Long = 0L,
-            @ProtoNumber(3) @JvmField val hitUinNick: String = ""
+            @ProtoNumber(3) @JvmField val hitUinNick: String = "",
         )
         )
     }
     }
 
 
@@ -478,7 +478,7 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(16) @JvmField val bubbleSubId: Int = 0,
         @ProtoNumber(16) @JvmField val bubbleSubId: Int = 0,
         @ProtoNumber(17) @JvmField val pendantId: Long = 0L,
         @ProtoNumber(17) @JvmField val pendantId: Long = 0L,
         @ProtoNumber(18) @JvmField val rpIndex: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(18) @JvmField val rpIndex: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(19) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY // 78 00 F8 01 00 C8 02 00
+        @ProtoNumber(19) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY, // 78 00 F8 01 00 C8 02 00
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -490,7 +490,7 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(5) @JvmField val nickColor: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(5) @JvmField val nickColor: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(6) @JvmField val rank: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(6) @JvmField val rank: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(7) @JvmField val rankColor: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(7) @JvmField val rankColor: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(8) @JvmField val rankBgcolor: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(8) @JvmField val rankBgcolor: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -504,18 +504,18 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(7) @JvmField val sequence: Long = 0L,
         @ProtoNumber(7) @JvmField val sequence: Long = 0L,
         @ProtoNumber(8) @JvmField val batchItemId: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(8) @JvmField val batchItemId: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(9) @JvmField val feedMsgTime: Int = 0,
         @ProtoNumber(9) @JvmField val feedMsgTime: Int = 0,
-        @ProtoNumber(10) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(10) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class GroupPostElem(
     internal class GroupPostElem(
         @ProtoNumber(1) @JvmField val transType: Int = 0,
         @ProtoNumber(1) @JvmField val transType: Int = 0,
-        @ProtoNumber(2) @JvmField val transMsg: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(2) @JvmField val transMsg: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class GroupPubAccountInfo(
     internal class GroupPubAccountInfo(
-        @ProtoNumber(1) @JvmField val pubAccount: Long = 0L
+        @ProtoNumber(1) @JvmField val pubAccount: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -528,20 +528,20 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(6) @JvmField val bitmap: Long = 0L,
         @ProtoNumber(6) @JvmField val bitmap: Long = 0L,
         @ProtoNumber(7) @JvmField val gdtImpData: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(7) @JvmField val gdtImpData: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(8) @JvmField val gdtCliData: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(8) @JvmField val gdtCliData: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(9) @JvmField val viewId: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(9) @JvmField val viewId: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class LightAppElem(
     internal class LightAppElem(
         @ProtoNumber(1) @JvmField val data: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(1) @JvmField val data: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(2) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(2) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class LocationInfo(
     internal class LocationInfo(
         @ProtoNumber(1) @JvmField val longitude: Double = 0.0,
         @ProtoNumber(1) @JvmField val longitude: Double = 0.0,
         @ProtoNumber(2) @JvmField val latitude: Double = 0.0,
         @ProtoNumber(2) @JvmField val latitude: Double = 0.0,
-        @ProtoNumber(3) @JvmField val desc: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(3) @JvmField val desc: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -549,7 +549,7 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(1) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(1) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val encodeContent: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val encodeContent: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val longMsgUrl: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val longMsgUrl: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(4) @JvmField val downloadKey: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(4) @JvmField val downloadKey: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -558,7 +558,7 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(2) @JvmField val sessionType: Int = 0,
         @ProtoNumber(2) @JvmField val sessionType: Int = 0,
         @ProtoNumber(3) @JvmField val sessionUin: Long = 0L,
         @ProtoNumber(3) @JvmField val sessionUin: Long = 0L,
         @ProtoNumber(4) @JvmField val senderUin: Long = 0L,
         @ProtoNumber(4) @JvmField val senderUin: Long = 0L,
-        @ProtoNumber(5) @JvmField val text: String = ""
+        @ProtoNumber(5) @JvmField val text: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -575,7 +575,7 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(10) @JvmField val imageWidth: Int = 0,
         @ProtoNumber(10) @JvmField val imageWidth: Int = 0,
         @ProtoNumber(11) @JvmField val imageHeight: Int = 0,
         @ProtoNumber(11) @JvmField val imageHeight: Int = 0,
         @ProtoNumber(12) @JvmField val mobileParam: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(12) @JvmField val mobileParam: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(13) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(13) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf {
     ) : ProtoBuf {
         @Suppress("DuplicatedCode")
         @Suppress("DuplicatedCode")
         override fun equals(other: Any?): Boolean {
         override fun equals(other: Any?): Boolean {
@@ -625,26 +625,26 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(2) @JvmField val xml: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val xml: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(4) @JvmField val ability: Int = 0,
         @ProtoNumber(4) @JvmField val ability: Int = 0,
-        @ProtoNumber(5) @JvmField val minAbility: Int = 0
+        @ProtoNumber(5) @JvmField val minAbility: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class MsgBody(
     internal class MsgBody(
         @ProtoNumber(1) @JvmField val richText: RichText = RichText(),
         @ProtoNumber(1) @JvmField val richText: RichText = RichText(),
         @ProtoNumber(2) @JvmField val msgContent: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val msgContent: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(3) @JvmField val msgEncryptContent: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(3) @JvmField val msgEncryptContent: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class MsgBodySubtype4(
     internal class MsgBodySubtype4(
         @ProtoNumber(1) @JvmField val msgNotOnlineFile: NotOnlineFile? = null,
         @ProtoNumber(1) @JvmField val msgNotOnlineFile: NotOnlineFile? = null,
-        @ProtoNumber(2) @JvmField val msgTime: Int = 0
+        @ProtoNumber(2) @JvmField val msgTime: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class NearByMessageType(
     internal class NearByMessageType(
         @ProtoNumber(1) @JvmField val type: Int = 0,
         @ProtoNumber(1) @JvmField val type: Int = 0,
-        @ProtoNumber(2) @JvmField val identifyType: Int = 0
+        @ProtoNumber(2) @JvmField val identifyType: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -667,7 +667,7 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(53) @JvmField val absFileType: Int = 0,
         @ProtoNumber(53) @JvmField val absFileType: Int = 0,
         @ProtoNumber(54) @JvmField val clientType: Int = 0,
         @ProtoNumber(54) @JvmField val clientType: Int = 0,
         @ProtoNumber(55) @JvmField val expireTime: Int = 0,
         @ProtoNumber(55) @JvmField val expireTime: Int = 0,
-        @ProtoNumber(56) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(56) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     interface NotOnlineImageOrCustomFace {
     interface NotOnlineImageOrCustomFace {
@@ -707,7 +707,7 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(26) override val _400Url: String = "",
         @ProtoNumber(26) override val _400Url: String = "",
         @ProtoNumber(27) @JvmField val _400Width: Int = 0,
         @ProtoNumber(27) @JvmField val _400Width: Int = 0,
         @ProtoNumber(28) @JvmField val _400Height: Int = 0,
         @ProtoNumber(28) @JvmField val _400Height: Int = 0,
-        @ProtoNumber(29) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(29) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf, NotOnlineImageOrCustomFace
     ) : ProtoBuf, NotOnlineImageOrCustomFace
 
 
 
 
@@ -715,18 +715,18 @@ internal class ImMsgBody : ProtoBuf {
     internal class OnlineImage(
     internal class OnlineImage(
         @ProtoNumber(1) @JvmField val guid: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(1) @JvmField val guid: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val filePath: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val filePath: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(3) @JvmField val oldVerSendFile: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(3) @JvmField val oldVerSendFile: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class OpenQQData(
     internal class OpenQQData(
-        @ProtoNumber(1) @JvmField val carQqData: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(1) @JvmField val carQqData: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class PatsElem(
     internal class PatsElem(
         @ProtoNumber(1) @JvmField val patType: Int = 0,
         @ProtoNumber(1) @JvmField val patType: Int = 0,
-        @ProtoNumber(2) @JvmField val patCount: Int = 0
+        @ProtoNumber(2) @JvmField val patCount: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -736,7 +736,7 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(3) @JvmField val macPtlBegin: Int = 0,
         @ProtoNumber(3) @JvmField val macPtlBegin: Int = 0,
         @ProtoNumber(4) @JvmField val macPtlEnd: Int = 0,
         @ProtoNumber(4) @JvmField val macPtlEnd: Int = 0,
         @ProtoNumber(5) @JvmField val ptlsSupport: List<Int> = emptyList(),
         @ProtoNumber(5) @JvmField val ptlsSupport: List<Int> = emptyList(),
-        @ProtoNumber(6) @JvmField val ptlsNotSupport: List<Int> = emptyList()
+        @ProtoNumber(6) @JvmField val ptlsNotSupport: List<Int> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -764,7 +764,7 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(29) @JvmField val format: Int = 0,
         @ProtoNumber(29) @JvmField val format: Int = 0,
         @ProtoNumber(30) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(30) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(31) @JvmField val bytesPttUrls: List<ByteArray> = emptyList(),
         @ProtoNumber(31) @JvmField val bytesPttUrls: List<ByteArray> = emptyList(),
-        @ProtoNumber(32) @JvmField val downloadFlag: Int = 0
+        @ProtoNumber(32) @JvmField val downloadFlag: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -772,13 +772,13 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(1) @JvmField val isInterNum: Int = 0,
         @ProtoNumber(1) @JvmField val isInterNum: Int = 0,
         @ProtoNumber(2) @JvmField val ingMsgTemplateId: String = "",
         @ProtoNumber(2) @JvmField val ingMsgTemplateId: String = "",
         @ProtoNumber(3) @JvmField val ingLongMsgUrl: String = "",
         @ProtoNumber(3) @JvmField val ingLongMsgUrl: String = "",
-        @ProtoNumber(4) @JvmField val downloadKey: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(4) @JvmField val downloadKey: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class PubAccount(
     internal class PubAccount(
         @ProtoNumber(1) @JvmField val buf: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(1) @JvmField val buf: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(2) @JvmField val pubAccountUin: Long = 0L
+        @ProtoNumber(2) @JvmField val pubAccountUin: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -786,7 +786,7 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(1) @JvmField val nickname: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(1) @JvmField val nickname: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val gender: Int = 0,
         @ProtoNumber(2) @JvmField val gender: Int = 0,
         @ProtoNumber(3) @JvmField val age: Int = 0,
         @ProtoNumber(3) @JvmField val age: Int = 0,
-        @ProtoNumber(4) @JvmField val distance: Int = 0
+        @ProtoNumber(4) @JvmField val distance: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -794,7 +794,7 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(1) @JvmField val subCmd: Int = 0,
         @ProtoNumber(1) @JvmField val subCmd: Int = 0,
         @ProtoNumber(2) @JvmField val showText: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val showText: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val param: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val param: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(4) @JvmField val introduce: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(4) @JvmField val introduce: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -819,7 +819,7 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(18) @JvmField val ingIndex: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(18) @JvmField val ingIndex: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(19) @JvmField val redchannel: Int = 0,
         @ProtoNumber(19) @JvmField val redchannel: Int = 0,
         @ProtoNumber(20) @JvmField val grapUin: List<Long> = emptyList(),
         @ProtoNumber(20) @JvmField val grapUin: List<Long> = emptyList(),
-        @ProtoNumber(21) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(21) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -844,17 +844,17 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(18) @JvmField val aioImageLeft: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(18) @JvmField val aioImageLeft: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(19) @JvmField val aioImageRight: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(19) @JvmField val aioImageRight: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(20) @JvmField val cftImage: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(20) @JvmField val cftImage: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(21) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(21) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class QQWalletMsg(
     internal class QQWalletMsg(
-        @ProtoNumber(1) @JvmField val aioBody: QQWalletAioBody? = null
+        @ProtoNumber(1) @JvmField val aioBody: QQWalletAioBody? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class RedBagInfo(
     internal class RedBagInfo(
-        @ProtoNumber(1) @JvmField val redbagType: Int = 0
+        @ProtoNumber(1) @JvmField val redbagType: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -864,7 +864,7 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(3) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(4) @JvmField val rand: Int = 0,
         @ProtoNumber(4) @JvmField val rand: Int = 0,
         @ProtoNumber(5) @JvmField val seq: Int = 0,
         @ProtoNumber(5) @JvmField val seq: Int = 0,
-        @ProtoNumber(6) @JvmField val flags: Int = 0
+        @ProtoNumber(6) @JvmField val flags: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -874,7 +874,7 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(3) @JvmField val notOnlineFile: NotOnlineFile? = null,
         @ProtoNumber(3) @JvmField val notOnlineFile: NotOnlineFile? = null,
         @ProtoNumber(4) @JvmField val ptt: Ptt? = null,
         @ProtoNumber(4) @JvmField val ptt: Ptt? = null,
         @ProtoNumber(5) @JvmField val tmpPtt: TmpPtt? = null,
         @ProtoNumber(5) @JvmField val tmpPtt: TmpPtt? = null,
-        @ProtoNumber(6) @JvmField val trans211TmpMsg: Trans211TmpMsg? = null
+        @ProtoNumber(6) @JvmField val trans211TmpMsg: Trans211TmpMsg? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -893,20 +893,20 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(12) @JvmField val notOnlineImage: NotOnlineImage? = null,
         @ProtoNumber(12) @JvmField val notOnlineImage: NotOnlineImage? = null,
         @ProtoNumber(13) @JvmField val elemFlags2: ElemFlags2? = null,
         @ProtoNumber(13) @JvmField val elemFlags2: ElemFlags2? = null,
         @ProtoNumber(14) @JvmField val opertype: Int = 0,
         @ProtoNumber(14) @JvmField val opertype: Int = 0,
-        @ProtoNumber(15) @JvmField val fromphonenum: String = ""
+        @ProtoNumber(15) @JvmField val fromphonenum: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class ShakeWindow(
     internal class ShakeWindow(
         @ProtoNumber(1) @JvmField val type: Int = 0,
         @ProtoNumber(1) @JvmField val type: Int = 0,
         @ProtoNumber(2) @JvmField val reserve: Int = 0,
         @ProtoNumber(2) @JvmField val reserve: Int = 0,
-        @ProtoNumber(3) @JvmField val uin: Long = 0L
+        @ProtoNumber(3) @JvmField val uin: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class SmallEmoji(
     internal class SmallEmoji(
         @ProtoNumber(1) @JvmField val packIdSum: Int = 0,
         @ProtoNumber(1) @JvmField val packIdSum: Int = 0,
-        @ProtoNumber(2) @JvmField val imageType: Int = 0
+        @ProtoNumber(2) @JvmField val imageType: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -921,7 +921,7 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(8) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(8) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(9) @JvmField val srcMsg: ByteArray? = null,
         @ProtoNumber(9) @JvmField val srcMsg: ByteArray? = null,
         @ProtoNumber(10) @JvmField val toUin: Long = 0L,
         @ProtoNumber(10) @JvmField val toUin: Long = 0L,
-        @ProtoNumber(11) @JvmField val troopName: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(11) @JvmField val troopName: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -931,12 +931,12 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(3) @JvmField val attr6Buf: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val attr6Buf: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(4) @JvmField val attr7Buf: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(4) @JvmField val attr7Buf: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(11) @JvmField val buf: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(11) @JvmField val buf: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(12) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(12) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class TipsInfo(
     internal class TipsInfo(
-        @ProtoNumber(1) @JvmField val text: String = ""
+        @ProtoNumber(1) @JvmField val text: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -952,19 +952,19 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(9) @JvmField val busiType: Int = 0,
         @ProtoNumber(9) @JvmField val busiType: Int = 0,
         @ProtoNumber(10) @JvmField val msgId: Long = 0L,
         @ProtoNumber(10) @JvmField val msgId: Long = 0L,
         @ProtoNumber(30) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(30) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(31) @JvmField val pttEncodeData: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(31) @JvmField val pttEncodeData: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class Trans211TmpMsg(
     internal class Trans211TmpMsg(
         @ProtoNumber(1) @JvmField val msgBody: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(1) @JvmField val msgBody: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(2) @JvmField val c2cCmd: Int = 0
+        @ProtoNumber(2) @JvmField val c2cCmd: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class TransElem(
     internal class TransElem(
         @ProtoNumber(1) @JvmField val elemType: Int = 0,
         @ProtoNumber(1) @JvmField val elemType: Int = 0,
-        @ProtoNumber(2) @JvmField val elemValue: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(2) @JvmField val elemValue: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -992,13 +992,13 @@ internal class ImMsgBody : ProtoBuf {
         @ProtoNumber(21) @JvmField val bytesVideoFileUrls: List<ByteArray> = emptyList(),
         @ProtoNumber(21) @JvmField val bytesVideoFileUrls: List<ByteArray> = emptyList(),
         @ProtoNumber(22) @JvmField val thumbDownloadFlag: Int = 0,
         @ProtoNumber(22) @JvmField val thumbDownloadFlag: Int = 0,
         @ProtoNumber(23) @JvmField val videoDownloadFlag: Int = 0,
         @ProtoNumber(23) @JvmField val videoDownloadFlag: Int = 0,
-        @ProtoNumber(24) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(24) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class WorkflowNotifyMsg(
     internal class WorkflowNotifyMsg(
         @ProtoNumber(1) @JvmField val extMsg: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(1) @JvmField val extMsg: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(2) @JvmField val createUin: Long = 0L
+        @ProtoNumber(2) @JvmField val createUin: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }
 
 
@@ -1016,7 +1016,7 @@ internal class ImMsgHead : ProtoBuf {
         @ProtoNumber(8) @JvmField val serverTime: Int = 0,
         @ProtoNumber(8) @JvmField val serverTime: Int = 0,
         @ProtoNumber(9) @JvmField val clientTime: Int = 0,
         @ProtoNumber(9) @JvmField val clientTime: Int = 0,
         @ProtoNumber(10) @JvmField val rand: Int = 0,
         @ProtoNumber(10) @JvmField val rand: Int = 0,
-        @ProtoNumber(11) @JvmField val ingPhoneNumber: String = ""
+        @ProtoNumber(11) @JvmField val ingPhoneNumber: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -1044,7 +1044,7 @@ internal class ImMsgHead : ProtoBuf {
         @ProtoNumber(21) @JvmField val appId: Int = 0,
         @ProtoNumber(21) @JvmField val appId: Int = 0,
         @ProtoNumber(22) @JvmField val instanceId: Int = 0,
         @ProtoNumber(22) @JvmField val instanceId: Int = 0,
         @ProtoNumber(23) @JvmField val sessionId: Long = 0L,
         @ProtoNumber(23) @JvmField val sessionId: Long = 0L,
-        @ProtoNumber(24) @JvmField val idcId: Int = 0
+        @ProtoNumber(24) @JvmField val idcId: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -1055,7 +1055,7 @@ internal class ImMsgHead : ProtoBuf {
         @ProtoNumber(4) @JvmField val cookie: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(4) @JvmField val cookie: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(5) @JvmField val ackCookie: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(5) @JvmField val ackCookie: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(6) @JvmField val result: Int = 0,
         @ProtoNumber(6) @JvmField val result: Int = 0,
-        @ProtoNumber(7) @JvmField val flags: Int = 0
+        @ProtoNumber(7) @JvmField val flags: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -1069,7 +1069,7 @@ internal class ImMsgHead : ProtoBuf {
         @ProtoNumber(7) @JvmField val msgDeltaHead: DeltaHead? = null,
         @ProtoNumber(7) @JvmField val msgDeltaHead: DeltaHead? = null,
         @ProtoNumber(8) @JvmField val msgC2cHead: C2CHead? = null,
         @ProtoNumber(8) @JvmField val msgC2cHead: C2CHead? = null,
         @ProtoNumber(9) @JvmField val msgSconnHead: SConnHead? = null,
         @ProtoNumber(9) @JvmField val msgSconnHead: SConnHead? = null,
-        @ProtoNumber(10) @JvmField val msgInstCtrl: InstCtrl? = null
+        @ProtoNumber(10) @JvmField val msgInstCtrl: InstCtrl? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -1098,14 +1098,14 @@ internal class ImMsgHead : ProtoBuf {
         @ProtoNumber(22) @JvmField val msgRedirect: RedirectMsg? = null,
         @ProtoNumber(22) @JvmField val msgRedirect: RedirectMsg? = null,
         @ProtoNumber(23) @JvmField val commandId: Int = 0,
         @ProtoNumber(23) @JvmField val commandId: Int = 0,
         @ProtoNumber(24) @JvmField val serviceCmdid: Int = 0,
         @ProtoNumber(24) @JvmField val serviceCmdid: Int = 0,
-        @ProtoNumber(25) @JvmField val msgOidbhead: TransOidbHead? = null
+        @ProtoNumber(25) @JvmField val msgOidbhead: TransOidbHead? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class InstCtrl(
     internal class InstCtrl(
         @ProtoNumber(1) @JvmField val msgSendToInst: List<InstInfo> = emptyList(),
         @ProtoNumber(1) @JvmField val msgSendToInst: List<InstInfo> = emptyList(),
         @ProtoNumber(2) @JvmField val msgExcludeInst: List<InstInfo> = emptyList(),
         @ProtoNumber(2) @JvmField val msgExcludeInst: List<InstInfo> = emptyList(),
-        @ProtoNumber(3) @JvmField val msgFromInst: InstInfo? = InstInfo()
+        @ProtoNumber(3) @JvmField val msgFromInst: InstInfo? = InstInfo(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -1113,13 +1113,13 @@ internal class ImMsgHead : ProtoBuf {
         @ProtoNumber(1) @JvmField val apppid: Int = 0,
         @ProtoNumber(1) @JvmField val apppid: Int = 0,
         @ProtoNumber(2) @JvmField val instid: Int = 0,
         @ProtoNumber(2) @JvmField val instid: Int = 0,
         @ProtoNumber(3) @JvmField val platform: Int = 0,
         @ProtoNumber(3) @JvmField val platform: Int = 0,
-        @ProtoNumber(10) @JvmField val enumDeviceType: Int /* enum */ = 0
+        @ProtoNumber(10) @JvmField val enumDeviceType: Int /* enum */ = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class LoginSig(
     internal class LoginSig(
         @ProtoNumber(1) @JvmField val type: Int = 0,
         @ProtoNumber(1) @JvmField val type: Int = 0,
-        @ProtoNumber(2) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(2) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -1128,7 +1128,7 @@ internal class ImMsgHead : ProtoBuf {
         @ProtoNumber(2) @JvmField val lastRedirectPort: Int = 0,
         @ProtoNumber(2) @JvmField val lastRedirectPort: Int = 0,
         @ProtoType(ProtoIntegerType.FIXED) @ProtoNumber(3) @JvmField val redirectIp: Int = 0,
         @ProtoType(ProtoIntegerType.FIXED) @ProtoNumber(3) @JvmField val redirectIp: Int = 0,
         @ProtoNumber(4) @JvmField val redirectPort: Int = 0,
         @ProtoNumber(4) @JvmField val redirectPort: Int = 0,
-        @ProtoNumber(5) @JvmField val redirectCount: Int = 0
+        @ProtoNumber(5) @JvmField val redirectCount: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -1139,7 +1139,7 @@ internal class ImMsgHead : ProtoBuf {
         @ProtoNumber(4) @JvmField val msgId: Int = 0,
         @ProtoNumber(4) @JvmField val msgId: Int = 0,
         @ProtoType(ProtoIntegerType.FIXED) @ProtoNumber(5) @JvmField val relayIp: Int = 0,
         @ProtoType(ProtoIntegerType.FIXED) @ProtoNumber(5) @JvmField val relayIp: Int = 0,
         @ProtoNumber(6) @JvmField val relayPort: Int = 0,
         @ProtoNumber(6) @JvmField val relayPort: Int = 0,
-        @ProtoNumber(7) @JvmField val toUin: Long = 0L
+        @ProtoNumber(7) @JvmField val toUin: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -1150,7 +1150,7 @@ internal class ImMsgHead : ProtoBuf {
         @ProtoNumber(1) @JvmField val command: Int = 0,
         @ProtoNumber(1) @JvmField val command: Int = 0,
         @ProtoNumber(2) @JvmField val serviceType: Int = 0,
         @ProtoNumber(2) @JvmField val serviceType: Int = 0,
         @ProtoNumber(3) @JvmField val result: Int = 0,
         @ProtoNumber(3) @JvmField val result: Int = 0,
-        @ProtoNumber(4) @JvmField val errorMsg: String = ""
+        @ProtoNumber(4) @JvmField val errorMsg: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }
 
 
@@ -1161,24 +1161,24 @@ internal class ImReceipt : ProtoBuf {
         @ProtoNumber(1) @JvmField val fromUin: Long = 0L,
         @ProtoNumber(1) @JvmField val fromUin: Long = 0L,
         @ProtoNumber(2) @JvmField val toUin: Long = 0L,
         @ProtoNumber(2) @JvmField val toUin: Long = 0L,
         @ProtoNumber(3) @JvmField val msgSeq: Int = 0,
         @ProtoNumber(3) @JvmField val msgSeq: Int = 0,
-        @ProtoNumber(4) @JvmField val msgRandom: Int = 0
+        @ProtoNumber(4) @JvmField val msgRandom: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal data class ReceiptInfo(
     internal data class ReceiptInfo(
-        @ProtoNumber(1) @JvmField val readTime: Long = 0L
+        @ProtoNumber(1) @JvmField val readTime: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class ReceiptReq(
     internal class ReceiptReq(
         @ProtoNumber(1) @JvmField val command: Int /* enum */ = 1,
         @ProtoNumber(1) @JvmField val command: Int /* enum */ = 1,
-        @ProtoNumber(2) @JvmField val msgInfo: MsgInfo? = null
+        @ProtoNumber(2) @JvmField val msgInfo: MsgInfo? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class ReceiptResp(
     internal class ReceiptResp(
         @ProtoNumber(1) @JvmField val command: Int /* enum */ = 1,
         @ProtoNumber(1) @JvmField val command: Int /* enum */ = 1,
-        @ProtoNumber(2) @JvmField val receiptInfo: ReceiptInfo? = null
+        @ProtoNumber(2) @JvmField val receiptInfo: ReceiptInfo? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }
 
 
@@ -1187,7 +1187,7 @@ internal class ObjMsg : ProtoBuf {
     @Serializable
     @Serializable
     internal class MsgContentInfo(
     internal class MsgContentInfo(
         @ProtoNumber(1) @JvmField val contentInfoId: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(1) @JvmField val contentInfoId: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(2) @JvmField val msgFile: MsgFile? = null
+        @ProtoNumber(2) @JvmField val msgFile: MsgFile? = null,
     ) : ProtoBuf {
     ) : ProtoBuf {
         @Serializable
         @Serializable
         internal class MsgFile(
         internal class MsgFile(
@@ -1205,7 +1205,7 @@ internal class ObjMsg : ProtoBuf {
     internal class MsgPic(
     internal class MsgPic(
         @ProtoNumber(1) @JvmField val smallPicUrl: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(1) @JvmField val smallPicUrl: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val originalPicUrl: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val originalPicUrl: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(3) @JvmField val localPicId: Int = 0
+        @ProtoNumber(3) @JvmField val localPicId: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -1216,6 +1216,6 @@ internal class ObjMsg : ProtoBuf {
         @ProtoNumber(5) @JvmField val titleExt: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(5) @JvmField val titleExt: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(6) @JvmField val msgPic: List<MsgPic> = emptyList(),
         @ProtoNumber(6) @JvmField val msgPic: List<MsgPic> = emptyList(),
         @ProtoNumber(7) @JvmField val msgContentInfo: List<MsgContentInfo> = emptyList(),
         @ProtoNumber(7) @JvmField val msgContentInfo: List<MsgContentInfo> = emptyList(),
-        @ProtoNumber(8) @JvmField val reportIdShow: Int = 0
+        @ProtoNumber(8) @JvmField val reportIdShow: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }

+ 13 - 13
mirai-core/src/commonMain/kotlin/network/protocol/data/proto/MsgCommon.kt

@@ -23,7 +23,7 @@ internal class MsgComm : ProtoBuf {
     internal class AppShareInfo(
     internal class AppShareInfo(
         @ProtoNumber(1) @JvmField val appshareId: Int = 0,
         @ProtoNumber(1) @JvmField val appshareId: Int = 0,
         @ProtoNumber(2) @JvmField val appshareCookie: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val appshareCookie: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(3) @JvmField val appshareResource: PluginInfo? = null
+        @ProtoNumber(3) @JvmField val appshareResource: PluginInfo? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -38,7 +38,7 @@ internal class MsgComm : ProtoBuf {
         @ProtoNumber(8) @JvmField val toPhone: String = "",
         @ProtoNumber(8) @JvmField val toPhone: String = "",
         @ProtoNumber(9) @JvmField val lockDisplay: Int = 0,
         @ProtoNumber(9) @JvmField val lockDisplay: Int = 0,
         @ProtoNumber(10) @JvmField val directionFlag: Int = 0,
         @ProtoNumber(10) @JvmField val directionFlag: Int = 0,
-        @ProtoNumber(11) @JvmField val reserved: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(11) @JvmField val reserved: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -46,7 +46,7 @@ internal class MsgComm : ProtoBuf {
         @ProtoNumber(1) @JvmField val pkgNum: Int = 0,
         @ProtoNumber(1) @JvmField val pkgNum: Int = 0,
         @ProtoNumber(2) @JvmField val pkgIndex: Int = 0,
         @ProtoNumber(2) @JvmField val pkgIndex: Int = 0,
         @ProtoNumber(3) @JvmField val divSeq: Int = 0,
         @ProtoNumber(3) @JvmField val divSeq: Int = 0,
-        @ProtoNumber(4) @JvmField val autoReply: Int = 0
+        @ProtoNumber(4) @JvmField val autoReply: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -55,13 +55,13 @@ internal class MsgComm : ProtoBuf {
         @ProtoNumber(2) @JvmField val discussType: Int = 0,
         @ProtoNumber(2) @JvmField val discussType: Int = 0,
         @ProtoNumber(3) @JvmField val discussInfoSeq: Long = 0L,
         @ProtoNumber(3) @JvmField val discussInfoSeq: Long = 0L,
         @ProtoNumber(4) @JvmField val discussRemark: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(4) @JvmField val discussRemark: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(5) @JvmField val discussName: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(5) @JvmField val discussName: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class ExtGroupKeyInfo(
     internal class ExtGroupKeyInfo(
         @ProtoNumber(1) @JvmField val curMaxSeq: Int = 0,
         @ProtoNumber(1) @JvmField val curMaxSeq: Int = 0,
-        @ProtoNumber(2) @JvmField val curTime: Long = 0L
+        @ProtoNumber(2) @JvmField val curTime: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -73,7 +73,7 @@ internal class MsgComm : ProtoBuf {
         @ProtoNumber(5) @JvmField val groupRank: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(5) @JvmField val groupRank: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(6) @JvmField val groupLevel: Int = 0,
         @ProtoNumber(6) @JvmField val groupLevel: Int = 0,
         @ProtoNumber(7) @JvmField val groupCardType: Int = 0,
         @ProtoNumber(7) @JvmField val groupCardType: Int = 0,
-        @ProtoNumber(8) @JvmField val groupName: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(8) @JvmField val groupName: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -81,7 +81,7 @@ internal class MsgComm : ProtoBuf {
         @ProtoNumber(1) @JvmField val msgHead: MsgHead,
         @ProtoNumber(1) @JvmField val msgHead: MsgHead,
         @ProtoNumber(2) @JvmField val contentHead: ContentHead? = null,
         @ProtoNumber(2) @JvmField val contentHead: ContentHead? = null,
         @ProtoNumber(3) @JvmField val msgBody: ImMsgBody.MsgBody,
         @ProtoNumber(3) @JvmField val msgBody: ImMsgBody.MsgBody,
-        @ProtoNumber(4) @JvmField val appshareInfo: AppShareInfo? = null
+        @ProtoNumber(4) @JvmField val appshareInfo: AppShareInfo? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -120,19 +120,19 @@ internal class MsgComm : ProtoBuf {
         @ProtoNumber(25) @JvmField val extGroupKeyInfo: ExtGroupKeyInfo? = null,
         @ProtoNumber(25) @JvmField val extGroupKeyInfo: ExtGroupKeyInfo? = null,
         @ProtoNumber(26) @JvmField val multiCompatibleText: String = "",
         @ProtoNumber(26) @JvmField val multiCompatibleText: String = "",
         @ProtoNumber(27) @JvmField val authSex: Int = 0,
         @ProtoNumber(27) @JvmField val authSex: Int = 0,
-        @ProtoNumber(28) @JvmField val isSrcMsg: Boolean = false
+        @ProtoNumber(28) @JvmField val isSrcMsg: Boolean = false,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class MsgType0x210(
     internal class MsgType0x210(
         @ProtoNumber(1) @JvmField val subMsgType: Int = 0,
         @ProtoNumber(1) @JvmField val subMsgType: Int = 0,
-        @ProtoNumber(2) @JvmField val msgContent: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(2) @JvmField val msgContent: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class MutilTransHead(
     internal class MutilTransHead(
         @ProtoNumber(1) @JvmField val status: Int = 0,
         @ProtoNumber(1) @JvmField val status: Int = 0,
-        @ProtoNumber(2) @JvmField val msgId: Int = 0
+        @ProtoNumber(2) @JvmField val msgId: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -147,13 +147,13 @@ internal class MsgComm : ProtoBuf {
         @ProtoNumber(8) @JvmField val resDesc: String = "",
         @ProtoNumber(8) @JvmField val resDesc: String = "",
         @ProtoNumber(9) @JvmField val resUrlBig: String = "",
         @ProtoNumber(9) @JvmField val resUrlBig: String = "",
         @ProtoNumber(10) @JvmField val resUrlSmall: String = "",
         @ProtoNumber(10) @JvmField val resUrlSmall: String = "",
-        @ProtoNumber(11) @JvmField val resConf: String = ""
+        @ProtoNumber(11) @JvmField val resConf: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class Uin2Nick(
     internal class Uin2Nick(
         @ProtoNumber(1) @JvmField val uin: Long = 0L,
         @ProtoNumber(1) @JvmField val uin: Long = 0L,
-        @ProtoNumber(2) @JvmField val nick: String = ""
+        @ProtoNumber(2) @JvmField val nick: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -165,6 +165,6 @@ internal class MsgComm : ProtoBuf {
         @ProtoNumber(5) @JvmField val unreadMsgNum: Int = 0,
         @ProtoNumber(5) @JvmField val unreadMsgNum: Int = 0,
         @ProtoNumber(8) @JvmField val c2cType: Int = 0,
         @ProtoNumber(8) @JvmField val c2cType: Int = 0,
         @ProtoNumber(9) @JvmField val serviceType: Int = 0,
         @ProtoNumber(9) @JvmField val serviceType: Int = 0,
-        @ProtoNumber(10) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(10) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }

+ 1 - 1
mirai-core/src/commonMain/kotlin/network/protocol/data/proto/MsgRevokeUserDef.kt

@@ -30,7 +30,7 @@ internal class MsgRevokeUserDef : ProtoBuf {
     }
     }
 
 
     @Serializable
     @Serializable
-internal class UinTypeUserDef(
+    internal class UinTypeUserDef(
         @ProtoNumber(1) @JvmField val fromUinType: Int = 0,
         @ProtoNumber(1) @JvmField val fromUinType: Int = 0,
         @ProtoNumber(2) @JvmField val fromGroupCode: Long = 0L,
         @ProtoNumber(2) @JvmField val fromGroupCode: Long = 0L,
         @ProtoNumber(3) @JvmField val fileUuid: List<String> = emptyList()
         @ProtoNumber(3) @JvmField val fileUuid: List<String> = emptyList()

+ 94 - 94
mirai-core/src/commonMain/kotlin/network/protocol/data/proto/MsgSvc.kt

@@ -19,7 +19,7 @@ import net.mamoe.mirai.utils.EMPTY_BYTE_ARRAY
 internal class MsgSvc : ProtoBuf {
 internal class MsgSvc : ProtoBuf {
     @Serializable
     @Serializable
     internal class Grp(
     internal class Grp(
-        @ProtoNumber(1) @JvmField val groupCode: Long = 0L
+        @ProtoNumber(1) @JvmField val groupCode: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -33,7 +33,7 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(7) @JvmField val msgRspType: Int = 0,
         @ProtoNumber(7) @JvmField val msgRspType: Int = 0,
         @ProtoNumber(8) @JvmField val pubAccountCookie: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(8) @JvmField val pubAccountCookie: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(9) @JvmField val isPartialSync: Boolean = false,
         @ProtoNumber(9) @JvmField val isPartialSync: Boolean = false,
-        @ProtoNumber(10) @JvmField val msgCtrlBuf: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(10) @JvmField val msgCtrlBuf: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -42,32 +42,32 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(2) @JvmField val groupType: Int,
         @ProtoNumber(2) @JvmField val groupType: Int,
         @ProtoNumber(3) @JvmField val groupCode: Long = 0L,
         @ProtoNumber(3) @JvmField val groupCode: Long = 0L,
         @ProtoNumber(4) @JvmField val msgList: List<MessageInfo> = emptyList(),
         @ProtoNumber(4) @JvmField val msgList: List<MessageInfo> = emptyList(),
-        @ProtoNumber(5) @JvmField val userdef: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(5) @JvmField val userdef: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf {
     ) : ProtoBuf {
         @Serializable
         @Serializable
         internal class MessageInfo(
         internal class MessageInfo(
             @ProtoNumber(1) @JvmField val msgSeq: Int = 0,
             @ProtoNumber(1) @JvmField val msgSeq: Int = 0,
             @ProtoNumber(2) @JvmField val msgRandom: Int = 0,
             @ProtoNumber(2) @JvmField val msgRandom: Int = 0,
-            @ProtoNumber(3) @JvmField val msgType: Int = 0
+            @ProtoNumber(3) @JvmField val msgType: Int = 0,
         )
         )
     }
     }
 
 
     @Serializable
     @Serializable
     internal class PbGroupReadedReportReq(
     internal class PbGroupReadedReportReq(
         @ProtoNumber(1) @JvmField val groupCode: Long = 0L,
         @ProtoNumber(1) @JvmField val groupCode: Long = 0L,
-        @ProtoNumber(2) @JvmField val lastReadSeq: Long = 0L
+        @ProtoNumber(2) @JvmField val lastReadSeq: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class BusinessWPATmp(
     internal class BusinessWPATmp(
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
         @ProtoNumber(2) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(3) @JvmField val sigt: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(3) @JvmField val sigt: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class C2C(
     internal class C2C(
-        @ProtoNumber(1) @JvmField val toUin: Long = 0L
+        @ProtoNumber(1) @JvmField val toUin: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -79,20 +79,20 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(5) @JvmField val memberSeq: Long = 0L,
         @ProtoNumber(5) @JvmField val memberSeq: Long = 0L,
         @ProtoNumber(6) @JvmField val publicGroup: Boolean = false,
         @ProtoNumber(6) @JvmField val publicGroup: Boolean = false,
         @ProtoNumber(7) @JvmField val shieldFlag: Int = 0,
         @ProtoNumber(7) @JvmField val shieldFlag: Int = 0,
-        @ProtoNumber(8) @JvmField val saveTrafficFlag: Int = 0
+        @ProtoNumber(8) @JvmField val saveTrafficFlag: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class PbBindUinMsgReadedConfirmReq(
     internal class PbBindUinMsgReadedConfirmReq(
         @ProtoNumber(1) @JvmField val syncCookie: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(1) @JvmField val syncCookie: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(2) @JvmField val bindUin: Long = 0L
+        @ProtoNumber(2) @JvmField val bindUin: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class AccostTmp(
     internal class AccostTmp(
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
         @ProtoNumber(2) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(3) @JvmField val reply: Boolean = false
+        @ProtoNumber(3) @JvmField val reply: Boolean = false,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -101,26 +101,26 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(2) @JvmField val errmsg: String = "",
         @ProtoNumber(2) @JvmField val errmsg: String = "",
         @ProtoNumber(3) @JvmField val confUin: Long = 0L,
         @ProtoNumber(3) @JvmField val confUin: Long = 0L,
         @ProtoNumber(4) @JvmField val memberSeq: Long = 0L,
         @ProtoNumber(4) @JvmField val memberSeq: Long = 0L,
-        @ProtoNumber(5) @JvmField val confSeq: Long = 0L
+        @ProtoNumber(5) @JvmField val confSeq: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class NearByAssistantTmp(
     internal class NearByAssistantTmp(
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
         @ProtoNumber(2) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(3) @JvmField val reply: Boolean = false
+        @ProtoNumber(3) @JvmField val reply: Boolean = false,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class MsgSendInfo(
     internal class MsgSendInfo(
-        @ProtoNumber(1) @JvmField val receiver: Int = 0
+        @ProtoNumber(1) @JvmField val receiver: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class PubGroupTmp(
     internal class PubGroupTmp(
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
         @ProtoNumber(2) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(3) @JvmField val groupUin: Long = 0L
+        @ProtoNumber(3) @JvmField val groupUin: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -129,31 +129,31 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(2) @JvmField val toPhone: String = "",
         @ProtoNumber(2) @JvmField val toPhone: String = "",
         @ProtoNumber(3) @JvmField val toUin: Long = 0L,
         @ProtoNumber(3) @JvmField val toUin: Long = 0L,
         @ProtoNumber(4) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(4) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(5) @JvmField val fromContactSize: Int = 0
+        @ProtoNumber(5) @JvmField val fromContactSize: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class DisTmp(
     internal class DisTmp(
         @ProtoNumber(1) @JvmField val disUin: Long = 0L,
         @ProtoNumber(1) @JvmField val disUin: Long = 0L,
-        @ProtoNumber(2) @JvmField val toUin: Long = 0L
+        @ProtoNumber(2) @JvmField val toUin: Long = 0L,
     )
     )
 
 
     @Serializable
     @Serializable
     internal class PbMsgWithDrawResp(
     internal class PbMsgWithDrawResp(
         @ProtoNumber(1) @JvmField val c2cWithDraw: List<PbC2CMsgWithDrawResp> = emptyList(),
         @ProtoNumber(1) @JvmField val c2cWithDraw: List<PbC2CMsgWithDrawResp> = emptyList(),
-        @ProtoNumber(2) @JvmField val groupWithDraw: List<PbGroupMsgWithDrawResp> = emptyList()
+        @ProtoNumber(2) @JvmField val groupWithDraw: List<PbGroupMsgWithDrawResp> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class AuthTmp(
     internal class AuthTmp(
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
-        @ProtoNumber(2) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(2) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class PbMsgWithDrawReq(
     internal class PbMsgWithDrawReq(
         @ProtoNumber(1) @JvmField val c2cWithDraw: List<PbC2CMsgWithDrawReq> = emptyList(),
         @ProtoNumber(1) @JvmField val c2cWithDraw: List<PbC2CMsgWithDrawReq> = emptyList(),
-        @ProtoNumber(2) @JvmField val groupWithDraw: List<PbGroupMsgWithDrawReq> = emptyList()
+        @ProtoNumber(2) @JvmField val groupWithDraw: List<PbGroupMsgWithDrawReq> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     internal enum class SyncFlag {
     internal enum class SyncFlag {
@@ -175,7 +175,7 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(9) @JvmField val msgReqType: Int = 0,
         @ProtoNumber(9) @JvmField val msgReqType: Int = 0,
         @ProtoNumber(10) @JvmField val pubaccountCookie: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(10) @JvmField val pubaccountCookie: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(11) @JvmField val msgCtrlBuf: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(11) @JvmField val msgCtrlBuf: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(12) @JvmField val serverBuf: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(12) @JvmField val serverBuf: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -183,13 +183,13 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(1) @JvmField val peerUin: Long = 0L,
         @ProtoNumber(1) @JvmField val peerUin: Long = 0L,
         @ProtoNumber(2) @JvmField val lastMsgtime: Long = 0L,
         @ProtoNumber(2) @JvmField val lastMsgtime: Long = 0L,
         @ProtoNumber(3) @JvmField val random: Long = 0L,
         @ProtoNumber(3) @JvmField val random: Long = 0L,
-        @ProtoNumber(4) @JvmField val readCnt: Int = 0
+        @ProtoNumber(4) @JvmField val readCnt: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class GrpTmp(
     internal class GrpTmp(
         @ProtoNumber(1) @JvmField val groupUin: Long = 0L,
         @ProtoNumber(1) @JvmField val groupUin: Long = 0L,
-        @ProtoNumber(2) @JvmField val toUin: Long = 0L
+        @ProtoNumber(2) @JvmField val toUin: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -201,7 +201,7 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(5) @JvmField val returnBeginSeq: Long = 0L,
         @ProtoNumber(5) @JvmField val returnBeginSeq: Long = 0L,
         @ProtoNumber(6) @JvmField val msg: List<MsgComm.Msg> = emptyList(),
         @ProtoNumber(6) @JvmField val msg: List<MsgComm.Msg> = emptyList(),
         @ProtoNumber(7) @JvmField val lastGetTime: Long = 0L,
         @ProtoNumber(7) @JvmField val lastGetTime: Long = 0L,
-        @ProtoNumber(8) @JvmField val discussInfoSeq: Long = 0L
+        @ProtoNumber(8) @JvmField val discussInfoSeq: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -210,7 +210,7 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(2) @JvmField val c2cType: Int = 0,
         @ProtoNumber(2) @JvmField val c2cType: Int = 0,
         @ProtoNumber(3) @JvmField val svrType: Int = 0,
         @ProtoNumber(3) @JvmField val svrType: Int = 0,
         @ProtoNumber(4) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(4) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(5) @JvmField val reserved: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(5) @JvmField val reserved: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -221,7 +221,7 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(4) @JvmField val groupType: Int = 0,
         @ProtoNumber(4) @JvmField val groupType: Int = 0,
         @ProtoNumber(5) @JvmField val groupCode: Long = 0L,
         @ProtoNumber(5) @JvmField val groupCode: Long = 0L,
         @ProtoNumber(6) @JvmField val failedMsgList: List<MessageResult> = emptyList(),
         @ProtoNumber(6) @JvmField val failedMsgList: List<MessageResult> = emptyList(),
-        @ProtoNumber(7) @JvmField val userdef: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(7) @JvmField val userdef: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf {
     ) : ProtoBuf {
         @Serializable
         @Serializable
         internal class MessageResult(
         internal class MessageResult(
@@ -230,7 +230,7 @@ internal class MsgSvc : ProtoBuf {
             @ProtoNumber(3) @JvmField val msgTime: Int = 0,
             @ProtoNumber(3) @JvmField val msgTime: Int = 0,
             @ProtoNumber(4) @JvmField val msgRandom: Int = 0,
             @ProtoNumber(4) @JvmField val msgRandom: Int = 0,
             @ProtoNumber(5) @JvmField val errMsg: ByteArray = EMPTY_BYTE_ARRAY,
             @ProtoNumber(5) @JvmField val errMsg: ByteArray = EMPTY_BYTE_ARRAY,
-            @ProtoNumber(6) @JvmField val msgType: Int = 0
+            @ProtoNumber(6) @JvmField val msgType: Int = 0,
         ) : ProtoBuf
         ) : ProtoBuf
     }
     }
 
 
@@ -238,7 +238,7 @@ internal class MsgSvc : ProtoBuf {
     internal class PbC2CReadedReportResp(
     internal class PbC2CReadedReportResp(
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(2) @JvmField val errmsg: String = "",
         @ProtoNumber(2) @JvmField val errmsg: String = "",
-        @ProtoNumber(3) @JvmField val syncCookie: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(3) @JvmField val syncCookie: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -249,7 +249,7 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(1) @JvmField val msgInfo: List<MsgInfo> = emptyList(),
         @ProtoNumber(1) @JvmField val msgInfo: List<MsgInfo> = emptyList(),
         @ProtoNumber(2) @JvmField val longMessageFlag: Int = 0,
         @ProtoNumber(2) @JvmField val longMessageFlag: Int = 0,
         @ProtoNumber(3) @JvmField val reserved: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val reserved: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(4) @JvmField val subCmd: Int = 0
+        @ProtoNumber(4) @JvmField val subCmd: Int = 0,
     ) : ProtoBuf {
     ) : ProtoBuf {
         @Serializable
         @Serializable
         internal class MsgInfo(
         internal class MsgInfo(
@@ -263,19 +263,19 @@ internal class MsgSvc : ProtoBuf {
             @ProtoNumber(8) @JvmField val pkgIndex: Int = 0,
             @ProtoNumber(8) @JvmField val pkgIndex: Int = 0,
             @ProtoNumber(9) @JvmField val divSeq: Int = 0,
             @ProtoNumber(9) @JvmField val divSeq: Int = 0,
             @ProtoNumber(10) @JvmField val msgType: Int = 0,
             @ProtoNumber(10) @JvmField val msgType: Int = 0,
-            @ProtoNumber(20) @JvmField val routingHead: RoutingHead? = null
+            @ProtoNumber(20) @JvmField val routingHead: RoutingHead? = null,
         )
         )
     }
     }
 
 
     @Serializable
     @Serializable
     internal class PbDelRoamMsgResp(
     internal class PbDelRoamMsgResp(
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(1) @JvmField val result: Int = 0,
-        @ProtoNumber(2) @JvmField val errmsg: String = ""
+        @ProtoNumber(2) @JvmField val errmsg: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class Dis(
     internal class Dis(
-        @ProtoNumber(1) @JvmField val disUin: Long = 0L
+        @ProtoNumber(1) @JvmField val disUin: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -283,20 +283,20 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(1) @JvmField val subType: Int = 0,
         @ProtoNumber(1) @JvmField val subType: Int = 0,
         @ProtoNumber(2) @JvmField val int32RetCode: Int = 0,
         @ProtoNumber(2) @JvmField val int32RetCode: Int = 0,
         @ProtoNumber(3) @JvmField val errMsg: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val errMsg: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(4) @JvmField val transInfo: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(4) @JvmField val transInfo: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class PbPullGroupMsgSeqResp(
     internal class PbPullGroupMsgSeqResp(
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(2) @JvmField val errmsg: String = "",
         @ProtoNumber(2) @JvmField val errmsg: String = "",
-        @ProtoNumber(3) @JvmField val groupInfoResp: List<GroupInfoResp> = emptyList()
+        @ProtoNumber(3) @JvmField val groupInfoResp: List<GroupInfoResp> = emptyList(),
     ) : ProtoBuf {
     ) : ProtoBuf {
         @Serializable
         @Serializable
         internal class GroupInfoResp(
         internal class GroupInfoResp(
             @ProtoNumber(1) @JvmField val groupCode: Long = 0L,
             @ProtoNumber(1) @JvmField val groupCode: Long = 0L,
             @ProtoNumber(2) @JvmField val memberSeq: Long = 0L,
             @ProtoNumber(2) @JvmField val memberSeq: Long = 0L,
-            @ProtoNumber(3) @JvmField val groupSeq: Long = 0L
+            @ProtoNumber(3) @JvmField val groupSeq: Long = 0L,
         )
         )
     }
     }
 
 
@@ -315,25 +315,25 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(11) @JvmField val inputNotifyInfo: PbInputNotifyInfo? = null,
         @ProtoNumber(11) @JvmField val inputNotifyInfo: PbInputNotifyInfo? = null,
         @ProtoNumber(12) @JvmField val msgCtrl: MsgCtrl.MsgCtrl? = null,
         @ProtoNumber(12) @JvmField val msgCtrl: MsgCtrl.MsgCtrl? = null,
         @ProtoNumber(13) @JvmField val receiptReq: ImReceipt.ReceiptReq? = null,
         @ProtoNumber(13) @JvmField val receiptReq: ImReceipt.ReceiptReq? = null,
-        @ProtoNumber(14) @JvmField val multiSendSeq: Int = 0
+        @ProtoNumber(14) @JvmField val multiSendSeq: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class TransMsg(
     internal class TransMsg(
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
-        @ProtoNumber(2) @JvmField val c2cCmd: Int = 0
+        @ProtoNumber(2) @JvmField val c2cCmd: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class PbDeleteMsgResp(
     internal class PbDeleteMsgResp(
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(1) @JvmField val result: Int = 0,
-        @ProtoNumber(2) @JvmField val errmsg: String = ""
+        @ProtoNumber(2) @JvmField val errmsg: String = "",
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class PbSearchRoamMsgInCloudResp(
     internal class PbSearchRoamMsgInCloudResp(
         @ProtoNumber(1) @JvmField val msg: List<MsgComm.Msg> = emptyList(),
         @ProtoNumber(1) @JvmField val msg: List<MsgComm.Msg> = emptyList(),
-        @ProtoNumber(2) @JvmField val serializeRspbody: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(2) @JvmField val serializeRspbody: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -342,7 +342,7 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(2) @JvmField val ime: Int = 0,
         @ProtoNumber(2) @JvmField val ime: Int = 0,
         @ProtoNumber(3) @JvmField val notifyFlag: Int = 0,
         @ProtoNumber(3) @JvmField val notifyFlag: Int = 0,
         @ProtoNumber(4) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(4) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(5) @JvmField val iosPushWording: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(5) @JvmField val iosPushWording: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -351,12 +351,12 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(2) @JvmField val binduinUnreadInfo: List<PbBindUinUnReadMsgNumResp> = emptyList(),
         @ProtoNumber(2) @JvmField val binduinUnreadInfo: List<PbBindUinUnReadMsgNumResp> = emptyList(),
         @ProtoNumber(3) @JvmField val groupUnreadInfo: PbPullGroupMsgSeqResp? = null,
         @ProtoNumber(3) @JvmField val groupUnreadInfo: PbPullGroupMsgSeqResp? = null,
         @ProtoNumber(4) @JvmField val discussUnreadInfo: PbPullDiscussMsgSeqResp? = null,
         @ProtoNumber(4) @JvmField val discussUnreadInfo: PbPullDiscussMsgSeqResp? = null,
-        @ProtoNumber(5) @JvmField val thirdqqUnreadInfo: PbThirdQQUnReadMsgNumResp? = null
+        @ProtoNumber(5) @JvmField val thirdqqUnreadInfo: PbThirdQQUnReadMsgNumResp? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class PbDeleteMsgReq(
     internal class PbDeleteMsgReq(
-        @ProtoNumber(1) @JvmField val msgItems: List<MsgItem> = emptyList()
+        @ProtoNumber(1) @JvmField val msgItems: List<MsgItem> = emptyList(),
     ) : ProtoBuf {
     ) : ProtoBuf {
         @Serializable
         @Serializable
         internal class MsgItem(
         internal class MsgItem(
@@ -365,7 +365,7 @@ internal class MsgSvc : ProtoBuf {
             @ProtoNumber(3) @JvmField val msgType: Int = 0,
             @ProtoNumber(3) @JvmField val msgType: Int = 0,
             @ProtoNumber(4) @JvmField val msgSeq: Int = 0,
             @ProtoNumber(4) @JvmField val msgSeq: Int = 0,
             @ProtoNumber(5) @JvmField val msgUid: Long = 0L,
             @ProtoNumber(5) @JvmField val msgUid: Long = 0L,
-            @ProtoNumber(7) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY
+            @ProtoNumber(7) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
         ) : ProtoBuf
         ) : ProtoBuf
     }
     }
 
 
@@ -378,7 +378,7 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(5) @JvmField val redbagId: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(5) @JvmField val redbagId: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(6) @JvmField val redbagAmount: Long = 0L,
         @ProtoNumber(6) @JvmField val redbagAmount: Long = 0L,
         @ProtoNumber(7) @JvmField val hasReadbag: Int = 0,
         @ProtoNumber(7) @JvmField val hasReadbag: Int = 0,
-        @ProtoNumber(8) @JvmField val hasVedio: Int = 0
+        @ProtoNumber(8) @JvmField val hasVedio: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -386,7 +386,7 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(1) @JvmField val grpReadReport: List<PbGroupReadedReportReq> = emptyList(),
         @ProtoNumber(1) @JvmField val grpReadReport: List<PbGroupReadedReportReq> = emptyList(),
         @ProtoNumber(2) @JvmField val disReadReport: List<PbDiscussReadedReportReq> = emptyList(),
         @ProtoNumber(2) @JvmField val disReadReport: List<PbDiscussReadedReportReq> = emptyList(),
         @ProtoNumber(3) @JvmField val c2cReadReport: PbC2CReadedReportReq? = null,
         @ProtoNumber(3) @JvmField val c2cReadReport: PbC2CReadedReportReq? = null,
-        @ProtoNumber(4) @JvmField val bindUinReadReport: PbBindUinMsgReadedConfirmReq? = null
+        @ProtoNumber(4) @JvmField val bindUinReadReport: PbBindUinMsgReadedConfirmReq? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -397,7 +397,7 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(4) @JvmField val lastMsgtime: Long = 0L,
         @ProtoNumber(4) @JvmField val lastMsgtime: Long = 0L,
         @ProtoNumber(5) @JvmField val random: Long = 0L,
         @ProtoNumber(5) @JvmField val random: Long = 0L,
         @ProtoNumber(6) @JvmField val msg: List<MsgComm.Msg> = emptyList(),
         @ProtoNumber(6) @JvmField val msg: List<MsgComm.Msg> = emptyList(),
-        @ProtoNumber(7) @JvmField val iscomplete: Int = 0
+        @ProtoNumber(7) @JvmField val iscomplete: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -405,20 +405,20 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(1) @JvmField val bindUin: Long = 0L,
         @ProtoNumber(1) @JvmField val bindUin: Long = 0L,
         @ProtoNumber(2) @JvmField val bindUinSig: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val bindUinSig: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val syncFlag: Int /* enum */ = 0,
         @ProtoNumber(3) @JvmField val syncFlag: Int /* enum */ = 0,
-        @ProtoNumber(4) @JvmField val syncCookie: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(4) @JvmField val syncCookie: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class NearByDatingTmp(
     internal class NearByDatingTmp(
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
         @ProtoNumber(2) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(2) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(3) @JvmField val reply: Boolean = false
+        @ProtoNumber(3) @JvmField val reply: Boolean = false,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class BsnsTmp(
     internal class BsnsTmp(
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
-        @ProtoNumber(2) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(2) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -444,7 +444,7 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(19) @JvmField val qqQuerybusinessTmp: QQQueryBusinessTmp? = null,
         @ProtoNumber(19) @JvmField val qqQuerybusinessTmp: QQQueryBusinessTmp? = null,
         @ProtoNumber(20) @JvmField val nearbyDatingTmp: NearByDatingTmp? = null,
         @ProtoNumber(20) @JvmField val nearbyDatingTmp: NearByDatingTmp? = null,
         @ProtoNumber(21) @JvmField val nearbyAssistantTmp: NearByAssistantTmp? = null,
         @ProtoNumber(21) @JvmField val nearbyAssistantTmp: NearByAssistantTmp? = null,
-        @ProtoNumber(22) @JvmField val commTmp: CommTmp? = null
+        @ProtoNumber(22) @JvmField val commTmp: CommTmp? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -452,7 +452,7 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(2) @JvmField val errmsg: String = "",
         @ProtoNumber(2) @JvmField val errmsg: String = "",
         @ProtoNumber(3) @JvmField val respTag: Int = 0,
         @ProtoNumber(3) @JvmField val respTag: Int = 0,
-        @ProtoNumber(4) @JvmField val respBuff: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(4) @JvmField val respBuff: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -465,7 +465,7 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(6) @JvmField val errtype: Int = 0,
         @ProtoNumber(6) @JvmField val errtype: Int = 0,
         @ProtoNumber(7) @JvmField val transSvrInfo: TransSvrInfo? = null,
         @ProtoNumber(7) @JvmField val transSvrInfo: TransSvrInfo? = null,
         @ProtoNumber(8) @JvmField val receiptResp: ImReceipt.ReceiptResp? = null,
         @ProtoNumber(8) @JvmField val receiptResp: ImReceipt.ReceiptResp? = null,
-        @ProtoNumber(9) @JvmField val textAnalysisResult: Int = 0
+        @ProtoNumber(9) @JvmField val textAnalysisResult: Int = 0,
     ) : ProtoBuf, Packet
     ) : ProtoBuf, Packet
 
 
     @Serializable
     @Serializable
@@ -473,7 +473,7 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(2) @JvmField val errmsg: String = "",
         @ProtoNumber(2) @JvmField val errmsg: String = "",
         @ProtoNumber(3) @JvmField val bindUin: Long = 0L,
         @ProtoNumber(3) @JvmField val bindUin: Long = 0L,
-        @ProtoNumber(4) @JvmField val msgNum: Int = 0
+        @ProtoNumber(4) @JvmField val msgNum: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -484,7 +484,7 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(4) @JvmField val lastGetTime: Long = 0L,
         @ProtoNumber(4) @JvmField val lastGetTime: Long = 0L,
         @ProtoNumber(5) @JvmField val discussInfoSeq: Long = 0L,
         @ProtoNumber(5) @JvmField val discussInfoSeq: Long = 0L,
         @ProtoNumber(6) @JvmField val filter: Int /* enum */ = 0,
         @ProtoNumber(6) @JvmField val filter: Int /* enum */ = 0,
-        @ProtoNumber(7) @JvmField val memberSeq: Long = 0L
+        @ProtoNumber(7) @JvmField val memberSeq: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -492,18 +492,18 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(2) @JvmField val errmsg: String = "",
         @ProtoNumber(2) @JvmField val errmsg: String = "",
         @ProtoNumber(3) @JvmField val msgStatus: List<MsgStatus> = emptyList(),
         @ProtoNumber(3) @JvmField val msgStatus: List<MsgStatus> = emptyList(),
-        @ProtoNumber(4) @JvmField val subCmd: Int = 0
+        @ProtoNumber(4) @JvmField val subCmd: Int = 0,
     ) : ProtoBuf {
     ) : ProtoBuf {
         @Serializable
         @Serializable
         internal class MsgStatus(
         internal class MsgStatus(
             @ProtoNumber(1) @JvmField val msgInfo: PbC2CMsgWithDrawReq.MsgInfo? = null,
             @ProtoNumber(1) @JvmField val msgInfo: PbC2CMsgWithDrawReq.MsgInfo? = null,
-            @ProtoNumber(2) @JvmField val status: Int = 0
+            @ProtoNumber(2) @JvmField val status: Int = 0,
         ) : ProtoBuf
         ) : ProtoBuf
     }
     }
 
 
     @Serializable
     @Serializable
     internal class SecretFileHead(
     internal class SecretFileHead(
-        @ProtoNumber(1) @JvmField val secretFileMsg: SubMsgType0xc1.MsgBody? = null
+        @ProtoNumber(1) @JvmField val secretFileMsg: SubMsgType0xc1.MsgBody? = null,
         //    @ProtoNumber(2) @JvmField val secretFileStatus: SubMsgType0x1a.MsgBody? = null
         //    @ProtoNumber(2) @JvmField val secretFileStatus: SubMsgType0x1a.MsgBody? = null
     )
     )
 
 
@@ -518,13 +518,13 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(7) @JvmField val pwd: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(7) @JvmField val pwd: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(8) @JvmField val subcmd: Int = 0,
         @ProtoNumber(8) @JvmField val subcmd: Int = 0,
         @ProtoNumber(9) @JvmField val beginMsgtime: Long = 0L,
         @ProtoNumber(9) @JvmField val beginMsgtime: Long = 0L,
-        @ProtoNumber(10) @JvmField val reqType: Int = 0
+        @ProtoNumber(10) @JvmField val reqType: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class TransCmd(
     internal class TransCmd(
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
-        @ProtoNumber(2) @JvmField val msgType: Int = 0
+        @ProtoNumber(2) @JvmField val msgType: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -532,7 +532,7 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(1) @JvmField val grpReadReport: List<PbGroupReadedReportResp> = emptyList(),
         @ProtoNumber(1) @JvmField val grpReadReport: List<PbGroupReadedReportResp> = emptyList(),
         @ProtoNumber(2) @JvmField val disReadReport: List<PbDiscussReadedReportResp> = emptyList(),
         @ProtoNumber(2) @JvmField val disReadReport: List<PbDiscussReadedReportResp> = emptyList(),
         @ProtoNumber(3) @JvmField val c2cReadReport: PbC2CReadedReportResp? = null,
         @ProtoNumber(3) @JvmField val c2cReadReport: PbC2CReadedReportResp? = null,
-        @ProtoNumber(4) @JvmField val bindUinReadReport: PbBindUinMsgReadedConfirmResp? = null
+        @ProtoNumber(4) @JvmField val bindUinReadReport: PbBindUinMsgReadedConfirmResp? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -540,7 +540,7 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(2) @JvmField val errmsg: String = "",
         @ProtoNumber(2) @JvmField val errmsg: String = "",
         @ProtoNumber(3) @JvmField val thirdqqRespInfo: List<ThirdQQRespInfo> = emptyList(),
         @ProtoNumber(3) @JvmField val thirdqqRespInfo: List<ThirdQQRespInfo> = emptyList(),
-        @ProtoNumber(4) @JvmField val interval: Int = 0
+        @ProtoNumber(4) @JvmField val interval: Int = 0,
     ) : ProtoBuf {
     ) : ProtoBuf {
         @Serializable
         @Serializable
         internal class ThirdQQRespInfo(
         internal class ThirdQQRespInfo(
@@ -550,32 +550,32 @@ internal class MsgSvc : ProtoBuf {
             @ProtoNumber(4) @JvmField val msgFlag: Int = 0,
             @ProtoNumber(4) @JvmField val msgFlag: Int = 0,
             @ProtoNumber(5) @JvmField val redbagTime: Int = 0,
             @ProtoNumber(5) @JvmField val redbagTime: Int = 0,
             @ProtoNumber(6) @JvmField val status: Int = 0,
             @ProtoNumber(6) @JvmField val status: Int = 0,
-            @ProtoNumber(7) @JvmField val lastMsgTime: Int = 0
+            @ProtoNumber(7) @JvmField val lastMsgTime: Int = 0,
         ) : ProtoBuf
         ) : ProtoBuf
     }
     }
 
 
     @Serializable
     @Serializable
     internal class RichStatusTmp(
     internal class RichStatusTmp(
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
-        @ProtoNumber(2) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(2) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class QQQueryBusinessTmp(
     internal class QQQueryBusinessTmp(
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
-        @ProtoNumber(2) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(2) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class PbDelRoamMsgReq(
     internal class PbDelRoamMsgReq(
         @ProtoNumber(1) @JvmField val c2cMsg: C2CMsg? = null,
         @ProtoNumber(1) @JvmField val c2cMsg: C2CMsg? = null,
         @ProtoNumber(2) @JvmField val grpMsg: GrpMsg? = null,
         @ProtoNumber(2) @JvmField val grpMsg: GrpMsg? = null,
-        @ProtoNumber(3) @JvmField val disMsg: DisMsg? = null
+        @ProtoNumber(3) @JvmField val disMsg: DisMsg? = null,
     ) : ProtoBuf {
     ) : ProtoBuf {
         @Serializable
         @Serializable
         internal class GrpMsg(
         internal class GrpMsg(
             @ProtoNumber(1) @JvmField val groupCode: Long = 0L,
             @ProtoNumber(1) @JvmField val groupCode: Long = 0L,
-            @ProtoNumber(2) @JvmField val msgSeq: Long = 0L
+            @ProtoNumber(2) @JvmField val msgSeq: Long = 0L,
         ) : ProtoBuf
         ) : ProtoBuf
 
 
         @Serializable
         @Serializable
@@ -584,13 +584,13 @@ internal class MsgSvc : ProtoBuf {
             @ProtoNumber(2) @JvmField val peerUin: Long = 0L,
             @ProtoNumber(2) @JvmField val peerUin: Long = 0L,
             @ProtoNumber(3) @JvmField val msgTime: Int = 0,
             @ProtoNumber(3) @JvmField val msgTime: Int = 0,
             @ProtoNumber(4) @JvmField val msgRandom: Int = 0,
             @ProtoNumber(4) @JvmField val msgRandom: Int = 0,
-            @ProtoNumber(5) @JvmField val msgSeq: Int = 0
+            @ProtoNumber(5) @JvmField val msgSeq: Int = 0,
         ) : ProtoBuf
         ) : ProtoBuf
 
 
         @Serializable
         @Serializable
         internal class DisMsg(
         internal class DisMsg(
             @ProtoNumber(1) @JvmField val discussUin: Long = 0L,
             @ProtoNumber(1) @JvmField val discussUin: Long = 0L,
-            @ProtoNumber(2) @JvmField val msgSeq: Long = 0L
+            @ProtoNumber(2) @JvmField val msgSeq: Long = 0L,
         ) : ProtoBuf
         ) : ProtoBuf
     }
     }
 
 
@@ -600,44 +600,44 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(2) @JvmField val binduinUnreadInfo: List<PbBindUinUnReadMsgNumReq> = emptyList(),
         @ProtoNumber(2) @JvmField val binduinUnreadInfo: List<PbBindUinUnReadMsgNumReq> = emptyList(),
         @ProtoNumber(3) @JvmField val groupUnreadInfo: PbPullGroupMsgSeqReq? = null,
         @ProtoNumber(3) @JvmField val groupUnreadInfo: PbPullGroupMsgSeqReq? = null,
         @ProtoNumber(4) @JvmField val discussUnreadInfo: PbPullDiscussMsgSeqReq? = null,
         @ProtoNumber(4) @JvmField val discussUnreadInfo: PbPullDiscussMsgSeqReq? = null,
-        @ProtoNumber(5) @JvmField val thirdqqUnreadInfo: PbThirdQQUnReadMsgNumReq? = null
+        @ProtoNumber(5) @JvmField val thirdqqUnreadInfo: PbThirdQQUnReadMsgNumReq? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class PbPullDiscussMsgSeqResp(
     internal class PbPullDiscussMsgSeqResp(
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(2) @JvmField val errmsg: String = "",
         @ProtoNumber(2) @JvmField val errmsg: String = "",
-        @ProtoNumber(3) @JvmField val discussInfoResp: List<DiscussInfoResp> = emptyList()
+        @ProtoNumber(3) @JvmField val discussInfoResp: List<DiscussInfoResp> = emptyList(),
     ) : ProtoBuf {
     ) : ProtoBuf {
         @Serializable
         @Serializable
         internal class DiscussInfoResp(
         internal class DiscussInfoResp(
             @ProtoNumber(1) @JvmField val confUin: Long = 0L,
             @ProtoNumber(1) @JvmField val confUin: Long = 0L,
             @ProtoNumber(2) @JvmField val memberSeq: Long = 0L,
             @ProtoNumber(2) @JvmField val memberSeq: Long = 0L,
-            @ProtoNumber(3) @JvmField val confSeq: Long = 0L
+            @ProtoNumber(3) @JvmField val confSeq: Long = 0L,
         ) : ProtoBuf
         ) : ProtoBuf
     }
     }
 
 
     @Serializable
     @Serializable
     internal class PbPullDiscussMsgSeqReq(
     internal class PbPullDiscussMsgSeqReq(
-        @ProtoNumber(1) @JvmField val discussInfoReq: List<DiscussInfoReq> = emptyList()
+        @ProtoNumber(1) @JvmField val discussInfoReq: List<DiscussInfoReq> = emptyList(),
     ) : ProtoBuf {
     ) : ProtoBuf {
         @Serializable
         @Serializable
         internal class DiscussInfoReq(
         internal class DiscussInfoReq(
             @ProtoNumber(1) @JvmField val confUin: Long = 0L,
             @ProtoNumber(1) @JvmField val confUin: Long = 0L,
-            @ProtoNumber(2) @JvmField val lastSeq: Long = 0L
+            @ProtoNumber(2) @JvmField val lastSeq: Long = 0L,
         ) : ProtoBuf
         ) : ProtoBuf
     }
     }
 
 
     @Serializable
     @Serializable
     internal class WPATmp(
     internal class WPATmp(
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
-        @ProtoNumber(2) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(2) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class PublicPlat(
     internal class PublicPlat(
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
         @ProtoNumber(1) @JvmField val toUin: Long = 0L,
-        @ProtoNumber(2) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(2) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -645,7 +645,7 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(2) @JvmField val errmsg: String = "",
         @ProtoNumber(2) @JvmField val errmsg: String = "",
         @ProtoNumber(3) @JvmField val syncCookie: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val syncCookie: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(4) @JvmField val bindUin: Long = 0L
+        @ProtoNumber(4) @JvmField val bindUin: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -656,25 +656,25 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(4) @JvmField val lastMsgtime: Long = 0L,
         @ProtoNumber(4) @JvmField val lastMsgtime: Long = 0L,
         @ProtoNumber(5) @JvmField val random: Long = 0L,
         @ProtoNumber(5) @JvmField val random: Long = 0L,
         @ProtoNumber(6) @JvmField val msg: List<MsgComm.Msg> = emptyList(),
         @ProtoNumber(6) @JvmField val msg: List<MsgComm.Msg> = emptyList(),
-        @ProtoNumber(7) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(7) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class PbDiscussReadedReportReq(
     internal class PbDiscussReadedReportReq(
         @ProtoNumber(1) @JvmField val confUin: Long = 0L,
         @ProtoNumber(1) @JvmField val confUin: Long = 0L,
-        @ProtoNumber(2) @JvmField val lastReadSeq: Long = 0L
+        @ProtoNumber(2) @JvmField val lastReadSeq: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class PbC2CReadedReportReq(
     internal class PbC2CReadedReportReq(
         @ProtoNumber(1) @JvmField val syncCookie: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(1) @JvmField val syncCookie: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoNumber(2) @JvmField val pairInfo: List<UinPairReadInfo> = emptyList()
+        @ProtoNumber(2) @JvmField val pairInfo: List<UinPairReadInfo> = emptyList(),
     ) : ProtoBuf {
     ) : ProtoBuf {
         @Serializable
         @Serializable
         internal class UinPairReadInfo(
         internal class UinPairReadInfo(
             @ProtoNumber(1) @JvmField val peerUin: Long = 0L,
             @ProtoNumber(1) @JvmField val peerUin: Long = 0L,
             @ProtoNumber(2) @JvmField val lastReadTime: Int = 0,
             @ProtoNumber(2) @JvmField val lastReadTime: Int = 0,
-            @ProtoNumber(3) @JvmField val crmSig: ByteArray = EMPTY_BYTE_ARRAY
+            @ProtoNumber(3) @JvmField val crmSig: ByteArray = EMPTY_BYTE_ARRAY,
         ) : ProtoBuf
         ) : ProtoBuf
     }
     }
 
 
@@ -685,35 +685,35 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(3) @JvmField val instCtrl: ImMsgHead.InstCtrl? = null,
         @ProtoNumber(3) @JvmField val instCtrl: ImMsgHead.InstCtrl? = null,
         @ProtoNumber(4) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(4) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(5) @JvmField val c2cType: Int = 0,
         @ProtoNumber(5) @JvmField val c2cType: Int = 0,
-        @ProtoNumber(6) @JvmField val serviceType: Int = 0
+        @ProtoNumber(6) @JvmField val serviceType: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class PbSearchRoamMsgInCloudReq(
     internal class PbSearchRoamMsgInCloudReq(
-        @ProtoNumber(1) @JvmField val serializeReqbody: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(1) @JvmField val serializeReqbody: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class PbBindUinUnReadMsgNumReq(
     internal class PbBindUinUnReadMsgNumReq(
         @ProtoNumber(1) @JvmField val bindUin: Long = 0L,
         @ProtoNumber(1) @JvmField val bindUin: Long = 0L,
-        @ProtoNumber(2) @JvmField val syncCookie: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(2) @JvmField val syncCookie: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class PbC2CUnReadMsgNumResp(
     internal class PbC2CUnReadMsgNumResp(
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(1) @JvmField val result: Int = 0,
         @ProtoNumber(2) @JvmField val errmsg: String = "",
         @ProtoNumber(2) @JvmField val errmsg: String = "",
-        @ProtoNumber(3) @JvmField val msgNum: Int = 0
+        @ProtoNumber(3) @JvmField val msgNum: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class PbPullGroupMsgSeqReq(
     internal class PbPullGroupMsgSeqReq(
-        @ProtoNumber(1) @JvmField val groupInfoReq: List<GroupInfoReq> = emptyList()
+        @ProtoNumber(1) @JvmField val groupInfoReq: List<GroupInfoReq> = emptyList(),
     ) : ProtoBuf {
     ) : ProtoBuf {
         @Serializable
         @Serializable
         internal class GroupInfoReq(
         internal class GroupInfoReq(
             @ProtoNumber(1) @JvmField val groupCode: Long = 0L,
             @ProtoNumber(1) @JvmField val groupCode: Long = 0L,
-            @ProtoNumber(2) @JvmField val lastSeq: Long = 0L
+            @ProtoNumber(2) @JvmField val lastSeq: Long = 0L,
         ) : ProtoBuf
         ) : ProtoBuf
     }
     }
 
 
@@ -721,7 +721,7 @@ internal class MsgSvc : ProtoBuf {
     internal class TransReq(
     internal class TransReq(
         @ProtoNumber(1) @JvmField val command: Int = 0,
         @ProtoNumber(1) @JvmField val command: Int = 0,
         @ProtoNumber(2) @JvmField val reqTag: Int = 0,
         @ProtoNumber(2) @JvmField val reqTag: Int = 0,
-        @ProtoNumber(3) @JvmField val reqBuff: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(3) @JvmField val reqBuff: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -730,7 +730,7 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(2) @JvmField val errmsg: String = "",
         @ProtoNumber(2) @JvmField val errmsg: String = "",
         @ProtoNumber(3) @JvmField val groupCode: Long = 0L,
         @ProtoNumber(3) @JvmField val groupCode: Long = 0L,
         @ProtoNumber(4) @JvmField val memberSeq: Long = 0L,
         @ProtoNumber(4) @JvmField val memberSeq: Long = 0L,
-        @ProtoNumber(5) @JvmField val groupMsgSeq: Long = 0L
+        @ProtoNumber(5) @JvmField val groupMsgSeq: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -740,19 +740,19 @@ internal class MsgSvc : ProtoBuf {
         @ProtoNumber(3) @JvmField val groupCode: Long = 0L,
         @ProtoNumber(3) @JvmField val groupCode: Long = 0L,
         @ProtoNumber(4) @JvmField val returnBeginSeq: Long = 0L,
         @ProtoNumber(4) @JvmField val returnBeginSeq: Long = 0L,
         @ProtoNumber(5) @JvmField val returnEndSeq: Long = 0L,
         @ProtoNumber(5) @JvmField val returnEndSeq: Long = 0L,
-        @ProtoNumber(6) @JvmField val msg: List<MsgComm.Msg> = emptyList()
+        @ProtoNumber(6) @JvmField val msg: List<MsgComm.Msg> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class PbThirdQQUnReadMsgNumReq(
     internal class PbThirdQQUnReadMsgNumReq(
         @ProtoNumber(1) @JvmField val thirdqqReqInfo: List<ThirdQQReqInfo> = emptyList(),
         @ProtoNumber(1) @JvmField val thirdqqReqInfo: List<ThirdQQReqInfo> = emptyList(),
-        @ProtoNumber(2) @JvmField val source: Int = 0
+        @ProtoNumber(2) @JvmField val source: Int = 0,
     ) : ProtoBuf {
     ) : ProtoBuf {
         @Serializable
         @Serializable
         internal class ThirdQQReqInfo(
         internal class ThirdQQReqInfo(
             @ProtoNumber(1) @JvmField val thirdUin: Long = 0L,
             @ProtoNumber(1) @JvmField val thirdUin: Long = 0L,
             @ProtoNumber(2) @JvmField val thirdUinSig: ByteArray = EMPTY_BYTE_ARRAY,
             @ProtoNumber(2) @JvmField val thirdUinSig: ByteArray = EMPTY_BYTE_ARRAY,
-            @ProtoNumber(3) @JvmField val thirdUinCookie: ByteArray = EMPTY_BYTE_ARRAY
+            @ProtoNumber(3) @JvmField val thirdUinCookie: ByteArray = EMPTY_BYTE_ARRAY,
         ) : ProtoBuf
         ) : ProtoBuf
     }
     }
 }
 }
@@ -762,7 +762,7 @@ internal class MsgCtrl {
     @Serializable
     @Serializable
     internal class MsgCtrl(
     internal class MsgCtrl(
         @ProtoNumber(1) @JvmField val msgFlag: Int = 0,
         @ProtoNumber(1) @JvmField val msgFlag: Int = 0,
-        @ProtoNumber(2) @JvmField val resvResvInfo: ResvResvInfo? = null
+        @ProtoNumber(2) @JvmField val resvResvInfo: ResvResvInfo? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -774,7 +774,7 @@ internal class MsgCtrl {
         @ProtoNumber(5) @JvmField val createTime: Int = 0,
         @ProtoNumber(5) @JvmField val createTime: Int = 0,
         @ProtoNumber(6) @JvmField val picHeight: Int = 0,
         @ProtoNumber(6) @JvmField val picHeight: Int = 0,
         @ProtoNumber(7) @JvmField val picWidth: Int = 0,
         @ProtoNumber(7) @JvmField val picWidth: Int = 0,
-        @ProtoNumber(8) @JvmField val resvFlag: Int = 0
+        @ProtoNumber(8) @JvmField val resvFlag: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }
 
 
@@ -794,7 +794,7 @@ internal class SubMsgType0xc1 {
         @ProtoNumber(10) @JvmField val resId: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(10) @JvmField val resId: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(11) @JvmField val flag: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(11) @JvmField val flag: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(12) @JvmField val downloadUrl: String = "",
         @ProtoNumber(12) @JvmField val downloadUrl: String = "",
-        @ProtoNumber(13) @JvmField val original: Int = 0
+        @ProtoNumber(13) @JvmField val original: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -810,7 +810,7 @@ internal class SubMsgType0xc1 {
         @ProtoNumber(9) @JvmField val encryptKey: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(9) @JvmField val encryptKey: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(10) @JvmField val readTimes: Int = 0,
         @ProtoNumber(10) @JvmField val readTimes: Int = 0,
         @ProtoNumber(11) @JvmField val leftTime: Int = 0,
         @ProtoNumber(11) @JvmField val leftTime: Int = 0,
-        @ProtoNumber(12) @JvmField val notOnlineImage: NotOnlineImage? = null
+        @ProtoNumber(12) @JvmField val notOnlineImage: NotOnlineImage? = null,
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }
 
 

+ 3 - 3
mirai-core/src/commonMain/kotlin/network/protocol/data/proto/MsgTransmit.kt

@@ -18,17 +18,17 @@ internal class MsgTransmit : ProtoBuf {
     @Serializable
     @Serializable
     internal class PbMultiMsgItem(
     internal class PbMultiMsgItem(
         @ProtoNumber(1) @JvmField val fileName: String = "",
         @ProtoNumber(1) @JvmField val fileName: String = "",
-        @ProtoNumber(2) @JvmField val buffer: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoNumber(2) @JvmField val buffer: ByteArray = EMPTY_BYTE_ARRAY,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class PbMultiMsgNew(
     internal class PbMultiMsgNew(
-        @ProtoNumber(1) @JvmField val msg: List<MsgComm.Msg> = emptyList()
+        @ProtoNumber(1) @JvmField val msg: List<MsgComm.Msg> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class PbMultiMsgTransmit(
     internal class PbMultiMsgTransmit(
         @ProtoNumber(1) @JvmField val msg: List<MsgComm.Msg> = emptyList(),
         @ProtoNumber(1) @JvmField val msg: List<MsgComm.Msg> = emptyList(),
-        @ProtoNumber(2) @JvmField val pbItemList: List<PbMultiMsgItem> = emptyList()
+        @ProtoNumber(2) @JvmField val pbItemList: List<PbMultiMsgItem> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }

+ 7 - 7
mirai-core/src/commonMain/kotlin/network/protocol/data/proto/MultiMsg.kt

@@ -18,14 +18,14 @@ import net.mamoe.mirai.utils.EMPTY_BYTE_ARRAY
 internal class MultiMsg : ProtoBuf {
 internal class MultiMsg : ProtoBuf {
     @Serializable
     @Serializable
     internal class ExternMsg(
     internal class ExternMsg(
-        @ProtoNumber(1) @JvmField val channelType: Int = 0
+        @ProtoNumber(1) @JvmField val channelType: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class MultiMsgApplyDownReq(
     internal class MultiMsgApplyDownReq(
         @ProtoNumber(1) @JvmField val msgResid: String = "",
         @ProtoNumber(1) @JvmField val msgResid: String = "",
         @ProtoNumber(2) @JvmField val msgType: Int = 0,
         @ProtoNumber(2) @JvmField val msgType: Int = 0,
-        @ProtoNumber(3) @JvmField val srcUin: Long = 0L
+        @ProtoNumber(3) @JvmField val srcUin: Long = 0L,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -38,7 +38,7 @@ internal class MultiMsg : ProtoBuf {
         @ProtoNumber(6) @JvmField val msgResid: String = "",
         @ProtoNumber(6) @JvmField val msgResid: String = "",
         @ProtoNumber(7) @JvmField val msgExternInfo: ExternMsg? = null,
         @ProtoNumber(7) @JvmField val msgExternInfo: ExternMsg? = null,
         @ProtoNumber(8) @JvmField val bytesDownIpV6: List<ByteArray> = emptyList(),
         @ProtoNumber(8) @JvmField val bytesDownIpV6: List<ByteArray> = emptyList(),
-        @ProtoNumber(9) @JvmField val uint32DownV6Port: List<Int> = emptyList()
+        @ProtoNumber(9) @JvmField val uint32DownV6Port: List<Int> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -47,7 +47,7 @@ internal class MultiMsg : ProtoBuf {
         @ProtoNumber(2) @JvmField val msgSize: Long = 0L,
         @ProtoNumber(2) @JvmField val msgSize: Long = 0L,
         @ProtoNumber(3) @JvmField val msgMd5: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(3) @JvmField val msgMd5: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(4) @JvmField val msgType: Int = 0,
         @ProtoNumber(4) @JvmField val msgType: Int = 0,
-        @ProtoNumber(5) @JvmField val applyId: Int = 0
+        @ProtoNumber(5) @JvmField val applyId: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -64,7 +64,7 @@ internal class MultiMsg : ProtoBuf {
         @ProtoNumber(10) @JvmField val msgSig: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(10) @JvmField val msgSig: ByteArray = EMPTY_BYTE_ARRAY,
         @ProtoNumber(11) @JvmField val msgExternInfo: ExternMsg? = null,
         @ProtoNumber(11) @JvmField val msgExternInfo: ExternMsg? = null,
         @ProtoNumber(12) @JvmField val bytesUpIpV6: List<ByteArray> = emptyList(),
         @ProtoNumber(12) @JvmField val bytesUpIpV6: List<ByteArray> = emptyList(),
-        @ProtoNumber(13) @JvmField val uint32UpV6Port: List<Int> = emptyList()
+        @ProtoNumber(13) @JvmField val uint32UpV6Port: List<Int> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
@@ -77,13 +77,13 @@ internal class MultiMsg : ProtoBuf {
         @ProtoNumber(6) @JvmField val multimsgApplyupReq: List<MultiMsg.MultiMsgApplyUpReq> = emptyList(),
         @ProtoNumber(6) @JvmField val multimsgApplyupReq: List<MultiMsg.MultiMsgApplyUpReq> = emptyList(),
         @ProtoNumber(7) @JvmField val multimsgApplydownReq: List<MultiMsg.MultiMsgApplyDownReq> = emptyList(),
         @ProtoNumber(7) @JvmField val multimsgApplydownReq: List<MultiMsg.MultiMsgApplyDownReq> = emptyList(),
         @ProtoNumber(8) @JvmField val buType: Int = 0,
         @ProtoNumber(8) @JvmField val buType: Int = 0,
-        @ProtoNumber(9) @JvmField val reqChannelType: Int = 0
+        @ProtoNumber(9) @JvmField val reqChannelType: Int = 0,
     ) : ProtoBuf
     ) : ProtoBuf
 
 
     @Serializable
     @Serializable
     internal class RspBody(
     internal class RspBody(
         @ProtoNumber(1) @JvmField val subcmd: Int = 0,
         @ProtoNumber(1) @JvmField val subcmd: Int = 0,
         @ProtoNumber(2) @JvmField val multimsgApplyupRsp: List<MultiMsg.MultiMsgApplyUpRsp> = emptyList(),
         @ProtoNumber(2) @JvmField val multimsgApplyupRsp: List<MultiMsg.MultiMsgApplyUpRsp> = emptyList(),
-        @ProtoNumber(3) @JvmField val multimsgApplydownRsp: List<MultiMsg.MultiMsgApplyDownRsp> = emptyList()
+        @ProtoNumber(3) @JvmField val multimsgApplydownRsp: List<MultiMsg.MultiMsgApplyDownRsp> = emptyList(),
     ) : ProtoBuf
     ) : ProtoBuf
 }
 }

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini