From eb807a03329931d3841184dccee81a84e6a116e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E6=B1=A0?= Date: Sun, 25 Feb 2024 12:46:40 +0800 Subject: [PATCH] `Shamrock`: support upload resource by NtKernel x3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 白池 --- .../moe/fuqiuluo/qqinterface/servlet/structures/RichMedia.kt | 1 + .../shamrock/remote/action/handlers/UploadNtResource.kt | 3 ++- .../fuqiuluo/shamrock/remote/service/listener/AioListener.kt | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/structures/RichMedia.kt b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/structures/RichMedia.kt index dc4ce58..ab20378 100644 --- a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/structures/RichMedia.kt +++ b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/structures/RichMedia.kt @@ -16,4 +16,5 @@ data class CommFileInfo( @SerialName("md5") val md5: String, @SerialName("uuid") val uuid: String, @SerialName("sub_id") val subId: String, + @SerialName("sha") val sha: String, ) \ No newline at end of file diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/UploadNtResource.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/UploadNtResource.kt index aad1ea5..88febbb 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/UploadNtResource.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/UploadNtResource.kt @@ -67,7 +67,8 @@ internal object UploadNtResource: IActionHandler() { fileSize = it.fileSize, md5 = it.md5, uuid = it.uuid, - subId = it.subId + subId = it.subId, + sha = it.sha ?: "" ) }), echo) }.onFailure { diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/listener/AioListener.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/listener/AioListener.kt index ffcf7e2..864d528 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/listener/AioListener.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/listener/AioListener.kt @@ -412,7 +412,7 @@ internal object AioListener : IKernelMsgListener { } override fun onRichMediaUploadComplete(notifyInfo: FileTransNotifyInfo) { - LogCenter.log("[BDH] 资源上传完成(${notifyInfo.trasferStatus}, ${notifyInfo.fileId}, ${notifyInfo.msgId}, ${notifyInfo.commonFileInfo})") + LogCenter.log({ "[BDH] 资源上传完成(${notifyInfo.trasferStatus}, ${notifyInfo.fileId}, ${notifyInfo.msgId}, ${notifyInfo.commonFileInfo})" }, Level.DEBUG) RichMediaUploadHandler.notify(notifyInfo) }