send_forward_msg(support at face...)

annotations/src/main/java/moe/fuqiuluo/symbols/Protobuf.kt

@@ -7,10 +7,6 @@ import kotlin.reflect.KClass
 
 interface Protobuf<T: Protobuf<T>>
 
-inline fun <reified T: Protobuf<T>> KClass<T>.decode(data: ByteArray): T {
-    return ProtoBuf.decodeFromByteArray(data)
-}
-
 inline fun <reified T: Protobuf<T>> ByteArray.decodeProtobuf(to: KClass<T>? = null): T {
     return ProtoBuf.decodeFromByteArray(this)
 }

protobuf/src/main/java/protobuf/message/AppShareInfo.kt

@@ -0,0 +1,26 @@
+package protobuf.message
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.protobuf.ProtoNumber
+
+@Serializable
+data class AppShareInfo(
+    @ProtoNumber(1) var appshareId: UInt? = null,
+    @ProtoNumber(2) var appshareCookie: ByteArray? = null,
+    @ProtoNumber(3) var appshareResource: PluginInfo? = null,
+)
+
+@Serializable
+data class PluginInfo(
+    @ProtoNumber(1) var resId: UInt = 0u,
+    @ProtoNumber(2) var pkgName: String = "",
+    @ProtoNumber(3) var newVer: UInt = 0u,
+    @ProtoNumber(4) var resType: UInt = 0u,
+    @ProtoNumber(5) var lanType: UInt = 0u,
+    @ProtoNumber(6) var priority: UInt = 0u,
+    @ProtoNumber(7) var resName: String = "",
+    @ProtoNumber(8) var resDesc: String = "",
+    @ProtoNumber(9) var resUrlBig: String = "",
+    @ProtoNumber(10) var resUrlSmall: String = "",
+    @ProtoNumber(11) var resConf: String = "",
+)

protobuf/src/main/java/protobuf/message/MessageContent.kt → protobuf/src/main/java/protobuf/message/ContentHead.kt

@@ -4,12 +4,12 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoNumber
 
 @Serializable
