github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-13 11:30:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix internal error in uploading private images; fix #1317

Browse Source
This commit is contained in:
Karlatemp 2021-06-10 22:49:24 +08:00
parent 1e2ab736c2
commit 05a8419fb7
No known key found for this signature in database
GPG Key ID: 21FBDDF664FF06F8
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mirai-core/src/commonMain/kotlin/contact/AbstractUser.kt
View File

@ -58,13 +58,13 @@ internal abstract class AbstractUser(
val resp = bot.network.run { val resp = bot.network.run {
LongConn.OffPicUp( LongConn.OffPicUp(
bot.client, Cmd0x352.TryUpImgReq( bot.client, Cmd0x352.TryUpImgReq(
srcUin = bot.id.toInt(), buType = 1,
dstUin = id.toInt(), srcUin = bot.id,
fileId = 0, dstUin = this@AbstractUser.id,
fileMd5 = resource.md5, fileMd5 = resource.md5,
fileSize = resource.size.toInt(), fileSize = resource.size,
fileName = resource.md5.toUHexString("") + "." + resource.formatName, fileName = resource.md5.toUHexString("") + "." + resource.formatName,
imgOriginal = 1 imgOriginal = 1,
) )
).sendAndExpect<LongConn.OffPicUp.Response>() ).sendAndExpect<LongConn.OffPicUp.Response>()
} }

8
mirai-core/src/commonMain/kotlin/network/protocol/data/proto/Cmd0x352.kt
View File

@ -100,7 +100,7 @@ internal class Cmd0x352 : ProtoBuf {
@ProtoNumber(2) @JvmField val msgTryupImgReq: List<TryUpImgReq> = emptyList(),// optional @ProtoNumber(2) @JvmField val msgTryupImgReq: List<TryUpImgReq> = emptyList(),// optional
@ProtoNumber(3) @JvmField val msgGetimgUrlReq: List<GetImgUrlReq> = emptyList(),// optional @ProtoNumber(3) @JvmField val msgGetimgUrlReq: List<GetImgUrlReq> = emptyList(),// optional
@ProtoNumber(4) @JvmField val msgDelImgReq: List<DelImgReq> = emptyList(), @ProtoNumber(4) @JvmField val msgDelImgReq: List<DelImgReq> = emptyList(),
@ProtoNumber(10) @JvmField val netType: Int = 3// 数据网络=5 @ProtoNumber(10) @JvmField val netType: Int = 0// 数据网络=5, wifi=3
) : ProtoBuf ) : ProtoBuf
@Serializable @Serializable
@ -115,11 +115,11 @@ internal class Cmd0x352 : ProtoBuf {
@Serializable @Serializable
internal class TryUpImgReq( internal class TryUpImgReq(
@ProtoNumber(1) @JvmField val srcUin: Int, @ProtoNumber(1) @JvmField val srcUin: Long,
@ProtoNumber(2) @JvmField val dstUin: Int, @ProtoNumber(2) @JvmField val dstUin: Long,
@ProtoNumber(3) @JvmField val fileId: Int = 0,//从0开始的自增数？貌似有一个连接就要自增1, 但是又会重置回0 @ProtoNumber(3) @JvmField val fileId: Int = 0,//从0开始的自增数？貌似有一个连接就要自增1, 但是又会重置回0
@ProtoNumber(4) @JvmField val fileMd5: ByteArray, @ProtoNumber(4) @JvmField val fileMd5: ByteArray,
@ProtoNumber(5) @JvmField val fileSize: Int, @ProtoNumber(5) @JvmField val fileSize: Long,
@ProtoNumber(6) @JvmField val fileName: String,//默认为md5+".jpg" @ProtoNumber(6) @JvmField val fileName: String,//默认为md5+".jpg"
@ProtoNumber(7) @JvmField val srcTerm: Int = 5, @ProtoNumber(7) @JvmField val srcTerm: Int = 5,
@ProtoNumber(8) @JvmField val platformType: Int = 9, @ProtoNumber(8) @JvmField val platformType: Int = 9,

8
mirai-core/src/commonMain/kotlin/network/protocol/packet/chat/image/LongConn.kt
View File

@ -29,7 +29,13 @@ internal class LongConn {
return buildOutgoingUniPacket(client) { return buildOutgoingUniPacket(client) {
writeProtoBuf( writeProtoBuf(
Cmd0x352.ReqBody.serializer(), Cmd0x352.ReqBody.serializer(),
Cmd0x352.ReqBody(1, msgTryupImgReq = listOf(req)) Cmd0x352.ReqBody(
subcmd = 1,
netType = 3,
msgTryupImgReq = listOf(req),
msgDelImgReq = listOf(),
msgGetimgUrlReq = listOf(),
)
) )
} }
} }