diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/ChatType.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/ChatType.kt index 14a3de7d5..d90acb586 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/ChatType.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/ChatType.kt @@ -9,7 +9,7 @@ enum class ChatType(val internalID: Int) { CONTACT(1006), - //未知,推测为"组" + //推测为"群" TROOP(1), TROOP_HCTOPIC(1026), diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/groupimage/GroupImageRequest.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/groupimage/GroupImageRequest.kt new file mode 100644 index 000000000..2f3bbfd51 --- /dev/null +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/groupimage/GroupImageRequest.kt @@ -0,0 +1,2 @@ +package net.mamoe.mirai.qqandroid.network.protocol.packet.chat.groupimage + diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/image/Cmd0x325Packet.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/image/Cmd0x352Packet.kt similarity index 88% rename from mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/image/Cmd0x325Packet.kt rename to mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/image/Cmd0x352Packet.kt index f70e0c4e9..ecf966f9a 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/image/Cmd0x325Packet.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/image/Cmd0x352Packet.kt @@ -4,7 +4,7 @@ import kotlinx.serialization.SerialId import kotlinx.serialization.Serializable @Serializable -internal class Cmd0x325Packet( +internal class Cmd0x352Packet( @SerialId(1) val subCommand: Int, //2是GetImgUrlReq 1是UploadImgReq @SerialId(2) val uploadImgReq: UploadImgReq? = null,// optional @SerialId(3) val getImgUrlReq: GetImgUrlReq? = null,// optional @@ -12,9 +12,9 @@ internal class Cmd0x325Packet( @SerialId(10) val networkType: Int = 5// 数据网络=5 ) { companion object { - fun createByImageRequest(req: ImgReq, networkType: Int = 5): Cmd0x325Packet { + fun createByImageRequest(req: ImgReq, networkType: Int = 5): Cmd0x352Packet { if (req is UploadImgReq) - return Cmd0x325Packet( + return Cmd0x352Packet( 1, req, null, @@ -22,7 +22,7 @@ internal class Cmd0x325Packet( networkType ) if (req is GetImgUrlReq) - return Cmd0x325Packet( + return Cmd0x352Packet( 2, null, req, diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/image/ImageDownPacket.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/image/ImageDownPacket.kt index 82581f54e..9c3bbea6e 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/image/ImageDownPacket.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/image/ImageDownPacket.kt @@ -19,8 +19,8 @@ internal object ImageDownPacket : PacketFactory