From 3d8485fee58c1dbcf447c722384ba53de9c708e1 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Sat, 22 Feb 2020 16:22:49 +0800
Subject: [PATCH] Fix `.last` bug

---
 .../kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt          | 5 ++---
 .../network/protocol/packet/chat/receive/MessageSvc.kt       | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt
index dc783581c..873725f57 100644
--- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt
+++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt
@@ -553,7 +553,7 @@ internal class GroupImpl(
         if (event.isCancelled) {
             throw EventCancelledException("cancelled by FriendMessageSendEvent")
         }
-        lateinit var source: MessageSource
+        lateinit var source: MessageSvc.PbSendMsg.MessageSourceFromSend
         bot.network.run {
             val response: MessageSvc.PbSendMsg.Response = MessageSvc.PbSendMsg.ToGroup(
                 bot.client,
@@ -565,8 +565,7 @@ internal class GroupImpl(
             ) { "send message failed: $response" }
         }
 
-        ((message.last() as MessageSource) as MessageSvc.PbSendMsg.MessageSourceFromSend)
-            .startWaitingSequenceId(this)
+        source.startWaitingSequenceId(this)
 
         return MessageReceipt(message, source, this)
     }
diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/MessageSvc.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/MessageSvc.kt
index 0c79e4345..694dd7277 100644
--- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/MessageSvc.kt
+++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/MessageSvc.kt
@@ -354,7 +354,7 @@ internal class MessageSvc {
             client: QQAndroidClient,
             groupCode: Long,
             message: MessageChain,
-            sourceCallback: (MessageSource) -> Unit
+            sourceCallback: (MessageSourceFromSend) -> Unit
         ): OutgoingPacket {
 
             val source = MessageSourceFromSend(