Merge pull request #10 from QuickBlox/Release-0.1.6

VladimirNybozhinsky · web-flow · commit 6ae794a576cd · 2023-08-31T15:35:12.000+03:00
Release 0.1.6
diff --git a/Sources/QuickBloxData/DTO/File/LocalFileDTO.swift b/Sources/QuickBloxData/DTO/File/LocalFileDTO.swift
@@ -20,4 +20,5 @@ public struct LocalFileDTO: DataStringConvertible {
     public var type: FileType = .file
     public var data: Data = Data()
     public var path: FilePath = FilePath()
+    public var uid: String = ""
 }
diff --git a/Sources/QuickBloxData/DTO/File/RemoteFileDTO.swift b/Sources/QuickBloxData/DTO/File/RemoteFileDTO.swift
@@ -17,6 +17,7 @@ public struct RemoteFileDTO: DataStringConvertible {
     public var type: FileType = .file
     public var data: Data = Data()
     public var path: FilePath = FilePath()
+    public var uid: String = ""
     
     public var `public`: Bool = false
 }
diff --git a/Sources/QuickBloxData/DTO/Message/LocalMessageDTO.swift b/Sources/QuickBloxData/DTO/Message/LocalMessageDTO.swift
@@ -35,4 +35,5 @@ public struct LocalFileInfoDTO: Equatable, Identifiable, Hashable {
     var ext: FileExtension = .json
     var name: String = ""
     var path: FilePath = FilePath()
+    public var uid: String = ""
 }
diff --git a/Sources/QuickBloxData/DTO/Message/RemoteMessageDTO.swift b/Sources/QuickBloxData/DTO/Message/RemoteMessageDTO.swift
@@ -39,4 +39,5 @@ public struct RemoteFileInfoDTO: Equatable {
     var name = ""
     var type = ""
     var path = ""
+    var uid = ""
 }
diff --git a/Sources/QuickBloxData/Repository/FilesRepository.swift b/Sources/QuickBloxData/Repository/FilesRepository.swift
@@ -76,6 +76,7 @@ private extension LocalFileDTO {
         type = value.type
         data = value.data
         path = value.path
+        uid = value.uid
     }
 }
 
@@ -85,7 +86,8 @@ private extension File {
         info = FileInfo(id: value.id,
                         ext: value.ext,
                         name: value.name,
-                        path: value.path)
+                        path: value.path,
+                        uid: value.uid)
         data = value.data
     }
 }
@@ -96,7 +98,8 @@ private extension File {
         info = FileInfo(id: value.id,
                         ext: value.ext,
                         name: value.name,
-                        path: value.path)
+                        path: value.path,
+                        uid: value.uid)
         data = value.data
     }
 }
@@ -109,5 +112,6 @@ private extension LocalFileDTO {
         type = value.info.type
         path = value.info.path
         data = value.data
+        uid = value.info.uid
     }
 }
diff --git a/Sources/QuickBloxData/Repository/MessagesRepository.swift b/Sources/QuickBloxData/Repository/MessagesRepository.swift
@@ -44,6 +44,7 @@ extension LocalMessageDTO {
             fileInfo?.name = new.name
             fileInfo?.ext = new.ext
             fileInfo?.path = new.path
+            fileInfo?.uid = new.uid
         }
     }
 }
@@ -68,7 +69,8 @@ private extension RemoteMessageDTO {
                     id: file.id,
                     name: file.name,
                     type: file.ext.type.rawValue,
-                    path: file.path.remote
+                    path: file.path.remote,
+                    uid: file.uid
                 ))
         }
     }
@@ -105,6 +107,7 @@ extension Message {
                                 name: filesInfo.name)
             }
             fileInfo?.path.remote = filesInfo.path
+            fileInfo?.uid = filesInfo.uid
         }
     }
     
@@ -126,6 +129,7 @@ extension Message {
                             ext: info.ext,
                             name: info.name)
             fileInfo?.path = info.path
+            fileInfo?.uid = info.uid
         }
     }
 }
diff --git a/Sources/QuickBloxData/Source/Entity/File.swift b/Sources/QuickBloxData/Source/Entity/File.swift
@@ -30,6 +30,7 @@ public struct FileInfo: FileInfoEntity {
     public var name: String
     public var type: FileType
     public var path: FilePath
+    public var uid: String
     
     public init(id: String,
                 ext: FileExtension,
@@ -44,6 +45,7 @@ public struct FileInfo: FileInfoEntity {
         }
         type = ext.type
         path = FilePath()
+        uid = ""
     }
 }
 
@@ -52,7 +54,8 @@ public extension FileInfo {
         self.init(id: value.id,
                   ext: value.ext,
                   name: value.name,
-                  path: FilePath(value.path))
+                  path: FilePath(value.path),
+                  uid: value.uid)
     }
 }
 
