From c962bd2641edfd7ea500714a9534321e30672837 Mon Sep 17 00:00:00 2001 From: Him188 Date: Wed, 4 Mar 2020 14:11:36 +0800 Subject: [PATCH] Revert "Adapt new kotlinx.serialization" This reverts commit 0a6b39e6 --- gradle.properties | 2 +- mirai-core-qqandroid/build.gradle.kts | 3 - .../net/mamoe/mirai/qqandroid/QQAndroidBot.kt | 2 +- .../mirai/qqandroid/io/serialization/Jce.kt | 239 +- .../ProtoBufWithNullableSupport.kt | 88 +- .../network/QQAndroidBotNetworkHandler.kt | 1 + .../network/highway/HighwayHelper.kt | 5 +- .../qqandroid/network/highway/highway.kt | 1 + .../network/protocol/data/jce/ConfigPush.kt | 136 +- .../network/protocol/data/jce/FriendList.kt | 260 +- .../protocol/data/jce/OnlinePushPack.kt | 298 +- .../protocol/data/jce/PushNotifyPack.kt | 84 +- .../protocol/data/jce/RequestPacket.kt | 28 +- .../data/jce/RequestPushForceOffline.kt | 10 +- .../protocol/data/jce/SvcReqRegister.kt | 74 +- .../network/protocol/data/jce/TroopList.kt | 262 +- .../network/protocol/data/proto/Cmd0x352.kt | 234 +- .../network/protocol/data/proto/Cmd0x388.kt | 372 +-- .../network/protocol/data/proto/Cmd0x857.kt | 486 ++-- .../network/protocol/data/proto/Cmd0x858.kt | 96 +- .../network/protocol/data/proto/Define.kt | 658 ++--- .../protocol/data/proto/FriendListCommon.kt | 92 +- .../network/protocol/data/proto/Group.kt | 46 +- .../network/protocol/data/proto/Highway.kt | 474 ++-- .../protocol/data/proto/ImageRequest.kt | 30 +- .../network/protocol/data/proto/Msg.kt | 1610 +++++------ .../network/protocol/data/proto/MsgCommon.kt | 182 +- .../protocol/data/proto/MsgRevokeUserDef.kt | 22 +- .../network/protocol/data/proto/MsgSvc.kt | 832 +++--- .../network/protocol/data/proto/OIDB.kt | 2456 ++++++++--------- .../network/protocol/data/proto/Oidb0x769.kt | 95 - .../network/protocol/data/proto/OnlinePush.kt | 42 +- .../network/protocol/data/proto/PbReserve.kt | 182 +- .../protocol/data/proto/StatSvcGetOnline.kt | 22 +- .../network/protocol/data/proto/SyncCookie.kt | 20 +- .../network/protocol/packet/MessageMicro.kt | 14 +- .../network/protocol/packet/PacketFactory.kt | 1 + .../protocol/packet/chat/TroopManagement.kt | 4 +- .../packet/chat/receive/MessageSvc.kt | 1 + .../protocol/packet/{ => list}/FriendList.kt | 10 +- .../network/protocol/packet/login/StatSvc.kt | 5 +- .../command/GetPublicAccountDetailInfo.kt | 28 + .../packet/oidb/oidb0x769/Oidb0x769.kt | 95 + .../packet/oidb/sso/OidbSsoPackage.kt | 31 + mirai-core/build.gradle.kts | 4 - .../mamoe/mirai/utils/ExternalImageAndroid.kt | 4 +- .../event/subscribeMessages.kt | 2 +- .../net.mamoe.mirai/utils/DeviceInfo.kt | 20 +- .../kotlin/net.mamoe.mirai/utils/channels.kt | 3 - .../net.mamoe.mirai/utils/io/chunked.kt | 4 +- .../net/mamoe/mirai/message/MessagePacket.kt | 3 - .../net/mamoe/mirai/utils/ExternalImageJvm.kt | 2 - 52 files changed, 4833 insertions(+), 4842 deletions(-) delete mode 100644 mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Oidb0x769.kt rename mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/OutputStream.kt => mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/MessageMicro.kt (51%) rename mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/{ => list}/FriendList.kt (95%) create mode 100644 mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/oidb/command/GetPublicAccountDetailInfo.kt create mode 100644 mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/oidb/oidb0x769/Oidb0x769.kt create mode 100644 mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/oidb/sso/OidbSsoPackage.kt diff --git a/gradle.properties b/gradle.properties index c46a36d93..e859845f4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ kotlin.parallel.tasks.in.project=true # kotlin kotlinVersion=1.3.61 # kotlin libraries -serializationVersion=0.20.0-1.3.70-eap-274-2 +serializationVersion=0.14.0 coroutinesVersion=1.3.3 atomicFuVersion=0.14.1 coroutinesIoVersion=0.1.16 diff --git a/mirai-core-qqandroid/build.gradle.kts b/mirai-core-qqandroid/build.gradle.kts index f52e28c60..128e2884a 100644 --- a/mirai-core-qqandroid/build.gradle.kts +++ b/mirai-core-qqandroid/build.gradle.kts @@ -59,7 +59,6 @@ kotlin { languageSettings.enableLanguageFeature("InlineClasses") languageSettings.useExperimentalAnnotation("kotlin.Experimental") - languageSettings.useExperimentalAnnotation("kotlin.OptIn") dependencies { api(project(":mirai-core")) @@ -74,7 +73,6 @@ kotlin { commonMain { dependencies { api(kotlinx("serialization-runtime-common", serializationVersion)) - api(kotlinx("serialization-protobuf-common", serializationVersion)) } } commonTest { @@ -88,7 +86,6 @@ kotlin { if (isAndroidSDKAvailable) { val androidMain by getting { dependencies { - api(kotlinx("serialization-protobuf", serializationVersion)) } } diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt index 093d377ec..b9fe826c0 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt @@ -28,10 +28,10 @@ import net.mamoe.mirai.qqandroid.message.OnlineFriendImageImpl import net.mamoe.mirai.qqandroid.message.OnlineGroupImageImpl import net.mamoe.mirai.qqandroid.network.QQAndroidBotNetworkHandler import net.mamoe.mirai.qqandroid.network.QQAndroidClient -import net.mamoe.mirai.qqandroid.network.protocol.packet.FriendList import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.GroupInfoImpl import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.PbMessageSvc import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.TroopManagement +import net.mamoe.mirai.qqandroid.network.protocol.packet.list.FriendList import net.mamoe.mirai.utils.* import kotlin.collections.asSequence import kotlin.coroutines.CoroutineContext diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/Jce.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/Jce.kt index 3c9277319..87ec126c1 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/Jce.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/Jce.kt @@ -12,14 +12,9 @@ package net.mamoe.mirai.qqandroid.io.serialization import io.ktor.utils.io.charsets.Charset import io.ktor.utils.io.core.* import kotlinx.serialization.* -import kotlinx.serialization.builtins.ByteArraySerializer -import kotlinx.serialization.builtins.MapEntrySerializer -import kotlinx.serialization.builtins.SetSerializer -import kotlinx.serialization.builtins.serializer import kotlinx.serialization.internal.* import kotlinx.serialization.modules.EmptyModule import kotlinx.serialization.modules.SerialModule -import kotlinx.serialization.protobuf.ProtoId import net.mamoe.mirai.qqandroid.io.JceStruct import net.mamoe.mirai.qqandroid.io.ProtoBuf import net.mamoe.mirai.utils.io.readString @@ -27,7 +22,6 @@ import net.mamoe.mirai.utils.io.toReadPacket @PublishedApi internal val CharsetGBK = Charset.forName("GBK") - @PublishedApi internal val CharsetUTF8 = Charset.forName("UTF8") @@ -36,14 +30,12 @@ enum class JceCharset(val kotlinCharset: Charset) { UTF8(Charset.forName("UTF8")) } -internal fun getSerialId(desc: SerialDescriptor, index: Int): Int? = desc.findAnnotation(index)?.id +internal fun getSerialId(desc: SerialDescriptor, index: Int): Int? = desc.findAnnotation(index)?.id /** * Jce 数据结构序列化和反序列化工具, 能将 kotlinx.serialization 通用的注解标记格式的 `class` 序列化为 [ByteArray] */ -@OptIn(InternalSerializationApi::class) -class Jce private constructor(private val charset: JceCharset, override val context: SerialModule = EmptyModule) : - SerialFormat, BinaryFormat { +class Jce private constructor(private val charset: JceCharset, context: SerialModule = EmptyModule) : AbstractSerialFormat(context), BinaryFormat { private inner class ListWriter( private val count: Int, @@ -54,7 +46,7 @@ class Jce private constructor(private val charset: JceCharset, override val cont return 0 } - override fun endEncode(descriptor: SerialDescriptor) { + override fun endEncode(desc: SerialDescriptor) { parentEncoder.writeHead(LIST, this.tag) parentEncoder.encodeTaggedInt(0, count) parentEncoder.output.writePacket(this.output.build()) @@ -76,18 +68,11 @@ class Jce private constructor(private val charset: JceCharset, override val cont parentEncoder.output.write(this.output.toByteArray()) }*/ - override fun beginCollection( - descriptor: SerialDescriptor, - collectionSize: Int, - vararg typeSerializers: KSerializer<*> - ): CompositeEncoder { + override fun beginCollection(desc: SerialDescriptor, collectionSize: Int, vararg typeParams: KSerializer<*>): CompositeEncoder { return this } - override fun beginStructure( - descriptor: SerialDescriptor, - vararg typeSerializers: KSerializer<*> - ): CompositeEncoder { + override fun beginStructure(desc: SerialDescriptor, vararg typeParams: KSerializer<*>): CompositeEncoder { return this } } @@ -109,89 +94,77 @@ class Jce private constructor(private val charset: JceCharset, override val cont /** * 序列化最开始的时候的 */ - override fun beginStructure( - descriptor: SerialDescriptor, - vararg typeSerializers: KSerializer<*> - ): CompositeEncoder = when (descriptor.kind) { + override fun beginStructure(desc: SerialDescriptor, vararg typeParams: KSerializer<*>): CompositeEncoder = when (desc.kind) { StructureKind.LIST -> this StructureKind.MAP -> this - StructureKind.CLASS, StructureKind.OBJECT -> this + StructureKind.CLASS, UnionKind.OBJECT -> this is PolymorphicKind -> this else -> throw SerializationException("Primitives are not supported at top-level") } @UseExperimental(ImplicitReflectionSerializer::class) @Suppress("UNCHECKED_CAST", "NAME_SHADOWING") - override fun encodeSerializableValue(serializer: SerializationStrategy, value: T) = - when { - serializer.descriptor.kind == StructureKind.MAP -> { - try { - val entries = (value as Map<*, *>).entries - val serializer = (serializer as MapLikeSerializer) - val mapEntrySerial = MapEntrySerializer(serializer.keySerializer, serializer.valueSerializer) + override fun encodeSerializableValue(serializer: SerializationStrategy, value: T) = when (serializer.descriptor) { + is MapLikeDescriptor -> { + val entries = (value as Map<*, *>).entries + val serializer = (serializer as MapLikeSerializer) + val mapEntrySerial = MapEntrySerializer(serializer.keySerializer, serializer.valueSerializer) - this.writeHead(MAP, currentTag) - this.encodeTaggedInt(0, entries.count()) - SetSerializer(mapEntrySerial).serialize(JceMapWriter(this.output), entries) - } catch (e: Exception) { - super.encodeSerializableValue(serializer, value) - } - } - serializer.descriptor == ByteArraySerializer() -> encodeTaggedByteArray(popTag(), value as ByteArray) - serializer.descriptor.kind == StructureKind.LIST - && serializer.descriptor.elementDescriptors()[0].kind is PrimitiveKind - && value !is ArrayList<*> - && value !is Array<*> -> { + this.writeHead(MAP, currentTag) + this.encodeTaggedInt(0, entries.count()) + HashSetSerializer(mapEntrySerial).serialize(JceMapWriter(this.output), entries) + } + ByteArraySerializer.descriptor -> encodeTaggedByteArray(popTag(), value as ByteArray) + is PrimitiveArrayDescriptor -> { + serializer.serialize( + ListWriter( + when (value) { + is ShortArray -> value.size + is IntArray -> value.size + is LongArray -> value.size + is FloatArray -> value.size + is DoubleArray -> value.size + is CharArray -> value.size + is ByteArray -> value.size + is BooleanArray -> value.size + else -> error("unknown array type: ${value.getClassName()}") + }, popTag(), this + ), + value + ) + } + is ArrayClassDesc -> { + val descriptor = serializer.descriptor as ReferenceArraySerializer + if (descriptor.typeParams.isNotEmpty() && descriptor.typeParams[0] is ByteSerializer) { + encodeTaggedByteArray(popTag(), (value as Array).toByteArray()) + } else serializer.serialize( - ListWriter( - when (value) { - is ShortArray -> value.size - is IntArray -> value.size - is LongArray -> value.size - is FloatArray -> value.size - is DoubleArray -> value.size - is CharArray -> value.size - is ByteArray -> value.size - is BooleanArray -> value.size - else -> error("unknown array type: ${value.getClassName()}") - }, popTag(), this - ), + ListWriter((value as Array<*>).size, popTag(), this), value ) - } - serializer.descriptor.kind == StructureKind.LIST -> { - if (value is Array<*>) { - val descriptors = serializer.descriptor.elementDescriptors() - if (descriptors.isNotEmpty() && descriptors[0].kind == PrimitiveKind.BYTE) { - encodeTaggedByteArray(popTag(), (value as Array).toByteArray()) - } else - serializer.serialize( - ListWriter((value as Array<*>).size, popTag(), this), - value - ) - } else if (value is Collection<*>) { - serializer.serialize( - ListWriter((value as Collection<*>).size, popTag(), this), - value - ) - } else error("unknown value kind: ${value.getClassName()}") - } - else -> { - if (value is JceStruct) { - if (currentTagOrNull == null) { - serializer.serialize(this, value) - } else { - this.writeHead(STRUCT_BEGIN, popTag()) - serializer.serialize(JceEncoder(this.output), value) - this.writeHead(STRUCT_END, 0) - } - } else if (value is ProtoBuf) { - this.encodeTaggedByteArray(popTag(), ProtoBufWithNullableSupport.dump(value)) - } else { + } + is ListLikeDescriptor -> { + serializer.serialize( + ListWriter((value as Collection<*>).size, popTag(), this), + value + ) + } + else -> { + if (value is JceStruct) { + if (currentTagOrNull == null) { serializer.serialize(this, value) + } else { + this.writeHead(STRUCT_BEGIN, popTag()) + serializer.serialize(JceEncoder(this.output), value) + this.writeHead(STRUCT_END, 0) } + } else if (value is ProtoBuf) { + this.encodeTaggedByteArray(popTag(), ProtoBufWithNullableSupport.dump(value)) + } else { + serializer.serialize(this, value) } } + } override fun encodeTaggedByte(tag: Int, value: Byte) { if (value.toInt() == 0) { @@ -254,6 +227,10 @@ class Jce private constructor(private val charset: JceCharset, override val cont override fun encodeTaggedNull(tag: Int) { } + override fun encodeTaggedUnit(tag: Int) { + encodeTaggedNull(tag) + } + fun encodeTaggedByteArray(tag: Int, bytes: ByteArray) { writeHead(SIMPLE_LIST, tag) writeHead(BYTE, 0) @@ -285,7 +262,7 @@ class Jce private constructor(private val charset: JceCharset, override val cont is Double -> encodeTaggedDouble(tag, value) is Boolean -> encodeTaggedBoolean(tag, value) is String -> encodeTaggedString(tag, value) - is Unit -> Unit + is Unit -> encodeTaggedUnit(tag) else -> error("unsupported type: ${value.getClassName()}") } } @@ -309,7 +286,7 @@ class Jce private constructor(private val charset: JceCharset, override val cont val size: Int, input: JceInput ) : JceDecoder(input) { - override fun decodeCollectionSize(descriptor: SerialDescriptor): Int { + override fun decodeCollectionSize(desc: SerialDescriptor): Int { return size } @@ -323,7 +300,7 @@ class Jce private constructor(private val charset: JceCharset, override val cont val size: Int, input: JceInput ) : JceDecoder(input) { - override fun decodeCollectionSize(descriptor: SerialDescriptor): Int { + override fun decodeCollectionSize(desc: SerialDescriptor): Int { return size } @@ -335,7 +312,7 @@ class Jce private constructor(private val charset: JceCharset, override val cont private open inner class JceStructReader( input: JceInput ) : JceDecoder(input) { - override fun endStructure(descriptor: SerialDescriptor) { + override fun endStructure(desc: SerialDescriptor) { } } @@ -368,16 +345,16 @@ class Jce private constructor(private val charset: JceCharset, override val cont /** * 在 [KSerializer.serialize] 前 */ - override fun beginStructure(descriptor: SerialDescriptor, vararg typeParams: KSerializer<*>): CompositeDecoder { + override fun beginStructure(desc: SerialDescriptor, vararg typeParams: KSerializer<*>): CompositeDecoder { //// println("beginStructure: desc=${desc.getClassName()}, typeParams: ${typeParams.contentToString()}") - when { + when (desc) { // 由于 Byte 的数组有两种方式写入, 需特定读取器 - descriptor == ByteArraySerializer().descriptor -> { + ByteArraySerializer.descriptor -> { // ByteArray, 交给 decodeSerializableValue 进行处理 return this } - descriptor.kind == StructureKind.LIST -> { - if (typeParams.isNotEmpty() && typeParams[0] == Byte.serializer()) { + is ListLikeDescriptor -> { + if (typeParams.isNotEmpty() && typeParams[0] is ByteSerializer) { // Array return this // 交给 decodeSerializableValue } @@ -394,12 +371,12 @@ class Jce private constructor(private val charset: JceCharset, override val cont MAP -> JceMapReader(input.readInt(0), this.input) else -> error("type mismatch") } - } == null && descriptor.isNullable) { + } == null && desc.isNullable) { return NullReader(this.input) } } - descriptor.kind == StructureKind.MAP -> { + is MapLikeDescriptor -> { val tag = currentTagOrNull if (tag != null) { popTag() @@ -414,11 +391,7 @@ class Jce private constructor(private val charset: JceCharset, override val cont return NullReader(this.input) } - return super.beginStructure(descriptor, *typeParams) - } - - override fun decodeElementIndex(descriptor: SerialDescriptor): Int { - return 0 + return super.beginStructure(desc, *typeParams) } override fun decodeTaggedNull(tag: Int): Nothing? { @@ -446,15 +419,13 @@ class Jce private constructor(private val charset: JceCharset, override val cont return null } } - - @Suppress("DEPRECATION_ERROR") - when { - deserializer.descriptor == ByteArraySerializer().descriptor -> { + when (deserializer.descriptor) { + ByteArraySerializer.descriptor -> { val tag = popTag() return if (isTagMissing(tag)) input.readByteArrayOrNull(tag) as? T else input.readByteArray(tag) as T } - deserializer.descriptor.kind == StructureKind.LIST -> { + is ListLikeDescriptor -> { if (deserializer is ReferenceArraySerializer<*, *> && (deserializer as ListLikeSerializer).typeParams.isNotEmpty() && (deserializer as ListLikeSerializer).typeParams[0] is ByteSerializer @@ -482,17 +453,15 @@ class Jce private constructor(private val charset: JceCharset, override val cont } error("UNREACHABLE CODE") } - deserializer.descriptor.kind == StructureKind.MAP -> { + is MapLikeDescriptor -> { val tag = popTag() @Suppress("SENSELESS_COMPARISON") if (input.skipToTagOrNull(tag) { head -> check(head.type == MAP) { "type mismatch: ${head.type}" } // 将 mapOf(k1 to v1, k2 to v2, ...) 转换为 listOf(k1, v1, k2, v2, ...) 以便于写入. val serializer = (deserializer as MapLikeSerializer) - val mapEntrySerial = - MapEntrySerializer(serializer.keySerializer, serializer.valueSerializer) - val setOfEntries = - SetSerializer(mapEntrySerial).deserialize(JceMapReader(input.readInt(0), input)) + val mapEntrySerial = MapEntrySerializer(serializer.keySerializer, serializer.valueSerializer) + val setOfEntries = HashSetSerializer(mapEntrySerial).deserialize(JceMapReader(input.readInt(0), input)) return setOfEntries.associateBy({ it.key }, { it.value }) as T } == null) { if (isTagMissing(tag)) { @@ -503,7 +472,7 @@ class Jce private constructor(private val charset: JceCharset, override val cont } } - if (deserializer.descriptor.kind == StructureKind.CLASS || deserializer.descriptor.kind == StructureKind.OBJECT) { + if (deserializer.descriptor.kind == StructureKind.CLASS || deserializer.descriptor.kind == UnionKind.OBJECT) { val tag = currentTagOrNull if (tag != null) { @Suppress("SENSELESS_COMPARISON") // 推断 bug @@ -592,30 +561,17 @@ class Jce private constructor(private val charset: JceCharset, override val cont return currentJceHead } - fun readBoolean(tag: Int): Boolean = - readBooleanOrNull(tag) ?: error("cannot find tag $tag, currentJceHead=$currentJceHead") - - fun readByte(tag: Int): Byte = - readByteOrNull(tag) ?: error("cannot find tag $tag, currentJceHead=$currentJceHead") - - fun readShort(tag: Int): Short = - readShortOrNull(tag) ?: error("cannot find tag $tag, currentJceHead=$currentJceHead") - + fun readBoolean(tag: Int): Boolean = readBooleanOrNull(tag) ?: error("cannot find tag $tag, currentJceHead=$currentJceHead") + fun readByte(tag: Int): Byte = readByteOrNull(tag) ?: error("cannot find tag $tag, currentJceHead=$currentJceHead") + fun readShort(tag: Int): Short = readShortOrNull(tag) ?: error("cannot find tag $tag, currentJceHead=$currentJceHead") fun readInt(tag: Int): Int = readIntOrNull(tag) ?: error("cannot find tag $tag, currentJceHead=$currentJceHead") - fun readLong(tag: Int): Long = - readLongOrNull(tag) ?: error("cannot find tag $tag, currentJceHead=$currentJceHead") + fun readLong(tag: Int): Long = readLongOrNull(tag) ?: error("cannot find tag $tag, currentJceHead=$currentJceHead") + fun readFloat(tag: Int): Float = readFloatOrNull(tag) ?: error("cannot find tag $tag, currentJceHead=$currentJceHead") + fun readDouble(tag: Int): Double = readDoubleOrNull(tag) ?: error("cannot find tag $tag, currentJceHead=$currentJceHead") - fun readFloat(tag: Int): Float = - readFloatOrNull(tag) ?: error("cannot find tag $tag, currentJceHead=$currentJceHead") + fun readString(tag: Int): String = readStringOrNull(tag) ?: error("cannot find tag $tag, currentJceHead=$currentJceHead") - fun readDouble(tag: Int): Double = - readDoubleOrNull(tag) ?: error("cannot find tag $tag, currentJceHead=$currentJceHead") - - fun readString(tag: Int): String = - readStringOrNull(tag) ?: error("cannot find tag $tag, currentJceHead=$currentJceHead") - - fun readByteArray(tag: Int): ByteArray = - readByteArrayOrNull(tag) ?: error("cannot find tag $tag, currentJceHead=$currentJceHead") + fun readByteArray(tag: Int): ByteArray = readByteArrayOrNull(tag) ?: error("cannot find tag $tag, currentJceHead=$currentJceHead") fun readByteArrayOrNull(tag: Int): ByteArray? = skipToTagOrNull(tag) { when (it.type) { @@ -776,8 +732,7 @@ class Jce private constructor(private val charset: JceCharset, override val cont internal const val ZERO_TYPE: Byte = 12 private fun Any?.getClassName(): String = - (if (this == null) Unit::class else this::class).qualifiedName?.split(".")?.takeLast(2)?.joinToString(".") - ?: "" + (if (this == null) Unit::class else this::class).qualifiedName?.split(".")?.takeLast(2)?.joinToString(".") ?: "" } fun dumpAsPacket(serializer: SerializationStrategy, obj: T): ByteReadPacket { @@ -787,18 +742,14 @@ class Jce private constructor(private val charset: JceCharset, override val cont return encoder.build() } - override fun dump(serializer: SerializationStrategy, value: T): ByteArray { - return dumpAsPacket(serializer, value).readBytes() + override fun dump(serializer: SerializationStrategy, obj: T): ByteArray { + return dumpAsPacket(serializer, obj).readBytes() } /** * 注意 close [packet]!! */ - fun load( - deserializer: DeserializationStrategy, - packet: ByteReadPacket, - length: Int = packet.remaining.toInt() - ): T { + fun load(deserializer: DeserializationStrategy, packet: ByteReadPacket, length: Int = packet.remaining.toInt()): T { return JceDecoder(JceInput(packet, length.toLong())).decode(deserializer) } diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/ProtoBufWithNullableSupport.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/ProtoBufWithNullableSupport.kt index d8cd26696..31e755546 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/ProtoBufWithNullableSupport.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/ProtoBufWithNullableSupport.kt @@ -5,19 +5,11 @@ * Some code changed by Mamoe is annotated around "MIRAI MODIFY START" and "MIRAI MODIFY END" */ -@file:Suppress("DEPRECATION_ERROR") - package net.mamoe.mirai.qqandroid.io.serialization -import kotlinx.io.ByteArrayOutputStream -import kotlinx.io.ByteBuffer -import kotlinx.io.ByteOrder +import kotlinx.io.* import kotlinx.serialization.* -import kotlinx.serialization.builtins.ByteArraySerializer -import kotlinx.serialization.builtins.MapEntrySerializer -import kotlinx.serialization.builtins.SetSerializer -import kotlinx.serialization.internal.MapLikeSerializer -import kotlinx.serialization.internal.TaggedEncoder +import kotlinx.serialization.internal.* import kotlinx.serialization.modules.EmptyModule import kotlinx.serialization.modules.SerialModule import kotlinx.serialization.protobuf.ProtoBuf @@ -41,31 +33,22 @@ internal fun extractParameters(desc: SerialDescriptor, index: Int, zeroBasedDefa * * 代码复制自 kotlinx.serialization. 修改部分已进行标注 (详见 "MIRAI MODIFY START") */ -@OptIn(InternalSerializationApi::class, ExperimentalStdlibApi::class) -class ProtoBufWithNullableSupport(override val context: SerialModule = EmptyModule) : SerialFormat, BinaryFormat { +class ProtoBufWithNullableSupport(context: SerialModule = EmptyModule) : AbstractSerialFormat(context), BinaryFormat { - internal open inner class ProtobufWriter(private val encoder: ProtobufEncoder) : TaggedEncoder() { - override val context + internal open inner class ProtobufWriter(val encoder: ProtobufEncoder) : TaggedEncoder() { + public override val context get() = this@ProtoBufWithNullableSupport.context - override fun beginStructure( - descriptor: SerialDescriptor, - vararg typeSerializers: KSerializer<*> - ): CompositeEncoder = - when (descriptor.kind) { - StructureKind.LIST -> RepeatedWriter(encoder, currentTag) - StructureKind.CLASS, StructureKind.OBJECT, is PolymorphicKind -> ObjectWriter(currentTagOrNull, encoder) - StructureKind.MAP -> MapRepeatedWriter(currentTagOrNull, encoder) - else -> throw SerializationException("Primitives are not supported at top-level") - } + override fun beginStructure(desc: SerialDescriptor, vararg typeParams: KSerializer<*>): CompositeEncoder = when (desc.kind) { + StructureKind.LIST -> RepeatedWriter(encoder, currentTag) + StructureKind.CLASS, UnionKind.OBJECT, is PolymorphicKind -> ObjectWriter(currentTagOrNull, encoder) + StructureKind.MAP -> MapRepeatedWriter(currentTagOrNull, encoder) + else -> throw SerializationException("Primitives are not supported at top-level") + } override fun encodeTaggedInt(tag: ProtoDesc, value: Int) = encoder.writeInt(value, tag.first, tag.second) - override fun encodeTaggedByte(tag: ProtoDesc, value: Byte) = - encoder.writeInt(value.toInt(), tag.first, tag.second) - - override fun encodeTaggedShort(tag: ProtoDesc, value: Short) = - encoder.writeInt(value.toInt(), tag.first, tag.second) - + override fun encodeTaggedByte(tag: ProtoDesc, value: Byte) = encoder.writeInt(value.toInt(), tag.first, tag.second) + override fun encodeTaggedShort(tag: ProtoDesc, value: Short) = encoder.writeInt(value.toInt(), tag.first, tag.second) override fun encodeTaggedLong(tag: ProtoDesc, value: Long) = encoder.writeLong(value, tag.first, tag.second) override fun encodeTaggedFloat(tag: ProtoDesc, value: Float) = encoder.writeFloat(value, tag.first) override fun encodeTaggedDouble(tag: ProtoDesc, value: Double) = encoder.writeDouble(value, tag.first) @@ -99,15 +82,12 @@ class ProtoBufWithNullableSupport(override val context: SerialModule = EmptyModu @Suppress("UNCHECKED_CAST", "NAME_SHADOWING") override fun encodeSerializableValue(serializer: SerializationStrategy, value: T) = when { // encode maps as collection of map entries, not merged collection of key-values - serializer.descriptor.kind == StructureKind.MAP -> { + serializer.descriptor is MapLikeDescriptor -> { val serializer = (serializer as MapLikeSerializer) val mapEntrySerial = MapEntrySerializer(serializer.keySerializer, serializer.valueSerializer) - SetSerializer(mapEntrySerial).serialize(this, (value as Map<*, *>).entries) + HashSetSerializer(mapEntrySerial).serialize(this, (value as Map<*, *>).entries) } - serializer.descriptor == ByteArraySerializer().descriptor -> encoder.writeBytes( - value as ByteArray, - popTag().first - ) + serializer.descriptor == ByteArraySerializer.descriptor -> encoder.writeBytes(value as ByteArray, popTag().first) else -> serializer.serialize(this, value) } } @@ -116,7 +96,7 @@ class ProtoBufWithNullableSupport(override val context: SerialModule = EmptyModu val parentTag: ProtoDesc?, private val parentEncoder: ProtobufEncoder, private val stream: ByteArrayOutputStream = ByteArrayOutputStream() ) : ProtobufWriter(ProtobufEncoder(stream)) { - override fun endEncode(descriptor: SerialDescriptor) { + override fun endEncode(desc: SerialDescriptor) { if (parentTag != null) { parentEncoder.writeBytes(stream.toByteArray(), parentTag.first) } else { @@ -131,8 +111,7 @@ class ProtoBufWithNullableSupport(override val context: SerialModule = EmptyModu else 2 to (parentTag?.second ?: ProtoNumberType.DEFAULT) } - internal inner class RepeatedWriter(encoder: ProtobufEncoder, private val curTag: ProtoDesc) : - ProtobufWriter(encoder) { + internal inner class RepeatedWriter(encoder: ProtobufEncoder, val curTag: ProtoDesc) : ProtobufWriter(encoder) { override fun SerialDescriptor.getTag(index: Int) = curTag } @@ -163,7 +142,7 @@ class ProtoBufWithNullableSupport(override val context: SerialModule = EmptyModu } fun writeString(value: String, tag: Int) { - val bytes = value.encodeToByteArray() + val bytes = value.toUtf8Bytes() writeBytes(bytes, tag) } @@ -249,17 +228,17 @@ class ProtoBufWithNullableSupport(override val context: SerialModule = EmptyModu internal const val SIZE_DELIMITED = 2 internal const val i32 = 5 - private val plain = ProtoBufWithNullableSupport() + val plain = ProtoBufWithNullableSupport() - override fun dump(serializer: SerializationStrategy, value: T): ByteArray = plain.dump(serializer, value) - override fun load(deserializer: DeserializationStrategy, bytes: ByteArray): T = - plain.load(deserializer, bytes) + override fun dump(serializer: SerializationStrategy, obj: T): ByteArray = plain.dump(serializer, obj) + override fun load(deserializer: DeserializationStrategy, bytes: ByteArray): T = plain.load(deserializer, bytes) + override fun install(module: SerialModule) = throw IllegalStateException("You should not install anything to global instance") } - override fun dump(serializer: SerializationStrategy, value: T): ByteArray { + override fun dump(serializer: SerializationStrategy, obj: T): ByteArray { val encoder = ByteArrayOutputStream() val dumper = ProtobufWriter(ProtobufEncoder(encoder)) - dumper.encode(serializer, value) + dumper.encode(serializer, obj) return encoder.toByteArray() } @@ -269,3 +248,20 @@ class ProtoBufWithNullableSupport(override val context: SerialModule = EmptyModu } +internal fun InputStream.readExactNBytes(bytes: Int): ByteArray { + val array = ByteArray(bytes) + var read = 0 + while (read < bytes) { + val i = this.read(array, read, bytes - read) + if (i == -1) throw IOException("Unexpected EOF") + read += i + } + return array +} + +internal fun InputStream.readToByteBuffer(bytes: Int): ByteBuffer { + val arr = readExactNBytes(bytes) + val buf = ByteBuffer.allocate(bytes) + buf.put(arr).flip() + return buf +} \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt index c0d309c5d..f4389c40e 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt @@ -31,6 +31,7 @@ import net.mamoe.mirai.qqandroid.network.protocol.data.proto.MsgSvc import net.mamoe.mirai.qqandroid.network.protocol.packet.* import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.GroupInfoImpl import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.receive.MessageSvc +import net.mamoe.mirai.qqandroid.network.protocol.packet.list.FriendList import net.mamoe.mirai.qqandroid.network.protocol.packet.login.Heartbeat import net.mamoe.mirai.qqandroid.network.protocol.packet.login.StatSvc import net.mamoe.mirai.qqandroid.network.protocol.packet.login.WtLogin diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt index ee1d04d36..61dd755c2 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt @@ -26,7 +26,6 @@ import io.ktor.utils.io.pool.useInstance import kotlinx.coroutines.InternalCoroutinesApi import kotlinx.coroutines.flow.collect import kotlinx.io.InputStream -import kotlinx.serialization.InternalSerializationApi import net.mamoe.mirai.qqandroid.io.serialization.readProtoBuf import net.mamoe.mirai.qqandroid.network.QQAndroidClient import net.mamoe.mirai.qqandroid.network.protocol.data.proto.CSDataHighwayHead @@ -35,7 +34,7 @@ import net.mamoe.mirai.utils.io.ByteArrayPool import net.mamoe.mirai.utils.io.PlatformSocket import net.mamoe.mirai.utils.io.withUse -@UseExperimental(MiraiInternalAPI::class, InternalSerializationApi::class) +@UseExperimental(MiraiInternalAPI::class) @Suppress("SpellCheckingInspection") internal suspend fun HttpClient.postImage( htcmd: String, @@ -93,7 +92,7 @@ internal suspend fun HttpClient.postImage( } } == HttpStatusCode.OK -@UseExperimental(MiraiInternalAPI::class, InternalSerializationApi::class) +@UseExperimental(MiraiInternalAPI::class) internal object HighwayHelper { @UseExperimental(InternalCoroutinesApi::class) suspend fun uploadImage( diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/highway.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/highway.kt index 006963c5f..cf13c882a 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/highway.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/highway.kt @@ -15,6 +15,7 @@ import io.ktor.utils.io.ByteReadChannel import io.ktor.utils.io.core.* import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map +import kotlinx.io.InputStream import net.mamoe.mirai.qqandroid.io.serialization.toByteArray import net.mamoe.mirai.qqandroid.network.QQAndroidClient import net.mamoe.mirai.qqandroid.network.protocol.data.proto.CSDataHighwayHead diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/ConfigPush.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/ConfigPush.kt index b96d5ea8d..9dc876865 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/ConfigPush.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/ConfigPush.kt @@ -9,139 +9,139 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce +import kotlinx.serialization.SerialId import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId import net.mamoe.mirai.data.Packet import net.mamoe.mirai.qqandroid.io.JceStruct @Serializable internal class BigDataChannel( - @ProtoId(0) val vBigdataIplists: List, - @ProtoId(1) val sBigdataSigSession: ByteArray? = null, - @ProtoId(2) val sBigdataKeySession: ByteArray? = null, - @ProtoId(3) val uSigUin: Long? = null, - @ProtoId(4) val iConnectFlag: Int? = 1, - @ProtoId(5) val vBigdataPbBuf: ByteArray? = null + @SerialId(0) val vBigdataIplists: List, + @SerialId(1) val sBigdataSigSession: ByteArray? = null, + @SerialId(2) val sBigdataKeySession: ByteArray? = null, + @SerialId(3) val uSigUin: Long? = null, + @SerialId(4) val iConnectFlag: Int? = 1, + @SerialId(5) val vBigdataPbBuf: ByteArray? = null ) : JceStruct @Serializable internal class BigDataIpInfo( - @ProtoId(0) val uType: Long, - @ProtoId(1) val sIp: String = "", - @ProtoId(2) val uPort: Long + @SerialId(0) val uType: Long, + @SerialId(1) val sIp: String = "", + @SerialId(2) val uPort: Long ) : JceStruct @Serializable internal class BigDataIpList( - @ProtoId(0) val uServiceType: Long, - @ProtoId(1) val vIplist: List, - @ProtoId(2) val netSegConfs: List? = null, - @ProtoId(3) val ufragmentSize: Long? = null + @SerialId(0) val uServiceType: Long, + @SerialId(1) val vIplist: List, + @SerialId(2) val netSegConfs: List? = null, + @SerialId(3) val ufragmentSize: Long? = null ) : JceStruct @Serializable internal class ClientLogConfig( - @ProtoId(1) val type: Int, - @ProtoId(2) val timeStart: TimeStamp? = null, - @ProtoId(3) val timeFinish: TimeStamp? = null, - @ProtoId(4) val loglevel: Byte? = null, - @ProtoId(5) val cookie: Int? = null, - @ProtoId(6) val lseq: Long? = null + @SerialId(1) val type: Int, + @SerialId(2) val timeStart: TimeStamp? = null, + @SerialId(3) val timeFinish: TimeStamp? = null, + @SerialId(4) val loglevel: Byte? = null, + @SerialId(5) val cookie: Int? = null, + @SerialId(6) val lseq: Long? = null ) : JceStruct @Serializable internal class DomainIpChannel( - @ProtoId(0) val vDomainIplists: List + @SerialId(0) val vDomainIplists: List ) : JceStruct @Serializable internal class DomainIpInfo( - @ProtoId(1) val uIp: Int, - @ProtoId(2) val uPort: Int + @SerialId(1) val uIp: Int, + @SerialId(2) val uPort: Int ) : JceStruct @Serializable internal class DomainIpList( - @ProtoId(0) val uDomainType: Int, - @ProtoId(1) val vIplist: List + @SerialId(0) val uDomainType: Int, + @SerialId(1) val vIplist: List ) : JceStruct @Serializable internal class FileStoragePushFSSvcList( - @ProtoId(0) val vUpLoadList: List, - @ProtoId(1) val vPicDownLoadList: List, - @ProtoId(2) val vGPicDownLoadList: List? = null, - @ProtoId(3) val vQzoneProxyServiceList: List? = null, - @ProtoId(4) val vUrlEncodeServiceList: List? = null, - @ProtoId(5) val bigDataChannel: BigDataChannel? = null, - @ProtoId(6) val vVipEmotionList: List? = null, - @ProtoId(7) val vC2CPicDownList: List? = null, - @ProtoId(8) val fmtIPInfo: FmtIPInfo? = null, - @ProtoId(9) val domainIpChannel: DomainIpChannel? = null, - @ProtoId(10) val pttlist: ByteArray? = null + @SerialId(0) val vUpLoadList: List, + @SerialId(1) val vPicDownLoadList: List, + @SerialId(2) val vGPicDownLoadList: List? = null, + @SerialId(3) val vQzoneProxyServiceList: List? = null, + @SerialId(4) val vUrlEncodeServiceList: List? = null, + @SerialId(5) val bigDataChannel: BigDataChannel? = null, + @SerialId(6) val vVipEmotionList: List? = null, + @SerialId(7) val vC2CPicDownList: List? = null, + @SerialId(8) val fmtIPInfo: FmtIPInfo? = null, + @SerialId(9) val domainIpChannel: DomainIpChannel? = null, + @SerialId(10) val pttlist: ByteArray? = null ) : JceStruct @Serializable internal class FileStorageServerListInfo( - @ProtoId(1) val sIP: String = "", - @ProtoId(2) val iPort: Int + @SerialId(1) val sIP: String = "", + @SerialId(2) val iPort: Int ) : JceStruct @Serializable internal class FmtIPInfo( - @ProtoId(0) val sGateIp: String = "", - @ProtoId(1) val iGateIpOper: Long + @SerialId(0) val sGateIp: String = "", + @SerialId(1) val iGateIpOper: Long ) : JceStruct @Serializable internal class NetSegConf( - @ProtoId(0) val uint32NetType: Long? = null, - @ProtoId(1) val uint32Segsize: Long? = null, - @ProtoId(2) val uint32Segnum: Long? = null, - @ProtoId(3) val uint32Curconnnum: Long? = null + @SerialId(0) val uint32NetType: Long? = null, + @SerialId(1) val uint32Segsize: Long? = null, + @SerialId(2) val uint32Segnum: Long? = null, + @SerialId(3) val uint32Curconnnum: Long? = null ) : JceStruct @Suppress("ArrayInDataClass") @Serializable internal data class PushReq( - @ProtoId(1) val type: Int, - @ProtoId(2) val jcebuf: ByteArray, - @ProtoId(3) val seq: Long + @SerialId(1) val type: Int, + @SerialId(2) val jcebuf: ByteArray, + @SerialId(3) val seq: Long ) : JceStruct, Packet @Serializable internal class PushResp( - @ProtoId(1) val type: Int, - @ProtoId(2) val seq: Long, - @ProtoId(3) val jcebuf: ByteArray? = null + @SerialId(1) val type: Int, + @SerialId(2) val seq: Long, + @SerialId(3) val jcebuf: ByteArray? = null ) : JceStruct @Serializable internal class SsoServerList( - @ProtoId(1) val v2G3GList: List, - @ProtoId(3) val vWifiList: List, - @ProtoId(4) val iReconnect: Int, - @ProtoId(5) val testSpeed: Byte? = null, - @ProtoId(6) val useNewList: Byte? = null, - @ProtoId(7) val iMultiConn: Int? = 1, - @ProtoId(8) val vHttp2g3glist: List? = null, - @ProtoId(9) val vHttpWifilist: List? = null + @SerialId(1) val v2G3GList: List, + @SerialId(3) val vWifiList: List, + @SerialId(4) val iReconnect: Int, + @SerialId(5) val testSpeed: Byte? = null, + @SerialId(6) val useNewList: Byte? = null, + @SerialId(7) val iMultiConn: Int? = 1, + @SerialId(8) val vHttp2g3glist: List? = null, + @SerialId(9) val vHttpWifilist: List? = null ) : JceStruct @Serializable internal class SsoServerListInfo( - @ProtoId(1) val sIP: String = "", - @ProtoId(2) val iPort: Int, - @ProtoId(3) val linkType: Byte, - @ProtoId(4) val proxy: Byte, - @ProtoId(5) val protocolType: Byte? = null, - @ProtoId(6) val iTimeOut: Int? = 10 + @SerialId(1) val sIP: String = "", + @SerialId(2) val iPort: Int, + @SerialId(3) val linkType: Byte, + @SerialId(4) val proxy: Byte, + @SerialId(5) val protocolType: Byte? = null, + @SerialId(6) val iTimeOut: Int? = 10 ) : JceStruct @Serializable internal class TimeStamp( - @ProtoId(1) val year: Int, - @ProtoId(2) val month: Byte, - @ProtoId(3) val day: Byte, - @ProtoId(4) val hour: Byte + @SerialId(1) val year: Int, + @SerialId(2) val month: Byte, + @SerialId(3) val day: Byte, + @SerialId(4) val hour: Byte ) : JceStruct diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/FriendList.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/FriendList.kt index b375aa4b4..27e19dd94 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/FriendList.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/FriendList.kt @@ -9,172 +9,172 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce +import kotlinx.serialization.SerialId import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId import net.mamoe.mirai.qqandroid.io.JceStruct @Serializable internal class ModifyGroupCardReq( - @ProtoId(0) val dwZero: Long, - @ProtoId(1) val dwGroupCode: Long, - @ProtoId(2) val dwNewSeq: Long, - @ProtoId(3) val vecUinInfo: List + @SerialId(0) val dwZero: Long, + @SerialId(1) val dwGroupCode: Long, + @SerialId(2) val dwNewSeq: Long, + @SerialId(3) val vecUinInfo: List ) : JceStruct @Serializable -internal class StUinInfo( - @ProtoId(0) val dwuin: Long, - @ProtoId(1) val dwFlag: Long, - @ProtoId(2) val sName: String = "", - @ProtoId(3) val gender: Byte, - @ProtoId(4) val sPhone: String = "", - @ProtoId(5) val sEmail: String = "", - @ProtoId(6) val sRemark: String = "" +internal class stUinInfo( + @SerialId(0) val dwuin: Long, + @SerialId(1) val dwFlag: Long, + @SerialId(2) val sName: String = "", + @SerialId(3) val gender: Byte, + @SerialId(4) val sPhone: String = "", + @SerialId(5) val sEmail: String = "", + @SerialId(6) val sRemark: String = "" ) : JceStruct @Serializable internal class GetFriendListReq( - @ProtoId(0) val reqtype: Int? = null, - @ProtoId(1) val ifReflush: Byte? = null, - @ProtoId(2) val uin: Long? = null, - @ProtoId(3) val startIndex: Short? = null, - @ProtoId(4) val getfriendCount: Short? = null, - @ProtoId(5) val groupid: Byte? = null, - @ProtoId(6) val ifGetGroupInfo: Byte? = null, - @ProtoId(7) val groupstartIndex: Byte? = null, - @ProtoId(8) val getgroupCount: Byte? = null, - @ProtoId(9) val ifGetMSFGroup: Byte? = null, - @ProtoId(10) val ifShowTermType: Byte? = null, - @ProtoId(11) val version: Long? = null, - @ProtoId(12) val uinList: List? = null, - @ProtoId(13) val eAppType: Int = 0, - @ProtoId(14) val ifGetDOVId: Byte? = null, - @ProtoId(15) val ifGetBothFlag: Byte? = null, - @ProtoId(16) val vec0xd50Req: ByteArray? = null, - @ProtoId(17) val vec0xd6bReq: ByteArray? = null, - @ProtoId(18) val vecSnsTypelist: List? = null + @SerialId(0) val reqtype: Int? = null, + @SerialId(1) val ifReflush: Byte? = null, + @SerialId(2) val uin: Long? = null, + @SerialId(3) val startIndex: Short? = null, + @SerialId(4) val getfriendCount: Short? = null, + @SerialId(5) val groupid: Byte? = null, + @SerialId(6) val ifGetGroupInfo: Byte? = null, + @SerialId(7) val groupstartIndex: Byte? = null, + @SerialId(8) val getgroupCount: Byte? = null, + @SerialId(9) val ifGetMSFGroup: Byte? = null, + @SerialId(10) val ifShowTermType: Byte? = null, + @SerialId(11) val version: Long? = null, + @SerialId(12) val uinList: List? = null, + @SerialId(13) val eAppType: Int = 0, + @SerialId(14) val ifGetDOVId: Byte? = null, + @SerialId(15) val ifGetBothFlag: Byte? = null, + @SerialId(16) val vec0xd50Req: ByteArray? = null, + @SerialId(17) val vec0xd6bReq: ByteArray? = null, + @SerialId(18) val vecSnsTypelist: List? = null ) : JceStruct @Serializable internal class GetFriendListResp( - @ProtoId(0) val reqtype: Int, - @ProtoId(1) val ifReflush: Byte, - @ProtoId(2) val uin: Long, - @ProtoId(3) val startIndex: Short, - @ProtoId(4) val getfriendCount: Short, - @ProtoId(5) val totoalFriendCount: Short, - @ProtoId(6) val friendCount: Short, - @ProtoId(7) val vecFriendInfo: List? = null, - @ProtoId(8) val groupid: Byte? = null, - @ProtoId(9) val ifGetGroupInfo: Byte, - @ProtoId(10) val groupstartIndex: Byte? = null, - @ProtoId(11) val getgroupCount: Byte? = null, - @ProtoId(12) val totoalGroupCount: Short? = null, - @ProtoId(13) val groupCount: Byte? = null, - @ProtoId(14) val vecGroupInfo: List? = null, - @ProtoId(15) val result: Int, - @ProtoId(16) val errorCode: Short? = null, - @ProtoId(17) val onlineFriendCount: Short? = null, - @ProtoId(18) val serverTime: Long? = null, - @ProtoId(19) val sqqOnLineCount: Short? = null, - @ProtoId(20) val vecMSFGroupInfo: List? = null, - @ProtoId(21) val respType: Byte? = null, - @ProtoId(22) val hasOtherRespFlag: Byte? = null, - @ProtoId(23) val stSelfInfo: FriendInfo? = null, - @ProtoId(24) val showPcIcon: Byte? = null, - @ProtoId(25) val wGetExtSnsRspCode: Short? = null, - @ProtoId(26) val stSubSrvRspCode: FriendListSubSrvRspCode? = null + @SerialId(0) val reqtype: Int, + @SerialId(1) val ifReflush: Byte, + @SerialId(2) val uin: Long, + @SerialId(3) val startIndex: Short, + @SerialId(4) val getfriendCount: Short, + @SerialId(5) val totoalFriendCount: Short, + @SerialId(6) val friendCount: Short, + @SerialId(7) val vecFriendInfo: List? = null, + @SerialId(8) val groupid: Byte? = null, + @SerialId(9) val ifGetGroupInfo: Byte, + @SerialId(10) val groupstartIndex: Byte? = null, + @SerialId(11) val getgroupCount: Byte? = null, + @SerialId(12) val totoalGroupCount: Short? = null, + @SerialId(13) val groupCount: Byte? = null, + @SerialId(14) val vecGroupInfo: List? = null, + @SerialId(15) val result: Int, + @SerialId(16) val errorCode: Short? = null, + @SerialId(17) val onlineFriendCount: Short? = null, + @SerialId(18) val serverTime: Long? = null, + @SerialId(19) val sqqOnLineCount: Short? = null, + @SerialId(20) val vecMSFGroupInfo: List? = null, + @SerialId(21) val respType: Byte? = null, + @SerialId(22) val hasOtherRespFlag: Byte? = null, + @SerialId(23) val stSelfInfo: FriendInfo? = null, + @SerialId(24) val showPcIcon: Byte? = null, + @SerialId(25) val wGetExtSnsRspCode: Short? = null, + @SerialId(26) val stSubSrvRspCode: FriendListSubSrvRspCode? = null ) : JceStruct @Serializable internal class FriendListSubSrvRspCode( - @ProtoId(0) val wGetMutualMarkRspCode: Short? = null, - @ProtoId(1) val wGetIntimateInfoRspCode: Short? = null + @SerialId(0) val wGetMutualMarkRspCode: Short? = null, + @SerialId(1) val wGetIntimateInfoRspCode: Short? = null ) : JceStruct @Serializable internal class FriendInfo( - @ProtoId(0) val friendUin: Long, - @ProtoId(1) val groupId: Byte, - @ProtoId(2) val faceId: Short, - @ProtoId(3) val remark: String = "", - @ProtoId(4) val sqqtype: Byte, - @ProtoId(5) val status: Byte = 20, - @ProtoId(6) val memberLevel: Byte? = null, - @ProtoId(7) val isMqqOnLine: Byte? = null, - @ProtoId(8) val sqqOnLineState: Byte? = null, - @ProtoId(9) val isIphoneOnline: Byte? = null, - @ProtoId(10) val detalStatusFlag: Byte? = null, - @ProtoId(11) val sqqOnLineStateV2: Byte? = null, - @ProtoId(12) val sShowName: String? = "", - @ProtoId(13) val isRemark: Byte? = null, - @ProtoId(14) val nick: String? = "", - @ProtoId(15) val specialFlag: Byte? = null, - @ProtoId(16) val vecIMGroupID: ByteArray? = null, - @ProtoId(17) val vecMSFGroupID: ByteArray? = null, - @ProtoId(18) val iTermType: Int? = null, - @ProtoId(19) val oVipInfo: VipBaseInfo? = null, - @ProtoId(20) val network: Byte? = null, - @ProtoId(21) val vecRing: ByteArray? = null, - @ProtoId(22) val uAbiFlag: Long? = null, - @ProtoId(23) val ulFaceAddonId: Long? = null, - @ProtoId(24) val eNetworkType: Int? = 0, - @ProtoId(25) val uVipFont: Long? = null, - @ProtoId(26) val eIconType: Int? = 0, - @ProtoId(27) val termDesc: String? = "", - @ProtoId(28) val uColorRing: Long? = null, - @ProtoId(29) val apolloFlag: Byte? = null, - @ProtoId(30) val uApolloTimestamp: Long? = null, - @ProtoId(31) val sex: Byte? = null, - @ProtoId(32) val uFounderFont: Long? = null, - @ProtoId(33) val eimId: String? = "", - @ProtoId(34) val eimMobile: String? = "", - @ProtoId(35) val olympicTorch: Byte? = null, - @ProtoId(36) val uApolloSignTime: Long? = null, - @ProtoId(37) val uLaviUin: Long? = null, - @ProtoId(38) val uTagUpdateTime: Long? = null, - @ProtoId(39) val uGameLastLoginTime: Long? = null, - @ProtoId(40) val uGameAppid: Long? = null, - @ProtoId(41) val vecCardID: ByteArray? = null, - @ProtoId(42) val ulBitSet: Long? = null, - @ProtoId(43) val kingOfGloryFlag: Byte? = null, - @ProtoId(44) val ulKingOfGloryRank: Long? = null, - @ProtoId(45) val masterUin: String? = "", - @ProtoId(46) val uLastMedalUpdateTime: Long? = null, - @ProtoId(47) val uFaceStoreId: Long? = null, - @ProtoId(48) val uFontEffect: Long? = null, - @ProtoId(49) val sDOVId: String? = "", - @ProtoId(50) val uBothFlag: Long? = null, - @ProtoId(51) val centiShow3DFlag: Byte? = null, - @ProtoId(52) val vecIntimateInfo: ByteArray? = null, - @ProtoId(53) val showNameplate: Byte? = null, - @ProtoId(54) val newLoverDiamondFlag: Byte? = null, - @ProtoId(55) val vecExtSnsFrdData: ByteArray? = null, - @ProtoId(56) val vecMutualMarkData: ByteArray? = null + @SerialId(0) val friendUin: Long, + @SerialId(1) val groupId: Byte, + @SerialId(2) val faceId: Short, + @SerialId(3) val remark: String = "", + @SerialId(4) val sqqtype: Byte, + @SerialId(5) val status: Byte = 20, + @SerialId(6) val memberLevel: Byte? = null, + @SerialId(7) val isMqqOnLine: Byte? = null, + @SerialId(8) val sqqOnLineState: Byte? = null, + @SerialId(9) val isIphoneOnline: Byte? = null, + @SerialId(10) val detalStatusFlag: Byte? = null, + @SerialId(11) val sqqOnLineStateV2: Byte? = null, + @SerialId(12) val sShowName: String? = "", + @SerialId(13) val isRemark: Byte? = null, + @SerialId(14) val nick: String? = "", + @SerialId(15) val specialFlag: Byte? = null, + @SerialId(16) val vecIMGroupID: ByteArray? = null, + @SerialId(17) val vecMSFGroupID: ByteArray? = null, + @SerialId(18) val iTermType: Int? = null, + @SerialId(19) val oVipInfo: VipBaseInfo? = null, + @SerialId(20) val network: Byte? = null, + @SerialId(21) val vecRing: ByteArray? = null, + @SerialId(22) val uAbiFlag: Long? = null, + @SerialId(23) val ulFaceAddonId: Long? = null, + @SerialId(24) val eNetworkType: Int? = 0, + @SerialId(25) val uVipFont: Long? = null, + @SerialId(26) val eIconType: Int? = 0, + @SerialId(27) val termDesc: String? = "", + @SerialId(28) val uColorRing: Long? = null, + @SerialId(29) val apolloFlag: Byte? = null, + @SerialId(30) val uApolloTimestamp: Long? = null, + @SerialId(31) val sex: Byte? = null, + @SerialId(32) val uFounderFont: Long? = null, + @SerialId(33) val eimId: String? = "", + @SerialId(34) val eimMobile: String? = "", + @SerialId(35) val olympicTorch: Byte? = null, + @SerialId(36) val uApolloSignTime: Long? = null, + @SerialId(37) val uLaviUin: Long? = null, + @SerialId(38) val uTagUpdateTime: Long? = null, + @SerialId(39) val uGameLastLoginTime: Long? = null, + @SerialId(40) val uGameAppid: Long? = null, + @SerialId(41) val vecCardID: ByteArray? = null, + @SerialId(42) val ulBitSet: Long? = null, + @SerialId(43) val kingOfGloryFlag: Byte? = null, + @SerialId(44) val ulKingOfGloryRank: Long? = null, + @SerialId(45) val masterUin: String? = "", + @SerialId(46) val uLastMedalUpdateTime: Long? = null, + @SerialId(47) val uFaceStoreId: Long? = null, + @SerialId(48) val uFontEffect: Long? = null, + @SerialId(49) val sDOVId: String? = "", + @SerialId(50) val uBothFlag: Long? = null, + @SerialId(51) val centiShow3DFlag: Byte? = null, + @SerialId(52) val vecIntimateInfo: ByteArray? = null, + @SerialId(53) val showNameplate: Byte? = null, + @SerialId(54) val newLoverDiamondFlag: Byte? = null, + @SerialId(55) val vecExtSnsFrdData: ByteArray? = null, + @SerialId(56) val vecMutualMarkData: ByteArray? = null ) : JceStruct @Serializable internal class VipBaseInfo( - @ProtoId(0) val mOpenInfo: Map + @SerialId(0) val mOpenInfo: Map ) : JceStruct @Serializable internal class VipOpenInfo( - @ProtoId(0) val open: Boolean, - @ProtoId(1) val iVipType: Int = -1, - @ProtoId(2) val iVipLevel: Int = -1, - @ProtoId(3) val iVipFlag: Int? = null, - @ProtoId(4) val nameplateId: Long? = null + @SerialId(0) val open: Boolean, + @SerialId(1) val iVipType: Int = -1, + @SerialId(2) val iVipLevel: Int = -1, + @SerialId(3) val iVipFlag: Int? = null, + @SerialId(4) val nameplateId: Long? = null ) : JceStruct @Serializable internal class GroupInfo( - @ProtoId(0) val groupId: Byte, - @ProtoId(1) val groupname: String = "", - @ProtoId(2) val friendCount: Int, - @ProtoId(3) val onlineFriendCount: Int, - @ProtoId(4) val seqid: Byte? = null, - @ProtoId(5) val sqqOnLineCount: Int? = null + @SerialId(0) val groupId: Byte, + @SerialId(1) val groupname: String = "", + @SerialId(2) val friendCount: Int, + @SerialId(3) val onlineFriendCount: Int, + @SerialId(4) val seqid: Byte? = null, + @SerialId(5) val sqqOnLineCount: Int? = null ) : JceStruct diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/OnlinePushPack.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/OnlinePushPack.kt index 7bb9cfd16..7fc67599d 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/OnlinePushPack.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/OnlinePushPack.kt @@ -9,250 +9,250 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce +import kotlinx.serialization.SerialId import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId import net.mamoe.mirai.qqandroid.io.JceStruct internal class OnlinePushPack { @Serializable internal class DelMsgInfo( - @ProtoId(0) val fromUin: Long, - @ProtoId(1) val uMsgTime: Long, - @ProtoId(2) val shMsgSeq: Short, - @ProtoId(3) val vMsgCookies: ByteArray? = null, - @ProtoId(4) val wCmd: Short? = null, - @ProtoId(5) val uMsgType: Long? = null, - @ProtoId(6) val uAppId: Long? = null, - @ProtoId(7) val sendTime: Long? = null, - @ProtoId(8) val ssoSeq: Int? = null, - @ProtoId(9) val ssoIp: Int? = null, - @ProtoId(10) val clientIp: Int? = null + @SerialId(0) val fromUin: Long, + @SerialId(1) val uMsgTime: Long, + @SerialId(2) val shMsgSeq: Short, + @SerialId(3) val vMsgCookies: ByteArray? = null, + @SerialId(4) val wCmd: Short? = null, + @SerialId(5) val uMsgType: Long? = null, + @SerialId(6) val uAppId: Long? = null, + @SerialId(7) val sendTime: Long? = null, + @SerialId(8) val ssoSeq: Int? = null, + @SerialId(9) val ssoIp: Int? = null, + @SerialId(10) val clientIp: Int? = null ) : JceStruct @Serializable internal class DeviceInfo( - @ProtoId(0) val netType: Byte? = null, - @ProtoId(1) val devType: String? = "", - @ProtoId(2) val oSVer: String? = "", - @ProtoId(3) val vendorName: String? = "", - @ProtoId(4) val vendorOSName: String? = "", - @ProtoId(5) val iOSIdfa: String? = "" + @SerialId(0) val netType: Byte? = null, + @SerialId(1) val devType: String? = "", + @SerialId(2) val oSVer: String? = "", + @SerialId(3) val vendorName: String? = "", + @SerialId(4) val vendorOSName: String? = "", + @SerialId(5) val iOSIdfa: String? = "" ) : JceStruct @Serializable internal class Name( - @ProtoId(0) val fromUin: Long, - @ProtoId(1) val uMsgTime: Long, - @ProtoId(2) val shMsgType: Short, - @ProtoId(3) val shMsgSeq: Short, - @ProtoId(4) val msg: String = "", - @ProtoId(5) val uRealMsgTime: Int? = null, - @ProtoId(6) val vMsg: ByteArray? = null, - @ProtoId(7) val uAppShareID: Long? = null, - @ProtoId(8) val vMsgCookies: ByteArray? = null, - @ProtoId(9) val vAppShareCookie: ByteArray? = null, - @ProtoId(10) val msgUid: Long? = null, - @ProtoId(11) val lastChangeTime: Long? = 1L, - @ProtoId(12) val vCPicInfo: List? = null, - @ProtoId(13) val stShareData: ShareData? = null, - @ProtoId(14) val fromInstId: Long? = null, - @ProtoId(15) val vRemarkOfSender: ByteArray? = null, - @ProtoId(16) val fromMobile: String? = "", - @ProtoId(17) val fromName: String? = "", - @ProtoId(18) val vNickName: List? = null, - @ProtoId(19) val stC2CTmpMsgHead: TempMsgHead? = null + @SerialId(0) val fromUin: Long, + @SerialId(1) val uMsgTime: Long, + @SerialId(2) val shMsgType: Short, + @SerialId(3) val shMsgSeq: Short, + @SerialId(4) val msg: String = "", + @SerialId(5) val uRealMsgTime: Int? = null, + @SerialId(6) val vMsg: ByteArray? = null, + @SerialId(7) val uAppShareID: Long? = null, + @SerialId(8) val vMsgCookies: ByteArray? = null, + @SerialId(9) val vAppShareCookie: ByteArray? = null, + @SerialId(10) val msgUid: Long? = null, + @SerialId(11) val lastChangeTime: Long? = 1L, + @SerialId(12) val vCPicInfo: List? = null, + @SerialId(13) val stShareData: ShareData? = null, + @SerialId(14) val fromInstId: Long? = null, + @SerialId(15) val vRemarkOfSender: ByteArray? = null, + @SerialId(16) val fromMobile: String? = "", + @SerialId(17) val fromName: String? = "", + @SerialId(18) val vNickName: List? = null, + @SerialId(19) val stC2CTmpMsgHead: TempMsgHead? = null ) : JceStruct @Serializable internal class SvcReqPushMsg( - @ProtoId(0) val uin: Long, - @ProtoId(1) val uMsgTime: Long, - @ProtoId(2) val vMsgInfos: List, - @ProtoId(3) val svrip: Int? = 0, - @ProtoId(4) val vSyncCookie: ByteArray? = null, - @ProtoId(5) val vUinPairMsg: List? = null, - @ProtoId(6) val mPreviews: Map? = null + @SerialId(0) val uin: Long, + @SerialId(1) val uMsgTime: Long, + @SerialId(2) val vMsgInfos: List, + @SerialId(3) val svrip: Int? = 0, + @SerialId(4) val vSyncCookie: ByteArray? = null, + @SerialId(5) val vUinPairMsg: List? = null, + @SerialId(6) val mPreviews: Map? = null // @SerialId(7) val wUserActive: Int? = null, //@SerialId(12) val wGeneralFlag: Int? = null ) : JceStruct @Serializable internal class SvcRespPushMsg( - @ProtoId(0) val uin: Long, - @ProtoId(1) val vDelInfos: List, - @ProtoId(2) val svrip: Int, - @ProtoId(3) val pushToken: ByteArray? = null, - @ProtoId(4) val serviceType: Int? = null, - @ProtoId(5) val deviceInfo: DeviceInfo? = null + @SerialId(0) val uin: Long, + @SerialId(1) val vDelInfos: List, + @SerialId(2) val svrip: Int, + @SerialId(3) val pushToken: ByteArray? = null, + @SerialId(4) val serviceType: Int? = null, + @SerialId(5) val deviceInfo: DeviceInfo? = null ) : JceStruct @Serializable internal class UinPairMsg( - @ProtoId(1) val uLastReadTime: Long? = null, - @ProtoId(2) val peerUin: Long? = null, - @ProtoId(3) val uMsgCompleted: Long? = null, - @ProtoId(4) val vMsgInfos: List? = null + @SerialId(1) val uLastReadTime: Long? = null, + @SerialId(2) val peerUin: Long? = null, + @SerialId(3) val uMsgCompleted: Long? = null, + @SerialId(4) val vMsgInfos: List? = null ) : JceStruct @Serializable internal class MsgType0x210( - @ProtoId(0) val uSubMsgType: Long, - @ProtoId(1) val stMsgInfo0x2: MsgType0x210SubMsgType0x2? = null, - @ProtoId(3) val stMsgInfo0xa: MsgType0x210SubMsgType0xa? = null, - @ProtoId(4) val stMsgInfo0xe: MsgType0x210SubMsgType0xe? = null, - @ProtoId(5) val stMsgInfo0x13: MsgType0x210SubMsgType0x13? = null, - @ProtoId(6) val stMsgInfo0x17: MsgType0x210SubMsgType0x17? = null, - @ProtoId(7) val stMsgInfo0x20: MsgType0x210SubMsgType0x20? = null, - @ProtoId(8) val stMsgInfo0x1d: MsgType0x210SubMsgType0x1d? = null, - @ProtoId(9) val stMsgInfo0x24: MsgType0x210SubMsgType0x24? = null, - @ProtoId(10) val vProtobuf: ByteArray? = null + @SerialId(0) val uSubMsgType: Long, + @SerialId(1) val stMsgInfo0x2: MsgType0x210SubMsgType0x2? = null, + @SerialId(3) val stMsgInfo0xa: MsgType0x210SubMsgType0xa? = null, + @SerialId(4) val stMsgInfo0xe: MsgType0x210SubMsgType0xe? = null, + @SerialId(5) val stMsgInfo0x13: MsgType0x210SubMsgType0x13? = null, + @SerialId(6) val stMsgInfo0x17: MsgType0x210SubMsgType0x17? = null, + @SerialId(7) val stMsgInfo0x20: MsgType0x210SubMsgType0x20? = null, + @SerialId(8) val stMsgInfo0x1d: MsgType0x210SubMsgType0x1d? = null, + @SerialId(9) val stMsgInfo0x24: MsgType0x210SubMsgType0x24? = null, + @SerialId(10) val vProtobuf: ByteArray? = null ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0x13( - @ProtoId(0) val uint32SrcAppId: Long? = null, - @ProtoId(1) val uint32SrcInstId: Long? = null, - @ProtoId(2) val uint32DstAppId: Long? = null, - @ProtoId(3) val uint32DstInstId: Long? = null, - @ProtoId(4) val uint64DstUin: Long? = null, - @ProtoId(5) val uint64Sessionid: Long? = null, - @ProtoId(6) val uint32Size: Long? = null, - @ProtoId(7) val uint32Index: Long? = null, - @ProtoId(8) val uint32Type: Long? = null, - @ProtoId(9) val buf: ByteArray? = null + @SerialId(0) val uint32SrcAppId: Long? = null, + @SerialId(1) val uint32SrcInstId: Long? = null, + @SerialId(2) val uint32DstAppId: Long? = null, + @SerialId(3) val uint32DstInstId: Long? = null, + @SerialId(4) val uint64DstUin: Long? = null, + @SerialId(5) val uint64Sessionid: Long? = null, + @SerialId(6) val uint32Size: Long? = null, + @SerialId(7) val uint32Index: Long? = null, + @SerialId(8) val uint32Type: Long? = null, + @SerialId(9) val buf: ByteArray? = null ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0x17( - @ProtoId(0) val dwOpType: Long? = null, - @ProtoId(1) val stAddGroup: AddGroup? = null, - @ProtoId(2) val stDelGroup: DelGroup? = null, - @ProtoId(3) val stModGroupName: ModGroupName? = null, - @ProtoId(4) val stModGroupSort: ModGroupSort? = null, - @ProtoId(5) val stModFriendGroup: ModFriendGroup? = null + @SerialId(0) val dwOpType: Long? = null, + @SerialId(1) val stAddGroup: AddGroup? = null, + @SerialId(2) val stDelGroup: DelGroup? = null, + @SerialId(3) val stModGroupName: ModGroupName? = null, + @SerialId(4) val stModGroupSort: ModGroupSort? = null, + @SerialId(5) val stModFriendGroup: ModFriendGroup? = null ) : JceStruct @Serializable internal class AddGroup( - @ProtoId(0) val dwGroupID: Long? = null, - @ProtoId(1) val dwSortID: Long? = null, - @ProtoId(2) val groupName: String? = "" + @SerialId(0) val dwGroupID: Long? = null, + @SerialId(1) val dwSortID: Long? = null, + @SerialId(2) val groupName: String? = "" ) : JceStruct @Serializable internal class DelGroup( - @ProtoId(0) val dwGroupID: Long? = null + @SerialId(0) val dwGroupID: Long? = null ) : JceStruct @Serializable internal class ModFriendGroup( - @ProtoId(0) val vMsgFrdGroup: List? = null + @SerialId(0) val vMsgFrdGroup: List? = null ) : JceStruct @Serializable internal class FriendGroup( - @ProtoId(0) val dwFuin: Long? = null, - @ProtoId(1) val vOldGroupID: List? = null, - @ProtoId(2) val vNewGroupID: List? = null + @SerialId(0) val dwFuin: Long? = null, + @SerialId(1) val vOldGroupID: List? = null, + @SerialId(2) val vNewGroupID: List? = null ) : JceStruct @Serializable internal class ModGroupName( - @ProtoId(0) val dwGroupID: Long? = null, - @ProtoId(1) val groupName: String? = "" + @SerialId(0) val dwGroupID: Long? = null, + @SerialId(1) val groupName: String? = "" ) : JceStruct @Serializable internal class ModGroupSort( - @ProtoId(0) val vMsgGroupSort: List? = null + @SerialId(0) val vMsgGroupSort: List? = null ) : JceStruct @Serializable internal class GroupSort( - @ProtoId(0) val dwGroupID: Long? = null, - @ProtoId(1) val dwSortID: Long? = null + @SerialId(0) val dwGroupID: Long? = null, + @SerialId(1) val dwSortID: Long? = null ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0x1d( - @ProtoId(0) val dwOpType: Long? = null, - @ProtoId(1) val dwUin: Long? = null, - @ProtoId(2) val dwID: Long? = null, - @ProtoId(3) val value: String? = "" + @SerialId(0) val dwOpType: Long? = null, + @SerialId(1) val dwUin: Long? = null, + @SerialId(2) val dwID: Long? = null, + @SerialId(3) val value: String? = "" ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0x2( - @ProtoId(0) val uSrcAppId: Long? = null, - @ProtoId(1) val uSrcInstId: Long? = null, - @ProtoId(2) val uDstAppId: Long? = null, - @ProtoId(3) val uDstInstId: Long? = null, - @ProtoId(4) val uDstUin: Long? = null, - @ProtoId(5) val fileName: ByteArray? = null, - @ProtoId(6) val fileIndex: ByteArray? = null, - @ProtoId(7) val fileMd5: ByteArray? = null, - @ProtoId(8) val fileKey: ByteArray? = null, - @ProtoId(9) val uServerIp: Long? = null, - @ProtoId(10) val uServerPort: Long? = null, - @ProtoId(11) val fileLen: Long? = null, - @ProtoId(12) val sessionId: Long? = null, - @ProtoId(13) val originfileMd5: ByteArray? = null, - @ProtoId(14) val uOriginfiletype: Long? = null, - @ProtoId(15) val uSeq: Long? = null + @SerialId(0) val uSrcAppId: Long? = null, + @SerialId(1) val uSrcInstId: Long? = null, + @SerialId(2) val uDstAppId: Long? = null, + @SerialId(3) val uDstInstId: Long? = null, + @SerialId(4) val uDstUin: Long? = null, + @SerialId(5) val fileName: ByteArray? = null, + @SerialId(6) val fileIndex: ByteArray? = null, + @SerialId(7) val fileMd5: ByteArray? = null, + @SerialId(8) val fileKey: ByteArray? = null, + @SerialId(9) val uServerIp: Long? = null, + @SerialId(10) val uServerPort: Long? = null, + @SerialId(11) val fileLen: Long? = null, + @SerialId(12) val sessionId: Long? = null, + @SerialId(13) val originfileMd5: ByteArray? = null, + @SerialId(14) val uOriginfiletype: Long? = null, + @SerialId(15) val uSeq: Long? = null ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0x20( - @ProtoId(0) val dwOpType: Long? = null, - @ProtoId(1) val dwType: Long? = null, - @ProtoId(2) val dwUin: Long? = null, - @ProtoId(3) val remaek: String? = "" + @SerialId(0) val dwOpType: Long? = null, + @SerialId(1) val dwType: Long? = null, + @SerialId(2) val dwUin: Long? = null, + @SerialId(3) val remaek: String? = "" ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0x24( - @ProtoId(0) val vPluginNumList: List? = null + @SerialId(0) val vPluginNumList: List? = null ) : JceStruct @Serializable internal class PluginNum( - @ProtoId(0) val dwID: Long? = null, - @ProtoId(1) val dwNUm: Long? = null, - @ProtoId(2) val flag: Byte? = null + @SerialId(0) val dwID: Long? = null, + @SerialId(1) val dwNUm: Long? = null, + @SerialId(2) val flag: Byte? = null ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0xa( - @ProtoId(0) val uSrcAppId: Long? = null, - @ProtoId(1) val uSrcInstId: Long? = null, - @ProtoId(2) val uDstAppId: Long? = null, - @ProtoId(3) val uDstInstId: Long? = null, - @ProtoId(4) val uDstUin: Long? = null, - @ProtoId(5) val uType: Long? = null, - @ProtoId(6) val uServerIp: Long? = null, - @ProtoId(7) val uServerPort: Long? = null, - @ProtoId(8) val vUrlNotify: ByteArray? = null, - @ProtoId(9) val vTokenKey: ByteArray? = null, - @ProtoId(10) val uFileLen: Long? = null, - @ProtoId(11) val fileName: ByteArray? = null, - @ProtoId(12) val vMd5: ByteArray? = null, - @ProtoId(13) val sessionId: Long? = null, - @ProtoId(14) val originfileMd5: ByteArray? = null, - @ProtoId(15) val uOriginfiletype: Long? = null, - @ProtoId(16) val uSeq: Long? = null + @SerialId(0) val uSrcAppId: Long? = null, + @SerialId(1) val uSrcInstId: Long? = null, + @SerialId(2) val uDstAppId: Long? = null, + @SerialId(3) val uDstInstId: Long? = null, + @SerialId(4) val uDstUin: Long? = null, + @SerialId(5) val uType: Long? = null, + @SerialId(6) val uServerIp: Long? = null, + @SerialId(7) val uServerPort: Long? = null, + @SerialId(8) val vUrlNotify: ByteArray? = null, + @SerialId(9) val vTokenKey: ByteArray? = null, + @SerialId(10) val uFileLen: Long? = null, + @SerialId(11) val fileName: ByteArray? = null, + @SerialId(12) val vMd5: ByteArray? = null, + @SerialId(13) val sessionId: Long? = null, + @SerialId(14) val originfileMd5: ByteArray? = null, + @SerialId(15) val uOriginfiletype: Long? = null, + @SerialId(16) val uSeq: Long? = null ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0xe( - @ProtoId(0) val uint32SrcAppId: Long? = null, - @ProtoId(1) val uint32SrcInstId: Long? = null, - @ProtoId(2) val uint32DstAppId: Long? = null, - @ProtoId(3) val uint32DstInstId: Long? = null, - @ProtoId(4) val uint64DstUin: Long? = null, - @ProtoId(5) val uint64Sessionid: Long? = null, - @ProtoId(6) val uint32Operate: Long? = null, - @ProtoId(7) val uint32Seq: Long? = null, - @ProtoId(8) val uint32Code: Long? = null, - @ProtoId(9) val msg: String? = "" + @SerialId(0) val uint32SrcAppId: Long? = null, + @SerialId(1) val uint32SrcInstId: Long? = null, + @SerialId(2) val uint32DstAppId: Long? = null, + @SerialId(3) val uint32DstInstId: Long? = null, + @SerialId(4) val uint64DstUin: Long? = null, + @SerialId(5) val uint64Sessionid: Long? = null, + @SerialId(6) val uint32Operate: Long? = null, + @SerialId(7) val uint32Seq: Long? = null, + @SerialId(8) val uint32Code: Long? = null, + @SerialId(9) val msg: String? = "" ) : JceStruct } \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt index 295a3cc1b..5547f798f 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt @@ -9,8 +9,8 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce +import kotlinx.serialization.SerialId import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId import net.mamoe.mirai.data.Packet import net.mamoe.mirai.qqandroid.io.JceStruct import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY @@ -18,63 +18,63 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY @Suppress("ArrayInDataClass") @Serializable internal data class RequestPushNotify( - @ProtoId(0) val uin: Long? = 0L, - @ProtoId(1) val ctype: Byte = 0, - @ProtoId(2) val strService: String?, - @ProtoId(3) val strCmd: String?, - @ProtoId(4) val vNotifyCookie: ByteArray? = EMPTY_BYTE_ARRAY, - @ProtoId(5) val usMsgType: Int?, - @ProtoId(6) val wUserActive: Int?, - @ProtoId(7) val wGeneralFlag: Int?, - @ProtoId(8) val bindedUin: Long?, - @ProtoId(9) val stMsgInfo: MsgInfo?, - @ProtoId(10) val msgCtrlBuf: String?, - @ProtoId(11) val serverBuf: ByteArray?, - @ProtoId(12) val pingFlag: Long?, - @ProtoId(13) val svrip: Int? + @SerialId(0) val uin: Long? = 0L, + @SerialId(1) val ctype: Byte = 0, + @SerialId(2) val strService: String?, + @SerialId(3) val strCmd: String?, + @SerialId(4) val vNotifyCookie: ByteArray? = EMPTY_BYTE_ARRAY, + @SerialId(5) val usMsgType: Int?, + @SerialId(6) val wUserActive: Int?, + @SerialId(7) val wGeneralFlag: Int?, + @SerialId(8) val bindedUin: Long?, + @SerialId(9) val stMsgInfo: MsgInfo?, + @SerialId(10) val msgCtrlBuf: String?, + @SerialId(11) val serverBuf: ByteArray?, + @SerialId(12) val pingFlag: Long?, + @SerialId(13) val svrip: Int? ) : JceStruct, Packet @Serializable internal class MsgInfo( - @ProtoId(0) val lFromUin: Long? = 0L, - @ProtoId(1) val uMsgTime: Long? = 0L, - @ProtoId(2) val shMsgType: Short, - @ProtoId(3) val shMsgSeq: Short, - @ProtoId(4) val strMsg: String?, - @ProtoId(5) val uRealMsgTime: Int?, - @ProtoId(6) val vMsg: ByteArray?, - @ProtoId(7) val uAppShareID: Long?, - @ProtoId(8) val vMsgCookies: ByteArray? = EMPTY_BYTE_ARRAY, - @ProtoId(9) val vAppShareCookie: ByteArray? = EMPTY_BYTE_ARRAY, - @ProtoId(10) val lMsgUid: Long?, - @ProtoId(11) val lLastChangeTime: Long?, - @ProtoId(12) val vCPicInfo: List?, - @ProtoId(13) val stShareData: ShareData?, - @ProtoId(14) val lFromInstId: Long?, - @ProtoId(15) val vRemarkOfSender: ByteArray?, - @ProtoId(16) val strFromMobile: String?, - @ProtoId(17) val strFromName: String?, - @ProtoId(18) val vNickName: List?//, + @SerialId(0) val lFromUin: Long? = 0L, + @SerialId(1) val uMsgTime: Long? = 0L, + @SerialId(2) val shMsgType: Short, + @SerialId(3) val shMsgSeq: Short, + @SerialId(4) val strMsg: String?, + @SerialId(5) val uRealMsgTime: Int?, + @SerialId(6) val vMsg: ByteArray?, + @SerialId(7) val uAppShareID: Long?, + @SerialId(8) val vMsgCookies: ByteArray? = EMPTY_BYTE_ARRAY, + @SerialId(9) val vAppShareCookie: ByteArray? = EMPTY_BYTE_ARRAY, + @SerialId(10) val lMsgUid: Long?, + @SerialId(11) val lLastChangeTime: Long?, + @SerialId(12) val vCPicInfo: List?, + @SerialId(13) val stShareData: ShareData?, + @SerialId(14) val lFromInstId: Long?, + @SerialId(15) val vRemarkOfSender: ByteArray?, + @SerialId(16) val strFromMobile: String?, + @SerialId(17) val strFromName: String?, + @SerialId(18) val vNickName: List?//, //@SerialId(19) val stC2CTmpMsgHead: TempMsgHead? ) : JceStruct @Serializable internal class ShareData( - @ProtoId(0) val pkgname: String = "", - @ProtoId(1) val msgtail: String = "", - @ProtoId(2) val picurl: String = "", - @ProtoId(3) val url: String = "" + @SerialId(0) val pkgname: String = "", + @SerialId(1) val msgtail: String = "", + @SerialId(2) val picurl: String = "", + @SerialId(3) val url: String = "" ) : JceStruct @Serializable internal class TempMsgHead( - @ProtoId(0) val c2c_type: Int? = 0, - @ProtoId(1) val serviceType: Int? = 0 + @SerialId(0) val c2c_type: Int? = 0, + @SerialId(1) val serviceType: Int? = 0 ) : JceStruct @Serializable internal class CPicInfo( - @ProtoId(0) val vPath: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(1) val vHost: ByteArray? = EMPTY_BYTE_ARRAY + @SerialId(0) val vPath: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(1) val vHost: ByteArray? = EMPTY_BYTE_ARRAY ) : JceStruct \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPacket.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPacket.kt index 7d2f6d1d9..427ed6800 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPacket.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPacket.kt @@ -9,8 +9,8 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce +import kotlinx.serialization.SerialId import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId import net.mamoe.mirai.qqandroid.io.JceStruct import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY @@ -18,29 +18,29 @@ private val EMPTY_MAP = mapOf() @Serializable internal class RequestPacket( - @ProtoId(1) val iVersion: Short = 3, - @ProtoId(2) val cPacketType: Byte = 0, - @ProtoId(3) val iMessageType: Int = 0, - @ProtoId(4) val iRequestId: Int, - @ProtoId(5) val sServantName: String = "", - @ProtoId(6) val sFuncName: String = "", - @ProtoId(7) val sBuffer: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) val iTimeout: Int? = 0, - @ProtoId(9) val context: Map? = EMPTY_MAP, - @ProtoId(10) val status: Map? = EMPTY_MAP + @SerialId(1) val iVersion: Short = 3, + @SerialId(2) val cPacketType: Byte = 0, + @SerialId(3) val iMessageType: Int = 0, + @SerialId(4) val iRequestId: Int, + @SerialId(5) val sServantName: String = "", + @SerialId(6) val sFuncName: String = "", + @SerialId(7) val sBuffer: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(8) val iTimeout: Int? = 0, + @SerialId(9) val context: Map? = EMPTY_MAP, + @SerialId(10) val status: Map? = EMPTY_MAP ) : JceStruct @Serializable internal class RequestDataVersion3( - @ProtoId(0) val map: Map // 注意: ByteArray 不能直接放序列化的 JceStruct!! 要放类似 RequestDataStructSvcReqRegister 的 + @SerialId(0) val map: Map // 注意: ByteArray 不能直接放序列化的 JceStruct!! 要放类似 RequestDataStructSvcReqRegister 的 ) : JceStruct @Serializable internal class RequestDataVersion2( - @ProtoId(0) val map: Map> + @SerialId(0) val map: Map> ) : JceStruct @Serializable internal class RequestDataStructSvcReqRegister( - @ProtoId(0) val struct: SvcReqRegister + @SerialId(0) val struct: SvcReqRegister ) : JceStruct \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPushForceOffline.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPushForceOffline.kt index aeba6f1ba..27e71530c 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPushForceOffline.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPushForceOffline.kt @@ -9,14 +9,14 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce +import kotlinx.serialization.SerialId import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId import net.mamoe.mirai.qqandroid.io.JceStruct @Serializable internal class RequestPushForceOffline( - @ProtoId(0) val uin: Long, - @ProtoId(1) val title: String? = "", - @ProtoId(2) val tips: String? = "", - @ProtoId(3) val sameDevice: Byte? = null + @SerialId(0) val uin: Long, + @SerialId(1) val title: String? = "", + @SerialId(2) val tips: String? = "", + @SerialId(3) val sameDevice: Byte? = null ) : JceStruct \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/SvcReqRegister.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/SvcReqRegister.kt index d351d8aea..1b1c23584 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/SvcReqRegister.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/SvcReqRegister.kt @@ -9,47 +9,47 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce +import kotlinx.serialization.SerialId import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId import net.mamoe.mirai.qqandroid.io.JceStruct @Serializable internal class SvcReqRegister( - @ProtoId(0) val lUin: Long = 0L, - @ProtoId(1) val lBid: Long = 0L, - @ProtoId(2) val cConnType: Byte = 0, - @ProtoId(3) val sOther: String = "", - @ProtoId(4) val iStatus: Int = 11, - @ProtoId(5) val bOnlinePush: Byte = 0, - @ProtoId(6) val bIsOnline: Byte = 0, - @ProtoId(7) val bIsShowOnline: Byte = 0, - @ProtoId(8) val bKikPC: Byte = 0, - @ProtoId(9) val bKikWeak: Byte = 0, - @ProtoId(10) val timeStamp: Long = 0L, - @ProtoId(11) val iOSVersion: Long = 0L, - @ProtoId(12) val cNetType: Byte = 0, - @ProtoId(13) val sBuildVer: String? = "", - @ProtoId(14) val bRegType: Byte = 0, - @ProtoId(15) val vecDevParam: ByteArray? = null, - @ProtoId(16) val vecGuid: ByteArray? = null, - @ProtoId(17) val iLocaleID: Int = 2052, - @ProtoId(18) val bSlientPush: Byte = 0, - @ProtoId(19) val strDevName: String? = null, - @ProtoId(20) val strDevType: String? = null, - @ProtoId(21) val strOSVer: String? = null, - @ProtoId(22) val bOpenPush: Byte = 1, - @ProtoId(23) val iLargeSeq: Long = 0L, - @ProtoId(24) val iLastWatchStartTime: Long = 0L, - @ProtoId(26) val uOldSSOIp: Long = 0L, - @ProtoId(27) val uNewSSOIp: Long = 0L, - @ProtoId(28) val sChannelNo: String? = null, - @ProtoId(29) val lCpId: Long = 0L, - @ProtoId(30) val strVendorName: String? = null, - @ProtoId(31) val strVendorOSName: String? = null, - @ProtoId(32) val strIOSIdfa: String? = null, - @ProtoId(33) val bytes_0x769_reqbody: ByteArray? = null, - @ProtoId(34) val bIsSetStatus: Byte = 0, - @ProtoId(35) val vecServerBuf: ByteArray? = null, - @ProtoId(36) val bSetMute: Byte = 0 + @SerialId(0) val lUin: Long = 0L, + @SerialId(1) val lBid: Long = 0L, + @SerialId(2) val cConnType: Byte = 0, + @SerialId(3) val sOther: String = "", + @SerialId(4) val iStatus: Int = 11, + @SerialId(5) val bOnlinePush: Byte = 0, + @SerialId(6) val bIsOnline: Byte = 0, + @SerialId(7) val bIsShowOnline: Byte = 0, + @SerialId(8) val bKikPC: Byte = 0, + @SerialId(9) val bKikWeak: Byte = 0, + @SerialId(10) val timeStamp: Long = 0L, + @SerialId(11) val iOSVersion: Long = 0L, + @SerialId(12) val cNetType: Byte = 0, + @SerialId(13) val sBuildVer: String? = "", + @SerialId(14) val bRegType: Byte = 0, + @SerialId(15) val vecDevParam: ByteArray? = null, + @SerialId(16) val vecGuid: ByteArray? = null, + @SerialId(17) val iLocaleID: Int = 2052, + @SerialId(18) val bSlientPush: Byte = 0, + @SerialId(19) val strDevName: String? = null, + @SerialId(20) val strDevType: String? = null, + @SerialId(21) val strOSVer: String? = null, + @SerialId(22) val bOpenPush: Byte = 1, + @SerialId(23) val iLargeSeq: Long = 0L, + @SerialId(24) val iLastWatchStartTime: Long = 0L, + @SerialId(26) val uOldSSOIp: Long = 0L, + @SerialId(27) val uNewSSOIp: Long = 0L, + @SerialId(28) val sChannelNo: String? = null, + @SerialId(29) val lCpId: Long = 0L, + @SerialId(30) val strVendorName: String? = null, + @SerialId(31) val strVendorOSName: String? = null, + @SerialId(32) val strIOSIdfa: String? = null, + @SerialId(33) val bytes_0x769_reqbody: ByteArray? = null, + @SerialId(34) val bIsSetStatus: Byte = 0, + @SerialId(35) val vecServerBuf: ByteArray? = null, + @SerialId(36) val bSetMute: Byte = 0 // @SerialId(25) var vecBindUin: ArrayList<*>? = null // ?? 未知泛型 ) : JceStruct \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/TroopList.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/TroopList.kt index f72349e5a..e7f1f4fe6 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/TroopList.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/TroopList.kt @@ -9,183 +9,183 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce +import kotlinx.serialization.SerialId import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId import net.mamoe.mirai.qqandroid.io.JceStruct @Serializable internal class GetTroopListReqV2Simplify( - @ProtoId(0) val uin: Long, - @ProtoId(1) val getMSFMsgFlag: Byte? = null, - @ProtoId(2) val vecCookies: ByteArray? = null, - @ProtoId(3) val vecGroupInfo: List? = null, - @ProtoId(4) val groupFlagExt: Byte? = null, - @ProtoId(5) val shVersion: Int? = null, - @ProtoId(6) val dwCompanyId: Long? = null, - @ProtoId(7) val versionNum: Long? = null, - @ProtoId(8) val getLongGroupName: Byte? = null + @SerialId(0) val uin: Long, + @SerialId(1) val getMSFMsgFlag: Byte? = null, + @SerialId(2) val vecCookies: ByteArray? = null, + @SerialId(3) val vecGroupInfo: List? = null, + @SerialId(4) val groupFlagExt: Byte? = null, + @SerialId(5) val shVersion: Int? = null, + @SerialId(6) val dwCompanyId: Long? = null, + @SerialId(7) val versionNum: Long? = null, + @SerialId(8) val getLongGroupName: Byte? = null ) : JceStruct @Serializable internal class StTroopNumSimplify( - @ProtoId(0) val groupCode: Long, - @ProtoId(1) val dwGroupInfoSeq: Long? = null, - @ProtoId(2) val dwGroupFlagExt: Long? = null, - @ProtoId(3) val dwGroupRankSeq: Long? = null + @SerialId(0) val groupCode: Long, + @SerialId(1) val dwGroupInfoSeq: Long? = null, + @SerialId(2) val dwGroupFlagExt: Long? = null, + @SerialId(3) val dwGroupRankSeq: Long? = null ) : JceStruct @Serializable internal class GetTroopListRespV2( - @ProtoId(0) val uin: Long, - @ProtoId(1) val troopCount: Short, - @ProtoId(2) val result: Int, - @ProtoId(3) val errorCode: Short? = null, - @ProtoId(4) val vecCookies: ByteArray? = null, - @ProtoId(5) val vecTroopList: List? = null, - @ProtoId(6) val vecTroopListDel: List? = null, - @ProtoId(7) val vecTroopRank: List? = null, - @ProtoId(8) val vecFavGroup: List? = null, - @ProtoId(9) val vecTroopListExt: List? = null + @SerialId(0) val uin: Long, + @SerialId(1) val troopCount: Short, + @SerialId(2) val result: Int, + @SerialId(3) val errorCode: Short? = null, + @SerialId(4) val vecCookies: ByteArray? = null, + @SerialId(5) val vecTroopList: List? = null, + @SerialId(6) val vecTroopListDel: List? = null, + @SerialId(7) val vecTroopRank: List? = null, + @SerialId(8) val vecFavGroup: List? = null, + @SerialId(9) val vecTroopListExt: List? = null ) : JceStruct @Serializable internal class StTroopNum( - @ProtoId(0) val groupUin: Long, - @ProtoId(1) val groupCode: Long, - @ProtoId(2) val flag: Byte? = null, - @ProtoId(3) val dwGroupInfoSeq: Long? = null, - @ProtoId(4) val groupName: String = "", - @ProtoId(5) val groupMemo: String = "", - @ProtoId(6) val dwGroupFlagExt: Long? = null, - @ProtoId(7) val dwGroupRankSeq: Long? = null, - @ProtoId(8) val dwCertificationType: Long? = null, - @ProtoId(9) val dwShutUpTimestamp: Long? = null, - @ProtoId(10) val dwMyShutUpTimestamp: Long? = null, - @ProtoId(11) val dwCmdUinUinFlag: Long? = null, - @ProtoId(12) val dwAdditionalFlag: Long? = null, - @ProtoId(13) val dwGroupTypeFlag: Long? = null, - @ProtoId(14) val dwGroupSecType: Long? = null, - @ProtoId(15) val dwGroupSecTypeInfo: Long? = null, - @ProtoId(16) val dwGroupClassExt: Long? = null, - @ProtoId(17) val dwAppPrivilegeFlag: Long? = null, - @ProtoId(18) val dwSubscriptionUin: Long? = null, - @ProtoId(19) val dwMemberNum: Long? = null, - @ProtoId(20) val dwMemberNumSeq: Long? = null, - @ProtoId(21) val dwMemberCardSeq: Long? = null, - @ProtoId(22) val dwGroupFlagExt3: Long? = null, - @ProtoId(23) val dwGroupOwnerUin: Long, - @ProtoId(24) val isConfGroup: Byte? = null, - @ProtoId(25) val isModifyConfGroupFace: Byte? = null, - @ProtoId(26) val isModifyConfGroupName: Byte? = null, - @ProtoId(27) val dwCmduinJoinTime: Long? = null, - @ProtoId(28) val ulCompanyId: Long? = null, - @ProtoId(29) val dwMaxGroupMemberNum: Long? = null, - @ProtoId(30) val dwCmdUinGroupMask: Long? = null, - @ProtoId(31) val udwHLGuildAppid: Long? = null, - @ProtoId(32) val udwHLGuildSubType: Long? = null, - @ProtoId(33) val udwCmdUinRingtoneID: Long? = null, - @ProtoId(34) val udwCmdUinFlagEx2: Long? = null + @SerialId(0) val groupUin: Long, + @SerialId(1) val groupCode: Long, + @SerialId(2) val flag: Byte? = null, + @SerialId(3) val dwGroupInfoSeq: Long? = null, + @SerialId(4) val groupName: String = "", + @SerialId(5) val groupMemo: String = "", + @SerialId(6) val dwGroupFlagExt: Long? = null, + @SerialId(7) val dwGroupRankSeq: Long? = null, + @SerialId(8) val dwCertificationType: Long? = null, + @SerialId(9) val dwShutUpTimestamp: Long? = null, + @SerialId(10) val dwMyShutUpTimestamp: Long? = null, + @SerialId(11) val dwCmdUinUinFlag: Long? = null, + @SerialId(12) val dwAdditionalFlag: Long? = null, + @SerialId(13) val dwGroupTypeFlag: Long? = null, + @SerialId(14) val dwGroupSecType: Long? = null, + @SerialId(15) val dwGroupSecTypeInfo: Long? = null, + @SerialId(16) val dwGroupClassExt: Long? = null, + @SerialId(17) val dwAppPrivilegeFlag: Long? = null, + @SerialId(18) val dwSubscriptionUin: Long? = null, + @SerialId(19) val dwMemberNum: Long? = null, + @SerialId(20) val dwMemberNumSeq: Long? = null, + @SerialId(21) val dwMemberCardSeq: Long? = null, + @SerialId(22) val dwGroupFlagExt3: Long? = null, + @SerialId(23) val dwGroupOwnerUin: Long, + @SerialId(24) val isConfGroup: Byte? = null, + @SerialId(25) val isModifyConfGroupFace: Byte? = null, + @SerialId(26) val isModifyConfGroupName: Byte? = null, + @SerialId(27) val dwCmduinJoinTime: Long? = null, + @SerialId(28) val ulCompanyId: Long? = null, + @SerialId(29) val dwMaxGroupMemberNum: Long? = null, + @SerialId(30) val dwCmdUinGroupMask: Long? = null, + @SerialId(31) val udwHLGuildAppid: Long? = null, + @SerialId(32) val udwHLGuildSubType: Long? = null, + @SerialId(33) val udwCmdUinRingtoneID: Long? = null, + @SerialId(34) val udwCmdUinFlagEx2: Long? = null ) : JceStruct @Serializable internal class StGroupRankInfo( - @ProtoId(0) val dwGroupCode: Long, - @ProtoId(1) val groupRankSysFlag: Byte? = null, - @ProtoId(2) val groupRankUserFlag: Byte? = null, - @ProtoId(3) val vecRankMap: List? = null, - @ProtoId(4) val dwGroupRankSeq: Long? = null, - @ProtoId(5) val ownerName: String? = "", - @ProtoId(6) val adminName: String? = "", - @ProtoId(7) val dwOfficeMode: Long? = null + @SerialId(0) val dwGroupCode: Long, + @SerialId(1) val groupRankSysFlag: Byte? = null, + @SerialId(2) val groupRankUserFlag: Byte? = null, + @SerialId(3) val vecRankMap: List? = null, + @SerialId(4) val dwGroupRankSeq: Long? = null, + @SerialId(5) val ownerName: String? = "", + @SerialId(6) val adminName: String? = "", + @SerialId(7) val dwOfficeMode: Long? = null ) : JceStruct @Serializable internal class StFavoriteGroup( - @ProtoId(0) val dwGroupCode: Long, - @ProtoId(1) val dwTimestamp: Long? = null, - @ProtoId(2) val dwSnsFlag: Long? = 1L, - @ProtoId(3) val dwOpenTimestamp: Long? = null + @SerialId(0) val dwGroupCode: Long, + @SerialId(1) val dwTimestamp: Long? = null, + @SerialId(2) val dwSnsFlag: Long? = 1L, + @SerialId(3) val dwOpenTimestamp: Long? = null ) : JceStruct @Serializable internal class StLevelRankPair( - @ProtoId(0) val dwLevel: Long? = null, - @ProtoId(1) val rank: String? = "" + @SerialId(0) val dwLevel: Long? = null, + @SerialId(1) val rank: String? = "" ) : JceStruct @Serializable internal class GetTroopMemberListReq( - @ProtoId(0) val uin: Long, - @ProtoId(1) val groupCode: Long, - @ProtoId(2) val nextUin: Long, - @ProtoId(3) val groupUin: Long, - @ProtoId(4) val version: Long? = null, - @ProtoId(5) val reqType: Long? = null, - @ProtoId(6) val getListAppointTime: Long? = null, - @ProtoId(7) val richCardNameVer: Byte? = null + @SerialId(0) val uin: Long, + @SerialId(1) val groupCode: Long, + @SerialId(2) val nextUin: Long, + @SerialId(3) val groupUin: Long, + @SerialId(4) val version: Long? = null, + @SerialId(5) val reqType: Long? = null, + @SerialId(6) val getListAppointTime: Long? = null, + @SerialId(7) val richCardNameVer: Byte? = null ) : JceStruct @Serializable internal class GetTroopMemberListResp( - @ProtoId(0) val uin: Long, - @ProtoId(1) val groupCode: Long, - @ProtoId(2) val groupUin: Long, - @ProtoId(3) val vecTroopMember: List, - @ProtoId(4) val nextUin: Long, - @ProtoId(5) val result: Int, - @ProtoId(6) val errorCode: Short? = null, - @ProtoId(7) val officeMode: Long? = null, - @ProtoId(8) val nextGetTime: Long? = null + @SerialId(0) val uin: Long, + @SerialId(1) val groupCode: Long, + @SerialId(2) val groupUin: Long, + @SerialId(3) val vecTroopMember: List, + @SerialId(4) val nextUin: Long, + @SerialId(5) val result: Int, + @SerialId(6) val errorCode: Short? = null, + @SerialId(7) val officeMode: Long? = null, + @SerialId(8) val nextGetTime: Long? = null ) : JceStruct @Serializable internal class StTroopMemberInfo( - @ProtoId(0) val memberUin: Long, - @ProtoId(1) val faceId: Short, - @ProtoId(2) val age: Byte, - @ProtoId(3) val gender: Byte, - @ProtoId(4) val nick: String = "", - @ProtoId(5) val status: Byte = 20, - @ProtoId(6) val sShowName: String? = null, - @ProtoId(8) val sName: String? = null, - @ProtoId(9) val cGender: Byte? = null, - @ProtoId(10) val sPhone: String? = "", - @ProtoId(11) val sEmail: String? = "", - @ProtoId(12) val sMemo: String? = "", - @ProtoId(13) val autoRemark: String? = "", - @ProtoId(14) val dwMemberLevel: Long? = null, - @ProtoId(15) val dwJoinTime: Long? = null, - @ProtoId(16) val dwLastSpeakTime: Long? = null, - @ProtoId(17) val dwCreditLevel: Long? = null, - @ProtoId(18) val dwFlag: Long? = null, - @ProtoId(19) val dwFlagExt: Long? = null, - @ProtoId(20) val dwPoint: Long? = null, - @ProtoId(21) val concerned: Byte? = null, - @ProtoId(22) val shielded: Byte? = null, - @ProtoId(23) val sSpecialTitle: String? = "", - @ProtoId(24) val dwSpecialTitleExpireTime: Long? = null, - @ProtoId(25) val job: String? = "", - @ProtoId(26) val apolloFlag: Byte? = null, - @ProtoId(27) val dwApolloTimestamp: Long? = null, - @ProtoId(28) val dwGlobalGroupLevel: Long? = null, - @ProtoId(29) val dwTitleId: Long? = null, - @ProtoId(30) val dwShutupTimestap: Long? = null, - @ProtoId(31) val dwGlobalGroupPoint: Long? = null, - @ProtoId(32) val qzusrinfo: QzoneUserInfo? = null, - @ProtoId(33) val richCardNameVer: Byte? = null, - @ProtoId(34) val dwVipType: Long? = null, - @ProtoId(35) val dwVipLevel: Long? = null, - @ProtoId(36) val dwBigClubLevel: Long? = null, - @ProtoId(37) val dwBigClubFlag: Long? = null, - @ProtoId(38) val dwNameplate: Long? = null, - @ProtoId(39) val vecGroupHonor: ByteArray? = null + @SerialId(0) val memberUin: Long, + @SerialId(1) val faceId: Short, + @SerialId(2) val age: Byte, + @SerialId(3) val gender: Byte, + @SerialId(4) val nick: String = "", + @SerialId(5) val status: Byte = 20, + @SerialId(6) val sShowName: String? = null, + @SerialId(8) val sName: String? = null, + @SerialId(9) val cGender: Byte? = null, + @SerialId(10) val sPhone: String? = "", + @SerialId(11) val sEmail: String? = "", + @SerialId(12) val sMemo: String? = "", + @SerialId(13) val autoRemark: String? = "", + @SerialId(14) val dwMemberLevel: Long? = null, + @SerialId(15) val dwJoinTime: Long? = null, + @SerialId(16) val dwLastSpeakTime: Long? = null, + @SerialId(17) val dwCreditLevel: Long? = null, + @SerialId(18) val dwFlag: Long? = null, + @SerialId(19) val dwFlagExt: Long? = null, + @SerialId(20) val dwPoint: Long? = null, + @SerialId(21) val concerned: Byte? = null, + @SerialId(22) val shielded: Byte? = null, + @SerialId(23) val sSpecialTitle: String? = "", + @SerialId(24) val dwSpecialTitleExpireTime: Long? = null, + @SerialId(25) val job: String? = "", + @SerialId(26) val apolloFlag: Byte? = null, + @SerialId(27) val dwApolloTimestamp: Long? = null, + @SerialId(28) val dwGlobalGroupLevel: Long? = null, + @SerialId(29) val dwTitleId: Long? = null, + @SerialId(30) val dwShutupTimestap: Long? = null, + @SerialId(31) val dwGlobalGroupPoint: Long? = null, + @SerialId(32) val qzusrinfo: QzoneUserInfo? = null, + @SerialId(33) val richCardNameVer: Byte? = null, + @SerialId(34) val dwVipType: Long? = null, + @SerialId(35) val dwVipLevel: Long? = null, + @SerialId(36) val dwBigClubLevel: Long? = null, + @SerialId(37) val dwBigClubFlag: Long? = null, + @SerialId(38) val dwNameplate: Long? = null, + @SerialId(39) val vecGroupHonor: ByteArray? = null ) : JceStruct @Serializable internal class QzoneUserInfo( - @ProtoId(0) val eStarState: Int? = null, - @ProtoId(1) val extendInfo: Map? = null + @SerialId(0) val eStarState: Int? = null, + @SerialId(1) val extendInfo: Map? = null ) : JceStruct \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x352.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x352.kt index 8eca4ba11..dbb85d0fd 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x352.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x352.kt @@ -9,8 +9,8 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto +import kotlinx.serialization.SerialId import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId import net.mamoe.mirai.qqandroid.io.ProtoBuf import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY @@ -18,118 +18,118 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY internal class Cmd0x352 : ProtoBuf { @Serializable class DelImgReq( - @ProtoId(1) val srcUin: Long = 0L, - @ProtoId(2) val dstUin: Long = 0L, - @ProtoId(3) val reqTerm: Int = 0, - @ProtoId(4) val reqPlatformType: Int = 0, - @ProtoId(5) val buType: Int = 0, - @ProtoId(6) val buildVer: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) val fileResid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) val picWidth: Int = 0, - @ProtoId(9) val picHeight: Int = 0 + @SerialId(1) val srcUin: Long = 0L, + @SerialId(2) val dstUin: Long = 0L, + @SerialId(3) val reqTerm: Int = 0, + @SerialId(4) val reqPlatformType: Int = 0, + @SerialId(5) val buType: Int = 0, + @SerialId(6) val buildVer: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(7) val fileResid: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(8) val picWidth: Int = 0, + @SerialId(9) val picHeight: Int = 0 ) : ProtoBuf @Serializable class DelImgRsp( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val failMsg: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val fileResid: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val result: Int = 0, + @SerialId(2) val failMsg: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val fileResid: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class GetImgUrlReq( - @ProtoId(1) val srcUin: Long = 0L, - @ProtoId(2) val dstUin: Long = 0L, - @ProtoId(3) val fileResid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val urlFlag: Int = 0, - @ProtoId(6) val urlType: Int = 0, - @ProtoId(7) val reqTerm: Int = 0, - @ProtoId(8) val reqPlatformType: Int = 0, - @ProtoId(9) val srcFileType: Int = 0, - @ProtoId(10) val innerIp: Int = 0, - @ProtoId(11) val boolAddressBook: Boolean = false, - @ProtoId(12) val buType: Int = 0, - @ProtoId(13) val buildVer: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(14) val picUpTimestamp: Int = 0, - @ProtoId(15) val reqTransferType: Int = 0 + @SerialId(1) val srcUin: Long = 0L, + @SerialId(2) val dstUin: Long = 0L, + @SerialId(3) val fileResid: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val urlFlag: Int = 0, + @SerialId(6) val urlType: Int = 0, + @SerialId(7) val reqTerm: Int = 0, + @SerialId(8) val reqPlatformType: Int = 0, + @SerialId(9) val srcFileType: Int = 0, + @SerialId(10) val innerIp: Int = 0, + @SerialId(11) val boolAddressBook: Boolean = false, + @SerialId(12) val buType: Int = 0, + @SerialId(13) val buildVer: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(14) val picUpTimestamp: Int = 0, + @SerialId(15) val reqTransferType: Int = 0 ) : ProtoBuf @Serializable class GetImgUrlRsp( - @ProtoId(1) val fileResid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val clientIp: Int = 0, - @ProtoId(3) val result: Int = 0, - @ProtoId(4) val failMsg: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val bytesThumbDownUrl: List? = null, - @ProtoId(6) val bytesOriginalDownUrl: List? = null, - @ProtoId(7) val msgImgInfo: ImgInfo? = null, - @ProtoId(8) val uint32DownIp: List? = null, - @ProtoId(9) val uint32DownPort: List? = null, - @ProtoId(10) val thumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(11) val originalDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(12) val downDomain: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(13) val bytesBigDownUrl: List? = null, - @ProtoId(14) val bigDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(15) val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(16) val httpsUrlFlag: Int = 0, - @ProtoId(26) val msgDownIp6: List? = null, - @ProtoId(27) val clientIp6: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val fileResid: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val clientIp: Int = 0, + @SerialId(3) val result: Int = 0, + @SerialId(4) val failMsg: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val bytesThumbDownUrl: List? = null, + @SerialId(6) val bytesOriginalDownUrl: List? = null, + @SerialId(7) val msgImgInfo: ImgInfo? = null, + @SerialId(8) val uint32DownIp: List? = null, + @SerialId(9) val uint32DownPort: List? = null, + @SerialId(10) val thumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(11) val originalDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(12) val downDomain: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(13) val bytesBigDownUrl: List? = null, + @SerialId(14) val bigDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(15) val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(16) val httpsUrlFlag: Int = 0, + @SerialId(26) val msgDownIp6: List? = null, + @SerialId(27) val clientIp6: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Suppress("ArrayInDataClass") @Serializable data class ImgInfo( - @ProtoId(1) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val fileType: Int = 0, - @ProtoId(3) val fileSize: Long = 0L, - @ProtoId(4) val fileWidth: Int = 0, - @ProtoId(5) val fileHeight: Int = 0, - @ProtoId(6) val fileFlag: Long = 0L, - @ProtoId(7) val fileCutPos: Int = 0 + @SerialId(1) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val fileType: Int = 0, + @SerialId(3) val fileSize: Long = 0L, + @SerialId(4) val fileWidth: Int = 0, + @SerialId(5) val fileHeight: Int = 0, + @SerialId(6) val fileFlag: Long = 0L, + @SerialId(7) val fileCutPos: Int = 0 ) : ProtoBuf @Serializable class IPv6Info( - @ProtoId(1) val ip6: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val port: Int = 0 + @SerialId(1) val ip6: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val port: Int = 0 ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val subcmd: Int = 0, //2是GetImgUrlReq 1是UploadImgReq - @ProtoId(2) val msgTryupImgReq: List? = null,// optional - @ProtoId(3) val msgGetimgUrlReq: List? = null,// optional - @ProtoId(4) val msgDelImgReq: List? = null, - @ProtoId(10) val netType: Int = 3// 数据网络=5 + @SerialId(1) val subcmd: Int = 0, //2是GetImgUrlReq 1是UploadImgReq + @SerialId(2) val msgTryupImgReq: List? = null,// optional + @SerialId(3) val msgGetimgUrlReq: List? = null,// optional + @SerialId(4) val msgDelImgReq: List? = null, + @SerialId(10) val netType: Int = 3// 数据网络=5 ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val subcmd: Int = 0, - @ProtoId(2) val msgTryupImgRsp: List? = null, - @ProtoId(3) val msgGetimgUrlRsp: List? = null, - @ProtoId(4) val boolNewBigchan: Boolean = false, - @ProtoId(5) val msgDelImgRsp: List? = null, - @ProtoId(10) val failMsg: String? = "" + @SerialId(1) val subcmd: Int = 0, + @SerialId(2) val msgTryupImgRsp: List? = null, + @SerialId(3) val msgGetimgUrlRsp: List? = null, + @SerialId(4) val boolNewBigchan: Boolean = false, + @SerialId(5) val msgDelImgRsp: List? = null, + @SerialId(10) val failMsg: String? = "" ) : ProtoBuf @Serializable internal class TryUpImgReq( - @ProtoId(1) val srcUin: Int, - @ProtoId(2) val dstUin: Int, - @ProtoId(3) val fileId: Int = 0,//从0开始的自增数？貌似有一个连接就要自增1, 但是又会重置回0 - @ProtoId(4) val fileMd5: ByteArray, - @ProtoId(5) val fileSize: Int, - @ProtoId(6) val fileName: String,//默认为md5+".jpg" - @ProtoId(7) val srcTerm: Int = 5, - @ProtoId(8) val platformType: Int = 9, - @ProtoId(9) val innerIP: Int = 0, - @ProtoId(10) val addressBook: Int = 0,//chatType == 1006为1 我觉得发0没问题 - @ProtoId(11) val retry: Int = 0,//default - @ProtoId(12) val buType: Int = 1,//1或96 不确定 - @ProtoId(13) val imgOriginal: Int,//是否为原图 - @ProtoId(14) val imgWidth: Int, - @ProtoId(15) val imgHeight: Int, + @SerialId(1) val srcUin: Int, + @SerialId(2) val dstUin: Int, + @SerialId(3) val fileId: Int = 0,//从0开始的自增数？貌似有一个连接就要自增1, 但是又会重置回0 + @SerialId(4) val fileMd5: ByteArray, + @SerialId(5) val fileSize: Int, + @SerialId(6) val fileName: String,//默认为md5+".jpg" + @SerialId(7) val srcTerm: Int = 5, + @SerialId(8) val platformType: Int = 9, + @SerialId(9) val innerIP: Int = 0, + @SerialId(10) val addressBook: Int = 0,//chatType == 1006为1 我觉得发0没问题 + @SerialId(11) val retry: Int = 0,//default + @SerialId(12) val buType: Int = 1,//1或96 不确定 + @SerialId(13) val imgOriginal: Int,//是否为原图 + @SerialId(14) val imgWidth: Int, + @SerialId(15) val imgHeight: Int, /** * ImgType: * JPG: 1000 @@ -140,50 +140,50 @@ internal class Cmd0x352 : ProtoBuf { * APNG: 2001 * SHARPP: 1004 */ - @ProtoId(16) val imgType: Int = 1000, - @ProtoId(17) val buildVer: String = "8.2.7.4410",//版本号 - @ProtoId(18) val fileIndex: ByteArray = EMPTY_BYTE_ARRAY,//default - @ProtoId(19) val fileStoreDays: Int = 0,//default - @ProtoId(20) val stepFlag: Int = 0,//default - @ProtoId(21) val rejectTryFast: Int = 0,//bool - @ProtoId(22) val srvUpload: Int = 1,//typeHotPic[1/2/3] - @ProtoId(23) val transferUrl: ByteArray = EMPTY_BYTE_ARRAY//rawDownloadUrl, 如果没有就是EMPTY_BYTE_ARRAY + @SerialId(16) val imgType: Int = 1000, + @SerialId(17) val buildVer: String = "8.2.7.4410",//版本号 + @SerialId(18) val fileIndex: ByteArray = EMPTY_BYTE_ARRAY,//default + @SerialId(19) val fileStoreDays: Int = 0,//default + @SerialId(20) val stepFlag: Int = 0,//default + @SerialId(21) val rejectTryFast: Int = 0,//bool + @SerialId(22) val srvUpload: Int = 1,//typeHotPic[1/2/3] + @SerialId(23) val transferUrl: ByteArray = EMPTY_BYTE_ARRAY//rawDownloadUrl, 如果没有就是EMPTY_BYTE_ARRAY ) : ImgReq @Serializable class TryUpImgRsp( - @ProtoId(1) val fileId: Long = 0L, - @ProtoId(2) val clientIp: Int = 0, - @ProtoId(3) val result: Int = 0, - @ProtoId(4) val failMsg: String? = "", - @ProtoId(5) val boolFileExit: Boolean = false, - @ProtoId(6) val msgImgInfo: ImgInfo? = null, - @ProtoId(7) val uint32UpIp: List? = null, - @ProtoId(8) val uint32UpPort: List? = null, - @ProtoId(9) val upUkey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(10) val upResid: String = "", - @ProtoId(11) val upUuid: String = "", - @ProtoId(12) val upOffset: Long = 0L, - @ProtoId(13) val blockSize: Long = 0L, - @ProtoId(14) val encryptDstip: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(15) val roamdays: Int = 0, - @ProtoId(26) val msgUpIp6: List? = null, - @ProtoId(27) val clientIp6: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(60) val thumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(61) val originalDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(62) val downDomain: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(64) val bigDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(65) val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(66) val httpsUrlFlag: Int = 0, - @ProtoId(1001) val msgInfo4busi: TryUpInfo4Busi? = null + @SerialId(1) val fileId: Long = 0L, + @SerialId(2) val clientIp: Int = 0, + @SerialId(3) val result: Int = 0, + @SerialId(4) val failMsg: String? = "", + @SerialId(5) val boolFileExit: Boolean = false, + @SerialId(6) val msgImgInfo: ImgInfo? = null, + @SerialId(7) val uint32UpIp: List? = null, + @SerialId(8) val uint32UpPort: List? = null, + @SerialId(9) val upUkey: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(10) val upResid: String = "", + @SerialId(11) val upUuid: String = "", + @SerialId(12) val upOffset: Long = 0L, + @SerialId(13) val blockSize: Long = 0L, + @SerialId(14) val encryptDstip: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(15) val roamdays: Int = 0, + @SerialId(26) val msgUpIp6: List? = null, + @SerialId(27) val clientIp6: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(60) val thumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(61) val originalDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(62) val downDomain: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(64) val bigDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(65) val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(66) val httpsUrlFlag: Int = 0, + @SerialId(1001) val msgInfo4busi: TryUpInfo4Busi? = null ) : ProtoBuf @Serializable class TryUpInfo4Busi( - @ProtoId(1) val fileResid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val downDomain: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val thumbDownUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val originalDownUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val bigDownUrl: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val fileResid: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val downDomain: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val thumbDownUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val originalDownUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val bigDownUrl: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf } \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x388.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x388.kt index bd818b0e5..d9ab40396 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x388.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x388.kt @@ -9,8 +9,8 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto +import kotlinx.serialization.SerialId import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId import net.mamoe.mirai.qqandroid.io.ProtoBuf import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY @@ -18,141 +18,141 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY internal class Cmd0x388 : ProtoBuf { @Serializable class DelImgReq( - @ProtoId(1) val srcUin: Long = 0L, - @ProtoId(2) val dstUin: Long = 0L, - @ProtoId(3) val reqTerm: Int = 0, - @ProtoId(4) val reqPlatformType: Int = 0, - @ProtoId(5) val buType: Int = 0, - @ProtoId(6) val buildVer: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) val fileResid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) val picWidth: Int = 0, - @ProtoId(9) val picHeight: Int = 0 + @SerialId(1) val srcUin: Long = 0L, + @SerialId(2) val dstUin: Long = 0L, + @SerialId(3) val reqTerm: Int = 0, + @SerialId(4) val reqPlatformType: Int = 0, + @SerialId(5) val buType: Int = 0, + @SerialId(6) val buildVer: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(7) val fileResid: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(8) val picWidth: Int = 0, + @SerialId(9) val picHeight: Int = 0 ) : ProtoBuf @Serializable class DelImgRsp( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val failMsg: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val fileResid: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val result: Int = 0, + @SerialId(2) val failMsg: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val fileResid: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class ExpRoamExtendInfo( - @ProtoId(1) val resid: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val resid: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class ExpRoamPicInfo( - @ProtoId(1) val shopFlag: Int = 0, - @ProtoId(2) val pkgId: Int = 0, - @ProtoId(3) val picId: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val shopFlag: Int = 0, + @SerialId(2) val pkgId: Int = 0, + @SerialId(3) val picId: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class ExtensionCommPicTryUp( - @ProtoId(1) val bytesExtinfo: List? = null + @SerialId(1) val bytesExtinfo: List? = null ) : ProtoBuf @Serializable class ExtensionExpRoamTryUp( - @ProtoId(1) val msgExproamPicInfo: List? = null + @SerialId(1) val msgExproamPicInfo: List? = null ) : ProtoBuf @Serializable class GetImgUrlReq( - @ProtoId(1) val groupCode: Long = 0L, - @ProtoId(2) val dstUin: Long = 0L, - @ProtoId(3) val fileid: Long = 0L, - @ProtoId(4) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val urlFlag: Int = 0, - @ProtoId(6) val urlType: Int = 0, - @ProtoId(7) val reqTerm: Int = 0, - @ProtoId(8) val reqPlatformType: Int = 0, - @ProtoId(9) val innerIp: Int = 0, - @ProtoId(10) val buType: Int = 0, - @ProtoId(11) val buildVer: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(12) val fileId: Long = 0L, - @ProtoId(13) val fileSize: Long = 0L, - @ProtoId(14) val originalPic: Int = 0, - @ProtoId(15) val retryReq: Int = 0, - @ProtoId(16) val fileHeight: Int = 0, - @ProtoId(17) val fileWidth: Int = 0, - @ProtoId(18) val picType: Int = 0, - @ProtoId(19) val picUpTimestamp: Int = 0, - @ProtoId(20) val reqTransferType: Int = 0 + @SerialId(1) val groupCode: Long = 0L, + @SerialId(2) val dstUin: Long = 0L, + @SerialId(3) val fileid: Long = 0L, + @SerialId(4) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val urlFlag: Int = 0, + @SerialId(6) val urlType: Int = 0, + @SerialId(7) val reqTerm: Int = 0, + @SerialId(8) val reqPlatformType: Int = 0, + @SerialId(9) val innerIp: Int = 0, + @SerialId(10) val buType: Int = 0, + @SerialId(11) val buildVer: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(12) val fileId: Long = 0L, + @SerialId(13) val fileSize: Long = 0L, + @SerialId(14) val originalPic: Int = 0, + @SerialId(15) val retryReq: Int = 0, + @SerialId(16) val fileHeight: Int = 0, + @SerialId(17) val fileWidth: Int = 0, + @SerialId(18) val picType: Int = 0, + @SerialId(19) val picUpTimestamp: Int = 0, + @SerialId(20) val reqTransferType: Int = 0 ) : ProtoBuf @Serializable class GetImgUrlRsp( - @ProtoId(1) val fileid: Long = 0L, - @ProtoId(2) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val result: Int = 0, - @ProtoId(4) val failMsg: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val msgImgInfo: ImgInfo? = null, - @ProtoId(6) val bytesThumbDownUrl: List? = null, - @ProtoId(7) val bytesOriginalDownUrl: List? = null, - @ProtoId(8) val bytesBigDownUrl: List? = null, - @ProtoId(9) val uint32DownIp: List? = null, - @ProtoId(10) val uint32DownPort: List? = null, - @ProtoId(11) val downDomain: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(12) val thumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(13) val originalDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(14) val bigDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(15) val fileId: Long = 0L, - @ProtoId(16) val autoDownType: Int = 0, - @ProtoId(17) val uint32OrderDownType: List? = null, - @ProtoId(19) val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(20) val httpsUrlFlag: Int = 0, - @ProtoId(26) val msgDownIp6: List? = null, - @ProtoId(27) val clientIp6: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val fileid: Long = 0L, + @SerialId(2) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val result: Int = 0, + @SerialId(4) val failMsg: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val msgImgInfo: ImgInfo? = null, + @SerialId(6) val bytesThumbDownUrl: List? = null, + @SerialId(7) val bytesOriginalDownUrl: List? = null, + @SerialId(8) val bytesBigDownUrl: List? = null, + @SerialId(9) val uint32DownIp: List? = null, + @SerialId(10) val uint32DownPort: List? = null, + @SerialId(11) val downDomain: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(12) val thumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(13) val originalDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(14) val bigDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(15) val fileId: Long = 0L, + @SerialId(16) val autoDownType: Int = 0, + @SerialId(17) val uint32OrderDownType: List? = null, + @SerialId(19) val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(20) val httpsUrlFlag: Int = 0, + @SerialId(26) val msgDownIp6: List? = null, + @SerialId(27) val clientIp6: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class GetPttUrlReq( - @ProtoId(1) val groupCode: Long = 0L, - @ProtoId(2) val dstUin: Long = 0L, - @ProtoId(3) val fileid: Long = 0L, - @ProtoId(4) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val reqTerm: Int = 0, - @ProtoId(6) val reqPlatformType: Int = 0, - @ProtoId(7) val innerIp: Int = 0, - @ProtoId(8) val buType: Int = 0, - @ProtoId(9) val buildVer: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(10) val fileId: Long = 0L, - @ProtoId(11) val fileKey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(12) val codec: Int = 0, - @ProtoId(13) val buId: Int = 0, - @ProtoId(14) val reqTransferType: Int = 0, - @ProtoId(15) val isAuto: Int = 0 + @SerialId(1) val groupCode: Long = 0L, + @SerialId(2) val dstUin: Long = 0L, + @SerialId(3) val fileid: Long = 0L, + @SerialId(4) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val reqTerm: Int = 0, + @SerialId(6) val reqPlatformType: Int = 0, + @SerialId(7) val innerIp: Int = 0, + @SerialId(8) val buType: Int = 0, + @SerialId(9) val buildVer: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(10) val fileId: Long = 0L, + @SerialId(11) val fileKey: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(12) val codec: Int = 0, + @SerialId(13) val buId: Int = 0, + @SerialId(14) val reqTransferType: Int = 0, + @SerialId(15) val isAuto: Int = 0 ) : ProtoBuf @Serializable class GetPttUrlRsp( - @ProtoId(1) val fileid: Long = 0L, - @ProtoId(2) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val result: Int = 0, - @ProtoId(4) val failMsg: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val bytesDownUrl: List? = null, - @ProtoId(6) val uint32DownIp: List? = null, - @ProtoId(7) val uint32DownPort: List? = null, - @ProtoId(8) val downDomain: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(9) val downPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(10) val fileId: Long = 0L, - @ProtoId(11) val transferType: Int = 0, - @ProtoId(12) val allowRetry: Int = 0, - @ProtoId(26) val msgDownIp6: List? = null, - @ProtoId(27) val clientIp6: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(28) val strDomain: String = "" + @SerialId(1) val fileid: Long = 0L, + @SerialId(2) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val result: Int = 0, + @SerialId(4) val failMsg: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val bytesDownUrl: List? = null, + @SerialId(6) val uint32DownIp: List? = null, + @SerialId(7) val uint32DownPort: List? = null, + @SerialId(8) val downDomain: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(9) val downPara: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(10) val fileId: Long = 0L, + @SerialId(11) val transferType: Int = 0, + @SerialId(12) val allowRetry: Int = 0, + @SerialId(26) val msgDownIp6: List? = null, + @SerialId(27) val clientIp6: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(28) val strDomain: String = "" ) : ProtoBuf @Suppress("ArrayInDataClass") @Serializable data class ImgInfo( - @ProtoId(1) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val fileType: Int = 0, - @ProtoId(3) val fileSize: Long = 0L, - @ProtoId(4) val fileWidth: Int = 0, - @ProtoId(5) val fileHeight: Int = 0 + @SerialId(1) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val fileType: Int = 0, + @SerialId(3) val fileSize: Long = 0L, + @SerialId(4) val fileWidth: Int = 0, + @SerialId(5) val fileHeight: Int = 0 ) : ProtoBuf { override fun toString(): String { return "ImgInfo(fileMd5=${fileMd5.contentToString()}, fileType=$fileType, fileSize=$fileSize, fileWidth=$fileWidth, fileHeight=$fileHeight)" @@ -161,128 +161,128 @@ internal class Cmd0x388 : ProtoBuf { @Serializable class IPv6Info( - @ProtoId(1) val ip6: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val port: Int = 0 + @SerialId(1) val ip6: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val port: Int = 0 ) : ProtoBuf @Serializable class PicSize( - @ProtoId(1) val original: Int = 0, - @ProtoId(2) val thumb: Int = 0, - @ProtoId(3) val high: Int = 0 + @SerialId(1) val original: Int = 0, + @SerialId(2) val thumb: Int = 0, + @SerialId(3) val high: Int = 0 ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val netType: Int = 0, - @ProtoId(2) val subcmd: Int = 0, - @ProtoId(3) val msgTryupImgReq: List? = null, - @ProtoId(4) val msgGetimgUrlReq: List? = null, - @ProtoId(5) val msgTryupPttReq: List? = null, - @ProtoId(6) val msgGetpttUrlReq: List? = null, - @ProtoId(7) val commandId: Int = 0, - @ProtoId(8) val msgDelImgReq: List? = null, - @ProtoId(1001) val extension: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val netType: Int = 0, + @SerialId(2) val subcmd: Int = 0, + @SerialId(3) val msgTryupImgReq: List? = null, + @SerialId(4) val msgGetimgUrlReq: List? = null, + @SerialId(5) val msgTryupPttReq: List? = null, + @SerialId(6) val msgGetpttUrlReq: List? = null, + @SerialId(7) val commandId: Int = 0, + @SerialId(8) val msgDelImgReq: List? = null, + @SerialId(1001) val extension: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val clientIp: Int = 0, - @ProtoId(2) val subcmd: Int = 0, - @ProtoId(3) val msgTryupImgRsp: List? = null, - @ProtoId(4) val msgGetimgUrlRsp: List? = null, - @ProtoId(5) val msgTryupPttRsp: List? = null, - @ProtoId(6) val msgGetpttUrlRsp: List? = null, - @ProtoId(7) val msgDelImgRsp: List? = null + @SerialId(1) val clientIp: Int = 0, + @SerialId(2) val subcmd: Int = 0, + @SerialId(3) val msgTryupImgRsp: List? = null, + @SerialId(4) val msgGetimgUrlRsp: List? = null, + @SerialId(5) val msgTryupPttRsp: List? = null, + @SerialId(6) val msgGetpttUrlRsp: List? = null, + @SerialId(7) val msgDelImgRsp: List? = null ) : ProtoBuf @Serializable class TryUpImgReq( - @ProtoId(1) val groupCode: Long = 0L, - @ProtoId(2) val srcUin: Long = 0L, - @ProtoId(3) val fileId: Long = 0L, - @ProtoId(4) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val fileSize: Long = 0L, - @ProtoId(6) val fileName: String = "", - @ProtoId(7) val srcTerm: Int = 0, - @ProtoId(8) val platformType: Int = 0, - @ProtoId(9) val buType: Int = 0, - @ProtoId(10) val picWidth: Int = 0, - @ProtoId(11) val picHeight: Int = 0, - @ProtoId(12) val picType: Int = 0, - @ProtoId(13) val buildVer: String = "", - @ProtoId(14) val innerIp: Int = 0, - @ProtoId(15) val appPicType: Int = 0, - @ProtoId(16) val originalPic: Int = 0, - @ProtoId(17) val fileIndex: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(18) val dstUin: Long = 0L, - @ProtoId(19) val srvUpload: Int = 0, - @ProtoId(20) val transferUrl: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val groupCode: Long = 0L, + @SerialId(2) val srcUin: Long = 0L, + @SerialId(3) val fileId: Long = 0L, + @SerialId(4) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val fileSize: Long = 0L, + @SerialId(6) val fileName: String ="", + @SerialId(7) val srcTerm: Int = 0, + @SerialId(8) val platformType: Int = 0, + @SerialId(9) val buType: Int = 0, + @SerialId(10) val picWidth: Int = 0, + @SerialId(11) val picHeight: Int = 0, + @SerialId(12) val picType: Int = 0, + @SerialId(13) val buildVer: String = "", + @SerialId(14) val innerIp: Int = 0, + @SerialId(15) val appPicType: Int = 0, + @SerialId(16) val originalPic: Int = 0, + @SerialId(17) val fileIndex: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(18) val dstUin: Long = 0L, + @SerialId(19) val srvUpload: Int = 0, + @SerialId(20) val transferUrl: ByteArray = EMPTY_BYTE_ARRAY ) : ImgReq @Serializable class TryUpImgRsp( - @ProtoId(1) val fileId: Long = 0L, - @ProtoId(2) val result: Int = 0, - @ProtoId(3) val failMsg: String = "", - @ProtoId(4) val boolFileExit: Boolean = false, - @ProtoId(5) val msgImgInfo: ImgInfo? = null, - @ProtoId(6) val uint32UpIp: List? = null, - @ProtoId(7) val uint32UpPort: List? = null, - @ProtoId(8) val upUkey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(9) val fileid: Long = 0L, - @ProtoId(10) val upOffset: Long = 0L, - @ProtoId(11) val blockSize: Long = 0L, - @ProtoId(12) val boolNewBigChan: Boolean = false, - @ProtoId(26) val msgUpIp6: List? = null, - @ProtoId(27) val clientIp6: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(1001) val msgInfo4busi: TryUpInfo4Busi? = null + @SerialId(1) val fileId: Long = 0L, + @SerialId(2) val result: Int = 0, + @SerialId(3) val failMsg: String = "", + @SerialId(4) val boolFileExit: Boolean = false, + @SerialId(5) val msgImgInfo: ImgInfo? = null, + @SerialId(6) val uint32UpIp: List? = null, + @SerialId(7) val uint32UpPort: List? = null, + @SerialId(8) val upUkey: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(9) val fileid: Long = 0L, + @SerialId(10) val upOffset: Long = 0L, + @SerialId(11) val blockSize: Long = 0L, + @SerialId(12) val boolNewBigChan: Boolean = false, + @SerialId(26) val msgUpIp6: List? = null, + @SerialId(27) val clientIp6: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(1001) val msgInfo4busi: TryUpInfo4Busi? = null ) : ProtoBuf @Serializable class TryUpInfo4Busi( - @ProtoId(1) val downDomain: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val thumbDownUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val originalDownUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val bigDownUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val fileResid: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val downDomain: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val thumbDownUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val originalDownUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val bigDownUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val fileResid: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class TryUpPttReq( - @ProtoId(1) val groupCode: Long = 0L, - @ProtoId(2) val srcUin: Long = 0L, - @ProtoId(3) val fileId: Long = 0L, - @ProtoId(4) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val fileSize: Long = 0L, - @ProtoId(6) val fileName: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) val srcTerm: Int = 0, - @ProtoId(8) val platformType: Int = 0, - @ProtoId(9) val buType: Int = 0, - @ProtoId(10) val buildVer: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(11) val innerIp: Int = 0, - @ProtoId(12) val voiceLength: Int = 0, - @ProtoId(13) val boolNewUpChan: Boolean = false, - @ProtoId(14) val codec: Int = 0, - @ProtoId(15) val voiceType: Int = 0, - @ProtoId(16) val buId: Int = 0 + @SerialId(1) val groupCode: Long = 0L, + @SerialId(2) val srcUin: Long = 0L, + @SerialId(3) val fileId: Long = 0L, + @SerialId(4) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val fileSize: Long = 0L, + @SerialId(6) val fileName: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(7) val srcTerm: Int = 0, + @SerialId(8) val platformType: Int = 0, + @SerialId(9) val buType: Int = 0, + @SerialId(10) val buildVer: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(11) val innerIp: Int = 0, + @SerialId(12) val voiceLength: Int = 0, + @SerialId(13) val boolNewUpChan: Boolean = false, + @SerialId(14) val codec: Int = 0, + @SerialId(15) val voiceType: Int = 0, + @SerialId(16) val buId: Int = 0 ) : ProtoBuf @Serializable class TryUpPttRsp( - @ProtoId(1) val fileId: Long = 0L, - @ProtoId(2) val result: Int = 0, - @ProtoId(3) val failMsg: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val boolFileExit: Boolean = false, - @ProtoId(5) val uint32UpIp: List? = null, - @ProtoId(6) val uint32UpPort: List? = null, - @ProtoId(7) val upUkey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) val fileid: Long = 0L, - @ProtoId(9) val upOffset: Long = 0L, - @ProtoId(10) val blockSize: Long = 0L, - @ProtoId(11) val fileKey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(12) val channelType: Int = 0, - @ProtoId(26) val msgUpIp6: List? = null, - @ProtoId(27) val clientIp6: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val fileId: Long = 0L, + @SerialId(2) val result: Int = 0, + @SerialId(3) val failMsg: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val boolFileExit: Boolean = false, + @SerialId(5) val uint32UpIp: List? = null, + @SerialId(6) val uint32UpPort: List? = null, + @SerialId(7) val upUkey: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(8) val fileid: Long = 0L, + @SerialId(9) val upOffset: Long = 0L, + @SerialId(10) val blockSize: Long = 0L, + @SerialId(11) val fileKey: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(12) val channelType: Int = 0, + @SerialId(26) val msgUpIp6: List? = null, + @SerialId(27) val clientIp6: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf } \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x857.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x857.kt index ed262fdb9..2586189c4 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x857.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x857.kt @@ -11,8 +11,8 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto +import kotlinx.serialization.SerialId import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId import kotlinx.serialization.protobuf.ProtoNumberType import kotlinx.serialization.protobuf.ProtoType import net.mamoe.mirai.qqandroid.io.ProtoBuf @@ -21,50 +21,50 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY class GroupOpenSysMsg : ProtoBuf { @Serializable class LightApp( - @ProtoId(1) val app: String = "", - @ProtoId(2) val view: String = "", - @ProtoId(3) val desc: String = "", - @ProtoId(4) val prompt: String = "", - @ProtoId(5) val ver: String = "", - @ProtoId(6) val meta: String = "", - @ProtoId(7) val config: String = "", - @ProtoId(8) val source: Source? = null + @SerialId(1) val app: String = "", + @SerialId(2) val view: String = "", + @SerialId(3) val desc: String = "", + @SerialId(4) val prompt: String = "", + @SerialId(5) val ver: String = "", + @SerialId(6) val meta: String = "", + @SerialId(7) val config: String = "", + @SerialId(8) val source: Source? = null ) : ProtoBuf @Serializable class RichMsg( - @ProtoId(1) val title: String = "", - @ProtoId(2) val desc: String = "", - @ProtoId(3) val brief: String = "", - @ProtoId(4) val cover: String = "", - @ProtoId(5) val url: String = "", - @ProtoId(6) val source: Source? = null + @SerialId(1) val title: String = "", + @SerialId(2) val desc: String = "", + @SerialId(3) val brief: String = "", + @SerialId(4) val cover: String = "", + @SerialId(5) val url: String = "", + @SerialId(6) val source: Source? = null ) : ProtoBuf @Serializable class Sender( - @ProtoId(1) val uin: Long = 0L, - @ProtoId(2) val nick: String = "", - @ProtoId(3) val avatar: String = "", - @ProtoId(4) val url: String = "" + @SerialId(1) val uin: Long = 0L, + @SerialId(2) val nick: String = "", + @SerialId(3) val avatar: String = "", + @SerialId(4) val url: String = "" ) : ProtoBuf @Serializable class Source( - @ProtoId(1) val name: String = "", - @ProtoId(2) val icon: String = "", - @ProtoId(3) val url: String = "" + @SerialId(1) val name: String = "", + @SerialId(2) val icon: String = "", + @SerialId(3) val url: String = "" ) : ProtoBuf @Serializable class SysMsgBody( - @ProtoId(1) val groupId: Long = 0L, - @ProtoId(2) val appid: Long = 0L, - @ProtoId(3) val sender: Sender? = null, - @ProtoId(4) val msgType: Int = 0, - @ProtoId(5) val content: String = "", - @ProtoId(6) val richMsg: RichMsg? = null, - @ProtoId(7) val lightApp: LightApp? = null + @SerialId(1) val groupId: Long = 0L, + @SerialId(2) val appid: Long = 0L, + @SerialId(3) val sender: Sender? = null, + @SerialId(4) val msgType: Int = 0, + @SerialId(5) val content: String = "", + @SerialId(6) val richMsg: RichMsg? = null, + @SerialId(7) val lightApp: LightApp? = null ) : ProtoBuf } @@ -72,337 +72,337 @@ class GroupOpenSysMsg : ProtoBuf { class TroopTips0x857 : ProtoBuf { @Serializable class AIOGrayTipsInfo( - @ProtoId(1) val optUint32ShowLastest: Int = 0, - @ProtoId(2) val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val optUint32Remind: Int = 0, - @ProtoId(4) val optBytesBrief: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val receiverUin: Long = 0L, - @ProtoId(6) val reliaoAdminOpt: Int = 0, - @ProtoId(7) val robotGroupOpt: Int = 0 + @SerialId(1) val optUint32ShowLastest: Int = 0, + @SerialId(2) val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val optUint32Remind: Int = 0, + @SerialId(4) val optBytesBrief: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val receiverUin: Long = 0L, + @SerialId(6) val reliaoAdminOpt: Int = 0, + @SerialId(7) val robotGroupOpt: Int = 0 ) : ProtoBuf @Serializable class AIOTopTipsInfo( - @ProtoId(1) val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val optUint32Icon: Int = 0, - @ProtoId(3) val optEnumAction: Int /* enum */ = 1, - @ProtoId(4) val optBytesUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val optBytesData: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val optBytesDataI: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) val optBytesDataA: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) val optBytesDataP: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val optUint32Icon: Int = 0, + @SerialId(3) val optEnumAction: Int /* enum */ = 1, + @SerialId(4) val optBytesUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val optBytesData: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val optBytesDataI: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(7) val optBytesDataA: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(8) val optBytesDataP: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class FloatedTipsInfo( - @ProtoId(1) val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class GeneralGrayTipInfo( - @ProtoId(1) val busiType: Long = 0L, - @ProtoId(2) val busiId: Long = 0L, - @ProtoId(3) val ctrlFlag: Int = 0, - @ProtoId(4) val c2cType: Int = 0, - @ProtoId(5) val serviceType: Int = 0, - @ProtoId(6) val templId: Long = 0L, - @ProtoId(7) val msgTemplParam: List? = null, - @ProtoId(8) val content: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(10) val tipsSeqId: Long = 0L, - @ProtoId(100) val pbReserv: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val busiType: Long = 0L, + @SerialId(2) val busiId: Long = 0L, + @SerialId(3) val ctrlFlag: Int = 0, + @SerialId(4) val c2cType: Int = 0, + @SerialId(5) val serviceType: Int = 0, + @SerialId(6) val templId: Long = 0L, + @SerialId(7) val msgTemplParam: List? = null, + @SerialId(8) val content: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(10) val tipsSeqId: Long = 0L, + @SerialId(100) val pbReserv: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class GoldMsgTipsElem( - @ProtoId(1) val type: Int = 0, - @ProtoId(2) val billno: String = "", - @ProtoId(3) val result: Int = 0, - @ProtoId(4) val amount: Int = 0, - @ProtoId(5) val total: Int = 0, - @ProtoId(6) val interval: Int = 0, - @ProtoId(7) val finish: Int = 0, - @ProtoId(8) val uin: List? = null, - @ProtoId(9) val action: Int = 0 + @SerialId(1) val type: Int = 0, + @SerialId(2) val billno: String = "", + @SerialId(3) val result: Int = 0, + @SerialId(4) val amount: Int = 0, + @SerialId(5) val total: Int = 0, + @SerialId(6) val interval: Int = 0, + @SerialId(7) val finish: Int = 0, + @SerialId(8) val uin: List? = null, + @SerialId(9) val action: Int = 0 ) : ProtoBuf @Serializable class GroupInfoChange( - @ProtoId(1) val groupHonorSwitch: Int = 0 + @SerialId(1) val groupHonorSwitch: Int = 0 ) : ProtoBuf @Serializable class GroupNotifyInfo( - @ProtoId(1) val optUint32AutoPullFlag: Int = 0, - @ProtoId(2) val optBytesFeedsId: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val optUint32AutoPullFlag: Int = 0, + @SerialId(2) val optBytesFeedsId: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class InstCtrl( - @ProtoId(1) val msgSendToInst: List? = null, - @ProtoId(2) val msgExcludeInst: List? = null, - @ProtoId(3) val msgFromInst: InstInfo? = null + @SerialId(1) val msgSendToInst: List? = null, + @SerialId(2) val msgExcludeInst: List? = null, + @SerialId(3) val msgFromInst: InstInfo? = null ) : ProtoBuf @Serializable class InstInfo( - @ProtoId(1) val apppid: Int = 0, - @ProtoId(2) val instid: Int = 0, - @ProtoId(3) val platform: Int = 0, - @ProtoId(4) val openAppid: Int = 0, - @ProtoId(5) val productid: Int = 0, - @ProtoId(6) val ssoBid: Int = 0, - @ProtoId(7) val guid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) val verMin: Int = 0, - @ProtoId(9) val verMax: Int = 0 + @SerialId(1) val apppid: Int = 0, + @SerialId(2) val instid: Int = 0, + @SerialId(3) val platform: Int = 0, + @SerialId(4) val openAppid: Int = 0, + @SerialId(5) val productid: Int = 0, + @SerialId(6) val ssoBid: Int = 0, + @SerialId(7) val guid: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(8) val verMin: Int = 0, + @SerialId(9) val verMax: Int = 0 ) : ProtoBuf @Serializable class LbsShareChangePushInfo( - @ProtoId(1) val msgType: Int = 0, - @ProtoId(2) val msgInfo: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val versionCtrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val groupId: Long = 0L, - @ProtoId(5) val operUin: Long = 0L, - @ProtoId(6) val grayTips: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) val msgSeq: Long = 0L, - @ProtoId(8) val joinNums: Int = 0, - @ProtoId(99) val pushType: Int = 0, - @ProtoId(100) val extInfo: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val msgType: Int = 0, + @SerialId(2) val msgInfo: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val versionCtrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val groupId: Long = 0L, + @SerialId(5) val operUin: Long = 0L, + @SerialId(6) val grayTips: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(7) val msgSeq: Long = 0L, + @SerialId(8) val joinNums: Int = 0, + @SerialId(99) val pushType: Int = 0, + @SerialId(100) val extInfo: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class LuckyBagNotify( - @ProtoId(1) val msgTips: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val msgTips: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class MediaChangePushInfo( - @ProtoId(1) val msgType: Int = 0, - @ProtoId(2) val msgInfo: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val versionCtrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val groupId: Long = 0L, - @ProtoId(5) val operUin: Long = 0L, - @ProtoId(6) val grayTips: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) val msgSeq: Long = 0L, - @ProtoId(8) val joinNums: Int = 0, - @ProtoId(9) val msgPerSetting: PersonalSetting? = null, - @ProtoId(10) val playMode: Int = 0, - @ProtoId(99) val mediaType: Int = 0, - @ProtoId(100) val extInfo: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val msgType: Int = 0, + @SerialId(2) val msgInfo: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val versionCtrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val groupId: Long = 0L, + @SerialId(5) val operUin: Long = 0L, + @SerialId(6) val grayTips: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(7) val msgSeq: Long = 0L, + @SerialId(8) val joinNums: Int = 0, + @SerialId(9) val msgPerSetting: PersonalSetting? = null, + @SerialId(10) val playMode: Int = 0, + @SerialId(99) val mediaType: Int = 0, + @SerialId(100) val extInfo: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf { @Serializable class PersonalSetting( - @ProtoId(1) val themeId: Int = 0, - @ProtoId(2) val playerId: Int = 0, - @ProtoId(3) val fontId: Int = 0 + @SerialId(1) val themeId: Int = 0, + @SerialId(2) val playerId: Int = 0, + @SerialId(3) val fontId: Int = 0 ) : ProtoBuf } @Serializable class MessageBoxInfo( - @ProtoId(1) val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val optBytesTitle: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val optBytesButton: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val optBytesTitle: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val optBytesButton: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class MessageRecallReminder( - @ProtoId(1) val uin: Long = 0L, - @ProtoId(2) val nickname: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val recalledMsgList: List = listOf(), - @ProtoId(4) val reminderContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val userdef: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val groupType: Int = 0, - @ProtoId(7) val opType: Int = 0 + @SerialId(1) val uin: Long = 0L, + @SerialId(2) val nickname: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val recalledMsgList: List = listOf(), + @SerialId(4) val reminderContent: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val userdef: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val groupType: Int = 0, + @SerialId(7) val opType: Int = 0 ) : ProtoBuf { @Serializable class MessageMeta( - @ProtoId(1) val seq: Int = 0, - @ProtoId(2) val time: Int = 0, - @ProtoId(3) val msgRandom: Int = 0, - @ProtoId(4) val msgType: Int = 0, - @ProtoId(5) val msgFlag: Int = 0, - @ProtoId(6) val authorUin: Long = 0L + @SerialId(1) val seq: Int = 0, + @SerialId(2) val time: Int = 0, + @SerialId(3) val msgRandom: Int = 0, + @SerialId(4) val msgType: Int = 0, + @SerialId(5) val msgFlag: Int = 0, + @SerialId(6) val authorUin: Long = 0L ) : ProtoBuf } @Serializable class MiniAppNotify( - @ProtoId(1) val msg: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val msg: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class NotifyMsgBody( - @ProtoId(1) val optEnumType: Int /* enum */ = 1, - @ProtoId(2) val optUint64MsgTime: Long = 0L, - @ProtoId(3) val optUint64MsgExpires: Long = 0L, - @ProtoId(4) val optUint64GroupCode: Long = 0L, - @ProtoId(5) val optMsgGraytips: AIOGrayTipsInfo? = null, - @ProtoId(6) val optMsgMessagebox: MessageBoxInfo? = null, - @ProtoId(7) val optMsgFloatedtips: FloatedTipsInfo? = null, - @ProtoId(8) val optMsgToptips: AIOTopTipsInfo? = null, - @ProtoId(9) val optMsgRedtips: RedGrayTipsInfo? = null, - @ProtoId(10) val optMsgGroupNotify: GroupNotifyInfo? = null, - @ProtoId(11) val optMsgRecall: MessageRecallReminder? = null, - @ProtoId(12) val optMsgThemeNotify: ThemeStateNotify? = null, - @ProtoId(13) val serviceType: Int = 0, - @ProtoId(14) val optMsgObjmsgUpdate: NotifyObjmsgUpdate? = null, - @ProtoId(15) val optMsgWerewolfPush: WereWolfPush? = null, + @SerialId(1) val optEnumType: Int /* enum */ = 1, + @SerialId(2) val optUint64MsgTime: Long = 0L, + @SerialId(3) val optUint64MsgExpires: Long = 0L, + @SerialId(4) val optUint64GroupCode: Long = 0L, + @SerialId(5) val optMsgGraytips: AIOGrayTipsInfo? = null, + @SerialId(6) val optMsgMessagebox: MessageBoxInfo? = null, + @SerialId(7) val optMsgFloatedtips: FloatedTipsInfo? = null, + @SerialId(8) val optMsgToptips: AIOTopTipsInfo? = null, + @SerialId(9) val optMsgRedtips: RedGrayTipsInfo? = null, + @SerialId(10) val optMsgGroupNotify: GroupNotifyInfo? = null, + @SerialId(11) val optMsgRecall: MessageRecallReminder? = null, + @SerialId(12) val optMsgThemeNotify: ThemeStateNotify? = null, + @SerialId(13) val serviceType: Int = 0, + @SerialId(14) val optMsgObjmsgUpdate: NotifyObjmsgUpdate? = null, + @SerialId(15) val optMsgWerewolfPush: WereWolfPush? = null, // @SerialId(16) val optStcmGameState: ApolloGameStatus.STCMGameMessage? = null, // @SerialId(17) val aplloMsgPush: ApolloPushMsgInfo.STPushMsgElem? = null, - @ProtoId(18) val optMsgGoldtips: GoldMsgTipsElem? = null, - @ProtoId(20) val optMsgMiniappNotify: MiniAppNotify? = null, - @ProtoId(21) val optUint64SenderUin: Long = 0L, - @ProtoId(22) val optMsgLuckybagNotify: LuckyBagNotify? = null, - @ProtoId(23) val optMsgTroopformtipsPush: TroopFormGrayTipsInfo? = null, - @ProtoId(24) val optMsgMediaPush: MediaChangePushInfo? = null, - @ProtoId(26) val optGeneralGrayTip: GeneralGrayTipInfo? = null, - @ProtoId(27) val optMsgVideoPush: VideoChangePushInfo? = null, - @ProtoId(28) val optLbsShareChangePlusInfo: LbsShareChangePushInfo? = null, - @ProtoId(29) val optMsgSingPush: SingChangePushInfo? = null, - @ProtoId(30) val optMsgGroupInfoChange: GroupInfoChange? = null + @SerialId(18) val optMsgGoldtips: GoldMsgTipsElem? = null, + @SerialId(20) val optMsgMiniappNotify: MiniAppNotify? = null, + @SerialId(21) val optUint64SenderUin: Long = 0L, + @SerialId(22) val optMsgLuckybagNotify: LuckyBagNotify? = null, + @SerialId(23) val optMsgTroopformtipsPush: TroopFormGrayTipsInfo? = null, + @SerialId(24) val optMsgMediaPush: MediaChangePushInfo? = null, + @SerialId(26) val optGeneralGrayTip: GeneralGrayTipInfo? = null, + @SerialId(27) val optMsgVideoPush: VideoChangePushInfo? = null, + @SerialId(28) val optLbsShareChangePlusInfo: LbsShareChangePushInfo? = null, + @SerialId(29) val optMsgSingPush: SingChangePushInfo? = null, + @SerialId(30) val optMsgGroupInfoChange: GroupInfoChange? = null ) : ProtoBuf @Serializable class NotifyObjmsgUpdate( - @ProtoId(1) val objmsgId: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val updateType: Int = 0, - @ProtoId(3) val extMsg: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val objmsgId: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val updateType: Int = 0, + @SerialId(3) val extMsg: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class RedGrayTipsInfo( - @ProtoId(1) val optUint32ShowLastest: Int = 0, - @ProtoId(2) val senderUin: Long = 0L, - @ProtoId(3) val receiverUin: Long = 0L, - @ProtoId(4) val senderRichContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val receiverRichContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val authkey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoType(ProtoNumberType.SIGNED) @ProtoId(7) val sint32Msgtype: Int = 0, - @ProtoId(8) val luckyFlag: Int = 0, - @ProtoId(9) val hideFlag: Int = 0, - @ProtoId(10) val pcBody: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(11) val icon: Int = 0, - @ProtoId(12) val luckyUin: Long = 0L, - @ProtoId(13) val time: Int = 0, - @ProtoId(14) val random: Int = 0, - @ProtoId(15) val broadcastRichContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(16) val idiom: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(17) val idiomSeq: Int = 0, - @ProtoId(18) val idiomAlpha: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(19) val jumpurl: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val optUint32ShowLastest: Int = 0, + @SerialId(2) val senderUin: Long = 0L, + @SerialId(3) val receiverUin: Long = 0L, + @SerialId(4) val senderRichContent: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val receiverRichContent: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val authkey: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoType(ProtoNumberType.SIGNED) @SerialId(7) val sint32Msgtype: Int = 0, + @SerialId(8) val luckyFlag: Int = 0, + @SerialId(9) val hideFlag: Int = 0, + @SerialId(10) val pcBody: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(11) val icon: Int = 0, + @SerialId(12) val luckyUin: Long = 0L, + @SerialId(13) val time: Int = 0, + @SerialId(14) val random: Int = 0, + @SerialId(15) val broadcastRichContent: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(16) val idiom: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(17) val idiomSeq: Int = 0, + @SerialId(18) val idiomAlpha: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(19) val jumpurl: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val optUint64GroupCode: Long = 0L, - @ProtoId(2) val uint64Memberuins: List? = null, - @ProtoId(3) val optUint32Offline: Int = 0, - @ProtoId(4) val msgInstCtrl: InstCtrl? = null, - @ProtoId(5) val optBytesMsg: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val optUint32BusiType: Int = 0 + @SerialId(1) val optUint64GroupCode: Long = 0L, + @SerialId(2) val uint64Memberuins: List? = null, + @SerialId(3) val optUint32Offline: Int = 0, + @SerialId(4) val msgInstCtrl: InstCtrl? = null, + @SerialId(5) val optBytesMsg: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val optUint32BusiType: Int = 0 ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val optUint64GroupCode: Long = 0L + @SerialId(1) val optUint64GroupCode: Long = 0L ) : ProtoBuf @Serializable class SingChangePushInfo( - @ProtoId(1) val seq: Long = 0L, - @ProtoId(2) val actionType: Int = 0, - @ProtoId(3) val groupId: Long = 0L, - @ProtoId(4) val operUin: Long = 0L, - @ProtoId(5) val grayTips: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val joinNums: Int = 0 + @SerialId(1) val seq: Long = 0L, + @SerialId(2) val actionType: Int = 0, + @SerialId(3) val groupId: Long = 0L, + @SerialId(4) val operUin: Long = 0L, + @SerialId(5) val grayTips: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val joinNums: Int = 0 ) : ProtoBuf @Serializable class TemplParam( - @ProtoId(1) val name: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val value: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val name: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val value: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class ThemeStateNotify( - @ProtoId(1) val state: Int = 0, - @ProtoId(2) val feedsId: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val themeName: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val actionUin: Long = 0L, - @ProtoId(5) val createUin: Long = 0L + @SerialId(1) val state: Int = 0, + @SerialId(2) val feedsId: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val themeName: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val actionUin: Long = 0L, + @SerialId(5) val createUin: Long = 0L ) : ProtoBuf @Serializable class TroopFormGrayTipsInfo( - @ProtoId(1) val writerUin: Long = 0L, - @ProtoId(2) val creatorUin: Long = 0L, - @ProtoId(3) val richContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val optBytesUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val creatorNick: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val writerUin: Long = 0L, + @SerialId(2) val creatorUin: Long = 0L, + @SerialId(3) val richContent: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val optBytesUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val creatorNick: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class VideoChangePushInfo( - @ProtoId(1) val seq: Long = 0L, - @ProtoId(2) val actionType: Int = 0, - @ProtoId(3) val groupId: Long = 0L, - @ProtoId(4) val operUin: Long = 0L, - @ProtoId(5) val grayTips: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val joinNums: Int = 0, - @ProtoId(100) val extInfo: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val seq: Long = 0L, + @SerialId(2) val actionType: Int = 0, + @SerialId(3) val groupId: Long = 0L, + @SerialId(4) val operUin: Long = 0L, + @SerialId(5) val grayTips: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val joinNums: Int = 0, + @SerialId(100) val extInfo: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class WereWolfPush( - @ProtoId(1) val pushType: Int = 0, - @ProtoId(2) val gameRoom: Long = 0L, - @ProtoId(3) val enumGameState: Int = 0, - @ProtoId(4) val gameRound: Int = 0, - @ProtoId(5) val roles: List? = null, - @ProtoId(6) val speaker: Long = 0L, - @ProtoId(7) val judgeUin: Long = 0L, - @ProtoId(8) val judgeWords: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(9) val enumOperation: Int = 0, - @ProtoId(10) val srcUser: Long = 0L, - @ProtoId(11) val dstUser: Long = 0L, - @ProtoId(12) val deadUsers: List? = null, - @ProtoId(13) val gameResult: Int = 0, - @ProtoId(14) val timeoutSec: Int = 0, - @ProtoId(15) val killConfirmed: Int = 0, - @ProtoId(16) val judgeNickname: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(17) val votedTieUsers: List? = null + @SerialId(1) val pushType: Int = 0, + @SerialId(2) val gameRoom: Long = 0L, + @SerialId(3) val enumGameState: Int = 0, + @SerialId(4) val gameRound: Int = 0, + @SerialId(5) val roles: List? = null, + @SerialId(6) val speaker: Long = 0L, + @SerialId(7) val judgeUin: Long = 0L, + @SerialId(8) val judgeWords: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(9) val enumOperation: Int = 0, + @SerialId(10) val srcUser: Long = 0L, + @SerialId(11) val dstUser: Long = 0L, + @SerialId(12) val deadUsers: List? = null, + @SerialId(13) val gameResult: Int = 0, + @SerialId(14) val timeoutSec: Int = 0, + @SerialId(15) val killConfirmed: Int = 0, + @SerialId(16) val judgeNickname: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(17) val votedTieUsers: List? = null ) : ProtoBuf { @Serializable class GameRecord( - @ProtoId(1) val total: Int = 0, - @ProtoId(2) val win: Int = 0, - @ProtoId(3) val lose: Int = 0, - @ProtoId(4) val draw: Int = 0 + @SerialId(1) val total: Int = 0, + @SerialId(2) val win: Int = 0, + @SerialId(3) val lose: Int = 0, + @SerialId(4) val draw: Int = 0 ) : ProtoBuf @Serializable class Role( - @ProtoId(1) val uin: Long = 0L, - @ProtoId(2) val enumType: Int = 0, - @ProtoId(3) val enumState: Int = 0, - @ProtoId(4) val canSpeak: Int = 0, - @ProtoId(5) val canListen: Int = 0, - @ProtoId(6) val position: Int = 0, - @ProtoId(7) val canVote: Int = 0, - @ProtoId(8) val canVoted: Int = 0, - @ProtoId(9) val alreadyChecked: Int = 0, - @ProtoId(10) val alreadySaved: Int = 0, - @ProtoId(11) val alreadyPoisoned: Int = 0, - @ProtoId(12) val playerState: Int = 0, - @ProtoId(13) val enumDeadOp: Int = 0, - @ProtoId(14) val enumOperation: Int = 0, - @ProtoId(15) val dstUser: Long = 0L, - @ProtoId(16) val operationRound: Int = 0, - @ProtoId(17) val msgGameRecord: GameRecord? = null, - @ProtoId(18) val isWerewolf: Int = 0, - @ProtoId(19) val defendedUser: Long = 0L, - @ProtoId(20) val isSheriff: Int = 0 + @SerialId(1) val uin: Long = 0L, + @SerialId(2) val enumType: Int = 0, + @SerialId(3) val enumState: Int = 0, + @SerialId(4) val canSpeak: Int = 0, + @SerialId(5) val canListen: Int = 0, + @SerialId(6) val position: Int = 0, + @SerialId(7) val canVote: Int = 0, + @SerialId(8) val canVoted: Int = 0, + @SerialId(9) val alreadyChecked: Int = 0, + @SerialId(10) val alreadySaved: Int = 0, + @SerialId(11) val alreadyPoisoned: Int = 0, + @SerialId(12) val playerState: Int = 0, + @SerialId(13) val enumDeadOp: Int = 0, + @SerialId(14) val enumOperation: Int = 0, + @SerialId(15) val dstUser: Long = 0L, + @SerialId(16) val operationRound: Int = 0, + @SerialId(17) val msgGameRecord: GameRecord? = null, + @SerialId(18) val isWerewolf: Int = 0, + @SerialId(19) val defendedUser: Long = 0L, + @SerialId(20) val isSheriff: Int = 0 ) : ProtoBuf } } \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x858.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x858.kt index 001b0cb66..eda82822c 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x858.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x858.kt @@ -11,8 +11,8 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto +import kotlinx.serialization.SerialId import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId import kotlinx.serialization.protobuf.ProtoNumberType import kotlinx.serialization.protobuf.ProtoType import net.mamoe.mirai.qqandroid.io.ProtoBuf @@ -22,74 +22,74 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY class Oidb0x858 : ProtoBuf { @Serializable class GoldMsgTipsElem( - @ProtoId(1) val type: Int = 0, - @ProtoId(2) val billno: String = "", - @ProtoId(3) val result: Int = 0, - @ProtoId(4) val amount: Int = 0, - @ProtoId(5) val total: Int = 0, - @ProtoId(6) val interval: Int = 0, - @ProtoId(7) val finish: Int = 0, - @ProtoId(8) val uin: List? = null, - @ProtoId(9) val action: Int = 0 + @SerialId(1) val type: Int = 0, + @SerialId(2) val billno: String = "", + @SerialId(3) val result: Int = 0, + @SerialId(4) val amount: Int = 0, + @SerialId(5) val total: Int = 0, + @SerialId(6) val interval: Int = 0, + @SerialId(7) val finish: Int = 0, + @SerialId(8) val uin: List? = null, + @SerialId(9) val action: Int = 0 ) : ProtoBuf @Serializable class MessageRecallReminder( - @ProtoId(1) val uin: Long = 0L, - @ProtoId(2) val nickname: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val recalledMsgList: List = listOf(), - @ProtoId(4) val reminderContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val userdef: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val uin: Long = 0L, + @SerialId(2) val nickname: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val recalledMsgList: List = listOf(), + @SerialId(4) val reminderContent: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val userdef: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf { @Serializable class MessageMeta( - @ProtoId(1) val seq: Int = 0, - @ProtoId(2) val time: Int = 0, - @ProtoId(3) val msgRandom: Int = 0 + @SerialId(1) val seq: Int = 0, + @SerialId(2) val time: Int = 0, + @SerialId(3) val msgRandom: Int = 0 ) : ProtoBuf } @Serializable class NotifyMsgBody( - @ProtoId(1) val optEnumType: Int /* enum */ = 5, - @ProtoId(2) val optUint64MsgTime: Long = 0L, - @ProtoId(3) val optUint64MsgExpires: Long = 0L, - @ProtoId(4) val optUint64ConfUin: Long = 0L, - @ProtoId(5) val optMsgRedtips: RedGrayTipsInfo? = null, - @ProtoId(6) val optMsgRecallReminder: MessageRecallReminder? = null, - @ProtoId(7) val optMsgObjUpdate: NotifyObjmsgUpdate? = null, + @SerialId(1) val optEnumType: Int /* enum */ = 5, + @SerialId(2) val optUint64MsgTime: Long = 0L, + @SerialId(3) val optUint64MsgExpires: Long = 0L, + @SerialId(4) val optUint64ConfUin: Long = 0L, + @SerialId(5) val optMsgRedtips: RedGrayTipsInfo? = null, + @SerialId(6) val optMsgRecallReminder: MessageRecallReminder? = null, + @SerialId(7) val optMsgObjUpdate: NotifyObjmsgUpdate? = null, // @SerialId(8) val optStcmGameState: ApolloGameStatus.STCMGameMessage? = null, // @SerialId(9) val aplloMsgPush: ApolloPushMsgInfo.STPushMsgElem? = null, - @ProtoId(10) val optMsgGoldtips: GoldMsgTipsElem? = null + @SerialId(10) val optMsgGoldtips: GoldMsgTipsElem? = null ) : ProtoBuf @Serializable class NotifyObjmsgUpdate( - @ProtoId(1) val objmsgId: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val updateType: Int = 0, - @ProtoId(3) val extMsg: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val objmsgId: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val updateType: Int = 0, + @SerialId(3) val extMsg: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class RedGrayTipsInfo( - @ProtoId(1) val optUint32ShowLastest: Int = 0, - @ProtoId(2) val senderUin: Long = 0L, - @ProtoId(3) val receiverUin: Long = 0L, - @ProtoId(4) val senderRichContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val receiverRichContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val authkey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoType(ProtoNumberType.SIGNED) @ProtoId(7) val sint32Msgtype: Int = 0, - @ProtoId(8) val luckyFlag: Int = 0, - @ProtoId(9) val hideFlag: Int = 0, - @ProtoId(10) val pcBody: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(11) val icon: Int = 0, - @ProtoId(12) val luckyUin: Long = 0L, - @ProtoId(13) val time: Int = 0, - @ProtoId(14) val random: Int = 0, - @ProtoId(15) val broadcastRichContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(16) val idiom: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(17) val idiomSeq: Int = 0, - @ProtoId(18) val idiomAlpha: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(19) val jumpurl: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val optUint32ShowLastest: Int = 0, + @SerialId(2) val senderUin: Long = 0L, + @SerialId(3) val receiverUin: Long = 0L, + @SerialId(4) val senderRichContent: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val receiverRichContent: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val authkey: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoType(ProtoNumberType.SIGNED) @SerialId(7) val sint32Msgtype: Int = 0, + @SerialId(8) val luckyFlag: Int = 0, + @SerialId(9) val hideFlag: Int = 0, + @SerialId(10) val pcBody: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(11) val icon: Int = 0, + @SerialId(12) val luckyUin: Long = 0L, + @SerialId(13) val time: Int = 0, + @SerialId(14) val random: Int = 0, + @SerialId(15) val broadcastRichContent: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(16) val idiom: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(17) val idiomSeq: Int = 0, + @SerialId(18) val idiomAlpha: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(19) val jumpurl: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf } diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Define.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Define.kt index 0ec01671d..22a9d3748 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Define.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Define.kt @@ -9,8 +9,8 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto +import kotlinx.serialization.SerialId import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId import net.mamoe.mirai.qqandroid.io.ProtoBuf import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY @@ -18,56 +18,56 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY class Common : ProtoBuf { @Serializable class BindInfo( - @ProtoId(1) val friUin: Long = 0L, - @ProtoId(2) val friNick: String = "", - @ProtoId(3) val time: Long = 0L, - @ProtoId(4) val bindStatus: Int = 0 + @SerialId(1) val friUin: Long = 0L, + @SerialId(2) val friNick: String = "", + @SerialId(3) val time: Long = 0L, + @SerialId(4) val bindStatus: Int = 0 ) : ProtoBuf @Serializable class MedalInfo( - @ProtoId(1) val id: Int = 0, - @ProtoId(2) val type: Int = 0, - @ProtoId(4) val seq: Long = 0, - @ProtoId(5) val name: String = "", - @ProtoId(6) val newflag: Int = 0, - @ProtoId(7) val time: Long = 0L, - @ProtoId(8) val msgBindFri: Common.BindInfo? = null, - @ProtoId(11) val desc: String = "", - @ProtoId(31) val level: Int = 0, - @ProtoId(36) val taskinfos: List? = null, - @ProtoId(40) val point: Int = 0, - @ProtoId(41) val pointLevel2: Int = 0, - @ProtoId(42) val pointLevel3: Int = 0, - @ProtoId(43) val seqLevel2: Long = 0, - @ProtoId(44) val seqLevel3: Long = 0, - @ProtoId(45) val timeLevel2: Long = 0L, - @ProtoId(46) val timeLevel3: Long = 0L, - @ProtoId(47) val descLevel2: String = "", - @ProtoId(48) val descLevel3: String = "", - @ProtoId(49) val endtime: Int = 0, - @ProtoId(50) val detailUrl: String = "", - @ProtoId(51) val detailUrl2: String = "", - @ProtoId(52) val detailUrl3: String = "", - @ProtoId(53) val taskDesc: String = "", - @ProtoId(54) val taskDesc2: String = "", - @ProtoId(55) val taskDesc3: String = "", - @ProtoId(56) val levelCount: Int = 0, - @ProtoId(57) val noProgress: Int = 0, - @ProtoId(58) val resource: String = "", - @ProtoId(59) val fromuinLevel: Int = 0, - @ProtoId(60) val unread: Int = 0, - @ProtoId(61) val unread2: Int = 0, - @ProtoId(62) val unread3: Int = 0 + @SerialId(1) val id: Int = 0, + @SerialId(2) val type: Int = 0, + @SerialId(4) val seq: Long = 0, + @SerialId(5) val name: String = "", + @SerialId(6) val newflag: Int = 0, + @SerialId(7) val time: Long = 0L, + @SerialId(8) val msgBindFri: Common.BindInfo? = null, + @SerialId(11) val desc: String = "", + @SerialId(31) val level: Int = 0, + @SerialId(36) val taskinfos: List? = null, + @SerialId(40) val point: Int = 0, + @SerialId(41) val pointLevel2: Int = 0, + @SerialId(42) val pointLevel3: Int = 0, + @SerialId(43) val seqLevel2: Long = 0, + @SerialId(44) val seqLevel3: Long = 0, + @SerialId(45) val timeLevel2: Long = 0L, + @SerialId(46) val timeLevel3: Long = 0L, + @SerialId(47) val descLevel2: String = "", + @SerialId(48) val descLevel3: String = "", + @SerialId(49) val endtime: Int = 0, + @SerialId(50) val detailUrl: String = "", + @SerialId(51) val detailUrl2: String = "", + @SerialId(52) val detailUrl3: String = "", + @SerialId(53) val taskDesc: String = "", + @SerialId(54) val taskDesc2: String = "", + @SerialId(55) val taskDesc3: String = "", + @SerialId(56) val levelCount: Int = 0, + @SerialId(57) val noProgress: Int = 0, + @SerialId(58) val resource: String = "", + @SerialId(59) val fromuinLevel: Int = 0, + @SerialId(60) val unread: Int = 0, + @SerialId(61) val unread2: Int = 0, + @SerialId(62) val unread3: Int = 0 ) : ProtoBuf @Serializable class MedalTaskInfo( - @ProtoId(1) val taskid: Int = 0, - @ProtoId(32) val int32TaskValue: Int = 0, - @ProtoId(33) val tarValue: Int = 0, - @ProtoId(34) val tarValueLevel2: Int = 0, - @ProtoId(35) val tarValueLevel3: Int = 0 + @SerialId(1) val taskid: Int = 0, + @SerialId(32) val int32TaskValue: Int = 0, + @SerialId(33) val tarValue: Int = 0, + @SerialId(34) val tarValueLevel2: Int = 0, + @SerialId(35) val tarValueLevel3: Int = 0 ) : ProtoBuf } @@ -75,475 +75,475 @@ class Common : ProtoBuf { class AppointDefine : ProtoBuf { @Serializable class ADFeedContent( - @ProtoId(1) val msgUserInfo: AppointDefine.UserInfo? = null, - @ProtoId(2) val strPicUrl: List = listOf(), - @ProtoId(3) val msgText: AppointDefine.RichText? = null, - @ProtoId(4) val attendInfo: String = "", - @ProtoId(5) val actionUrl: String = "", - @ProtoId(6) val publishTime: Int = 0, - @ProtoId(7) val msgHotTopicList: AppointDefine.HotTopicList? = null, - @ProtoId(8) val moreUrl: String = "", - @ProtoId(9) val recordDuration: String = "" + @SerialId(1) val msgUserInfo: AppointDefine.UserInfo? = null, + @SerialId(2) val strPicUrl: List = listOf(), + @SerialId(3) val msgText: AppointDefine.RichText? = null, + @SerialId(4) val attendInfo: String = "", + @SerialId(5) val actionUrl: String = "", + @SerialId(6) val publishTime: Int = 0, + @SerialId(7) val msgHotTopicList: AppointDefine.HotTopicList? = null, + @SerialId(8) val moreUrl: String = "", + @SerialId(9) val recordDuration: String = "" ) : ProtoBuf @Serializable class RichText( - @ProtoId(1) val msgElems: List? = null + @SerialId(1) val msgElems: List? = null ) : ProtoBuf @Serializable class RankEvent( - @ProtoId(1) val listtype: Int = 0, - @ProtoId(2) val notifytype: Int = 0, - @ProtoId(3) val eventtime: Int = 0, - @ProtoId(4) val seq: Int = 0, - @ProtoId(5) val notifyTips: String = "" + @SerialId(1) val listtype: Int = 0, + @SerialId(2) val notifytype: Int = 0, + @SerialId(3) val eventtime: Int = 0, + @SerialId(4) val seq: Int = 0, + @SerialId(5) val notifyTips: String = "" ) : ProtoBuf @Serializable class Wifi( - @ProtoId(1) val mac: Long = 0L, - @ProtoId(2) val int32Rssi: Int = 0 + @SerialId(1) val mac: Long = 0L, + @SerialId(2) val int32Rssi: Int = 0 ) : ProtoBuf @Serializable class InterestItem( - @ProtoId(1) val tagId: Long = 0L, - @ProtoId(2) val tagName: String = "", - @ProtoId(3) val tagIconUrl: String = "", - @ProtoId(4) val tagHref: String = "", - @ProtoId(5) val tagBackColor: String = "", - @ProtoId(6) val tagFontColor: String = "", - @ProtoId(7) val tagVid: String = "", - @ProtoId(8) val tagType: Int = 0, - @ProtoId(9) val addTime: Int = 0, - @ProtoId(10) val tagCategory: String = "", - @ProtoId(11) val tagOtherUrl: String = "", - @ProtoId(12) val bid: Int = 0 + @SerialId(1) val tagId: Long = 0L, + @SerialId(2) val tagName: String = "", + @SerialId(3) val tagIconUrl: String = "", + @SerialId(4) val tagHref: String = "", + @SerialId(5) val tagBackColor: String = "", + @SerialId(6) val tagFontColor: String = "", + @SerialId(7) val tagVid: String = "", + @SerialId(8) val tagType: Int = 0, + @SerialId(9) val addTime: Int = 0, + @SerialId(10) val tagCategory: String = "", + @SerialId(11) val tagOtherUrl: String = "", + @SerialId(12) val bid: Int = 0 ) : ProtoBuf @Serializable class ShopID( - @ProtoId(1) val shopid: String = "", - @ProtoId(2) val sp: Int = 0 + @SerialId(1) val shopid: String = "", + @SerialId(2) val sp: Int = 0 ) : ProtoBuf @Serializable class FeedComment( - @ProtoId(1) val commentId: String = "", - @ProtoId(2) val feedId: String = "", - @ProtoId(3) val msgPublisherInfo: AppointDefine.StrangerInfo? = null, - @ProtoId(4) val time: Int = 0, - @ProtoId(6) val msgReplyInfo: AppointDefine.ReplyInfo? = null, - @ProtoId(7) val flag: Int = 0, - @ProtoId(8) val msgContent: AppointDefine.RichText? = null, - @ProtoId(9) val hot: Int = 0 + @SerialId(1) val commentId: String = "", + @SerialId(2) val feedId: String = "", + @SerialId(3) val msgPublisherInfo: AppointDefine.StrangerInfo? = null, + @SerialId(4) val time: Int = 0, + @SerialId(6) val msgReplyInfo: AppointDefine.ReplyInfo? = null, + @SerialId(7) val flag: Int = 0, + @SerialId(8) val msgContent: AppointDefine.RichText? = null, + @SerialId(9) val hot: Int = 0 ) : ProtoBuf @Serializable class ADFeed( - @ProtoId(1) val taskId: Int = 0, - @ProtoId(2) val style: Int = 0, - @ProtoId(3) val content: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val taskId: Int = 0, + @SerialId(2) val style: Int = 0, + @SerialId(3) val content: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class Cell( - @ProtoId(1) val int32Mcc: Int = -1, - @ProtoId(2) val int32Mnc: Int = -1, - @ProtoId(3) val int32Lac: Int = -1, - @ProtoId(4) val int32Cellid: Int = -1, - @ProtoId(5) val int32Rssi: Int = 0 + @SerialId(1) val int32Mcc: Int = -1, + @SerialId(2) val int32Mnc: Int = -1, + @SerialId(3) val int32Lac: Int = -1, + @SerialId(4) val int32Cellid: Int = -1, + @SerialId(5) val int32Rssi: Int = 0 ) : ProtoBuf @Serializable class RecentVistorEvent( - @ProtoId(1) val eventtype: Int = 0, - @ProtoId(2) val eventTinyid: Long = 0L, - @ProtoId(3) val unreadCount: Int = 0 + @SerialId(1) val eventtype: Int = 0, + @SerialId(2) val eventTinyid: Long = 0L, + @SerialId(3) val unreadCount: Int = 0 ) : ProtoBuf @Serializable class OrganizerInfo( - @ProtoId(1) val hostName: String = "", - @ProtoId(2) val hostUrl: String = "", - @ProtoId(3) val hostCover: String = "" + @SerialId(1) val hostName: String = "", + @SerialId(2) val hostUrl: String = "", + @SerialId(3) val hostCover: String = "" ) : ProtoBuf @Serializable class InterestTag( - @ProtoId(1) val tagType: Int = 0, - @ProtoId(2) val msgTagList: List? = null + @SerialId(1) val tagType: Int = 0, + @SerialId(2) val msgTagList: List? = null ) : ProtoBuf @Serializable class AppointInfoEx( - @ProtoId(1) val feedsPicUrl: String = "", - @ProtoId(2) val feedsUrl: String = "", - @ProtoId(3) val detailTitle: String = "", - @ProtoId(4) val detailDescribe: String = "", - @ProtoId(5) val showPublisher: Int = 0, - @ProtoId(6) val detailPicUrl: String = "", - @ProtoId(7) val detailUrl: String = "", - @ProtoId(8) val showAttend: Int = 0 + @SerialId(1) val feedsPicUrl: String = "", + @SerialId(2) val feedsUrl: String = "", + @SerialId(3) val detailTitle: String = "", + @SerialId(4) val detailDescribe: String = "", + @SerialId(5) val showPublisher: Int = 0, + @SerialId(6) val detailPicUrl: String = "", + @SerialId(7) val detailUrl: String = "", + @SerialId(8) val showAttend: Int = 0 ) : ProtoBuf @Serializable class DateComment( - @ProtoId(1) val commentId: String = "", - @ProtoId(2) val msgAppointId: AppointDefine.AppointID? = null, - @ProtoId(3) val msgPublisherInfo: AppointDefine.StrangerInfo? = null, - @ProtoId(4) val time: Int = 0, - @ProtoId(6) val msgReplyInfo: AppointDefine.ReplyInfo? = null, - @ProtoId(7) val flag: Int = 0, - @ProtoId(8) val msgContent: AppointDefine.RichText? = null + @SerialId(1) val commentId: String = "", + @SerialId(2) val msgAppointId: AppointDefine.AppointID? = null, + @SerialId(3) val msgPublisherInfo: AppointDefine.StrangerInfo? = null, + @SerialId(4) val time: Int = 0, + @SerialId(6) val msgReplyInfo: AppointDefine.ReplyInfo? = null, + @SerialId(7) val flag: Int = 0, + @SerialId(8) val msgContent: AppointDefine.RichText? = null ) : ProtoBuf @Serializable class AppointContent( - @ProtoId(1) val appointSubject: Int = 0, - @ProtoId(2) val payType: Int = 0, - @ProtoId(3) val appointDate: Int = 0, - @ProtoId(4) val appointGender: Int = 0, - @ProtoId(5) val appointIntroduce: String = "", - @ProtoId(6) val msgAppointAddress: AppointDefine.AddressInfo? = null, - @ProtoId(7) val msgTravelInfo: AppointDefine.TravelInfo? = null + @SerialId(1) val appointSubject: Int = 0, + @SerialId(2) val payType: Int = 0, + @SerialId(3) val appointDate: Int = 0, + @SerialId(4) val appointGender: Int = 0, + @SerialId(5) val appointIntroduce: String = "", + @SerialId(6) val msgAppointAddress: AppointDefine.AddressInfo? = null, + @SerialId(7) val msgTravelInfo: AppointDefine.TravelInfo? = null ) : ProtoBuf @Serializable class FeedInfo( - @ProtoId(1) val feedType: Long = 0L, - @ProtoId(2) val feedId: String = "", - @ProtoId(3) val msgFeedContent: AppointDefine.FeedContent? = null, - @ProtoId(4) val msgTopicInfo: AppointDefine.NearbyTopic? = null, - @ProtoId(5) val publishTime: Long = 0, - @ProtoId(6) val praiseCount: Int = 0, - @ProtoId(7) val praiseFlag: Int = 0, - @ProtoId(8) val msgPraiseUser: List? = null, - @ProtoId(9) val commentCount: Int = 0, - @ProtoId(10) val msgCommentList: List? = null, - @ProtoId(11) val commentRetAll: Int = 0, - @ProtoId(12) val hotFlag: Int = 0, - @ProtoId(13) val svrReserved: Long = 0L, - @ProtoId(14) val msgHotEntry: AppointDefine.HotEntry? = null + @SerialId(1) val feedType: Long = 0L, + @SerialId(2) val feedId: String = "", + @SerialId(3) val msgFeedContent: AppointDefine.FeedContent? = null, + @SerialId(4) val msgTopicInfo: AppointDefine.NearbyTopic? = null, + @SerialId(5) val publishTime: Long = 0, + @SerialId(6) val praiseCount: Int = 0, + @SerialId(7) val praiseFlag: Int = 0, + @SerialId(8) val msgPraiseUser: List? = null, + @SerialId(9) val commentCount: Int = 0, + @SerialId(10) val msgCommentList: List? = null, + @SerialId(11) val commentRetAll: Int = 0, + @SerialId(12) val hotFlag: Int = 0, + @SerialId(13) val svrReserved: Long = 0L, + @SerialId(14) val msgHotEntry: AppointDefine.HotEntry? = null ) : ProtoBuf @Serializable class HotTopicList( - @ProtoId(1) val topicList: List? = null + @SerialId(1) val topicList: List? = null ) : ProtoBuf @Serializable class FeedContent( - @ProtoId(1) val strPicUrl: List = listOf(), - @ProtoId(2) val msgText: AppointDefine.RichText? = null, - @ProtoId(3) val hrefUrl: String = "", - @ProtoId(5) val groupName: String = "", - @ProtoId(6) val groupBulletin: String = "", - @ProtoId(7) val feedType: Int = 0, - @ProtoId(8) val poiId: String = "", - @ProtoId(9) val poiTitle: String = "", - @ProtoId(20) val effectiveTime: Int = 0, - @ProtoId(21) val expiationTime: Int = 0, - @ProtoId(22) val msgLocale: AppointDefine.LocaleInfo? = null, - @ProtoId(23) val feedsIndex: Int = 0, - @ProtoId(24) val msgAd: AppointDefine.ADFeed? = null, - @ProtoId(25) val privateData: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val strPicUrl: List = listOf(), + @SerialId(2) val msgText: AppointDefine.RichText? = null, + @SerialId(3) val hrefUrl: String = "", + @SerialId(5) val groupName: String = "", + @SerialId(6) val groupBulletin: String = "", + @SerialId(7) val feedType: Int = 0, + @SerialId(8) val poiId: String = "", + @SerialId(9) val poiTitle: String = "", + @SerialId(20) val effectiveTime: Int = 0, + @SerialId(21) val expiationTime: Int = 0, + @SerialId(22) val msgLocale: AppointDefine.LocaleInfo? = null, + @SerialId(23) val feedsIndex: Int = 0, + @SerialId(24) val msgAd: AppointDefine.ADFeed? = null, + @SerialId(25) val privateData: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class TravelInfo( - @ProtoId(1) val msgDepartLocale: AppointDefine.LocaleInfo? = null, - @ProtoId(2) val msgDestination: AppointDefine.LocaleInfo? = null, - @ProtoId(3) val vehicle: Int = 0, - @ProtoId(4) val partnerCount: Int = 0, - @ProtoId(5) val placePicUrl: String = "", - @ProtoId(6) val placeUrl: String = "" + @SerialId(1) val msgDepartLocale: AppointDefine.LocaleInfo? = null, + @SerialId(2) val msgDestination: AppointDefine.LocaleInfo? = null, + @SerialId(3) val vehicle: Int = 0, + @SerialId(4) val partnerCount: Int = 0, + @SerialId(5) val placePicUrl: String = "", + @SerialId(6) val placeUrl: String = "" ) : ProtoBuf @Serializable class RecentFreshFeed( - @ProtoId(1) val freshFeedInfo: List? = null, - @ProtoId(2) val uid: Long = 0L + @SerialId(1) val freshFeedInfo: List? = null, + @SerialId(2) val uid: Long = 0L ) : ProtoBuf @Serializable class GPS( - @ProtoId(1) val int32Lat: Int = 900000000, - @ProtoId(2) val int32Lon: Int = 900000000, - @ProtoId(3) val int32Alt: Int = -10000000, - @ProtoId(4) val int32Type: Int = 0 + @SerialId(1) val int32Lat: Int = 900000000, + @SerialId(2) val int32Lon: Int = 900000000, + @SerialId(3) val int32Alt: Int = -10000000, + @SerialId(4) val int32Type: Int = 0 ) : ProtoBuf @Serializable class AppointID( - @ProtoId(1) val requestId: String = "" + @SerialId(1) val requestId: String = "" ) : ProtoBuf @Serializable class LocaleInfo( - @ProtoId(1) val name: String = "", - @ProtoId(2) val country: String = "", - @ProtoId(3) val province: String = "", - @ProtoId(4) val city: String = "", - @ProtoId(5) val region: String = "", - @ProtoId(6) val poi: String = "", - @ProtoId(7) val msgGps: AppointDefine.GPS? = null, - @ProtoId(8) val address: String = "" + @SerialId(1) val name: String = "", + @SerialId(2) val country: String = "", + @SerialId(3) val province: String = "", + @SerialId(4) val city: String = "", + @SerialId(5) val region: String = "", + @SerialId(6) val poi: String = "", + @SerialId(7) val msgGps: AppointDefine.GPS? = null, + @SerialId(8) val address: String = "" ) : ProtoBuf @Serializable class LBSInfo( - @ProtoId(1) val msgGps: AppointDefine.GPS? = null, - @ProtoId(2) val msgWifis: List? = null, - @ProtoId(3) val msgCells: List? = null + @SerialId(1) val msgGps: AppointDefine.GPS? = null, + @SerialId(2) val msgWifis: List? = null, + @SerialId(3) val msgCells: List? = null ) : ProtoBuf @Serializable class FeedEvent( - @ProtoId(1) val eventId: Long = 0L, - @ProtoId(2) val time: Int = 0, - @ProtoId(3) val eventtype: Int = 0, - @ProtoId(4) val msgUserInfo: AppointDefine.StrangerInfo? = null, - @ProtoId(5) val msgFeedInfo: AppointDefine.FeedInfo? = null, - @ProtoId(6) val eventTips: String = "", - @ProtoId(7) val msgComment: AppointDefine.FeedComment? = null, - @ProtoId(8) val cancelEventId: Long = 0L + @SerialId(1) val eventId: Long = 0L, + @SerialId(2) val time: Int = 0, + @SerialId(3) val eventtype: Int = 0, + @SerialId(4) val msgUserInfo: AppointDefine.StrangerInfo? = null, + @SerialId(5) val msgFeedInfo: AppointDefine.FeedInfo? = null, + @SerialId(6) val eventTips: String = "", + @SerialId(7) val msgComment: AppointDefine.FeedComment? = null, + @SerialId(8) val cancelEventId: Long = 0L ) : ProtoBuf @Serializable class FeedsCookie( - @ProtoId(1) val strList: List = listOf(), - @ProtoId(2) val pose: Int = 0, - @ProtoId(3) val cookie: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val uint64Topics: List? = null + @SerialId(1) val strList: List = listOf(), + @SerialId(2) val pose: Int = 0, + @SerialId(3) val cookie: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val uint64Topics: List? = null ) : ProtoBuf @Serializable class NearbyTopic( - @ProtoId(1) val topicId: Long = 0L, - @ProtoId(2) val topic: String = "", - @ProtoId(3) val foreword: String = "", - @ProtoId(4) val createTime: Int = 0, - @ProtoId(5) val updateTime: Int = 0, - @ProtoId(6) val hotFlag: Int = 0, - @ProtoId(7) val buttonStyle: Int = 0, - @ProtoId(8) val buttonSrc: String = "", - @ProtoId(9) val backgroundSrc: String = "", - @ProtoId(10) val attendeeInfo: String = "", - @ProtoId(11) val index: Int = 0, - @ProtoId(12) val publishScope: Int = 0, - @ProtoId(13) val effectiveTime: Int = 0, - @ProtoId(14) val expiationTime: Int = 0, - @ProtoId(15) val pushedUsrCount: Int = 0, - @ProtoId(16) val timerangeLeft: Int = 0, - @ProtoId(17) val timerangeRight: Int = 0, - @ProtoId(18) val area: String = "" + @SerialId(1) val topicId: Long = 0L, + @SerialId(2) val topic: String = "", + @SerialId(3) val foreword: String = "", + @SerialId(4) val createTime: Int = 0, + @SerialId(5) val updateTime: Int = 0, + @SerialId(6) val hotFlag: Int = 0, + @SerialId(7) val buttonStyle: Int = 0, + @SerialId(8) val buttonSrc: String = "", + @SerialId(9) val backgroundSrc: String = "", + @SerialId(10) val attendeeInfo: String = "", + @SerialId(11) val index: Int = 0, + @SerialId(12) val publishScope: Int = 0, + @SerialId(13) val effectiveTime: Int = 0, + @SerialId(14) val expiationTime: Int = 0, + @SerialId(15) val pushedUsrCount: Int = 0, + @SerialId(16) val timerangeLeft: Int = 0, + @SerialId(17) val timerangeRight: Int = 0, + @SerialId(18) val area: String = "" ) : ProtoBuf @Serializable class NearbyEvent( - @ProtoId(1) val eventtype: Int = 0, - @ProtoId(2) val msgRankevent: AppointDefine.RankEvent? = null, - @ProtoId(3) val eventUin: Long = 0L, - @ProtoId(4) val eventTinyid: Long = 0L + @SerialId(1) val eventtype: Int = 0, + @SerialId(2) val msgRankevent: AppointDefine.RankEvent? = null, + @SerialId(3) val eventUin: Long = 0L, + @SerialId(4) val eventTinyid: Long = 0L ) : ProtoBuf @Serializable class Feed( - @ProtoId(1) val msgUserInfo: AppointDefine.PublisherInfo? = null, - @ProtoId(2) val msgFeedInfo: AppointDefine.FeedInfo? = null, - @ProtoId(3) val ownerFlag: Int = 0 + @SerialId(1) val msgUserInfo: AppointDefine.PublisherInfo? = null, + @SerialId(2) val msgFeedInfo: AppointDefine.FeedInfo? = null, + @SerialId(3) val ownerFlag: Int = 0 ) : ProtoBuf @Serializable class ActivityInfo( - @ProtoId(2) val name: String = "", - @ProtoId(3) val cover: String = "", - @ProtoId(4) val url: String = "", - @ProtoId(5) val startTime: Int = 0, - @ProtoId(6) val endTime: Int = 0, - @ProtoId(7) val locName: String = "", - @ProtoId(8) val enroll: Long = 0L, - @ProtoId(9) val createUin: Long = 0L, - @ProtoId(10) val createTime: Int = 0, - @ProtoId(11) val organizerInfo: AppointDefine.OrganizerInfo = OrganizerInfo(), - @ProtoId(12) val flag: Long? = null + @SerialId(2) val name: String = "", + @SerialId(3) val cover: String = "", + @SerialId(4) val url: String = "", + @SerialId(5) val startTime: Int = 0, + @SerialId(6) val endTime: Int = 0, + @SerialId(7) val locName: String = "", + @SerialId(8) val enroll: Long = 0L, + @SerialId(9) val createUin: Long = 0L, + @SerialId(10) val createTime: Int = 0, + @SerialId(11) val organizerInfo: AppointDefine.OrganizerInfo = OrganizerInfo(), + @SerialId(12) val flag: Long? = null ) : ProtoBuf @Serializable class HotEntry( - @ProtoId(1) val openFlag: Int = 0, - @ProtoId(2) val restTime: Int = 0, - @ProtoId(3) val foreword: String = "", - @ProtoId(4) val backgroundSrc: String = "" + @SerialId(1) val openFlag: Int = 0, + @SerialId(2) val restTime: Int = 0, + @SerialId(3) val foreword: String = "", + @SerialId(4) val backgroundSrc: String = "" ) : ProtoBuf @Serializable class UserFeed( - @ProtoId(1) val msgUserInfo: AppointDefine.PublisherInfo? = null, - @ProtoId(2) val msgFeedInfo: AppointDefine.FeedInfo? = null, - @ProtoId(3) val ownerFlag: Int = 0, - @ProtoId(4) val msgActivityInfo: AppointDefine.ActivityInfo? = null + @SerialId(1) val msgUserInfo: AppointDefine.PublisherInfo? = null, + @SerialId(2) val msgFeedInfo: AppointDefine.FeedInfo? = null, + @SerialId(3) val ownerFlag: Int = 0, + @SerialId(4) val msgActivityInfo: AppointDefine.ActivityInfo? = null ) : ProtoBuf @Serializable class Elem( - @ProtoId(1) val content: String = "", - @ProtoId(2) val msgFaceInfo: AppointDefine.Face? = null + @SerialId(1) val content: String = "", + @SerialId(2) val msgFaceInfo: AppointDefine.Face? = null ) : ProtoBuf @Serializable class HotFreshFeedList( - @ProtoId(1) val msgFeeds: List? = null, - @ProtoId(2) val updateTime: Int = 0 + @SerialId(1) val msgFeeds: List? = null, + @SerialId(2) val updateTime: Int = 0 ) : ProtoBuf @Serializable class RptInterestTag( - @ProtoId(1) val interestTags: List? = null + @SerialId(1) val interestTags: List? = null ) : ProtoBuf @Serializable class AddressInfo( - @ProtoId(1) val companyZone: String = "", - @ProtoId(2) val companyName: String = "", - @ProtoId(3) val companyAddr: String = "", - @ProtoId(4) val companyPicUrl: String = "", - @ProtoId(5) val companyUrl: String = "", - @ProtoId(6) val msgCompanyId: AppointDefine.ShopID? = null + @SerialId(1) val companyZone: String = "", + @SerialId(2) val companyName: String = "", + @SerialId(3) val companyAddr: String = "", + @SerialId(4) val companyPicUrl: String = "", + @SerialId(5) val companyUrl: String = "", + @SerialId(6) val msgCompanyId: AppointDefine.ShopID? = null ) : ProtoBuf @Serializable class PublisherInfo( - @ProtoId(1) val tinyid: Long = 0L, - @ProtoId(2) val nickname: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val age: Int = 0, - @ProtoId(4) val gender: Int = 0, - @ProtoId(5) val constellation: String = "", - @ProtoId(6) val profession: Int = 0, - @ProtoId(7) val distance: String = "", - @ProtoId(8) val marriage: Int = 0, - @ProtoId(9) val vipinfo: String = "", - @ProtoId(10) val recommend: Int = 0, - @ProtoId(11) val godflag: Int = 0, - @ProtoId(12) val chatflag: Int = 0, - @ProtoId(13) val chatupCount: Int = 0, - @ProtoId(14) val charm: Int = 0, - @ProtoId(15) val charmLevel: Int = 0, - @ProtoId(16) val pubNumber: Int = 0, - @ProtoId(17) val msgCommonLabel: AppointDefine.CommonLabel? = null, - @ProtoId(18) val recentVistorTime: Int = 0, - @ProtoId(19) val strangerDeclare: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(20) val friendUin: Long = 0L, - @ProtoId(21) val historyFlag: Int = 0, - @ProtoId(22) val followflag: Long = 0L + @SerialId(1) val tinyid: Long = 0L, + @SerialId(2) val nickname: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val age: Int = 0, + @SerialId(4) val gender: Int = 0, + @SerialId(5) val constellation: String = "", + @SerialId(6) val profession: Int = 0, + @SerialId(7) val distance: String = "", + @SerialId(8) val marriage: Int = 0, + @SerialId(9) val vipinfo: String = "", + @SerialId(10) val recommend: Int = 0, + @SerialId(11) val godflag: Int = 0, + @SerialId(12) val chatflag: Int = 0, + @SerialId(13) val chatupCount: Int = 0, + @SerialId(14) val charm: Int = 0, + @SerialId(15) val charmLevel: Int = 0, + @SerialId(16) val pubNumber: Int = 0, + @SerialId(17) val msgCommonLabel: AppointDefine.CommonLabel? = null, + @SerialId(18) val recentVistorTime: Int = 0, + @SerialId(19) val strangerDeclare: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(20) val friendUin: Long = 0L, + @SerialId(21) val historyFlag: Int = 0, + @SerialId(22) val followflag: Long = 0L ) : ProtoBuf @Serializable class HotUserFeed( - @ProtoId(1) val feedId: String = "", - @ProtoId(2) val praiseCount: Int = 0, - @ProtoId(3) val publishUid: Long = 0L, - @ProtoId(4) val publishTime: Int = 0 + @SerialId(1) val feedId: String = "", + @SerialId(2) val praiseCount: Int = 0, + @SerialId(3) val publishUid: Long = 0L, + @SerialId(4) val publishTime: Int = 0 ) : ProtoBuf @Serializable class FreshFeedInfo( - @ProtoId(1) val uin: Long = 0L, - @ProtoId(2) val time: Int = 0, - @ProtoId(3) val feedId: String = "", - @ProtoId(4) val feedType: Long = 0L + @SerialId(1) val uin: Long = 0L, + @SerialId(2) val time: Int = 0, + @SerialId(3) val feedId: String = "", + @SerialId(4) val feedType: Long = 0L ) : ProtoBuf @Serializable class CommonLabel( - @ProtoId(1) val lableId: Int = 0, - @ProtoId(2) val lableMsgPre: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val lableMsgLast: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val interstName: List? = null, - @ProtoId(5) val interstType: List? = null + @SerialId(1) val lableId: Int = 0, + @SerialId(2) val lableMsgPre: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val lableMsgLast: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val interstName: List? = null, + @SerialId(5) val interstType: List? = null ) : ProtoBuf @Serializable class Face( - @ProtoId(1) val index: Int = 0 + @SerialId(1) val index: Int = 0 ) : ProtoBuf @Serializable class StrangerInfo( - @ProtoId(1) val tinyid: Long = 0L, - @ProtoId(2) val nickname: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val age: Int = 0, - @ProtoId(4) val gender: Int = 0, - @ProtoId(5) val dating: Int = 0, - @ProtoId(6) val listIdx: Int = 0, - @ProtoId(7) val constellation: String = "", - @ProtoId(8) val profession: Int = 0, - @ProtoId(9) val marriage: Int = 0, - @ProtoId(10) val vipinfo: String = "", - @ProtoId(11) val recommend: Int = 0, - @ProtoId(12) val godflag: Int = 0, - @ProtoId(13) val charm: Int = 0, - @ProtoId(14) val charmLevel: Int = 0, - @ProtoId(15) val uin: Long = 0L + @SerialId(1) val tinyid: Long = 0L, + @SerialId(2) val nickname: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val age: Int = 0, + @SerialId(4) val gender: Int = 0, + @SerialId(5) val dating: Int = 0, + @SerialId(6) val listIdx: Int = 0, + @SerialId(7) val constellation: String = "", + @SerialId(8) val profession: Int = 0, + @SerialId(9) val marriage: Int = 0, + @SerialId(10) val vipinfo: String = "", + @SerialId(11) val recommend: Int = 0, + @SerialId(12) val godflag: Int = 0, + @SerialId(13) val charm: Int = 0, + @SerialId(14) val charmLevel: Int = 0, + @SerialId(15) val uin: Long = 0L ) : ProtoBuf @Serializable class HotTopic( - @ProtoId(1) val id: Long = 0L, - @ProtoId(2) val title: String = "", - @ProtoId(3) val topicType: Long = 0L, - @ProtoId(4) val total: Long = 0L, - @ProtoId(5) val times: Long = 0L, - @ProtoId(6) val historyTimes: Long = 0L, - @ProtoId(7) val bgUrl: String = "", - @ProtoId(8) val url: String = "", - @ProtoId(9) val extraInfo: String = "" + @SerialId(1) val id: Long = 0L, + @SerialId(2) val title: String = "", + @SerialId(3) val topicType: Long = 0L, + @SerialId(4) val total: Long = 0L, + @SerialId(5) val times: Long = 0L, + @SerialId(6) val historyTimes: Long = 0L, + @SerialId(7) val bgUrl: String = "", + @SerialId(8) val url: String = "", + @SerialId(9) val extraInfo: String = "" ) : ProtoBuf @Serializable class DateEvent( - @ProtoId(1) val eventId: Long = 0L, - @ProtoId(2) val time: Int = 0, - @ProtoId(3) val type: Int = 0, - @ProtoId(4) val msgUserInfo: AppointDefine.StrangerInfo? = null, - @ProtoId(5) val msgDateInfo: AppointDefine.AppointInfo? = null, - @ProtoId(6) val attendIdx: Int = 0, - @ProtoId(7) val eventTips: String = "", - @ProtoId(8) val msgComment: AppointDefine.DateComment? = null, - @ProtoId(9) val cancelEventId: Long = 0L + @SerialId(1) val eventId: Long = 0L, + @SerialId(2) val time: Int = 0, + @SerialId(3) val type: Int = 0, + @SerialId(4) val msgUserInfo: AppointDefine.StrangerInfo? = null, + @SerialId(5) val msgDateInfo: AppointDefine.AppointInfo? = null, + @SerialId(6) val attendIdx: Int = 0, + @SerialId(7) val eventTips: String = "", + @SerialId(8) val msgComment: AppointDefine.DateComment? = null, + @SerialId(9) val cancelEventId: Long = 0L ) : ProtoBuf @Serializable class AppointInfo( - @ProtoId(1) val msgAppointId: AppointDefine.AppointID? = null, - @ProtoId(2) val msgAppointment: AppointDefine.AppointContent? = null, - @ProtoId(3) val appointStatus: Int = 0, - @ProtoId(4) val joinWording: String = "", - @ProtoId(5) val viewWording: String = "", - @ProtoId(6) val unreadCount: Int = 0, - @ProtoId(7) val owner: Int = 0, - @ProtoId(8) val join: Int = 0, - @ProtoId(9) val view: Int = 0, - @ProtoId(10) val commentWording: String = "", - @ProtoId(11) val commentNum: Int = 0, - @ProtoId(12) val attendStatus: Int = 0, - @ProtoId(13) val msgAppointmentEx: AppointDefine.AppointInfoEx? = null + @SerialId(1) val msgAppointId: AppointDefine.AppointID? = null, + @SerialId(2) val msgAppointment: AppointDefine.AppointContent? = null, + @SerialId(3) val appointStatus: Int = 0, + @SerialId(4) val joinWording: String = "", + @SerialId(5) val viewWording: String = "", + @SerialId(6) val unreadCount: Int = 0, + @SerialId(7) val owner: Int = 0, + @SerialId(8) val join: Int = 0, + @SerialId(9) val view: Int = 0, + @SerialId(10) val commentWording: String = "", + @SerialId(11) val commentNum: Int = 0, + @SerialId(12) val attendStatus: Int = 0, + @SerialId(13) val msgAppointmentEx: AppointDefine.AppointInfoEx? = null ) : ProtoBuf @Serializable class UserInfo( - @ProtoId(1) val uin: Long = 0L, - @ProtoId(2) val nickname: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val age: Int = 0, - @ProtoId(4) val gender: Int = 0, - @ProtoId(5) val avatar: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val uin: Long = 0L, + @SerialId(2) val nickname: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val age: Int = 0, + @SerialId(4) val gender: Int = 0, + @SerialId(5) val avatar: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class ReplyInfo( - @ProtoId(1) val commentId: String = "", - @ProtoId(2) val msgStrangerInfo: AppointDefine.StrangerInfo? = null + @SerialId(1) val commentId: String = "", + @SerialId(2) val msgStrangerInfo: AppointDefine.StrangerInfo? = null ) : ProtoBuf } \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/FriendListCommon.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/FriendListCommon.kt index 4680d70f7..aa7bf2de0 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/FriendListCommon.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/FriendListCommon.kt @@ -9,8 +9,8 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto +import kotlinx.serialization.SerialId import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId import net.mamoe.mirai.qqandroid.io.ProtoBuf import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY @@ -18,40 +18,40 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY internal class Vec0xd50 : ProtoBuf { @Serializable internal class ExtSnsFrdData( - @ProtoId(1) val frdUin: Long = 0L, - @ProtoId(91001) val musicSwitch: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(101001) val mutualmarkAlienation: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(141001) val mutualmarkScore: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(151001) val ksingSwitch: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(181001) val lbsShare: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val frdUin: Long = 0L, + @SerialId(91001) val musicSwitch: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(101001) val mutualmarkAlienation: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(141001) val mutualmarkScore: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(151001) val ksingSwitch: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(181001) val lbsShare: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class RspBody( - @ProtoId(1) val msgUpdateData: List? = null, - @ProtoId(11) val over: Int = 0, - @ProtoId(12) val nextStart: Int = 0, - @ProtoId(13) val uint64UnfinishedUins: List? = null + @SerialId(1) val msgUpdateData: List? = null, + @SerialId(11) val over: Int = 0, + @SerialId(12) val nextStart: Int = 0, + @SerialId(13) val uint64UnfinishedUins: List? = null ) : ProtoBuf @Serializable internal class ReqBody( - @ProtoId(1) val appid: Long = 0L, - @ProtoId(2) val maxPkgSize: Int = 0, - @ProtoId(3) val startTime: Int = 0, - @ProtoId(4) val startIndex: Int = 0, - @ProtoId(5) val reqNum: Int = 0, - @ProtoId(6) val uinList: List? = null, - @ProtoId(91001) val reqMusicSwitch: Int = 0, - @ProtoId(101001) val reqMutualmarkAlienation: Int = 0, - @ProtoId(141001) val reqMutualmarkScore: Int = 0, - @ProtoId(151001) val reqKsingSwitch: Int = 0, - @ProtoId(181001) val reqMutualmarkLbsshare: Int = 0 + @SerialId(1) val appid: Long = 0L, + @SerialId(2) val maxPkgSize: Int = 0, + @SerialId(3) val startTime: Int = 0, + @SerialId(4) val startIndex: Int = 0, + @SerialId(5) val reqNum: Int = 0, + @SerialId(6) val uinList: List? = null, + @SerialId(91001) val reqMusicSwitch: Int = 0, + @SerialId(101001) val reqMutualmarkAlienation: Int = 0, + @SerialId(141001) val reqMutualmarkScore: Int = 0, + @SerialId(151001) val reqKsingSwitch: Int = 0, + @SerialId(181001) val reqMutualmarkLbsshare: Int = 0 ) : ProtoBuf @Serializable internal class KSingRelationInfo( - @ProtoId(1) val flag: Int = 0 + @SerialId(1) val flag: Int = 0 ) : ProtoBuf } @@ -59,21 +59,21 @@ internal class Vec0xd50 : ProtoBuf { internal class Vec0xd6b : ProtoBuf { @Serializable internal class ReqBody( - @ProtoId(1) val maxPkgSize: Int = 0, - @ProtoId(2) val startTime: Int = 0, - @ProtoId(11) val uinList: List? = null + @SerialId(1) val maxPkgSize: Int = 0, + @SerialId(2) val startTime: Int = 0, + @SerialId(11) val uinList: List? = null ) : ProtoBuf @Serializable internal class RspBody( - @ProtoId(11) val msgMutualmarkData: List? = null, - @ProtoId(12) val uint64UnfinishedUins: List? = null + @SerialId(11) val msgMutualmarkData: List? = null, + @SerialId(12) val uint64UnfinishedUins: List? = null ) : ProtoBuf @Serializable internal class MutualMarkData( - @ProtoId(1) val frdUin: Long = 0L, - @ProtoId(2) val result: Int = 0 + @SerialId(1) val frdUin: Long = 0L, + @SerialId(2) val result: Int = 0 // @SerialId(11) val mutualmarkInfo: List? = null ) : ProtoBuf } @@ -82,26 +82,26 @@ internal class Vec0xd6b : ProtoBuf { internal class Mutualmark : ProtoBuf { @Serializable internal class MutualmarkInfo( - @ProtoId(1) val lastActionTime: Long = 0L, - @ProtoId(2) val level: Int = 0, - @ProtoId(3) val lastChangeTime: Long = 0L, - @ProtoId(4) val continueDays: Int = 0, - @ProtoId(5) val wildcardWording: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val notifyTime: Long = 0L, - @ProtoId(7) val iconStatus: Long = 0L, - @ProtoId(8) val iconStatusEndTime: Long = 0L, - @ProtoId(9) val closeFlag: Int = 0, - @ProtoId(10) val resourceInfo: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val lastActionTime: Long = 0L, + @SerialId(2) val level: Int = 0, + @SerialId(3) val lastChangeTime: Long = 0L, + @SerialId(4) val continueDays: Int = 0, + @SerialId(5) val wildcardWording: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val notifyTime: Long = 0L, + @SerialId(7) val iconStatus: Long = 0L, + @SerialId(8) val iconStatusEndTime: Long = 0L, + @SerialId(9) val closeFlag: Int = 0, + @SerialId(10) val resourceInfo: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class ResourceInfo17( - @ProtoId(1) val dynamicUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val staticUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val cartoonUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val cartoonMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val playCartoon: Int = 0, - @ProtoId(6) val word: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val dynamicUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val staticUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val cartoonUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val cartoonMd5: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val playCartoon: Int = 0, + @SerialId(6) val word: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf } diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Group.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Group.kt index 625147b16..73cd71fe5 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Group.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Group.kt @@ -9,8 +9,8 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto +import kotlinx.serialization.SerialId import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId import net.mamoe.mirai.qqandroid.io.ProtoBuf import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY @@ -18,51 +18,51 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY class GroupLabel : ProtoBuf { @Serializable class Label( - @ProtoId(1) val name: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val enumType: Int /* enum */ = 1, - @ProtoId(3) val textColor: GroupLabel.Color? = null, - @ProtoId(4) val edgingColor: GroupLabel.Color? = null, - @ProtoId(5) val labelAttr: Int = 0, - @ProtoId(6) val labelType: Int = 0 + @SerialId(1) val name: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val enumType: Int /* enum */ = 1, + @SerialId(3) val textColor: GroupLabel.Color? = null, + @SerialId(4) val edgingColor: GroupLabel.Color? = null, + @SerialId(5) val labelAttr: Int = 0, + @SerialId(6) val labelType: Int = 0 ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val error: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val groupInfo: List? = null + @SerialId(1) val error: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val groupInfo: List? = null ) : ProtoBuf @Serializable class SourceId( - @ProtoId(1) val sourceId: Int = 0 + @SerialId(1) val sourceId: Int = 0 ) : ProtoBuf @Serializable class GroupInfo( - @ProtoId(1) val int32Result: Int = 0, - @ProtoId(2) val groupCode: Long = 0L, - @ProtoId(3) val groupLabel: List? = null + @SerialId(1) val int32Result: Int = 0, + @SerialId(2) val groupCode: Long = 0L, + @SerialId(3) val groupLabel: List? = null ) : ProtoBuf @Serializable class Color( - @ProtoId(1) val r: Int = 0, - @ProtoId(2) val g: Int = 0, - @ProtoId(3) val b: Int = 0 + @SerialId(1) val r: Int = 0, + @SerialId(2) val g: Int = 0, + @SerialId(3) val b: Int = 0 ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val sourceId: GroupLabel.SourceId? = null, - @ProtoId(2) val uinInfo: GroupLabel.UinInfo? = null, - @ProtoId(3) val numberLabel: Int = 5, - @ProtoId(4) val groupCode: List? = null, - @ProtoId(5) val labelStyle: Int = 0 + @SerialId(1) val sourceId: GroupLabel.SourceId? = null, + @SerialId(2) val uinInfo: GroupLabel.UinInfo? = null, + @SerialId(3) val numberLabel: Int = 5, + @SerialId(4) val groupCode: List? = null, + @SerialId(5) val labelStyle: Int = 0 ) : ProtoBuf @Serializable class UinInfo( - @ProtoId(1) val int64Longitude: Long = 0L, - @ProtoId(2) val int64Latitude: Long = 0L + @SerialId(1) val int64Longitude: Long = 0L, + @SerialId(2) val int64Latitude: Long = 0L ) : ProtoBuf } \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Highway.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Highway.kt index 8b9db91a0..59568de2e 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Highway.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Highway.kt @@ -9,8 +9,8 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto +import kotlinx.serialization.SerialId import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId import kotlinx.serialization.protobuf.ProtoNumberType import kotlinx.serialization.protobuf.ProtoType import net.mamoe.mirai.qqandroid.io.ProtoBuf @@ -20,90 +20,90 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY class BdhExtinfo : ProtoBuf { @Serializable class CommFileExtReq( - @ProtoId(1) val actionType: Int = 0, - @ProtoId(2) val uuid: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val actionType: Int = 0, + @SerialId(2) val uuid: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class CommFileExtRsp( - @ProtoId(1) val int32Retcode: Int = 0, - @ProtoId(2) val downloadUrl: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val int32Retcode: Int = 0, + @SerialId(2) val downloadUrl: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class PicInfo( - @ProtoId(1) val idx: Int = 0, - @ProtoId(2) val size: Int = 0, - @ProtoId(3) val binMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val type: Int = 0 + @SerialId(1) val idx: Int = 0, + @SerialId(2) val size: Int = 0, + @SerialId(3) val binMd5: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val type: Int = 0 ) : ProtoBuf @Serializable class QQVoiceExtReq( - @ProtoId(1) val qid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val fmt: Int = 0, - @ProtoId(3) val rate: Int = 0, - @ProtoId(4) val bits: Int = 0, - @ProtoId(5) val channel: Int = 0, - @ProtoId(6) val pinyin: Int = 0 + @SerialId(1) val qid: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val fmt: Int = 0, + @SerialId(3) val rate: Int = 0, + @SerialId(4) val bits: Int = 0, + @SerialId(5) val channel: Int = 0, + @SerialId(6) val pinyin: Int = 0 ) : ProtoBuf @Serializable class QQVoiceExtRsp( - @ProtoId(1) val qid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val int32Retcode: Int = 0, - @ProtoId(3) val msgResult: List? = null + @SerialId(1) val qid: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val int32Retcode: Int = 0, + @SerialId(3) val msgResult: List? = null ) : ProtoBuf @Serializable class QQVoiceResult( - @ProtoId(1) val text: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val pinyin: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val source: Int = 0 + @SerialId(1) val text: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val pinyin: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val source: Int = 0 ) : ProtoBuf @Serializable class ShortVideoReqExtInfo( - @ProtoId(1) val cmd: Int = 0, - @ProtoId(2) val sessionId: Long = 0L, - @ProtoId(3) val msgThumbinfo: PicInfo? = null, - @ProtoId(4) val msgVideoinfo: VideoInfo? = null, - @ProtoId(5) val msgShortvideoSureReq: ShortVideoSureReqInfo? = null, - @ProtoId(6) val boolIsMergeCmdBeforeData: Boolean = false + @SerialId(1) val cmd: Int = 0, + @SerialId(2) val sessionId: Long = 0L, + @SerialId(3) val msgThumbinfo: PicInfo? = null, + @SerialId(4) val msgVideoinfo: VideoInfo? = null, + @SerialId(5) val msgShortvideoSureReq: ShortVideoSureReqInfo? = null, + @SerialId(6) val boolIsMergeCmdBeforeData: Boolean = false ) : ProtoBuf @Serializable class ShortVideoRspExtInfo( - @ProtoId(1) val cmd: Int = 0, - @ProtoId(2) val sessionId: Long = 0L, - @ProtoId(3) val int32Retcode: Int = 0, - @ProtoId(4) val errinfo: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val msgThumbinfo: PicInfo? = null, - @ProtoId(6) val msgVideoinfo: VideoInfo? = null, - @ProtoId(7) val msgShortvideoSureRsp: ShortVideoSureRspInfo? = null, - @ProtoId(8) val retryFlag: Int = 0 + @SerialId(1) val cmd: Int = 0, + @SerialId(2) val sessionId: Long = 0L, + @SerialId(3) val int32Retcode: Int = 0, + @SerialId(4) val errinfo: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val msgThumbinfo: PicInfo? = null, + @SerialId(6) val msgVideoinfo: VideoInfo? = null, + @SerialId(7) val msgShortvideoSureRsp: ShortVideoSureRspInfo? = null, + @SerialId(8) val retryFlag: Int = 0 ) : ProtoBuf @Serializable class ShortVideoSureReqInfo( - @ProtoId(1) val fromuin: Long = 0L, - @ProtoId(2) val chatType: Int = 0, - @ProtoId(3) val touin: Long = 0L, - @ProtoId(4) val groupCode: Long = 0L, - @ProtoId(5) val clientType: Int = 0, - @ProtoId(6) val msgThumbinfo: PicInfo? = null, - @ProtoId(7) val msgMergeVideoinfo: List? = null, - @ProtoId(8) val msgDropVideoinfo: List? = null, - @ProtoId(9) val businessType: Int = 0, - @ProtoId(10) val subBusinessType: Int = 0 + @SerialId(1) val fromuin: Long = 0L, + @SerialId(2) val chatType: Int = 0, + @SerialId(3) val touin: Long = 0L, + @SerialId(4) val groupCode: Long = 0L, + @SerialId(5) val clientType: Int = 0, + @SerialId(6) val msgThumbinfo: PicInfo? = null, + @SerialId(7) val msgMergeVideoinfo: List? = null, + @SerialId(8) val msgDropVideoinfo: List? = null, + @SerialId(9) val businessType: Int = 0, + @SerialId(10) val subBusinessType: Int = 0 ) : ProtoBuf @Serializable class ShortVideoSureRspInfo( - @ProtoId(1) val fileid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val ukey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val msgVideoinfo: VideoInfo? = null, - @ProtoId(4) val mergeCost: Int = 0 + @SerialId(1) val fileid: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val ukey: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val msgVideoinfo: VideoInfo? = null, + @SerialId(4) val mergeCost: Int = 0 ) : ProtoBuf @Serializable @@ -111,31 +111,31 @@ class BdhExtinfo : ProtoBuf { @Serializable class StoryVideoExtRsp( - @ProtoId(1) val int32Retcode: Int = 0, - @ProtoId(2) val msg: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val cdnUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val fileKey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val fileId: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val int32Retcode: Int = 0, + @SerialId(2) val msg: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val cdnUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val fileKey: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val fileId: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class UploadPicExtInfo( - @ProtoId(1) val fileResid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val downloadUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val thumbDownloadUrl: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val fileResid: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val downloadUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val thumbDownloadUrl: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class VideoInfo( - @ProtoId(1) val idx: Int = 0, - @ProtoId(2) val size: Int = 0, - @ProtoId(3) val binMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val format: Int = 0, - @ProtoId(5) val resLen: Int = 0, - @ProtoId(6) val resWidth: Int = 0, - @ProtoId(7) val time: Int = 0, - @ProtoId(8) val starttime: Long = 0L, - @ProtoId(9) val isAudio: Int = 0 + @SerialId(1) val idx: Int = 0, + @SerialId(2) val size: Int = 0, + @SerialId(3) val binMd5: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val format: Int = 0, + @SerialId(5) val resLen: Int = 0, + @SerialId(6) val resWidth: Int = 0, + @SerialId(7) val time: Int = 0, + @SerialId(8) val starttime: Long = 0L, + @SerialId(9) val isAudio: Int = 0 ) : ProtoBuf } @@ -143,142 +143,142 @@ class BdhExtinfo : ProtoBuf { class CSDataHighwayHead : ProtoBuf { @Serializable class C2CCommonExtendinfo( - @ProtoId(1) val infoId: Int = 0, - @ProtoId(2) val msgFilterExtendinfo: FilterExtendinfo? = null + @SerialId(1) val infoId: Int = 0, + @SerialId(2) val msgFilterExtendinfo: FilterExtendinfo? = null ) : ProtoBuf @Serializable class DataHighwayHead( - @ProtoId(1) val version: Int = 0, - @ProtoId(2) val uin: String = "", // yes - @ProtoId(3) val command: String = "", - @ProtoId(4) val seq: Int = 0, - @ProtoId(5) val retryTimes: Int = 0, - @ProtoId(6) val appid: Int = 0, - @ProtoId(7) val dataflag: Int = 0, - @ProtoId(8) val commandId: Int = 0, - @ProtoId(9) val buildVer: String = "", - @ProtoId(10) val localeId: Int = 0 + @SerialId(1) val version: Int = 0, + @SerialId(2) val uin: String = "", // yes + @SerialId(3) val command: String = "", + @SerialId(4) val seq: Int = 0, + @SerialId(5) val retryTimes: Int = 0, + @SerialId(6) val appid: Int = 0, + @SerialId(7) val dataflag: Int = 0, + @SerialId(8) val commandId: Int = 0, + @SerialId(9) val buildVer: String = "", + @SerialId(10) val localeId: Int = 0 ) : ProtoBuf @Serializable class DataHole( - @ProtoId(1) val begin: Long = 0L, - @ProtoId(2) val end: Long = 0L + @SerialId(1) val begin: Long = 0L, + @SerialId(2) val end: Long = 0L ) : ProtoBuf @Serializable class FilterExtendinfo( - @ProtoId(1) val filterFlag: Int = 0, - @ProtoId(2) val msgImageFilterRequest: ImageFilterRequest? = null + @SerialId(1) val filterFlag: Int = 0, + @SerialId(2) val msgImageFilterRequest: ImageFilterRequest? = null ) : ProtoBuf @Serializable class FilterStyle( - @ProtoId(1) val styleId: Int = 0, - @ProtoId(2) val styleName: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val styleId: Int = 0, + @SerialId(2) val styleName: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class ImageFilterRequest( - @ProtoId(1) val sessionId: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val clientIp: Int = 0, - @ProtoId(3) val uin: Long = 0L, - @ProtoId(4) val style: FilterStyle? = null, - @ProtoId(5) val width: Int = 0, - @ProtoId(6) val height: Int = 0, - @ProtoId(7) val imageData: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val sessionId: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val clientIp: Int = 0, + @SerialId(3) val uin: Long = 0L, + @SerialId(4) val style: FilterStyle? = null, + @SerialId(5) val width: Int = 0, + @SerialId(6) val height: Int = 0, + @SerialId(7) val imageData: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class ImageFilterResponse( - @ProtoId(1) val retCode: Int = 0, - @ProtoId(2) val imageData: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val costTime: Int = 0 + @SerialId(1) val retCode: Int = 0, + @SerialId(2) val imageData: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val costTime: Int = 0 ) : ProtoBuf @Serializable class LoginSigHead( - @ProtoId(1) val loginsigType: Int = 0, - @ProtoId(2) val loginsig: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val loginsigType: Int = 0, + @SerialId(2) val loginsig: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class NewServiceTicket( - @ProtoId(1) val signature: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val ukey: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val signature: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val ukey: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class PicInfoExt( - @ProtoId(1) val picWidth: Int = 0, - @ProtoId(2) val picHeight: Int = 0, - @ProtoId(3) val picFlag: Int = 0, - @ProtoId(4) val busiType: Int = 0, - @ProtoId(5) val srcTerm: Int = 0, - @ProtoId(6) val platType: Int = 0, - @ProtoId(7) val netType: Int = 0, - @ProtoId(8) val imgType: Int = 0, - @ProtoId(9) val appPicType: Int = 0 + @SerialId(1) val picWidth: Int = 0, + @SerialId(2) val picHeight: Int = 0, + @SerialId(3) val picFlag: Int = 0, + @SerialId(4) val busiType: Int = 0, + @SerialId(5) val srcTerm: Int = 0, + @SerialId(6) val platType: Int = 0, + @SerialId(7) val netType: Int = 0, + @SerialId(8) val imgType: Int = 0, + @SerialId(9) val appPicType: Int = 0 ) : ProtoBuf @Serializable class PicRspExtInfo( - @ProtoId(1) val skey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val clientIp: Int = 0, - @ProtoId(3) val upOffset: Long = 0L, - @ProtoId(4) val blockSize: Long = 0L + @SerialId(1) val skey: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val clientIp: Int = 0, + @SerialId(3) val upOffset: Long = 0L, + @SerialId(4) val blockSize: Long = 0L ) : ProtoBuf @Serializable class QueryHoleRsp( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val dataHole: List? = null, - @ProtoId(3) val boolCompFlag: Boolean = false + @SerialId(1) val result: Int = 0, + @SerialId(2) val dataHole: List? = null, + @SerialId(3) val boolCompFlag: Boolean = false ) : ProtoBuf @Serializable class ReqDataHighwayHead( - @ProtoId(1) val msgBasehead: DataHighwayHead? = null, - @ProtoId(2) val msgSeghead: SegHead? = null, - @ProtoId(3) val reqExtendinfo: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val timestamp: Long = 0L, - @ProtoId(5) val msgLoginSigHead: LoginSigHead? = null + @SerialId(1) val msgBasehead: DataHighwayHead? = null, + @SerialId(2) val msgSeghead: SegHead? = null, + @SerialId(3) val reqExtendinfo: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val timestamp: Long = 0L, + @SerialId(5) val msgLoginSigHead: LoginSigHead? = null ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val msgQueryHoleRsp: QueryHoleRsp? = null + @SerialId(1) val msgQueryHoleRsp: QueryHoleRsp? = null ) : ProtoBuf @Serializable class RspDataHighwayHead( - @ProtoId(1) val msgBasehead: DataHighwayHead? = null, - @ProtoId(2) val msgSeghead: SegHead? = null, - @ProtoId(3) val errorCode: Int = 0, - @ProtoId(4) val allowRetry: Int = 0, - @ProtoId(5) val cachecost: Int = 0, - @ProtoId(6) val htcost: Int = 0, - @ProtoId(7) val rspExtendinfo: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) val timestamp: Long = 0L, - @ProtoId(9) val range: Long = 0L, - @ProtoId(10) val isReset: Int = 0 + @SerialId(1) val msgBasehead: DataHighwayHead? = null, + @SerialId(2) val msgSeghead: SegHead? = null, + @SerialId(3) val errorCode: Int = 0, + @SerialId(4) val allowRetry: Int = 0, + @SerialId(5) val cachecost: Int = 0, + @SerialId(6) val htcost: Int = 0, + @SerialId(7) val rspExtendinfo: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(8) val timestamp: Long = 0L, + @SerialId(9) val range: Long = 0L, + @SerialId(10) val isReset: Int = 0 ) : ProtoBuf @Serializable class SegHead( - @ProtoId(1) val serviceid: Int = 0, - @ProtoId(2) val filesize: Long = 0L, - @ProtoId(3) val dataoffset: Long = 0L, - @ProtoId(4) val datalength: Int = 0, - @ProtoId(5) val rtcode: Int = 0, - @ProtoId(6) val serviceticket: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) val flag: Int = 0, - @ProtoId(8) val md5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(9) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(10) val cacheAddr: Int = 0, - @ProtoId(11) val queryTimes: Int = 0, - @ProtoId(12) val updateCacheip: Int = 0 + @SerialId(1) val serviceid: Int = 0, + @SerialId(2) val filesize: Long = 0L, + @SerialId(3) val dataoffset: Long = 0L, + @SerialId(4) val datalength: Int = 0, + @SerialId(5) val rtcode: Int = 0, + @SerialId(6) val serviceticket: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(7) val flag: Int = 0, + @SerialId(8) val md5: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(9) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(10) val cacheAddr: Int = 0, + @SerialId(11) val queryTimes: Int = 0, + @SerialId(12) val updateCacheip: Int = 0 ) : ProtoBuf } @@ -286,31 +286,31 @@ class CSDataHighwayHead : ProtoBuf { class HwConfigPersistentPB : ProtoBuf { @Serializable class HwConfigItemPB( - @ProtoId(1) val ingKey: String = "", - @ProtoId(2) val endPointList: List? = null + @SerialId(1) val ingKey: String = "", + @SerialId(2) val endPointList: List? = null ) : ProtoBuf @Serializable class HwConfigPB( - @ProtoId(1) val configItemList: List? = null, - @ProtoId(2) val netSegConfList: List? = null, - @ProtoId(3) val shortVideoNetConf: List? = null, - @ProtoId(4) val configItemListIp6: List? = null + @SerialId(1) val configItemList: List? = null, + @SerialId(2) val netSegConfList: List? = null, + @SerialId(3) val shortVideoNetConf: List? = null, + @SerialId(4) val configItemListIp6: List? = null ) : ProtoBuf @Serializable class HwEndPointPB( - @ProtoId(1) val ingHost: String = "", - @ProtoId(2) val int32Port: Int = 0, - @ProtoId(3) val int64Timestampe: Long = 0L + @SerialId(1) val ingHost: String = "", + @SerialId(2) val int32Port: Int = 0, + @SerialId(3) val int64Timestampe: Long = 0L ) : ProtoBuf @Serializable class HwNetSegConfPB( - @ProtoId(1) val int64NetType: Long = 0L, - @ProtoId(2) val int64SegSize: Long = 0L, - @ProtoId(3) val int64SegNum: Long = 0L, - @ProtoId(4) val int64CurConnNum: Long = 0L + @SerialId(1) val int64NetType: Long = 0L, + @SerialId(2) val int64SegSize: Long = 0L, + @SerialId(3) val int64SegNum: Long = 0L, + @SerialId(4) val int64CurConnNum: Long = 0L ) : ProtoBuf } @@ -318,8 +318,8 @@ class HwConfigPersistentPB : ProtoBuf { class HwSessionInfoPersistentPB : ProtoBuf { @Serializable class HwSessionInfoPB( - @ProtoId(1) val httpconnSigSession: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val sessionKey: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val httpconnSigSession: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val sessionKey: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf } @@ -327,137 +327,137 @@ class HwSessionInfoPersistentPB : ProtoBuf { class Subcmd0x501 : ProtoBuf { @Serializable class ReqBody( - @ProtoId(1281) val msgSubcmd0x501ReqBody: SubCmd0x501ReqBody? = null + @SerialId(1281) val msgSubcmd0x501ReqBody: SubCmd0x501ReqBody? = null ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1281) val msgSubcmd0x501RspBody: SubCmd0x501Rspbody? = null + @SerialId(1281) val msgSubcmd0x501RspBody: SubCmd0x501Rspbody? = null ) : ProtoBuf @Serializable class SubCmd0x501ReqBody( - @ProtoId(1) val uin: Long = 0L, - @ProtoId(2) val idcId: Int = 0, - @ProtoId(3) val appid: Int = 0, - @ProtoId(4) val loginSigType: Int = 0, - @ProtoId(5) val loginSigTicket: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val requestFlag: Int = 0, - @ProtoId(7) val uint32ServiceTypes: List? = null, - @ProtoId(8) val bid: Int = 0, - @ProtoId(9) val term: Int = 0, - @ProtoId(10) val plat: Int = 0, - @ProtoId(11) val net: Int = 0, - @ProtoId(12) val caller: Int = 0 + @SerialId(1) val uin: Long = 0L, + @SerialId(2) val idcId: Int = 0, + @SerialId(3) val appid: Int = 0, + @SerialId(4) val loginSigType: Int = 0, + @SerialId(5) val loginSigTicket: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val requestFlag: Int = 0, + @SerialId(7) val uint32ServiceTypes: List? = null, + @SerialId(8) val bid: Int = 0, + @SerialId(9) val term: Int = 0, + @SerialId(10) val plat: Int = 0, + @SerialId(11) val net: Int = 0, + @SerialId(12) val caller: Int = 0 ) : ProtoBuf @Serializable class SubCmd0x501Rspbody( - @ProtoId(1) val httpconnSigSession: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val sessionKey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val msgHttpconnAddrs: List? = null, - @ProtoId(4) val preConnection: Int = 0, - @ProtoId(5) val csConn: Int = 0, - @ProtoId(6) val msgIpLearnConf: IpLearnConf? = null, - @ProtoId(7) val msgDynTimeoutConf: DynTimeOutConf? = null, - @ProtoId(8) val msgOpenUpConf: OpenUpConf? = null, - @ProtoId(9) val msgDownloadEncryptConf: DownloadEncryptConf? = null, - @ProtoId(10) val msgShortVideoConf: ShortVideoConf? = null, - @ProtoId(11) val msgPtvConf: PTVConf? = null + @SerialId(1) val httpconnSigSession: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val sessionKey: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val msgHttpconnAddrs: List? = null, + @SerialId(4) val preConnection: Int = 0, + @SerialId(5) val csConn: Int = 0, + @SerialId(6) val msgIpLearnConf: IpLearnConf? = null, + @SerialId(7) val msgDynTimeoutConf: DynTimeOutConf? = null, + @SerialId(8) val msgOpenUpConf: OpenUpConf? = null, + @SerialId(9) val msgDownloadEncryptConf: DownloadEncryptConf? = null, + @SerialId(10) val msgShortVideoConf: ShortVideoConf? = null, + @SerialId(11) val msgPtvConf: PTVConf? = null ) : ProtoBuf { @Serializable class DownloadEncryptConf( - @ProtoId(1) val boolEnableEncryptRequest: Boolean = false, - @ProtoId(2) val boolEnableEncryptedPic: Boolean = false, - @ProtoId(3) val ctrlFlag: Int = 0 + @SerialId(1) val boolEnableEncryptRequest: Boolean = false, + @SerialId(2) val boolEnableEncryptedPic: Boolean = false, + @SerialId(3) val ctrlFlag: Int = 0 ) : ProtoBuf @Serializable class DynTimeOutConf( - @ProtoId(1) val tbase2g: Int = 0, - @ProtoId(2) val tbase3g: Int = 0, - @ProtoId(3) val tbase4g: Int = 0, - @ProtoId(4) val tbaseWifi: Int = 0, - @ProtoId(5) val torg2g: Int = 0, - @ProtoId(6) val torg3g: Int = 0, - @ProtoId(7) val torg4g: Int = 0, - @ProtoId(8) val torgWifi: Int = 0, - @ProtoId(9) val maxTimeout: Int = 0, - @ProtoId(10) val enableDynTimeout: Int = 0, - @ProtoId(11) val maxTimeout2g: Int = 0, - @ProtoId(12) val maxTimeout3g: Int = 0, - @ProtoId(13) val maxTimeout4g: Int = 0, - @ProtoId(14) val maxTimeoutWifi: Int = 0, - @ProtoId(15) val hbTimeout2g: Int = 0, - @ProtoId(16) val hbTimeout3g: Int = 0, - @ProtoId(17) val hbTimeout4g: Int = 0, - @ProtoId(18) val hbTimeoutWifi: Int = 0, - @ProtoId(19) val hbTimeoutDefault: Int = 0 + @SerialId(1) val tbase2g: Int = 0, + @SerialId(2) val tbase3g: Int = 0, + @SerialId(3) val tbase4g: Int = 0, + @SerialId(4) val tbaseWifi: Int = 0, + @SerialId(5) val torg2g: Int = 0, + @SerialId(6) val torg3g: Int = 0, + @SerialId(7) val torg4g: Int = 0, + @SerialId(8) val torgWifi: Int = 0, + @SerialId(9) val maxTimeout: Int = 0, + @SerialId(10) val enableDynTimeout: Int = 0, + @SerialId(11) val maxTimeout2g: Int = 0, + @SerialId(12) val maxTimeout3g: Int = 0, + @SerialId(13) val maxTimeout4g: Int = 0, + @SerialId(14) val maxTimeoutWifi: Int = 0, + @SerialId(15) val hbTimeout2g: Int = 0, + @SerialId(16) val hbTimeout3g: Int = 0, + @SerialId(17) val hbTimeout4g: Int = 0, + @SerialId(18) val hbTimeoutWifi: Int = 0, + @SerialId(19) val hbTimeoutDefault: Int = 0 ) : ProtoBuf @Serializable class Ip6Addr( - @ProtoId(1) val type: Int = 0, - @ProtoId(2) val ip6: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val port: Int = 0, - @ProtoId(4) val area: Int = 0, - @ProtoId(5) val sameIsp: Int = 0 + @SerialId(1) val type: Int = 0, + @SerialId(2) val ip6: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val port: Int = 0, + @SerialId(4) val area: Int = 0, + @SerialId(5) val sameIsp: Int = 0 ) : ProtoBuf @Serializable class IpAddr( - @ProtoId(1) val type: Int = 0, - @ProtoType(ProtoNumberType.FIXED) @ProtoId(2) val ip: Int = 0, - @ProtoId(3) val port: Int = 0, - @ProtoId(4) val area: Int = 0, - @ProtoId(5) val sameIsp: Int = 0 + @SerialId(1) val type: Int = 0, + @ProtoType(ProtoNumberType.FIXED) @SerialId(2) val ip: Int = 0, + @SerialId(3) val port: Int = 0, + @SerialId(4) val area: Int = 0, + @SerialId(5) val sameIsp: Int = 0 ) : ProtoBuf @Serializable class IpLearnConf( - @ProtoId(1) val refreshCachedIp: Int = 0, - @ProtoId(2) val enableIpLearn: Int = 0 + @SerialId(1) val refreshCachedIp: Int = 0, + @SerialId(2) val enableIpLearn: Int = 0 ) : ProtoBuf @Serializable class NetSegConf( - @ProtoId(1) val netType: Int = 0, - @ProtoId(2) val segsize: Int = 0, - @ProtoId(3) val segnum: Int = 0, - @ProtoId(4) val curconnnum: Int = 0 + @SerialId(1) val netType: Int = 0, + @SerialId(2) val segsize: Int = 0, + @SerialId(3) val segnum: Int = 0, + @SerialId(4) val curconnnum: Int = 0 ) : ProtoBuf @Serializable class OpenUpConf( - @ProtoId(1) val boolEnableOpenup: Boolean = false, - @ProtoId(2) val preSendSegnum: Int = 0, - @ProtoId(3) val preSendSegnum3g: Int = 0, - @ProtoId(4) val preSendSegnum4g: Int = 0, - @ProtoId(5) val preSendSegnumWifi: Int = 0 + @SerialId(1) val boolEnableOpenup: Boolean = false, + @SerialId(2) val preSendSegnum: Int = 0, + @SerialId(3) val preSendSegnum3g: Int = 0, + @SerialId(4) val preSendSegnum4g: Int = 0, + @SerialId(5) val preSendSegnumWifi: Int = 0 ) : ProtoBuf @Serializable class PTVConf( - @ProtoId(1) val channelType: Int = 0, - @ProtoId(2) val msgNetsegconf: List? = null, - @ProtoId(3) val boolOpenHardwareCodec: Boolean = false + @SerialId(1) val channelType: Int = 0, + @SerialId(2) val msgNetsegconf: List? = null, + @SerialId(3) val boolOpenHardwareCodec: Boolean = false ) : ProtoBuf @Serializable class ShortVideoConf( - @ProtoId(1) val channelType: Int = 0, - @ProtoId(2) val msgNetsegconf: List? = null, - @ProtoId(3) val boolOpenHardwareCodec: Boolean = false, - @ProtoId(4) val boolSendAheadSignal: Boolean = false + @SerialId(1) val channelType: Int = 0, + @SerialId(2) val msgNetsegconf: List? = null, + @SerialId(3) val boolOpenHardwareCodec: Boolean = false, + @SerialId(4) val boolSendAheadSignal: Boolean = false ) : ProtoBuf @Serializable class SrvAddrs( - @ProtoId(1) val serviceType: Int = 0, - @ProtoId(2) val msgAddrs: List? = null, - @ProtoId(3) val fragmentSize: Int = 0, - @ProtoId(4) val msgNetsegconf: List? = null, - @ProtoId(5) val msgAddrsV6: List? = null + @SerialId(1) val serviceType: Int = 0, + @SerialId(2) val msgAddrs: List? = null, + @SerialId(3) val fragmentSize: Int = 0, + @SerialId(4) val msgNetsegconf: List? = null, + @SerialId(5) val msgAddrsV6: List? = null ) : ProtoBuf } } diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/ImageRequest.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/ImageRequest.kt index 0b4606896..87b0f7de4 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/ImageRequest.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/ImageRequest.kt @@ -9,8 +9,8 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto +import kotlinx.serialization.SerialId import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId import net.mamoe.mirai.qqandroid.io.ProtoBuf import net.mamoe.mirai.utils.currentTimeSeconds @@ -20,22 +20,22 @@ interface ImgReq : ProtoBuf @Serializable internal class GetImgUrlReq( - @ProtoId(1) val srcUni: Int, - @ProtoId(2) val dstUni: Int, - @ProtoId(3) val fileResID: String,//UUID + @SerialId(1) val srcUni: Int, + @SerialId(2) val dstUni: Int, + @SerialId(3) val fileResID: String,//UUID /** * UUID例子: 没有找到 */ - @ProtoId(4) val urlFlag: Int = 1, + @SerialId(4) val urlFlag: Int = 1, //5 unknown, 好像没用 - @ProtoId(6) val urlType: Int = 4, - @ProtoId(7) val requestTerm: Int = 5,//确定 - @ProtoId(8) val requestPlatformType: Int = 9,//确定 - @ProtoId(9) val srcFileType: Int = 1,//2=ftn，1=picplatform，255 - @ProtoId(10) val innerIP: Int = 0,//确定 - @ProtoId(11) val addressBook: Int = 0,//[ChatType.internalID]== 1006为1[为CONTACT时] 我觉得发0没问题 - @ProtoId(12) val buType: Int = 1,//确定 - @ProtoId(13) val buildVer: String = "8.2.7.4410",//版本号 - @ProtoId(14) val timestamp: Int = currentTimeSeconds.toInt(),//(pic_up_timestamp) - @ProtoId(15) val requestTransferType: Int = 1 + @SerialId(6) val urlType: Int = 4, + @SerialId(7) val requestTerm: Int = 5,//确定 + @SerialId(8) val requestPlatformType: Int = 9,//确定 + @SerialId(9) val srcFileType: Int = 1,//2=ftn，1=picplatform，255 + @SerialId(10) val innerIP: Int = 0,//确定 + @SerialId(11) val addressBook: Int = 0,//[ChatType.internalID]== 1006为1[为CONTACT时] 我觉得发0没问题 + @SerialId(12) val buType: Int = 1,//确定 + @SerialId(13) val buildVer: String = "8.2.7.4410",//版本号 + @SerialId(14) val timestamp: Int = currentTimeSeconds.toInt(),//(pic_up_timestamp) + @SerialId(15) val requestTransferType: Int = 1 ) : ImgReq \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Msg.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Msg.kt index a4c0abfdb..f8037384f 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Msg.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Msg.kt @@ -9,8 +9,8 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto +import kotlinx.serialization.SerialId import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId import kotlinx.serialization.protobuf.ProtoNumberType import kotlinx.serialization.protobuf.ProtoType import net.mamoe.mirai.qqandroid.io.ProtoBuf @@ -21,36 +21,36 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY internal class ImCommon : ProtoBuf { @Serializable internal class GroupInfo( - @ProtoId(1) val groupId: Long = 0L, - @ProtoId(2) val groupType: Int /* enum */ = 1 + @SerialId(1) val groupId: Long = 0L, + @SerialId(2) val groupType: Int /* enum */ = 1 ) : ProtoBuf @Serializable internal class Signature( - @ProtoId(1) val keyType: Int = 0, - @ProtoId(2) val sessionAppId: Int = 0, - @ProtoId(3) val sessionKey: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val keyType: Int = 0, + @SerialId(2) val sessionAppId: Int = 0, + @SerialId(3) val sessionKey: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class Token( - @ProtoId(1) val buf: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val c2cType: Int = 0, - @ProtoId(3) val serviceType: Int = 0 + @SerialId(1) val buf: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val c2cType: Int = 0, + @SerialId(3) val serviceType: Int = 0 ) : ProtoBuf @Serializable internal class User( - @ProtoId(1) val uin: Long = 0L, - @ProtoId(2) val appId: Int = 0, - @ProtoId(3) val instanceId: Int = 0, - @ProtoId(4) val appType: Int = 0, - @ProtoType(ProtoNumberType.FIXED) @ProtoId(5) val clientIp: Int = 0, - @ProtoId(6) val version: Int = 0, - @ProtoId(7) val phoneNumber: String = "", - @ProtoId(8) val platformId: Int = 0, - @ProtoId(9) val language: Int = 0, - @ProtoId(10) val equipKey: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val uin: Long = 0L, + @SerialId(2) val appId: Int = 0, + @SerialId(3) val instanceId: Int = 0, + @SerialId(4) val appType: Int = 0, + @ProtoType(ProtoNumberType.FIXED) @SerialId(5) val clientIp: Int = 0, + @SerialId(6) val version: Int = 0, + @SerialId(7) val phoneNumber: String = "", + @SerialId(8) val platformId: Int = 0, + @SerialId(9) val language: Int = 0, + @SerialId(10) val equipKey: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf } @@ -58,37 +58,37 @@ internal class ImCommon : ProtoBuf { internal class ImImagent : ProtoBuf { @Serializable internal class ImAgentHead( - @ProtoId(1) val command: Int /* enum */ = 1, - @ProtoId(2) val seq: Int = 0, - @ProtoId(3) val result: Int = 0, - @ProtoId(4) val err: String = "", - @ProtoId(5) val echoBuf: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val reqUser: ImCommon.User? = null, - @ProtoId(7) val reqInfo: Requestinfo? = null, - @ProtoId(8) val signature: Signature? = null, - @ProtoId(9) val subCmd: Int = 0, - @ProtoId(10) val serverIp: Int = 0 + @SerialId(1) val command: Int /* enum */ = 1, + @SerialId(2) val seq: Int = 0, + @SerialId(3) val result: Int = 0, + @SerialId(4) val err: String = "", + @SerialId(5) val echoBuf: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val reqUser: ImCommon.User? = null, + @SerialId(7) val reqInfo: Requestinfo? = null, + @SerialId(8) val signature: Signature? = null, + @SerialId(9) val subCmd: Int = 0, + @SerialId(10) val serverIp: Int = 0 ) : ProtoBuf @Serializable internal class ImAgentPackage( - @ProtoId(1) val head: ImAgentHead? = null, - @ProtoId(11) val msgSendReq: ImMsg.MsgSendReq? = null, - @ProtoId(12) val msgSendResp: ImMsg.MsgSendResp? = null + @SerialId(1) val head: ImAgentHead? = null, + @SerialId(11) val msgSendReq: ImMsg.MsgSendReq? = null, + @SerialId(12) val msgSendResp: ImMsg.MsgSendResp? = null ) : ProtoBuf @Serializable internal class Requestinfo( - @ProtoType(ProtoNumberType.FIXED) @ProtoId(1) val reqIp: Int = 0, - @ProtoId(2) val reqPort: Int = 0, - @ProtoId(3) val reqFlag: Int = 0 + @ProtoType(ProtoNumberType.FIXED) @SerialId(1) val reqIp: Int = 0, + @SerialId(2) val reqPort: Int = 0, + @SerialId(3) val reqFlag: Int = 0 ) : ProtoBuf @Serializable internal class Signature( - @ProtoId(1) val keyType: Int = 0, - @ProtoId(2) val sessionAppId: Int = 0, - @ProtoId(3) val sessionKey: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val keyType: Int = 0, + @SerialId(2) val sessionAppId: Int = 0, + @SerialId(3) val sessionKey: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf } @@ -96,59 +96,59 @@ internal class ImImagent : ProtoBuf { internal class ImMsg : ProtoBuf { @Serializable internal class C2C( - @ProtoId(1) val sender: ImCommon.User? = null, - @ProtoId(2) val receiver: ImCommon.User? = null, - @ProtoId(3) val c2cRelation: C2CRelation? = null + @SerialId(1) val sender: ImCommon.User? = null, + @SerialId(2) val receiver: ImCommon.User? = null, + @SerialId(3) val c2cRelation: C2CRelation? = null ) : ProtoBuf @Serializable internal class C2CRelation( - @ProtoId(1) val c2cType: Int /* enum */ = 0, - @ProtoId(2) val groupInfo: ImCommon.GroupInfo? = null, - @ProtoId(3) val token: ImCommon.Token? = null + @SerialId(1) val c2cType: Int /* enum */ = 0, + @SerialId(2) val groupInfo: ImCommon.GroupInfo? = null, + @SerialId(3) val token: ImCommon.Token? = null ) : ProtoBuf @Serializable internal class ContentHead( - @ProtoId(1) val pkgNum: Int = 1, - @ProtoId(2) val pkgIndex: Int = 0, - @ProtoId(3) val seq: Int = 0, - @ProtoId(4) val dateTime: Int = 0, - @ProtoId(5) val msgType: Int = 0, - @ProtoId(6) val divSeq: Int = 0, - @ProtoId(7) val msgdbUin: Long = 0L, - @ProtoId(8) val msgdbSeq: Int = 0, - @ProtoId(9) val wordMsgSeq: Int = 0, - @ProtoId(10) val msgRand: Int = 0 + @SerialId(1) val pkgNum: Int = 1, + @SerialId(2) val pkgIndex: Int = 0, + @SerialId(3) val seq: Int = 0, + @SerialId(4) val dateTime: Int = 0, + @SerialId(5) val msgType: Int = 0, + @SerialId(6) val divSeq: Int = 0, + @SerialId(7) val msgdbUin: Long = 0L, + @SerialId(8) val msgdbSeq: Int = 0, + @SerialId(9) val wordMsgSeq: Int = 0, + @SerialId(10) val msgRand: Int = 0 ) : ProtoBuf @Serializable internal class Group( - @ProtoId(1) val sender: ImCommon.User? = null, - @ProtoId(2) val receiver: ImCommon.User? = null, - @ProtoId(3) val groupInfo: ImCommon.GroupInfo? = null + @SerialId(1) val sender: ImCommon.User? = null, + @SerialId(2) val receiver: ImCommon.User? = null, + @SerialId(3) val groupInfo: ImCommon.GroupInfo? = null ) : ProtoBuf @Serializable internal class Msg( - @ProtoId(1) val head: MsgHead? = null, - @ProtoId(2) val body: ImMsgBody.MsgBody? = null + @SerialId(1) val head: MsgHead? = null, + @SerialId(2) val body: ImMsgBody.MsgBody? = null ) : ProtoBuf @Serializable internal class MsgHead( - @ProtoId(1) val routingHead: RoutingHead? = null, - @ProtoId(2) val contentHead: ContentHead? = null, - @ProtoId(3) val gbkTmpMsgBody: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val routingHead: RoutingHead? = null, + @SerialId(2) val contentHead: ContentHead? = null, + @SerialId(3) val gbkTmpMsgBody: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class MsgSendReq( - @ProtoId(1) val msg: Msg? = null, - @ProtoId(2) val buMsg: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val msgTailId: Int = 0, - @ProtoId(4) val connMsgFlag: Int = 0, - @ProtoId(5) val cookie: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val msg: Msg? = null, + @SerialId(2) val buMsg: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val msgTailId: Int = 0, + @SerialId(4) val connMsgFlag: Int = 0, + @SerialId(5) val cookie: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable @@ -156,8 +156,8 @@ internal class ImMsg : ProtoBuf { @Serializable internal class RoutingHead( - @ProtoId(1) val c2c: C2C? = null, - @ProtoId(2) val group: Group? = null + @SerialId(1) val c2c: C2C? = null, + @SerialId(2) val group: Group? = null ) : ProtoBuf } @@ -165,512 +165,512 @@ internal class ImMsg : ProtoBuf { internal class ImMsgBody : ProtoBuf { @Serializable internal class AnonymousGroupMsg( - @ProtoId(1) val flags: Int = 0, - @ProtoId(2) val anonId: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val anonNick: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val headPortrait: Int = 0, - @ProtoId(5) val expireTime: Int = 0, - @ProtoId(6) val bubbleId: Int = 0, - @ProtoId(7) val rankColor: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val flags: Int = 0, + @SerialId(2) val anonId: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val anonNick: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val headPortrait: Int = 0, + @SerialId(5) val expireTime: Int = 0, + @SerialId(6) val bubbleId: Int = 0, + @SerialId(7) val rankColor: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class ApolloActMsg( - @ProtoId(1) val actionId: Int = 0, - @ProtoId(2) val actionName: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val actionText: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val flag: Int = 0, - @ProtoId(5) val peerUin: Int = 0, - @ProtoId(6) val senderTs: Int = 0, - @ProtoId(7) val peerTs: Int = 0, - @ProtoId(8) val int32SenderStatus: Int = 0, - @ProtoId(9) val int32PeerStatus: Int = 0, - @ProtoId(10) val diytextId: Int = 0, - @ProtoId(11) val diytextContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(12) val inputText: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(13) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val actionId: Int = 0, + @SerialId(2) val actionName: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val actionText: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val flag: Int = 0, + @SerialId(5) val peerUin: Int = 0, + @SerialId(6) val senderTs: Int = 0, + @SerialId(7) val peerTs: Int = 0, + @SerialId(8) val int32SenderStatus: Int = 0, + @SerialId(9) val int32PeerStatus: Int = 0, + @SerialId(10) val diytextId: Int = 0, + @SerialId(11) val diytextContent: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(12) val inputText: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(13) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class ArkAppElem( - @ProtoId(1) val appName: String = "", - @ProtoId(2) val minVersion: String = "", - @ProtoId(3) val xmlTemplate: String = "", - @ProtoId(4) val data: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val appName: String = "", + @SerialId(2) val minVersion: String = "", + @SerialId(3) val xmlTemplate: String = "", + @SerialId(4) val data: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class Attr( - @ProtoType(ProtoNumberType.SIGNED) @ProtoId(1) val codePage: Int = -1, - @ProtoId(2) val time: Int = 1, - @ProtoId(3) val random: Int = 0, - @ProtoId(4) val color: Int = 0, - @ProtoId(5) val size: Int = 10, - @ProtoId(6) val effect: Int = 7, - @ProtoId(7) val charSet: Int = 78, - @ProtoId(8) val pitchAndFamily: Int = 90, - @ProtoId(9) val fontName: String = "Times New Roman", - @ProtoId(10) val reserveData: ByteArray = EMPTY_BYTE_ARRAY + @ProtoType(ProtoNumberType.SIGNED) @SerialId(1) val codePage: Int = -1, + @SerialId(2) val time: Int = 1, + @SerialId(3) val random: Int = 0, + @SerialId(4) val color: Int = 0, + @SerialId(5) val size: Int = 10, + @SerialId(6) val effect: Int = 7, + @SerialId(7) val charSet: Int = 78, + @SerialId(8) val pitchAndFamily: Int = 90, + @SerialId(9) val fontName: String = "Times New Roman", + @SerialId(10) val reserveData: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class BitAppMsg( - @ProtoId(1) val buf: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val buf: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class BlessingMessage( - @ProtoId(1) val msgType: Int = 0, - @ProtoId(2) val exFlag: Int = 0 + @SerialId(1) val msgType: Int = 0, + @SerialId(2) val exFlag: Int = 0 ) : ProtoBuf @Serializable internal class CommonElem( - @ProtoId(1) val serviceType: Int = 0, - @ProtoId(2) val pbElem: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val businessType: Int = 0 + @SerialId(1) val serviceType: Int = 0, + @SerialId(2) val pbElem: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val businessType: Int = 0 ) : ProtoBuf @Serializable internal class ConferenceTipsInfo( - @ProtoId(1) val sessionType: Int = 0, - @ProtoId(2) val sessionUin: Long = 0L, - @ProtoId(3) val text: String = "" + @SerialId(1) val sessionType: Int = 0, + @SerialId(2) val sessionUin: Long = 0L, + @SerialId(3) val text: String = "" ) : ProtoBuf @Serializable internal class CrmElem( - @ProtoId(1) val crmBuf: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val msgResid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val qidianFlag: Int = 0, - @ProtoId(4) val pushFlag: Int = 0, - @ProtoId(5) val countFlag: Int = 0 + @SerialId(1) val crmBuf: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val msgResid: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val qidianFlag: Int = 0, + @SerialId(4) val pushFlag: Int = 0, + @SerialId(5) val countFlag: Int = 0 ) : ProtoBuf @Serializable internal class CustomElem( - @ProtoId(1) val desc: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val data: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val enumType: Int /* enum */ = 1, - @ProtoId(4) val ext: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val sound: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val desc: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val data: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val enumType: Int /* enum */ = 1, + @SerialId(4) val ext: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val sound: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class CustomFace( - @ProtoId(1) val guid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val filePath: String = "", - @ProtoId(3) val shortcut: String = "", - @ProtoId(4) val buffer: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val flag: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val oldData: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) val fileId: Int = 0, - @ProtoId(8) val serverIp: Int = 0, - @ProtoId(9) val serverPort: Int = 0, - @ProtoId(10) val fileType: Int = 0, - @ProtoId(11) val signature: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(12) val useful: Int = 0, - @ProtoId(13) val md5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(14) val thumbUrl: String = "", - @ProtoId(15) val bigUrl: String = "", - @ProtoId(16) val origUrl: String = "", - @ProtoId(17) val bizType: Int = 0, - @ProtoId(18) val repeatIndex: Int = 0, - @ProtoId(19) val repeatImage: Int = 0, - @ProtoId(20) val imageType: Int = 0, - @ProtoId(21) val index: Int = 0, - @ProtoId(22) val width: Int = 0, - @ProtoId(23) val height: Int = 0, - @ProtoId(24) val source: Int = 0, - @ProtoId(25) val size: Int = 0, - @ProtoId(26) val origin: Int = 0, - @ProtoId(27) val thumbWidth: Int = 0, - @ProtoId(28) val thumbHeight: Int = 0, - @ProtoId(29) val showLen: Int = 0, - @ProtoId(30) val downloadLen: Int = 0, - @ProtoId(31) val _400Url: String = "", - @ProtoId(32) val _400Width: Int = 0, - @ProtoId(33) val _400Height: Int = 0, - @ProtoId(34) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val guid: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val filePath: String = "", + @SerialId(3) val shortcut: String = "", + @SerialId(4) val buffer: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val flag: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val oldData: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(7) val fileId: Int = 0, + @SerialId(8) val serverIp: Int = 0, + @SerialId(9) val serverPort: Int = 0, + @SerialId(10) val fileType: Int = 0, + @SerialId(11) val signature: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(12) val useful: Int = 0, + @SerialId(13) val md5: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(14) val thumbUrl: String = "", + @SerialId(15) val bigUrl: String = "", + @SerialId(16) val origUrl: String = "", + @SerialId(17) val bizType: Int = 0, + @SerialId(18) val repeatIndex: Int = 0, + @SerialId(19) val repeatImage: Int = 0, + @SerialId(20) val imageType: Int = 0, + @SerialId(21) val index: Int = 0, + @SerialId(22) val width: Int = 0, + @SerialId(23) val height: Int = 0, + @SerialId(24) val source: Int = 0, + @SerialId(25) val size: Int = 0, + @SerialId(26) val origin: Int = 0, + @SerialId(27) val thumbWidth: Int = 0, + @SerialId(28) val thumbHeight: Int = 0, + @SerialId(29) val showLen: Int = 0, + @SerialId(30) val downloadLen: Int = 0, + @SerialId(31) val _400Url: String = "", + @SerialId(32) val _400Width: Int = 0, + @SerialId(33) val _400Height: Int = 0, + @SerialId(34) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class DeliverGiftMsg( - @ProtoId(1) val grayTipContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val animationPackageId: Int = 0, - @ProtoId(3) val animationPackageUrlA: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val animationPackageUrlI: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val remindBrief: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val giftId: Int = 0, - @ProtoId(7) val giftCount: Int = 0, - @ProtoId(8) val animationBrief: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(9) val senderUin: Long = 0L, - @ProtoId(10) val receiverUin: Long = 0L, - @ProtoId(11) val stmessageTitle: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(12) val stmessageSubtitle: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(13) val stmessageMessage: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(14) val stmessageGiftpicid: Int = 0, - @ProtoId(15) val stmessageComefrom: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(16) val stmessageExflag: Int = 0, - @ProtoId(17) val toAllGiftId: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(18) val comefromLink: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(19) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(20) val receiverName: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(21) val receiverPic: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(22) val stmessageGifturl: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val grayTipContent: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val animationPackageId: Int = 0, + @SerialId(3) val animationPackageUrlA: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val animationPackageUrlI: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val remindBrief: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val giftId: Int = 0, + @SerialId(7) val giftCount: Int = 0, + @SerialId(8) val animationBrief: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(9) val senderUin: Long = 0L, + @SerialId(10) val receiverUin: Long = 0L, + @SerialId(11) val stmessageTitle: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(12) val stmessageSubtitle: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(13) val stmessageMessage: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(14) val stmessageGiftpicid: Int = 0, + @SerialId(15) val stmessageComefrom: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(16) val stmessageExflag: Int = 0, + @SerialId(17) val toAllGiftId: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(18) val comefromLink: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(19) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(20) val receiverName: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(21) val receiverPic: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(22) val stmessageGifturl: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class EIMInfo( - @ProtoId(1) val rootId: Long = 0L, - @ProtoId(2) val flag: Int = 0 + @SerialId(1) val rootId: Long = 0L, + @SerialId(2) val flag: Int = 0 ) : ProtoBuf @Serializable internal class Elem( - @ProtoId(1) val text: Text? = null, - @ProtoId(2) val face: Face? = null, - @ProtoId(3) val onlineImage: OnlineImage? = null, - @ProtoId(4) val notOnlineImage: NotOnlineImage? = null, - @ProtoId(5) val transElemInfo: TransElem? = null, - @ProtoId(6) val marketFace: MarketFace? = null, - @ProtoId(7) val elemFlags: ElemFlags? = null, - @ProtoId(8) val customFace: CustomFace? = null, - @ProtoId(9) val elemFlags2: ElemFlags2? = null, - @ProtoId(10) val funFace: FunFace? = null, - @ProtoId(11) val secretFile: SecretFileMsg? = null, - @ProtoId(12) val richMsg: RichMsg? = null, - @ProtoId(13) val groupFile: GroupFile? = null, - @ProtoId(14) val pubGroup: PubGroup? = null, - @ProtoId(15) val marketTrans: MarketTrans? = null, - @ProtoId(16) val extraInfo: ExtraInfo? = null, - @ProtoId(17) val shakeWindow: ShakeWindow? = null, - @ProtoId(18) val pubAccount: PubAccount? = null, - @ProtoId(19) val videoFile: VideoFile? = null, - @ProtoId(20) val tipsInfo: TipsInfo? = null, - @ProtoId(21) val anonGroupMsg: AnonymousGroupMsg? = null, - @ProtoId(22) val qqLiveOld: QQLiveOld? = null, - @ProtoId(23) val lifeOnline: LifeOnlineAccount? = null, - @ProtoId(24) val qqwalletMsg: QQWalletMsg? = null, - @ProtoId(25) val crmElem: CrmElem? = null, - @ProtoId(26) val conferenceTipsInfo: ConferenceTipsInfo? = null, - @ProtoId(27) val redbagInfo: RedBagInfo? = null, - @ProtoId(28) val lowVersionTips: LowVersionTips? = null, - @ProtoId(29) val bankcodeCtrlInfo: ByteArray? = null, - @ProtoId(30) val nearByMsg: NearByMessageType? = null, - @ProtoId(31) val customElem: CustomElem? = null, - @ProtoId(32) val locationInfo: LocationInfo? = null, - @ProtoId(33) val pubAccInfo: PubAccInfo? = null, - @ProtoId(34) val smallEmoji: SmallEmoji? = null, - @ProtoId(35) val fsjMsgElem: FSJMessageElem? = null, - @ProtoId(36) val arkApp: ArkAppElem? = null, - @ProtoId(37) val generalFlags: GeneralFlags? = null, - @ProtoId(38) val hcFlashPic: CustomFace? = null, - @ProtoId(39) val deliverGiftMsg: DeliverGiftMsg? = null, - @ProtoId(40) val bitappMsg: BitAppMsg? = null, - @ProtoId(41) val openQqData: OpenQQData? = null, - @ProtoId(42) val apolloMsg: ApolloActMsg? = null, - @ProtoId(43) val groupPubAccInfo: GroupPubAccountInfo? = null, - @ProtoId(44) val blessMsg: BlessingMessage? = null, - @ProtoId(45) val srcMsg: SourceMsg? = null, - @ProtoId(46) val lolaMsg: LolaMsg? = null, - @ProtoId(47) val groupBusinessMsg: GroupBusinessMsg? = null, - @ProtoId(48) val msgWorkflowNotify: WorkflowNotifyMsg? = null, - @ProtoId(49) val patElem: PatsElem? = null, - @ProtoId(50) val groupPostElem: GroupPostElem? = null, - @ProtoId(51) val lightApp: LightAppElem? = null, - @ProtoId(52) val eimInfo: EIMInfo? = null, - @ProtoId(53) val commonElem: CommonElem? = null + @SerialId(1) val text: Text? = null, + @SerialId(2) val face: Face? = null, + @SerialId(3) val onlineImage: OnlineImage? = null, + @SerialId(4) val notOnlineImage: NotOnlineImage? = null, + @SerialId(5) val transElemInfo: TransElem? = null, + @SerialId(6) val marketFace: MarketFace? = null, + @SerialId(7) val elemFlags: ElemFlags? = null, + @SerialId(8) val customFace: CustomFace? = null, + @SerialId(9) val elemFlags2: ElemFlags2? = null, + @SerialId(10) val funFace: FunFace? = null, + @SerialId(11) val secretFile: SecretFileMsg? = null, + @SerialId(12) val richMsg: RichMsg? = null, + @SerialId(13) val groupFile: GroupFile? = null, + @SerialId(14) val pubGroup: PubGroup? = null, + @SerialId(15) val marketTrans: MarketTrans? = null, + @SerialId(16) val extraInfo: ExtraInfo? = null, + @SerialId(17) val shakeWindow: ShakeWindow? = null, + @SerialId(18) val pubAccount: PubAccount? = null, + @SerialId(19) val videoFile: VideoFile? = null, + @SerialId(20) val tipsInfo: TipsInfo? = null, + @SerialId(21) val anonGroupMsg: AnonymousGroupMsg? = null, + @SerialId(22) val qqLiveOld: QQLiveOld? = null, + @SerialId(23) val lifeOnline: LifeOnlineAccount? = null, + @SerialId(24) val qqwalletMsg: QQWalletMsg? = null, + @SerialId(25) val crmElem: CrmElem? = null, + @SerialId(26) val conferenceTipsInfo: ConferenceTipsInfo? = null, + @SerialId(27) val redbagInfo: RedBagInfo? = null, + @SerialId(28) val lowVersionTips: LowVersionTips? = null, + @SerialId(29) val bankcodeCtrlInfo: ByteArray? = null, + @SerialId(30) val nearByMsg: NearByMessageType? = null, + @SerialId(31) val customElem: CustomElem? = null, + @SerialId(32) val locationInfo: LocationInfo? = null, + @SerialId(33) val pubAccInfo: PubAccInfo? = null, + @SerialId(34) val smallEmoji: SmallEmoji? = null, + @SerialId(35) val fsjMsgElem: FSJMessageElem? = null, + @SerialId(36) val arkApp: ArkAppElem? = null, + @SerialId(37) val generalFlags: GeneralFlags? = null, + @SerialId(38) val hcFlashPic: CustomFace? = null, + @SerialId(39) val deliverGiftMsg: DeliverGiftMsg? = null, + @SerialId(40) val bitappMsg: BitAppMsg? = null, + @SerialId(41) val openQqData: OpenQQData? = null, + @SerialId(42) val apolloMsg: ApolloActMsg? = null, + @SerialId(43) val groupPubAccInfo: GroupPubAccountInfo? = null, + @SerialId(44) val blessMsg: BlessingMessage? = null, + @SerialId(45) val srcMsg: SourceMsg? = null, + @SerialId(46) val lolaMsg: LolaMsg? = null, + @SerialId(47) val groupBusinessMsg: GroupBusinessMsg? = null, + @SerialId(48) val msgWorkflowNotify: WorkflowNotifyMsg? = null, + @SerialId(49) val patElem: PatsElem? = null, + @SerialId(50) val groupPostElem: GroupPostElem? = null, + @SerialId(51) val lightApp: LightAppElem? = null, + @SerialId(52) val eimInfo: EIMInfo? = null, + @SerialId(53) val commonElem: CommonElem? = null ) : ProtoBuf @Serializable internal class ElemFlags( - @ProtoId(1) val flags1: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val businessData: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val flags1: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val businessData: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class ElemFlags2( - @ProtoId(1) val colorTextId: Int = 0, - @ProtoId(2) val msgId: Long = 0L, - @ProtoId(3) val whisperSessionId: Int = 0, - @ProtoId(4) val pttChangeBit: Int = 0, - @ProtoId(5) val vipStatus: Int = 0, - @ProtoId(6) val compatibleId: Int = 0, - @ProtoId(7) val insts: List? = null, - @ProtoId(8) val msgRptCnt: Int = 0, - @ProtoId(9) val srcInst: Inst? = null, - @ProtoId(10) val longtitude: Int = 0, - @ProtoId(11) val latitude: Int = 0, - @ProtoId(12) val customFont: Int = 0, - @ProtoId(13) val pcSupportDef: PcSupportDef? = null, - @ProtoId(14) val crmFlags: Int = 0 + @SerialId(1) val colorTextId: Int = 0, + @SerialId(2) val msgId: Long = 0L, + @SerialId(3) val whisperSessionId: Int = 0, + @SerialId(4) val pttChangeBit: Int = 0, + @SerialId(5) val vipStatus: Int = 0, + @SerialId(6) val compatibleId: Int = 0, + @SerialId(7) val insts: List? = null, + @SerialId(8) val msgRptCnt: Int = 0, + @SerialId(9) val srcInst: Inst? = null, + @SerialId(10) val longtitude: Int = 0, + @SerialId(11) val latitude: Int = 0, + @SerialId(12) val customFont: Int = 0, + @SerialId(13) val pcSupportDef: PcSupportDef? = null, + @SerialId(14) val crmFlags: Int = 0 ) : ProtoBuf { @Serializable internal class Inst( - @ProtoId(1) val appId: Int = 0, - @ProtoId(2) val instId: Int = 0 + @SerialId(1) val appId: Int = 0, + @SerialId(2) val instId: Int = 0 ) } @Serializable internal class ExtraInfo( - @ProtoId(1) val nick: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val groupCard: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val level: Int = 0, - @ProtoId(4) val flags: Int = 0, - @ProtoId(5) val groupMask: Int = 0, - @ProtoId(6) val msgTailId: Int = 0, - @ProtoId(7) val senderTitle: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) val apnsTips: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(9) val uin: Long = 0L, - @ProtoId(10) val msgStateFlag: Int = 0, - @ProtoId(11) val apnsSoundType: Int = 0, - @ProtoId(12) val newGroupFlag: Int = 0 + @SerialId(1) val nick: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val groupCard: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val level: Int = 0, + @SerialId(4) val flags: Int = 0, + @SerialId(5) val groupMask: Int = 0, + @SerialId(6) val msgTailId: Int = 0, + @SerialId(7) val senderTitle: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(8) val apnsTips: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(9) val uin: Long = 0L, + @SerialId(10) val msgStateFlag: Int = 0, + @SerialId(11) val apnsSoundType: Int = 0, + @SerialId(12) val newGroupFlag: Int = 0 ) : ProtoBuf @Serializable internal class Face( - @ProtoId(1) val index: Int = 0, - @ProtoId(2) val old: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(11) val buf: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val index: Int = 0, + @SerialId(2) val old: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(11) val buf: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class FSJMessageElem( - @ProtoId(1) val msgType: Int = 0 + @SerialId(1) val msgType: Int = 0 ) : ProtoBuf @Serializable internal class FunFace( - @ProtoId(1) val msgTurntable: Turntable? = null, - @ProtoId(2) val msgBomb: Bomb? = null + @SerialId(1) val msgTurntable: Turntable? = null, + @SerialId(2) val msgBomb: Bomb? = null ) { @Serializable internal class Bomb( - @ProtoId(1) val boolBurst: Boolean = false + @SerialId(1) val boolBurst: Boolean = false ) @Serializable internal class Turntable( - @ProtoId(1) val uint64UinList: List? = null, - @ProtoId(2) val hitUin: Long = 0L, - @ProtoId(3) val hitUinNick: String = "" + @SerialId(1) val uint64UinList: List? = null, + @SerialId(2) val hitUin: Long = 0L, + @SerialId(3) val hitUinNick: String = "" ) } @Serializable internal class GeneralFlags( - @ProtoId(1) val bubbleDiyTextId: Int = 0, - @ProtoId(2) val groupFlagNew: Int = 0, - @ProtoId(3) val uin: Long = 0L, - @ProtoId(4) val rpId: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val prpFold: Int = 0, - @ProtoId(6) val longTextFlag: Int = 0, - @ProtoId(7) val longTextResid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) val groupType: Int = 0, - @ProtoId(9) val toUinFlag: Int = 0, - @ProtoId(10) val glamourLevel: Int = 0, - @ProtoId(11) val memberLevel: Int = 0, - @ProtoId(12) val groupRankSeq: Long = 0L, - @ProtoId(13) val olympicTorch: Int = 0, - @ProtoId(14) val babyqGuideMsgCookie: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(15) val uin32ExpertFlag: Int = 0, - @ProtoId(16) val bubbleSubId: Int = 0, - @ProtoId(17) val pendantId: Long = 0L, - @ProtoId(18) val rpIndex: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(19) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY // 78 00 F8 01 00 C8 02 00 + @SerialId(1) val bubbleDiyTextId: Int = 0, + @SerialId(2) val groupFlagNew: Int = 0, + @SerialId(3) val uin: Long = 0L, + @SerialId(4) val rpId: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val prpFold: Int = 0, + @SerialId(6) val longTextFlag: Int = 0, + @SerialId(7) val longTextResid: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(8) val groupType: Int = 0, + @SerialId(9) val toUinFlag: Int = 0, + @SerialId(10) val glamourLevel: Int = 0, + @SerialId(11) val memberLevel: Int = 0, + @SerialId(12) val groupRankSeq: Long = 0L, + @SerialId(13) val olympicTorch: Int = 0, + @SerialId(14) val babyqGuideMsgCookie: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(15) val uin32ExpertFlag: Int = 0, + @SerialId(16) val bubbleSubId: Int = 0, + @SerialId(17) val pendantId: Long = 0L, + @SerialId(18) val rpIndex: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(19) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY // 78 00 F8 01 00 C8 02 00 ) : ProtoBuf @Serializable internal class GroupBusinessMsg( - @ProtoId(1) val flags: Int = 0, - @ProtoId(2) val headUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val headClkUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val nick: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val nickColor: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val rank: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) val rankColor: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) val rankBgcolor: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val flags: Int = 0, + @SerialId(2) val headUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val headClkUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val nick: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val nickColor: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val rank: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(7) val rankColor: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(8) val rankBgcolor: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class GroupFile( - @ProtoId(1) val filename: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val fileSize: Long = 0L, - @ProtoId(3) val fileId: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val batchId: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val fileKey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val mark: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) val sequence: Long = 0L, - @ProtoId(8) val batchItemId: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(9) val feedMsgTime: Int = 0, - @ProtoId(10) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val filename: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val fileSize: Long = 0L, + @SerialId(3) val fileId: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val batchId: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val fileKey: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val mark: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(7) val sequence: Long = 0L, + @SerialId(8) val batchItemId: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(9) val feedMsgTime: Int = 0, + @SerialId(10) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class GroupPostElem( - @ProtoId(1) val transType: Int = 0, - @ProtoId(2) val transMsg: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val transType: Int = 0, + @SerialId(2) val transMsg: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class GroupPubAccountInfo( - @ProtoId(1) val pubAccount: Long = 0L + @SerialId(1) val pubAccount: Long = 0L ) : ProtoBuf @Serializable internal class LifeOnlineAccount( - @ProtoId(1) val uniqueId: Long = 0L, - @ProtoId(2) val op: Int = 0, - @ProtoId(3) val showTime: Int = 0, - @ProtoId(4) val report: Int = 0, - @ProtoId(5) val ack: Int = 0, - @ProtoId(6) val bitmap: Long = 0L, - @ProtoId(7) val gdtImpData: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) val gdtCliData: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(9) val viewId: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val uniqueId: Long = 0L, + @SerialId(2) val op: Int = 0, + @SerialId(3) val showTime: Int = 0, + @SerialId(4) val report: Int = 0, + @SerialId(5) val ack: Int = 0, + @SerialId(6) val bitmap: Long = 0L, + @SerialId(7) val gdtImpData: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(8) val gdtCliData: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(9) val viewId: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class LightAppElem( - @ProtoId(1) val data: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val msgResid: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val data: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val msgResid: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class LocationInfo( - @ProtoId(1) val longitude: Double = 0.0, - @ProtoId(2) val latitude: Double = 0.0, - @ProtoId(3) val desc: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val longitude: Double = 0.0, + @SerialId(2) val latitude: Double = 0.0, + @SerialId(3) val desc: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class LolaMsg( - @ProtoId(1) val msgResid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val encodeContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val longMsgUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val downloadKey: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val msgResid: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val encodeContent: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val longMsgUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val downloadKey: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class LowVersionTips( - @ProtoId(1) val businessId: Int = 0, - @ProtoId(2) val sessionType: Int = 0, - @ProtoId(3) val sessionUin: Long = 0L, - @ProtoId(4) val senderUin: Long = 0L, - @ProtoId(5) val text: String = "" + @SerialId(1) val businessId: Int = 0, + @SerialId(2) val sessionType: Int = 0, + @SerialId(3) val sessionUin: Long = 0L, + @SerialId(4) val senderUin: Long = 0L, + @SerialId(5) val text: String = "" ) : ProtoBuf @Serializable internal class MarketFace( - @ProtoId(1) val faceName: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val itemType: Int = 0, - @ProtoId(3) val faceInfo: Int = 0, - @ProtoId(4) val faceId: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val tabId: Int = 0, - @ProtoId(6) val subType: Int = 0, - @ProtoId(7) val key: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) val param: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(9) val mediaType: Int = 0, - @ProtoId(10) val imageWidth: Int = 0, - @ProtoId(11) val imageHeight: Int = 0, - @ProtoId(12) val mobileparam: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(13) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val faceName: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val itemType: Int = 0, + @SerialId(3) val faceInfo: Int = 0, + @SerialId(4) val faceId: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val tabId: Int = 0, + @SerialId(6) val subType: Int = 0, + @SerialId(7) val key: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(8) val param: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(9) val mediaType: Int = 0, + @SerialId(10) val imageWidth: Int = 0, + @SerialId(11) val imageHeight: Int = 0, + @SerialId(12) val mobileparam: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(13) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class MarketTrans( - @ProtoId(1) val int32Flag: Int = 0, - @ProtoId(2) val xml: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val msgResid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val ability: Int = 0, - @ProtoId(5) val minAbility: Int = 0 + @SerialId(1) val int32Flag: Int = 0, + @SerialId(2) val xml: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val msgResid: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val ability: Int = 0, + @SerialId(5) val minAbility: Int = 0 ) : ProtoBuf @Serializable internal class MsgBody( - @ProtoId(1) val richText: RichText = RichText(), - @ProtoId(2) val msgContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val msgEncryptContent: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val richText: RichText = RichText(), + @SerialId(2) val msgContent: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val msgEncryptContent: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class MsgBodySubtype4( - @ProtoId(1) val msgNotOnlineFile: NotOnlineFile? = null, - @ProtoId(2) val msgTime: Int = 0 + @SerialId(1) val msgNotOnlineFile: NotOnlineFile? = null, + @SerialId(2) val msgTime: Int = 0 ) : ProtoBuf @Serializable internal class NearByMessageType( - @ProtoId(1) val type: Int = 0, - @ProtoId(2) val identifyType: Int = 0 + @SerialId(1) val type: Int = 0, + @SerialId(2) val identifyType: Int = 0 ) : ProtoBuf @Serializable internal class NotOnlineFile( - @ProtoId(1) val fileType: Int = 0, - @ProtoId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val fileUuid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val fileName: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val fileSize: Long = 0L, - @ProtoId(7) val note: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) val reserved: Int = 0, - @ProtoId(9) val subcmd: Int = 0, - @ProtoId(10) val microCloud: Int = 0, - @ProtoId(11) val bytesFileUrls: List? = listOf(), - @ProtoId(12) val downloadFlag: Int = 0, - @ProtoId(50) val dangerEvel: Int = 0, - @ProtoId(51) val lifeTime: Int = 0, - @ProtoId(52) val uploadTime: Int = 0, - @ProtoId(53) val absFileType: Int = 0, - @ProtoId(54) val clientType: Int = 0, - @ProtoId(55) val expireTime: Int = 0, - @ProtoId(56) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val fileType: Int = 0, + @SerialId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val fileUuid: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val fileName: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val fileSize: Long = 0L, + @SerialId(7) val note: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(8) val reserved: Int = 0, + @SerialId(9) val subcmd: Int = 0, + @SerialId(10) val microCloud: Int = 0, + @SerialId(11) val bytesFileUrls: List? = listOf(), + @SerialId(12) val downloadFlag: Int = 0, + @SerialId(50) val dangerEvel: Int = 0, + @SerialId(51) val lifeTime: Int = 0, + @SerialId(52) val uploadTime: Int = 0, + @SerialId(53) val absFileType: Int = 0, + @SerialId(54) val clientType: Int = 0, + @SerialId(55) val expireTime: Int = 0, + @SerialId(56) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class NotOnlineImage( - @ProtoId(1) val filePath: String = "", - @ProtoId(2) val fileLen: Int = 0, - @ProtoId(3) val downloadPath: String = "", - @ProtoId(4) val oldVerSendFile: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val imgType: Int = 0, - @ProtoId(6) val previewsImage: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) val picMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) val picHeight: Int = 0, - @ProtoId(9) val picWidth: Int = 0, - @ProtoId(10) val resId: String = "", - @ProtoId(11) val flag: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(12) val thumbUrl: String = "", - @ProtoId(13) val original: Int = 0, - @ProtoId(14) val bigUrl: String = "", - @ProtoId(15) val origUrl: String = "", - @ProtoId(16) val bizType: Int = 0, - @ProtoId(17) val result: Int = 0, - @ProtoId(18) val index: Int = 0, - @ProtoId(19) val opFaceBuf: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(20) val oldPicMd5: Boolean = false, - @ProtoId(21) val thumbWidth: Int = 0, - @ProtoId(22) val thumbHeight: Int = 0, - @ProtoId(23) val fileId: Int = 0, - @ProtoId(24) val showLen: Int = 0, - @ProtoId(25) val downloadLen: Int = 0, - @ProtoId(26) val _400Url: String = "", - @ProtoId(27) val _400Width: Int = 0, - @ProtoId(28) val _400Height: Int = 0, - @ProtoId(29) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val filePath: String = "", + @SerialId(2) val fileLen: Int = 0, + @SerialId(3) val downloadPath: String = "", + @SerialId(4) val oldVerSendFile: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val imgType: Int = 0, + @SerialId(6) val previewsImage: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(7) val picMd5: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(8) val picHeight: Int = 0, + @SerialId(9) val picWidth: Int = 0, + @SerialId(10) val resId: String = "", + @SerialId(11) val flag: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(12) val thumbUrl: String = "", + @SerialId(13) val original: Int = 0, + @SerialId(14) val bigUrl: String = "", + @SerialId(15) val origUrl: String = "", + @SerialId(16) val bizType: Int = 0, + @SerialId(17) val result: Int = 0, + @SerialId(18) val index: Int = 0, + @SerialId(19) val opFaceBuf: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(20) val oldPicMd5: Boolean = false, + @SerialId(21) val thumbWidth: Int = 0, + @SerialId(22) val thumbHeight: Int = 0, + @SerialId(23) val fileId: Int = 0, + @SerialId(24) val showLen: Int = 0, + @SerialId(25) val downloadLen: Int = 0, + @SerialId(26) val _400Url: String = "", + @SerialId(27) val _400Width: Int = 0, + @SerialId(28) val _400Height: Int = 0, + @SerialId(29) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable // 非官方. internal data class PbReserve( - @ProtoId(1) val unknown1: Int = 1, - @ProtoId(2) val unknown2: Int = 0, - @ProtoId(6) val unknown3: Int = 0, - @ProtoId(8) val hint: String = "[动画表情]", - @ProtoId(10) val unknown5: Int = 0, - @ProtoId(15) val unknwon6: Int = 5 + @SerialId(1) val unknown1: Int = 1, + @SerialId(2) val unknown2: Int = 0, + @SerialId(6) val unknown3: Int = 0, + @SerialId(8) val hint: String = "[动画表情]", + @SerialId(10) val unknown5: Int = 0, + @SerialId(15) val unknwon6: Int = 5 ) : ProtoBuf { companion object { val DEFAULT: ByteArray = PbReserve().toByteArray(serializer()) @@ -679,292 +679,292 @@ internal class ImMsgBody : ProtoBuf { @Serializable internal class OnlineImage( - @ProtoId(1) val guid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val filePath: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val oldVerSendFile: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val guid: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val filePath: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val oldVerSendFile: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class OpenQQData( - @ProtoId(1) val carQqData: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val carQqData: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class PatsElem( - @ProtoId(1) val patType: Int = 0, - @ProtoId(2) val patCount: Int = 0 + @SerialId(1) val patType: Int = 0, + @SerialId(2) val patCount: Int = 0 ) : ProtoBuf @Serializable internal class PcSupportDef( - @ProtoId(1) val pcPtlBegin: Int = 0, - @ProtoId(2) val pcPtlEnd: Int = 0, - @ProtoId(3) val macPtlBegin: Int = 0, - @ProtoId(4) val macPtlEnd: Int = 0, - @ProtoId(5) val ptlsSupport: List? = null, - @ProtoId(6) val ptlsNotSupport: List? = null + @SerialId(1) val pcPtlBegin: Int = 0, + @SerialId(2) val pcPtlEnd: Int = 0, + @SerialId(3) val macPtlBegin: Int = 0, + @SerialId(4) val macPtlEnd: Int = 0, + @SerialId(5) val ptlsSupport: List? = null, + @SerialId(6) val ptlsNotSupport: List? = null ) : ProtoBuf @Serializable internal class Ptt( - @ProtoId(1) val fileType: Int = 0, - @ProtoId(2) val srcUin: Long = 0L, - @ProtoId(3) val fileUuid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val fileName: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val fileSize: Int = 0, - @ProtoId(7) val reserve: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) val fileId: Int = 0, - @ProtoId(9) val serverIp: Int = 0, - @ProtoId(10) val serverPort: Int = 0, - @ProtoId(11) val boolValid: Boolean = false, - @ProtoId(12) val signature: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(13) val shortcut: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(14) val fileKey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(15) val magicPttIndex: Int = 0, - @ProtoId(16) val voiceSwitch: Int = 0, - @ProtoId(17) val pttUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(18) val groupFileKey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(19) val time: Int = 0, - @ProtoId(20) val downPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(29) val format: Int = 0, - @ProtoId(30) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(31) val bytesPttUrls: List? = listOf(), - @ProtoId(32) val downloadFlag: Int = 0 + @SerialId(1) val fileType: Int = 0, + @SerialId(2) val srcUin: Long = 0L, + @SerialId(3) val fileUuid: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val fileName: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val fileSize: Int = 0, + @SerialId(7) val reserve: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(8) val fileId: Int = 0, + @SerialId(9) val serverIp: Int = 0, + @SerialId(10) val serverPort: Int = 0, + @SerialId(11) val boolValid: Boolean = false, + @SerialId(12) val signature: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(13) val shortcut: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(14) val fileKey: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(15) val magicPttIndex: Int = 0, + @SerialId(16) val voiceSwitch: Int = 0, + @SerialId(17) val pttUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(18) val groupFileKey: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(19) val time: Int = 0, + @SerialId(20) val downPara: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(29) val format: Int = 0, + @SerialId(30) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(31) val bytesPttUrls: List? = listOf(), + @SerialId(32) val downloadFlag: Int = 0 ) : ProtoBuf @Serializable internal class PubAccInfo( - @ProtoId(1) val isInterNum: Int = 0, - @ProtoId(2) val ingMsgTemplateId: String = "", - @ProtoId(3) val ingLongMsgUrl: String = "", - @ProtoId(4) val downloadKey: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val isInterNum: Int = 0, + @SerialId(2) val ingMsgTemplateId: String = "", + @SerialId(3) val ingLongMsgUrl: String = "", + @SerialId(4) val downloadKey: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class PubAccount( - @ProtoId(1) val buf: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val pubAccountUin: Long = 0L + @SerialId(1) val buf: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val pubAccountUin: Long = 0L ) : ProtoBuf @Serializable internal class PubGroup( - @ProtoId(1) val nickname: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val gender: Int = 0, - @ProtoId(3) val age: Int = 0, - @ProtoId(4) val distance: Int = 0 + @SerialId(1) val nickname: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val gender: Int = 0, + @SerialId(3) val age: Int = 0, + @SerialId(4) val distance: Int = 0 ) : ProtoBuf @Serializable internal class QQLiveOld( - @ProtoId(1) val subCmd: Int = 0, - @ProtoId(2) val showText: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val param: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val introduce: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val subCmd: Int = 0, + @SerialId(2) val showText: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val param: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val introduce: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class QQWalletAioBody( - @ProtoId(1) val senduin: Long = 0L, - @ProtoId(2) val sender: QQWalletAioElem? = null, - @ProtoId(3) val receiver: QQWalletAioElem? = null, - @ProtoType(ProtoNumberType.SIGNED) @ProtoId(4) val sint32Channelid: Int = 0, - @ProtoType(ProtoNumberType.SIGNED) @ProtoId(5) val sint32Templateid: Int = 0, - @ProtoId(6) val resend: Int = 0, - @ProtoId(7) val msgPriority: Int = 0, - @ProtoType(ProtoNumberType.SIGNED) @ProtoId(8) val sint32Redtype: Int = 0, - @ProtoId(9) val billno: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(10) val authkey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoType(ProtoNumberType.SIGNED) @ProtoId(11) val sint32Sessiontype: Int = 0, - @ProtoType(ProtoNumberType.SIGNED) @ProtoId(12) val sint32Msgtype: Int = 0, - @ProtoType(ProtoNumberType.SIGNED) @ProtoId(13) val sint32Envelopeid: Int = 0, - @ProtoId(14) val name: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoType(ProtoNumberType.SIGNED) @ProtoId(15) val sint32Conftype: Int = 0, - @ProtoType(ProtoNumberType.SIGNED) @ProtoId(16) val sint32MsgFrom: Int = 0, - @ProtoId(17) val pcBody: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(18) val ingIndex: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(19) val redchannel: Int = 0, - @ProtoId(20) val grapUin: List? = null, - @ProtoId(21) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val senduin: Long = 0L, + @SerialId(2) val sender: QQWalletAioElem? = null, + @SerialId(3) val receiver: QQWalletAioElem? = null, + @ProtoType(ProtoNumberType.SIGNED) @SerialId(4) val sint32Channelid: Int = 0, + @ProtoType(ProtoNumberType.SIGNED) @SerialId(5) val sint32Templateid: Int = 0, + @SerialId(6) val resend: Int = 0, + @SerialId(7) val msgPriority: Int = 0, + @ProtoType(ProtoNumberType.SIGNED) @SerialId(8) val sint32Redtype: Int = 0, + @SerialId(9) val billno: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(10) val authkey: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoType(ProtoNumberType.SIGNED) @SerialId(11) val sint32Sessiontype: Int = 0, + @ProtoType(ProtoNumberType.SIGNED) @SerialId(12) val sint32Msgtype: Int = 0, + @ProtoType(ProtoNumberType.SIGNED) @SerialId(13) val sint32Envelopeid: Int = 0, + @SerialId(14) val name: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoType(ProtoNumberType.SIGNED) @SerialId(15) val sint32Conftype: Int = 0, + @ProtoType(ProtoNumberType.SIGNED) @SerialId(16) val sint32MsgFrom: Int = 0, + @SerialId(17) val pcBody: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(18) val ingIndex: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(19) val redchannel: Int = 0, + @SerialId(20) val grapUin: List? = null, + @SerialId(21) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class QQWalletAioElem( - @ProtoId(1) val background: Int = 0, - @ProtoId(2) val icon: Int = 0, - @ProtoId(3) val title: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val subtitle: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val content: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val linkurl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) val blackstripe: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) val notice: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(9) val titleColor: Int = 0, - @ProtoId(10) val subtitleColor: Int = 0, - @ProtoId(11) val actionsPriority: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(12) val jumpUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(13) val nativeIos: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(14) val nativeAndroid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(15) val iconurl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(16) val contentColor: Int = 0, - @ProtoId(17) val contentBgcolor: Int = 0, - @ProtoId(18) val aioImageLeft: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(19) val aioImageRight: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(20) val cftImage: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(21) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val background: Int = 0, + @SerialId(2) val icon: Int = 0, + @SerialId(3) val title: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val subtitle: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val content: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val linkurl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(7) val blackstripe: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(8) val notice: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(9) val titleColor: Int = 0, + @SerialId(10) val subtitleColor: Int = 0, + @SerialId(11) val actionsPriority: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(12) val jumpUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(13) val nativeIos: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(14) val nativeAndroid: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(15) val iconurl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(16) val contentColor: Int = 0, + @SerialId(17) val contentBgcolor: Int = 0, + @SerialId(18) val aioImageLeft: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(19) val aioImageRight: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(20) val cftImage: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(21) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class QQWalletMsg( - @ProtoId(1) val aioBody: QQWalletAioBody? = null + @SerialId(1) val aioBody: QQWalletAioBody? = null ) : ProtoBuf @Serializable internal class RedBagInfo( - @ProtoId(1) val redbagType: Int = 0 + @SerialId(1) val redbagType: Int = 0 ) : ProtoBuf @Serializable internal class RichMsg( - @ProtoId(1) val template1: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val serviceId: Int = 0, - @ProtoId(3) val msgResid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val rand: Int = 0, - @ProtoId(5) val seq: Int = 0, - @ProtoId(6) val flags: Int = 0 + @SerialId(1) val template1: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val serviceId: Int = 0, + @SerialId(3) val msgResid: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val rand: Int = 0, + @SerialId(5) val seq: Int = 0, + @SerialId(6) val flags: Int = 0 ) : ProtoBuf @Serializable internal class RichText( - @ProtoId(1) val attr: Attr? = null, - @ProtoId(2) val elems: MutableList = mutableListOf(), - @ProtoId(3) val notOnlineFile: NotOnlineFile? = null, - @ProtoId(4) val ptt: Ptt? = null, - @ProtoId(5) val tmpPtt: TmpPtt? = null, - @ProtoId(6) val trans211TmpMsg: Trans211TmpMsg? = null + @SerialId(1) val attr: Attr? = null, + @SerialId(2) val elems: MutableList = mutableListOf(), + @SerialId(3) val notOnlineFile: NotOnlineFile? = null, + @SerialId(4) val ptt: Ptt? = null, + @SerialId(5) val tmpPtt: TmpPtt? = null, + @SerialId(6) val trans211TmpMsg: Trans211TmpMsg? = null ) : ProtoBuf @Serializable internal class SecretFileMsg( - @ProtoId(1) val fileKey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val fromUin: Long = 0L, - @ProtoId(3) val toUin: Long = 0L, - @ProtoId(4) val status: Int = 0, - @ProtoId(5) val ttl: Int = 0, - @ProtoId(6) val type: Int = 0, - @ProtoId(7) val encryptPreheadLength: Int = 0, - @ProtoId(8) val encryptType: Int = 0, - @ProtoId(9) val encryptKey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(10) val readTimes: Int = 0, - @ProtoId(11) val leftTime: Int = 0, - @ProtoId(12) val notOnlineImage: NotOnlineImage? = null, - @ProtoId(13) val elemFlags2: ElemFlags2? = null, - @ProtoId(14) val opertype: Int = 0, - @ProtoId(15) val fromphonenum: String = "" + @SerialId(1) val fileKey: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val fromUin: Long = 0L, + @SerialId(3) val toUin: Long = 0L, + @SerialId(4) val status: Int = 0, + @SerialId(5) val ttl: Int = 0, + @SerialId(6) val type: Int = 0, + @SerialId(7) val encryptPreheadLength: Int = 0, + @SerialId(8) val encryptType: Int = 0, + @SerialId(9) val encryptKey: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(10) val readTimes: Int = 0, + @SerialId(11) val leftTime: Int = 0, + @SerialId(12) val notOnlineImage: NotOnlineImage? = null, + @SerialId(13) val elemFlags2: ElemFlags2? = null, + @SerialId(14) val opertype: Int = 0, + @SerialId(15) val fromphonenum: String = "" ) : ProtoBuf @Serializable internal class ShakeWindow( - @ProtoId(1) val type: Int = 0, - @ProtoId(2) val reserve: Int = 0, - @ProtoId(3) val uin: Long = 0L + @SerialId(1) val type: Int = 0, + @SerialId(2) val reserve: Int = 0, + @SerialId(3) val uin: Long = 0L ) : ProtoBuf @Serializable internal class SmallEmoji( - @ProtoId(1) val packIdSum: Int = 0, - @ProtoId(2) val imageType: Int = 0 + @SerialId(1) val packIdSum: Int = 0, + @SerialId(2) val imageType: Int = 0 ) : ProtoBuf @Serializable internal class SourceMsg( - @ProtoId(1) val origSeqs: List? = null, - @ProtoId(2) val senderUin: Long = 0L, - @ProtoId(3) val time: Int = 0, - @ProtoId(4) val flag: Int = 0, - @ProtoId(5) val elems: List? = null, - @ProtoId(6) val type: Int = 0, - @ProtoId(7) val richMsg: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(9) val srcMsg: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(10) val toUin: Long = 0L, - @ProtoId(11) val troopName: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val origSeqs: List? = null, + @SerialId(2) val senderUin: Long = 0L, + @SerialId(3) val time: Int = 0, + @SerialId(4) val flag: Int = 0, + @SerialId(5) val elems: List? = null, + @SerialId(6) val type: Int = 0, + @SerialId(7) val richMsg: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(8) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(9) val srcMsg: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(10) val toUin: Long = 0L, + @SerialId(11) val troopName: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class Text( - @ProtoId(1) val str: String = "", - @ProtoId(2) val link: String = "", - @ProtoId(3) val attr6Buf: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val attr7Buf: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(11) val buf: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(12) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val str: String = "", + @SerialId(2) val link: String = "", + @SerialId(3) val attr6Buf: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val attr7Buf: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(11) val buf: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(12) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class TipsInfo( - @ProtoId(1) val text: String = "" + @SerialId(1) val text: String = "" ) : ProtoBuf @Serializable internal class TmpPtt( - @ProtoId(1) val fileType: Int = 0, - @ProtoId(2) val fileUuid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val fileName: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val fileSize: Int = 0, - @ProtoId(6) val pttTimes: Int = 0, - @ProtoId(7) val userType: Int = 0, - @ProtoId(8) val ptttransFlag: Int = 0, - @ProtoId(9) val busiType: Int = 0, - @ProtoId(10) val msgId: Long = 0L, - @ProtoId(30) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(31) val pttEncodeData: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val fileType: Int = 0, + @SerialId(2) val fileUuid: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val fileName: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val fileSize: Int = 0, + @SerialId(6) val pttTimes: Int = 0, + @SerialId(7) val userType: Int = 0, + @SerialId(8) val ptttransFlag: Int = 0, + @SerialId(9) val busiType: Int = 0, + @SerialId(10) val msgId: Long = 0L, + @SerialId(30) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(31) val pttEncodeData: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class Trans211TmpMsg( - @ProtoId(1) val msgBody: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val c2cCmd: Int = 0 + @SerialId(1) val msgBody: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val c2cCmd: Int = 0 ) : ProtoBuf @Serializable internal class TransElem( - @ProtoId(1) val elemType: Int = 0, - @ProtoId(2) val elemValue: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val elemType: Int = 0, + @SerialId(2) val elemValue: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class VideoFile( - @ProtoId(1) val fileUuid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val fileName: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val fileFormat: Int = 0, - @ProtoId(5) val fileTime: Int = 0, - @ProtoId(6) val fileSize: Int = 0, - @ProtoId(7) val thumbWidth: Int = 0, - @ProtoId(8) val thumbHeight: Int = 0, - @ProtoId(9) val thumbFileMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(10) val source: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(11) val thumbFileSize: Int = 0, - @ProtoId(12) val busiType: Int = 0, - @ProtoId(13) val fromChatType: Int = 0, - @ProtoId(14) val toChatType: Int = 0, - @ProtoId(15) val boolSupportProgressive: Boolean = false, - @ProtoId(16) val fileWidth: Int = 0, - @ProtoId(17) val fileHeight: Int = 0, - @ProtoId(18) val subBusiType: Int = 0, - @ProtoId(19) val videoAttr: Int = 0, - @ProtoId(20) val bytesThumbFileUrls: List? = null, - @ProtoId(21) val bytesVideoFileUrls: List? = null, - @ProtoId(22) val thumbDownloadFlag: Int = 0, - @ProtoId(23) val videoDownloadFlag: Int = 0, - @ProtoId(24) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val fileUuid: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val fileName: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val fileFormat: Int = 0, + @SerialId(5) val fileTime: Int = 0, + @SerialId(6) val fileSize: Int = 0, + @SerialId(7) val thumbWidth: Int = 0, + @SerialId(8) val thumbHeight: Int = 0, + @SerialId(9) val thumbFileMd5: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(10) val source: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(11) val thumbFileSize: Int = 0, + @SerialId(12) val busiType: Int = 0, + @SerialId(13) val fromChatType: Int = 0, + @SerialId(14) val toChatType: Int = 0, + @SerialId(15) val boolSupportProgressive: Boolean = false, + @SerialId(16) val fileWidth: Int = 0, + @SerialId(17) val fileHeight: Int = 0, + @SerialId(18) val subBusiType: Int = 0, + @SerialId(19) val videoAttr: Int = 0, + @SerialId(20) val bytesThumbFileUrls: List? = null, + @SerialId(21) val bytesVideoFileUrls: List? = null, + @SerialId(22) val thumbDownloadFlag: Int = 0, + @SerialId(23) val videoDownloadFlag: Int = 0, + @SerialId(24) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class WorkflowNotifyMsg( - @ProtoId(1) val extMsg: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val createUin: Long = 0L + @SerialId(1) val extMsg: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val createUin: Long = 0L ) : ProtoBuf } @@ -972,140 +972,140 @@ internal class ImMsgBody : ProtoBuf { internal class ImMsgHead : ProtoBuf { @Serializable internal class C2CHead( - @ProtoId(1) val toUin: Long = 0L, - @ProtoId(2) val fromUin: Long = 0L, - @ProtoId(3) val ccType: Int = 0, - @ProtoId(4) val ccCmd: Int = 0, - @ProtoId(5) val authPicSig: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val authSig: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) val authBuf: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) val serverTime: Int = 0, - @ProtoId(9) val clientTime: Int = 0, - @ProtoId(10) val rand: Int = 0, - @ProtoId(11) val ingPhoneNumber: String = "" + @SerialId(1) val toUin: Long = 0L, + @SerialId(2) val fromUin: Long = 0L, + @SerialId(3) val ccType: Int = 0, + @SerialId(4) val ccCmd: Int = 0, + @SerialId(5) val authPicSig: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val authSig: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(7) val authBuf: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(8) val serverTime: Int = 0, + @SerialId(9) val clientTime: Int = 0, + @SerialId(10) val rand: Int = 0, + @SerialId(11) val ingPhoneNumber: String = "" ) : ProtoBuf @Serializable internal class CSHead( - @ProtoId(1) val uin: Long = 0L, - @ProtoId(2) val command: Int = 0, - @ProtoId(3) val seq: Int = 0, - @ProtoId(4) val version: Int = 0, - @ProtoId(5) val retryTimes: Int = 0, - @ProtoId(6) val clientType: Int = 0, - @ProtoId(7) val pubno: Int = 0, - @ProtoId(8) val localid: Int = 0, - @ProtoId(9) val timezone: Int = 0, - @ProtoType(ProtoNumberType.FIXED) @ProtoId(10) val clientIp: Int = 0, - @ProtoId(11) val clientPort: Int = 0, - @ProtoType(ProtoNumberType.FIXED) @ProtoId(12) val connIp: Int = 0, - @ProtoId(13) val connPort: Int = 0, - @ProtoType(ProtoNumberType.FIXED) @ProtoId(14) val interfaceIp: Int = 0, - @ProtoId(15) val interfacePort: Int = 0, - @ProtoType(ProtoNumberType.FIXED) @ProtoId(16) val actualIp: Int = 0, - @ProtoId(17) val flag: Int = 0, - @ProtoType(ProtoNumberType.FIXED) @ProtoId(18) val timestamp: Int = 0, - @ProtoId(19) val subcmd: Int = 0, - @ProtoId(20) val result: Int = 0, - @ProtoId(21) val appId: Int = 0, - @ProtoId(22) val instanceId: Int = 0, - @ProtoId(23) val sessionId: Long = 0L, - @ProtoId(24) val idcId: Int = 0 + @SerialId(1) val uin: Long = 0L, + @SerialId(2) val command: Int = 0, + @SerialId(3) val seq: Int = 0, + @SerialId(4) val version: Int = 0, + @SerialId(5) val retryTimes: Int = 0, + @SerialId(6) val clientType: Int = 0, + @SerialId(7) val pubno: Int = 0, + @SerialId(8) val localid: Int = 0, + @SerialId(9) val timezone: Int = 0, + @ProtoType(ProtoNumberType.FIXED) @SerialId(10) val clientIp: Int = 0, + @SerialId(11) val clientPort: Int = 0, + @ProtoType(ProtoNumberType.FIXED) @SerialId(12) val connIp: Int = 0, + @SerialId(13) val connPort: Int = 0, + @ProtoType(ProtoNumberType.FIXED) @SerialId(14) val interfaceIp: Int = 0, + @SerialId(15) val interfacePort: Int = 0, + @ProtoType(ProtoNumberType.FIXED) @SerialId(16) val actualIp: Int = 0, + @SerialId(17) val flag: Int = 0, + @ProtoType(ProtoNumberType.FIXED) @SerialId(18) val timestamp: Int = 0, + @SerialId(19) val subcmd: Int = 0, + @SerialId(20) val result: Int = 0, + @SerialId(21) val appId: Int = 0, + @SerialId(22) val instanceId: Int = 0, + @SerialId(23) val sessionId: Long = 0L, + @SerialId(24) val idcId: Int = 0 ) : ProtoBuf @Serializable internal class DeltaHead( - @ProtoId(1) val totalLen: Long = 0L, - @ProtoId(2) val offset: Long = 0L, - @ProtoId(3) val ackOffset: Long = 0L, - @ProtoId(4) val cookie: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val ackCookie: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val result: Int = 0, - @ProtoId(7) val flags: Int = 0 + @SerialId(1) val totalLen: Long = 0L, + @SerialId(2) val offset: Long = 0L, + @SerialId(3) val ackOffset: Long = 0L, + @SerialId(4) val cookie: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val ackCookie: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val result: Int = 0, + @SerialId(7) val flags: Int = 0 ) : ProtoBuf @Serializable internal class Head( - @ProtoId(1) val headType: Int = 0, - @ProtoId(2) val msgCsHead: CSHead? = null, - @ProtoId(3) val msgS2cHead: S2CHead? = null, - @ProtoId(4) val msgHttpconnHead: HttpConnHead? = null, - @ProtoId(5) val paintFlag: Int = 0, - @ProtoId(6) val msgLoginSig: LoginSig? = null, - @ProtoId(7) val msgDeltaHead: DeltaHead? = null, - @ProtoId(8) val msgC2cHead: C2CHead? = null, - @ProtoId(9) val msgSconnHead: SConnHead? = null, - @ProtoId(10) val msgInstCtrl: InstCtrl? = null + @SerialId(1) val headType: Int = 0, + @SerialId(2) val msgCsHead: CSHead? = null, + @SerialId(3) val msgS2cHead: S2CHead? = null, + @SerialId(4) val msgHttpconnHead: HttpConnHead? = null, + @SerialId(5) val paintFlag: Int = 0, + @SerialId(6) val msgLoginSig: LoginSig? = null, + @SerialId(7) val msgDeltaHead: DeltaHead? = null, + @SerialId(8) val msgC2cHead: C2CHead? = null, + @SerialId(9) val msgSconnHead: SConnHead? = null, + @SerialId(10) val msgInstCtrl: InstCtrl? = null ) : ProtoBuf @Serializable internal class HttpConnHead( - @ProtoId(1) val uin: Long = 0L, - @ProtoId(2) val command: Int = 0, - @ProtoId(3) val subCommand: Int = 0, - @ProtoId(4) val seq: Int = 0, - @ProtoId(5) val version: Int = 0, - @ProtoId(6) val retryTimes: Int = 0, - @ProtoId(7) val clientType: Int = 0, - @ProtoId(8) val pubNo: Int = 0, - @ProtoId(9) val localId: Int = 0, - @ProtoId(10) val timeZone: Int = 0, - @ProtoType(ProtoNumberType.FIXED) @ProtoId(11) val clientIp: Int = 0, - @ProtoId(12) val clientPort: Int = 0, - @ProtoType(ProtoNumberType.FIXED) @ProtoId(13) val qzhttpIp: Int = 0, - @ProtoId(14) val qzhttpPort: Int = 0, - @ProtoType(ProtoNumberType.FIXED) @ProtoId(15) val sppIp: Int = 0, - @ProtoId(16) val sppPort: Int = 0, - @ProtoId(17) val flag: Int = 0, - @ProtoId(18) val key: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(19) val compressType: Int = 0, - @ProtoId(20) val originSize: Int = 0, - @ProtoId(21) val errorCode: Int = 0, - @ProtoId(22) val msgRedirect: RedirectMsg? = null, - @ProtoId(23) val commandId: Int = 0, - @ProtoId(24) val serviceCmdid: Int = 0, - @ProtoId(25) val msgOidbhead: TransOidbHead? = null + @SerialId(1) val uin: Long = 0L, + @SerialId(2) val command: Int = 0, + @SerialId(3) val subCommand: Int = 0, + @SerialId(4) val seq: Int = 0, + @SerialId(5) val version: Int = 0, + @SerialId(6) val retryTimes: Int = 0, + @SerialId(7) val clientType: Int = 0, + @SerialId(8) val pubNo: Int = 0, + @SerialId(9) val localId: Int = 0, + @SerialId(10) val timeZone: Int = 0, + @ProtoType(ProtoNumberType.FIXED) @SerialId(11) val clientIp: Int = 0, + @SerialId(12) val clientPort: Int = 0, + @ProtoType(ProtoNumberType.FIXED) @SerialId(13) val qzhttpIp: Int = 0, + @SerialId(14) val qzhttpPort: Int = 0, + @ProtoType(ProtoNumberType.FIXED) @SerialId(15) val sppIp: Int = 0, + @SerialId(16) val sppPort: Int = 0, + @SerialId(17) val flag: Int = 0, + @SerialId(18) val key: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(19) val compressType: Int = 0, + @SerialId(20) val originSize: Int = 0, + @SerialId(21) val errorCode: Int = 0, + @SerialId(22) val msgRedirect: RedirectMsg? = null, + @SerialId(23) val commandId: Int = 0, + @SerialId(24) val serviceCmdid: Int = 0, + @SerialId(25) val msgOidbhead: TransOidbHead? = null ) : ProtoBuf @Serializable internal class InstCtrl( - @ProtoId(1) val msgSendToInst: List? = listOf(), - @ProtoId(2) val msgExcludeInst: List? = listOf(), - @ProtoId(3) val msgFromInst: InstInfo? = InstInfo() + @SerialId(1) val msgSendToInst: List? = listOf(), + @SerialId(2) val msgExcludeInst: List? = listOf(), + @SerialId(3) val msgFromInst: InstInfo? = InstInfo() ) : ProtoBuf @Serializable internal class InstInfo( - @ProtoId(1) val apppid: Int = 0, - @ProtoId(2) val instid: Int = 0, - @ProtoId(3) val platform: Int = 0, - @ProtoId(10) val enumDeviceType: Int /* enum */ = 0 + @SerialId(1) val apppid: Int = 0, + @SerialId(2) val instid: Int = 0, + @SerialId(3) val platform: Int = 0, + @SerialId(10) val enumDeviceType: Int /* enum */ = 0 ) : ProtoBuf @Serializable internal class LoginSig( - @ProtoId(1) val type: Int = 0, - @ProtoId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val type: Int = 0, + @SerialId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class RedirectMsg( - @ProtoType(ProtoNumberType.FIXED) @ProtoId(1) val lastRedirectIp: Int = 0, - @ProtoId(2) val lastRedirectPort: Int = 0, - @ProtoType(ProtoNumberType.FIXED) @ProtoId(3) val redirectIp: Int = 0, - @ProtoId(4) val redirectPort: Int = 0, - @ProtoId(5) val redirectCount: Int = 0 + @ProtoType(ProtoNumberType.FIXED) @SerialId(1) val lastRedirectIp: Int = 0, + @SerialId(2) val lastRedirectPort: Int = 0, + @ProtoType(ProtoNumberType.FIXED) @SerialId(3) val redirectIp: Int = 0, + @SerialId(4) val redirectPort: Int = 0, + @SerialId(5) val redirectCount: Int = 0 ) : ProtoBuf @Serializable internal class S2CHead( - @ProtoId(1) val subMsgtype: Int = 0, - @ProtoId(2) val msgType: Int = 0, - @ProtoId(3) val fromUin: Long = 0L, - @ProtoId(4) val msgId: Int = 0, - @ProtoType(ProtoNumberType.FIXED) @ProtoId(5) val relayIp: Int = 0, - @ProtoId(6) val relayPort: Int = 0, - @ProtoId(7) val toUin: Long = 0L + @SerialId(1) val subMsgtype: Int = 0, + @SerialId(2) val msgType: Int = 0, + @SerialId(3) val fromUin: Long = 0L, + @SerialId(4) val msgId: Int = 0, + @ProtoType(ProtoNumberType.FIXED) @SerialId(5) val relayIp: Int = 0, + @SerialId(6) val relayPort: Int = 0, + @SerialId(7) val toUin: Long = 0L ) : ProtoBuf @Serializable @@ -1113,10 +1113,10 @@ internal class ImMsgHead : ProtoBuf { @Serializable internal class TransOidbHead( - @ProtoId(1) val command: Int = 0, - @ProtoId(2) val serviceType: Int = 0, - @ProtoId(3) val result: Int = 0, - @ProtoId(4) val errorMsg: String = "" + @SerialId(1) val command: Int = 0, + @SerialId(2) val serviceType: Int = 0, + @SerialId(3) val result: Int = 0, + @SerialId(4) val errorMsg: String = "" ) : ProtoBuf } @@ -1124,27 +1124,27 @@ internal class ImMsgHead : ProtoBuf { internal class ImReceipt : ProtoBuf { @Serializable internal class MsgInfo( - @ProtoId(1) val fromUin: Long = 0L, - @ProtoId(2) val toUin: Long = 0L, - @ProtoId(3) val msgSeq: Int = 0, - @ProtoId(4) val msgRandom: Int = 0 + @SerialId(1) val fromUin: Long = 0L, + @SerialId(2) val toUin: Long = 0L, + @SerialId(3) val msgSeq: Int = 0, + @SerialId(4) val msgRandom: Int = 0 ) : ProtoBuf @Serializable data internal class ReceiptInfo( - @ProtoId(1) val readTime: Long = 0L + @SerialId(1) val readTime: Long = 0L ) : ProtoBuf @Serializable internal class ReceiptReq( - @ProtoId(1) val command: Int /* enum */ = 1, - @ProtoId(2) val msgInfo: MsgInfo? = null + @SerialId(1) val command: Int /* enum */ = 1, + @SerialId(2) val msgInfo: MsgInfo? = null ) : ProtoBuf @Serializable internal data class ReceiptResp( - @ProtoId(1) val command: Int /* enum */ = 1, - @ProtoId(2) val receiptInfo: ReceiptInfo? = null + @SerialId(1) val command: Int /* enum */ = 1, + @SerialId(2) val receiptInfo: ReceiptInfo? = null ) : ProtoBuf } @@ -1152,37 +1152,37 @@ internal class ImReceipt : ProtoBuf { internal class ObjMsg : ProtoBuf { @Serializable internal class MsgContentInfo( - @ProtoId(1) val contentInfoId: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val msgFile: MsgFile? = null + @SerialId(1) val contentInfoId: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val msgFile: MsgFile? = null ) : ProtoBuf { @Serializable internal class MsgFile( - @ProtoId(1) val busId: Int = 0, - @ProtoId(2) val filePath: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val fileSize: Long = 0L, - @ProtoId(4) val fileName: String = "", - @ProtoId(5) val int64DeadTime: Long = 0L, - @ProtoId(6) val fileSha1: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) val ext: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val busId: Int = 0, + @SerialId(2) val filePath: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val fileSize: Long = 0L, + @SerialId(4) val fileName: String = "", + @SerialId(5) val int64DeadTime: Long = 0L, + @SerialId(6) val fileSha1: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(7) val ext: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf } @Serializable internal class MsgPic( - @ProtoId(1) val smallPicUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val originalPicUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val localPicId: Int = 0 + @SerialId(1) val smallPicUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val originalPicUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val localPicId: Int = 0 ) : ProtoBuf @Serializable internal class ObjMsg( - @ProtoId(1) val msgType: Int = 0, - @ProtoId(2) val title: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val bytesAbstact: List? = null, - @ProtoId(5) val titleExt: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val msgPic: List? = null, - @ProtoId(7) val msgContentInfo: List? = null, - @ProtoId(8) val reportIdShow: Int = 0 + @SerialId(1) val msgType: Int = 0, + @SerialId(2) val title: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val bytesAbstact: List? = null, + @SerialId(5) val titleExt: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val msgPic: List? = null, + @SerialId(7) val msgContentInfo: List? = null, + @SerialId(8) val reportIdShow: Int = 0 ) : ProtoBuf } @@ -1190,111 +1190,111 @@ internal class ObjMsg : ProtoBuf { internal class Submsgtype0xc7 : ProtoBuf { @Serializable internal class RelationalChainChange( - @ProtoId(1) val appid: Long = 0L, - @ProtoId(2) val srcUin: Long = 0L, - @ProtoId(3) val dstUin: Long = 0L, - @ProtoId(4) val changeType: Int /* enum */ = 1, - @ProtoId(5) val msgRelationalChainInfoOld: RelationalChainInfo? = null, - @ProtoId(6) val msgRelationalChainInfoNew: RelationalChainInfo? = null, - @ProtoId(7) val msgToDegradeInfo: ToDegradeInfo? = null, - @ProtoId(20) val relationalChainInfos: List? = null, - @ProtoId(100) val uint32FeatureId: List? = null + @SerialId(1) val appid: Long = 0L, + @SerialId(2) val srcUin: Long = 0L, + @SerialId(3) val dstUin: Long = 0L, + @SerialId(4) val changeType: Int /* enum */ = 1, + @SerialId(5) val msgRelationalChainInfoOld: RelationalChainInfo? = null, + @SerialId(6) val msgRelationalChainInfoNew: RelationalChainInfo? = null, + @SerialId(7) val msgToDegradeInfo: ToDegradeInfo? = null, + @SerialId(20) val relationalChainInfos: List? = null, + @SerialId(100) val uint32FeatureId: List? = null ) : ProtoBuf @Serializable internal class FriendShipFlagNotify( - @ProtoId(1) val dstUin: Long = 0L, - @ProtoId(2) val level1: Int = 0, - @ProtoId(3) val level2: Int = 0, - @ProtoId(4) val continuityDays: Int = 0, - @ProtoId(5) val chatFlag: Int = 0, - @ProtoId(6) val lastChatTime: Long = 0L, - @ProtoId(7) val notifyTime: Long = 0L, - @ProtoId(8) val seq: Int = 0 + @SerialId(1) val dstUin: Long = 0L, + @SerialId(2) val level1: Int = 0, + @SerialId(3) val level2: Int = 0, + @SerialId(4) val continuityDays: Int = 0, + @SerialId(5) val chatFlag: Int = 0, + @SerialId(6) val lastChatTime: Long = 0L, + @SerialId(7) val notifyTime: Long = 0L, + @SerialId(8) val seq: Int = 0 ) : ProtoBuf @Serializable internal class ToDegradeItem( - @ProtoId(1) val type: Int /* enum */ = 1, - @ProtoId(2) val oldLevel: Int = 0, - @ProtoId(3) val newLevel: Int = 0, - @ProtoId(11) val continuityDays: Int = 0, - @ProtoId(12) val lastActionTime: Long = 0L + @SerialId(1) val type: Int /* enum */ = 1, + @SerialId(2) val oldLevel: Int = 0, + @SerialId(3) val newLevel: Int = 0, + @SerialId(11) val continuityDays: Int = 0, + @SerialId(12) val lastActionTime: Long = 0L ) : ProtoBuf @Serializable internal class RelationalChainInfo( - @ProtoId(1) val type: Int /* enum */ = 1, - @ProtoId(2) val attr: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(1002) val intimateInfo: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(91001) val musicSwitch: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(101001) val mutualmarkAlienation: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val type: Int /* enum */ = 1, + @SerialId(2) val attr: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(1002) val intimateInfo: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(91001) val musicSwitch: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(101001) val mutualmarkAlienation: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class ForwardBody( - @ProtoId(1) val notifyType: Int = 0, - @ProtoId(2) val opType: Int = 0, - @ProtoId(3000) val msgHotFriendNotify: HotFriendNotify? = null, - @ProtoId(4000) val msgRelationalChainChange: RelationalChainChange? = null + @SerialId(1) val notifyType: Int = 0, + @SerialId(2) val opType: Int = 0, + @SerialId(3000) val msgHotFriendNotify: HotFriendNotify? = null, + @SerialId(4000) val msgRelationalChainChange: RelationalChainChange? = null ) : ProtoBuf @Serializable internal class HotFriendNotify( - @ProtoId(1) val dstUin: Long = 0L, - @ProtoId(2) val praiseHotLevel: Int = 0, - @ProtoId(3) val chatHotLevel: Int = 0, - @ProtoId(4) val praiseHotDays: Int = 0, - @ProtoId(5) val chatHotDays: Int = 0, - @ProtoId(6) val closeLevel: Int = 0, - @ProtoId(7) val closeDays: Int = 0, - @ProtoId(8) val praiseFlag: Int = 0, - @ProtoId(9) val chatFlag: Int = 0, - @ProtoId(10) val closeFlag: Int = 0, - @ProtoId(11) val notifyTime: Long = 0L, - @ProtoId(12) val lastPraiseTime: Long = 0L, - @ProtoId(13) val lastChatTime: Long = 0L, - @ProtoId(14) val qzoneHotLevel: Int = 0, - @ProtoId(15) val qzoneHotDays: Int = 0, - @ProtoId(16) val qzoneFlag: Int = 0, - @ProtoId(17) val lastQzoneTime: Long = 0L, - @ProtoId(51) val showRecheckEntry: Int = 0, - @ProtoId(52) val wildcardWording: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(100) val loverFlag: Int = 0, - @ProtoId(200) val keyHotLevel: Int = 0, - @ProtoId(201) val keyHotDays: Int = 0, - @ProtoId(202) val keyFlag: Int = 0, - @ProtoId(203) val lastKeyTime: Long = 0L, - @ProtoId(204) val keyWording: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(205) val keyTransFlag: Int = 0, - @ProtoId(206) val loverKeyBusinessType: Int = 0, - @ProtoId(207) val loverKeySubBusinessType: Int = 0, - @ProtoId(208) val loverKeyMainWording: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(209) val loverKeyLinkWording: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(300) val boatLevel: Int = 0, - @ProtoId(301) val boatDays: Int = 0, - @ProtoId(302) val boatFlag: Int = 0, - @ProtoId(303) val lastBoatTime: Int = 0, - @ProtoId(304) val boatWording: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(400) val notifyType: Int = 0, - @ProtoId(401) val msgFriendshipFlagNotify: FriendShipFlagNotify? = null + @SerialId(1) val dstUin: Long = 0L, + @SerialId(2) val praiseHotLevel: Int = 0, + @SerialId(3) val chatHotLevel: Int = 0, + @SerialId(4) val praiseHotDays: Int = 0, + @SerialId(5) val chatHotDays: Int = 0, + @SerialId(6) val closeLevel: Int = 0, + @SerialId(7) val closeDays: Int = 0, + @SerialId(8) val praiseFlag: Int = 0, + @SerialId(9) val chatFlag: Int = 0, + @SerialId(10) val closeFlag: Int = 0, + @SerialId(11) val notifyTime: Long = 0L, + @SerialId(12) val lastPraiseTime: Long = 0L, + @SerialId(13) val lastChatTime: Long = 0L, + @SerialId(14) val qzoneHotLevel: Int = 0, + @SerialId(15) val qzoneHotDays: Int = 0, + @SerialId(16) val qzoneFlag: Int = 0, + @SerialId(17) val lastQzoneTime: Long = 0L, + @SerialId(51) val showRecheckEntry: Int = 0, + @SerialId(52) val wildcardWording: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(100) val loverFlag: Int = 0, + @SerialId(200) val keyHotLevel: Int = 0, + @SerialId(201) val keyHotDays: Int = 0, + @SerialId(202) val keyFlag: Int = 0, + @SerialId(203) val lastKeyTime: Long = 0L, + @SerialId(204) val keyWording: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(205) val keyTransFlag: Int = 0, + @SerialId(206) val loverKeyBusinessType: Int = 0, + @SerialId(207) val loverKeySubBusinessType: Int = 0, + @SerialId(208) val loverKeyMainWording: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(209) val loverKeyLinkWording: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(300) val boatLevel: Int = 0, + @SerialId(301) val boatDays: Int = 0, + @SerialId(302) val boatFlag: Int = 0, + @SerialId(303) val lastBoatTime: Int = 0, + @SerialId(304) val boatWording: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(400) val notifyType: Int = 0, + @SerialId(401) val msgFriendshipFlagNotify: FriendShipFlagNotify? = null ) : ProtoBuf @Serializable internal class RelationalChainInfos( - @ProtoId(1) val msgRelationalChainInfoOld: RelationalChainInfo? = null, - @ProtoId(2) val msgRelationalChainInfoNew: RelationalChainInfo? = null + @SerialId(1) val msgRelationalChainInfoOld: RelationalChainInfo? = null, + @SerialId(2) val msgRelationalChainInfoNew: RelationalChainInfo? = null ) : ProtoBuf @Serializable internal class ToDegradeInfo( - @ProtoId(1) val toDegradeItem: List? = null, - @ProtoId(2) val nick: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val notifyTime: Long = 0L + @SerialId(1) val toDegradeItem: List? = null, + @SerialId(2) val nick: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val notifyTime: Long = 0L ) : ProtoBuf @Serializable internal class MsgBody( - @ProtoId(1) val msgModInfos: List? = null + @SerialId(1) val msgModInfos: List? = null ) : ProtoBuf } diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgCommon.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgCommon.kt index 13e2b0be6..4cda86784 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgCommon.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgCommon.kt @@ -9,8 +9,8 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto +import kotlinx.serialization.SerialId import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId import net.mamoe.mirai.qqandroid.io.ProtoBuf import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY @@ -21,143 +21,143 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY internal class MsgComm : ProtoBuf { @Serializable internal class AppShareInfo( - @ProtoId(1) val appshareId: Int = 0, - @ProtoId(2) val appshareCookie: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val appshareResource: PluginInfo? = null + @SerialId(1) val appshareId: Int = 0, + @SerialId(2) val appshareCookie: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val appshareResource: PluginInfo? = null ) : ProtoBuf @Serializable internal class C2CTmpMsgHead( - @ProtoId(1) val c2cType: Int = 0, - @ProtoId(2) val serviceType: Int = 0, - @ProtoId(3) val groupUin: Long = 0L, - @ProtoId(4) val groupCode: Long = 0L, - @ProtoId(5) val sig: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val sigType: Int = 0, - @ProtoId(7) val fromPhone: String = "", - @ProtoId(8) val toPhone: String = "", - @ProtoId(9) val lockDisplay: Int = 0, - @ProtoId(10) val directionFlag: Int = 0, - @ProtoId(11) val reserved: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val c2cType: Int = 0, + @SerialId(2) val serviceType: Int = 0, + @SerialId(3) val groupUin: Long = 0L, + @SerialId(4) val groupCode: Long = 0L, + @SerialId(5) val sig: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val sigType: Int = 0, + @SerialId(7) val fromPhone: String = "", + @SerialId(8) val toPhone: String = "", + @SerialId(9) val lockDisplay: Int = 0, + @SerialId(10) val directionFlag: Int = 0, + @SerialId(11) val reserved: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class ContentHead( - @ProtoId(1) val pkgNum: Int = 0, - @ProtoId(2) val pkgIndex: Int = 0, - @ProtoId(3) val divSeq: Int = 0, - @ProtoId(4) val autoReply: Int = 0 + @SerialId(1) val pkgNum: Int = 0, + @SerialId(2) val pkgIndex: Int = 0, + @SerialId(3) val divSeq: Int = 0, + @SerialId(4) val autoReply: Int = 0 ) : ProtoBuf @Serializable internal class DiscussInfo( - @ProtoId(1) val discussUin: Long = 0L, - @ProtoId(2) val discussType: Int = 0, - @ProtoId(3) val discussInfoSeq: Long = 0L, - @ProtoId(4) val discussRemark: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val discussName: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val discussUin: Long = 0L, + @SerialId(2) val discussType: Int = 0, + @SerialId(3) val discussInfoSeq: Long = 0L, + @SerialId(4) val discussRemark: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val discussName: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class ExtGroupKeyInfo( - @ProtoId(1) val curMaxSeq: Int = 0, - @ProtoId(2) val curTime: Long = 0L + @SerialId(1) val curMaxSeq: Int = 0, + @SerialId(2) val curTime: Long = 0L ) : ProtoBuf @Serializable internal class GroupInfo( - @ProtoId(1) val groupCode: Long = 0L, - @ProtoId(2) val groupType: Int = 0, - @ProtoId(3) val groupInfoSeq: Long = 0L, - @ProtoId(4) val groupCard: String = "", - @ProtoId(5) val groupRank: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val groupLevel: Int = 0, - @ProtoId(7) val groupCardType: Int = 0, - @ProtoId(8) val groupName: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val groupCode: Long = 0L, + @SerialId(2) val groupType: Int = 0, + @SerialId(3) val groupInfoSeq: Long = 0L, + @SerialId(4) val groupCard: String = "", + @SerialId(5) val groupRank: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val groupLevel: Int = 0, + @SerialId(7) val groupCardType: Int = 0, + @SerialId(8) val groupName: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class Msg( - @ProtoId(1) val msgHead: MsgHead, - @ProtoId(2) val contentHead: ContentHead? = null, - @ProtoId(3) val msgBody: ImMsgBody.MsgBody, - @ProtoId(4) val appshareInfo: AppShareInfo? = null + @SerialId(1) val msgHead: MsgHead, + @SerialId(2) val contentHead: ContentHead? = null, + @SerialId(3) val msgBody: ImMsgBody.MsgBody, + @SerialId(4) val appshareInfo: AppShareInfo? = null ) : ProtoBuf @Serializable internal class MsgHead( - @ProtoId(1) val fromUin: Long = 0L, - @ProtoId(2) val toUin: Long = 0L, - @ProtoId(3) val msgType: Int = 0, - @ProtoId(4) val c2cCmd: Int = 0, - @ProtoId(5) val msgSeq: Int = 0, - @ProtoId(6) val msgTime: Int = 0, - @ProtoId(7) var msgUid: Long = 0L, - @ProtoId(8) val c2cTmpMsgHead: C2CTmpMsgHead? = null, - @ProtoId(9) val groupInfo: GroupInfo? = null, - @ProtoId(10) val fromAppid: Int = 0, - @ProtoId(11) val fromInstid: Int = 0, - @ProtoId(12) val userActive: Int = 0, - @ProtoId(13) val discussInfo: DiscussInfo? = null, - @ProtoId(14) val fromNick: String = "", - @ProtoId(15) val authUin: Long = 0L, - @ProtoId(16) val authNick: String = "", - @ProtoId(17) val msgFlag: Int = 0, - @ProtoId(18) val authRemark: String = "", - @ProtoId(19) val groupName: String = "", - @ProtoId(20) val mutiltransHead: MutilTransHead? = null, - @ProtoId(21) val msgInstCtrl: ImMsgHead.InstCtrl? = null, - @ProtoId(22) val publicAccountGroupSendFlag: Int = 0, - @ProtoId(23) val wseqInC2cMsghead: Int = 0, - @ProtoId(24) val cpid: Long = 0L, - @ProtoId(25) val extGroupKeyInfo: ExtGroupKeyInfo? = null, - @ProtoId(26) val multiCompatibleText: String = "", - @ProtoId(27) val authSex: Int = 0, - @ProtoId(28) val isSrcMsg: Boolean = false + @SerialId(1) val fromUin: Long = 0L, + @SerialId(2) val toUin: Long = 0L, + @SerialId(3) val msgType: Int = 0, + @SerialId(4) val c2cCmd: Int = 0, + @SerialId(5) val msgSeq: Int = 0, + @SerialId(6) val msgTime: Int = 0, + @SerialId(7) var msgUid: Long = 0L, + @SerialId(8) val c2cTmpMsgHead: C2CTmpMsgHead? = null, + @SerialId(9) val groupInfo: GroupInfo? = null, + @SerialId(10) val fromAppid: Int = 0, + @SerialId(11) val fromInstid: Int = 0, + @SerialId(12) val userActive: Int = 0, + @SerialId(13) val discussInfo: DiscussInfo? = null, + @SerialId(14) val fromNick: String = "", + @SerialId(15) val authUin: Long = 0L, + @SerialId(16) val authNick: String = "", + @SerialId(17) val msgFlag: Int = 0, + @SerialId(18) val authRemark: String = "", + @SerialId(19) val groupName: String = "", + @SerialId(20) val mutiltransHead: MutilTransHead? = null, + @SerialId(21) val msgInstCtrl: ImMsgHead.InstCtrl? = null, + @SerialId(22) val publicAccountGroupSendFlag: Int = 0, + @SerialId(23) val wseqInC2cMsghead: Int = 0, + @SerialId(24) val cpid: Long = 0L, + @SerialId(25) val extGroupKeyInfo: ExtGroupKeyInfo? = null, + @SerialId(26) val multiCompatibleText: String = "", + @SerialId(27) val authSex: Int = 0, + @SerialId(28) val isSrcMsg: Boolean = false ) : ProtoBuf @Serializable internal class MsgType0x210( - @ProtoId(1) val subMsgType: Int = 0, - @ProtoId(2) val msgContent: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val subMsgType: Int = 0, + @SerialId(2) val msgContent: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class MutilTransHead( - @ProtoId(1) val status: Int = 0, - @ProtoId(2) val msgId: Int = 0 + @SerialId(1) val status: Int = 0, + @SerialId(2) val msgId: Int = 0 ) : ProtoBuf @Serializable internal class PluginInfo( - @ProtoId(1) val resId: Int = 0, - @ProtoId(2) val pkgName: String = "", - @ProtoId(3) val newVer: Int = 0, - @ProtoId(4) val resType: Int = 0, - @ProtoId(5) val lanType: Int = 0, - @ProtoId(6) val priority: Int = 0, - @ProtoId(7) val resName: String = "", - @ProtoId(8) val resDesc: String = "", - @ProtoId(9) val resUrlBig: String = "", - @ProtoId(10) val resUrlSmall: String = "", - @ProtoId(11) val resConf: String = "" + @SerialId(1) val resId: Int = 0, + @SerialId(2) val pkgName: String = "", + @SerialId(3) val newVer: Int = 0, + @SerialId(4) val resType: Int = 0, + @SerialId(5) val lanType: Int = 0, + @SerialId(6) val priority: Int = 0, + @SerialId(7) val resName: String = "", + @SerialId(8) val resDesc: String = "", + @SerialId(9) val resUrlBig: String = "", + @SerialId(10) val resUrlSmall: String = "", + @SerialId(11) val resConf: String = "" ) : ProtoBuf @Serializable internal class Uin2Nick( - @ProtoId(1) val uin: Long = 0L, - @ProtoId(2) val nick: String = "" + @SerialId(1) val uin: Long = 0L, + @SerialId(2) val nick: String = "" ) : ProtoBuf @Serializable internal class UinPairMsg( - @ProtoId(1) val lastReadTime: Int = 0, - @ProtoId(2) val peerUin: Long = 0L, - @ProtoId(3) val msgCompleted: Int = 0, - @ProtoId(4) val msg: List? = null, - @ProtoId(5) val unreadMsgNum: Int = 0, - @ProtoId(8) val c2cType: Int = 0, - @ProtoId(9) val serviceType: Int = 0, - @ProtoId(10) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val lastReadTime: Int = 0, + @SerialId(2) val peerUin: Long = 0L, + @SerialId(3) val msgCompleted: Int = 0, + @SerialId(4) val msg: List? = null, + @SerialId(5) val unreadMsgNum: Int = 0, + @SerialId(8) val c2cType: Int = 0, + @SerialId(9) val serviceType: Int = 0, + @SerialId(10) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf } \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgRevokeUserDef.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgRevokeUserDef.kt index 61da3aa4a..86d34da88 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgRevokeUserDef.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgRevokeUserDef.kt @@ -9,30 +9,30 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto +import kotlinx.serialization.SerialId import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId import net.mamoe.mirai.qqandroid.io.ProtoBuf class MsgRevokeUserDef : ProtoBuf { @Serializable class MsgInfoUserDef( - @ProtoId(1) val longMessageFlag: Int = 0, - @ProtoId(2) val longMsgInfo: List? = null, - @ProtoId(3) val fileUuid: List = listOf() + @SerialId(1) val longMessageFlag: Int = 0, + @SerialId(2) val longMsgInfo: List? = null, + @SerialId(3) val fileUuid: List = listOf() ) : ProtoBuf { @Serializable class MsgInfoDef( - @ProtoId(1) val msgSeq: Int = 0, - @ProtoId(2) val longMsgId: Int = 0, - @ProtoId(3) val longMsgNum: Int = 0, - @ProtoId(4) val longMsgIndex: Int = 0 + @SerialId(1) val msgSeq: Int = 0, + @SerialId(2) val longMsgId: Int = 0, + @SerialId(3) val longMsgNum: Int = 0, + @SerialId(4) val longMsgIndex: Int = 0 ) : ProtoBuf } @Serializable class UinTypeUserDef( - @ProtoId(1) val fromUinType: Int = 0, - @ProtoId(2) val fromGroupCode: Long = 0L, - @ProtoId(3) val fileUuid: List = listOf() + @SerialId(1) val fromUinType: Int = 0, + @SerialId(2) val fromGroupCode: Long = 0L, + @SerialId(3) val fileUuid: List = listOf() ) : ProtoBuf } \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgSvc.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgSvc.kt index f0d48e18c..712ffe1d8 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgSvc.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgSvc.kt @@ -9,8 +9,8 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto +import kotlinx.serialization.SerialId import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId import net.mamoe.mirai.data.Packet import net.mamoe.mirai.qqandroid.io.ProtoBuf import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY @@ -19,141 +19,141 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY internal class MsgSvc : ProtoBuf { @Serializable internal class Grp( - @ProtoId(1) val groupCode: Long = 0L + @SerialId(1) val groupCode: Long = 0L ) : ProtoBuf @Serializable internal class PbGetMsgResp( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val errmsg: String = "", - @ProtoId(3) val syncCookie: ByteArray? = EMPTY_BYTE_ARRAY, - @ProtoId(4) val syncFlag: SyncFlag, - @ProtoId(5) val uinPairMsgs: List? = null, - @ProtoId(6) val bindUin: Long = 0L, - @ProtoId(7) val msgRspType: Int = 0, - @ProtoId(8) val pubAccountCookie: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(9) val isPartialSync: Boolean = false, - @ProtoId(10) val msgCtrlBuf: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val result: Int = 0, + @SerialId(2) val errmsg: String = "", + @SerialId(3) val syncCookie: ByteArray? = EMPTY_BYTE_ARRAY, + @SerialId(4) val syncFlag: SyncFlag, + @SerialId(5) val uinPairMsgs: List? = null, + @SerialId(6) val bindUin: Long = 0L, + @SerialId(7) val msgRspType: Int = 0, + @SerialId(8) val pubAccountCookie: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(9) val isPartialSync: Boolean = false, + @SerialId(10) val msgCtrlBuf: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class PbGroupMsgWithDrawReq( - @ProtoId(1) val subCmd: Int = 0, - @ProtoId(2) val groupType: Int = 0, - @ProtoId(3) val groupCode: Long = 0L, - @ProtoId(4) val msgList: List? = null, - @ProtoId(5) val userdef: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val subCmd: Int = 0, + @SerialId(2) val groupType: Int = 0, + @SerialId(3) val groupCode: Long = 0L, + @SerialId(4) val msgList: List? = null, + @SerialId(5) val userdef: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf { @Serializable internal class MessageInfo( - @ProtoId(1) val msgSeq: Int = 0, - @ProtoId(2) val msgRandom: Int = 0, - @ProtoId(3) val msgType: Int = 0 + @SerialId(1) val msgSeq: Int = 0, + @SerialId(2) val msgRandom: Int = 0, + @SerialId(3) val msgType: Int = 0 ) } @Serializable internal class PbGroupReadedReportReq( - @ProtoId(1) val groupCode: Long = 0L, - @ProtoId(2) val lastReadSeq: Long = 0L + @SerialId(1) val groupCode: Long = 0L, + @SerialId(2) val lastReadSeq: Long = 0L ) : ProtoBuf @Serializable internal class BusinessWPATmp( - @ProtoId(1) val toUin: Long = 0L, - @ProtoId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val sigt: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val toUin: Long = 0L, + @SerialId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val sigt: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class C2C( - @ProtoId(1) val toUin: Long = 0L + @SerialId(1) val toUin: Long = 0L ) : ProtoBuf @Serializable internal class PbGetGroupMsgReq( - @ProtoId(1) val groupCode: Long = 0L, - @ProtoId(2) val beginSeq: Long = 0L, - @ProtoId(3) val endSeq: Long = 0L, - @ProtoId(4) val filter: Int /* enum */ = 0, - @ProtoId(5) val memberSeq: Long = 0L, - @ProtoId(6) val publicGroup: Boolean = false, - @ProtoId(7) val shieldFlag: Int = 0, - @ProtoId(8) val saveTrafficFlag: Int = 0 + @SerialId(1) val groupCode: Long = 0L, + @SerialId(2) val beginSeq: Long = 0L, + @SerialId(3) val endSeq: Long = 0L, + @SerialId(4) val filter: Int /* enum */ = 0, + @SerialId(5) val memberSeq: Long = 0L, + @SerialId(6) val publicGroup: Boolean = false, + @SerialId(7) val shieldFlag: Int = 0, + @SerialId(8) val saveTrafficFlag: Int = 0 ) : ProtoBuf @Serializable internal class PbBindUinMsgReadedConfirmReq( - @ProtoId(1) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val bindUin: Long = 0L + @SerialId(1) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val bindUin: Long = 0L ) : ProtoBuf @Serializable internal class AccostTmp( - @ProtoId(1) val toUin: Long = 0L, - @ProtoId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val reply: Boolean = false + @SerialId(1) val toUin: Long = 0L, + @SerialId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val reply: Boolean = false ) : ProtoBuf @Serializable internal class PbDiscussReadedReportResp( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val errmsg: String = "", - @ProtoId(3) val confUin: Long = 0L, - @ProtoId(4) val memberSeq: Long = 0L, - @ProtoId(5) val confSeq: Long = 0L + @SerialId(1) val result: Int = 0, + @SerialId(2) val errmsg: String = "", + @SerialId(3) val confUin: Long = 0L, + @SerialId(4) val memberSeq: Long = 0L, + @SerialId(5) val confSeq: Long = 0L ) : ProtoBuf @Serializable internal class NearByAssistantTmp( - @ProtoId(1) val toUin: Long = 0L, - @ProtoId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val reply: Boolean = false + @SerialId(1) val toUin: Long = 0L, + @SerialId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val reply: Boolean = false ) : ProtoBuf @Serializable internal data class MsgSendInfo( - @ProtoId(1) val receiver: Int = 0 + @SerialId(1) val receiver: Int = 0 ) : ProtoBuf @Serializable internal class PubGroupTmp( - @ProtoId(1) val toUin: Long = 0L, - @ProtoId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val groupUin: Long = 0L + @SerialId(1) val toUin: Long = 0L, + @SerialId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val groupUin: Long = 0L ) : ProtoBuf @Serializable internal class AddressListTmp( - @ProtoId(1) val fromPhone: String = "", - @ProtoId(2) val toPhone: String = "", - @ProtoId(3) val toUin: Long = 0L, - @ProtoId(4) val sig: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val fromContactSize: Int = 0 + @SerialId(1) val fromPhone: String = "", + @SerialId(2) val toPhone: String = "", + @SerialId(3) val toUin: Long = 0L, + @SerialId(4) val sig: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val fromContactSize: Int = 0 ) : ProtoBuf @Serializable internal class DisTmp( - @ProtoId(1) val disUin: Long = 0L, - @ProtoId(2) val toUin: Long = 0L + @SerialId(1) val disUin: Long = 0L, + @SerialId(2) val toUin: Long = 0L ) @Serializable internal class PbMsgWithDrawResp( - @ProtoId(1) val c2cWithDraw: List? = null, - @ProtoId(2) val groupWithDraw: List? = null + @SerialId(1) val c2cWithDraw: List? = null, + @SerialId(2) val groupWithDraw: List? = null ) : ProtoBuf @Serializable internal class AuthTmp( - @ProtoId(1) val toUin: Long = 0L, - @ProtoId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val toUin: Long = 0L, + @SerialId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class PbMsgWithDrawReq( - @ProtoId(1) val c2cWithDraw: List? = null, - @ProtoId(2) val groupWithDraw: List? = null + @SerialId(1) val c2cWithDraw: List? = null, + @SerialId(2) val groupWithDraw: List? = null ) : ProtoBuf internal enum class SyncFlag { @@ -164,81 +164,81 @@ internal class MsgSvc : ProtoBuf { @Serializable internal class PbGetMsgReq( - @ProtoId(1) val syncFlag: SyncFlag, - @ProtoId(2) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val rambleFlag: Int = 1, - @ProtoId(4) val latestRambleNumber: Int = 20, - @ProtoId(5) val otherRambleNumber: Int = 3, - @ProtoId(6) val onlineSyncFlag: Int = 1, - @ProtoId(7) val contextFlag: Int = 0, - @ProtoId(8) val whisperSessionId: Int = 0, - @ProtoId(9) val msgReqType: Int = 0, - @ProtoId(10) val pubaccountCookie: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(11) val msgCtrlBuf: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(12) val serverBuf: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val syncFlag: SyncFlag, + @SerialId(2) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val rambleFlag: Int = 1, + @SerialId(4) val latestRambleNumber: Int = 20, + @SerialId(5) val otherRambleNumber: Int = 3, + @SerialId(6) val onlineSyncFlag: Int = 1, + @SerialId(7) val contextFlag: Int = 0, + @SerialId(8) val whisperSessionId: Int = 0, + @SerialId(9) val msgReqType: Int = 0, + @SerialId(10) val pubaccountCookie: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(11) val msgCtrlBuf: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(12) val serverBuf: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class PbGetOneDayRoamMsgReq( - @ProtoId(1) val peerUin: Long = 0L, - @ProtoId(2) val lastMsgtime: Long = 0L, - @ProtoId(3) val random: Long = 0L, - @ProtoId(4) val readCnt: Int = 0 + @SerialId(1) val peerUin: Long = 0L, + @SerialId(2) val lastMsgtime: Long = 0L, + @SerialId(3) val random: Long = 0L, + @SerialId(4) val readCnt: Int = 0 ) : ProtoBuf @Serializable internal class GrpTmp( - @ProtoId(1) val groupUin: Long = 0L, - @ProtoId(2) val toUin: Long = 0L + @SerialId(1) val groupUin: Long = 0L, + @SerialId(2) val toUin: Long = 0L ) : ProtoBuf @Serializable internal class PbGetDiscussMsgResp( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val errmsg: String = "", - @ProtoId(3) val discussUin: Long = 0L, - @ProtoId(4) val returnEndSeq: Long = 0L, - @ProtoId(5) val returnBeginSeq: Long = 0L, - @ProtoId(6) val msg: List? = null, - @ProtoId(7) val lastGetTime: Long = 0L, - @ProtoId(8) val discussInfoSeq: Long = 0L + @SerialId(1) val result: Int = 0, + @SerialId(2) val errmsg: String = "", + @SerialId(3) val discussUin: Long = 0L, + @SerialId(4) val returnEndSeq: Long = 0L, + @SerialId(5) val returnBeginSeq: Long = 0L, + @SerialId(6) val msg: List? = null, + @SerialId(7) val lastGetTime: Long = 0L, + @SerialId(8) val discussInfoSeq: Long = 0L ) : ProtoBuf @Serializable internal class CommTmp( - @ProtoId(1) val toUin: Long = 0L, - @ProtoId(2) val c2cType: Int = 0, - @ProtoId(3) val svrType: Int = 0, - @ProtoId(4) val sig: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val reserved: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val toUin: Long = 0L, + @SerialId(2) val c2cType: Int = 0, + @SerialId(3) val svrType: Int = 0, + @SerialId(4) val sig: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val reserved: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class PbGroupMsgWithDrawResp( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val errmsg: String = "", - @ProtoId(3) val subCmd: Int = 0, - @ProtoId(4) val groupType: Int = 0, - @ProtoId(5) val groupCode: Long = 0L, - @ProtoId(6) val failedMsgList: List? = null, - @ProtoId(7) val userdef: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val result: Int = 0, + @SerialId(2) val errmsg: String = "", + @SerialId(3) val subCmd: Int = 0, + @SerialId(4) val groupType: Int = 0, + @SerialId(5) val groupCode: Long = 0L, + @SerialId(6) val failedMsgList: List? = null, + @SerialId(7) val userdef: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf { @Serializable internal class MessageResult( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val msgSeq: Int = 0, - @ProtoId(3) val msgTime: Int = 0, - @ProtoId(4) val msgRandom: Int = 0, - @ProtoId(5) val errMsg: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val msgType: Int = 0 + @SerialId(1) val result: Int = 0, + @SerialId(2) val msgSeq: Int = 0, + @SerialId(3) val msgTime: Int = 0, + @SerialId(4) val msgRandom: Int = 0, + @SerialId(5) val errMsg: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val msgType: Int = 0 ) : ProtoBuf } @Serializable internal class PbC2CReadedReportResp( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val errmsg: String = "", - @ProtoId(3) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val result: Int = 0, + @SerialId(2) val errmsg: String = "", + @SerialId(3) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable @@ -246,513 +246,513 @@ internal class MsgSvc : ProtoBuf { @Serializable internal class PbC2CMsgWithDrawReq( - @ProtoId(1) val msgInfo: List? = null, - @ProtoId(2) val longMessageFlag: Int = 0, - @ProtoId(3) val reserved: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val subCmd: Int = 0 + @SerialId(1) val msgInfo: List? = null, + @SerialId(2) val longMessageFlag: Int = 0, + @SerialId(3) val reserved: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val subCmd: Int = 0 ) : ProtoBuf { @Serializable internal class MsgInfo( - @ProtoId(1) val fromUin: Long = 0L, - @ProtoId(2) val toUin: Long = 0L, - @ProtoId(3) val msgSeq: Int = 0, - @ProtoId(4) val msgUid: Long = 0L, - @ProtoId(5) val msgTime: Long = 0L, - @ProtoId(6) val msgRandom: Int = 0, - @ProtoId(7) val pkgNum: Int = 0, - @ProtoId(8) val pkgIndex: Int = 0, - @ProtoId(9) val divSeq: Int = 0, - @ProtoId(10) val msgType: Int = 0, - @ProtoId(20) val routingHead: RoutingHead? = null + @SerialId(1) val fromUin: Long = 0L, + @SerialId(2) val toUin: Long = 0L, + @SerialId(3) val msgSeq: Int = 0, + @SerialId(4) val msgUid: Long = 0L, + @SerialId(5) val msgTime: Long = 0L, + @SerialId(6) val msgRandom: Int = 0, + @SerialId(7) val pkgNum: Int = 0, + @SerialId(8) val pkgIndex: Int = 0, + @SerialId(9) val divSeq: Int = 0, + @SerialId(10) val msgType: Int = 0, + @SerialId(20) val routingHead: RoutingHead? = null ) } @Serializable internal class PbDelRoamMsgResp( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val errmsg: String = "" + @SerialId(1) val result: Int = 0, + @SerialId(2) val errmsg: String = "" ) : ProtoBuf @Serializable internal class Dis( - @ProtoId(1) val disUin: Long = 0L + @SerialId(1) val disUin: Long = 0L ) : ProtoBuf @Serializable internal class TransSvrInfo( - @ProtoId(1) val subType: Int = 0, - @ProtoId(2) val int32RetCode: Int = 0, - @ProtoId(3) val errMsg: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val transInfo: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val subType: Int = 0, + @SerialId(2) val int32RetCode: Int = 0, + @SerialId(3) val errMsg: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val transInfo: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class PbPullGroupMsgSeqResp( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val errmsg: String = "", - @ProtoId(3) val groupInfoResp: List? = null + @SerialId(1) val result: Int = 0, + @SerialId(2) val errmsg: String = "", + @SerialId(3) val groupInfoResp: List? = null ) : ProtoBuf { @Serializable internal class GroupInfoResp( - @ProtoId(1) val groupCode: Long = 0L, - @ProtoId(2) val memberSeq: Long = 0L, - @ProtoId(3) val groupSeq: Long = 0L + @SerialId(1) val groupCode: Long = 0L, + @SerialId(2) val memberSeq: Long = 0L, + @SerialId(3) val groupSeq: Long = 0L ) } @Serializable internal class PbSendMsgReq( - @ProtoId(1) val routingHead: RoutingHead? = null, - @ProtoId(2) val contentHead: MsgComm.ContentHead? = null, - @ProtoId(3) val msgBody: ImMsgBody.MsgBody = ImMsgBody.MsgBody(), - @ProtoId(4) val msgSeq: Int = 0, - @ProtoId(5) val msgRand: Int = 0, - @ProtoId(6) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) val appShare: MsgComm.AppShareInfo? = null, - @ProtoId(8) val msgVia: Int = 0, - @ProtoId(9) val dataStatist: Int = 0, - @ProtoId(10) val multiMsgAssist: MultiMsgAssist? = null, - @ProtoId(11) val inputNotifyInfo: PbInputNotifyInfo? = null, - @ProtoId(12) val msgCtrl: MsgCtrl.MsgCtrl? = null, - @ProtoId(13) val receiptReq: ImReceipt.ReceiptReq? = null, - @ProtoId(14) val multiSendSeq: Int = 0 + @SerialId(1) val routingHead: RoutingHead? = null, + @SerialId(2) val contentHead: MsgComm.ContentHead? = null, + @SerialId(3) val msgBody: ImMsgBody.MsgBody = ImMsgBody.MsgBody(), + @SerialId(4) val msgSeq: Int = 0, + @SerialId(5) val msgRand: Int = 0, + @SerialId(6) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(7) val appShare: MsgComm.AppShareInfo? = null, + @SerialId(8) val msgVia: Int = 0, + @SerialId(9) val dataStatist: Int = 0, + @SerialId(10) val multiMsgAssist: MultiMsgAssist? = null, + @SerialId(11) val inputNotifyInfo: PbInputNotifyInfo? = null, + @SerialId(12) val msgCtrl: MsgCtrl.MsgCtrl? = null, + @SerialId(13) val receiptReq: ImReceipt.ReceiptReq? = null, + @SerialId(14) val multiSendSeq: Int = 0 ) : ProtoBuf @Serializable internal class TransMsg( - @ProtoId(1) val toUin: Long = 0L, - @ProtoId(2) val c2cCmd: Int = 0 + @SerialId(1) val toUin: Long = 0L, + @SerialId(2) val c2cCmd: Int = 0 ) : ProtoBuf @Serializable internal class PbDeleteMsgResp( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val errmsg: String = "" + @SerialId(1) val result: Int = 0, + @SerialId(2) val errmsg: String = "" ) : ProtoBuf @Serializable internal class PbSearchRoamMsgInCloudResp( - @ProtoId(1) val msg: List? = null, - @ProtoId(2) val serializeRspbody: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val msg: List? = null, + @SerialId(2) val serializeRspbody: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class PbInputNotifyInfo( - @ProtoId(1) val toUin: Long = 0L, - @ProtoId(2) val ime: Int = 0, - @ProtoId(3) val notifyFlag: Int = 0, - @ProtoId(4) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val iosPushWording: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val toUin: Long = 0L, + @SerialId(2) val ime: Int = 0, + @SerialId(3) val notifyFlag: Int = 0, + @SerialId(4) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val iosPushWording: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class PbUnReadMsgSeqResp( - @ProtoId(1) val c2cUnreadInfo: PbC2CUnReadMsgNumResp? = null, - @ProtoId(2) val binduinUnreadInfo: List? = null, - @ProtoId(3) val groupUnreadInfo: PbPullGroupMsgSeqResp? = null, - @ProtoId(4) val discussUnreadInfo: PbPullDiscussMsgSeqResp? = null, - @ProtoId(5) val thirdqqUnreadInfo: PbThirdQQUnReadMsgNumResp? = null + @SerialId(1) val c2cUnreadInfo: PbC2CUnReadMsgNumResp? = null, + @SerialId(2) val binduinUnreadInfo: List? = null, + @SerialId(3) val groupUnreadInfo: PbPullGroupMsgSeqResp? = null, + @SerialId(4) val discussUnreadInfo: PbPullDiscussMsgSeqResp? = null, + @SerialId(5) val thirdqqUnreadInfo: PbThirdQQUnReadMsgNumResp? = null ) : ProtoBuf @Serializable internal class PbDeleteMsgReq( - @ProtoId(1) val msgItems: List? = null + @SerialId(1) val msgItems: List? = null ) : ProtoBuf { @Serializable internal class MsgItem( - @ProtoId(1) val fromUin: Long = 0L, - @ProtoId(2) val toUin: Long = 0L, - @ProtoId(3) val msgType: Int = 0, - @ProtoId(4) val msgSeq: Int = 0, - @ProtoId(5) val msgUid: Long = 0L, - @ProtoId(7) val sig: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val fromUin: Long = 0L, + @SerialId(2) val toUin: Long = 0L, + @SerialId(3) val msgType: Int = 0, + @SerialId(4) val msgSeq: Int = 0, + @SerialId(5) val msgUid: Long = 0L, + @SerialId(7) val sig: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf } @Serializable internal class MultiMsgAssist( - @ProtoId(1) val repeatedRouting: List? = null, - @ProtoId(2) val msgUse: Int /* enum */ = 1, - @ProtoId(3) val tempId: Long = 0L, - @ProtoId(4) val vedioLen: Long = 0L, - @ProtoId(5) val redbagId: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val redbagAmount: Long = 0L, - @ProtoId(7) val hasReadbag: Int = 0, - @ProtoId(8) val hasVedio: Int = 0 + @SerialId(1) val repeatedRouting: List? = null, + @SerialId(2) val msgUse: Int /* enum */ = 1, + @SerialId(3) val tempId: Long = 0L, + @SerialId(4) val vedioLen: Long = 0L, + @SerialId(5) val redbagId: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val redbagAmount: Long = 0L, + @SerialId(7) val hasReadbag: Int = 0, + @SerialId(8) val hasVedio: Int = 0 ) : ProtoBuf @Serializable internal class PbMsgReadedReportReq( - @ProtoId(1) val grpReadReport: List? = null, - @ProtoId(2) val disReadReport: List? = null, - @ProtoId(3) val c2cReadReport: PbC2CReadedReportReq? = null, - @ProtoId(4) val bindUinReadReport: PbBindUinMsgReadedConfirmReq? = null + @SerialId(1) val grpReadReport: List? = null, + @SerialId(2) val disReadReport: List? = null, + @SerialId(3) val c2cReadReport: PbC2CReadedReportReq? = null, + @SerialId(4) val bindUinReadReport: PbBindUinMsgReadedConfirmReq? = null ) : ProtoBuf @Serializable internal class PbGetOneDayRoamMsgResp( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val errmsg: String = "", - @ProtoId(3) val peerUin: Long = 0L, - @ProtoId(4) val lastMsgtime: Long = 0L, - @ProtoId(5) val random: Long = 0L, - @ProtoId(6) val msg: List? = null, - @ProtoId(7) val iscomplete: Int = 0 + @SerialId(1) val result: Int = 0, + @SerialId(2) val errmsg: String = "", + @SerialId(3) val peerUin: Long = 0L, + @SerialId(4) val lastMsgtime: Long = 0L, + @SerialId(5) val random: Long = 0L, + @SerialId(6) val msg: List? = null, + @SerialId(7) val iscomplete: Int = 0 ) : ProtoBuf @Serializable internal class PbBindUinGetMsgReq( - @ProtoId(1) val bindUin: Long = 0L, - @ProtoId(2) val bindUinSig: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val syncFlag: Int /* enum */ = 0, - @ProtoId(4) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val bindUin: Long = 0L, + @SerialId(2) val bindUinSig: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val syncFlag: Int /* enum */ = 0, + @SerialId(4) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class NearByDatingTmp( - @ProtoId(1) val toUin: Long = 0L, - @ProtoId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val reply: Boolean = false + @SerialId(1) val toUin: Long = 0L, + @SerialId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val reply: Boolean = false ) : ProtoBuf @Serializable internal class BsnsTmp( - @ProtoId(1) val toUin: Long = 0L, - @ProtoId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val toUin: Long = 0L, + @SerialId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class RoutingHead( - @ProtoId(1) val c2c: C2C? = null, - @ProtoId(2) val grp: Grp? = null, - @ProtoId(3) val grpTmp: GrpTmp? = null, - @ProtoId(4) val dis: Dis? = null, - @ProtoId(5) val disTmp: DisTmp? = null, - @ProtoId(6) val wpaTmp: WPATmp? = null, - @ProtoId(7) val secretFile: SecretFileHead? = null, - @ProtoId(8) val publicPlat: PublicPlat? = null, - @ProtoId(9) val transMsg: TransMsg? = null, - @ProtoId(10) val addressList: AddressListTmp? = null, - @ProtoId(11) val richStatusTmp: RichStatusTmp? = null, - @ProtoId(12) val transCmd: TransCmd? = null, - @ProtoId(13) val accostTmp: AccostTmp? = null, - @ProtoId(14) val pubGroupTmp: PubGroupTmp? = null, - @ProtoId(15) val trans0x211: Trans0x211? = null, - @ProtoId(16) val businessWpaTmp: BusinessWPATmp? = null, - @ProtoId(17) val authTmp: AuthTmp? = null, - @ProtoId(18) val bsnsTmp: BsnsTmp? = null, - @ProtoId(19) val qqQuerybusinessTmp: QQQueryBusinessTmp? = null, - @ProtoId(20) val nearbyDatingTmp: NearByDatingTmp? = null, - @ProtoId(21) val nearbyAssistantTmp: NearByAssistantTmp? = null, - @ProtoId(22) val commTmp: CommTmp? = null + @SerialId(1) val c2c: C2C? = null, + @SerialId(2) val grp: Grp? = null, + @SerialId(3) val grpTmp: GrpTmp? = null, + @SerialId(4) val dis: Dis? = null, + @SerialId(5) val disTmp: DisTmp? = null, + @SerialId(6) val wpaTmp: WPATmp? = null, + @SerialId(7) val secretFile: SecretFileHead? = null, + @SerialId(8) val publicPlat: PublicPlat? = null, + @SerialId(9) val transMsg: TransMsg? = null, + @SerialId(10) val addressList: AddressListTmp? = null, + @SerialId(11) val richStatusTmp: RichStatusTmp? = null, + @SerialId(12) val transCmd: TransCmd? = null, + @SerialId(13) val accostTmp: AccostTmp? = null, + @SerialId(14) val pubGroupTmp: PubGroupTmp? = null, + @SerialId(15) val trans0x211: Trans0x211? = null, + @SerialId(16) val businessWpaTmp: BusinessWPATmp? = null, + @SerialId(17) val authTmp: AuthTmp? = null, + @SerialId(18) val bsnsTmp: BsnsTmp? = null, + @SerialId(19) val qqQuerybusinessTmp: QQQueryBusinessTmp? = null, + @SerialId(20) val nearbyDatingTmp: NearByDatingTmp? = null, + @SerialId(21) val nearbyAssistantTmp: NearByAssistantTmp? = null, + @SerialId(22) val commTmp: CommTmp? = null ) : ProtoBuf @Serializable internal class TransResp( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val errmsg: String = "", - @ProtoId(3) val respTag: Int = 0, - @ProtoId(4) val respBuff: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val result: Int = 0, + @SerialId(2) val errmsg: String = "", + @SerialId(3) val respTag: Int = 0, + @SerialId(4) val respBuff: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal data class PbSendMsgResp( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val errmsg: String = "", - @ProtoId(3) val sendTime: Int = 0, - @ProtoId(4) val svrbusyWaitTime: Int = 0, - @ProtoId(5) val msgSendInfo: MsgSendInfo? = null, - @ProtoId(6) val errtype: Int = 0, - @ProtoId(7) val transSvrInfo: TransSvrInfo? = null, - @ProtoId(8) val receiptResp: ImReceipt.ReceiptResp? = null, - @ProtoId(9) val textAnalysisResult: Int = 0 + @SerialId(1) val result: Int = 0, + @SerialId(2) val errmsg: String = "", + @SerialId(3) val sendTime: Int = 0, + @SerialId(4) val svrbusyWaitTime: Int = 0, + @SerialId(5) val msgSendInfo: MsgSendInfo? = null, + @SerialId(6) val errtype: Int = 0, + @SerialId(7) val transSvrInfo: TransSvrInfo? = null, + @SerialId(8) val receiptResp: ImReceipt.ReceiptResp? = null, + @SerialId(9) val textAnalysisResult: Int = 0 ) : ProtoBuf, Packet @Serializable internal class PbBindUinUnReadMsgNumResp( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val errmsg: String = "", - @ProtoId(3) val bindUin: Long = 0L, - @ProtoId(4) val msgNum: Int = 0 + @SerialId(1) val result: Int = 0, + @SerialId(2) val errmsg: String = "", + @SerialId(3) val bindUin: Long = 0L, + @SerialId(4) val msgNum: Int = 0 ) : ProtoBuf @Serializable internal class PbGetDiscussMsgReq( - @ProtoId(1) val discussUin: Long = 0L, - @ProtoId(2) val endSeq: Long = 0L, - @ProtoId(3) val beginSeq: Long = 0L, - @ProtoId(4) val lastGetTime: Long = 0L, - @ProtoId(5) val discussInfoSeq: Long = 0L, - @ProtoId(6) val filter: Int /* enum */ = 0, - @ProtoId(7) val memberSeq: Long = 0L + @SerialId(1) val discussUin: Long = 0L, + @SerialId(2) val endSeq: Long = 0L, + @SerialId(3) val beginSeq: Long = 0L, + @SerialId(4) val lastGetTime: Long = 0L, + @SerialId(5) val discussInfoSeq: Long = 0L, + @SerialId(6) val filter: Int /* enum */ = 0, + @SerialId(7) val memberSeq: Long = 0L ) : ProtoBuf @Serializable internal class PbC2CMsgWithDrawResp( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val errmsg: String = "", - @ProtoId(3) val msgStatus: List? = null, - @ProtoId(4) val subCmd: Int = 0 + @SerialId(1) val result: Int = 0, + @SerialId(2) val errmsg: String = "", + @SerialId(3) val msgStatus: List? = null, + @SerialId(4) val subCmd: Int = 0 ) : ProtoBuf { @Serializable internal class MsgStatus( - @ProtoId(1) val msgInfo: PbC2CMsgWithDrawReq.MsgInfo? = null, - @ProtoId(2) val status: Int = 0 + @SerialId(1) val msgInfo: PbC2CMsgWithDrawReq.MsgInfo? = null, + @SerialId(2) val status: Int = 0 ) : ProtoBuf } @Serializable internal class SecretFileHead( - @ProtoId(1) val secretFileMsg: SubMsgType0xc1.MsgBody? = null, - @ProtoId(2) val secretFileStatus: SubMsgType0x1a.MsgBody? = null + @SerialId(1) val secretFileMsg: SubMsgType0xc1.MsgBody? = null, + @SerialId(2) val secretFileStatus: SubMsgType0x1a.MsgBody? = null ) @Serializable internal class PbGetRoamMsgReq( - @ProtoId(1) val peerUin: Long = 0L, - @ProtoId(2) val lastMsgtime: Long = 0L, - @ProtoId(3) val random: Long = 0L, - @ProtoId(4) val readCnt: Int = 0, - @ProtoId(5) val checkPwd: Int = 0, - @ProtoId(6) val sig: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) val pwd: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) val subcmd: Int = 0, - @ProtoId(9) val beginMsgtime: Long = 0L, - @ProtoId(10) val reqType: Int = 0 + @SerialId(1) val peerUin: Long = 0L, + @SerialId(2) val lastMsgtime: Long = 0L, + @SerialId(3) val random: Long = 0L, + @SerialId(4) val readCnt: Int = 0, + @SerialId(5) val checkPwd: Int = 0, + @SerialId(6) val sig: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(7) val pwd: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(8) val subcmd: Int = 0, + @SerialId(9) val beginMsgtime: Long = 0L, + @SerialId(10) val reqType: Int = 0 ) : ProtoBuf @Serializable internal class TransCmd( - @ProtoId(1) val toUin: Long = 0L, - @ProtoId(2) val msgType: Int = 0 + @SerialId(1) val toUin: Long = 0L, + @SerialId(2) val msgType: Int = 0 ) : ProtoBuf @Serializable internal class PbMsgReadedReportResp( - @ProtoId(1) val grpReadReport: List? = null, - @ProtoId(2) val disReadReport: List? = null, - @ProtoId(3) val c2cReadReport: PbC2CReadedReportResp? = null, - @ProtoId(4) val bindUinReadReport: PbBindUinMsgReadedConfirmResp? = null + @SerialId(1) val grpReadReport: List? = null, + @SerialId(2) val disReadReport: List? = null, + @SerialId(3) val c2cReadReport: PbC2CReadedReportResp? = null, + @SerialId(4) val bindUinReadReport: PbBindUinMsgReadedConfirmResp? = null ) : ProtoBuf @Serializable internal class PbThirdQQUnReadMsgNumResp( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val errmsg: String = "", - @ProtoId(3) val thirdqqRespInfo: List? = null, - @ProtoId(4) val interval: Int = 0 + @SerialId(1) val result: Int = 0, + @SerialId(2) val errmsg: String = "", + @SerialId(3) val thirdqqRespInfo: List? = null, + @SerialId(4) val interval: Int = 0 ) : ProtoBuf { @Serializable internal class ThirdQQRespInfo( - @ProtoId(1) val thirdUin: Long = 0L, - @ProtoId(2) val thirdUinCookie: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val msgNum: Int = 0, - @ProtoId(4) val msgFlag: Int = 0, - @ProtoId(5) val redbagTime: Int = 0, - @ProtoId(6) val status: Int = 0, - @ProtoId(7) val lastMsgTime: Int = 0 + @SerialId(1) val thirdUin: Long = 0L, + @SerialId(2) val thirdUinCookie: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val msgNum: Int = 0, + @SerialId(4) val msgFlag: Int = 0, + @SerialId(5) val redbagTime: Int = 0, + @SerialId(6) val status: Int = 0, + @SerialId(7) val lastMsgTime: Int = 0 ) : ProtoBuf } @Serializable internal class RichStatusTmp( - @ProtoId(1) val toUin: Long = 0L, - @ProtoId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val toUin: Long = 0L, + @SerialId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class QQQueryBusinessTmp( - @ProtoId(1) val toUin: Long = 0L, - @ProtoId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val toUin: Long = 0L, + @SerialId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class PbDelRoamMsgReq( - @ProtoId(1) val c2cMsg: C2CMsg? = null, - @ProtoId(2) val grpMsg: GrpMsg? = null, - @ProtoId(3) val disMsg: DisMsg? = null + @SerialId(1) val c2cMsg: C2CMsg? = null, + @SerialId(2) val grpMsg: GrpMsg? = null, + @SerialId(3) val disMsg: DisMsg? = null ) : ProtoBuf { @Serializable internal class GrpMsg( - @ProtoId(1) val groupCode: Long = 0L, - @ProtoId(2) val msgSeq: Long = 0L + @SerialId(1) val groupCode: Long = 0L, + @SerialId(2) val msgSeq: Long = 0L ) : ProtoBuf @Serializable internal class C2CMsg( - @ProtoId(1) val fromUin: Long = 0L, - @ProtoId(2) val peerUin: Long = 0L, - @ProtoId(3) val msgTime: Int = 0, - @ProtoId(4) val msgRandom: Int = 0, - @ProtoId(5) val msgSeq: Int = 0 + @SerialId(1) val fromUin: Long = 0L, + @SerialId(2) val peerUin: Long = 0L, + @SerialId(3) val msgTime: Int = 0, + @SerialId(4) val msgRandom: Int = 0, + @SerialId(5) val msgSeq: Int = 0 ) : ProtoBuf @Serializable internal class DisMsg( - @ProtoId(1) val discussUin: Long = 0L, - @ProtoId(2) val msgSeq: Long = 0L + @SerialId(1) val discussUin: Long = 0L, + @SerialId(2) val msgSeq: Long = 0L ) : ProtoBuf } @Serializable internal class PbUnReadMsgSeqReq( - @ProtoId(1) val c2cUnreadInfo: PbC2CUnReadMsgNumReq? = null, - @ProtoId(2) val binduinUnreadInfo: List? = null, - @ProtoId(3) val groupUnreadInfo: PbPullGroupMsgSeqReq? = null, - @ProtoId(4) val discussUnreadInfo: PbPullDiscussMsgSeqReq? = null, - @ProtoId(5) val thirdqqUnreadInfo: PbThirdQQUnReadMsgNumReq? = null + @SerialId(1) val c2cUnreadInfo: PbC2CUnReadMsgNumReq? = null, + @SerialId(2) val binduinUnreadInfo: List? = null, + @SerialId(3) val groupUnreadInfo: PbPullGroupMsgSeqReq? = null, + @SerialId(4) val discussUnreadInfo: PbPullDiscussMsgSeqReq? = null, + @SerialId(5) val thirdqqUnreadInfo: PbThirdQQUnReadMsgNumReq? = null ) : ProtoBuf @Serializable internal class PbPullDiscussMsgSeqResp( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val errmsg: String = "", - @ProtoId(3) val discussInfoResp: List? = null + @SerialId(1) val result: Int = 0, + @SerialId(2) val errmsg: String = "", + @SerialId(3) val discussInfoResp: List? = null ) : ProtoBuf { @Serializable internal class DiscussInfoResp( - @ProtoId(1) val confUin: Long = 0L, - @ProtoId(2) val memberSeq: Long = 0L, - @ProtoId(3) val confSeq: Long = 0L + @SerialId(1) val confUin: Long = 0L, + @SerialId(2) val memberSeq: Long = 0L, + @SerialId(3) val confSeq: Long = 0L ) : ProtoBuf } @Serializable internal class PbPullDiscussMsgSeqReq( - @ProtoId(1) val discussInfoReq: List? = null + @SerialId(1) val discussInfoReq: List? = null ) : ProtoBuf { @Serializable internal class DiscussInfoReq( - @ProtoId(1) val confUin: Long = 0L, - @ProtoId(2) val lastSeq: Long = 0L + @SerialId(1) val confUin: Long = 0L, + @SerialId(2) val lastSeq: Long = 0L ) : ProtoBuf } @Serializable internal class WPATmp( - @ProtoId(1) val toUin: Long = 0L, - @ProtoId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val toUin: Long = 0L, + @SerialId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class PublicPlat( - @ProtoId(1) val toUin: Long = 0L, - @ProtoId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val toUin: Long = 0L, + @SerialId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class PbBindUinMsgReadedConfirmResp( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val errmsg: String = "", - @ProtoId(3) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val bindUin: Long = 0L + @SerialId(1) val result: Int = 0, + @SerialId(2) val errmsg: String = "", + @SerialId(3) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val bindUin: Long = 0L ) : ProtoBuf @Serializable internal class PbGetRoamMsgResp( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val errmsg: String = "", - @ProtoId(3) val peerUin: Long = 0L, - @ProtoId(4) val lastMsgtime: Long = 0L, - @ProtoId(5) val random: Long = 0L, - @ProtoId(6) val msg: List? = null, - @ProtoId(7) val sig: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val result: Int = 0, + @SerialId(2) val errmsg: String = "", + @SerialId(3) val peerUin: Long = 0L, + @SerialId(4) val lastMsgtime: Long = 0L, + @SerialId(5) val random: Long = 0L, + @SerialId(6) val msg: List? = null, + @SerialId(7) val sig: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class PbDiscussReadedReportReq( - @ProtoId(1) val confUin: Long = 0L, - @ProtoId(2) val lastReadSeq: Long = 0L + @SerialId(1) val confUin: Long = 0L, + @SerialId(2) val lastReadSeq: Long = 0L ) : ProtoBuf @Serializable internal class PbC2CReadedReportReq( - @ProtoId(1) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val pairInfo: List? = null + @SerialId(1) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val pairInfo: List? = null ) : ProtoBuf { @Serializable internal class UinPairReadInfo( - @ProtoId(1) val peerUin: Long = 0L, - @ProtoId(2) val lastReadTime: Int = 0, - @ProtoId(3) val crmSig: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val peerUin: Long = 0L, + @SerialId(2) val lastReadTime: Int = 0, + @SerialId(3) val crmSig: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf } @Serializable internal class Trans0x211( - @ProtoId(1) val toUin: Long = 0L, - @ProtoId(2) val ccCmd: Int = 0, - @ProtoId(3) val instCtrl: ImMsgHead.InstCtrl? = null, - @ProtoId(4) val sig: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val c2cType: Int = 0, - @ProtoId(6) val serviceType: Int = 0 + @SerialId(1) val toUin: Long = 0L, + @SerialId(2) val ccCmd: Int = 0, + @SerialId(3) val instCtrl: ImMsgHead.InstCtrl? = null, + @SerialId(4) val sig: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val c2cType: Int = 0, + @SerialId(6) val serviceType: Int = 0 ) : ProtoBuf @Serializable internal class PbSearchRoamMsgInCloudReq( - @ProtoId(1) val serializeReqbody: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val serializeReqbody: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class PbBindUinUnReadMsgNumReq( - @ProtoId(1) val bindUin: Long = 0L, - @ProtoId(2) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val bindUin: Long = 0L, + @SerialId(2) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class PbC2CUnReadMsgNumResp( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val errmsg: String = "", - @ProtoId(3) val msgNum: Int = 0 + @SerialId(1) val result: Int = 0, + @SerialId(2) val errmsg: String = "", + @SerialId(3) val msgNum: Int = 0 ) : ProtoBuf @Serializable internal class PbPullGroupMsgSeqReq( - @ProtoId(1) val groupInfoReq: List? = null + @SerialId(1) val groupInfoReq: List? = null ) : ProtoBuf { @Serializable internal class GroupInfoReq( - @ProtoId(1) val groupCode: Long = 0L, - @ProtoId(2) val lastSeq: Long = 0L + @SerialId(1) val groupCode: Long = 0L, + @SerialId(2) val lastSeq: Long = 0L ) : ProtoBuf } @Serializable internal class TransReq( - @ProtoId(1) val command: Int = 0, - @ProtoId(2) val reqTag: Int = 0, - @ProtoId(3) val reqBuff: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val command: Int = 0, + @SerialId(2) val reqTag: Int = 0, + @SerialId(3) val reqBuff: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class PbGroupReadedReportResp( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val errmsg: String = "", - @ProtoId(3) val groupCode: Long = 0L, - @ProtoId(4) val memberSeq: Long = 0L, - @ProtoId(5) val groupMsgSeq: Long = 0L + @SerialId(1) val result: Int = 0, + @SerialId(2) val errmsg: String = "", + @SerialId(3) val groupCode: Long = 0L, + @SerialId(4) val memberSeq: Long = 0L, + @SerialId(5) val groupMsgSeq: Long = 0L ) : ProtoBuf @Serializable internal class PbGetGroupMsgResp( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val errmsg: String = "", - @ProtoId(3) val groupCode: Long = 0L, - @ProtoId(4) val returnBeginSeq: Long = 0L, - @ProtoId(5) val returnEndSeq: Long = 0L, - @ProtoId(6) val msg: List? = null + @SerialId(1) val result: Int = 0, + @SerialId(2) val errmsg: String = "", + @SerialId(3) val groupCode: Long = 0L, + @SerialId(4) val returnBeginSeq: Long = 0L, + @SerialId(5) val returnEndSeq: Long = 0L, + @SerialId(6) val msg: List? = null ) : ProtoBuf @Serializable internal class PbThirdQQUnReadMsgNumReq( - @ProtoId(1) val thirdqqReqInfo: List? = null, - @ProtoId(2) val source: Int = 0 + @SerialId(1) val thirdqqReqInfo: List? = null, + @SerialId(2) val source: Int = 0 ) : ProtoBuf { @Serializable internal class ThirdQQReqInfo( - @ProtoId(1) val thirdUin: Long = 0L, - @ProtoId(2) val thirdUinSig: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val thirdUinCookie: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val thirdUin: Long = 0L, + @SerialId(2) val thirdUinSig: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val thirdUinCookie: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf } } @@ -761,20 +761,20 @@ internal class MsgSvc : ProtoBuf { internal class MsgCtrl { @Serializable internal class MsgCtrl( - @ProtoId(1) val msgFlag: Int = 0, - @ProtoId(2) val resvResvInfo: ResvResvInfo? = null + @SerialId(1) val msgFlag: Int = 0, + @SerialId(2) val resvResvInfo: ResvResvInfo? = null ) : ProtoBuf @Serializable internal class ResvResvInfo( - @ProtoId(1) val flag: Int = 0, - @ProtoId(2) val reserv1: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val reserv2: Long = 0L, - @ProtoId(4) val reserv3: Long = 0L, - @ProtoId(5) val createTime: Int = 0, - @ProtoId(6) val picHeight: Int = 0, - @ProtoId(7) val picWidth: Int = 0, - @ProtoId(8) val resvFlag: Int = 0 + @SerialId(1) val flag: Int = 0, + @SerialId(2) val reserv1: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val reserv2: Long = 0L, + @SerialId(4) val reserv3: Long = 0L, + @SerialId(5) val createTime: Int = 0, + @SerialId(6) val picHeight: Int = 0, + @SerialId(7) val picWidth: Int = 0, + @SerialId(8) val resvFlag: Int = 0 ) : ProtoBuf } @@ -782,35 +782,35 @@ internal class MsgCtrl { internal class SubMsgType0xc1 { @Serializable internal class NotOnlineImage( - @ProtoId(1) val filePath: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val fileLen: Int = 0, - @ProtoId(3) val downloadPath: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val oldVerSendFile: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val imgType: Int = 0, - @ProtoId(6) val previewsImage: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) val picMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) val picHeight: Int = 0, - @ProtoId(9) val picWidth: Int = 0, - @ProtoId(10) val resId: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(11) val flag: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(12) val downloadUrl: String = "", - @ProtoId(13) val original: Int = 0 + @SerialId(1) val filePath: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val fileLen: Int = 0, + @SerialId(3) val downloadPath: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val oldVerSendFile: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val imgType: Int = 0, + @SerialId(6) val previewsImage: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(7) val picMd5: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(8) val picHeight: Int = 0, + @SerialId(9) val picWidth: Int = 0, + @SerialId(10) val resId: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(11) val flag: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(12) val downloadUrl: String = "", + @SerialId(13) val original: Int = 0 ) : ProtoBuf @Serializable internal class MsgBody( - @ProtoId(1) val fileKey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val fromUin: Long = 0L, - @ProtoId(3) val toUin: Long = 0L, - @ProtoId(4) val status: Int = 0, - @ProtoId(5) val ttl: Int = 0, - @ProtoId(6) val type: Int = 0, - @ProtoId(7) val encryptPreheadLength: Int = 0, - @ProtoId(8) val encryptType: Int = 0, - @ProtoId(9) val encryptKey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(10) val readTimes: Int = 0, - @ProtoId(11) val leftTime: Int = 0, - @ProtoId(12) val notOnlineImage: NotOnlineImage? = null + @SerialId(1) val fileKey: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val fromUin: Long = 0L, + @SerialId(3) val toUin: Long = 0L, + @SerialId(4) val status: Int = 0, + @SerialId(5) val ttl: Int = 0, + @SerialId(6) val type: Int = 0, + @SerialId(7) val encryptPreheadLength: Int = 0, + @SerialId(8) val encryptType: Int = 0, + @SerialId(9) val encryptKey: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(10) val readTimes: Int = 0, + @SerialId(11) val leftTime: Int = 0, + @SerialId(12) val notOnlineImage: NotOnlineImage? = null ) : ProtoBuf } @@ -818,15 +818,15 @@ internal class SubMsgType0xc1 { internal class SubMsgType0x1a { @Serializable internal class MsgBody( - @ProtoId(1) val fileKey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val fromUin_int32: Int = 0, - @ProtoId(3) val toUin_int32: Int = 0, - @ProtoId(4) val status: Int = 0, - @ProtoId(5) val ttl: Int = 0, - @ProtoId(6) val ingDesc: String = "", - @ProtoId(7) val type: Int = 0, - @ProtoId(8) val captureTimes: Int = 0, - @ProtoId(9) val fromUin: Long = 0L, - @ProtoId(10) val toUin: Long = 0L + @SerialId(1) val fileKey: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val fromUin_int32: Int = 0, + @SerialId(3) val toUin_int32: Int = 0, + @SerialId(4) val status: Int = 0, + @SerialId(5) val ttl: Int = 0, + @SerialId(6) val ingDesc: String = "", + @SerialId(7) val type: Int = 0, + @SerialId(8) val captureTimes: Int = 0, + @SerialId(9) val fromUin: Long = 0L, + @SerialId(10) val toUin: Long = 0L ) : ProtoBuf } \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/OIDB.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/OIDB.kt index 53459082c..e12633005 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/OIDB.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/OIDB.kt @@ -9,8 +9,8 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto +import kotlinx.serialization.SerialId import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId import net.mamoe.mirai.qqandroid.io.ProtoBuf import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY @@ -18,31 +18,31 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY class Oidb0x8a0 : ProtoBuf { @Serializable class RspBody( - @ProtoId(1) val optUint64GroupCode: Long = 0L, - @ProtoId(2) val msgKickResult: List? = null + @SerialId(1) val optUint64GroupCode: Long = 0L, + @SerialId(2) val msgKickResult: List? = null ) : ProtoBuf @Serializable class KickResult( - @ProtoId(1) val optUint32Result: Int = 0, - @ProtoId(2) val optUint64MemberUin: Long = 0L + @SerialId(1) val optUint32Result: Int = 0, + @SerialId(2) val optUint64MemberUin: Long = 0L ) : ProtoBuf @Serializable class KickMemberInfo( - @ProtoId(1) val optUint32Operate: Int = 0, - @ProtoId(2) val optUint64MemberUin: Long = 0L, - @ProtoId(3) val optUint32Flag: Int = 0, - @ProtoId(4) val optBytesMsg: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val optUint32Operate: Int = 0, + @SerialId(2) val optUint64MemberUin: Long = 0L, + @SerialId(3) val optUint32Flag: Int = 0, + @SerialId(4) val optBytesMsg: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val optUint64GroupCode: Long = 0L, - @ProtoId(2) val msgKickList: List? = null, - @ProtoId(3) val kickList: List? = null, - @ProtoId(4) val kickFlag: Int = 0, - @ProtoId(5) val kickMsg: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val optUint64GroupCode: Long = 0L, + @SerialId(2) val msgKickList: List? = null, + @SerialId(3) val kickList: List? = null, + @SerialId(4) val kickFlag: Int = 0, + @SerialId(5) val kickMsg: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf } @@ -51,71 +51,71 @@ class Oidb0x8a0 : ProtoBuf { class Oidb0x8fc : ProtoBuf { @Serializable class CardNameElem( - @ProtoId(1) val enumCardType: Int /* enum */ = 1, - @ProtoId(2) val value: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val enumCardType: Int /* enum */ = 1, + @SerialId(2) val value: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class CommCardNameBuf( - @ProtoId(1) val richCardName: List? = null + @SerialId(1) val richCardName: List? = null ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val groupCode: Long = 0L, - @ProtoId(2) val showFlag: Int = 0, - @ProtoId(3) val memLevelInfo: List? = null, - @ProtoId(4) val levelName: List? = null, - @ProtoId(5) val updateTime: Int = 0, - @ProtoId(6) val officeMode: Int = 0, - @ProtoId(7) val groupOpenAppid: Int = 0, - @ProtoId(8) val msgClientInfo: ClientInfo? = null, - @ProtoId(9) val authKey: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val groupCode: Long = 0L, + @SerialId(2) val showFlag: Int = 0, + @SerialId(3) val memLevelInfo: List? = null, + @SerialId(4) val levelName: List? = null, + @SerialId(5) val updateTime: Int = 0, + @SerialId(6) val officeMode: Int = 0, + @SerialId(7) val groupOpenAppid: Int = 0, + @SerialId(8) val msgClientInfo: ClientInfo? = null, + @SerialId(9) val authKey: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class MemberInfo( - @ProtoId(1) val uin: Long = 0L, - @ProtoId(2) val point: Int = 0, - @ProtoId(3) val activeDay: Int = 0, - @ProtoId(4) val level: Int = 0, - @ProtoId(5) val specialTitle: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val specialTitleExpireTime: Int = 0, - @ProtoId(7) val uinName: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) val memberCardName: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(9) val phone: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(10) val email: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(11) val remark: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(12) val gender: Int = 0, - @ProtoId(13) val job: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(14) val tribeLevel: Int = 0, - @ProtoId(15) val tribePoint: Int = 0, - @ProtoId(16) val richCardName: List? = null, - @ProtoId(17) val commRichCardName: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val uin: Long = 0L, + @SerialId(2) val point: Int = 0, + @SerialId(3) val activeDay: Int = 0, + @SerialId(4) val level: Int = 0, + @SerialId(5) val specialTitle: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val specialTitleExpireTime: Int = 0, + @SerialId(7) val uinName: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(8) val memberCardName: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(9) val phone: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(10) val email: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(11) val remark: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(12) val gender: Int = 0, + @SerialId(13) val job: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(14) val tribeLevel: Int = 0, + @SerialId(15) val tribePoint: Int = 0, + @SerialId(16) val richCardName: List? = null, + @SerialId(17) val commRichCardName: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class RichCardNameElem( - @ProtoId(1) val ctrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val text: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val ctrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val text: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val groupCode: Long = 0L, - @ProtoId(2) val errInfo: String = "" + @SerialId(1) val groupCode: Long = 0L, + @SerialId(2) val errInfo: String = "" ) : ProtoBuf @Serializable class ClientInfo( - @ProtoId(1) val implat: Int = 0, - @ProtoId(2) val ingClientver: String = "" + @SerialId(1) val implat: Int = 0, + @SerialId(2) val ingClientver: String = "" ) : ProtoBuf @Serializable class LevelName( - @ProtoId(1) val level: Int = 0, - @ProtoId(2) val name: String = "" + @SerialId(1) val level: Int = 0, + @SerialId(2) val name: String = "" ) : ProtoBuf } @@ -123,181 +123,181 @@ class Oidb0x8fc : ProtoBuf { class Oidb0x88d : ProtoBuf { @Serializable class GroupExInfoOnly( - @ProtoId(1) val tribeId: Int = 0, - @ProtoId(2) val moneyForAddGroup: Int = 0 + @SerialId(1) val tribeId: Int = 0, + @SerialId(2) val moneyForAddGroup: Int = 0 ) : ProtoBuf @Serializable class ReqGroupInfo( - @ProtoId(1) val groupCode: Long = 0L, - @ProtoId(2) val stgroupinfo: GroupInfo? = null, - @ProtoId(3) val lastGetGroupNameTime: Int = 0 + @SerialId(1) val groupCode: Long = 0L, + @SerialId(2) val stgroupinfo: GroupInfo? = null, + @SerialId(3) val lastGetGroupNameTime: Int = 0 ) : ProtoBuf @Serializable class RspGroupInfo( - @ProtoId(1) val groupCode: Long = 0L, - @ProtoId(2) val result: Int = 0, - @ProtoId(3) val stgroupinfo: GroupInfo? = null + @SerialId(1) val groupCode: Long = 0L, + @SerialId(2) val result: Int = 0, + @SerialId(3) val stgroupinfo: GroupInfo? = null ) : ProtoBuf @Serializable class GroupGeoInfo( - @ProtoId(1) val owneruin: Long = 0L, - @ProtoId(2) val settime: Int = 0, - @ProtoId(3) val cityid: Int = 0, - @ProtoId(4) val int64Longitude: Long = 0L, - @ProtoId(5) val int64Latitude: Long = 0L, - @ProtoId(6) val geocontent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) val poiId: Long = 0L + @SerialId(1) val owneruin: Long = 0L, + @SerialId(2) val settime: Int = 0, + @SerialId(3) val cityid: Int = 0, + @SerialId(4) val int64Longitude: Long = 0L, + @SerialId(5) val int64Latitude: Long = 0L, + @SerialId(6) val geocontent: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(7) val poiId: Long = 0L ) : ProtoBuf @Serializable class TagRecord( - @ProtoId(1) val fromUin: Long = 0L, - @ProtoId(2) val groupCode: Long = 0L, - @ProtoId(3) val tagId: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val setTime: Long = 0L, - @ProtoId(5) val goodNum: Int = 0, - @ProtoId(6) val badNum: Int = 0, - @ProtoId(7) val tagLen: Int = 0, - @ProtoId(8) val tagValue: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val fromUin: Long = 0L, + @SerialId(2) val groupCode: Long = 0L, + @SerialId(3) val tagId: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val setTime: Long = 0L, + @SerialId(5) val goodNum: Int = 0, + @SerialId(6) val badNum: Int = 0, + @SerialId(7) val tagLen: Int = 0, + @SerialId(8) val tagValue: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class GroupInfo( - @ProtoId(1) val groupOwner: Long? = null, - @ProtoId(2) val groupCreateTime: Int? = null, - @ProtoId(3) val groupFlag: Int? = null, - @ProtoId(4) val groupFlagExt: Int? = null, - @ProtoId(5) val groupMemberMaxNum: Int? = null, - @ProtoId(6) val groupMemberNum: Int? = null, - @ProtoId(7) val groupOption: Int? = null, - @ProtoId(8) val groupClassExt: Int? = null, - @ProtoId(9) val groupSpecialClass: Int? = null, - @ProtoId(10) val groupLevel: Int? = null, - @ProtoId(11) val groupFace: Int? = null, - @ProtoId(12) val groupDefaultPage: Int? = null, - @ProtoId(13) val groupInfoSeq: Int? = null, - @ProtoId(14) val groupRoamingTime: Int? = null, - @ProtoId(15) var groupName: String? = null, - @ProtoId(16) var groupMemo: String? = null, - @ProtoId(17) val ingGroupFingerMemo: String? = null, - @ProtoId(18) val ingGroupClassText: String? = null, - @ProtoId(19) val groupAllianceCode: List? = null, - @ProtoId(20) val groupExtraAdmNum: Int? = null, - @ProtoId(21) var groupUin: Long? = null, - @ProtoId(22) val groupCurMsgSeq: Int? = null, - @ProtoId(23) val groupLastMsgTime: Int? = null, - @ProtoId(24) val ingGroupQuestion: String? = null, - @ProtoId(25) val ingGroupAnswer: String? = null, - @ProtoId(26) val groupVisitorMaxNum: Int? = null, - @ProtoId(27) val groupVisitorCurNum: Int? = null, - @ProtoId(28) val levelNameSeq: Int? = null, - @ProtoId(29) val groupAdminMaxNum: Int? = null, - @ProtoId(30) val groupAioSkinTimestamp: Int? = null, - @ProtoId(31) val groupBoardSkinTimestamp: Int? = null, - @ProtoId(32) val ingGroupAioSkinUrl: String? = null, - @ProtoId(33) val ingGroupBoardSkinUrl: String? = null, - @ProtoId(34) val groupCoverSkinTimestamp: Int? = null, - @ProtoId(35) val ingGroupCoverSkinUrl: String? = null, - @ProtoId(36) val groupGrade: Int? = null, - @ProtoId(37) val activeMemberNum: Int? = null, - @ProtoId(38) val certificationType: Int? = null, - @ProtoId(39) val ingCertificationText: String? = null, - @ProtoId(40) val ingGroupRichFingerMemo: String? = null, - @ProtoId(41) val tagRecord: List? = null, - @ProtoId(42) val groupGeoInfo: GroupGeoInfo? = null, - @ProtoId(43) val headPortraitSeq: Int? = null, - @ProtoId(44) val msgHeadPortrait: GroupHeadPortrait? = null, - @ProtoId(45) val shutupTimestamp: Int? = null, - @ProtoId(46) val shutupTimestampMe: Int? = null, - @ProtoId(47) val createSourceFlag: Int? = null, - @ProtoId(48) val cmduinMsgSeq: Int? = null, - @ProtoId(49) val cmduinJoinTime: Int? = null, - @ProtoId(50) val cmduinUinFlag: Int? = null, - @ProtoId(51) val cmduinFlagEx: Int? = null, - @ProtoId(52) val cmduinNewMobileFlag: Int? = null, - @ProtoId(53) val cmduinReadMsgSeq: Int? = null, - @ProtoId(54) val cmduinLastMsgTime: Int? = null, - @ProtoId(55) val groupTypeFlag: Int? = null, - @ProtoId(56) val appPrivilegeFlag: Int? = null, - @ProtoId(57) val stGroupExInfo: GroupExInfoOnly? = null, - @ProtoId(58) val groupSecLevel: Int? = null, - @ProtoId(59) val groupSecLevelInfo: Int? = null, - @ProtoId(60) val cmduinPrivilege: Int? = null, - @ProtoId(61) val ingPoidInfo: ByteArray? = null, - @ProtoId(62) val cmduinFlagEx2: Int? = null, - @ProtoId(63) val confUin: Long? = null, - @ProtoId(64) val confMaxMsgSeq: Int? = null, - @ProtoId(65) val confToGroupTime: Int? = null, - @ProtoId(66) val passwordRedbagTime: Int? = null, - @ProtoId(67) val subscriptionUin: Long? = null, - @ProtoId(68) val memberListChangeSeq: Int? = null, - @ProtoId(69) val membercardSeq: Int? = null, - @ProtoId(70) val rootId: Long? = null, - @ProtoId(71) val parentId: Long? = null, - @ProtoId(72) val teamSeq: Int? = null, - @ProtoId(73) val historyMsgBeginTime: Long? = null, - @ProtoId(74) val inviteNoAuthNumLimit: Long? = null, - @ProtoId(75) val cmduinHistoryMsgSeq: Int? = null, - @ProtoId(76) val cmduinJoinMsgSeq: Int? = null, - @ProtoId(77) val groupFlagext3: Int? = null, - @ProtoId(78) val groupOpenAppid: Int? = null, - @ProtoId(79) val isConfGroup: Int? = null, - @ProtoId(80) val isModifyConfGroupFace: Int? = null, - @ProtoId(81) val isModifyConfGroupName: Int? = null, - @ProtoId(82) val noFingerOpenFlag: Int? = null, - @ProtoId(83) val noCodeFingerOpenFlag: Int? = null, - @ProtoId(84) val autoAgreeJoinGroupUserNumForNormalGroup: Int? = null, - @ProtoId(85) val autoAgreeJoinGroupUserNumForConfGroup: Int? = null, - @ProtoId(86) val isAllowConfGroupMemberNick: Int? = null, - @ProtoId(87) val isAllowConfGroupMemberAtAll: Int? = null, - @ProtoId(88) val isAllowConfGroupMemberModifyGroupName: Int? = null, - @ProtoId(89) val longGroupName: String? = null, - @ProtoId(90) val cmduinJoinRealMsgSeq: Int? = null, - @ProtoId(91) val isGroupFreeze: Int? = null, - @ProtoId(92) val msgLimitFrequency: Int? = null, - @ProtoId(93) val joinGroupAuth: ByteArray? = null, - @ProtoId(94) val hlGuildAppid: Int? = null, - @ProtoId(95) val hlGuildSubType: Int? = null, - @ProtoId(96) val hlGuildOrgid: Int? = null, - @ProtoId(97) val isAllowHlGuildBinary: Int? = null, - @ProtoId(98) val cmduinRingtoneId: Int? = null, - @ProtoId(99) val groupFlagext4: Int? = null, - @ProtoId(100) val groupFreezeReason: Int? = null, - @ProtoId(101) var groupCode: Long? = null // mirai 添加 + @SerialId(1) val groupOwner: Long? = null, + @SerialId(2) val groupCreateTime: Int? = null, + @SerialId(3) val groupFlag: Int? = null, + @SerialId(4) val groupFlagExt: Int? = null, + @SerialId(5) val groupMemberMaxNum: Int? = null, + @SerialId(6) val groupMemberNum: Int? = null, + @SerialId(7) val groupOption: Int? = null, + @SerialId(8) val groupClassExt: Int? = null, + @SerialId(9) val groupSpecialClass: Int? = null, + @SerialId(10) val groupLevel: Int? = null, + @SerialId(11) val groupFace: Int? = null, + @SerialId(12) val groupDefaultPage: Int? = null, + @SerialId(13) val groupInfoSeq: Int? = null, + @SerialId(14) val groupRoamingTime: Int? = null, + @SerialId(15) var groupName: String? = null, + @SerialId(16) var groupMemo: String? = null, + @SerialId(17) val ingGroupFingerMemo: String? = null, + @SerialId(18) val ingGroupClassText: String? = null, + @SerialId(19) val groupAllianceCode: List? = null, + @SerialId(20) val groupExtraAdmNum: Int? = null, + @SerialId(21) var groupUin: Long? = null, + @SerialId(22) val groupCurMsgSeq: Int? = null, + @SerialId(23) val groupLastMsgTime: Int? = null, + @SerialId(24) val ingGroupQuestion: String? = null, + @SerialId(25) val ingGroupAnswer: String? = null, + @SerialId(26) val groupVisitorMaxNum: Int? = null, + @SerialId(27) val groupVisitorCurNum: Int? = null, + @SerialId(28) val levelNameSeq: Int? = null, + @SerialId(29) val groupAdminMaxNum: Int? = null, + @SerialId(30) val groupAioSkinTimestamp: Int? = null, + @SerialId(31) val groupBoardSkinTimestamp: Int? = null, + @SerialId(32) val ingGroupAioSkinUrl: String? = null, + @SerialId(33) val ingGroupBoardSkinUrl: String? = null, + @SerialId(34) val groupCoverSkinTimestamp: Int? = null, + @SerialId(35) val ingGroupCoverSkinUrl: String? = null, + @SerialId(36) val groupGrade: Int? = null, + @SerialId(37) val activeMemberNum: Int? = null, + @SerialId(38) val certificationType: Int? = null, + @SerialId(39) val ingCertificationText: String? = null, + @SerialId(40) val ingGroupRichFingerMemo: String? = null, + @SerialId(41) val tagRecord: List? = null, + @SerialId(42) val groupGeoInfo: GroupGeoInfo? = null, + @SerialId(43) val headPortraitSeq: Int? = null, + @SerialId(44) val msgHeadPortrait: GroupHeadPortrait? = null, + @SerialId(45) val shutupTimestamp: Int? = null, + @SerialId(46) val shutupTimestampMe: Int? = null, + @SerialId(47) val createSourceFlag: Int? = null, + @SerialId(48) val cmduinMsgSeq: Int? = null, + @SerialId(49) val cmduinJoinTime: Int? = null, + @SerialId(50) val cmduinUinFlag: Int? = null, + @SerialId(51) val cmduinFlagEx: Int? = null, + @SerialId(52) val cmduinNewMobileFlag: Int? = null, + @SerialId(53) val cmduinReadMsgSeq: Int? = null, + @SerialId(54) val cmduinLastMsgTime: Int? = null, + @SerialId(55) val groupTypeFlag: Int? = null, + @SerialId(56) val appPrivilegeFlag: Int? = null, + @SerialId(57) val stGroupExInfo: GroupExInfoOnly? = null, + @SerialId(58) val groupSecLevel: Int? = null, + @SerialId(59) val groupSecLevelInfo: Int? = null, + @SerialId(60) val cmduinPrivilege: Int? = null, + @SerialId(61) val ingPoidInfo: ByteArray? = null, + @SerialId(62) val cmduinFlagEx2: Int? = null, + @SerialId(63) val confUin: Long? = null, + @SerialId(64) val confMaxMsgSeq: Int? = null, + @SerialId(65) val confToGroupTime: Int? = null, + @SerialId(66) val passwordRedbagTime: Int? = null, + @SerialId(67) val subscriptionUin: Long? = null, + @SerialId(68) val memberListChangeSeq: Int? = null, + @SerialId(69) val membercardSeq: Int? = null, + @SerialId(70) val rootId: Long? = null, + @SerialId(71) val parentId: Long? = null, + @SerialId(72) val teamSeq: Int? = null, + @SerialId(73) val historyMsgBeginTime: Long? = null, + @SerialId(74) val inviteNoAuthNumLimit: Long? = null, + @SerialId(75) val cmduinHistoryMsgSeq: Int? = null, + @SerialId(76) val cmduinJoinMsgSeq: Int? = null, + @SerialId(77) val groupFlagext3: Int? = null, + @SerialId(78) val groupOpenAppid: Int? = null, + @SerialId(79) val isConfGroup: Int? = null, + @SerialId(80) val isModifyConfGroupFace: Int? = null, + @SerialId(81) val isModifyConfGroupName: Int? = null, + @SerialId(82) val noFingerOpenFlag: Int? = null, + @SerialId(83) val noCodeFingerOpenFlag: Int? = null, + @SerialId(84) val autoAgreeJoinGroupUserNumForNormalGroup: Int? = null, + @SerialId(85) val autoAgreeJoinGroupUserNumForConfGroup: Int? = null, + @SerialId(86) val isAllowConfGroupMemberNick: Int? = null, + @SerialId(87) val isAllowConfGroupMemberAtAll: Int? = null, + @SerialId(88) val isAllowConfGroupMemberModifyGroupName: Int? = null, + @SerialId(89) val longGroupName: String? = null, + @SerialId(90) val cmduinJoinRealMsgSeq: Int? = null, + @SerialId(91) val isGroupFreeze: Int? = null, + @SerialId(92) val msgLimitFrequency: Int? = null, + @SerialId(93) val joinGroupAuth: ByteArray? = null, + @SerialId(94) val hlGuildAppid: Int? = null, + @SerialId(95) val hlGuildSubType: Int? = null, + @SerialId(96) val hlGuildOrgid: Int? = null, + @SerialId(97) val isAllowHlGuildBinary: Int? = null, + @SerialId(98) val cmduinRingtoneId: Int? = null, + @SerialId(99) val groupFlagext4: Int? = null, + @SerialId(100) val groupFreezeReason: Int? = null, + @SerialId(101) var groupCode: Long? = null // mirai 添加 ) : ProtoBuf @Serializable class GroupHeadPortraitInfo( - @ProtoId(1) val uint32PicId: Int = 0, - @ProtoId(2) val leftX: Int = 0, - @ProtoId(3) val leftY: Int = 0, - @ProtoId(4) val rightX: Int = 0, - @ProtoId(5) val rightY: Int = 0 + @SerialId(1) val uint32PicId: Int = 0, + @SerialId(2) val leftX: Int = 0, + @SerialId(3) val leftY: Int = 0, + @SerialId(4) val rightX: Int = 0, + @SerialId(5) val rightY: Int = 0 ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val stzrspgroupinfo: List? = null, - @ProtoId(2) val errorinfo: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val stzrspgroupinfo: List? = null, + @SerialId(2) val errorinfo: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val appid: Int = 0, - @ProtoId(2) val stzreqgroupinfo: List? = null, - @ProtoId(3) val pcClientVersion: Int = 0 + @SerialId(1) val appid: Int = 0, + @SerialId(2) val stzreqgroupinfo: List? = null, + @SerialId(3) val pcClientVersion: Int = 0 ) : ProtoBuf @Serializable class GroupHeadPortrait( - @ProtoId(1) val picCnt: Int = 0, - @ProtoId(2) val msgInfo: List? = null, - @ProtoId(3) val defaultId: Int = 0, - @ProtoId(4) val verifyingPicCnt: Int = 0, - @ProtoId(5) val msgVerifyingpicInfo: List? = null + @SerialId(1) val picCnt: Int = 0, + @SerialId(2) val msgInfo: List? = null, + @SerialId(3) val defaultId: Int = 0, + @SerialId(4) val verifyingPicCnt: Int = 0, + @SerialId(5) val msgVerifyingpicInfo: List? = null ) : ProtoBuf } @@ -305,79 +305,79 @@ class Oidb0x88d : ProtoBuf { class Oidb0x89a : ProtoBuf { @Serializable class GroupNewGuidelinesInfo( - @ProtoId(1) val boolEnabled: Boolean = false, - @ProtoId(2) val ingContent: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val boolEnabled: Boolean = false, + @SerialId(2) val ingContent: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class Groupinfo( - @ProtoId(1) val groupExtAdmNum: Int? = null, - @ProtoId(2) val flag: Int? = null, - @ProtoId(3) val ingGroupName: ByteArray? = null, - @ProtoId(4) val ingGroupMemo: ByteArray? = null, - @ProtoId(5) val ingGroupFingerMemo: ByteArray? = null, - @ProtoId(6) val ingGroupAioSkinUrl: ByteArray? = null, - @ProtoId(7) val ingGroupBoardSkinUrl: ByteArray? = null, - @ProtoId(8) val ingGroupCoverSkinUrl: ByteArray? = null, - @ProtoId(9) val groupGrade: Int? = null, - @ProtoId(10) val activeMemberNum: Int? = null, - @ProtoId(11) val certificationType: Int? = null, - @ProtoId(12) val ingCertificationText: ByteArray? = null, - @ProtoId(13) val ingGroupRichFingerMemo: ByteArray? = null, - @ProtoId(14) val stGroupNewguidelines: GroupNewGuidelinesInfo? = null, - @ProtoId(15) val groupFace: Int? = null, - @ProtoId(16) val addOption: Int? = null, - @ProtoId(17) val shutupTime: Int? = null, - @ProtoId(18) val groupTypeFlag: Int? = null, - @ProtoId(19) val stringGroupTag: List? = null, - @ProtoId(20) val msgGroupGeoInfo: GroupGeoInfo? = null, - @ProtoId(21) val groupClassExt: Int? = null, - @ProtoId(22) val ingGroupClassText: ByteArray? = null, - @ProtoId(23) val appPrivilegeFlag: Int? = null, - @ProtoId(24) val appPrivilegeMask: Int? = null, - @ProtoId(25) val stGroupExInfo: GroupExInfoOnly? = null, - @ProtoId(26) val groupSecLevel: Int? = null, - @ProtoId(27) val groupSecLevelInfo: Int? = null, - @ProtoId(28) val subscriptionUin: Long? = null, - @ProtoId(29) val allowMemberInvite: Int? = null, - @ProtoId(30) val ingGroupQuestion: ByteArray? = null, - @ProtoId(31) val ingGroupAnswer: ByteArray? = null, - @ProtoId(32) val groupFlagext3: Int? = null, - @ProtoId(33) val groupFlagext3Mask: Int? = null, - @ProtoId(34) val groupOpenAppid: Int? = null, - @ProtoId(35) val noFingerOpenFlag: Int? = null, - @ProtoId(36) val noCodeFingerOpenFlag: Int? = null, - @ProtoId(37) val rootId: Long? = null, - @ProtoId(38) val msgLimitFrequency: Int? = null + @SerialId(1) val groupExtAdmNum: Int? = null, + @SerialId(2) val flag: Int? = null, + @SerialId(3) val ingGroupName: ByteArray? = null, + @SerialId(4) val ingGroupMemo: ByteArray? = null, + @SerialId(5) val ingGroupFingerMemo: ByteArray? = null, + @SerialId(6) val ingGroupAioSkinUrl: ByteArray? = null, + @SerialId(7) val ingGroupBoardSkinUrl: ByteArray? = null, + @SerialId(8) val ingGroupCoverSkinUrl: ByteArray? = null, + @SerialId(9) val groupGrade: Int? = null, + @SerialId(10) val activeMemberNum: Int? = null, + @SerialId(11) val certificationType: Int? = null, + @SerialId(12) val ingCertificationText: ByteArray? = null, + @SerialId(13) val ingGroupRichFingerMemo: ByteArray? = null, + @SerialId(14) val stGroupNewguidelines: GroupNewGuidelinesInfo? = null, + @SerialId(15) val groupFace: Int? = null, + @SerialId(16) val addOption: Int? = null, + @SerialId(17) val shutupTime: Int? = null, + @SerialId(18) val groupTypeFlag: Int? = null, + @SerialId(19) val stringGroupTag: List? = null, + @SerialId(20) val msgGroupGeoInfo: GroupGeoInfo? = null, + @SerialId(21) val groupClassExt: Int? = null, + @SerialId(22) val ingGroupClassText: ByteArray? = null, + @SerialId(23) val appPrivilegeFlag: Int? = null, + @SerialId(24) val appPrivilegeMask: Int? = null, + @SerialId(25) val stGroupExInfo: GroupExInfoOnly? = null, + @SerialId(26) val groupSecLevel: Int? = null, + @SerialId(27) val groupSecLevelInfo: Int? = null, + @SerialId(28) val subscriptionUin: Long? = null, + @SerialId(29) val allowMemberInvite: Int? = null, + @SerialId(30) val ingGroupQuestion: ByteArray? = null, + @SerialId(31) val ingGroupAnswer: ByteArray? = null, + @SerialId(32) val groupFlagext3: Int? = null, + @SerialId(33) val groupFlagext3Mask: Int? = null, + @SerialId(34) val groupOpenAppid: Int? = null, + @SerialId(35) val noFingerOpenFlag: Int? = null, + @SerialId(36) val noCodeFingerOpenFlag: Int? = null, + @SerialId(37) val rootId: Long? = null, + @SerialId(38) val msgLimitFrequency: Int? = null ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val groupCode: Long = 0L, - @ProtoId(2) val errorinfo: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val groupCode: Long = 0L, + @SerialId(2) val errorinfo: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class GroupExInfoOnly( - @ProtoId(1) val tribeId: Int = 0, - @ProtoId(2) val moneyForAddGroup: Int = 0 + @SerialId(1) val tribeId: Int = 0, + @SerialId(2) val moneyForAddGroup: Int = 0 ) : ProtoBuf @Serializable class GroupGeoInfo( - @ProtoId(1) val cityId: Int = 0, - @ProtoId(2) val longtitude: Long = 0L, - @ProtoId(3) val latitude: Long = 0L, - @ProtoId(4) val ingGeoContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val poiId: Long = 0L + @SerialId(1) val cityId: Int = 0, + @SerialId(2) val longtitude: Long = 0L, + @SerialId(3) val latitude: Long = 0L, + @SerialId(4) val ingGeoContent: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val poiId: Long = 0L ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val groupCode: Long = 0L, - @ProtoId(2) val stGroupInfo: Groupinfo? = null, - @ProtoId(3) val originalOperatorUin: Long = 0L, - @ProtoId(4) val reqGroupOpenAppid: Int = 0 + @SerialId(1) val groupCode: Long = 0L, + @SerialId(2) val stGroupInfo: Groupinfo? = null, + @SerialId(3) val originalOperatorUin: Long = 0L, + @SerialId(4) val reqGroupOpenAppid: Int = 0 ) : ProtoBuf } @@ -385,50 +385,50 @@ class Oidb0x89a : ProtoBuf { class Cmd0x7cb : ProtoBuf { @Serializable class ConfigItem( - @ProtoId(1) val id: Int = 0, - @ProtoId(2) val config: String = "" + @SerialId(1) val id: Int = 0, + @SerialId(2) val config: String = "" ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val timeStamp: Int = 0, - @ProtoId(2) val timeGap: Int = 0, - @ProtoId(3) val commentConfigs: List? = null, - @ProtoId(4) val attendTipsToA: String = "", - @ProtoId(5) val firstMsgTips: String = "", - @ProtoId(6) val cancleConfig: List? = null, - @ProtoId(7) val msgDateRequest: DateRequest? = null, - @ProtoId(8) val msgHotLocale: List? = null,//List - @ProtoId(9) val msgTopicList: List? = null, - @ProtoId(10) val travelMsgTips: String = "", - @ProtoId(11) val travelProfileTips: String = "", - @ProtoId(12) val travelAttenTips: String = "", - @ProtoId(13) val topicDefault: Int = 0 + @SerialId(1) val timeStamp: Int = 0, + @SerialId(2) val timeGap: Int = 0, + @SerialId(3) val commentConfigs: List? = null, + @SerialId(4) val attendTipsToA: String = "", + @SerialId(5) val firstMsgTips: String = "", + @SerialId(6) val cancleConfig: List? = null, + @SerialId(7) val msgDateRequest: DateRequest? = null, + @SerialId(8) val msgHotLocale: List? = null,//List + @SerialId(9) val msgTopicList: List? = null, + @SerialId(10) val travelMsgTips: String = "", + @SerialId(11) val travelProfileTips: String = "", + @SerialId(12) val travelAttenTips: String = "", + @SerialId(13) val topicDefault: Int = 0 ) : ProtoBuf @Serializable class CommentConfig( - @ProtoId(1) val appointSubject: Int = 0, - @ProtoId(2) val msgConfigs: List? = null + @SerialId(1) val appointSubject: Int = 0, + @SerialId(2) val msgConfigs: List? = null ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val timeStamp: Int = 0 + @SerialId(1) val timeStamp: Int = 0 ) : ProtoBuf @Serializable class DateRequest( - @ProtoId(1) val time: Int = 0, - @ProtoId(2) val errMsg: String = "" + @SerialId(1) val time: Int = 0, + @SerialId(2) val errMsg: String = "" ) : ProtoBuf @Serializable class TopicConfig( - @ProtoId(1) val topicId: Int = 0, - @ProtoId(2) val topicName: String = "", - @ProtoId(3) val deadline: Int = 0, - @ProtoId(4) val errDeadline: String = "" + @SerialId(1) val topicId: Int = 0, + @SerialId(2) val topicName: String = "", + @SerialId(3) val deadline: Int = 0, + @SerialId(4) val errDeadline: String = "" ) : ProtoBuf } @@ -436,18 +436,18 @@ class Cmd0x7cb : ProtoBuf { class Oidb0x87a : ProtoBuf { @Serializable class RspBody( - @ProtoId(1) val country: String = "", - @ProtoId(2) val telephone: String = "", - @ProtoId(3) val resendInterval: Int = 0, - @ProtoId(4) val guid: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val country: String = "", + @SerialId(2) val telephone: String = "", + @SerialId(3) val resendInterval: Int = 0, + @SerialId(4) val guid: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val country: String = "", - @ProtoId(2) val telephone: String = "", - @ProtoId(3) val guid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val enumButype: Int /* enum */ = 0 + @SerialId(1) val country: String = "", + @SerialId(2) val telephone: String = "", + @SerialId(3) val guid: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val enumButype: Int /* enum */ = 0 ) : ProtoBuf } @@ -455,42 +455,42 @@ class Oidb0x87a : ProtoBuf { class GroupAppPb : ProtoBuf { @Serializable class ClientInfo( - @ProtoId(1) val platform: Int = 0, - @ProtoId(2) val version: String = "" + @SerialId(1) val platform: Int = 0, + @SerialId(2) val version: String = "" ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val fullList: AppList? = null, - @ProtoId(2) val groupGrayList: AppList? = null, - @ProtoId(3) val redPointList: AppList? = null, - @ProtoId(4) val cacheInterval: Int = 0 + @SerialId(1) val fullList: AppList? = null, + @SerialId(2) val groupGrayList: AppList? = null, + @SerialId(3) val redPointList: AppList? = null, + @SerialId(4) val cacheInterval: Int = 0 ) : ProtoBuf @Serializable class AppList( - @ProtoId(1) val hash: String = "", - @ProtoId(2) val infos: List? = null + @SerialId(1) val hash: String = "", + @SerialId(2) val infos: List? = null ) : ProtoBuf @Serializable class AppInfo( - @ProtoId(1) val appid: Int = 0, - @ProtoId(2) val icon: String = "", - @ProtoId(3) val name: String = "", - @ProtoId(4) val url: String = "", - @ProtoId(5) val isGray: Int = 0, - @ProtoId(6) val iconSimpleDay: String = "", - @ProtoId(7) val iconSimpleNight: String = "" + @SerialId(1) val appid: Int = 0, + @SerialId(2) val icon: String = "", + @SerialId(3) val name: String = "", + @SerialId(4) val url: String = "", + @SerialId(5) val isGray: Int = 0, + @SerialId(6) val iconSimpleDay: String = "", + @SerialId(7) val iconSimpleNight: String = "" ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val client: ClientInfo? = null, - @ProtoId(2) val groupId: Long = 0L, - @ProtoId(3) val groupType: Int = 0, - @ProtoId(4) val fullListHash: String = "", - @ProtoId(5) val groupGrayListHash: String = "" + @SerialId(1) val client: ClientInfo? = null, + @SerialId(2) val groupId: Long = 0L, + @SerialId(3) val groupType: Int = 0, + @SerialId(4) val fullListHash: String = "", + @SerialId(5) val groupGrayListHash: String = "" ) : ProtoBuf } @@ -501,7 +501,7 @@ class Oidb0xc34 : ProtoBuf { @Serializable class ReqBody( - @ProtoId(1) val uin: Long = 0L + @SerialId(1) val uin: Long = 0L ) : ProtoBuf } @@ -509,18 +509,18 @@ class Oidb0xc34 : ProtoBuf { class Cmd0x5fd : ProtoBuf { @Serializable class ReqBody( - @ProtoId(1) val msgComment: AppointDefine.DateComment? = null, - @ProtoId(2) val maxFetchCount: Int = 0, - @ProtoId(3) val lastCommentId: String = "" + @SerialId(1) val msgComment: AppointDefine.DateComment? = null, + @SerialId(2) val maxFetchCount: Int = 0, + @SerialId(3) val lastCommentId: String = "" ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val msgComment: List? = null, - @ProtoId(2) val errorTips: String = "", - @ProtoId(3) val clearCacheFlag: Int = 0, - @ProtoId(4) val commentWording: String = "", - @ProtoId(5) val commentNum: Int = 0 + @SerialId(1) val msgComment: List? = null, + @SerialId(2) val errorTips: String = "", + @SerialId(3) val clearCacheFlag: Int = 0, + @SerialId(4) val commentWording: String = "", + @SerialId(5) val commentNum: Int = 0 ) : ProtoBuf } @@ -528,62 +528,62 @@ class Cmd0x5fd : ProtoBuf { class Oidb0xbcb : ProtoBuf { @Serializable class CheckUrlReqItem( - @ProtoId(1) val url: String = "", - @ProtoId(2) val refer: String = "", - @ProtoId(3) val plateform: String = "", - @ProtoId(4) val qqPfTo: String = "", - @ProtoId(5) val msgType: Int = 0, - @ProtoId(6) val msgFrom: Int = 0, - @ProtoId(7) val msgChatid: Long = 0L, - @ProtoId(8) val serviceType: Long = 0L, - @ProtoId(9) val sendUin: Long = 0L, - @ProtoId(10) val reqType: String = "" + @SerialId(1) val url: String = "", + @SerialId(2) val refer: String = "", + @SerialId(3) val plateform: String = "", + @SerialId(4) val qqPfTo: String = "", + @SerialId(5) val msgType: Int = 0, + @SerialId(6) val msgFrom: Int = 0, + @SerialId(7) val msgChatid: Long = 0L, + @SerialId(8) val serviceType: Long = 0L, + @SerialId(9) val sendUin: Long = 0L, + @SerialId(10) val reqType: String = "" ) : ProtoBuf @Serializable class CheckUrlRsp( - @ProtoId(1) val results: List? = null, - @ProtoId(2) val nextReqDuration: Int = 0 + @SerialId(1) val results: List? = null, + @SerialId(2) val nextReqDuration: Int = 0 ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(9) val notUseCache: Int = 0, - @ProtoId(10) val checkUrlReq: CheckUrlReq? = null + @SerialId(9) val notUseCache: Int = 0, + @SerialId(10) val checkUrlReq: CheckUrlReq? = null ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val wording: String = "", - @ProtoId(10) val checkUrlRsp: CheckUrlRsp? = null + @SerialId(1) val wording: String = "", + @SerialId(10) val checkUrlRsp: CheckUrlRsp? = null ) : ProtoBuf @Serializable class CheckUrlReq( - @ProtoId(1) val url: List = listOf(), - @ProtoId(2) val refer: String = "", - @ProtoId(3) val plateform: String = "", - @ProtoId(4) val qqPfTo: String = "", - @ProtoId(5) val msgType: Int = 0, - @ProtoId(6) val msgFrom: Int = 0, - @ProtoId(7) val msgChatid: Long = 0L, - @ProtoId(8) val serviceType: Long = 0L, - @ProtoId(9) val sendUin: Long = 0L, - @ProtoId(10) val reqType: String = "", - @ProtoId(11) val originalUrl: String = "" + @SerialId(1) val url: List = listOf(), + @SerialId(2) val refer: String = "", + @SerialId(3) val plateform: String = "", + @SerialId(4) val qqPfTo: String = "", + @SerialId(5) val msgType: Int = 0, + @SerialId(6) val msgFrom: Int = 0, + @SerialId(7) val msgChatid: Long = 0L, + @SerialId(8) val serviceType: Long = 0L, + @SerialId(9) val sendUin: Long = 0L, + @SerialId(10) val reqType: String = "", + @SerialId(11) val originalUrl: String = "" ) : ProtoBuf @Serializable class UrlCheckResult( - @ProtoId(1) val url: String = "", - @ProtoId(2) val result: Int = 0, - @ProtoId(3) val jumpResult: Int = 0, - @ProtoId(4) val jumpUrl: String = "", - @ProtoId(5) val level: Int = 0, - @ProtoId(6) val subLevel: Int = 0, - @ProtoId(7) val umrtype: Int = 0, - @ProtoId(8) val retFrom: Int = 0, - @ProtoId(9) val operationBit: Long = 0L + @SerialId(1) val url: String = "", + @SerialId(2) val result: Int = 0, + @SerialId(3) val jumpResult: Int = 0, + @SerialId(4) val jumpUrl: String = "", + @SerialId(5) val level: Int = 0, + @SerialId(6) val subLevel: Int = 0, + @SerialId(7) val umrtype: Int = 0, + @SerialId(8) val retFrom: Int = 0, + @SerialId(9) val operationBit: Long = 0L ) : ProtoBuf } @@ -591,14 +591,14 @@ class Oidb0xbcb : ProtoBuf { class Oidb0xbfe : ProtoBuf { @Serializable class RspBody( - @ProtoId(1) val receiveStatus: Int = 0, - @ProtoId(2) val jumpUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val flag: Int = 0 + @SerialId(1) val receiveStatus: Int = 0, + @SerialId(2) val jumpUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val flag: Int = 0 ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val uin: Long = 0L + @SerialId(1) val uin: Long = 0L ) : ProtoBuf } @@ -606,26 +606,26 @@ class Oidb0xbfe : ProtoBuf { class Oidb0xbe8 : ProtoBuf { @Serializable class RspBody( - @ProtoId(1) val uin: Long = 0L, - @ProtoId(2) val enumOpCode: Int /* enum */ = 1, - @ProtoId(3) val rspOfPopupFlag: Int = 0, - @ProtoId(4) val popupCountNow: Int = 0 + @SerialId(1) val uin: Long = 0L, + @SerialId(2) val enumOpCode: Int /* enum */ = 1, + @SerialId(3) val rspOfPopupFlag: Int = 0, + @SerialId(4) val popupCountNow: Int = 0 ) : ProtoBuf @Serializable class PopupResult( - @ProtoId(1) val popupResult: Int = 0, - @ProtoId(2) val popupFieldid: Int = 0 + @SerialId(1) val popupResult: Int = 0, + @SerialId(2) val popupFieldid: Int = 0 ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val uin: Long = 0L, - @ProtoId(2) val enumOpCode: Int /* enum */ = 1, - @ProtoId(3) val reqOfPopupFlag: Int = 0, - @ProtoId(4) val rstOfPopupFlag: Int = 0, - @ProtoId(5) val mqq808WelcomepageFlag: Int = 0, - @ProtoId(6) val msgPopupResult: List? = null + @SerialId(1) val uin: Long = 0L, + @SerialId(2) val enumOpCode: Int /* enum */ = 1, + @SerialId(3) val reqOfPopupFlag: Int = 0, + @SerialId(4) val rstOfPopupFlag: Int = 0, + @SerialId(5) val mqq808WelcomepageFlag: Int = 0, + @SerialId(6) val msgPopupResult: List? = null ) : ProtoBuf } @@ -633,45 +633,45 @@ class Oidb0xbe8 : ProtoBuf { class Cmd0x7de : ProtoBuf { @Serializable class UserProfile( - @ProtoId(1) val msgPublisherInfo: AppointDefine.PublisherInfo? = null, - @ProtoId(2) val msgAppointsInfo: AppointDefine.AppointInfo? = null, - @ProtoId(3) val msgVistorInfo: List? = null + @SerialId(1) val msgPublisherInfo: AppointDefine.PublisherInfo? = null, + @SerialId(2) val msgAppointsInfo: AppointDefine.AppointInfo? = null, + @SerialId(3) val msgVistorInfo: List? = null ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val msgHead: BusiRespHead? = null, - @ProtoId(2) val msgUserList: List? = null, - @ProtoId(3) val ended: Int = 0, - @ProtoId(4) val cookie: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val msgHead: BusiRespHead? = null, + @SerialId(2) val msgUserList: List? = null, + @SerialId(3) val ended: Int = 0, + @SerialId(4) val cookie: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class BusiRespHead( - @ProtoId(1) val int32Version: Int = 1, - @ProtoId(2) val int32Seq: Int = 0, - @ProtoId(3) val int32ReplyCode: Int = 0, - @ProtoId(4) val result: String = "" + @SerialId(1) val int32Version: Int = 1, + @SerialId(2) val int32Seq: Int = 0, + @SerialId(3) val int32ReplyCode: Int = 0, + @SerialId(4) val result: String = "" ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val msgHead: BusiReqHead? = null, - @ProtoId(2) val msgLbsInfo: AppointDefine.LBSInfo? = null, - @ProtoId(3) val time: Int = 0, - @ProtoId(4) val subject: Int = 0, - @ProtoId(5) val gender: Int = 0, - @ProtoId(6) val ageLow: Int = 0, - @ProtoId(7) val ageUp: Int = 0, - @ProtoId(8) val profession: Int = 0, - @ProtoId(9) val cookie: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(10) val msgDestination: AppointDefine.LocaleInfo? = null + @SerialId(1) val msgHead: BusiReqHead? = null, + @SerialId(2) val msgLbsInfo: AppointDefine.LBSInfo? = null, + @SerialId(3) val time: Int = 0, + @SerialId(4) val subject: Int = 0, + @SerialId(5) val gender: Int = 0, + @SerialId(6) val ageLow: Int = 0, + @SerialId(7) val ageUp: Int = 0, + @SerialId(8) val profession: Int = 0, + @SerialId(9) val cookie: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(10) val msgDestination: AppointDefine.LocaleInfo? = null ) : ProtoBuf @Serializable class BusiReqHead( - @ProtoId(1) val int32Version: Int = 1, - @ProtoId(2) val int32Seq: Int = 0 + @SerialId(1) val int32Version: Int = 1, + @SerialId(2) val int32Seq: Int = 0 ) : ProtoBuf } @@ -679,37 +679,37 @@ class Cmd0x7de : ProtoBuf { class Cmd0x7a8 : ProtoBuf { @Serializable class ReqBody( - @ProtoId(1) val reqUin: Long = 0L, - @ProtoId(11) val onlyObtained: Int = 0, - @ProtoId(12) val readReport: Int = 0, - @ProtoId(13) val sortType: Int = 0, - @ProtoId(14) val onlyNew: Int = 0, - @ProtoId(15) val filterMedalIds: List? = null, - @ProtoId(16) val onlySummary: Int = 0, - @ProtoId(17) val doScan: Int = 0, - @ProtoId(18) val startTimestamp: Int = 0 + @SerialId(1) val reqUin: Long = 0L, + @SerialId(11) val onlyObtained: Int = 0, + @SerialId(12) val readReport: Int = 0, + @SerialId(13) val sortType: Int = 0, + @SerialId(14) val onlyNew: Int = 0, + @SerialId(15) val filterMedalIds: List? = null, + @SerialId(16) val onlySummary: Int = 0, + @SerialId(17) val doScan: Int = 0, + @SerialId(18) val startTimestamp: Int = 0 ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val nick: String = "", - @ProtoId(2) val metalRank: Int = 0, - @ProtoId(3) val friCount: Int = 0, - @ProtoId(4) val metalCount: Int = 0, - @ProtoId(5) val metalTotal: Int = 0, - @ProtoId(6) val msgMedal: List? = null, - @ProtoId(8) val totalPoint: Int = 0, - @ProtoId(9) val int32NewCount: Int = 0, - @ProtoId(10) val int32UpgradeCount: Int = 0, - @ProtoId(11) val promptParams: String = "", - @ProtoId(12) val now: Int = 0 + @SerialId(1) val nick: String = "", + @SerialId(2) val metalRank: Int = 0, + @SerialId(3) val friCount: Int = 0, + @SerialId(4) val metalCount: Int = 0, + @SerialId(5) val metalTotal: Int = 0, + @SerialId(6) val msgMedal: List? = null, + @SerialId(8) val totalPoint: Int = 0, + @SerialId(9) val int32NewCount: Int = 0, + @SerialId(10) val int32UpgradeCount: Int = 0, + @SerialId(11) val promptParams: String = "", + @SerialId(12) val now: Int = 0 ) : ProtoBuf @Serializable class MedalNews( - @ProtoId(1) val friUin: Long = 0L, - @ProtoId(2) val friNick: String = "", - @ProtoId(3) val msgMedal: Common.MedalInfo? = null + @SerialId(1) val friUin: Long = 0L, + @SerialId(2) val friNick: String = "", + @SerialId(3) val msgMedal: Common.MedalInfo? = null ) : ProtoBuf } @@ -718,18 +718,18 @@ class Cmd0x7a8 : ProtoBuf { class Cmd0x5fe : ProtoBuf { @Serializable class ReqBody( - @ProtoId(1) val msgAppointId: AppointDefine.AppointID? = null, - @ProtoId(2) val commentId: String = "", - @ProtoId(3) val fetchOldCount: Int = 0, - @ProtoId(4) val fetchNewCount: Int = 0 + @SerialId(1) val msgAppointId: AppointDefine.AppointID? = null, + @SerialId(2) val commentId: String = "", + @SerialId(3) val fetchOldCount: Int = 0, + @SerialId(4) val fetchNewCount: Int = 0 ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val msgComment: List? = null, - @ProtoId(2) val errorTips: String = "", - @ProtoId(3) val fetchOldOver: Int = 0, - @ProtoId(4) val fetchNewOver: Int = 0 + @SerialId(1) val msgComment: List? = null, + @SerialId(2) val errorTips: String = "", + @SerialId(3) val fetchOldOver: Int = 0, + @SerialId(4) val fetchNewOver: Int = 0 ) : ProtoBuf } @@ -740,20 +740,20 @@ class Oidb0xc35 : ProtoBuf { @Serializable class ReqBody( - @ProtoId(1) val uin: Long = 0L, - @ProtoId(2) val msgExposeInfo: List? = null + @SerialId(1) val uin: Long = 0L, + @SerialId(2) val msgExposeInfo: List? = null ) : ProtoBuf @Serializable class ExposeItem( - @ProtoId(1) val friend: Long = 0L, - @ProtoId(2) val pageId: Int = 0, - @ProtoId(3) val entranceId: Int = 0, - @ProtoId(4) val actionId: Int = 0, - @ProtoId(5) val exposeCount: Int = 0, - @ProtoId(6) val exposeTime: Int = 0, - @ProtoId(7) val algoBuffer: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) val addition: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val friend: Long = 0L, + @SerialId(2) val pageId: Int = 0, + @SerialId(3) val entranceId: Int = 0, + @SerialId(4) val actionId: Int = 0, + @SerialId(5) val exposeCount: Int = 0, + @SerialId(6) val exposeTime: Int = 0, + @SerialId(7) val algoBuffer: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(8) val addition: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf } @@ -761,15 +761,15 @@ class Oidb0xc35 : ProtoBuf { class Oidb0xc0d : ProtoBuf { @Serializable class RspBody( - @ProtoId(1) val completedTaskStamp: Long = 0L, - @ProtoId(2) val errMsg: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val completedTaskStamp: Long = 0L, + @SerialId(2) val errMsg: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val uin: Long = 0L, - @ProtoId(2) val taskType: Int = 0, - @ProtoId(3) val taskPoint: Int = 0 + @SerialId(1) val uin: Long = 0L, + @SerialId(2) val taskType: Int = 0, + @SerialId(3) val taskPoint: Int = 0 ) : ProtoBuf } @@ -777,12 +777,12 @@ class Oidb0xc0d : ProtoBuf { class OidbSso : ProtoBuf { @Serializable class OIDBSSOPkg( - @ProtoId(1) val command: Int = 0, - @ProtoId(2) val serviceType: Int = 0, - @ProtoId(3) val result: Int = 0, - @ProtoId(4) val bodybuffer: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val errorMsg: String = "", - @ProtoId(6) val clientVersion: String = "" + @SerialId(1) val command: Int = 0, + @SerialId(2) val serviceType: Int = 0, + @SerialId(3) val result: Int = 0, + @SerialId(4) val bodybuffer: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val errorMsg: String = "", + @SerialId(6) val clientVersion: String = "" ) : ProtoBuf } @@ -790,15 +790,15 @@ class OidbSso : ProtoBuf { class Cmd0xc83 : ProtoBuf { @Serializable class ReqBody( - @ProtoId(101) val fromUin: Long = 0L, - @ProtoId(102) val toUin: Long = 0L, - @ProtoId(103) val op: Int = 0 + @SerialId(101) val fromUin: Long = 0L, + @SerialId(102) val toUin: Long = 0L, + @SerialId(103) val op: Int = 0 ) : ProtoBuf @Serializable class RspBody( - @ProtoId(101) val result: Int = 0, - @ProtoId(102) val retryInterval: Int = 0 + @SerialId(101) val result: Int = 0, + @SerialId(102) val retryInterval: Int = 0 ) : ProtoBuf } @@ -806,35 +806,35 @@ class Cmd0xc83 : ProtoBuf { class Cmd0xccb : ProtoBuf { @Serializable class GroupMsgInfo( - @ProtoId(1) val msgSeq: Int = 0, - @ProtoId(2) val roamFlag: Int = 0 + @SerialId(1) val msgSeq: Int = 0, + @SerialId(2) val roamFlag: Int = 0 ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val type: Int = 0, - @ProtoId(2) val destUin: Long = 0L, - @ProtoId(3) val groupCode: Long = 0L, - @ProtoId(4) val c2cMsg: List? = null, - @ProtoId(5) val groupMsg: List? = null + @SerialId(1) val type: Int = 0, + @SerialId(2) val destUin: Long = 0L, + @SerialId(3) val groupCode: Long = 0L, + @SerialId(4) val c2cMsg: List? = null, + @SerialId(5) val groupMsg: List? = null ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val type: Int = 0, - @ProtoId(2) val destUin: Long = 0L, - @ProtoId(3) val groupCode: Long = 0L, - @ProtoId(4) val c2cMsg: List? = null, - @ProtoId(5) val groupMsg: List? = null, - @ProtoId(6) val resId: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val type: Int = 0, + @SerialId(2) val destUin: Long = 0L, + @SerialId(3) val groupCode: Long = 0L, + @SerialId(4) val c2cMsg: List? = null, + @SerialId(5) val groupMsg: List? = null, + @SerialId(6) val resId: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class C2cMsgInfo( - @ProtoId(1) val msgSeq: Int = 0, - @ProtoId(2) val msgTime: Int = 0, - @ProtoId(3) val msgRandom: Int = 0, - @ProtoId(4) val roamFlag: Int = 0 + @SerialId(1) val msgSeq: Int = 0, + @SerialId(2) val msgTime: Int = 0, + @SerialId(3) val msgRandom: Int = 0, + @SerialId(4) val roamFlag: Int = 0 ) : ProtoBuf } @@ -842,12 +842,12 @@ class Cmd0xccb : ProtoBuf { class Oidb0xd84 : ProtoBuf { @Serializable class ReqBody( - @ProtoId(1) val xmitinfo: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val xmitinfo: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val xmitinfo: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val xmitinfo: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf } @@ -855,103 +855,103 @@ class Oidb0xd84 : ProtoBuf { class Oidb0x5e1 : ProtoBuf { @Serializable class UdcUinData( - @ProtoId(1) val uin: Long = 0L, - @ProtoId(4) val openid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(20002) val nick: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(20003) val country: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(20004) val province: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(20009) val gender: Int = 0, - @ProtoId(20014) val allow: Int = 0, - @ProtoId(20015) val faceId: Int = 0, - @ProtoId(20020) val city: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(20027) val commonPlace1: Int = 0, - @ProtoId(20030) val mss3Bitmapextra: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(20031) val birthday: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(20032) val cityId: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(20033) val lang1: Int = 0, - @ProtoId(20034) val lang2: Int = 0, - @ProtoId(20035) val lang3: Int = 0, - @ProtoId(20041) val cityZoneId: Int = 0, - @ProtoId(20056) val oin: Int = 0, - @ProtoId(20059) val bubbleId: Int = 0, - @ProtoId(21001) val mss2Identity: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(21002) val mss1Service: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(21003) val lflag: Int = 0, - @ProtoId(21004) val extFlag: Int = 0, - @ProtoId(21006) val basicSvrFlag: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(21007) val basicCliFlag: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(24101) val pengyouRealname: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(24103) val pengyouGender: Int = 0, - @ProtoId(24118) val pengyouFlag: Int = 0, - @ProtoId(26004) val fullBirthday: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(26005) val fullAge: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(26010) val simpleUpdateTime: Int = 0, - @ProtoId(26011) val mssUpdateTime: Int = 0, - @ProtoId(27022) val groupMemCreditFlag: Int = 0, - @ProtoId(27025) val faceAddonId: Long = 0L, - @ProtoId(27026) val musicGene: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(40323) val fileShareBit: Int = 0, - @ProtoId(40404) val recommendPrivacyCtrl: Int = 0, - @ProtoId(40505) val oldFriendChat: Int = 0, - @ProtoId(40602) val businessBit: Int = 0, - @ProtoId(41305) val crmBit: Int = 0, - @ProtoId(41810) val forbidFileshareBit: Int = 0, - @ProtoId(42333) val userLoginGuardFace: Int = 0 + @SerialId(1) val uin: Long = 0L, + @SerialId(4) val openid: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(20002) val nick: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(20003) val country: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(20004) val province: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(20009) val gender: Int = 0, + @SerialId(20014) val allow: Int = 0, + @SerialId(20015) val faceId: Int = 0, + @SerialId(20020) val city: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(20027) val commonPlace1: Int = 0, + @SerialId(20030) val mss3Bitmapextra: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(20031) val birthday: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(20032) val cityId: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(20033) val lang1: Int = 0, + @SerialId(20034) val lang2: Int = 0, + @SerialId(20035) val lang3: Int = 0, + @SerialId(20041) val cityZoneId: Int = 0, + @SerialId(20056) val oin: Int = 0, + @SerialId(20059) val bubbleId: Int = 0, + @SerialId(21001) val mss2Identity: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(21002) val mss1Service: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(21003) val lflag: Int = 0, + @SerialId(21004) val extFlag: Int = 0, + @SerialId(21006) val basicSvrFlag: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(21007) val basicCliFlag: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(24101) val pengyouRealname: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(24103) val pengyouGender: Int = 0, + @SerialId(24118) val pengyouFlag: Int = 0, + @SerialId(26004) val fullBirthday: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(26005) val fullAge: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(26010) val simpleUpdateTime: Int = 0, + @SerialId(26011) val mssUpdateTime: Int = 0, + @SerialId(27022) val groupMemCreditFlag: Int = 0, + @SerialId(27025) val faceAddonId: Long = 0L, + @SerialId(27026) val musicGene: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(40323) val fileShareBit: Int = 0, + @SerialId(40404) val recommendPrivacyCtrl: Int = 0, + @SerialId(40505) val oldFriendChat: Int = 0, + @SerialId(40602) val businessBit: Int = 0, + @SerialId(41305) val crmBit: Int = 0, + @SerialId(41810) val forbidFileshareBit: Int = 0, + @SerialId(42333) val userLoginGuardFace: Int = 0 ) : ProtoBuf @Serializable class RspBody( - @ProtoId(11) val msgUinData: List? = null, - @ProtoId(12) val uint64UnfinishedUins: List? = null + @SerialId(11) val msgUinData: List? = null, + @SerialId(12) val uint64UnfinishedUins: List? = null ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val uint64Uins: List? = null, - @ProtoId(2) val startTime: Int = 0, - @ProtoId(3) val maxPackageSize: Int = 0, - @ProtoId(4) val bytesOpenid: List? = null, - @ProtoId(5) val appid: Int = 0, - @ProtoId(20002) val reqNick: Int = 0, - @ProtoId(20003) val reqCountry: Int = 0, - @ProtoId(20004) val reqProvince: Int = 0, - @ProtoId(20009) val reqGender: Int = 0, - @ProtoId(20014) val reqAllow: Int = 0, - @ProtoId(20015) val reqFaceId: Int = 0, - @ProtoId(20020) val reqCity: Int = 0, - @ProtoId(20027) val reqCommonPlace1: Int = 0, - @ProtoId(20030) val reqMss3Bitmapextra: Int = 0, - @ProtoId(20031) val reqBirthday: Int = 0, - @ProtoId(20032) val reqCityId: Int = 0, - @ProtoId(20033) val reqLang1: Int = 0, - @ProtoId(20034) val reqLang2: Int = 0, - @ProtoId(20035) val reqLang3: Int = 0, - @ProtoId(20041) val reqCityZoneId: Int = 0, - @ProtoId(20056) val reqOin: Int = 0, - @ProtoId(20059) val reqBubbleId: Int = 0, - @ProtoId(21001) val reqMss2Identity: Int = 0, - @ProtoId(21002) val reqMss1Service: Int = 0, - @ProtoId(21003) val reqLflag: Int = 0, - @ProtoId(21004) val reqExtFlag: Int = 0, - @ProtoId(21006) val reqBasicSvrFlag: Int = 0, - @ProtoId(21007) val reqBasicCliFlag: Int = 0, - @ProtoId(24101) val reqPengyouRealname: Int = 0, - @ProtoId(24103) val reqPengyouGender: Int = 0, - @ProtoId(24118) val reqPengyouFlag: Int = 0, - @ProtoId(26004) val reqFullBirthday: Int = 0, - @ProtoId(26005) val reqFullAge: Int = 0, - @ProtoId(26010) val reqSimpleUpdateTime: Int = 0, - @ProtoId(26011) val reqMssUpdateTime: Int = 0, - @ProtoId(27022) val reqGroupMemCreditFlag: Int = 0, - @ProtoId(27025) val reqFaceAddonId: Int = 0, - @ProtoId(27026) val reqMusicGene: Int = 0, - @ProtoId(40323) val reqFileShareBit: Int = 0, - @ProtoId(40404) val reqRecommendPrivacyCtrlBit: Int = 0, - @ProtoId(40505) val reqOldFriendChatBit: Int = 0, - @ProtoId(40602) val reqBusinessBit: Int = 0, - @ProtoId(41305) val reqCrmBit: Int = 0, - @ProtoId(41810) val reqForbidFileshareBit: Int = 0, - @ProtoId(42333) val userLoginGuardFace: Int = 0 + @SerialId(1) val uint64Uins: List? = null, + @SerialId(2) val startTime: Int = 0, + @SerialId(3) val maxPackageSize: Int = 0, + @SerialId(4) val bytesOpenid: List? = null, + @SerialId(5) val appid: Int = 0, + @SerialId(20002) val reqNick: Int = 0, + @SerialId(20003) val reqCountry: Int = 0, + @SerialId(20004) val reqProvince: Int = 0, + @SerialId(20009) val reqGender: Int = 0, + @SerialId(20014) val reqAllow: Int = 0, + @SerialId(20015) val reqFaceId: Int = 0, + @SerialId(20020) val reqCity: Int = 0, + @SerialId(20027) val reqCommonPlace1: Int = 0, + @SerialId(20030) val reqMss3Bitmapextra: Int = 0, + @SerialId(20031) val reqBirthday: Int = 0, + @SerialId(20032) val reqCityId: Int = 0, + @SerialId(20033) val reqLang1: Int = 0, + @SerialId(20034) val reqLang2: Int = 0, + @SerialId(20035) val reqLang3: Int = 0, + @SerialId(20041) val reqCityZoneId: Int = 0, + @SerialId(20056) val reqOin: Int = 0, + @SerialId(20059) val reqBubbleId: Int = 0, + @SerialId(21001) val reqMss2Identity: Int = 0, + @SerialId(21002) val reqMss1Service: Int = 0, + @SerialId(21003) val reqLflag: Int = 0, + @SerialId(21004) val reqExtFlag: Int = 0, + @SerialId(21006) val reqBasicSvrFlag: Int = 0, + @SerialId(21007) val reqBasicCliFlag: Int = 0, + @SerialId(24101) val reqPengyouRealname: Int = 0, + @SerialId(24103) val reqPengyouGender: Int = 0, + @SerialId(24118) val reqPengyouFlag: Int = 0, + @SerialId(26004) val reqFullBirthday: Int = 0, + @SerialId(26005) val reqFullAge: Int = 0, + @SerialId(26010) val reqSimpleUpdateTime: Int = 0, + @SerialId(26011) val reqMssUpdateTime: Int = 0, + @SerialId(27022) val reqGroupMemCreditFlag: Int = 0, + @SerialId(27025) val reqFaceAddonId: Int = 0, + @SerialId(27026) val reqMusicGene: Int = 0, + @SerialId(40323) val reqFileShareBit: Int = 0, + @SerialId(40404) val reqRecommendPrivacyCtrlBit: Int = 0, + @SerialId(40505) val reqOldFriendChatBit: Int = 0, + @SerialId(40602) val reqBusinessBit: Int = 0, + @SerialId(41305) val reqCrmBit: Int = 0, + @SerialId(41810) val reqForbidFileshareBit: Int = 0, + @SerialId(42333) val userLoginGuardFace: Int = 0 ) : ProtoBuf } @@ -959,35 +959,35 @@ class Oidb0x5e1 : ProtoBuf { class Oidb0xc90 : ProtoBuf { @Serializable class ReqBody( - @ProtoId(1) val communityBid: List? = null, - @ProtoId(2) val page: Int = 0 + @SerialId(1) val communityBid: List? = null, + @SerialId(2) val page: Int = 0 ) : ProtoBuf @Serializable class CommunityWebInfo( - @ProtoId(1) val communityInfoItem: List? = null, - @ProtoId(2) val page: Int = 0, - @ProtoId(3) val end: Int = 0 + @SerialId(1) val communityInfoItem: List? = null, + @SerialId(2) val page: Int = 0, + @SerialId(3) val end: Int = 0 ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val communityInfoItem: List? = null, - @ProtoId(2) val jumpConcernCommunityUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val communityTitleWording: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val moreUrlWording: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val webCommunityInfo: CommunityWebInfo? = null, - @ProtoId(6) val jumpCommunityChannelUrl: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val communityInfoItem: List? = null, + @SerialId(2) val jumpConcernCommunityUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val communityTitleWording: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val moreUrlWording: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val webCommunityInfo: CommunityWebInfo? = null, + @SerialId(6) val jumpCommunityChannelUrl: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class CommunityConfigInfo( - @ProtoId(1) val jumpHomePageUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val name: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val picUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val dynamicCount: Int = 0, - @ProtoId(5) val communityBid: Long = 0L, - @ProtoId(6) val followStatus: Int = 0 + @SerialId(1) val jumpHomePageUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val name: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val picUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val dynamicCount: Int = 0, + @SerialId(5) val communityBid: Long = 0L, + @SerialId(6) val followStatus: Int = 0 ) : ProtoBuf } @@ -995,22 +995,22 @@ class Oidb0xc90 : ProtoBuf { class Cmd0xd8a : ProtoBuf { @Serializable class RspBody( - @ProtoId(1) val retcode: Int = 0, - @ProtoId(2) val res: String = "" + @SerialId(1) val retcode: Int = 0, + @SerialId(2) val res: String = "" ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val uin: Long = 0L, - @ProtoId(2) val cmd: Int = 0, - @ProtoId(3) val body: String = "", - @ProtoId(4) val clientInfo: ClientInfo? = null + @SerialId(1) val uin: Long = 0L, + @SerialId(2) val cmd: Int = 0, + @SerialId(3) val body: String = "", + @SerialId(4) val clientInfo: ClientInfo? = null ) : ProtoBuf @Serializable class ClientInfo( - @ProtoId(1) val implat: Int = 0, - @ProtoId(2) val ingClientver: String = "" + @SerialId(1) val implat: Int = 0, + @SerialId(2) val ingClientver: String = "" ) : ProtoBuf } @@ -1018,43 +1018,43 @@ class Cmd0xd8a : ProtoBuf { class Oidb0xb6f : ProtoBuf { @Serializable class ReportFreqRspBody( - @ProtoId(1) val identity: Identity? = null, - @ProtoId(4) val remainTimes: Long = 0L, - @ProtoId(5) val expireTime: Int = 0 + @SerialId(1) val identity: Identity? = null, + @SerialId(4) val remainTimes: Long = 0L, + @SerialId(5) val expireTime: Int = 0 ) : ProtoBuf @Serializable class Identity( - @ProtoId(1) val apiName: String = "", - @ProtoId(2) val appid: Int = 0, - @ProtoId(3) val apptype: Int = 0, - @ProtoId(4) val bizid: Int = 0, - @ProtoId(10) val intExt1: Long = 0L, - @ProtoId(20) val ext1: String = "" + @SerialId(1) val apiName: String = "", + @SerialId(2) val appid: Int = 0, + @SerialId(3) val apptype: Int = 0, + @SerialId(4) val bizid: Int = 0, + @SerialId(10) val intExt1: Long = 0L, + @SerialId(20) val ext1: String = "" ) : ProtoBuf @Serializable class ThresholdInfo( - @ProtoId(1) val thresholdPerMinute: Long = 0L, - @ProtoId(2) val thresholdPerDay: Long = 0L, - @ProtoId(3) val thresholdPerHour: Long = 0L, - @ProtoId(4) val thresholdPerWeek: Long = 0L + @SerialId(1) val thresholdPerMinute: Long = 0L, + @SerialId(2) val thresholdPerDay: Long = 0L, + @SerialId(3) val thresholdPerHour: Long = 0L, + @SerialId(4) val thresholdPerWeek: Long = 0L ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val reportFreqRsp: ReportFreqRspBody? = null + @SerialId(1) val reportFreqRsp: ReportFreqRspBody? = null ) : ProtoBuf @Serializable class ReportFreqReqBody( - @ProtoId(1) val identity: Identity? = null, - @ProtoId(2) val invokeTimes: Long = 1L + @SerialId(1) val identity: Identity? = null, + @SerialId(2) val invokeTimes: Long = 1L ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val reportFreqReq: ReportFreqReqBody? = null + @SerialId(1) val reportFreqReq: ReportFreqReqBody? = null ) : ProtoBuf } @@ -1062,17 +1062,17 @@ class Oidb0xb6f : ProtoBuf { class Cmd0x7dc : ProtoBuf { @Serializable class RspBody( - @ProtoId(1) val seq: Int = 0, - @ProtoId(2) val wording: String = "", - @ProtoId(3) val msgAppointInfo: List? = null + @SerialId(1) val seq: Int = 0, + @SerialId(2) val wording: String = "", + @SerialId(3) val msgAppointInfo: List? = null ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val seq: Int = 0, - @ProtoId(2) val msgAppointment: AppointDefine.AppointContent? = null, - @ProtoId(3) val msgLbsInfo: AppointDefine.LBSInfo? = null, - @ProtoId(4) val overwrite: Int = 0 + @SerialId(1) val seq: Int = 0, + @SerialId(2) val msgAppointment: AppointDefine.AppointContent? = null, + @SerialId(3) val msgLbsInfo: AppointDefine.LBSInfo? = null, + @SerialId(4) val overwrite: Int = 0 ) : ProtoBuf } @@ -1080,27 +1080,27 @@ class Cmd0x7dc : ProtoBuf { class Cmd0x7cd : ProtoBuf { @Serializable class AppointBrife( - @ProtoId(1) val msgPublisherInfo: AppointDefine.PublisherInfo? = null, - @ProtoId(2) val msgAppointsInfo: AppointDefine.AppointInfo? = null + @SerialId(1) val msgPublisherInfo: AppointDefine.PublisherInfo? = null, + @SerialId(2) val msgAppointsInfo: AppointDefine.AppointInfo? = null ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val stamp: Int = 0, - @ProtoId(2) val over: Int = 0, - @ProtoId(3) val next: Int = 0, - @ProtoId(4) val msgAppointsInfo: List? = null + @SerialId(1) val stamp: Int = 0, + @SerialId(2) val over: Int = 0, + @SerialId(3) val next: Int = 0, + @SerialId(4) val msgAppointsInfo: List? = null ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val stamp: Int = 0, - @ProtoId(2) val start: Int = 0, - @ProtoId(3) val want: Int = 0, - @ProtoId(4) val msgLbsInfo: AppointDefine.LBSInfo? = null, - @ProtoId(5) val msgAppointIds: List? = null, - @ProtoId(6) val appointOperation: Int = 0, - @ProtoId(100) val requestUin: Long = 0L + @SerialId(1) val stamp: Int = 0, + @SerialId(2) val start: Int = 0, + @SerialId(3) val want: Int = 0, + @SerialId(4) val msgLbsInfo: AppointDefine.LBSInfo? = null, + @SerialId(5) val msgAppointIds: List? = null, + @SerialId(6) val appointOperation: Int = 0, + @SerialId(100) val requestUin: Long = 0L ) : ProtoBuf } @@ -1108,29 +1108,29 @@ class Cmd0x7cd : ProtoBuf { class Oidb0xc0c : ProtoBuf { @Serializable class RspBody( - @ProtoId(1) val isTaskCompleted: Int = 0, - @ProtoId(2) val taskPoint: Int = 0, - @ProtoId(3) val guideWording: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val needShowProgress: Int = 0, - @ProtoId(5) val originalProgress: Int = 0, - @ProtoId(6) val nowProgress: Int = 0, - @ProtoId(7) val totalProgress: Int = 0, - @ProtoId(8) val needExecTask: Int = 0 + @SerialId(1) val isTaskCompleted: Int = 0, + @SerialId(2) val taskPoint: Int = 0, + @SerialId(3) val guideWording: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val needShowProgress: Int = 0, + @SerialId(5) val originalProgress: Int = 0, + @SerialId(6) val nowProgress: Int = 0, + @SerialId(7) val totalProgress: Int = 0, + @SerialId(8) val needExecTask: Int = 0 ) : ProtoBuf @Serializable class VideoSrcType( - @ProtoId(1) val sourceType: Int = 0, - @ProtoId(2) val videoFromType: Int = 0 + @SerialId(1) val sourceType: Int = 0, + @SerialId(2) val videoFromType: Int = 0 ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val uin: Long = 0L, - @ProtoId(2) val taskType: Int = 0, - @ProtoId(3) val rowkey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val feedsId: Long = 0L, - @ProtoId(5) val msgVideoFromType: VideoSrcType? = null + @SerialId(1) val uin: Long = 0L, + @SerialId(2) val taskType: Int = 0, + @SerialId(3) val rowkey: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val feedsId: Long = 0L, + @SerialId(5) val msgVideoFromType: VideoSrcType? = null ) : ProtoBuf } @@ -1138,54 +1138,54 @@ class Oidb0xc0c : ProtoBuf { class Cmd0x5fb : ProtoBuf { @Serializable class ReqInfo( - @ProtoId(3) val time: Int = 0, - @ProtoId(4) val subject: Int = 0, - @ProtoId(5) val gender: Int = 0, - @ProtoId(6) val ageLow: Int = 0, - @ProtoId(7) val ageUp: Int = 0, - @ProtoId(8) val profession: Int = 0, - @ProtoId(9) val cookie: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(10) val msgDestination: AppointDefine.LocaleInfo? = null + @SerialId(3) val time: Int = 0, + @SerialId(4) val subject: Int = 0, + @SerialId(5) val gender: Int = 0, + @SerialId(6) val ageLow: Int = 0, + @SerialId(7) val ageUp: Int = 0, + @SerialId(8) val profession: Int = 0, + @SerialId(9) val cookie: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(10) val msgDestination: AppointDefine.LocaleInfo? = null ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val msgHead: BusiReqHead? = null, - @ProtoId(2) val msgLbsInfo: AppointDefine.LBSInfo? = null, - @ProtoId(3) val reqInfo: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val msgHead: BusiReqHead? = null, + @SerialId(2) val msgLbsInfo: AppointDefine.LBSInfo? = null, + @SerialId(3) val reqInfo: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class BusiRespHead( - @ProtoId(1) val int32Version: Int = 1, - @ProtoId(2) val int32Seq: Int = 0, - @ProtoId(3) val int32ReplyCode: Int = 0, - @ProtoId(4) val result: String = "" + @SerialId(1) val int32Version: Int = 1, + @SerialId(2) val int32Seq: Int = 0, + @SerialId(3) val int32ReplyCode: Int = 0, + @SerialId(4) val result: String = "" ) : ProtoBuf @Serializable class UserProfile( - @ProtoId(1) val int64Id: Long = 0L, - @ProtoId(2) val int32IdType: Int = 0, - @ProtoId(3) val url: String = "", - @ProtoId(4) val int32PicType: Int = 0, - @ProtoId(5) val int32SubPicType: Int = 0, - @ProtoId(6) val title: String = "", - @ProtoId(7) val content: String = "", - @ProtoId(8) val content2: String = "", - @ProtoId(9) val picUrl: String = "" + @SerialId(1) val int64Id: Long = 0L, + @SerialId(2) val int32IdType: Int = 0, + @SerialId(3) val url: String = "", + @SerialId(4) val int32PicType: Int = 0, + @SerialId(5) val int32SubPicType: Int = 0, + @SerialId(6) val title: String = "", + @SerialId(7) val content: String = "", + @SerialId(8) val content2: String = "", + @SerialId(9) val picUrl: String = "" ) : ProtoBuf @Serializable class BusiReqHead( - @ProtoId(1) val int32Version: Int = 1, - @ProtoId(2) val int32Seq: Int = 0 + @SerialId(1) val int32Version: Int = 1, + @SerialId(2) val int32Seq: Int = 0 ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val msgHead: BusiRespHead? = null, - @ProtoId(2) val msgUserList: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val msgHead: BusiRespHead? = null, + @SerialId(2) val msgUserList: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf } @@ -1193,44 +1193,44 @@ class Cmd0x5fb : ProtoBuf { class Oidb0xb61 : ProtoBuf { @Serializable class GetAppinfoReq( - @ProtoId(1) val appid: Int = 0, - @ProtoId(2) val appType: Int = 0, - @ProtoId(3) val platform: Int = 0 + @SerialId(1) val appid: Int = 0, + @SerialId(2) val appType: Int = 0, + @SerialId(3) val platform: Int = 0 ) : ProtoBuf @Serializable class GetPkgUrlReq( - @ProtoId(1) val appid: Int = 0, - @ProtoId(2) val appType: Int = 0, - @ProtoId(3) val appVersion: Int = 0, - @ProtoId(4) val platform: Int = 0, - @ProtoId(5) val sysVersion: String = "", - @ProtoId(6) val qqVersion: String = "" + @SerialId(1) val appid: Int = 0, + @SerialId(2) val appType: Int = 0, + @SerialId(3) val appVersion: Int = 0, + @SerialId(4) val platform: Int = 0, + @SerialId(5) val sysVersion: String = "", + @SerialId(6) val qqVersion: String = "" ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val wording: String = "", - @ProtoId(2) val nextReqDuration: Int = 0, - @ProtoId(10) val getAppinfoRsp: GetAppinfoRsp? = null, - @ProtoId(11) val getMqqappUrlRsp: GetPkgUrlRsp? = null + @SerialId(1) val wording: String = "", + @SerialId(2) val nextReqDuration: Int = 0, + @SerialId(10) val getAppinfoRsp: GetAppinfoRsp? = null, + @SerialId(11) val getMqqappUrlRsp: GetPkgUrlRsp? = null ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(10) val getAppinfoReq: GetAppinfoReq? = null, - @ProtoId(11) val getMqqappUrlReq: GetPkgUrlReq? = null + @SerialId(10) val getAppinfoReq: GetAppinfoReq? = null, + @SerialId(11) val getMqqappUrlReq: GetPkgUrlReq? = null ) : ProtoBuf @Serializable class GetAppinfoRsp( - @ProtoId(1) val appinfo: Qqconnect.Appinfo? = null + @SerialId(1) val appinfo: Qqconnect.Appinfo? = null ) : ProtoBuf @Serializable class GetPkgUrlRsp( - @ProtoId(1) val appVersion: Int = 0, - @ProtoId(2) val pkgUrl: String = "" + @SerialId(1) val appVersion: Int = 0, + @SerialId(2) val pkgUrl: String = "" ) : ProtoBuf } @@ -1238,52 +1238,52 @@ class Oidb0xb61 : ProtoBuf { class Oidb0xb60 : ProtoBuf { @Serializable class GetPrivilegeReq( - @ProtoId(1) val appid: Int = 0, - @ProtoId(2) val appType: Int = 3 + @SerialId(1) val appid: Int = 0, + @SerialId(2) val appType: Int = 3 ) : ProtoBuf @Serializable class CheckUrlReq( - @ProtoId(1) val appid: Int = 0, - @ProtoId(2) val appType: Int = 0, - @ProtoId(3) val url: String = "" + @SerialId(1) val appid: Int = 0, + @SerialId(2) val appType: Int = 0, + @SerialId(3) val url: String = "" ) : ProtoBuf @Serializable class ClientInfo( - @ProtoId(1) val platform: Int = 0, - @ProtoId(2) val sdkVersion: String = "", - @ProtoId(3) val androidPackageName: String = "", - @ProtoId(4) val androidSignature: String = "", - @ProtoId(5) val iosBundleId: String = "", - @ProtoId(6) val pcSign: String = "" + @SerialId(1) val platform: Int = 0, + @SerialId(2) val sdkVersion: String = "", + @SerialId(3) val androidPackageName: String = "", + @SerialId(4) val androidSignature: String = "", + @SerialId(5) val iosBundleId: String = "", + @SerialId(6) val pcSign: String = "" ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val wording: String = "", - @ProtoId(10) val getPrivilegeRsp: GetPrivilegeRsp? = null, - @ProtoId(11) val checkUrlRsp: CheckUrlRsp? = null + @SerialId(1) val wording: String = "", + @SerialId(10) val getPrivilegeRsp: GetPrivilegeRsp? = null, + @SerialId(11) val checkUrlRsp: CheckUrlRsp? = null ) : ProtoBuf @Serializable class CheckUrlRsp( - @ProtoId(1) val isAuthed: Boolean = false, - @ProtoId(2) val nextReqDuration: Int = 0 + @SerialId(1) val isAuthed: Boolean = false, + @SerialId(2) val nextReqDuration: Int = 0 ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val clientInfo: ClientInfo? = null, - @ProtoId(10) val getPrivilegeReq: GetPrivilegeReq? = null, - @ProtoId(11) val checkUrlReq: CheckUrlReq? = null + @SerialId(1) val clientInfo: ClientInfo? = null, + @SerialId(10) val getPrivilegeReq: GetPrivilegeReq? = null, + @SerialId(11) val checkUrlReq: CheckUrlReq? = null ) : ProtoBuf @Serializable class GetPrivilegeRsp( - @ProtoId(1) val apiGroups: List? = null, - @ProtoId(2) val nextReqDuration: Int = 0, - @ProtoId(3) val apiNames: List = listOf() + @SerialId(1) val apiGroups: List? = null, + @SerialId(2) val nextReqDuration: Int = 0, + @SerialId(3) val apiNames: List = listOf() ) : ProtoBuf } @@ -1291,26 +1291,26 @@ class Oidb0xb60 : ProtoBuf { class Cmd0x5fc : ProtoBuf { @Serializable class ReqBody( - @ProtoId(1) val lastEventId: Long = 0L, - @ProtoId(2) val readEventId: Long = 0L, - @ProtoId(3) val fetchCount: Int = 0, - @ProtoId(4) val lastNearbyEventId: Long = 0L, - @ProtoId(5) val readNearbyEventId: Long = 0L, - @ProtoId(6) val fetchNearbyEventCount: Int = 0, - @ProtoId(7) val lastFeedEventId: Long = 0L, - @ProtoId(8) val readFeedEventId: Long = 0L, - @ProtoId(9) val fetchFeedEventCount: Int = 0 + @SerialId(1) val lastEventId: Long = 0L, + @SerialId(2) val readEventId: Long = 0L, + @SerialId(3) val fetchCount: Int = 0, + @SerialId(4) val lastNearbyEventId: Long = 0L, + @SerialId(5) val readNearbyEventId: Long = 0L, + @SerialId(6) val fetchNearbyEventCount: Int = 0, + @SerialId(7) val lastFeedEventId: Long = 0L, + @SerialId(8) val readFeedEventId: Long = 0L, + @SerialId(9) val fetchFeedEventCount: Int = 0 ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val msgEventList: List? = null, - @ProtoId(2) val actAppointIds: List? = null, - @ProtoId(3) val maxEventId: Long = 0L, - @ProtoId(4) val errorTips: String = "", - @ProtoId(5) val msgNearbyEventList: List? = null, - @ProtoId(6) val msgFeedEventList: List? = null, - @ProtoId(7) val maxFreshEventId: Long = 0L + @SerialId(1) val msgEventList: List? = null, + @SerialId(2) val actAppointIds: List? = null, + @SerialId(3) val maxEventId: Long = 0L, + @SerialId(4) val errorTips: String = "", + @SerialId(5) val msgNearbyEventList: List? = null, + @SerialId(6) val msgFeedEventList: List? = null, + @SerialId(7) val maxFreshEventId: Long = 0L ) : ProtoBuf } @@ -1318,9 +1318,9 @@ class Cmd0x5fc : ProtoBuf { class Oidb0xc33 : ProtoBuf { @Serializable class RspBody( - @ProtoId(1) val result: Int = 0, - @ProtoId(2) val nextGap: Int = 0, - @ProtoId(3) val newUser: Int = 0 + @SerialId(1) val result: Int = 0, + @SerialId(2) val nextGap: Int = 0, + @SerialId(3) val newUser: Int = 0 ) : ProtoBuf @Serializable @@ -1331,38 +1331,38 @@ class Oidb0xc33 : ProtoBuf { class Oidb0xc0b : ProtoBuf { @Serializable class RspBody( - @ProtoId(1) val isOpenCoinEntry: Int = 0, - @ProtoId(2) val canGetCoinCount: Int = 0, - @ProtoId(3) val coinIconUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val lastCompletedTaskStamp: Long = 0L, - @ProtoId(6) val cmsWording: List? = null, - @ProtoId(7) val lastCmsActivityStamp: Long = 0L, - @ProtoId(8) val msgKandianCoinRemind: KanDianCoinRemind? = null, - @ProtoId(9) val msgKandianTaskRemind: KanDianTaskRemind? = null + @SerialId(1) val isOpenCoinEntry: Int = 0, + @SerialId(2) val canGetCoinCount: Int = 0, + @SerialId(3) val coinIconUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val lastCompletedTaskStamp: Long = 0L, + @SerialId(6) val cmsWording: List? = null, + @SerialId(7) val lastCmsActivityStamp: Long = 0L, + @SerialId(8) val msgKandianCoinRemind: KanDianCoinRemind? = null, + @SerialId(9) val msgKandianTaskRemind: KanDianTaskRemind? = null ) : ProtoBuf @Serializable class KanDianCoinRemind( - @ProtoId(1) val wording: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val wording: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class KanDianTaskRemind( - @ProtoId(1) val wording: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val jumpUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val taskType: Int = 0 + @SerialId(1) val wording: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val jumpUrl: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val taskType: Int = 0 ) : ProtoBuf @Serializable class KanDianCMSActivityInfo( - @ProtoId(1) val activityId: Long = 0L, - @ProtoId(2) val wording: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) val pictureUrl: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val activityId: Long = 0L, + @SerialId(2) val wording: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(3) val pictureUrl: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val uin: Long = 0L + @SerialId(1) val uin: Long = 0L ) : ProtoBuf } @@ -1370,26 +1370,26 @@ class Oidb0xc0b : ProtoBuf { class Cmd0xc85 : ProtoBuf { @Serializable class ReqBody( - @ProtoId(101) val fromUin: Long = 0L, - @ProtoId(102) val toUin: Long = 0L, - @ProtoId(103) val op: Int = 0, - @ProtoId(104) val intervalDays: Int = 0 + @SerialId(101) val fromUin: Long = 0L, + @SerialId(102) val toUin: Long = 0L, + @SerialId(103) val op: Int = 0, + @SerialId(104) val intervalDays: Int = 0 ) : ProtoBuf @Serializable class InteractionDetailInfo( - @ProtoId(101) val continuousRecordDays: Int = 0, - @ProtoId(102) val sendDayTime: Int = 0, - @ProtoId(103) val recvDayTime: Int = 0, - @ProtoId(104) val sendRecord: String = "", - @ProtoId(105) val recvRecord: String = "" + @SerialId(101) val continuousRecordDays: Int = 0, + @SerialId(102) val sendDayTime: Int = 0, + @SerialId(103) val recvDayTime: Int = 0, + @SerialId(104) val sendRecord: String = "", + @SerialId(105) val recvRecord: String = "" ) : ProtoBuf @Serializable class RspBody( - @ProtoId(101) val result: Int = 0, - @ProtoId(102) val recentInteractionTime: Int = 0, - @ProtoId(103) val interactionDetailInfo: InteractionDetailInfo? = null + @SerialId(101) val result: Int = 0, + @SerialId(102) val recentInteractionTime: Int = 0, + @SerialId(103) val interactionDetailInfo: InteractionDetailInfo? = null ) : ProtoBuf } @@ -1397,46 +1397,46 @@ class Cmd0xc85 : ProtoBuf { class Cmd0x7ce : ProtoBuf { @Serializable class AppintDetail( - @ProtoId(1) val msgPublisherInfo: AppointDefine.PublisherInfo? = null, - @ProtoId(2) val msgAppointsInfo: AppointDefine.AppointInfo? = null, - @ProtoId(3) val score: Int = 0, - @ProtoId(4) val joinOver: Int = 0, - @ProtoId(5) val joinNext: Int = 0, - @ProtoId(6) val msgStrangerInfo: List? = null, - @ProtoId(7) val viewOver: Int = 0, - @ProtoId(8) val viewNext: Int = 0, - @ProtoId(9) val msgVistorInfo: List? = null, - @ProtoId(10) val meJoin: Int = 0, - @ProtoId(12) val canProfile: Int = 0, - @ProtoId(13) val profileErrmsg: String = "", - @ProtoId(14) val canAio: Int = 0, - @ProtoId(15) val aioErrmsg: String = "", - @ProtoId(16) val sigC2C: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(17) val uin: Long = 0L, - @ProtoId(18) val limited: Int = 0, - @ProtoId(19) val msgCommentList: List? = null, - @ProtoId(20) val commentOver: Int = 0, - @ProtoId(23) val meInvited: Int = 0 + @SerialId(1) val msgPublisherInfo: AppointDefine.PublisherInfo? = null, + @SerialId(2) val msgAppointsInfo: AppointDefine.AppointInfo? = null, + @SerialId(3) val score: Int = 0, + @SerialId(4) val joinOver: Int = 0, + @SerialId(5) val joinNext: Int = 0, + @SerialId(6) val msgStrangerInfo: List? = null, + @SerialId(7) val viewOver: Int = 0, + @SerialId(8) val viewNext: Int = 0, + @SerialId(9) val msgVistorInfo: List? = null, + @SerialId(10) val meJoin: Int = 0, + @SerialId(12) val canProfile: Int = 0, + @SerialId(13) val profileErrmsg: String = "", + @SerialId(14) val canAio: Int = 0, + @SerialId(15) val aioErrmsg: String = "", + @SerialId(16) val sigC2C: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(17) val uin: Long = 0L, + @SerialId(18) val limited: Int = 0, + @SerialId(19) val msgCommentList: List? = null, + @SerialId(20) val commentOver: Int = 0, + @SerialId(23) val meInvited: Int = 0 ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val msgAppointsInfo: List? = null, - @ProtoId(2) val secureFlag: Int = 0, - @ProtoId(3) val secureTips: String = "" + @SerialId(1) val msgAppointsInfo: List? = null, + @SerialId(2) val secureFlag: Int = 0, + @SerialId(3) val secureTips: String = "" ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val appointIds: List? = null, - @ProtoId(2) val joinStart: Int = 0, - @ProtoId(3) val joinWant: Int = 0, - @ProtoId(4) val viewStart: Int = 0, - @ProtoId(5) val viewWant: Int = 0, - @ProtoId(6) val msgLbsInfo: AppointDefine.LBSInfo? = null, - @ProtoId(7) val uint64Uins: List? = null, - @ProtoId(8) val viewCommentCount: Int = 0, - @ProtoId(100) val requestUin: Long = 0L + @SerialId(1) val appointIds: List? = null, + @SerialId(2) val joinStart: Int = 0, + @SerialId(3) val joinWant: Int = 0, + @SerialId(4) val viewStart: Int = 0, + @SerialId(5) val viewWant: Int = 0, + @SerialId(6) val msgLbsInfo: AppointDefine.LBSInfo? = null, + @SerialId(7) val uint64Uins: List? = null, + @SerialId(8) val viewCommentCount: Int = 0, + @SerialId(100) val requestUin: Long = 0L ) : ProtoBuf } @@ -1444,18 +1444,18 @@ class Cmd0x7ce : ProtoBuf { class Cmd0x7db : ProtoBuf { @Serializable class RspBody( - @ProtoId(1) val wording: String = "", - @ProtoId(2) val msgAppointInfo: AppointDefine.AppointInfo? = null, - @ProtoId(3) val sigC2C: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val appointAction: Int = 0 + @SerialId(1) val wording: String = "", + @SerialId(2) val msgAppointInfo: AppointDefine.AppointInfo? = null, + @SerialId(3) val sigC2C: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val appointAction: Int = 0 ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(1) val msgAppointId: AppointDefine.AppointID? = null, - @ProtoId(2) val appointAction: Int = 0, - @ProtoId(3) val overwrite: Int = 0, - @ProtoId(4) val msgAppointIds: List? = null + @SerialId(1) val msgAppointId: AppointDefine.AppointID? = null, + @SerialId(2) val appointAction: Int = 0, + @SerialId(3) val overwrite: Int = 0, + @SerialId(4) val msgAppointIds: List? = null ) : ProtoBuf } @@ -1463,14 +1463,14 @@ class Cmd0x7db : ProtoBuf { class Oidb0xc6c : ProtoBuf { @Serializable class ReqBody( - @ProtoId(1) val uin: Long = 0L, - @ProtoId(2) val msgGroupInfo: List? = null + @SerialId(1) val uin: Long = 0L, + @SerialId(2) val msgGroupInfo: List? = null ) : ProtoBuf @Serializable class GroupInfo( - @ProtoId(1) val groupUin: Long = 0L, - @ProtoId(2) val groupCode: Long = 0L + @SerialId(1) val groupUin: Long = 0L, + @SerialId(2) val groupCode: Long = 0L ) : ProtoBuf @Serializable @@ -1481,40 +1481,40 @@ class Oidb0xc6c : ProtoBuf { class Oidb0xc05 : ProtoBuf { @Serializable class GetAuthAppListReq( - @ProtoId(1) val start: Int = 0, - @ProtoId(2) val limit: Int = 0 + @SerialId(1) val start: Int = 0, + @SerialId(2) val limit: Int = 0 ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val wording: String = "", - @ProtoId(10) val getCreateAppListRsp: GetCreateAppListRsp? = null, - @ProtoId(11) val getAuthAppListRsp: GetAuthAppListRsp? = null + @SerialId(1) val wording: String = "", + @SerialId(10) val getCreateAppListRsp: GetCreateAppListRsp? = null, + @SerialId(11) val getAuthAppListRsp: GetAuthAppListRsp? = null ) : ProtoBuf @Serializable class GetCreateAppListRsp( - @ProtoId(1) val totalCount: Int = 0, - @ProtoId(2) val appinfos: List? = null + @SerialId(1) val totalCount: Int = 0, + @SerialId(2) val appinfos: List? = null ) : ProtoBuf @Serializable class GetAuthAppListRsp( - @ProtoId(1) val totalCount: Int = 0, - @ProtoId(2) val appinfos: List? = null, - @ProtoId(3) val curIndex: Int = 0 + @SerialId(1) val totalCount: Int = 0, + @SerialId(2) val appinfos: List? = null, + @SerialId(3) val curIndex: Int = 0 ) : ProtoBuf @Serializable class ReqBody( - @ProtoId(10) val getCreateAppListReq: GetCreateAppListReq? = null, - @ProtoId(11) val getAuthAppListReq: GetAuthAppListReq? = null + @SerialId(10) val getCreateAppListReq: GetCreateAppListReq? = null, + @SerialId(11) val getAuthAppListReq: GetAuthAppListReq? = null ) : ProtoBuf @Serializable class GetCreateAppListReq( - @ProtoId(1) val start: Int = 0, - @ProtoId(2) val limit: Int = 0 + @SerialId(1) val start: Int = 0, + @SerialId(2) val limit: Int = 0 ) : ProtoBuf } @@ -1522,17 +1522,17 @@ class Oidb0xc05 : ProtoBuf { class Cmd0x7da : ProtoBuf { @Serializable class ReqBody( - @ProtoId(1) val msgAppointIds: List? = null, - @ProtoId(2) val appointOperation: Int = 0, - @ProtoId(3) val operationReason: Int = 0, - @ProtoId(4) val overwrite: Int = 0 + @SerialId(1) val msgAppointIds: List? = null, + @SerialId(2) val appointOperation: Int = 0, + @SerialId(3) val operationReason: Int = 0, + @SerialId(4) val overwrite: Int = 0 ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val wording: String = "", - @ProtoId(2) val msgAppointInfo: List? = null, - @ProtoId(3) val operationReason: Int = 0 + @SerialId(1) val wording: String = "", + @SerialId(2) val msgAppointInfo: List? = null, + @SerialId(3) val operationReason: Int = 0 ) : ProtoBuf } @@ -1540,118 +1540,118 @@ class Cmd0x7da : ProtoBuf { class Qqconnect : ProtoBuf { @Serializable class MobileAppInfo( - @ProtoId(11) val androidAppInfo: List? = null, - @ProtoId(12) val iosAppInfo: List? = null + @SerialId(11) val androidAppInfo: List? = null, + @SerialId(12) val iosAppInfo: List? = null ) : ProtoBuf @Serializable class TemplateMsgConfig( - @ProtoId(1) val serviceMsgUin: Long = 0L, - @ProtoId(2) val publicMsgUin: Long = 0L, - @ProtoId(3) val campMsgUin: Long = 0L + @SerialId(1) val serviceMsgUin: Long = 0L, + @SerialId(2) val publicMsgUin: Long = 0L, + @SerialId(3) val campMsgUin: Long = 0L ) : ProtoBuf @Serializable class Appinfo( - @ProtoId(1) val appid: Int = 0, - @ProtoId(2) val appType: Int = 0, - @ProtoId(3) val platform: Int = 0, - @ProtoId(4) val appName: String = "", - @ProtoId(5) val appKey: String = "", - @ProtoId(6) val appState: Int = 0, - @ProtoId(7) val iphoneUrlScheme: String = "", - @ProtoId(8) val androidPackName: String = "", - @ProtoId(9) val iconUrl: String = "", - @ProtoId(10) val sourceUrl: String = "", - @ProtoId(11) val iconSmallUrl: String = "", - @ProtoId(12) val iconMiddleUrl: String = "", - @ProtoId(13) val tencentDocsAppinfo: TencentDocsAppinfo? = null, - @ProtoId(21) val developerUin: Long = 0L, - @ProtoId(22) val appClass: Int = 0, - @ProtoId(23) val appSubclass: Int = 0, - @ProtoId(24) val remark: String = "", - @ProtoId(25) val iconMiniUrl: String = "", - @ProtoId(26) val authTime: Long = 0L, - @ProtoId(27) val appUrl: String = "", - @ProtoId(28) val universalLink: String = "", - @ProtoId(29) val qqconnectFeature: Int = 0, - @ProtoId(30) val isHatchery: Int = 0, - @ProtoId(31) val testUinList: List? = null, - @ProtoId(100) val templateMsgConfig: TemplateMsgConfig? = null, - @ProtoId(101) val miniAppInfo: MiniAppInfo? = null, - @ProtoId(102) val webAppInfo: WebAppInfo? = null, - @ProtoId(103) val mobileAppInfo: MobileAppInfo? = null + @SerialId(1) val appid: Int = 0, + @SerialId(2) val appType: Int = 0, + @SerialId(3) val platform: Int = 0, + @SerialId(4) val appName: String = "", + @SerialId(5) val appKey: String = "", + @SerialId(6) val appState: Int = 0, + @SerialId(7) val iphoneUrlScheme: String = "", + @SerialId(8) val androidPackName: String = "", + @SerialId(9) val iconUrl: String = "", + @SerialId(10) val sourceUrl: String = "", + @SerialId(11) val iconSmallUrl: String = "", + @SerialId(12) val iconMiddleUrl: String = "", + @SerialId(13) val tencentDocsAppinfo: TencentDocsAppinfo? = null, + @SerialId(21) val developerUin: Long = 0L, + @SerialId(22) val appClass: Int = 0, + @SerialId(23) val appSubclass: Int = 0, + @SerialId(24) val remark: String = "", + @SerialId(25) val iconMiniUrl: String = "", + @SerialId(26) val authTime: Long = 0L, + @SerialId(27) val appUrl: String = "", + @SerialId(28) val universalLink: String = "", + @SerialId(29) val qqconnectFeature: Int = 0, + @SerialId(30) val isHatchery: Int = 0, + @SerialId(31) val testUinList: List? = null, + @SerialId(100) val templateMsgConfig: TemplateMsgConfig? = null, + @SerialId(101) val miniAppInfo: MiniAppInfo? = null, + @SerialId(102) val webAppInfo: WebAppInfo? = null, + @SerialId(103) val mobileAppInfo: MobileAppInfo? = null ) : ProtoBuf @Serializable class ConnectClientInfo( - @ProtoId(1) val platform: Int = 0, - @ProtoId(2) val sdkVersion: String = "", - @ProtoId(3) val systemName: String = "", - @ProtoId(4) val systemVersion: String = "", - @ProtoId(21) val androidPackageName: String = "", - @ProtoId(22) val androidSignature: String = "", - @ProtoId(31) val iosBundleId: String = "", - @ProtoId(32) val iosDeviceId: String = "", - @ProtoId(33) val iosAppToken: String = "", - @ProtoId(41) val pcSign: String = "" + @SerialId(1) val platform: Int = 0, + @SerialId(2) val sdkVersion: String = "", + @SerialId(3) val systemName: String = "", + @SerialId(4) val systemVersion: String = "", + @SerialId(21) val androidPackageName: String = "", + @SerialId(22) val androidSignature: String = "", + @SerialId(31) val iosBundleId: String = "", + @SerialId(32) val iosDeviceId: String = "", + @SerialId(33) val iosAppToken: String = "", + @SerialId(41) val pcSign: String = "" ) : ProtoBuf @Serializable class TencentDocsAppinfo( - @ProtoId(1) val openTypes: String = "", - @ProtoId(2) val opts: String = "", - @ProtoId(3) val ejs: String = "", - @ProtoId(4) val callbackUrlTest: String = "", - @ProtoId(5) val callbackUrl: String = "", - @ProtoId(6) val domain: String = "", - @ProtoId(7) val userinfoCallback: String = "", - @ProtoId(8) val userinfoCallbackTest: String = "" + @SerialId(1) val openTypes: String = "", + @SerialId(2) val opts: String = "", + @SerialId(3) val ejs: String = "", + @SerialId(4) val callbackUrlTest: String = "", + @SerialId(5) val callbackUrl: String = "", + @SerialId(6) val domain: String = "", + @SerialId(7) val userinfoCallback: String = "", + @SerialId(8) val userinfoCallbackTest: String = "" ) : ProtoBuf @Serializable class WebAppInfo( - @ProtoId(1) val websiteUrl: String = "", - @ProtoId(2) val provider: String = "", - @ProtoId(3) val icp: String = "", - @ProtoId(4) val callbackUrl: String = "" + @SerialId(1) val websiteUrl: String = "", + @SerialId(2) val provider: String = "", + @SerialId(3) val icp: String = "", + @SerialId(4) val callbackUrl: String = "" ) : ProtoBuf @Serializable class IOSAppInfo( - @ProtoId(1) val bundleId: String = "", - @ProtoId(2) val urlScheme: String = "", - @ProtoId(3) val storeId: String = "" + @SerialId(1) val bundleId: String = "", + @SerialId(2) val urlScheme: String = "", + @SerialId(3) val storeId: String = "" ) : ProtoBuf @Serializable class MsgUinInfo( - @ProtoId(1) val uin: Long = 0L, - @ProtoId(2) val msgType: Int = 0, - @ProtoId(3) val appid: Int = 0, - @ProtoId(4) val appType: Int = 0, - @ProtoId(5) val ctime: Int = 0, - @ProtoId(6) val mtime: Int = 0, - @ProtoId(7) val mpType: Int = 0, - @ProtoId(100) val nick: String = "", - @ProtoId(101) val faceUrl: String = "" + @SerialId(1) val uin: Long = 0L, + @SerialId(2) val msgType: Int = 0, + @SerialId(3) val appid: Int = 0, + @SerialId(4) val appType: Int = 0, + @SerialId(5) val ctime: Int = 0, + @SerialId(6) val mtime: Int = 0, + @SerialId(7) val mpType: Int = 0, + @SerialId(100) val nick: String = "", + @SerialId(101) val faceUrl: String = "" ) : ProtoBuf @Serializable class MiniAppInfo( - @ProtoId(1) val superUin: Long = 0L, - @ProtoId(11) val ownerType: Int = 0, - @ProtoId(12) val ownerName: String = "", - @ProtoId(13) val ownerIdCardType: Int = 0, - @ProtoId(14) val ownerIdCard: String = "", - @ProtoId(15) val ownerStatus: Int = 0 + @SerialId(1) val superUin: Long = 0L, + @SerialId(11) val ownerType: Int = 0, + @SerialId(12) val ownerName: String = "", + @SerialId(13) val ownerIdCardType: Int = 0, + @SerialId(14) val ownerIdCard: String = "", + @SerialId(15) val ownerStatus: Int = 0 ) : ProtoBuf @Serializable class AndroidAppInfo( - @ProtoId(1) val packName: String = "", - @ProtoId(2) val packSign: String = "", - @ProtoId(3) val apkDownUrl: String = "" + @SerialId(1) val packName: String = "", + @SerialId(2) val packSign: String = "", + @SerialId(3) val apkDownUrl: String = "" ) : ProtoBuf } @@ -1659,14 +1659,14 @@ class Qqconnect : ProtoBuf { class Sync : ProtoBuf { @Serializable class SyncAppointmentReq( - @ProtoId(1) val uin: Long = 0L, - @ProtoId(2) val msgAppointment: AppointDefine.AppointContent? = null, - @ProtoId(3) val msgGpsInfo: AppointDefine.GPS? = null + @SerialId(1) val uin: Long = 0L, + @SerialId(2) val msgAppointment: AppointDefine.AppointContent? = null, + @SerialId(3) val msgGpsInfo: AppointDefine.GPS? = null ) : ProtoBuf @Serializable class SyncAppointmentRsp( - @ProtoId(1) val result: Int = 0 + @SerialId(1) val result: Int = 0 ) : ProtoBuf } @@ -1674,137 +1674,137 @@ class Sync : ProtoBuf { class Oidb0xc26 : ProtoBuf { @Serializable class RgoupLabel( - @ProtoId(1) val name: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val enumType: Int /* enum */ = 1, - @ProtoId(3) val textColor: RgroupColor? = null, - @ProtoId(4) val edgingColor: RgroupColor? = null, - @ProtoId(5) val labelAttr: Int = 0, - @ProtoId(6) val labelType: Int = 0 + @SerialId(1) val name: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val enumType: Int /* enum */ = 1, + @SerialId(3) val textColor: RgroupColor? = null, + @SerialId(4) val edgingColor: RgroupColor? = null, + @SerialId(5) val labelAttr: Int = 0, + @SerialId(6) val labelType: Int = 0 ) : ProtoBuf @Serializable class AddFriendSource( - @ProtoId(1) val source: Int = 0, - @ProtoId(2) val subSource: Int = 0 + @SerialId(1) val source: Int = 0, + @SerialId(2) val subSource: Int = 0 ) : ProtoBuf @Serializable class Label( - @ProtoId(1) val name: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) val textColor: Color? = null, - @ProtoId(3) val edgingColor: Color? = null, - @ProtoId(4) val labelType: Int = 0 + @SerialId(1) val name: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(2) val textColor: Color? = null, + @SerialId(3) val edgingColor: Color? = null, + @SerialId(4) val labelType: Int = 0 ) : ProtoBuf @Serializable class EntryDelay( - @ProtoId(1) val emEntry: Int /* enum */ = 1, - @ProtoId(2) val delay: Int = 0 + @SerialId(1) val emEntry: Int /* enum */ = 1, + @SerialId(2) val delay: Int = 0 ) : ProtoBuf @Serializable class RspBody( - @ProtoId(1) val msgPersons: List? = null, - @ProtoId(2) val entryInuse: List = listOf(), - @ProtoId(3) val entryClose: List = listOf(), - @ProtoId(4) val nextGap: Int = 0, - @ProtoId(5) val timestamp: Int = 0, - @ProtoId(6) val msgUp: Int = 0, - @ProtoId(7) val entryDelays: List? = null, - @ProtoId(8) val listSwitch: Int = 0, - @ProtoId(9) val addPageListSwitch: Int = 0, - @ProtoId(10) val emRspDataType: Int /* enum */ = 1, - @ProtoId(11) val msgRgroupItems: List? = null, - @ProtoId(12) val boolIsNewuser: Boolean = false, - @ProtoId(13) val msgTables: List? = null, - @ProtoId(14) val cookies: ByteArray = EMPTY_BYTE_ARRAY + @SerialId(1) val msgPersons: List? = null, + @SerialId(2) val entryInuse: List = listOf(), + @SerialId(3) val entryClose: List = listOf(), + @SerialId(4) val nextGap: Int = 0, + @SerialId(5) val timestamp: Int = 0, + @SerialId(6) val msgUp: Int = 0, + @SerialId(7) val entryDelays: List? = null, + @SerialId(8) val listSwitch: Int = 0, + @SerialId(9) val addPageListSwitch: Int = 0, + @SerialId(10) val emRspDataType: Int /* enum */ = 1, + @SerialId(11) val msgRgroupItems: List? = null, + @SerialId(12) val boolIsNewuser: Boolean = false, + @SerialId(13) val msgTables: List? = null, + @SerialId(14) val cookies: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable class TabInfo( - @ProtoId(1) val tabId: Int = 0, - @ProtoId(2) val recommendCount: Int = 0, - @ProtoId(3) val tableName: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val iconUrlSelect: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val iconUrlUnselect: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val backgroundColorSelect: Color? = null, - @ProtoId(7) val backgroundColorUnselect: Color? = null + @SerialId(1) val tabId: Int = 0, + @SerialId(2) val recommendCount: Int = 0, + @SerialId(3) val tableName: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(4) val iconUrlSelect: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(5) val iconUrlUnselect: ByteArray = EMPTY_BYTE_ARRAY, + @SerialId(6) val backgroundColorSelect: Color? = null, + @SerialId(7) val backgroundColorUnselect: Color? = null ) : ProtoBuf @Serializable class MayKnowPerson( - @ProtoId(1) val uin: Long = 0L, - @ProtoId(2) val msgIosSource: AddFriendSource? = null, - @ProtoId(3) val msgAndroidSource: AddFriendSource? = null, - @ProtoId(4) val reason: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) val additive: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) val nick: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) val remark: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) val country: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(9) val province: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(10) val city: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(11) val age: Int = 0, - @ProtoId(12) val catelogue: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(13) val alghrithm: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(14) val richbuffer: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(15) val qzone: Int = 0, - @ProtoId(16) val gender: Int = 0, - @ProtoId(17) val mobileName: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(18) val token: String = "", - @ProtoId(19) val onlineState: Int = 0, - @ProtoId(20) val msgLabels: List