From 4dc83fdebaf7b319680cbedca88f4865a11d0a46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E6=B1=A0?= Date: Wed, 28 Feb 2024 00:03:47 +0800 Subject: [PATCH] `Shamrock`: add `real_id` for long msg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 白池 --- .../src/main/java/moe/fuqiuluo/qqinterface/servlet/GroupSvc.kt | 1 + .../src/main/java/moe/fuqiuluo/qqinterface/servlet/MsgSvc.kt | 1 + .../java/moe/fuqiuluo/shamrock/remote/service/data/Message.kt | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/GroupSvc.kt b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/GroupSvc.kt index 3d9eb82..7256a6e 100644 --- a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/GroupSvc.kt +++ b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/GroupSvc.kt @@ -983,6 +983,7 @@ internal object GroupSvc: BaseSvc() { operatorTime = obj["add_digest_time"].asLong, messageId = 0, messageSeq = msgSeq, + realId = msgSeq, messageContent = obj["msg_content"] ?: EmptyJsonArray ) val mapping = MessageHelper.getMsgMappingBySeq(MsgConstant.KCHATTYPEGROUP, groupId.toString(), msgSeq) diff --git a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/MsgSvc.kt b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/MsgSvc.kt index eb7f9a4..9279900 100644 --- a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/MsgSvc.kt +++ b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/MsgSvc.kt @@ -298,6 +298,7 @@ internal object MsgSvc : BaseSvc() { msgType = MessageHelper.obtainDetailTypeByMsgType(chatType), msgId = 0, // MessageHelper.generateMsgIdHash(chatType, msg.content!!.msgViaRandom), msgViaRandom 为空 msgSeq = msg.contentHead!!.msgSeq ?: 0, + realId = msg.contentHead!!.msgSeq ?: 0, sender = MessageSender( msg.msgHead?.peer ?: 0, msg.msgHead?.responseGrp?.memberCard?.ifEmpty { msg.msgHead?.forward?.friendName } diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/data/Message.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/data/Message.kt index 4cf4bee..7dca35c 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/data/Message.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/data/Message.kt @@ -21,7 +21,7 @@ internal data class MessageDetail( @SerialName("message_type") val msgType: String, @SerialName("message_id") val msgId: Int, @SerialName("message_seq") val msgSeq: Long, - @SerialName("real_id") val realId: Long = msgSeq, + @SerialName("real_id") val realId: Long, @SerialName("sender") val sender: MessageSender, @SerialName("message") val message: List>, @SerialName("group_id") val groupId: Long = 0, @@ -49,5 +49,6 @@ internal data class EssenceMessage( @SerialName("operator_time") val operatorTime: Long, @SerialName("message_id") var messageId: Int, @SerialName("message_seq") val messageSeq: Int, + @SerialName("real_id") val realId: Int, @SerialName("message_content") val messageContent: JsonElement, ) \ No newline at end of file