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 9345154..eb7f9a4 100644 --- a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/MsgSvc.kt +++ b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/MsgSvc.kt @@ -98,7 +98,7 @@ internal object MsgSvc : BaseSvc() { } continuation.invokeOnCancellation { continuation.resume(null) - } // 貌似不会被取消,写了也没什么鸟用啊? + } } } 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 ba0027b..8643271 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 @@ -70,6 +70,7 @@ internal object GetHistoryMsg : IActionHandler() { msgType = MessageHelper.obtainDetailTypeByMsgType(msg.chatType), msgId = msgHash, msgSeq = msg.msgSeq, + realId = msg.msgSeq, sender = MessageSender( msg.senderUin, msg.sendNickName, "unknown", 0, msg.senderUid, msg.senderUid ), @@ -92,6 +93,7 @@ internal object GetHistoryMsg : IActionHandler() { msgType = MessageHelper.obtainDetailTypeByMsgType(msg.chatType), msgId = MessageHelper.generateMsgIdHash(msg.chatType, msg.msgId), msgSeq = msg.msgSeq, + realId = msg.msgSeq, sender = MessageSender( msg.senderUin, msg.sendNickName .ifEmpty { msg.sendMemberName } diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetMsg.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetMsg.kt index e23077e..7657caf 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetMsg.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetMsg.kt @@ -30,6 +30,7 @@ internal object GetMsg: IActionHandler() { msgType = MessageHelper.obtainDetailTypeByMsgType(msg.chatType), msgId = msgHash, msgSeq = msg.msgSeq, + realId = msg.msgSeq, sender = MessageSender( msg.senderUin, msg.sendNickName .ifEmpty { msg.sendMemberName } 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 1f54913..4cf4bee 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,6 +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("sender") val sender: MessageSender, @SerialName("message") val message: List>, @SerialName("group_id") val groupId: Long = 0,