Prevent publishing changes to Observable outside the main thread

Signed-off-by: Daniel D’Aquino <daniel@daquino.me>

damus/Features/Events/Models/EventsModel.swift

@@ -78,7 +78,11 @@ class EventsModel: ObservableObject {
                         event = ev.toOwned()
                     }
                     guard let event else { return }
-                    if events.insert(event) { objectWillChange.send() }
+                    Task {
+                        if await events.insert(event) {
+                            DispatchQueue.main.async { self.objectWillChange.send() }
+                        }
+                    }
                 case .eose:
                     break
                 }
@@ -93,6 +97,7 @@ class EventsModel: ObservableObject {
         loadingTask?.cancel()
     }
 
+    @MainActor
     private func handle_event(relay_id: RelayURL, ev: NostrEvent) {
         if events.insert(ev) {
             objectWillChange.send()

damus/Features/FollowPack/Models/FollowPackModel.swift

@@ -25,6 +25,7 @@ class FollowPackModel: ObservableObject {
     
     func subscribe(follow_pack_users: [Pubkey]) {
         loading = true
+        self.listener?.cancel()
         self.listener = Task {
             await self.listenForUpdates(follow_pack_users: follow_pack_users)
         }
@@ -52,8 +53,10 @@ class FollowPackModel: ObservableObject {
                 guard let event else { return }
                 if event.is_textlike && should_show_event(state: damus_state, ev: event) && !event.is_reply()
                 {
-                    if self.events.insert(event) {
-                        self.objectWillChange.send()
+                    if await self.events.insert(event) {
+                        DispatchQueue.main.async {
+                            self.objectWillChange.send()
+                        }
                     }
                 }
             case .eose:

damus/Features/NIP05/Models/NIP05DomainEventsModel.swift

@@ -67,18 +67,21 @@ class NIP05DomainEventsModel: ObservableObject {
         for await item in state.nostrNetwork.reader.subscribe(filters: [filter]) {
             switch item {
             case .event(borrow: let borrow):
-                try? borrow { event in
-                    self.add_event(event.toOwned())
+                var event: NostrEvent? = nil
+                try? borrow { ev in
+                    event = ev.toOwned()
                     guard let txn = NdbTxn(ndb: state.ndb) else { return }
                     load_profiles(context: "search", load: .from_events(self.events.all_events), damus_state: state, txn: txn)
                 }
+                guard let event else { return }
+                await self.add_event(event)
             case .eose:
                 continue
             }
         }
     }
 
-    func add_event(_ ev: NostrEvent) {
+    func add_event(_ ev: NostrEvent) async {
         if !event_matches_filter(ev, filter: filter) {
             return
         }
@@ -87,8 +90,10 @@ class NIP05DomainEventsModel: ObservableObject {
             return
         }
 
-        if self.events.insert(ev) {
-            objectWillChange.send()
+        if await self.events.insert(ev) {
+            DispatchQueue.main.async {
+                self.objectWillChange.send()
+            }
         }
     }
 }

damus/Features/Search/Models/SearchModel.swift

@@ -49,7 +49,7 @@ class SearchModel: ObservableObject {
                     try? borrow { ev in
                         let event = ev.toOwned()
                         if event.is_textlike && event.should_show_event {
-                            self.add_event(event)
+                            Task { await self.add_event(event) }
                         }
                     }
                 case .eose:
@@ -67,6 +67,7 @@ class SearchModel: ObservableObject {
         listener = nil
     }
     
+    @MainActor
     func add_event(_ ev: NostrEvent) {
         if !event_matches_filter(ev, filter: search) {
             return

damus/Features/Timeline/Models/HomeModel.swift

@@ -765,6 +765,7 @@ class HomeModel: ContactsDelegate {
         }
     }
 
+    @MainActor
     func insert_home_event(_ ev: NostrEvent) {
         if events.insert(ev) {
             handle_last_event(ev: ev, timeline: .home)
@@ -798,7 +799,7 @@ class HomeModel: ContactsDelegate {
 
         switch context {
         case .home:
-            insert_home_event(ev)
+            Task { await insert_home_event(ev) }
         case .notifications:
             handle_notification(ev: ev)
         case .dms, .contacts, .initialRelayList, .initialContactList, .nwc:

damus/Shared/Utilities/EventHolder.swift

@@ -38,6 +38,7 @@ class EventHolder: ObservableObject, ScrollQueue {
         self.incoming = self.incoming.filter(isIncluded)
     }
     
+    @MainActor
     func insert(_ ev: NostrEvent) -> Bool {
         if should_queue {
             return insert_queued(ev)
@@ -46,6 +47,7 @@ class EventHolder: ObservableObject, ScrollQueue {
         }
     }
     
+    @MainActor
     private func insert_immediate(_ ev: NostrEvent) -> Bool {
         if has_event.contains(ev.id) {
             return false
@@ -86,7 +88,9 @@ class EventHolder: ObservableObject, ScrollQueue {
         }
         
         if changed {
-            self.objectWillChange.send()
+            DispatchQueue.main.async {
+                self.objectWillChange.send()
+            }
         }
         
         self.incoming = []