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: add real_id for long msg

Browse Source 
Signed-off-by: 白池 <whitechi73@outlook.com>
This commit is contained in:
白池 2024-02-28 00:03:47 +08:00
parent 541422a43e
commit 4dc83fdeba
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/GroupSvc.kt
View File

@ -983,6 +983,7 @@ internal object GroupSvc: BaseSvc() {
operatorTime = obj["add_digest_time"].asLong, operatorTime = obj["add_digest_time"].asLong,
messageId = 0, messageId = 0,
messageSeq = msgSeq, messageSeq = msgSeq,
realId = msgSeq,
messageContent = obj["msg_content"] ?: EmptyJsonArray messageContent = obj["msg_content"] ?: EmptyJsonArray
) )
val mapping = MessageHelper.getMsgMappingBySeq(MsgConstant.KCHATTYPEGROUP, groupId.toString(), msgSeq) val mapping = MessageHelper.getMsgMappingBySeq(MsgConstant.KCHATTYPEGROUP, groupId.toString(), msgSeq)

1
xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/MsgSvc.kt
View File

@ -298,6 +298,7 @@ internal object MsgSvc : BaseSvc() {
msgType = MessageHelper.obtainDetailTypeByMsgType(chatType), msgType = MessageHelper.obtainDetailTypeByMsgType(chatType),
msgId = 0, // MessageHelper.generateMsgIdHash(chatType, msg.content!!.msgViaRandom), msgViaRandom 为空 msgId = 0, // MessageHelper.generateMsgIdHash(chatType, msg.content!!.msgViaRandom), msgViaRandom 为空
msgSeq = msg.contentHead!!.msgSeq ?: 0, msgSeq = msg.contentHead!!.msgSeq ?: 0,
realId = msg.contentHead!!.msgSeq ?: 0,
sender = MessageSender( sender = MessageSender(
msg.msgHead?.peer ?: 0, msg.msgHead?.peer ?: 0,
msg.msgHead?.responseGrp?.memberCard?.ifEmpty { msg.msgHead?.forward?.friendName } msg.msgHead?.responseGrp?.memberCard?.ifEmpty { msg.msgHead?.forward?.friendName }

3
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/data/Message.kt
View File

@ -21,7 +21,7 @@ internal data class MessageDetail(
@SerialName("message_type") val msgType: String, @SerialName("message_type") val msgType: String,
@SerialName("message_id") val msgId: Int, @SerialName("message_id") val msgId: Int,
@SerialName("message_seq") val msgSeq: Long, @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("sender") val sender: MessageSender,
@SerialName("message") val message: List<Map<String, JsonElement>>, @SerialName("message") val message: List<Map<String, JsonElement>>,
@SerialName("group_id") val groupId: Long = 0, @SerialName("group_id") val groupId: Long = 0,
@ -49,5 +49,6 @@ internal data class EssenceMessage(
@SerialName("operator_time") val operatorTime: Long, @SerialName("operator_time") val operatorTime: Long,
@SerialName("message_id") var messageId: Int, @SerialName("message_id") var messageId: Int,
@SerialName("message_seq") val messageSeq: Int, @SerialName("message_seq") val messageSeq: Int,
@SerialName("real_id") val realId: Int,
@SerialName("message_content") val messageContent: JsonElement, @SerialName("message_content") val messageContent: JsonElement,
) )