From 5a5c67e44523e9d8be270c435cce179a9a4c2334 Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Mon, 7 Nov 2022 18:47:46 -0500
Subject: [PATCH] Try to prevent pruning accounts that still have statuses
 referencing them

---
 .../Tusker.xcdatamodeld/Tusker.xcdatamodel/contents | 12 +++---------
 Tusker/Scenes/MainSceneDelegate.swift               | 13 ++++++++++---
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Tusker/CoreData/Tusker.xcdatamodeld/Tusker.xcdatamodel/contents b/Tusker/CoreData/Tusker.xcdatamodeld/Tusker.xcdatamodel/contents
index f60d79ce..9ba83c7a 100644
--- a/Tusker/CoreData/Tusker.xcdatamodeld/Tusker.xcdatamodel/contents
+++ b/Tusker/CoreData/Tusker.xcdatamodeld/Tusker.xcdatamodel/contents
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="20086" systemVersion="21E230" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="21512" systemVersion="22A380" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="Account" representedClassName="AccountMO" syncable="YES">
         <attribute name="acct" attributeType="String"/>
         <attribute name="avatar" optional="YES" attributeType="URI"/>
@@ -21,6 +21,7 @@
         <attribute name="username" attributeType="String"/>
         <relationship name="movedTo" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Account"/>
         <relationship name="relationship" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Relationship" inverseName="account" inverseEntity="Relationship"/>
+        <relationship name="statuses" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="Status" inverseName="account" inverseEntity="Status"/>
         <uniquenessConstraints>
             <uniquenessConstraint>
                 <constraint value="id"/>
@@ -84,7 +85,7 @@
         <attribute name="uri" attributeType="String"/>
         <attribute name="url" optional="YES" attributeType="URI"/>
         <attribute name="visibilityString" attributeType="String"/>
-        <relationship name="account" maxCount="1" deletionRule="Nullify" destinationEntity="Account"/>
+        <relationship name="account" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Account" inverseName="statuses" inverseEntity="Account"/>
         <relationship name="reblog" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Status"/>
         <uniquenessConstraints>
             <uniquenessConstraint>
@@ -92,11 +93,4 @@
             </uniquenessConstraint>
         </uniquenessConstraints>
     </entity>
-    <elements>
-        <element name="Account" positionX="169.21875" positionY="78.9609375" width="128" height="343"/>
-        <element name="Relationship" positionX="63" positionY="135" width="128" height="194"/>
-        <element name="Status" positionX="-63" positionY="-18" width="128" height="449"/>
-        <element name="SavedInstance" positionX="63" positionY="144" width="128" height="44"/>
-        <element name="SavedHashtag" positionX="72" positionY="153" width="128" height="59"/>
-    </elements>
 </model>
\ No newline at end of file
diff --git a/Tusker/Scenes/MainSceneDelegate.swift b/Tusker/Scenes/MainSceneDelegate.swift
index 0198d1ab..29642a73 100644
--- a/Tusker/Scenes/MainSceneDelegate.swift
+++ b/Tusker/Scenes/MainSceneDelegate.swift
@@ -125,12 +125,19 @@ class MainSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDelegate
             let statusReq: NSFetchRequest<NSFetchRequestResult> = StatusMO.fetchRequest()
             statusReq.predicate = NSPredicate(format: "(lastFetchedAt = nil) OR (lastFetchedAt < %@)", minDate as NSDate)
             let deleteStatusReq = NSBatchDeleteRequest(fetchRequest: statusReq)
-            _ = try? context.execute(deleteStatusReq)
+            deleteStatusReq.resultType = .resultTypeCount
+            if let res = try? context.execute(deleteStatusReq) as? NSBatchDeleteResult {
+                Logging.general.info("Pruned \(res.result as! Int) statuses")
+            }
+            
             
             let accountReq: NSFetchRequest<NSFetchRequestResult> = AccountMO.fetchRequest()
-            accountReq.predicate = NSPredicate(format: "(lastFetchedAt = nil) OR (lastFetchedAt < %@)", minDate as NSDate)
+            accountReq.predicate = NSPredicate(format: "((lastFetchedAt = nil) OR (lastFetchedAt < %@)) AND (statuses.@count = 0)", minDate as NSDate)
             let deleteAccountReq = NSBatchDeleteRequest(fetchRequest: accountReq)
-            _ = try? context.execute(deleteAccountReq)
+            deleteAccountReq.resultType = .resultTypeCount
+            if let res = try? context.execute(deleteAccountReq) as? NSBatchDeleteResult {
+                Logging.general.info("Pruned \(res.result as! Int) accounts")
+            }
             
             try? context.save()
         }