implement message draft

Author: jakub-grzesiowski

c-sharp-chat/PubnubChatApi/PubNubChatApi.Tests/ChannelTests.cs

@@ -109,18 +109,6 @@ public async Task TestLeaveChannel()
 
         Assert.False(memberships.Memberships.Any(x => x.UserId == currentChatUser.Id), "Leave failed, current user found in channel memberships");
     }
-
-    [Test]
-    public async Task TestGetUserSuggestions()
-    {
-        var channel = await chat.CreatePublicConversation("user_suggestions_test_channel");
-        channel.Join();
-
-        await Task.Delay(5000);
-        
-        var suggestions = await channel.GetUserSuggestions("@Test");
-        Assert.True(suggestions.Any(x => x.UserId == user.Id));
-    }
 
     [Test]
     public async Task TestGetMemberships()

c-sharp-chat/PubnubChatApi/PubNubChatApi.Tests/MembershipTests.cs

@@ -22,6 +22,10 @@ public async Task Setup()
             SubscribeKey = PubnubTestsParameters.SubscribeKey
         });
         channel = await chat.CreatePublicConversation("membership_tests_channel");
+        if (channel == null)
+        {
+            Assert.Fail();
+        }
         if (!chat.TryGetCurrentUser(out user))
         {
             Assert.Fail();
@@ -34,6 +38,8 @@ public async Task Setup()
     [TearDown]
     public async Task CleanUp()
     {
+        await chat.PubnubInstance.RemoveMemberships().Channels(new List<string>() { "membership_tests_channel", "test_invite_group_channel" })
+            .Uuid("membership_tests_user_54").ExecuteAsync();
         channel.Leave();
         await Task.Delay(3000);
         chat.Destroy();
@@ -63,7 +69,9 @@ public async Task TestUpdateMemberships()
             CustomData = new Dictionary<string, object>()
             {
                 {"key", Guid.NewGuid().ToString()}
-            }
+            },
+            Type = "some_membership",
+            Status = "active"
         };
 
         var manualUpdatedEvent = new ManualResetEvent(false);

c-sharp-chat/PubnubChatApi/PubNubChatApi.Tests/MessageDraftTests.cs

@@ -77,10 +77,9 @@ void InsertDelegateCallback(List<MessageElement> elements, List<SuggestedMention
     }
 
     [Test]
