Merge pull request #4 from QuickBlox/release/0.1.2

Release QuickBlox UIKit 0.1.2

Author: VladimirNybozhinsky

.DS_Store

@@ -15,6 +15,8 @@ public struct RemoteDialogDTO: Equatable {
     var type: DialogType = .private
     var name = ""
     var participantsIds: [String] = []
+    var toDeleteIds: [String] = []
+    var toAddIds: [String] = []
     var photo = ""
     var ownerId = ""
     var isOwnedByCurrentUser = false

Sources/.DS_Store

@@ -16,6 +16,8 @@ public enum RemoteEvent {
     case history(_ messages: RemoteMessagesDTO)
     case read( _ messageID: String, dialogID: String)
     case delivered( _ messageID: String, dialogID: String)
+    case typing( _ userID: UInt, dialogID: String)
+    case stopTyping( _ userID: UInt, dialogID: String)
 
     init(_ message: RemoteMessageDTO) {
         if message.type == .event {

Sources/QuickBloxData/.DS_Store

@@ -45,6 +45,10 @@ extension DialogsRepository: DialogsRepositoryProtocol {
                         return .read(messageID, dialogID: dialogID)
                     case .delivered(let messageID, let dialogID):
                         return .delivered(messageID, dialogID: dialogID)
+                    case .typing(let userID,let dialogID):
+                        return .typing(userID, dialogID: dialogID)
+                    case .stopTyping(let userID,let dialogID):
+                        return .stopTyping(userID, dialogID: dialogID)
                     }
                 }
                 .eraseToAnyPublisher()
@@ -182,6 +186,30 @@ extension DialogsRepository: DialogsRepositoryProtocol {
             throw try error.repositoryException
         }
     }
+    
+    public func subscribeToObserveTyping(dialog dialogId: String) async throws {
+        do {
+            try await remote.subscribeToObserveTyping(dialog: dialogId)
+        } catch {
+            throw try error.repositoryException
+        }
+    }
+    
+    public func sendTyping(dialogInRemote dialogId: String) async throws {
+        do {
+            try await remote.sendTyping(dialog: dialogId)
+        } catch {
+            throw try error.repositoryException
+        }
+    }
+    
+    public func sendStopTyping(dialogInRemote dialogId: String) async throws {
+        do {
+            try await remote.sendStopTyping(dialog: dialogId)
+        } catch {
+            throw try error.repositoryException
+        }
+    }
 }
 
 private extension RemoteDialogDTO {

Sources/QuickBloxData/DTO/Dialog/RemoteDialogDTO.swift

@@ -117,10 +117,10 @@ extension Message {
         isOwnedByCurrentUser = value.isOwnedByCurrentUser
         deliveredIds = value.deliveredIds
         readIds = value.readIds
-        isRead = value.isReaded
         isDelivered = value.isDelivered
-        type = value.type
+        isRead = value.isReaded
         eventType = value.eventType
+        type = value.type
         if let info = value.fileInfo {
             fileInfo = FileInfo(id: info.id,
                             ext: info.ext,

Sources/QuickBloxData/Event/RemoteEvent.swift

@@ -58,6 +58,23 @@ public struct Dialog: DialogEntity {
     }
 }
 
+public extension Dialog {
+    init<T: DialogEntity>(_ value: T) {
+        self.init(id: value.id,
+                  type: value.type,
+                  name: value.name,
+                  participantsIds: value.participantsIds,
+                  photo: value.photo,
+                  ownerId: value.ownerId,
+                  createdAt: value.createdAt,
+                  updatedAt: value.updatedAt,
+                  lastMessage: LastMessage(value.lastMessage),
+                  messages: value.messages.map{ Message($0) },
+                  unreadMessagesCount: value.unreadMessagesCount)
+        isOwnedByCurrentUser = value.isOwnedByCurrentUser
+    }
+}
+
 public struct LastMessage: LastMessageEntity {
     public var id: String = ""
 
@@ -81,3 +98,13 @@ public struct LastMessage: LastMessageEntity {
         self.dialogId = dialogId
     }
 }
+
+public extension LastMessage {
+    init<T: LastMessageEntity>(_ value: T) {
+        self.init(id: value.id,
+                  text: value.text,
+                  dateSent: value.dateSent,
+                  userId: value.userId,
+                  dialogId: value.dialogId)
+    }
+}

Sources/QuickBloxData/Repository/DialogsRepository.swift

@@ -47,6 +47,15 @@ public struct FileInfo: FileInfoEntity {
     }
 }
 
+public extension FileInfo {
+    init<T: FileInfoEntity>(_ value: T) {
+        self.init(id: value.id,
+                  ext: value.ext,
+                  name: value.name,
+                  path: FilePath(value.path))
+    }
+}
+
 public struct FilePath: FilePathEntity {
     public var remote = ""
     public var local = ""
@@ -61,3 +70,9 @@ public struct FilePath: FilePathEntity {
 
     public init() {}
 }
+
+public extension FilePath {
+    init<T: FilePathEntity>(_ value: T) {
+        self.init(remote: value.remote, local: value.local)
+    }
+}