From 3d4ff807af89edb0fa9a9518600f02172d2027ba Mon Sep 17 00:00:00 2001 From: Him188 Date: Thu, 20 Feb 2020 13:24:27 +0800 Subject: [PATCH] Add `MessageSource.time` --- .../mamoe/mirai/qqandroid/message/MessageSourceFromMsg.kt | 2 ++ .../kotlin/net.mamoe.mirai/message/data/MessageSource.kt | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/message/MessageSourceFromMsg.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/message/MessageSourceFromMsg.kt index c8e77f7d3..fe4aab43f 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/message/MessageSourceFromMsg.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/message/MessageSourceFromMsg.kt @@ -21,6 +21,7 @@ import net.mamoe.mirai.qqandroid.network.protocol.data.proto.SourceMsg internal inline class MessageSourceFromServer( val delegate: ImMsgBody.SourceMsg ) : MessageSource { + override val time: Long get() = delegate.time.toLong() and 0xFFFFFFFF override val messageUid: Long get() = delegate.pbReserve.loadAs(SourceMsg.ResvAttr.serializer()).origUids!! override val sourceMessage: MessageChain get() = delegate.toMessageChain() override val senderId: Long get() = delegate.senderUin @@ -32,6 +33,7 @@ internal inline class MessageSourceFromServer( internal inline class MessageSourceFromMsg( val delegate: MsgComm.Msg ) : MessageSource { + override val time: Long get() = delegate.msgHead.msgTime.toLong() and 0xFFFFFFFF override val messageUid: Long get() = delegate.msgBody.richText.attr!!.random.toLong() override val sourceMessage: MessageChain get() = delegate.toMessageChain() override val senderId: Long get() = delegate.msgHead.fromUin diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageSource.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageSource.kt index 3653cfabb..e5b831b17 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageSource.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageSource.kt @@ -31,6 +31,11 @@ interface MessageSource : Message { */ val messageUid: Long + /** + * 发送时间, 单位为秒 + */ + val time: Long + /** * 发送人号码 */