From 346798dc9a4fb1384d5dc89b48a2fd84e6e578b7 Mon Sep 17 00:00:00 2001 From: WhiteChi Date: Tue, 7 Nov 2023 09:15:00 +0800 Subject: [PATCH] =?UTF-8?q?`Shamrock`:=20=E5=B1=A5=E6=AD=B4=E3=83=A1?= =?UTF-8?q?=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=81=AE=E5=8F=96=E5=BE=97?= =?UTF-8?q?=E3=82=92=E3=82=B5=E3=83=9D=E3=83=BC=E3=83=88=20x2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../remote/action/handlers/GetGroupMsgHistory.kt | 3 +++ .../shamrock/remote/action/handlers/GetHistoryMsg.kt | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGroupMsgHistory.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGroupMsgHistory.kt index 631fbb8..274e249 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGroupMsgHistory.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGroupMsgHistory.kt @@ -10,5 +10,8 @@ internal object GetGroupMsgHistory: IActionHandler() { return GetHistoryMsg("group", groupId, cnt, session.echo) } + override val requiredParams: Array + get() = arrayOf("group_id") + override fun path(): String = "get_group_msg_history" } \ No newline at end of file diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetHistoryMsg.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetHistoryMsg.kt index b2e28ea..16c7f9f 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetHistoryMsg.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetHistoryMsg.kt @@ -2,6 +2,8 @@ package moe.fuqiuluo.shamrock.remote.action.handlers import com.tencent.qqnt.kernel.nativeinterface.MsgConstant import com.tencent.qqnt.kernel.nativeinterface.MsgRecord +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable import kotlinx.serialization.json.JsonElement import moe.fuqiuluo.qqinterface.servlet.msg.convert.MessageConvert import moe.fuqiuluo.shamrock.helper.MessageHelper @@ -60,7 +62,7 @@ internal object GetHistoryMsg: IActionHandler() { ) } - return ok(data = msgList, echo = echo) + return ok(data = GetHistoryMsgResult(msgList), echo = echo) } override val requiredParams: Array @@ -68,6 +70,11 @@ internal object GetHistoryMsg: IActionHandler() { override fun path(): String = "get_history_msg" + @Serializable + data class GetHistoryMsgResult( + @SerialName("messages") val msgs: List + ) + data class GetMsgResult( val code: Int, val msg: String?,