Pass extra data in attachments

Author: martinmitrevski

Sources/StreamChatSwiftUI/ChatChannel/Composer/AddedImageAttachmentsView.swift

@@ -1,5 +1,5 @@
 //
-// Copyright © 2022 Stream.io Inc. All rights reserved.
+// Copyright © 2023 Stream.io Inc. All rights reserved.
 //
 
 import SwiftUI
@@ -44,7 +44,7 @@ public struct AddedImageAttachmentsView: View {
                                     if attachment.type == .video {
                                         VideoIndicatorView()
 
-                                        if let duration = attachment.extraData["duration"] as? String {
+                                        if let duration = attachment.extraData["duration"]?.stringValue {
                                             VideoDurationIndicatorView(duration: duration)
                                         }
                                     }

Sources/StreamChatSwiftUI/ChatChannel/Composer/ComposerModels.swift

@@ -1,5 +1,5 @@
 //
-// Copyright © 2022 Stream.io Inc. All rights reserved.
+// Copyright © 2023 Stream.io Inc. All rights reserved.
 //
 
 import StreamChat
@@ -24,14 +24,14 @@ public struct AddedAsset: Identifiable, Equatable {
     public let id: String
     public let url: URL
     public let type: AssetType
-    public var extraData: [String: Any] = [:]
+    public var extraData: [String: RawJSON] = [:]
 
     public init(
         image: UIImage,
         id: String,
         url: URL,
         type: AssetType,
-        extraData: [String: Any] = [:]
+        extraData: [String: RawJSON] = [:]
     ) {
         self.image = image
         self.id = id
@@ -41,6 +41,16 @@ public struct AddedAsset: Identifiable, Equatable {
     }
 }
 
+extension AddedAsset {
+    func toAttachmentPayload() throws -> AnyAttachmentPayload {
+        try AnyAttachmentPayload(
+            localFileURL: url,
+            attachmentType: type == .video ? .video : .image,
+            extraData: extraData
+        )
+    }
+}
+
 /// Type of asset added to the composer.
 public enum AssetType {
     case image

Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerViewModel.swift

@@ -1,5 +1,5 @@
 //
-// Copyright © 2022 Stream.io Inc. All rights reserved.
+// Copyright © 2023 Stream.io Inc. All rights reserved.
 //
 
 import Combine
@@ -204,13 +204,7 @@ open class MessageComposerViewModel: ObservableObject {
         }
 
         do {
-            var attachments = try addedAssets.map { added in
-                try AnyAttachmentPayload(
-                    localFileURL: added.url,
-                    attachmentType: added.type == .video ? .video : .image
-                )
-            }
-            
+            var attachments = try addedAssets.map { try $0.toAttachmentPayload() }
             attachments += try addedFileURLs.map { url in
                 _ = url.startAccessingSecurityScopedResource()
                 return try AnyAttachmentPayload(localFileURL: url, attachmentType: .file)

Sources/StreamChatSwiftUI/ChatChannel/Composer/PhotoAttachmentPickerView.swift

@@ -1,5 +1,5 @@
 //
-// Copyright © 2022 Stream.io Inc. All rights reserved.
+// Copyright © 2023 Stream.io Inc. All rights reserved.
 //
 
 import Photos
@@ -94,7 +94,8 @@ public struct PhotoAttachmentCell: View {
                                                 id: asset.localIdentifier,
                                                 url: assetURL,
                                                 type: assetType,
-                                                extraData: asset.mediaType == .video ? ["duration": asset.durationString] : [:]
+                                                extraData: asset
+                                                    .mediaType == .video ? ["duration": .string(asset.durationString)] : [:]
                                             )
                                         )
                                     }

StreamChatSwiftUITests/Tests/ChatChannel/MessageComposerViewModel_Tests.swift

@@ -1,5 +1,5 @@
 //
-// Copyright © 2022 Stream.io Inc. All rights reserved.
+// Copyright © 2023 Stream.io Inc. All rights reserved.
 //
 
 @testable import StreamChat
@@ -554,6 +554,29 @@ class MessageComposerViewModel_Tests: StreamChatTestCase {
         XCTAssert(viewModel.mentionedUsers.isEmpty)
     }
 
+    func test_addedAsset_extraData() {
+        // Given
+        let image = UIImage(systemName: "person")!
+        let url = URL.newTemporaryFileURL()
+        let addedAsset = AddedAsset(
+            image: image,
+            id: "imageId",
+            url: url,
+            type: .image,
+            extraData: ["test": "test"]
+        )
+        
+        // When
+        try! image.pngData()?.write(to: url)
+        let attachment = try! addedAsset.toAttachmentPayload()
+        let payload = attachment.payload as! ImageAttachmentPayload
+        let extraData = payload.extraData
+        
+        // Then
+        XCTAssert(extraData?["test"] == "test")
+        try! FileManager.default.removeItem(at: url)
+    }
+    
     // MARK: - private
 
     private func makeComposerViewModel() -> MessageComposerViewModel {