Fix draft attachments being sent with local file urls to the server (#964)

* Fix draft attachments sent to the server with local file url

* Add test coverage

* Update CHANGELOG.md

Author: nuno-vieira

CHANGELOG.md

@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fix composer not showing images in the composer when editing signed attachments [#956](https://github.com/GetStream/stream-chat-swiftui/pull/956)
 - Fix replacing an image while editing a message not showing the new image in the message list [#956](https://github.com/GetStream/stream-chat-swiftui/pull/956)
 - Improve precision when scrolling to the newest message with long text [#958](https://github.com/GetStream/stream-chat-swiftui/pull/958)
+- Fix draft attachments being sent with local file urls to the server [#964](https://github.com/GetStream/stream-chat-swiftui/pull/964)
 ### 🔄 Changed
 - Change the gallery header view to show the message timestamp instead of online status [#962](https://github.com/GetStream/stream-chat-swiftui/pull/962)
 

Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerViewModel.swift

@@ -1041,6 +1041,9 @@ class MessageAttachmentsConverter {
         guard let filePayload = attachment.attachment(payloadType: FileAttachmentPayload.self) else {
             return nil
         }
+        if let localUrl = attachment.uploadingState?.localFileURL {
+            return FileAddedAsset(url: localUrl)
+        }
         return FileAddedAsset(
             url: filePayload.assetURL,
             payload: filePayload.payload
@@ -1053,7 +1056,20 @@ class MessageAttachmentsConverter {
         guard let videoAttachment = attachment.attachment(payloadType: VideoAttachmentPayload.self) else {
             return nil
         }
-        guard let thumbnail = attachment.imageThumbnail(for: videoAttachment.payload) else { return nil }
+        guard let thumbnail = attachment.imageThumbnail(for: videoAttachment.payload) else {
+            return nil
+        }
+
+        if let localUrl = attachment.uploadingState?.localFileURL {
+            return AddedAsset(
+                image: thumbnail,
+                id: videoAttachment.id.rawValue,
+                url: localUrl,
+                type: .video,
+                extraData: videoAttachment.extraData ?? [:]
+            )
+        }
+
         return AddedAsset(
             image: thumbnail,
             id: videoAttachment.id.rawValue,
@@ -1072,6 +1088,20 @@ class MessageAttachmentsConverter {
             return completion(nil)
         }
 
+        if let localFileUrl = attachment.uploadingState?.localFileURL,
+           let imageData = try? Data(contentsOf: localFileUrl),
+           let image = UIImage(data: imageData) {
+            let imageAsset = AddedAsset(
+                image: image,
+                id: imageAttachment.id.rawValue,
+                url: localFileUrl,
+                type: .image,
+                extraData: imageAttachment.extraData ?? [:]
+            )
+            completion(imageAsset)
+            return
+        }
+
         utils.imageLoader.loadImage(
             url: imageAttachment.imageURL,
             imageCDN: utils.imageCDN,

StreamChatSwiftUI.xcodeproj/project.pbxproj

@@ -527,6 +527,7 @@
 		AD3AB65C2CB730090014D4D7 /* Shimmer.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD3AB65B2CB730090014D4D7 /* Shimmer.swift */; };
 		AD3AB65E2CB731360014D4D7 /* ChatThreadListLoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD3AB65D2CB731360014D4D7 /* ChatThreadListLoadingView.swift */; };
 		AD3AB6602CB7403C0014D4D7 /* ChatThreadListHeaderViewModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD3AB65F2CB7403C0014D4D7 /* ChatThreadListHeaderViewModifier.swift */; };
+		AD3DB8342E7C7BD50023D377 /* MessageAttachmentsConverter_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD3DB8332E7C7BD50023D377 /* MessageAttachmentsConverter_Tests.swift */; };
 		AD3DB82F2E7C2E190023D377 /* GalleryHeaderViewDateFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD3DB82E2E7C2E190023D377 /* GalleryHeaderViewDateFormatter.swift */; };
 		AD51D9182DB9543A0068D0B0 /* MessageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD51D9172DB9543A0068D0B0 /* MessageViewModel.swift */; };
 		AD5C0A5F2D6FDD9700E1E500 /* BouncedMessageActionsModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD5C0A5E2D6FDD8600E1E500 /* BouncedMessageActionsModifier.swift */; };
@@ -1141,6 +1142,7 @@
 		AD3AB65B2CB730090014D4D7 /* Shimmer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Shimmer.swift; sourceTree = "<group>"; };
 		AD3AB65D2CB731360014D4D7 /* ChatThreadListLoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatThreadListLoadingView.swift; sourceTree = "<group>"; };
 		AD3AB65F2CB7403C0014D4D7 /* ChatThreadListHeaderViewModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatThreadListHeaderViewModifier.swift; sourceTree = "<group>"; };
+		AD3DB8332E7C7BD50023D377 /* MessageAttachmentsConverter_Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageAttachmentsConverter_Tests.swift; sourceTree = "<group>"; };
 		AD3DB82E2E7C2E190023D377 /* GalleryHeaderViewDateFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GalleryHeaderViewDateFormatter.swift; sourceTree = "<group>"; };
 		AD51D9172DB9543A0068D0B0 /* MessageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageViewModel.swift; sourceTree = "<group>"; };
 		AD5C0A5E2D6FDD8600E1E500 /* BouncedMessageActionsModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BouncedMessageActionsModifier.swift; sourceTree = "<group>"; };
@@ -2165,9 +2167,10 @@
 		84C94D472758BDB2007FE2B9 /* ChatChannel */ = {
 			isa = PBXGroup;
 			children = (
-				AD9138AF2E7241D900581EB0 /* FileAttachmentView_Tests.swift */,
 				846B15F22817E7440017F7A1 /* ChannelInfo */,
 				8423C340277CB5C70092DCF1 /* Suggestions */,
+				AD3DB8332E7C7BD50023D377 /* MessageAttachmentsConverter_Tests.swift */,
+				AD9138AF2E7241D900581EB0 /* FileAttachmentView_Tests.swift */,
 				84779C742AEBBACD000A6A68 /* BottomReactionsView_Tests.swift */,
 				ADA77F042E1EC2B700A3641F /* MessageAvatarView_Tests.swift */,
 				844D1D672851DE58000CCCB9 /* ChannelControllerFactory_Tests.swift */,
@@ -3095,6 +3098,7 @@
 				84E04796284A444E00BAFA17 /* EventBatcherMock.swift in Sources */,
 				ADE442F22CBDAAC40066CDF7 /* ChatThreadListItemView_Tests.swift in Sources */,
 				84E57C5B28103822002213C1 /* TestDataModel.xcdatamodeld in Sources */,
+				AD3DB8342E7C7BD50023D377 /* MessageAttachmentsConverter_Tests.swift in Sources */,
 				84E04792284A444E00BAFA17 /* MockBackgroundTaskScheduler.swift in Sources */,
 				84C94D1327578BF2007FE2B9 /* XCTestCase+MockJSON.swift in Sources */,
 				84C94D5E275A3AA9007FE2B9 /* ImageCDN_Tests.swift in Sources */,