github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-05 23:50:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

#1536 Try to fix image sending error

Browse Source
This commit is contained in:
sandtechnology 2021-09-09 17:48:40 +08:00 committed by Karlatemp
parent 6cd7fa9709
commit 25c489d238
No known key found for this signature in database
GPG Key ID: 21FBDDF664FF06F8
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mirai-core/src/commonMain/kotlin/message/imagesImpl.kt
View File

@ -140,7 +140,10 @@ internal fun ImMsgBody.NotOnlineImage.toCustomFace(): ImMsgBody.CustomFace {
//_400Height = 235,
//_400Url = "/gchatpic_new/000000000/1041235568-2195821338-01E9451B70EDEAE3B37C101F1EEBF5B5/400?term=2",
//_400Width = 351,
oldData = this.oldVerSendFile
oldData = oldData,
bizType = 66,
useful = 1,
origin = 1,
)
}
@ -185,9 +188,10 @@ internal fun OfflineGroupImage.toJceData(): ImMsgBody.CustomFace {
//_400Height = 235,
//_400Url = "/gchatpic_new/000000000/1041235568-2195821338-01E9451B70EDEAE3B37C101F1EEBF5B5/400?term=2",
//_400Width = 351,
oldData = oldData,
// pbReserve = "08 00 10 00 32 00 50 00 78 08".autoHexToBytes(),
// useful = 1,
bizType = 66,
useful = 1,
origin = 1,
// pbReserve = CustomFaceExtPb.ResvAttr().toByteArray(CustomFaceExtPb.ResvAttr.serializer())
)
}

2
mirai-core/src/commonMain/kotlin/network/protocol/data/proto/Msg.kt
View File

@ -262,7 +262,7 @@ internal class ImMsgBody : ProtoBuf {
@ProtoNumber(3) @JvmField val shortcut: String = "",
@ProtoNumber(4) @JvmField val buffer: ByteArray = EMPTY_BYTE_ARRAY,
@ProtoNumber(5) @JvmField val flag: ByteArray = EMPTY_BYTE_ARRAY,
@ProtoNumber(6) @JvmField val oldData: ByteArray = EMPTY_BYTE_ARRAY,
@ProtoNumber(6) @JvmField val oldData: ByteArray? = null,
@ProtoNumber(7) @JvmField val fileId: Int = 0,
@ProtoNumber(8) @JvmField val serverIp: Int = 0,
@ProtoNumber(9) @JvmField val serverPort: Int = 0,