diff --git a/Sources/QuickBloxData/Source/Remote/RemoteDataSource.swift b/Sources/QuickBloxData/Source/Remote/RemoteDataSource.swift
@@ -556,7 +556,6 @@ extension RemoteDataSource {
         system.dateSent = Date()
         
         system.recipientID = QBSession.current.currentUserID
-//        await stream.process(system)
         
         for id in dto.participantsIds {
             system.recipientID = UInt(id) ?? 0
@@ -893,6 +892,7 @@ extension RemoteDataSource {
             
             let fileName = blob.name ?? "file"
             let fileId = String(blob.id)
+            let fileUID = blob.uid ?? ""
             
             var fileExtension: FileExtension
             if let extStr = fileName.components(separatedBy: ".").last,
@@ -916,7 +916,8 @@ extension RemoteDataSource {
                                  name: fileName,
                                  type: fileExtension.type,
                                  data: dto.data,
-                                 path: filePath)
+                                 path: filePath,
+                                 uid: fileUID)
         } catch let nsError as NSError {
             throw try nsError.convertToRemoteException()
         } catch {
@@ -974,6 +975,7 @@ extension RemoteDataSource {
                 uploaded.name = fileName
                 uploaded.type = fileExtension.type
                 uploaded.path = filePath
+                uploaded.uid = uuid
                 return uploaded
             } catch let nsError as NSError {
                 throw try nsError.convertToRemoteException()
@@ -982,6 +984,10 @@ extension RemoteDataSource {
             }
         } else {
             var uploaded = try await get(fileWithPath: dto.id)
+            if uploaded.name.contains("json"), uploaded.ext != .json {
+                uploaded.name = uploaded.name.replacingOccurrences(of: "json",
+                                                             with: uploaded.ext.rawValue)
+            }
             if dto.name.contains(dto.ext.rawValue) {
                 let fileName = dto.name.replacingOccurrences(of: dto.ext.rawValue,
                                                              with: "")
@@ -1425,7 +1431,8 @@ private extension QBRequest {
                              name: fileName,
                              type: fileExt.type,
                              data: data,
-                             path: filePath)
+                             path: filePath,
+                             uid: uuid ?? "")
     }
     
     static func delete(file id: UInt) async throws {
@@ -1645,7 +1652,9 @@ extension QBChatMessage {
         }
         
         attachments = value.filesInfo.compactMap {
-            return QBChatAttachment($0)
+            var attachment = QBChatAttachment($0)
+            attachment["uid"] = $0.uid
+            return attachment
         }
         
         delayed = value.delayed
@@ -1658,15 +1667,26 @@ extension QBChatMessage {
 
 private extension RemoteFileInfoDTO {
     init (_ value: QBChatAttachment) throws {
-        guard let id = value.id else {
-            let info = "\(String(describing: QBChatAttachment.self)) id is missing"
-            throw MapperException.incorrectData(description: info)
+        if let id = value.id {
+            self.id = id
+        } else {
+            if let urlPath = value.url, let url = URL(string: urlPath) {
+                self.id = url.lastPathComponent
+            }
+            if let uid = value.customParameters?["uid"] {
+                self.id = uid
+            }
+            if let contentType = value["content-type"] {
+                type = contentType
+            }
         }
-        self.id = id
         
         name = value.name ?? ""
         type = value.type ?? ""
         path = value.url ?? ""
+        if let uid = value.customParameters?["uid"] {
+            self.uid = uid
+        }
     }
 }
 
diff --git a/Sources/QuickBloxDomain/Entity/FileEntity.swift b/Sources/QuickBloxDomain/Entity/FileEntity.swift
@@ -28,6 +28,7 @@ public protocol FileInfoEntity: Entity {
     var name: String { get set }
     var type: FileType { get set }
     var path: PathItem { get set }
+    var uid: String { get set }
     
     init(id: String, ext: FileExtension, name: String)
 }
@@ -36,12 +37,13 @@ extension FileInfoEntity {
     public init(id: String,
                 ext: FileExtension,
                 name: String,
-                path: PathItem) {
+                path: PathItem,
+                uid: String) {
         self.init(id: id, ext: ext, name: name)
         self.name = name
-        self.name = name
         self.type = ext.type
         self.path = path
+        self.uid = uid
     }
 }
 
diff --git a/Sources/QuickBloxUIKit/SwiftUIView/Dialog/GroupDialogView.swift b/Sources/QuickBloxUIKit/SwiftUIView/Dialog/GroupDialogView.swift
@@ -79,9 +79,12 @@ public struct GroupDialogView<ViewModel: DialogViewModelProtocol>: View {
                                     if action == .play {
                                         viewModel.playAudio(data, action: action)
                                         tappedMessage = message
-                                    } else {
+                                    } else if action == .stop {
                                         viewModel.stopPlayng()
                                         tappedMessage = nil
+                                    } else if action == .save {
+                                        self.fileUrl = url
+                                        isFileExporterPresented = true
                                     }
                                 }
                             }, onAIFeature: { type, message in
@@ -188,9 +191,9 @@ public struct GroupDialogView<ViewModel: DialogViewModelProtocol>: View {
                     viewModel.sendStopTyping()
                     viewModel.stopPlayng()
                     isInfoPresented = true
-                    }))
-                    
-                        .sheet(isPresented: $isFileExporterPresented) {
+                }))
+            
+                .sheet(isPresented: $isFileExporterPresented) {
                     if let fileUrl = fileUrl {
                         ActivityViewController(activityItems: [fileUrl.lastPathComponent , fileUrl])
                     }
diff --git a/Sources/QuickBloxUIKit/SwiftUIView/Dialog/MessageRowView/InboundAudioMessageRow.swift b/Sources/QuickBloxUIKit/SwiftUIView/Dialog/MessageRowView/InboundAudioMessageRow.swift
@@ -96,6 +96,13 @@ public struct InboundAudioMessageRow<MessageItem: MessageEntity>: View {
         }
         .fixedSize(horizontal: false, vertical: true)
         .id(message.id)
+        .contextMenu {
+            Button {
+                save()
+            } label: {
+                Label("Save", systemImage: "folder")
+            }
+        }
     }
     
     private func play() {
@@ -106,6 +113,11 @@ public struct InboundAudioMessageRow<MessageItem: MessageEntity>: View {
             onTap(.play, data, url)
         }
     }
+    
+    private func save() {
+        guard let url = fileTuple?.url, let data = fileTuple?.data else { return }
+        onTap(.save, data, url)
+    }
 }
 
 import QuickBloxData
