fix: merge props after creating conv

leancloud · Jun 20, 2023 · e8d6f66 · e8d6f66
1 parent c3e91ea
commit e8d6f66
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/Realtime/Realtime.Test/Client.cs b/Realtime/Realtime.Test/Client.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Threading.Tasks;
 using System.Collections.ObjectModel;
+using System.Collections.Generic;
 using LeanCloud;
 using LeanCloud.Realtime;
 using LeanCloud.Storage;
@@ -63,16 +64,23 @@ public async Task CreateConversation() {
                 WriteLine(conv.CreatorId);
             };
 
+            string name = Guid.NewGuid().ToString();
+
             client.OnMembersJoined = (conv, memberList, initBy) => {
+                WriteLine($"custom id: {conv["custom_id"]}");
+                Assert.AreEqual(conv["custom_id"], name);
                 WriteLine($"on members joined: {initBy}");
                 foreach (string memberId in conv.MemberIds) {
                     WriteLine(memberId);
                 }
                 tcs.SetResult(null);
             };
 
-            string name = Guid.NewGuid().ToString();
-            LCIMConversation conversation = await client.CreateConversation(new string[] { "world" }, name: name, unique: false);
+            Dictionary<string, object> props = new Dictionary<string, object> {
+                { "custom_id", name }
+            };
+            LCIMConversation conversation = await client.CreateConversation(new string[] { "world" },
+                name: name, unique: false, properties: props);
 
             await tcs.Task;
         }

diff --git a/Realtime/Realtime/Internal/Controller/LCIMConversationController.cs b/Realtime/Realtime/Internal/Controller/LCIMConversationController.cs
@@ -76,6 +76,7 @@ internal async Task<LCIMConversation> CreateConv(
                 } else {
                     conversation = new LCIMConversation(Client);
                 }
+                conversation.MergeFrom(properties);
                 Client.ConversationDict[convId] = conversation;
             }
             // 合并请求数据

diff --git a/Realtime/Realtime/Public/Conversation/LCIMConversation.cs b/Realtime/Realtime/Public/Conversation/LCIMConversation.cs
@@ -491,6 +491,10 @@ internal static bool IsTemporayConversation(string convId) {
         }
 
         internal void MergeFrom(Dictionary<string, object> conv) {
+            if (conv == null) {
+                return;
+            }
+
             foreach (KeyValuePair<string, object> kv in conv) {
                 if (kv.Key == "objectId") {
                     Id = kv.Value as string;