Bookmarks Refactor

- Don't do async loading stuff
- Move bookmarkmanager to damus state
- Remove bookmarks update notififcation and switch to observed object
- Switch api to use events explicitly instead of strings

damus/Models/BookmarksManager.swift

@@ -7,44 +7,65 @@
 
 import Foundation
 
-class BookmarksManager {
+fileprivate func get_bookmarks_key(pubkey: String) -> String {
+    pk_setting_key(pubkey, key: "bookmarks")
+}
+
+func load_bookmarks(pubkey: String) -> [NostrEvent] {
+    let key = get_bookmarks_key(pubkey: pubkey)
+    return (UserDefaults.standard.stringArray(forKey: key) ?? []).compactMap {
+        event_from_json(dat: $0)
+    }
+}
+
+func save_bookmarks(pubkey: String, current_value: [NostrEvent], value: [NostrEvent]) -> Bool {
+    let uniq_bookmarks = Array(Set(value))
+    
+    if uniq_bookmarks != current_value {
+        let encoded = uniq_bookmarks.map(event_to_json)
+        UserDefaults.standard.set(encoded, forKey: get_bookmarks_key(pubkey: pubkey))
+        return true
+    }
+    
+    return false
+}
+
+class BookmarksManager: ObservableObject {
     
     private let userDefaults = UserDefaults.standard
     private let pubkey: String
     
-    init(pubkey: String) {
-        self.pubkey = pubkey
-    }
-    
-    var bookmarks: [String] {
+    private var _bookmarks: [NostrEvent]
+    var bookmarks: [NostrEvent] {
         get {
-            return userDefaults.stringArray(forKey: storageKey()) ?? []
+            return _bookmarks
         }
         set {
-            let uniqueBookmarks = Array(Set(newValue))
-            if uniqueBookmarks != bookmarks {
-                userDefaults.set(uniqueBookmarks, forKey: storageKey())
+            if save_bookmarks(pubkey: pubkey, current_value: _bookmarks, value: newValue) {
+                self._bookmarks = newValue
+                self.objectWillChange.send()
             }
         }
     }
     
-    func isBookmarked(_ string: String) -> Bool {
-        return bookmarks.contains(string)
+    init(pubkey: String) {
+        self._bookmarks = load_bookmarks(pubkey: pubkey)
+        self.pubkey = pubkey
     }
     
-    func updateBookmark(_ string: String) {
-        if isBookmarked(string) {
-            bookmarks = bookmarks.filter { $0 != string }
+    func isBookmarked(_ ev: NostrEvent) -> Bool {
+        return bookmarks.contains(ev)
+    }
+    
+    func updateBookmark(_ ev: NostrEvent) {
+        if isBookmarked(ev) {
+            bookmarks = bookmarks.filter { $0 != ev }
         } else {
-            bookmarks.append(string)
+            bookmarks.append(ev)
         }
     }
     
     func clearAll() {
         bookmarks = []
     }
-    
-    private func storageKey() -> String {
-        pk_setting_key(pubkey, key: "bookmarks")
-    }
 }

damus/Models/DamusState.swift

@@ -25,6 +25,7 @@ struct DamusState {
     let relay_metadata: RelayMetadatas
     let drafts: Drafts
     let events: EventCache
+    let bookmarks: BookmarksManager
     
     var pubkey: String {
         return keypair.pubkey
@@ -35,6 +36,6 @@ struct DamusState {
     }
     
     static var empty: DamusState {
-        return DamusState.init(pool: RelayPool(), keypair: Keypair(pubkey: "", privkey: ""), likes: EventCounter(our_pubkey: ""), boosts: EventCounter(our_pubkey: ""), contacts: Contacts(our_pubkey: ""), tips: TipCounter(our_pubkey: ""), profiles: Profiles(), dms: DirectMessagesModel(our_pubkey: ""), previews: PreviewCache(), zaps: Zaps(our_pubkey: ""), lnurls: LNUrls(), settings: UserSettingsStore(), relay_filters: RelayFilters(our_pubkey: ""), relay_metadata: RelayMetadatas(), drafts: Drafts(), events: EventCache())
+        return DamusState.init(pool: RelayPool(), keypair: Keypair(pubkey: "", privkey: ""), likes: EventCounter(our_pubkey: ""), boosts: EventCounter(our_pubkey: ""), contacts: Contacts(our_pubkey: ""), tips: TipCounter(our_pubkey: ""), profiles: Profiles(), dms: DirectMessagesModel(our_pubkey: ""), previews: PreviewCache(), zaps: Zaps(our_pubkey: ""), lnurls: LNUrls(), settings: UserSettingsStore(), relay_filters: RelayFilters(our_pubkey: ""), relay_metadata: RelayMetadatas(), drafts: Drafts(), events: EventCache(), bookmarks: BookmarksManager(pubkey: ""))
     }
 }