diff --git a/Sources/QuickBloxUIKit/SwiftUIView/Dialog/MessageRowView/OutboundAudioMessageRow.swift b/Sources/QuickBloxUIKit/SwiftUIView/Dialog/MessageRowView/OutboundAudioMessageRow.swift
@@ -89,7 +89,13 @@ public struct OutboundAudioMessageRow<MessageItem: MessageEntity>: View {
         }
         .fixedSize(horizontal: false, vertical: true)
         .id(message.id)
-        
+        .contextMenu {
+            Button {
+                save()
+            } label: {
+                Label("Save", systemImage: "folder")
+            }
+        }
     }
     
     private func play() {
@@ -100,6 +106,11 @@ public struct OutboundAudioMessageRow<MessageItem: MessageEntity>: View {
             onTap(.play, data, url)
         }
     }
+    
+    private func save() {
+        guard let url = fileTuple?.url, let data = fileTuple?.data else { return }
+        onTap(.save, data, url)
+    }
 }
 
 import QuickBloxData
diff --git a/Sources/QuickBloxUIKit/SwiftUIView/Dialog/PrivateDialogView.swift b/Sources/QuickBloxUIKit/SwiftUIView/Dialog/PrivateDialogView.swift
@@ -79,9 +79,12 @@ public struct PrivateDialogView<ViewModel: DialogViewModelProtocol>: View  {
                                     if action == .play {
                                         viewModel.playAudio(data, action: action)
                                         tappedMessage = message
-                                    } else {
+                                    } else if action == .stop {
                                         viewModel.stopPlayng()
                                         tappedMessage = nil
+                                    } else if action == .save {
+                                        self.fileUrl = url
+                                        isFileExporterPresented = true
                                     }
                                 }
                             }, onAIFeature: { type, message in
diff --git a/Sources/QuickBloxUIKit/ViewModel/DialogsViewModel.swift b/Sources/QuickBloxUIKit/ViewModel/DialogsViewModel.swift
@@ -66,6 +66,7 @@ open class DialogsViewModel: DialogsListProtocol {
                 if dialogId == self?.selectedItem?.id {
                     self?.selectedItem = nil
                 }
+                self?.dialogToBeDeleted = nil
             }
             .store(in: &cancellables)
         

Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,5 @@ public struct LocalFileDTO: DataStringConvertible {`
`20`	`20`	`public var type: FileType = .file`
`21`	`21`	`public var data: Data = Data()`
`22`	`22`	`public var path: FilePath = FilePath()`
	`23`	`+ public var uid: String = ""`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ public struct RemoteFileDTO: DataStringConvertible {`
`17`	`17`	`public var type: FileType = .file`
`18`	`18`	`public var data: Data = Data()`
`19`	`19`	`public var path: FilePath = FilePath()`
	`20`	`+ public var uid: String = ""`
`20`	`21`
`21`	`22`	public var `public`: Bool = false
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,5 @@ public struct LocalFileInfoDTO: Equatable, Identifiable, Hashable {`
`35`	`35`	`var ext: FileExtension = .json`
`36`	`36`	`var name: String = ""`
`37`	`37`	`var path: FilePath = FilePath()`
	`38`	`+ public var uid: String = ""`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,4 +39,5 @@ public struct RemoteFileInfoDTO: Equatable {`
`39`	`39`	`var name = ""`
`40`	`40`	`var type = ""`
`41`	`41`	`var path = ""`
	`42`	`+ var uid = ""`
`42`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ private extension LocalFileDTO {`
`76`	`76`	`type = value.type`
`77`	`77`	`data = value.data`
`78`	`78`	`path = value.path`
	`79`	`+ uid = value.uid`
`79`	`80`	`}`
`80`	`81`	`}`
`81`	`82`
`@@ -85,7 +86,8 @@ private extension File {`
`85`	`86`	`info = FileInfo(id: value.id,`
`86`	`87`	`ext: value.ext,`
`87`	`88`	`name: value.name,`
`88`		`- path: value.path)`
	`89`	`+ path: value.path,`
	`90`	`+ uid: value.uid)`
`89`	`91`	`data = value.data`
`90`	`92`	`}`
`91`	`93`	`}`
`@@ -96,7 +98,8 @@ private extension File {`
`96`	`98`	`info = FileInfo(id: value.id,`
`97`	`99`	`ext: value.ext,`
`98`	`100`	`name: value.name,`
`99`		`- path: value.path)`
	`101`	`+ path: value.path,`
	`102`	`+ uid: value.uid)`
`100`	`103`	`data = value.data`
`101`	`104`	`}`
`102`	`105`	`}`
`@@ -109,5 +112,6 @@ private extension LocalFileDTO {`
`109`	`112`	`type = value.info.type`
`110`	`113`	`path = value.info.path`
`111`	`114`	`data = value.data`
	`115`	`+ uid = value.info.uid`
`112`	`116`	`}`
`113`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ extension LocalMessageDTO {`
`44`	`44`	`fileInfo?.name = new.name`
`45`	`45`	`fileInfo?.ext = new.ext`
`46`	`46`	`fileInfo?.path = new.path`
	`47`	`+ fileInfo?.uid = new.uid`
