From 8f81bf245a872719dac356b75dac61840c093bab Mon Sep 17 00:00:00 2001
From: oneRain <onerain88@gmail.com>
Date: Wed, 15 Apr 2020 17:36:37 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E5=AE=8C=E5=96=84=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=BA=8F=E5=88=97=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/LCIMMessageController.cs       | 40 +++++++++++++++----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/Realtime/Internal/Controller/LCIMMessageController.cs b/Realtime/Internal/Controller/LCIMMessageController.cs
index b0f6ace..d041b21 100644
--- a/Realtime/Internal/Controller/LCIMMessageController.cs
+++ b/Realtime/Internal/Controller/LCIMMessageController.cs
@@ -1,6 +1,7 @@
 using System;
+using System.Linq;
 using System.Threading.Tasks;
-using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using Newtonsoft.Json;
 using Google.Protobuf;
 using LeanCloud.Realtime.Protocol;
@@ -106,7 +107,7 @@ namespace LeanCloud.Realtime.Internal.Controller {
         /// <param name="limit"></param>
         /// <param name="messageType"></param>
         /// <returns></returns>
-        internal async Task<List<LCIMMessage>> QueryMessages(string convId,
+        internal async Task<ReadOnlyCollection<LCIMMessage>> QueryMessages(string convId,
             LCIMMessageQueryEndpoint start = null,
             LCIMMessageQueryEndpoint end = null,
             LCIMMessageQueryDirection direction = LCIMMessageQueryDirection.NewToOld,
@@ -134,9 +135,28 @@ namespace LeanCloud.Realtime.Internal.Controller {
             GenericCommand request = NewCommand(CommandType.Logs, OpType.Open);
             request.LogsMessage = logs;
             GenericCommand response = await Client.Connection.SendRequest(request);
-            // TODO 反序列化聊天记录
-
-            return null;
+            // 反序列化聊天记录
+            return response.LogsMessage.Logs.Select(item => {
+                LCIMMessage message;
+                if (item.Bin) {
+                    // 二进制消息
+                    byte[] bytes = Convert.FromBase64String(item.Data);
+                    message = LCIMBinaryMessage.Deserialize(bytes);
+                } else {
+                    // 类型消息
+                    message = LCIMTypedMessage.Deserialize(item.Data);
+                }
+                message.ConversationId = convId;
+                message.Id = item.MsgId;
+                message.FromClientId = item.From;
+                message.SentTimestamp = item.Timestamp;
+                message.DeliveredTimestamp = item.AckAt;
+                message.ReadTimestamp = item.ReadAt;
+                message.PatchedTimestamp = item.PatchTimestamp;
+                message.MentionAll = item.MentionAll;
+                message.MentionIdList = item.MentionPids.ToList();
+                return message;
+            }).ToList().AsReadOnly();
         }
 
         /// <summary>
@@ -182,8 +202,6 @@ namespace LeanCloud.Realtime.Internal.Controller {
 
         internal override async Task OnNotification(GenericCommand notification) {
             DirectCommand direct = notification.DirectMessage;
-            // 通知服务端已接收
-            _ = Ack(direct.Cid, direct.Id);
             // 反序列化消息
             LCIMMessage message;
             if (direct.HasBinaryMsg) {
@@ -199,6 +217,14 @@ namespace LeanCloud.Realtime.Internal.Controller {
             message.Id = direct.Id;
             message.FromClientId = direct.FromPeerId;
             message.SentTimestamp = direct.Timestamp;
+            message.MentionAll = direct.MentionAll;
+            message.MentionIdList = direct.MentionPids.ToList();
+            message.PatchedTimestamp = direct.PatchTimestamp;
+            message.IsTransient = direct.Transient;
+            // 通知服务端已接收
+            if (!message.IsTransient) {
+                _ = Ack(message.ConversationId, message.Id);
+            }
             // 获取对话
             LCIMConversation conversation = await Client.GetOrQueryConversation(direct.Cid);
             conversation.LastMessage = message;