Tusker/Screens/Preferences/WellnessPrefsView.swift

@@ -16,9 +16,7 @@ struct WellnessPrefsView: View {
             showFavAndReblogCount
             notificationsMode
             grayscaleImages
-            if #available(iOS 15.0, *) {
+            disableInfiniteScrolling
-                disableInfiniteScrolling
-            }
         }
         .listStyle(InsetGroupedListStyle())
         .navigationBarTitle(Text("Digital Wellness"))

Tusker/Screens/Timeline/TimelineTableViewController.swift

@@ -123,8 +123,7 @@ class TimelineTableViewController: DiffableTimelineLikeTableViewController<Timel
             return
         }
         
-        if #available(iOS 15.0, *),
+        guard !Preferences.shared.disableInfiniteScrolling || didConfirmLoadMore else {
-           Preferences.shared.disableInfiniteScrolling && !didConfirmLoadMore {
             guard !currentSnapshot.itemIdentifiers(inSection: .footer).contains(.confirmLoadMore) else {
                 // todo: need something more accurate than "success"/"failure"
                 completion(.success(currentSnapshot))
@@ -178,11 +177,11 @@ class TimelineTableViewController: DiffableTimelineLikeTableViewController<Timel
                 
                 self.mastodonController.persistentContainer.addAll(statuses: statuses) {
                     var snapshot = currentSnapshot
-                    let newIdentifiers = statuses.map { Item.status(id: $0.id, state: .unknown) }
+                    let identifiers = statuses.map { Item.status(id: $0.id, state: .unknown) }
                     if let first = snapshot.itemIdentifiers(inSection: .statuses).first {
-                        snapshot.insertItems(newIdentifiers, beforeItem: first)
+                        snapshot.insertItems(identifiers, beforeItem: first)
                     } else {
-                        snapshot.appendItems(newIdentifiers, toSection: .statuses)
+                        snapshot.appendItems(identifiers, toSection: .statuses)
                     }
                     completion(.success(snapshot))
                 }
@@ -206,27 +205,6 @@ extension TimelineTableViewController {
     enum Item: Hashable {
         case status(id: String, state: StatusState)
         case confirmLoadMore
-        
-        static func ==(lhs: Item, rhs: Item) -> Bool {
-            switch (lhs, rhs) {
-            case let (.status(id: a, state: _), .status(id: b, state: _)):
-                return a == b
-            case (.confirmLoadMore, .confirmLoadMore):
-                return true
-            default:
-                return false
-            }
-        }
-        
-        func hash(into hasher: inout Hasher) {
-            switch self {
-            case let .status(id: id, state: _):
-                hasher.combine(0)
-                hasher.combine(id)
-            case .confirmLoadMore:
-                hasher.combine(1)
-            }
-        }
     }
 }