`47`	`48`	`}`
`48`	`49`	`}`
`49`	`50`	`}`
`@@ -68,7 +69,8 @@ private extension RemoteMessageDTO {`
`68`	`69`	`id: file.id,`
`69`	`70`	`name: file.name,`
`70`	`71`	`type: file.ext.type.rawValue,`
`71`		`- path: file.path.remote`
	`72`	`+ path: file.path.remote,`
	`73`	`+ uid: file.uid`
`72`	`74`	`))`
`73`	`75`	`}`
`74`	`76`	`}`
`@@ -105,6 +107,7 @@ extension Message {`
`105`	`107`	`name: filesInfo.name)`
`106`	`108`	`}`
`107`	`109`	`fileInfo?.path.remote = filesInfo.path`
	`110`	`+ fileInfo?.uid = filesInfo.uid`
`108`	`111`	`}`
`109`	`112`	`}`
`110`	`113`
`@@ -126,6 +129,7 @@ extension Message {`
`126`	`129`	`ext: info.ext,`
`127`	`130`	`name: info.name)`
`128`	`131`	`fileInfo?.path = info.path`
	`132`	`+ fileInfo?.uid = info.uid`
`129`	`133`	`}`
`130`	`134`	`}`
`131`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ public struct FileInfo: FileInfoEntity {`
`30`	`30`	`public var name: String`
`31`	`31`	`public var type: FileType`
`32`	`32`	`public var path: FilePath`
	`33`	`+ public var uid: String`
`33`	`34`
`34`	`35`	`public init(id: String,`
`35`	`36`	`ext: FileExtension,`
`@@ -44,6 +45,7 @@ public struct FileInfo: FileInfoEntity {`
`44`	`45`	`}`
`45`	`46`	`type = ext.type`
`46`	`47`	`path = FilePath()`
	`48`	`+ uid = ""`
`47`	`49`	`}`
`48`	`50`	`}`
`49`	`51`
`@@ -52,7 +54,8 @@ public extension FileInfo {`
`52`	`54`	`self.init(id: value.id,`
`53`	`55`	`ext: value.ext,`
`54`	`56`	`name: value.name,`
`55`		`- path: FilePath(value.path))`
	`57`	`+ path: FilePath(value.path),`
	`58`	`+ uid: value.uid)`
`56`	`59`	`}`
`57`	`60`	`}`
`58`	`61`