From 7e0454c7c43e5f29da2d6833bcd3e19927dedcb5 Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Tue, 16 Feb 2021 21:44:27 +0530
Subject: [PATCH] [LLC] Fix tests

Signed-off-by: Sahil Kumar <xdsahil@gmail.com>
---
 packages/stream_chat/lib/src/api/channel.dart | 84 +++++++++----------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/packages/stream_chat/lib/src/api/channel.dart b/packages/stream_chat/lib/src/api/channel.dart
index bbe1d762..1b802b4e 100644
--- a/packages/stream_chat/lib/src/api/channel.dart
+++ b/packages/stream_chat/lib/src/api/channel.dart
@@ -301,19 +301,17 @@ class Channel {
       user: _client.state.user,
       quotedMessage: quotedMessage,
       status: MessageSendingStatus.sending,
-      attachments: [
-        ...message.attachments.map(
-          (it) {
-            if (it.uploadState.isSuccess) return it;
-            return it.copyWith(
-              uploadState: UploadState.inProgress(
-                uploaded: 0,
-                total: it.file?.size ?? it.extraData['file_size'],
-              ),
-            );
-          },
-        )
-      ],
+      attachments: message.attachments?.map(
+        (it) {
+          if (it.uploadState.isSuccess) return it;
+          return it.copyWith(
+            uploadState: UploadState.inProgress(
+              uploaded: 0,
+              total: it.file?.size ?? it.extraData['file_size'],
+            ),
+          );
+        },
+      )?.toList(),
     );
 
     if (message.parentId != null && message.id == null) {
@@ -328,16 +326,18 @@ class Channel {
     state?.addMessage(message);
 
     try {
-      final attachmentsUploadCompleter = Completer<Message>();
-      _messageAttachmentsUploadCompleter[message.id] =
-          attachmentsUploadCompleter;
+      if (message.attachments?.isNotEmpty == true) {
+        final attachmentsUploadCompleter = Completer<Message>();
+        _messageAttachmentsUploadCompleter[message.id] =
+            attachmentsUploadCompleter;
 
-      unawaited(_uploadAttachments(
-        message.id,
-        message.attachments.map((it) => it.id),
-      ));
+        unawaited(_uploadAttachments(
+          message.id,
+          message.attachments.map((it) => it.id),
+        ));
 
-      message = await attachmentsUploadCompleter.future;
+        message = await attachmentsUploadCompleter.future;
+      }
 
       final response = await _client.post(
         '$_channelURL/message',
@@ -374,34 +374,34 @@ class Channel {
     message = message.copyWith(
       status: MessageSendingStatus.updating,
       updatedAt: message.updatedAt ?? DateTime.now(),
-      attachments: [
-        ...message.attachments.map(
-          (it) {
-            if (it.uploadState.isSuccess) return it;
-            return it.copyWith(
-              uploadState: UploadState.inProgress(
-                uploaded: 0,
-                total: it.file?.size ?? it.extraData['file_size'],
-              ),
-            );
-          },
-        )
-      ],
+      attachments: message.attachments?.map(
+        (it) {
+          if (it.uploadState.isSuccess) return it;
+          return it.copyWith(
+            uploadState: UploadState.inProgress(
+              uploaded: 0,
+              total: it.file?.size ?? it.extraData['file_size'],
+            ),
+          );
+        },
+      )?.toList(),
     );
 
     state?.addMessage(message);
 
     try {
-      final attachmentsUploadCompleter = Completer<Message>();
-      _messageAttachmentsUploadCompleter[message.id] =
-          attachmentsUploadCompleter;
+      if (message.attachments?.isNotEmpty == true) {
+        final attachmentsUploadCompleter = Completer<Message>();
+        _messageAttachmentsUploadCompleter[message.id] =
+            attachmentsUploadCompleter;
 
-      unawaited(_uploadAttachments(
-        message.id,
-        message.attachments.map((it) => it.id),
-      ));
+        unawaited(_uploadAttachments(
+          message.id,
+          message.attachments.map((it) => it.id),
+        ));
 
-      message = await attachmentsUploadCompleter.future;
+        message = await attachmentsUploadCompleter.future;
+      }
 
       final response = await _client.updateMessage(message);
       state?.addMessage(response?.message?.copyWith(