Tusker/Screens/Asset Picker/AssetCollectionViewController.swift

@@ -70,7 +70,6 @@ class AssetCollectionViewController: UICollectionViewController {
 
         collectionView.alwaysBounceVertical = true
         collectionView.allowsMultipleSelection = true
-        collectionView.allowsSelection = true
         
         collectionView.register(UINib(nibName: "AssetCollectionViewCell", bundle: .main), forCellWithReuseIdentifier: reuseIdentifier)
         collectionView.register(UINib(nibName: "ShowCameraCollectionViewCell", bundle: .main), forCellWithReuseIdentifier: cameraReuseIdentifier)
@@ -99,6 +98,8 @@ class AssetCollectionViewController: UICollectionViewController {
             }
         })
         
+        setEditing(true, animated: false)
+        
         updateItemsSelectedCount()
 
         if let singleFingerPanGesture = collectionView.gestureRecognizers?.first(where: {

Tusker/Screens/Compose/ComposeHostingController.swift

@@ -249,9 +249,9 @@ extension ComposeHostingController: ComposeUIStateDelegate {
         if #available(iOS 15.0, *) {
             let picker = AssetPickerViewController()
             picker.assetPickerDelegate = self
-            picker.modalPresentationStyle = .pageSheet
+            picker.modalPresentationStyle = .popover
             picker.overrideUserInterfaceStyle = .dark
-            let sheet = picker.sheetPresentationController!
+            let sheet = picker.popoverPresentationController!.adaptiveSheetPresentationController
             sheet.detents = [.medium(), .large()]
             sheet.prefersEdgeAttachedInCompactHeight = true
             self.present(picker, animated: true)

Tusker/Screens/Profile/ProfileViewController.swift

@@ -91,8 +91,8 @@ class ProfileViewController: UIPageViewController {
         addKeyCommand(MenuController.nextSubTabCommand)
         
         accountUpdater = mastodonController.persistentContainer.accountSubject
-            .receive(on: DispatchQueue.main)
             .filter { [weak self] in $0 == self?.accountID }
+            .receive(on: DispatchQueue.main)
             .sink { [weak self] (_) in self?.updateAccountUI() }
         
         loadAccount()

Tusker/Screens/Timeline/TimelineTableViewController.swift

@@ -42,12 +42,10 @@ class TimelineTableViewController: DiffableTimelineLikeTableViewController<Timel
     }
     
     deinit {
-        guard let persistentContainer = mastodonController?.persistentContainer,
-              let dataSource = dataSource else { return }
+        guard let persistentContainer = mastodonController?.persistentContainer else { return }
         // decrement reference counts of any statuses we still have
         // if the app is currently being quit, this will not affect the persisted data because
         // the persistent container would already have been saved in SceneDelegate.sceneDidEnterBackground(_:)
-        // todo: remove the whole reference count system
         for case let .status(id: id, state: _) in dataSource.snapshot().itemIdentifiers {
             persistentContainer.status(for: id)?.decrementReferenceCount()
         }
@@ -109,8 +107,8 @@ class TimelineTableViewController: DiffableTimelineLikeTableViewController<Timel
                 
                 self.mastodonController.persistentContainer.addAll(statuses: statuses) {
                     var snapshot = Snapshot()
-                    snapshot.appendSections([.statuses, .footer])
-                    snapshot.appendItems(statuses.map { .status(id: $0.id, state: .unknown) }, toSection: .statuses)
+                    snapshot.appendSections([.statuses])
+                    snapshot.appendItems(statuses.map { .status(id: $0.id, state: .unknown) })
                     completion(.success(snapshot))
                 }
             }
@@ -124,12 +122,13 @@ class TimelineTableViewController: DiffableTimelineLikeTableViewController<Timel
         }
         
         guard !Preferences.shared.disableInfiniteScrolling || didConfirmLoadMore else {
-            guard !currentSnapshot.itemIdentifiers(inSection: .footer).contains(.confirmLoadMore) else {
+            guard !currentSnapshot.sectionIdentifiers.contains(.footer) || !currentSnapshot.itemIdentifiers(inSection: .footer).contains(.confirmLoadMore) else {
                 // todo: need something more accurate than "success"/"failure"
                 completion(.success(currentSnapshot))
                 return
             }
             var snapshot = currentSnapshot
+            snapshot.appendSections([.footer])
             snapshot.appendItems([.confirmLoadMore], toSection: .footer)
             self.dataSource.apply(snapshot)
             completion(.success(snapshot))
@@ -149,7 +148,7 @@ class TimelineTableViewController: DiffableTimelineLikeTableViewController<Timel
                 self.mastodonController.persistentContainer.addAll(statuses: statuses) {
                     var snapshot = currentSnapshot
                     snapshot.appendItems(statuses.map { .status(id: $0.id, state: .unknown) }, toSection: .statuses)
-                    snapshot.deleteItems([.confirmLoadMore])
+                    snapshot.deleteSections([.footer])
                     completion(.success(snapshot))
                 }
             }

Tusker/Screens/Utilities/DiffableTimelineLikeTableViewController.swift

@@ -156,8 +156,7 @@ class DiffableTimelineLikeTableViewController<Section: Hashable & CaseIterable,
         // this assumes that indexPathsForVisibleRows is always in order
         lastLastVisibleRow = tableView.indexPathsForVisibleRows?.last
         
-        let orderedContentSections = dataSource.snapshot().sectionIdentifiers.filter { timelineContentSections().contains($0) }
-        if indexPath.section == orderedContentSections.count - 1,
+        if indexPath.section == tableView.numberOfSections - 1,
            indexPath.row == tableView.numberOfRows(inSection: indexPath.section) - 1 {
             
             loadOlder()

Tusker/Views/Attachments/AttachmentView.swift

@@ -164,9 +164,7 @@ class AttachmentView: UIImageView, GIFAnimatable {
         let attachmentURL = attachment.url
         attachmentRequest = ImageCache.attachments.get(attachmentURL) { [weak self] (data, _) in
             guard let self = self, let data = data else { return }
-            DispatchQueue.main.async {
-                self.attachmentRequest = nil
-            }
+            self.attachmentRequest = nil
             if self.attachment.url.pathExtension == "gif" {
                 self.source = .gifData(attachmentURL, data)
                 if self.autoplayGifs {

Tusker/Views/Profile Header/ProfileHeaderView.swift

@@ -80,14 +80,14 @@ class ProfileHeaderView: UIView {
         cancellables = []
         
         mastodonController.persistentContainer.accountSubject
-            .receive(on: DispatchQueue.main)
             .filter { [weak self] in $0 == self?.accountID }
+            .receive(on: DispatchQueue.main)
             .sink { [weak self] in self?.updateUI(for: $0) }
             .store(in: &cancellables)
         
         mastodonController.persistentContainer.relationshipSubject
-            .receive(on: DispatchQueue.main)
             .filter { [weak self] in $0 == self?.accountID }
+            .receive(on: DispatchQueue.main)
             .sink { [weak self] (_) in self?.updateRelationship() }
             .store(in: &cancellables)
     }
@@ -203,14 +203,11 @@ class ProfileHeaderView: UIView {
                   let image = image,
                   self.accountID == accountID,
                   let transformedImage = ImageGrayscalifier.convertIfNecessary(url: avatarURL, image: image) else {
-                DispatchQueue.main.async {
-                    self?.avatarRequest = nil
-                }
                 return
             }
+            self.avatarRequest = nil
             
             DispatchQueue.main.async {
-                self.avatarRequest = nil
                 self.avatarImageView.image = transformedImage
             }
         }
@@ -220,14 +217,11 @@ class ProfileHeaderView: UIView {
                       let image = image,
                       self.accountID == accountID,
                       let transformedImage = ImageGrayscalifier.convertIfNecessary(url: header, image: image) else {
-                    DispatchQueue.main.async {
-                        self?.headerRequest = nil
-                    }
                     return
                 }
+                self.headerRequest = nil
                 
                 DispatchQueue.main.async {
-                    self.headerRequest = nil
                     self.headerImageView.image = transformedImage
                 }
             }

Tusker/Views/Status/BaseStatusTableViewCell.swift

@@ -106,8 +106,8 @@ class BaseStatusTableViewCell: UITableViewCell, MenuPreviewProvider {
     open func createObserversIfNecessary() {
         if statusUpdater == nil {
             statusUpdater = mastodonController.persistentContainer.statusSubject
-                .receive(on: DispatchQueue.main)
                 .filter { [unowned self] in $0 == self.statusID }
+                .receive(on: DispatchQueue.main)
                 .sink { [unowned self] in
                     if let mastodonController = mastodonController,
                        let status = mastodonController.persistentContainer.status(for: $0) {
@@ -118,8 +118,8 @@ class BaseStatusTableViewCell: UITableViewCell, MenuPreviewProvider {
 
         if accountUpdater == nil {
             accountUpdater = mastodonController.persistentContainer.accountSubject
-                .receive(on: DispatchQueue.main)
                 .filter { [unowned self] in $0 == self.accountID }
+                .receive(on: DispatchQueue.main)
                 .sink { [unowned self] in
                     if let mastodonController = mastodonController,
                        let account = mastodonController.persistentContainer.account(for: $0) {

Tusker/Views/Status/TimelineStatusTableViewCell.swift

@@ -59,8 +59,8 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
         
         if rebloggerAccountUpdater == nil {
             rebloggerAccountUpdater = mastodonController.persistentContainer.accountSubject
-                .receive(on: DispatchQueue.main)
                 .filter { [unowned self] in $0 == self.rebloggerID }
+                .receive(on: DispatchQueue.main)
                 .sink { [unowned self] in
                     if let mastodonController = self.mastodonController,
                        let reblogger = mastodonController.persistentContainer.account(for: $0) {