-    public async Task TestInsertSuggestedMention()
+    public async Task TestInsertSuggestedMentionsAndSend()
     {
-        var messageDraft = channel.CreateMessageDraft();
-        messageDraft.SetSearchForSuggestions(true);
+        var messageDraft = channel.CreateMessageDraft(shouldSearchForSuggestions:true);
         var successReset = new ManualResetEvent(false);
         var step = "user_suggestion";
         messageDraft.OnDraftUpdated += (elements, mentions) =>
@@ -101,8 +100,7 @@ public async Task TestInsertSuggestedMention()
                     Assert.True(elements.Any(x => x.Text.Contains("Mock Usernamiski")));
                     successReset.Set();
                     break;
-                //TODO: to be re-enabled after Channel and Link mentions approach unification
-                /*case "channel_suggestion":
+                case "channel_suggestion":
                     var channelSuggestion =
                         mentions.FirstOrDefault(x => x.Target is { Target: "message_draft_tests_channel", Type: MentionType.Channel });
 
@@ -113,9 +111,13 @@ public async Task TestInsertSuggestedMention()
                     messageDraft.InsertSuggestedMention(channelSuggestion, channelSuggestion.ReplaceTo);
                     break;
                 case "channel_inserted":
-                    Assert.True(elements.Any(x => x.Text.Contains("MessageDraftTestingChannel")));
+                    Assert.True(elements.Any(x => x.Text.Contains("MessageDraftTestingChannel")), "channel wasn't inserted into MD");
+                    successReset.Set();
+                    break;
+                case "link_inserted":
+                    Assert.True(elements.Any(x => x.MentionTarget is {Type:MentionType.Url, Target:"www.pubnub.com"}), "text link wasn't insterted into MD");
                     successReset.Set();
-                    break;*/
+                    break;
                 default:
                     Assert.Fail("Unexpected draft update callback flow in test");
                     break;
@@ -124,57 +126,36 @@ public async Task TestInsertSuggestedMention()
         messageDraft.InsertText(0, "maybe i'll mention @Mock");
         var userInserted = successReset.WaitOne(5000);
         Assert.True(userInserted, "didn't receive user insertion callback");
-
-        //TODO: to be re-enabled after Channel and Link mentions approach unification
-        /*step = "channel_suggestion";
+        
+        step = "channel_suggestion";
         successReset = new ManualResetEvent(false);
         messageDraft.InsertText(0, "now mention #MessageDraft ");
         var channelInserted = successReset.WaitOne(5000);
         Assert.True(channelInserted, "didn't receive channel insertion callback");
 
+        step = "link_inserted";
+        successReset = new ManualResetEvent(false);
+        messageDraft.AddMention(0, 3, new MentionTarget(){Target = "www.pubnub.com", Type = MentionType.Url});
+        var linkAdded = successReset.WaitOne(5000);
+        Assert.True(channelInserted, "didn't receive text link insertion callback");
+
         var messageReset = new ManualResetEvent(false);
+        Message messageFromDraft = null;
         channel.OnMessageReceived += message =>
         {
-            Assert.True(message.ReferencedChannels.Any(x => x.Id == channel.Id), "received message doesn't contain expected referenced channel");
-            Assert.True(message.MentionedUsers.Any(x => x.Id == dummyUser.Id), "received message doesn't contain expected mentioned user");
+            messageFromDraft = message;
             messageReset.Set();
         };
         await messageDraft.Send();
         var receivedMessage = messageReset.WaitOne(10000);
-        Assert.True(receivedMessage, "didn't receive message callback");*/
-    }
-
-    //TODO: to be re-enabled after Channel and Link mentions approach unification
-    /*[Test]
-    public async Task TestAddAndSendTextLink()
-    {
-        var messageDraft = channel.CreateMessageDraft();
-        messageDraft.InsertText(0, "some text goes here");
-        var updateReset = new ManualResetEvent(false);
-        messageDraft.OnDraftUpdated += (elements, mentions) =>
+        Assert.True(receivedMessage, "didn't receive message callback");
+        if (messageFromDraft != null)
         {
-            Assert.True(elements.Any(x => x is { Text: "some", MentionTarget: {Target: "www.pubnub.com", Type: MentionType.Url} })
-                , "updated message draft doesn't contain expected element");
-            updateReset.Set();
-        };
-        messageDraft.AddMention(0, 4, new MentionTarget()
-        {
-            Target = "www.pubnub.com",
-            Type = MentionType.Url
-        });
-        var updated = updateReset.WaitOne(3000);
-        Assert.True(updated, "didn't receive md update callback");
-        
-        var messageReset = new ManualResetEvent(false);
-        channel.OnMessageReceived += message =>
-        {
-            Assert.True(message.TextLinks.Any(x => x.Link == "www.pubnub.com"), "didn't find expected link in received message");
-            messageReset.Set();
-        };
-        await messageDraft.Send();
-        var received = messageReset.WaitOne(6000);
-        Assert.True(received, "didn't receive message callback after md send");
-    }*/
+            Assert.True(messageFromDraft.TextLinks.Any(x => x.Link == "www.pubnub.com"), "received message doesn't contain expected text link");
+            Assert.True(messageFromDraft.ReferencedChannels.Any(x => x.Id == channel.Id), "received message doesn't contain expected referenced channel");
+            Assert.True(messageFromDraft.MentionedUsers.Any(x => x.Id == dummyUser.Id), "received message doesn't contain expected mentioned user");
+        }
+    }
 
     [Test]
     public async Task TestAddAndRemoveMention()

c-sharp-chat/PubnubChatApi/PubnubChatApi/Entities/Base/ChatEntity.cs

