Packages/TuskerPreferences/Sources/TuskerPreferences/Preferences.swift

@@ -62,7 +62,6 @@ public final class Preferences: Codable, ObservableObject {
         self.trailingStatusSwipeActions = try container.decodeIfPresent([StatusSwipeAction].self, forKey: .trailingStatusSwipeActions) ?? trailingStatusSwipeActions
         self.widescreenNavigationMode = try container.decodeIfPresent(WidescreenNavigationMode.self, forKey: .widescreenNavigationMode) ?? Self.defaultWidescreenNavigationMode
         self.underlineTextLinks = try container.decodeIfPresent(Bool.self, forKey: .underlineTextLinks) ?? false
-        self.showAttachmentsInTimeline = try container.decodeIfPresent(Bool.self, forKey: .showAttachmentsInTimeline) ?? true
         
         if let existing = try? container.decode(Visibility.self, forKey: .defaultPostVisibility) {
             self.defaultPostVisibility = .visibility(existing)
@@ -128,7 +127,6 @@ public final class Preferences: Codable, ObservableObject {
         try container.encode(trailingStatusSwipeActions, forKey: .trailingStatusSwipeActions)
         try container.encode(widescreenNavigationMode, forKey: .widescreenNavigationMode)
         try container.encode(underlineTextLinks, forKey: .underlineTextLinks)
-        try container.encode(showAttachmentsInTimeline, forKey: .showAttachmentsInTimeline)
         
         try container.encode(defaultPostVisibility, forKey: .defaultPostVisibility)
         try container.encode(defaultReplyVisibility, forKey: .defaultReplyVisibility)
@@ -184,7 +182,6 @@ public final class Preferences: Codable, ObservableObject {
     private static var defaultWidescreenNavigationMode = WidescreenNavigationMode.splitScreen
     @Published public var widescreenNavigationMode  = Preferences.defaultWidescreenNavigationMode
     @Published public var underlineTextLinks = false
-    @Published public var showAttachmentsInTimeline = true
     
     // MARK: Composing
     @Published public var defaultPostVisibility = PostVisibility.serverDefault
@@ -256,7 +253,6 @@ public final class Preferences: Codable, ObservableObject {
         case trailingStatusSwipeActions
         case widescreenNavigationMode
         case underlineTextLinks
-        case showAttachmentsInTimeline
         
         case defaultPostVisibility
         case defaultReplyVisibility

Tusker/CoreData/Tusker.xcdatamodeld/Tusker.xcdatamodel/contents

@@ -123,8 +123,7 @@
         <attribute name="url" optional="YES" attributeType="URI"/>
         <attribute name="visibilityString" attributeType="String"/>
         <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" inverseName="reblogs" inverseEntity="Status"/>
-        <relationship name="reblogs" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Status" inverseName="reblog" inverseEntity="Status"/>
+        <relationship name="reblog" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Status"/>
         <relationship name="timelines" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="TimelineState" inverseName="statuses" inverseEntity="TimelineState"/>
         <uniquenessConstraints>
             <uniquenessConstraint>

Tusker/LazilyDecoding.swift

@@ -33,37 +33,41 @@ public struct LazilyDecoding<Enclosing: NSManagedObject, Value: Codable> {
     
     public static subscript(_enclosingInstance instance: Enclosing, wrapped wrappedKeyPath: ReferenceWritableKeyPath<Enclosing, Value>, storage storageKeyPath: ReferenceWritableKeyPath<Enclosing, Self>) -> Value {
         get {
-            var wrapper = instance[keyPath: storageKeyPath]
-            if let value = wrapper.value {
-                return value
-            } else {
-                guard let data = instance[keyPath: wrapper.keyPath] else { return wrapper.fallback }
-                do {
-                    let value = try decoder.decode(Box.self, from: data)
-                    wrapper.value = value.value
-                    wrapper.observation = instance.observe(wrapper.keyPath, changeHandler: { instance, _ in
-                        var wrapper = instance[keyPath: storageKeyPath]
-                        if wrapper.skipClearingOnNextUpdate {
-                            wrapper.skipClearingOnNextUpdate = false
-                        } else {
-                            wrapper.removeCachedValue()
-                        }
+            instance.performOnContext {
+                var wrapper = instance[keyPath: storageKeyPath]
+                if let value = wrapper.value {
+                    return value
+                } else {
+                    guard let data = instance[keyPath: wrapper.keyPath] else { return wrapper.fallback }
+                    do {
+                        let value = try decoder.decode(Box.self, from: data)
+                        wrapper.value = value.value
+                        wrapper.observation = instance.observe(wrapper.keyPath, changeHandler: { instance, _ in
+                            var wrapper = instance[keyPath: storageKeyPath]
+                            if wrapper.skipClearingOnNextUpdate {
+                                wrapper.skipClearingOnNextUpdate = false
+                            } else {
+                                wrapper.removeCachedValue()
+                            }
+                            instance[keyPath: storageKeyPath] = wrapper
+                        })
                         instance[keyPath: storageKeyPath] = wrapper
-                    })
-                    instance[keyPath: storageKeyPath] = wrapper
-                    return value.value
-                } catch {
-                    return wrapper.fallback
+                        return value.value
+                    } catch {
+                        return wrapper.fallback
+                    }
                 }
             }
         }
         set {
-            var wrapper = instance[keyPath: storageKeyPath]
-            wrapper.value = newValue
-            wrapper.skipClearingOnNextUpdate = true
-            instance[keyPath: storageKeyPath] = wrapper
-            let newData = try! encoder.encode(Box(value: newValue))
-            instance[keyPath: wrapper.keyPath] = newData
+            instance.performOnContext {
+                var wrapper = instance[keyPath: storageKeyPath]
+                wrapper.value = newValue
+                wrapper.skipClearingOnNextUpdate = true
+                instance[keyPath: storageKeyPath] = wrapper
+                let newData = try! encoder.encode(Box(value: newValue))
+                instance[keyPath: wrapper.keyPath] = newData
+            }
         }
     }
     
@@ -74,6 +78,16 @@ public struct LazilyDecoding<Enclosing: NSManagedObject, Value: Codable> {
     
 }
 
+extension NSManagedObject {
+    fileprivate func performOnContext<V>(_ f: () -> V) -> V {
+        if let managedObjectContext {
+            managedObjectContext.performAndWait(f)
+        } else {
+            f()
+        }
+    }
+}
+
 extension LazilyDecoding {
     init<T>(arrayFrom keyPath: ReferenceWritableKeyPath<Enclosing, Data?>) where Value == [T] {
         self.init(from: keyPath, fallback: [])

Tusker/Scenes/MainSceneDelegate.swift

@@ -148,7 +148,7 @@ class MainSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDelegate
             minDate.addTimeInterval(-7 * 24 * 60 * 60)
             
             let statusReq: NSFetchRequest<NSFetchRequestResult> = StatusMO.fetchRequest()
-            statusReq.predicate = NSPredicate(format: "((lastFetchedAt = nil) OR (lastFetchedAt < %@)) AND (reblogs.@count = 0)", minDate as NSDate)
+            statusReq.predicate = NSPredicate(format: "(lastFetchedAt = nil) OR (lastFetchedAt < %@)", minDate as NSDate)
             let deleteStatusReq = NSBatchDeleteRequest(fetchRequest: statusReq)
             deleteStatusReq.resultType = .resultTypeCount
             if let res = try? context.execute(deleteStatusReq) as? NSBatchDeleteResult {

Tusker/Screens/Preferences/AppearancePrefsView.swift

@@ -118,15 +118,12 @@ struct AppearancePrefsView : View {
             Toggle(isOn: $preferences.alwaysShowStatusVisibilityIcon) {
                 Text("Always Show Status Visibility Icons")
             }
-            Toggle(isOn: $preferences.showLinkPreviews) {
-                Text("Show Link Previews")
-            }
-            Toggle(isOn: $preferences.showAttachmentsInTimeline) {
-                Text("Show Attachments on Timeline")
-            }
             Toggle(isOn: $preferences.hideActionsInTimeline) {
                 Text("Hide Actions on Timeline")
             }
+            Toggle(isOn: $preferences.showLinkPreviews) {
+                Text("Show Link Previews")
+            }
             Toggle(isOn: $preferences.underlineTextLinks) {
                 Text("Underline Links")
             }

Tusker/Screens/Timeline/TimelineViewController.swift

@@ -164,18 +164,6 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
             .store(in: &cancellables)
         NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: mastodonController)
         
-        Preferences.shared.$showAttachmentsInTimeline
-            // skip the initial value
-            .dropFirst()
-            // publisher fires on willChange, wait the change is actually made
-            .receive(on: DispatchQueue.main)
-            .sink { [unowned self] _ in
-                var snapshot = self.dataSource.snapshot()
-                snapshot.reconfigureItems(snapshot.itemIdentifiers)
-                self.dataSource.apply(snapshot, animatingDifferences: false)
-            }
-            .store(in: &cancellables)
-        
         if userActivity != nil {
             userActivityNeedsUpdate
                 .debounce(for: .seconds(1), scheduler: DispatchQueue.main)
@@ -192,7 +180,6 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
     // separate method because InstanceTimelineViewController needs to be able to customize it
     func configureStatusCell(_ cell: TimelineStatusCollectionViewCell, id: String, state: CollapseState, filterResult: Filterer.Result, precomputedContent: NSAttributedString?) {
         cell.delegate = self
-        cell.showAttachmentsInline = Preferences.shared.showAttachmentsInTimeline
         if case .home = timeline {
             cell.showFollowedHashtags = true
         } else {
@@ -458,16 +445,6 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
             if let status = mastodonController.persistentContainer.status(for: id) {
                 // touch the status so that, even if it's old, it doesn't get pruned when we go into the background
                 status.touch()
-                
-                // there was a bug where th the reblogged status would get pruned even when it was still refernced by the reblog
-                // as a temporary workaround, until there are no longer user db's in this state,
-                // check if the reblog is invalid and reload the status if so
-                if let reblog = status.reblog,
-                   // force the fault to fire
-                    case _  = reblog.id,
-                   reblog.isDeleted {
-                    unloaded.append(id)
-                }
             } else {
                 unloaded.append(id)
             }

Tusker/Views/Attachments/AttachmentsContainerView.swift

@@ -30,8 +30,8 @@ class AttachmentsContainerView: UIView {
         }
     }
     
-    private var blurView: UIVisualEffectView?
-    private var hideButtonView: UIVisualEffectView?
+    var blurView: UIVisualEffectView?
+    var hideButtonView: UIVisualEffectView?
     var contentHidden: Bool! {
         didSet {
             guard let blurView = blurView,
@@ -42,8 +42,6 @@ class AttachmentsContainerView: UIView {
         }
     }
     
-    private var label: UILabel?
-    
     override init(frame: CGRect) {
         super.init(frame: frame)
         commonInit()
@@ -69,16 +67,9 @@ class AttachmentsContainerView: UIView {
     
     // MARK: - User Interaface
     
-    func updateUI(attachments: [Attachment], labelOnly: Bool = false) {
+    func updateUI(attachments: [Attachment]) {
         let newTokens = attachments.map { AttachmentToken(attachment: $0) }
         
-        guard !labelOnly else {
-            self.attachments = attachments
-            self.attachmentTokens = newTokens
-            updateLabel(attachments: attachments)
-            return
-        }
-        
         guard self.attachmentTokens != newTokens else {
             return
         }
@@ -86,8 +77,11 @@ class AttachmentsContainerView: UIView {
         self.attachments = attachments
         self.attachmentTokens = newTokens
         
-        removeAttachmentViews()
-        hideButtonView?.isHidden = false
+        attachmentViews.allObjects.forEach { $0.removeFromSuperview() }
+        attachmentViews.removeAllObjects()
+        attachmentStacks.allObjects.forEach { $0.removeFromSuperview() }
+        attachmentStacks.removeAllObjects()
+        moreView?.removeFromSuperview()
         
         var accessibilityElements = [Any]()
 
@@ -290,14 +284,6 @@ class AttachmentsContainerView: UIView {
         self.accessibilityElements = accessibilityElements
     }
     
-    private func removeAttachmentViews() {
-        attachmentViews.allObjects.forEach { $0.removeFromSuperview() }
-        attachmentViews.removeAllObjects()
-        attachmentStacks.allObjects.forEach { $0.removeFromSuperview() }
-        attachmentStacks.removeAllObjects()
-        moreView?.removeFromSuperview()
-    }
-    
     private func createAttachmentView(index: Int, hSize: RelativeSize, vSize: RelativeSize) -> AttachmentView {
         let attachmentView = AttachmentView(attachment: attachments[index], index: index)
         attachmentView.delegate = delegate
@@ -410,35 +396,6 @@ class AttachmentsContainerView: UIView {
         ])
     }
     
-    private func updateLabel(attachments: [Attachment]) {
-        removeAttachmentViews()
-        blurView?.isHidden = true
-        hideButtonView?.isHidden = true
-        aspectRatioConstraint?.isActive = false
-        
-        if label == nil {
-            if attachments.isEmpty {
-                accessibilityElements = []
-                return
-            }
-            label = UILabel()
-            label!.font = .preferredFont(forTextStyle: .body)
-            label!.adjustsFontForContentSizeCategory = true
-            label!.textColor = .secondaryLabel
-            label!.translatesAutoresizingMaskIntoConstraints = false
-            addSubview(label!)
-            NSLayoutConstraint.activate([
-                label!.leadingAnchor.constraint(equalTo: leadingAnchor),
-                label!.trailingAnchor.constraint(equalTo: trailingAnchor),
-                label!.topAnchor.constraint(equalTo: topAnchor),
-                label!.bottomAnchor.constraint(equalTo: bottomAnchor),
-            ])
-        }
-        
-        label!.text = "\(attachments.count) attachment\(attachments.count == 1 ? "" : "s")"
-        accessibilityElements = [label!]
-    }
-    
     // MARK: - Interaction
     
     @objc func blurViewTapped() {

Tusker/Views/Status/StatusCollectionViewCell.swift

@@ -44,7 +44,6 @@ protocol StatusCollectionViewCell: UICollectionViewCell, AttachmentViewDelegate
     var isGrayscale: Bool { get set }
     var cancellables: Set<AnyCancellable> { get set }
     
-    func updateAttachmentsUI(status: StatusMO)
     func updateUIForPreferences(status: StatusMO)
     func updateStatusState(status: StatusMO)
     func estimateContentHeight() -> CGFloat
@@ -92,7 +91,8 @@ extension StatusCollectionViewCell {
         
         contentContainer.contentTextView.setTextFrom(status: status, precomputed: precomputedContent)
         contentContainer.contentTextView.navigationDelegate = delegate
-        self.updateAttachmentsUI(status: status)
+        contentContainer.attachmentsView.delegate = self
+        contentContainer.attachmentsView.updateUI(attachments: status.attachments)
         contentContainer.pollView.isHidden = status.poll == nil
         contentContainer.pollView.mastodonController = mastodonController
         contentContainer.pollView.delegate = delegate
@@ -167,11 +167,6 @@ extension StatusCollectionViewCell {
         return true
     }
     
-    func updateAttachmentsUI(status: StatusMO) {
-        contentContainer.attachmentsView.delegate = self
-        contentContainer.attachmentsView.updateUI(attachments: status.attachments)
-    }
- 
     func updateAccountUI(account: AccountMO) {
         avatarImageView.update(for: account.avatar)
         displayNameLabel.updateForAccountDisplayName(account: account)

Tusker/Views/Status/StatusContentContainer.swift

@@ -14,8 +14,8 @@ protocol StatusContentPollView: UIView {
 
 class StatusContentContainer<ContentView: ContentTextView, PollView: StatusContentPollView>: UIView {
     
-    private let useTopSpacer: Bool
-    private lazy var topSpacer = UIView().configure {
+    private var useTopSpacer = false
+    private let topSpacer = UIView().configure {
         $0.backgroundColor = .clear
         // other 4pt is provided by this view's own spacing
         $0.heightAnchor.constraint(equalToConstant: 4).isActive = true

Tusker/Views/Status/TimelineStatusCollectionViewCell.swift

@@ -297,7 +297,6 @@ class TimelineStatusCollectionViewCell: UICollectionViewListCell, StatusCollecti
     var showReplyIndicator = true
     var showPinned: Bool = false
     var showFollowedHashtags: Bool = false
-    var showAttachmentsInline = true
     
     // alas these need to be internal so they're accessible from the protocol extensions
     var statusID: String!
@@ -646,11 +645,6 @@ class TimelineStatusCollectionViewCell: UICollectionViewListCell, StatusCollecti
         baseUpdateStatusState(status: status)
     }
     
-    func updateAttachmentsUI(status: StatusMO) {
-        attachmentsView.delegate = self
-        attachmentsView.updateUI(attachments: status.attachments, labelOnly: !showAttachmentsInline)
-    }
-    
     func estimateContentHeight() -> CGFloat {
         let width = bounds.width /* leading spacing: */ - 16 /* avatar: */ - 50 /* spacing: 8 */ - 8 /* trailing spacing: */ - 16
         return contentContainer.estimateVisibleSubviewHeight(effectiveWidth: width)