Merge pull request #1324 from planetary-social/fix-duplicate-authors

Fix duplicate authors in db
planetary-social · Jul 22, 2024 · 0ac47b6 · 0ac47b6
2 parents 4098f31 + 23bcda1
commit 0ac47b6
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- Fixed an issue where Profile views would sometimes not display any notes.
 - Add impersonation flag category and better NIP-56 mapping.
 - Add a Tap to Refresh button in empty profiles.
 - Support nostr:naddr links to text and long-form content notes.

diff --git a/Nos/Service/CurrentUser.swift b/Nos/Service/CurrentUser.swift
@@ -107,21 +107,27 @@ import Dependencies
 
     @MainActor func setUp() {
         if let keyPair {
-            author = try? Author.findOrCreate(by: keyPair.publicKeyHex, context: viewContext)
-            authorWatcher = NSFetchedResultsController(
-                fetchRequest: Author.request(by: keyPair.publicKeyHex),
-                managedObjectContext: viewContext,
-                sectionNameKeyPath: nil,
-                cacheName: nil
-            )
-            authorWatcher?.delegate = self
-            try? authorWatcher?.performFetch()
-
-            socialGraph = SocialGraphCache(userKey: keyPair.publicKeyHex, context: backgroundContext)
-
-            Task {
-                await subscribe()
-                refreshFriendMetadata()
+            do {
+                author = try Author.findOrCreate(by: keyPair.publicKeyHex, context: viewContext)
+                try viewContext.saveIfNeeded()
+                authorWatcher = NSFetchedResultsController(
+                    fetchRequest: Author.request(by: keyPair.publicKeyHex),
+                    managedObjectContext: viewContext,
+                    sectionNameKeyPath: nil,
+                    cacheName: nil
+                )
+                authorWatcher?.delegate = self
+                try authorWatcher?.performFetch()
+
+                socialGraph = SocialGraphCache(userKey: keyPair.publicKeyHex, context: backgroundContext)
+
+                Task {
+                    await subscribe()
+                    refreshFriendMetadata()
+                }
+            } catch {
+                crashReporting.report("Serious error in CurrentUser.setUp(): \(error.localizedDescription)")
+                Log.optional(error)
             }
         } else {
             author = nil

diff --git a/Nos/Service/Relay/RelayService.swift b/Nos/Service/Relay/RelayService.swift
@@ -20,6 +20,7 @@ class RelayService: ObservableObject {
     private var processingQueue = DispatchQueue(label: "RelayService-processing", qos: .userInitiated)
     private var parseQueue = ParseQueue()
 
+    @Dependency(\.persistenceController) var persistenceController
     @Dependency(\.analytics) private var analytics
     @MainActor @Dependency(\.currentUser) private var currentUser
     @Published var numberOfConnectedRelays: Int = 0
@@ -400,6 +401,7 @@ extension RelayService {
                 )
                 #endif
                 try self.parseContext.saveIfNeeded()
+                try self.persistenceController.viewContext.saveIfNeeded()
             }
             return true
         }