@@ -2,17 +2,20 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
+using PubnubApi;
 using PubnubChatApi.Utilities;
 
 namespace PubNubChatAPI.Entities
 {
     public abstract class ChatEntity
     {
-        public abstract Task Resync();
-
+        protected Subscription? updateSubscription;
+        
         public virtual void SetListeningForUpdates(bool listen)
         {
             throw new NotImplementedException();
         }
+        
+        public abstract Task Resync();
     }
 }

c-sharp-chat/PubnubChatApi/PubnubChatApi/Entities/Channel.cs

@@ -6,6 +6,7 @@
 using PubnubApi;
 using PubnubChatApi.Entities.Data;
 using PubnubChatApi.Entities.Events;
+using PubnubChatApi.Enums;
 using PubnubChatApi.Utilities;
 
 namespace PubNubChatAPI.Entities
@@ -309,12 +310,12 @@ public async Task EmitUserMention(string userId, string timeToken, string text)
 
         public async Task StartTyping()
         {
-            throw new NotImplementedException();
+            await chat.EmitEvent(PubnubChatEventType.Typing, Id, $"{{\"value\":true}}");
         }
 
         public async Task StopTyping()
         {
-            throw new NotImplementedException();
+            await chat.EmitEvent(PubnubChatEventType.Typing, Id, $"{{\"value\":false}}");
         }
 
         public virtual async Task PinMessage(Message message)
@@ -352,23 +353,19 @@ public bool TryGetPinnedMessage(out Message pinnedMessage)
             });
         }
 
-        public async Task<List<Membership>> GetUserSuggestions(string text, int limit = 10)
-        {
-            throw new NotImplementedException();
-        }
-
         /// <summary>
         /// Creates a new MessageDraft.
         /// </summary>
         /// <param name="userSuggestionSource">Source of the user suggestions</param>
         /// <param name="isTypingIndicatorTriggered">Typing indicator trigger status.</param>
         /// <param name="userLimit">User limit.</param>
         /// <param name="channelLimit">Channel limit.</param>
+        /// <param name="shouldSearchForSuggestions">Whether the MessageDraft should search for suggestions whenever the text is changed.</param>
         /// <returns></returns>
         public MessageDraft CreateMessageDraft(UserSuggestionSource userSuggestionSource = UserSuggestionSource.GLOBAL,
-            bool isTypingIndicatorTriggered = true, int userLimit = 10, int channelLimit = 10)
+            bool isTypingIndicatorTriggered = true, int userLimit = 10, int channelLimit = 10, bool shouldSearchForSuggestions = false)
         {
-            throw new NotImplementedException();
+            return new MessageDraft(chat, this, userSuggestionSource, isTypingIndicatorTriggered, userLimit, channelLimit, shouldSearchForSuggestions);
         }
 
         /// <summary>
@@ -607,8 +604,7 @@ public virtual async Task SendText(string message, SendTextParams sendTextParams
                     {"text", message},
                     {"type", "text"}
                 };
-                //TODO: "meta" here too?
-                var meta = new Dictionary<string, object>();
+                var meta = sendTextParams.Meta ?? new Dictionary<string, object>();
                 if (sendTextParams.QuotedMessage != null)
                 {
                     //TODO: may create some "ToJSON()" methods for chat entities
@@ -770,7 +766,21 @@ public async Task<bool> IsUserPresent(string userId)
         /// <seealso cref="IsUserPresent"/>
         public async Task<List<string>> WhoIsPresent()
         {
-            throw new NotImplementedException();
+            var result = new List<string>();
+            var response = await chat.PubnubInstance.HereNow().Channels(new[] { Id }).IncludeState(true)
+                .IncludeUUIDs(true).ExecuteAsync();
+            if (response.Status.Error)
+            {
+                chat.Logger.Error($"Error when trying to perform WhoIsPresent(): {response.Status.ErrorData.Information}");
+                return result;
+            }
+
+            foreach (var occupant in response.Result.Channels[Id].Occupants)
+            {
+                result.Add(occupant.Uuid);
+            }
+
+            return result;
         }
 
         /// <summary>