Merge pull request #198 from GetStream/feature/uni-93-cleanup-after-release

Refactor to reduce nesting

Author: sierpinskid

Assets/Plugins/StreamChat/Core/StatefulModels/StreamChannel.cs

@@ -840,34 +840,34 @@ private void AssertCid(string cid)
         private bool InternalAppendOrUpdateMessage(MessageInternalDTO dto, out StreamMessage streamMessage)
         {
             streamMessage = Cache.TryCreateOrUpdate(dto, out var wasCreated);
-            if (wasCreated)
+            var isNewMessage = wasCreated && !_messages.ContainsNoAlloc(streamMessage);
+            if (!isNewMessage)
             {
-                if (!_messages.ContainsNoAlloc(streamMessage))
-                {
-                    var lastMessage = _messages.LastOrDefault();
-
-                    try
-                    {
-                        _messages.Add(streamMessage);
-                    }
-                    catch
-                    {
-                        streamMessage = null;
-                        return false;
-                    }
+                return true;
+            }
+            
+            var lastMessage = _messages.LastOrDefault();
 
-                    // If local user sends message during the sync operation.
-                    // It is possible that the locally sent message will be added before the /sync endpoint returns past message events
-                    if (lastMessage != null && streamMessage.CreatedAt < lastMessage.CreatedAt)
-                    {
-                        //StreamTodo: test this more. One way is to toggle Ethernet on PC and send messages from Android client
-                        _messages.Sort(_messageCreateAtComparer);
-                    }
+            try
+            {
+                // Adding message can fail. For example, shadowed messages are ignored
+                _messages.Add(streamMessage);
+            }
+            catch
+            {
+                streamMessage = null;
+                return false;
+            }
 
-                    MessageReceived?.Invoke(this, streamMessage);
-                }
+            // If local user sends message during the sync operation.
+            // It is possible that the locally sent message will be added before the /sync endpoint returns past message events
+            if (lastMessage != null && streamMessage.CreatedAt < lastMessage.CreatedAt)
+            {
+                //StreamTodo: test this more. One way is to toggle Ethernet on PC and send messages from Android client
+                _messages.Sort(_messageCreateAtComparer);
             }
 
+            MessageReceived?.Invoke(this, streamMessage);
             return true;
         }
 

Assets/Plugins/StreamChat/Tests/StatefulClient/ChannelsModerationTests.cs

@@ -37,7 +37,7 @@ private async Task When_client_sends_message_shadowed_by_ai_moderation_expect_ot
             Assert.IsTrue(channel.Messages.Contains(normalMessage));
 
             // Wait for other client to receive the message
-            await WaitWhileFalseAsync(() => otherClientChannel.Messages.Any(m => m.Id == normalMessage.Id));
+            await WaitWhileFalseAsync(() => otherClientChannel.Messages.Any(m => m.Id == normalMessage.Id), maxSeconds: 20);
 
             Assert.IsNotNull(otherClientChannel.Messages.Single(m => m.Id == normalMessage.Id));
 
@@ -54,7 +54,7 @@ private async Task When_client_sends_message_shadowed_by_ai_moderation_expect_ot
             Assert.IsTrue(channel.Messages.Contains(offensiveMessage));
 
             // Wait for other client to receive the offensive message
-            await WaitWhileFalseAsync(() => messagesReceivedOnOtherClient.Any(m => m.Message.Id == offensiveMessage.Id));
+            await WaitWhileFalseAsync(() => messagesReceivedOnOtherClient.Any(m => m.Message.Id == offensiveMessage.Id), maxSeconds: 20);
 
             // Other client should have the offensive message shadowed
             Assert.IsFalse(otherClientChannel.Messages.Any(m => m.Id == offensiveMessage.Id));