Fixes on draft

Author: dena-sohrabi

apple/InlineKit/Sources/InlineKit/ApiClient.swift

@@ -479,7 +479,6 @@ public final class ApiClient: ObservableObject, @unchecked Sendable {
   public func updateDialog(
     peerId: Peer,
     pinned: Bool?,
-    draft: String?,
     archived: Bool?
   ) async throws -> UpdateDialog {
     var queryItems: [URLQueryItem] = []
@@ -493,9 +492,6 @@ public final class ApiClient: ObservableObject, @unchecked Sendable {
       queryItems.append(URLQueryItem(name: "pinned", value: "\(pinned)"))
     }
 
-    if let draft {
-      queryItems.append(URLQueryItem(name: "draft", value: draft))
-    }
     if let archived {
       queryItems.append(URLQueryItem(name: "archived", value: "\(archived)"))
     }

apple/InlineKit/Sources/InlineKit/DataManager.swift

@@ -247,12 +247,8 @@ public class DataManager: ObservableObject {
           try chat.save(db, onConflict: .replace)
         }
 
-        // Finally save dialogs
-        let dialogs = result.dialogs.map { dialog in
-          Dialog(from: dialog)
-        }
-        try dialogs.forEach { dialog in
-          try dialog.save(db, onConflict: .replace)
+        try result.dialogs.forEach { dialog in
+          try dialog.saveFull(db)
         }
 
         return chats
@@ -437,29 +433,11 @@ public class DataManager: ObservableObject {
       return
     }
 
-    let result = try await ApiClient.shared.updateDialog(
+    _ = try await ApiClient.shared.updateDialog(
       peerId: peerId,
       pinned: pinned,
-      draft: draft,
       archived: archived == nil ? updatedDialog.archived : archived
     )
-
-    // Note(@Mo): don't do too many DB writes
-//    try await database.dbWriter.write { db in
-//      var dialog = Dialog(from: result.dialog)
-//      if archived != nil {
-//        dialog.archived = archived
-//      }
-//
-//      try dialog.save(db, onConflict: .replace)
-//    }
-  }
-
-  public func getDraft(peerId: Peer) async throws -> String? {
-    try await database.dbWriter.read { db in
-      let dialog = try Dialog.fetchOne(db, id: Dialog.getDialogId(peerId: peerId))
-      return dialog?.draft
-    }
   }
 
   public func getSpace(spaceId: Int64) async throws {

apple/InlineKit/Sources/InlineKit/Models/Dialog.swift

@@ -8,7 +8,6 @@ public struct ApiDialog: Codable, Hashable, Sendable {
   public var unreadCount: Int?
   public var readInboxMaxId: Int64?
   public var readOutboxMaxId: Int64?
-  public var draft: String?
   public var archived: Bool?
 }
 
@@ -65,7 +64,6 @@ public extension Dialog {
     readInboxMaxId = from.readInboxMaxId
     readOutboxMaxId = from.readOutboxMaxId
     pinned = from.pinned
-    draft = from.draft
     archived = from.archived
     unreadCount = from.unreadCount
   }
@@ -116,6 +114,23 @@ public extension Dialog {
   }
 }
 
+public extension ApiDialog {
+  @discardableResult
+  func saveFull(
+    _ db: Database
+  )
+    throws -> Dialog
+  {
+    let existing = try? Dialog.fetchOne(db, id: Dialog.getDialogId(peerId: peerId))
+    var dialog = Dialog(from: self)
+    if let existing {
+      dialog.draft = existing.draft
+      try dialog.save(db)
+    }
+    return dialog
+  }
+}
+
 public extension Dialog {
   static func get(peerId: Peer) -> QueryInterfaceRequest<Dialog> {
     Dialog

apple/InlineKit/Sources/InlineKit/Models/Message.swift

@@ -38,6 +38,7 @@ public struct Message: FetchableRecord, Identifiable, Codable, Hashable, Persist
     globalId ?? 0
   }
 
+  /// @Deprecated
   public var id: Int64 {
     // this is wrong
     messageId
@@ -324,7 +325,6 @@ public extension Message {
           try? await ApiClient.shared.updateDialog(
             peerId: peer,
             pinned: nil,
-            draft: nil,
             archived: false
           )
         }
@@ -347,6 +347,7 @@ public extension ApiMessage {
       message.globalId = existing.globalId
       message.status = existing.status
       message.fileId = existing.fileId
+      message.text = existing.text
       // ... anything else?
     } else {
       // attach main photo