-data class MessageContent(
+data class ContentHead(
     @ProtoNumber(1) val msgType: Int = Int.MIN_VALUE,
     @ProtoNumber(2) val msgSubType: Int? = null,
-    @ProtoNumber(3) val u1: Int? = null,
+    @ProtoNumber(3) val divSeq: Int? = null,
     @ProtoNumber(4) val msgViaRandom: Long = Long.MIN_VALUE,
-    @ProtoNumber(5) val msgSeq_: Long? = null,
+    @ProtoNumber(5) val sequence: Long? = null,
     @ProtoNumber(6) val msgTime: Long? = null,
     @ProtoNumber(7) val u2: Int? = null,
     @ProtoNumber(8) val u6: Int? = null,
@@ -27,5 +27,5 @@ data class ForwardHead(
     @ProtoNumber(2) val u2: Int? = null,
     @ProtoNumber(3) val u3: Int? = null,
     @ProtoNumber(4) val ub641: String? = null,
-    @ProtoNumber(5) val Avatar: String? = null
+    @ProtoNumber(5) val avatar: String? = null
 )

protobuf/src/main/java/protobuf/message/Elem.kt

@@ -0,0 +1,64 @@
+package protobuf.message
+
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.protobuf.ProtoNumber
+import protobuf.message.element.*
+
+@OptIn(ExperimentalSerializationApi::class)
+@Serializable
+data class Elem(
+    @ProtoNumber(1) val text: TextMsg? = null,
+    @ProtoNumber(2) val face: FaceMsg? = null,
+//    @ProtoNumber(3) val onlineImage: OnlineImage? = null,
+    @ProtoNumber(4) val notOnlineImage: NotOnlineImage? = null,
+//    @ProtoNumber(5) var transElemInfo: TransElem? = null,
+    @ProtoNumber(6) val marketFace: MarketFace? = null,
+//    @ProtoNumber(7) var elemFlags: ElemFlags? = null,
+    @ProtoNumber(8) val customFace: CustomFace? = null,
+    @ProtoNumber(9) var elemFlags2: ElemFlags2? = null,
+//    @ProtoNumber(10) var funFace: FunFace? = null,
+//    @ProtoNumber(11) var secretFile: SecretFileMsg? = null,
+//    @ProtoNumber(12) var richMsg: RichMsg? = null,
+//    @ProtoNumber(13) var groupFile: GroupFile? = null,
+//    @ProtoNumber(14) var pubGroup: PubGroup? = null,
+//    @ProtoNumber(15) var marketTrans: MarketTrans? = null,
+//    @ProtoNumber(16) var extraInfo: ExtraInfo? = null,
+//    @ProtoNumber(17) var shakeWindow: ShakeWindow? = null,
+//    @ProtoNumber(18) var pubAccount: PubAccount? = null,
+//    @ProtoNumber(19) var videoFile: VideoFile? = null,
+//    @ProtoNumber(20) var tipsInfo: TipsInfo? = null,
+//    @ProtoNumber(21) var anonGroupMsg: AnonymousGroupMsg? = null,
+//    @ProtoNumber(22) var qqLiveOld: QQLiveOld? = null,
+//    @ProtoNumber(23) var lifeOnline: LifeOnlineAccount? = null,
+//    @ProtoNumber(24) var qqwalletMsg: QQWalletMsg? = null,
+//    @ProtoNumber(25) var crmElem: CrmElem? = null,
+//    @ProtoNumber(26) var conferenceTipsInfo: ConferenceTipsInfo? = null,
+//    @ProtoNumber(27) var redbagInfo: RedBagInfo? = null,
+//    @ProtoNumber(28) var lowVersionTips: LowVersionTips? = null,
+//    @ProtoNumber(29) var bankcodeCtrlInfo: ByteArray? = null,
+//    @ProtoNumber(30) var nearByMsg: NearByMessageType? = null,
+//    @ProtoNumber(31) var customElem: CustomElem? = null,
+//    @ProtoNumber(32) var locationInfo: LocationInfo? = null,
+//    @ProtoNumber(33) var pubAccInfo: PubAccInfo? = null,
+//    @ProtoNumber(34) var smallEmoji: SmallEmoji? = null,
+//    @ProtoNumber(35) var fsjMsgElem: FSJMessageElem? = null,
+//    @ProtoNumber(36) var arkApp: ArkAppElem? = null,
+    @ProtoNumber(37) val generalFlags: GeneralFlags? = null,
+//    @ProtoNumber(38) var hcFlashPic: CustomFace? = null,
+//    @ProtoNumber(39) var deliverGiftMsg: DeliverGiftMsg? = null,
+//    @ProtoNumber(40) var bitapp_msg: BitAppMsg? = null,
+//    @ProtoNumber(41) var openQqData: OpenQQData? = null,
+//    @ProtoNumber(42) var apolloMsg: ApolloActMsg? = null,
+//    @ProtoNumber(43) var groupPubAccInfo: GroupPubAccountInfo? = null,
+//    @ProtoNumber(44) var blessMsg: BlessingMessage? = null,
+    @ProtoNumber(45) var srcMsg: SourceMsg? = null,
+//    @ProtoNumber(46) var lolaMsg: LolaMsg? = null,
+//    @ProtoNumber(47) var groupBusinessMsg: GroupBusinessMsg? = null,
+//    @ProtoNumber(48) var msgWorkflowNotify: WorkflowNotifyMsg? = null,
+//    @ProtoNumber(49) var patElem: PatsElem? = null,
+//    @ProtoNumber(50) var groupPostElem: GroupPostElem? = null,
+    @ProtoNumber(51) val lightApp: LightAppElem? = null,
+//    @ProtoNumber(52) var eimInfo: EIMInfo? = null,
+    @ProtoNumber(53) val commonElem: CommonElem? = null,
+)

protobuf/src/main/java/protobuf/message/MsgBody.kt

@@ -0,0 +1,11 @@
+package protobuf.message
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.protobuf.ProtoNumber
+
+@Serializable
+data class MsgBody(
+    @ProtoNumber(1) val richText: RichText? = null,
+    @ProtoNumber(2) val msgContent: ByteArray? = null,
+    @ProtoNumber(3) val msgEncryptContent: ByteArray? = null
+)

protobuf/src/main/java/protobuf/message/MsgControl.kt

@@ -0,0 +1,9 @@
+package protobuf.message
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.protobuf.ProtoNumber
+
+@Serializable
+data class MsgControl(
+    @ProtoNumber(1) val msgFlag: Int? = null,
+)

protobuf/src/main/java/protobuf/message/NotOnlineFile.kt

@@ -0,0 +1,28 @@
+package protobuf.message
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.protobuf.ProtoNumber
+
+@Serializable
+data class NotOnlineFile(
+    @ProtoNumber(1) var fileType: UInt? = null,
+    @ProtoNumber(2) var sig: ByteArray? = null,
+    @ProtoNumber(3) var fileUuid: ByteArray? = null,
+    @ProtoNumber(4) var fileMd5: ByteArray? = null,
+    @ProtoNumber(5) var fileName: ByteArray? = null,
+    @ProtoNumber(6) var fileSize: ULong? = null,
+    @ProtoNumber(7) var note: ByteArray? = null,
+    @ProtoNumber(8) var reserved: UInt? = null,
+    @ProtoNumber(9) var subcmd: UInt? = null,
+    @ProtoNumber(10) var microCloud: UInt? = null,
+    @ProtoNumber(11) var rptFileUrls: List<String>? = null,
+    @ProtoNumber(12) var downloadFlag: UInt? = null,
+    @ProtoNumber(50) var dangerEvel: UInt? = null,
+    @ProtoNumber(51) var lifeTime: UInt? = null,
+    @ProtoNumber(52) var uploadTime: UInt? = null,
+    @ProtoNumber(53) var absFileType: UInt? = null,
+    @ProtoNumber(54) var clientType: UInt? = null,
+    @ProtoNumber(55) var expireTime: UInt? = null,
+    @ProtoNumber(56) var pbReserve: ByteArray? = null,
+    @ProtoNumber(57) var fileidcrcMedia: String? = null,
+)

protobuf/src/main/java/protobuf/message/PbSendMsgReq.kt

@@ -0,0 +1,23 @@
+package protobuf.message
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.protobuf.ProtoNumber
+import moe.fuqiuluo.symbols.Protobuf
+
+@Serializable
+data class PbSendMsgReq(
+    @ProtoNumber(1) val routingHead: RoutingHead? = null,
+    @ProtoNumber(2) val contentHead: ContentHead? = null,
+    @ProtoNumber(3) val msgBody: MsgBody? = null,
+    @ProtoNumber(4) val msgSeq: UInt? = null,
+    @ProtoNumber(5) val msgRand: UInt? = null,
+    @ProtoNumber(6) val syncCookie: ByteArray? = null,
+    @ProtoNumber(7) val appShare: AppShareInfo? = null,
+    @ProtoNumber(8) val msgVia: UInt? = null,
+    @ProtoNumber(9) val dataStatist: UInt? = null,
+//    @ProtoNumber(10) val multiMsgAssist: MultiMsgAssist? = null,
+//    @ProtoNumber(11) val inputNotifyInfo: InputNotifyInfo? = null,
+    @ProtoNumber(12) val ctrl: MsgControl? = null,
+//    @ProtoNumber(13) val receiptReq: ReceiptReq? = null,
+    @ProtoNumber(14) val multiSendSeq: UInt? = null
+) : Protobuf<PbSendMsgReq>

protobuf/src/main/java/protobuf/message/Ptt.kt

@@ -0,0 +1,32 @@
+package protobuf.message
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.protobuf.ProtoNumber
+
+@Serializable
+data class Ptt(
+    @ProtoNumber(1) var fileType: UInt?=null,
+    @ProtoNumber(2) var srcUin: ULong?=null,
+    @ProtoNumber(3) var fileUuid: ByteArray?=null,
+    @ProtoNumber(4) var fileMd5: ByteArray?=null,
+    @ProtoNumber(5) var fileName: ByteArray?=null,
+    @ProtoNumber(6) var fileSize: UInt?=null,
+    @ProtoNumber(7) var reserve: ByteArray?=null,
+    @ProtoNumber(8) var fileId: UInt?=null,
+    @ProtoNumber(9) var serverIp: UInt?=null,
+    @ProtoNumber(10) var serverPort: UInt?=null,
+    @ProtoNumber(11) var boolValid: Boolean = false,
+    @ProtoNumber(12) var signature: ByteArray?=null,
+    @ProtoNumber(13) var shortcut: ByteArray?=null,
+    @ProtoNumber(14) var fileKey: ByteArray?=null,
+    @ProtoNumber(15) var magicPttIndex: UInt?=null,
+    @ProtoNumber(16) var voiceSwitch: UInt?=null,
+    @ProtoNumber(17) var pttUrl: ByteArray?=null,
+    @ProtoNumber(18) var groupFileKey: ByteArray?=null,
+    @ProtoNumber(19) var time: UInt?=null,
+    @ProtoNumber(20) var downPara: ByteArray?=null,
+    @ProtoNumber(29) var format: UInt?=null,
+    @ProtoNumber(30) var pbReserve: ByteArray?=null,
+    @ProtoNumber(31) var rptPttUrls: List<String>? = null,
+    @ProtoNumber(32) var downloadFlag: UInt?=null,
+)

protobuf/src/main/java/protobuf/message/PushMsgBody.kt

@@ -0,0 +1,11 @@
+package protobuf.message
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.protobuf.ProtoNumber
+
+@Serializable
+data class PushMsgBody(
+    @ProtoNumber(1) val msgHead: ResponseHead? = null,
+    @ProtoNumber(2) val contentHead: ContentHead? = null,
+    @ProtoNumber(3) val body: MsgBody? = null,
+)

protobuf/src/main/java/protobuf/message/MessageHead.kt → protobuf/src/main/java/protobuf/message/ResponseHead.kt

@@ -6,25 +6,25 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoNumber
 
 @Serializable
-data class MessageHead(
+data class ResponseHead(
     @ProtoNumber(1) val peer: Long = Long.MIN_VALUE,
     @ProtoNumber(2) val peerUid: String? = null,
     @ProtoNumber(3) val flag: Int = Int.MIN_VALUE,
     @ProtoNumber(4) val appId: Int = Int.MIN_VALUE,
     @ProtoNumber(5) val receiver: Long? = null,
     @ProtoNumber(6) val receiverUid: String? = null,
-    @ProtoNumber(7) val forward: MessageForward? = null,
-    @ProtoNumber(8) val groupInfo: GroupInfo? = null,
+    @ProtoNumber(7) val forward: ResponseForward? = null,
+    @ProtoNumber(8) val responseGrp: ResponseGrp? = null,
 )
 
 @Serializable
-data class MessageForward(
+data class ResponseForward(
     @ProtoNumber(6) val friendName: String? = null,
     @ProtoNumber(11) val u1: Int? = null,
 )
 
 @Serializable
-data class GroupInfo(
+data class ResponseGrp(
     @ProtoNumber(1) val groupCode: ULong = ULong.MIN_VALUE,
     @ProtoNumber(4) val memberCard: String? = null,
     @ProtoNumber(5) val u1: Int? = null,

protobuf/src/main/java/protobuf/message/RichText.kt

@@ -0,0 +1,31 @@
+@file:OptIn(ExperimentalSerializationApi::class)
+
+package protobuf.message
+
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.protobuf.ProtoNumber
+
+@Serializable
+data class RichText(
+    @ProtoNumber(1) val attr: Attr? = null,
+    @ProtoNumber(2) val elements: List<Elem>? = null,
+    @ProtoNumber(3) val not_online_file: NotOnlineFile? = null,
+    @ProtoNumber(4) val ptt: Ptt? = null,
+    @ProtoNumber(5) val tmp_ptt: TmpPtt? = null,
+    @ProtoNumber(6) val trans_211_tmp_msg: Trans211TmpMsg? = null,
+)
+
+@Serializable
+data class Attr(
+    @ProtoNumber(1) val codePage: Int? = null,
+    @ProtoNumber(2) val time: UInt? = null,
+    @ProtoNumber(3) val random: UInt? = null,
+    @ProtoNumber(4) val color: UInt? = null,
+    @ProtoNumber(5) val size: UInt? = null,
+    @ProtoNumber(6) val effect: UInt? = null,
+    @ProtoNumber(7) val charSet: UInt? = null,
+    @ProtoNumber(8) val pitchAndFamily: UInt? = null,
+    @ProtoNumber(9) val fontName: String? = null,
+    @ProtoNumber(10) val reserve_data: ByteArray? = null,
+)

protobuf/src/main/java/protobuf/message/RoutingHead.kt

@@ -0,0 +1,14 @@
+package protobuf.message
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.protobuf.ProtoNumber
+import protobuf.message.routing.*
+
+@Serializable
+data class RoutingHead(
+    @ProtoNumber(1) val c2c: C2C? = null,
+    @ProtoNumber(2) val grp: Grp? = null,
+    @ProtoNumber(3) val grpTmp: GrpTmp? = null,
+    @ProtoNumber(6) val wpaTmp: WPATmp? = null,
+    @ProtoNumber(15) val trans0X211: Trans0X211? = null
+)