shkong/OpenShamrock
1
0
Fork 0
mirror of https://github.com/whitechi73/OpenShamrock.git synced 2024-08-14 13:12:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Shamrock: fix #242

Browse Source
This commit is contained in:
白池 2024-02-18 21:07:22 +08:00
parent c3e0031aa4
commit 0ed4480878
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/convert/MessageElemConverter.kt
View File

@ -17,6 +17,7 @@ import moe.fuqiuluo.shamrock.helper.db.ImageMapping
import moe.fuqiuluo.shamrock.helper.db.MessageDB import moe.fuqiuluo.shamrock.helper.db.MessageDB
import moe.fuqiuluo.shamrock.tools.asJsonObject import moe.fuqiuluo.shamrock.tools.asJsonObject
import moe.fuqiuluo.shamrock.tools.asString import moe.fuqiuluo.shamrock.tools.asString
import moe.fuqiuluo.shamrock.tools.hex2ByteArray
import moe.fuqiuluo.shamrock.tools.json import moe.fuqiuluo.shamrock.tools.json
import mqq.app.MobileQQ import mqq.app.MobileQQ
import kotlin.jvm.internal.Intrinsics import kotlin.jvm.internal.Intrinsics
@ -213,7 +214,13 @@ internal sealed class MessageElemConverter: IMessageConvert {
element: MsgElement element: MsgElement
): MessageSegment { ): MessageSegment {
val video = element.videoElement val video = element.videoElement
val md5 = video.fileName.split(".")[0] val md5 = if (video.fileName.contains("/")) {
video.videoMd5.takeIf {
!it.isNullOrEmpty()
}?.hex2ByteArray() ?: video.fileName.split("/").let {
it[it.size - 2].hex2ByteArray()
}
} else video.fileName.split(".")[0].hex2ByteArray()
LogCenter.log({ "receive video msg: $video" }, Level.DEBUG) LogCenter.log({ "receive video msg: $video" }, Level.DEBUG)

8
xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/transfile/RichProtoSvc.kt
View File

@ -205,7 +205,7 @@ internal object RichProtoSvc: BaseSvc() {
suspend fun getC2CVideoDownUrl( suspend fun getC2CVideoDownUrl(
peerId: String, peerId: String,
md5Hex: String, md5: ByteArray,
fileUUId: String fileUUId: String
): String { ): String {
return suspendCancellableCoroutine { return suspendCancellableCoroutine {
@ -221,7 +221,7 @@ internal object RichProtoSvc: BaseSvc() {
downReq.troopUin = peerId downReq.troopUin = peerId
downReq.clientType = 2 downReq.clientType = 2
downReq.fileId = fileUUId downReq.fileId = fileUUId
downReq.md5 = md5Hex.hex2ByteArray() downReq.md5 = md5
downReq.busiType = FileTransfer.BUSI_TYPE_SHORT_VIDEO downReq.busiType = FileTransfer.BUSI_TYPE_SHORT_VIDEO
downReq.subBusiType = 0 downReq.subBusiType = 0
downReq.fileType = FileTransfer.VIDEO_FORMAT_MP4 downReq.fileType = FileTransfer.VIDEO_FORMAT_MP4
@ -248,7 +248,7 @@ internal object RichProtoSvc: BaseSvc() {
suspend fun getGroupVideoDownUrl( suspend fun getGroupVideoDownUrl(
peerId: String, peerId: String,
md5Hex: String, md5: ByteArray,
fileUUId: String fileUUId: String
): String { ): String {
return suspendCancellableCoroutine { return suspendCancellableCoroutine {
@ -264,7 +264,7 @@ internal object RichProtoSvc: BaseSvc() {
downReq.troopUin = peerId downReq.troopUin = peerId
downReq.clientType = 2 downReq.clientType = 2
downReq.fileId = fileUUId downReq.fileId = fileUUId
downReq.md5 = md5Hex.hex2ByteArray() downReq.md5 = md5
downReq.busiType = FileTransfer.BUSI_TYPE_SHORT_VIDEO downReq.busiType = FileTransfer.BUSI_TYPE_SHORT_VIDEO
downReq.subBusiType = 0 downReq.subBusiType = 0
downReq.fileType = FileTransfer.VIDEO_FORMAT_MP4 downReq.fileType = FileTransfer.VIDEO_FORMAT_MP4