renaming, refactoring, and fixing relationship

planetary-social · Dec 17, 2024 · 3c2bd5f · 3c2bd5f
1 parent 89beadf
commit 3c2bd5f
Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/Nos/Models/CoreData/AuthorList+CoreDataClass.swift b/Nos/Models/CoreData/AuthorList+CoreDataClass.swift
@@ -19,6 +19,7 @@ public class AuthorList: Event {
         let authorList = existingAuthorList ?? AuthorList(context: context)
         authorList.createdAt = jsonEvent.createdDate
         authorList.author = owner
+        authorList.owner = owner
         authorList.identifier = jsonEvent.id
         authorList.replaceableIdentifier = replaceableID
         authorList.kind = jsonEvent.kind
@@ -55,7 +56,7 @@ public class AuthorList: Event {
     ) -> NSFetchRequest<AuthorList> {
         let fetchRequest = NSFetchRequest<AuthorList>(entityName: "AuthorList")
         fetchRequest.predicate = NSPredicate(
-            format: "replaceableIdentifier = %@ AND author = %@ AND kind = %i",
+            format: "replaceableIdentifier = %@ AND owner = %@ AND kind = %i",
             replaceableID,
             owner,
             kind

diff --git a/Nos/Models/CoreData/Generated/AuthorList+CoreDataProperties.swift b/Nos/Models/CoreData/Generated/AuthorList+CoreDataProperties.swift
@@ -7,9 +7,20 @@ extension AuthorList {
         NSFetchRequest<AuthorList>(entityName: "AuthorList")
     }
 
+    /// The URL of an image representing the list.
     @NSManaged public var image: URL?
+
+    /// The description of the list.
     @NSManaged public var listDescription: String?
+
+    /// The title of the list.
     @NSManaged public var title: String?
+
+    /// The owner of the list; the ``Author`` who created it.
+    /// Duplicates ``author`` but Core Data won't allow for multiple relationships to have the same inverse.
+    @NSManaged public var owner: Author?
+
+    /// The set of unique authors in this list.
     @NSManaged public var authors: Set<Author>
 }
 

diff --git a/Nos/Models/CoreData/Nos.xcdatamodeld/Nos 21.xcdatamodel/contents b/Nos/Models/CoreData/Nos.xcdatamodeld/Nos 21.xcdatamodel/contents
@@ -21,7 +21,7 @@
         <relationship name="follows" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="Follow" inverseName="source" inverseEntity="Follow"/>
         <relationship name="includedInLists" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="AuthorList" inverseName="authors" inverseEntity="AuthorList"/>
         <relationship name="incomingNotifications" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NosNotification" inverseName="user" inverseEntity="NosNotification"/>
-        <relationship name="lists" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="AuthorList"/>
+        <relationship name="lists" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="AuthorList" inverseName="owner" inverseEntity="AuthorList"/>
         <relationship name="relays" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Relay" inverseName="authors" inverseEntity="Relay"/>
         <uniquenessConstraints>
             <uniquenessConstraint>
@@ -34,6 +34,7 @@
         <attribute name="listDescription" optional="YES" attributeType="String"/>
         <attribute name="title" optional="YES" attributeType="String"/>
         <relationship name="authors" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Author" inverseName="includedInLists" inverseEntity="Author"/>
+        <relationship name="owner" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Author" inverseName="lists" inverseEntity="Author"/>
     </entity>
     <entity name="AuthorReference" representedClassName="AuthorReference" syncable="YES">
         <attribute name="pubkey" optional="YES" attributeType="String"/>

diff --git a/Nos/Service/EventProcessor.swift b/Nos/Service/EventProcessor.swift
@@ -74,7 +74,7 @@ extension EventProcessor {
         skipVerification: Bool
     ) throws -> AuthorList {
         let authorList = try AuthorList.createOrUpdate(from: jsonEvent, in: parseContext)
-        if skipVerification == false {
+        if !skipVerification {
             guard try authorList.verifySignature() else {
                 parseContext.delete(authorList)
                 Log.info("Invalid signature on author list: \(jsonEvent) from \(relay?.address ?? "error")")
@@ -104,7 +104,7 @@ extension EventProcessor {
             throw EventError.missingAuthor
         }
 
-        if skipVerification == false {
+        if !skipVerification {
             guard try event.verifySignature(for: publicKey) else {
                 parseContext.delete(event)
                 Log.info("Invalid signature on event: \(jsonEvent) from \(relay?.address ?? "error")")

diff --git a/Nos/Service/Relay/RelayService.swift b/Nos/Service/Relay/RelayService.swift
@@ -271,7 +271,7 @@ extension RelayService {
         return await fetchEvents(matching: contactFilter)
     }
 
-    func requestFollowSets(
+    func requestAuthorLists(
         for authorKey: RawAuthorID?,
         since: Date?
     ) async -> SubscriptionCancellable {
@@ -300,7 +300,7 @@ extension RelayService {
 
         subscriptions.append(await requestMetadata(for: authorKey, since: lastUpdateMetadata))
         subscriptions.append(await requestContactList(for: authorKey, since: lastUpdatedContactList))
-        subscriptions.append(await requestFollowSets(for: authorKey, since: lastUpdatedFollowSets))
+        subscriptions.append(await requestAuthorLists(for: authorKey, since: lastUpdatedFollowSets))
 
         return SubscriptionCancellable(cancellables: subscriptions, relayService: self)
     }