Skip to content

M
Mirai
Commit b0bc0ec6 authored by Him188's avatar Him188
Browse files
Options

Rearrange files

parent 7bb9052a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 121 additions and 383 deletions
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/FriendListCommon.kt
View file @ b0bc0ec6
......@@ -7,6 +7,8 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
@file:Suppress("SpellCheckingInspection")
package net.mamoe.mirai.qqandroid.network.protocol.data.proto
import kotlinx.serialization.Serializable
......@@ -28,7 +30,7 @@ internal class Vec0xd50 : ProtoBuf {
@Serializable
internal class RspBody(
@ProtoId(1) val msgUpdateData: List<Vec0xd50.ExtSnsFrdData>? = null,
@ProtoId(1) val msgUpdateData: List<ExtSnsFrdData>? = null,
@ProtoId(11) val over: Int = 0,
@ProtoId(12) val nextStart: Int = 0,
@ProtoId(13) val uint64UnfinishedUins: List<Long>? = null
......@@ -66,7 +68,7 @@ internal class Vec0xd6b : ProtoBuf {
@Serializable
internal class RspBody(
@ProtoId(11) val msgMutualmarkData: List<Vec0xd6b.MutualMarkData>? = null,
@ProtoId(11) val msgMutualmarkData: List<MutualMarkData>? = null,
@ProtoId(12) val uint64UnfinishedUins: List<Long>? = null
) : ProtoBuf
......@@ -74,35 +76,6 @@ internal class Vec0xd6b : ProtoBuf {
internal class MutualMarkData(
@ProtoId(1) val frdUin: Long = 0L,
@ProtoId(2) val result: Int = 0
// @SerialId(11) val mutualmarkInfo: List<net.mamoe.mirai.qqandroid.network.protocol.data.proto.onlinePush0x210.Mutualmark.MutualMark>? = null
// @SerialId(11) val mutualmarkInfo: List<net.mamoe.mirai.qqandroid.network.protocol.data.proto.Mutualmark.MutualMark>? = null
) : ProtoBuf
}
\ No newline at end of file
@Serializable
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
) : 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
) : ProtoBuf
}
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Msg.kt
View file @ b0bc0ec6
......@@ -1185,116 +1185,3 @@ internal class ObjMsg : ProtoBuf {
@ProtoId(8) val reportIdShow: Int = 0
) : ProtoBuf
}
@Serializable
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<RelationalChainInfos>? = null,
@ProtoId(100) val uint32FeatureId: List<Int>? = 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
) : 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
) : 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
) : 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
) : 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
) : ProtoBuf
@Serializable
internal class RelationalChainInfos(
@ProtoId(1) val msgRelationalChainInfoOld: RelationalChainInfo? = null,
@ProtoId(2) val msgRelationalChainInfoNew: RelationalChainInfo? = null
) : ProtoBuf
@Serializable
internal class ToDegradeInfo(
@ProtoId(1) val toDegradeItem: List<ToDegradeItem>? = null,
@ProtoId(2) val nick: ByteArray = EMPTY_BYTE_ARRAY,
@ProtoId(3) val notifyTime: Long = 0L
) : ProtoBuf
@Serializable
internal class MsgBody(
@ProtoId(1) val msgModInfos: List<ForwardBody>? = null
) : ProtoBuf
}
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.kt
View file @ b0bc0ec6
......@@ -35,9 +35,6 @@ import net.mamoe.mirai.qqandroid.network.protocol.data.jce.MsgType0x210
import net.mamoe.mirai.qqandroid.network.protocol.data.jce.OnlinePushPack
import net.mamoe.mirai.qqandroid.network.protocol.data.jce.RequestPacket
import net.mamoe.mirai.qqandroid.network.protocol.data.proto.*
import net.mamoe.mirai.qqandroid.network.protocol.data.proto.onlinePush0x210.Submsgtype0x27
import net.mamoe.mirai.qqandroid.network.protocol.data.proto.onlinePush0x210.Submsgtype0x44
import net.mamoe.mirai.qqandroid.network.protocol.data.proto.onlinePush0x210.Submsgtype0xb3
import net.mamoe.mirai.qqandroid.network.protocol.packet.IncomingPacketFactory
import net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacket
import net.mamoe.mirai.qqandroid.network.protocol.packet.buildResponseUniPacket
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment