From ed0a2f1ba3c32396925b120046dada2293ce46c8 Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Wed, 19 Jan 2022 18:30:49 -0500
Subject: [PATCH] Fix remotely deleted feeds not being removed

---
 Reader/CoreData/PersistentContainer.swift                      | 3 +++
 .../CoreData/Reader.xcdatamodeld/Reader.xcdatamodel/contents   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Reader/CoreData/PersistentContainer.swift b/Reader/CoreData/PersistentContainer.swift
index 0ca2447..0ef2d68 100644
--- a/Reader/CoreData/PersistentContainer.swift
+++ b/Reader/CoreData/PersistentContainer.swift
@@ -91,6 +91,9 @@ class PersistentContainer: NSPersistentContainer {
                     mo.updateFromServer(feed)
                 }
             }
+            for removed in existingFeeds where !serverFeeds.contains(where: { $0.id == removed.id }) {
+                self.backgroundContext.delete(removed)
+            }
             
             if self.backgroundContext.hasChanges {
                 try self.backgroundContext.save()
diff --git a/Reader/CoreData/Reader.xcdatamodeld/Reader.xcdatamodel/contents b/Reader/CoreData/Reader.xcdatamodeld/Reader.xcdatamodel/contents
index 3698692..e351ea0 100644
--- a/Reader/CoreData/Reader.xcdatamodeld/Reader.xcdatamodel/contents
+++ b/Reader/CoreData/Reader.xcdatamodeld/Reader.xcdatamodel/contents
@@ -6,7 +6,7 @@
         <attribute name="title" attributeType="String"/>
         <attribute name="url" optional="YES" attributeType="URI"/>
         <relationship name="groups" toMany="YES" deletionRule="Nullify" destinationEntity="Group" inverseName="feeds" inverseEntity="Group"/>
-        <relationship name="items" toMany="YES" deletionRule="Nullify" destinationEntity="Item" inverseName="feed" inverseEntity="Item"/>
+        <relationship name="items" toMany="YES" deletionRule="Cascade" destinationEntity="Item" inverseName="feed" inverseEntity="Item"/>
     </entity>
     <entity name="Group" representedClassName="Group" syncable="YES">
         <attribute name="id" attributeType="String"/>