CHANGELOG.md

@@ -1,23 +1,5 @@
 # Changelog
 
-## 2024.1 (116)
-Features/Improvements:
-- Display message on empty list timelines
-- Add preference to display badge for attachments that lack alt text
-- Mark notifications as read on the Mastodon web frontend once displayed
-- iPadOS: Support tapping the selected sidebar item to scroll to top
-
-Bugfixes:
-- Fix playing back GIFVs preventing the device sleeping
-- Fix incorrect cell separator insets followers/following lists
-- Fix memory leak in attachments gallery
-- Fix notifications tab not scrolling to top when tab bar item tapped
-- Fix Trending Hashtags screen not clearing selection
-- Fix fast account switcher overlapping sensor housing on landscape iPhones
-- Fix Edit List screen not updating when accounts are added/removed
-- Fix changing List reply policy not refreshing list timeline
-- macOS: Fix certain gallery attachments being incorrectly sized/positioned
-
 ## 2024.1 (115)
 Features/Improvements:
 - Rewrite attachment gallery

Packages/GalleryVC/Sources/GalleryVC/GalleryContentViewControllerContainer.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 @MainActor
-public protocol GalleryContentViewControllerContainer: AnyObject {
+public protocol GalleryContentViewControllerContainer {
     var galleryControlsVisible: Bool { get }
     
     func setGalleryContentLoading(_ loading: Bool)

Packages/GalleryVC/Sources/GalleryVC/GalleryDismissInteraction.swift

@@ -10,7 +10,7 @@ import UIKit
 @MainActor
 class GalleryDismissInteraction: NSObject {
     
-    private unowned let viewController: GalleryViewController
+    private let viewController: GalleryViewController
     
     private var content: GalleryContentViewController?
     private var origContentFrameInGallery: CGRect?

Packages/GalleryVC/Sources/GalleryVC/GalleryItemViewController.swift

@@ -43,7 +43,6 @@ class GalleryItemViewController: UIViewController {
     private(set) var controlsVisible: Bool = true
     private(set) var scrollAndZoomEnabled = true
     
-    private var scrollViewSizeForLastZoomScaleUpdate: CGSize?
     override var prefersHomeIndicatorAutoHidden: Bool {
         return !controlsVisible
     }
@@ -220,12 +219,6 @@ class GalleryItemViewController: UIViewController {
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
         
-        // When the scrollView size changes, make sure the zoom scale is up-to-date since it depends on the scrollView's bounds.
-        // This might also fix an issue on macOS (Designed for iPad) where the content isn't placed correctly. See #446
-        if scrollViewSizeForLastZoomScaleUpdate != scrollView.bounds.size {
-            scrollViewSizeForLastZoomScaleUpdate = scrollView.bounds.size
-            updateZoomScale(resetZoom: true)
-        }
         centerContent()
     }
     
@@ -310,8 +303,6 @@ class GalleryItemViewController: UIViewController {
     }
     
     func updateZoomScale(resetZoom: Bool) {
-        scrollView.contentSize = content.contentSize
-        
         guard scrollAndZoomEnabled else {
             scrollView.maximumZoomScale = 1
             scrollView.minimumZoomScale = 1

Packages/Pachyderm/Sources/Pachyderm/Model/TimelineMarkers.swift

@@ -7,83 +7,34 @@
 
 import Foundation
 
-public struct TimelineMarkers {
-    private init() {}
+public struct TimelineMarkers: Decodable, Sendable {
+    public let home: Marker?
+    public let notifications: Marker?
     
-    public static func request<T: TimelineMarkerType>(timeline: T) -> Request<TimelineMarker<T.Payload>> {
-        Request(method: .get, path: "/api/v1/markers", queryParameters: ["timeline[]" => T.name])
+    public static func request(timelines: [Timeline]) -> Request<TimelineMarkers> {
+        return Request(method: .get, path: "/api/v1/markers", queryParameters: "timeline[]" => timelines.map(\.rawValue))
     }
     
-    public static func update<T: TimelineMarkerType>(timeline: T, lastReadID: String) -> Request<Empty> {
-        Request(method: .post, path: "/api/v1/markers", body: ParametersBody([
-            "\(T.name)[last_read_id]" => lastReadID
+    public static func update(timeline: Timeline, lastReadID: String) -> Request<Empty> {
+        return Request(method: .post, path: "/api/v1/markers", body: ParametersBody([
+            "\(timeline.rawValue)[last_read_id]" => lastReadID,
         ]))
     }
-}
     
-public struct TimelineMarker<Payload: TimelineMarkerTypePayload>: Decodable, Sendable {
-    let payload: Payload
-    
-    public var lastReadID: String {
-        payload.payload.lastReadID
-    }
-    public var version: Int {
-        payload.payload.version
-    }
-    public var updatedAt: Date {
-        payload.payload.updatedAt
+    public enum Timeline: String {
+        case home
+        case notifications
     }
     
-    public init(from decoder: any Decoder) throws {
-        self.payload = try Payload(from: decoder)
+    public struct Marker: Decodable, Sendable {
+        public let lastReadID: String
+        public let version: Int
+        public let updatedAt: Date
+        
+        enum CodingKeys: String, CodingKey {
+            case lastReadID = "last_read_id"
+            case version
+            case updatedAt = "updated_at"
+        }
     }
 }
-
-public protocol TimelineMarkerTypePayload: Decodable, Sendable {
-    var payload: MarkerPayload { get }
-}
-
-public struct HomeMarkerPayload: TimelineMarkerTypePayload {
-    public var home: MarkerPayload
-    public var payload: MarkerPayload { home }
-}
-
-public struct NotificationsMarkerPayload: TimelineMarkerTypePayload {
-    public var notifications: MarkerPayload
-    public var payload: MarkerPayload { notifications }
-}
-
-public struct MarkerPayload: Decodable, Sendable {
-    public let lastReadID: String
-    public let version: Int
-    public let updatedAt: Date
-    
-    enum CodingKeys: String, CodingKey {
-        case lastReadID = "last_read_id"
-        case version
-        case updatedAt = "updated_at"
-    }
-}
-
-public protocol TimelineMarkerType {
-    static var name: String { get }
-    associatedtype Payload: TimelineMarkerTypePayload
-}
-
-extension TimelineMarkerType where Self == HomeMarker {
-    public static var home: Self { .init() }
-}
-
-extension TimelineMarkerType where Self == NotificationsMarker {
-    public static var notifications: Self { .init() }
-}
-
-public struct HomeMarker: TimelineMarkerType {
-    public typealias Payload = HomeMarkerPayload
-    public static var name: String { "home" }
-}
-
-public struct NotificationsMarker: TimelineMarkerType {
-    public typealias Payload = NotificationsMarkerPayload
-    public static var name: String { "notifications" }
-}

Packages/TuskerPreferences/Sources/TuskerPreferences/Preferences.swift

@@ -87,7 +87,6 @@ public final class Preferences: Codable, ObservableObject {
         self.automaticallyPlayGifs = try container.decode(Bool.self, forKey: .automaticallyPlayGifs)
         self.showUncroppedMediaInline = try container.decodeIfPresent(Bool.self, forKey: .showUncroppedMediaInline) ?? true
         self.showAttachmentBadges = try container.decodeIfPresent(Bool.self, forKey: .showAttachmentBadges) ?? true
-        self.attachmentAltBadgeInverted = try container.decodeIfPresent(Bool.self, forKey: .attachmentAltBadgeInverted) ?? false
         
         self.openLinksInApps = try container.decode(Bool.self, forKey: .openLinksInApps)
         self.useInAppSafari = try container.decode(Bool.self, forKey: .useInAppSafari)
@@ -146,7 +145,6 @@ public final class Preferences: Codable, ObservableObject {
         try container.encode(automaticallyPlayGifs, forKey: .automaticallyPlayGifs)
         try container.encode(showUncroppedMediaInline, forKey: .showUncroppedMediaInline)
         try container.encode(showAttachmentBadges, forKey: .showAttachmentBadges)
-        try container.encode(attachmentAltBadgeInverted, forKey: .attachmentAltBadgeInverted)
         
         try container.encode(openLinksInApps, forKey: .openLinksInApps)
         try container.encode(useInAppSafari, forKey: .useInAppSafari)
@@ -213,7 +211,6 @@ public final class Preferences: Codable, ObservableObject {
     @Published public var automaticallyPlayGifs = true
     @Published public var showUncroppedMediaInline = true
     @Published public var showAttachmentBadges = true
-    @Published public var attachmentAltBadgeInverted = false
     
     // MARK: Behavior
     @Published public var openLinksInApps = true
@@ -277,7 +274,6 @@ public final class Preferences: Codable, ObservableObject {
         case automaticallyPlayGifs
         case showUncroppedMediaInline
         case showAttachmentBadges
-        case attachmentAltBadgeInverted
         
         case openLinksInApps
         case useInAppSafari

Tusker/Screens/Account Follows/AccountFollowsListViewController.swift

@@ -52,12 +52,6 @@ class AccountFollowsListViewController: UIViewController, CollectionViewControll
                 config.topSeparatorVisibility = .hidden
                 config.bottomSeparatorVisibility = .hidden
             }
-            if config.topSeparatorInsets != .zero {
-                config.topSeparatorInsets = TimelineStatusCollectionViewCell.separatorInsets
-            }
-            if config.bottomSeparatorInsets != .zero {
-                config.bottomSeparatorInsets = TimelineStatusCollectionViewCell.separatorInsets
-            }
             return config
         }
         let layout = UICollectionViewCompositionalLayout { sectionIndex, environment in

Tusker/Screens/Account List/AccountListViewController.swift

@@ -33,8 +33,6 @@ class AccountListViewController: UIViewController, CollectionViewController {
     override func loadView() {
         var config = UICollectionLayoutListConfiguration(appearance: .grouped)
         config.backgroundColor = .appGroupedBackground
-        config.separatorConfiguration.topSeparatorInsets = TimelineStatusCollectionViewCell.separatorInsets
-        config.separatorConfiguration.bottomSeparatorInsets = TimelineStatusCollectionViewCell.separatorInsets
         let layout = UICollectionViewCompositionalLayout { sectionIndex, environment in
             let section = NSCollectionLayoutSection.list(using: config, layoutEnvironment: environment)
             section.readableContentInset(in: environment)

Tusker/Screens/Explore/TrendingHashtagsViewController.swift

@@ -11,11 +11,11 @@ import Pachyderm
 import WebURLFoundationExtras
 import Combine
 
-class TrendingHashtagsViewController: UIViewController, CollectionViewController {
+class TrendingHashtagsViewController: UIViewController {
 
     private let mastodonController: MastodonController
     
-    private(set) var collectionView: UICollectionView!
+    private var collectionView: UICollectionView!
     private var dataSource: UICollectionViewDiffableDataSource<Section, Item>!
     
     private var state = State.unloaded
@@ -84,8 +84,6 @@ class TrendingHashtagsViewController: UIViewController, CollectionViewController
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
-        clearSelectionOnAppear(animated: animated)
-        
         Task {
             await loadInitial()
         }

Tusker/Screens/Fast Account Switcher/FastAccountSwitcherViewController.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -32,6 +32,7 @@
                         </subviews>
                         <constraints>
                             <constraint firstItem="lYU-Bb-3Wi" firstAttribute="top" secondItem="1Gd-Da-Vab" secondAttribute="topMargin" placeholder="YES" id="KQs-d5-U3f"/>
+                            <constraint firstAttribute="trailing" secondItem="lYU-Bb-3Wi" secondAttribute="trailingMargin" constant="8" id="UZh-xR-XVt"/>
                             <constraint firstAttribute="bottomMargin" secondItem="lYU-Bb-3Wi" secondAttribute="bottom" placeholder="YES" id="j6f-r5-NNI"/>
                             <constraint firstItem="lYU-Bb-3Wi" firstAttribute="leading" secondItem="1Gd-Da-Vab" secondAttribute="leading" constant="8" id="sae-ga-MGE"/>
                         </constraints>
@@ -46,7 +47,6 @@
                 <constraint firstItem="5fd-Ni-Owc" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="phf-PC-bdH"/>
                 <constraint firstItem="5fd-Ni-Owc" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="rz7-cQ-PIC"/>
                 <constraint firstAttribute="bottom" secondItem="5fd-Ni-Owc" secondAttribute="bottom" id="sHl-iD-kGi"/>
-                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="lYU-Bb-3Wi" secondAttribute="trailing" constant="8" id="snX-cx-wq6"/>
             </constraints>
             <point key="canvasLocation" x="140.57971014492756" y="144.64285714285714"/>
         </view>

Tusker/Screens/Gallery/FallbackGalleryContentViewController.swift

@@ -70,7 +70,7 @@ class FallbackGalleryNavigationController: UINavigationController, GalleryConten
     
     // MARK: GalleryContentViewController
     
-    weak var container: (any GalleryVC.GalleryContentViewControllerContainer)?
+    var container: (any GalleryVC.GalleryContentViewControllerContainer)?
     
     var contentSize: CGSize {
         .zero

Tusker/Screens/Gallery/GifvGalleryContentViewController.swift

@@ -59,7 +59,7 @@ class GifvGalleryContentViewController: UIViewController, GalleryContentViewCont
     
     // MARK: GalleryContentViewController
     
-    weak var container: (any GalleryVC.GalleryContentViewControllerContainer)?
+    var container: (any GalleryVC.GalleryContentViewControllerContainer)?
     
     var contentSize: CGSize {
         controller.item.presentationSize

Tusker/Screens/Gallery/ImageGalleryContentViewController.swift

@@ -114,7 +114,7 @@ class ImageGalleryContentViewController: UIViewController, GalleryContentViewCon
     
     // MARK: GalleryContentViewController
     
-    weak var container: (any GalleryVC.GalleryContentViewControllerContainer)?
+    var container: (any GalleryVC.GalleryContentViewControllerContainer)?
     
     var contentSize: CGSize {
         image.size

Tusker/Screens/Gallery/LoadingGalleryContentViewController.swift

@@ -13,7 +13,7 @@ class LoadingGalleryContentViewController: UIViewController, GalleryContentViewC
     private let provider: () async -> (any GalleryContentViewController)?
     private var wrapped: (any GalleryContentViewController)!
     
-    weak var container: GalleryContentViewControllerContainer?
+    var container: GalleryContentViewControllerContainer?
     
     var contentSize: CGSize {
         wrapped?.contentSize ?? .zero

Tusker/Screens/Gallery/VideoGalleryContentViewController.swift

@@ -132,7 +132,7 @@ class VideoGalleryContentViewController: UIViewController, GalleryContentViewCon
     
     // MARK: GalleryContentViewController
     
-    weak var container: (any GalleryVC.GalleryContentViewControllerContainer)?
+    var container: (any GalleryVC.GalleryContentViewControllerContainer)?
     
     var contentSize: CGSize {
         item.presentationSize

Tusker/Screens/Lists/EditListAccountsViewController.swift

@@ -17,7 +17,7 @@ class EditListAccountsViewController: UIViewController, CollectionViewController
     
     private var state = State.unloaded
     
-    private(set) var shouldReloadListTimeline = false
+    private(set) var changedAccounts = false
     
     private var dataSource: UICollectionViewDiffableDataSource<Section, Item>!
     var collectionView: UICollectionView! { view as? UICollectionView }
@@ -186,7 +186,7 @@ class EditListAccountsViewController: UIViewController, CollectionViewController
     
     @MainActor
     private func loadAccounts() async {
-        guard state == .unloaded || state == .loaded else { return }
+        guard state == .unloaded else { return }
         
         state = .loading
         
@@ -278,7 +278,7 @@ class EditListAccountsViewController: UIViewController, CollectionViewController
     }
     
     private func addAccount(id: String) async {
-        shouldReloadListTimeline = true
+        changedAccounts = true
         do {
             let req = List.add(list.id, accounts: [id])
             _ = try await mastodonController.run(req)
@@ -294,19 +294,11 @@ class EditListAccountsViewController: UIViewController, CollectionViewController
     }
     
     private func removeAccount(id: String) async {
-        shouldReloadListTimeline = true
+        changedAccounts = true
         do {
             let request = List.remove(list.id, accounts: [id])
             _ = try await mastodonController.run(request)
-            
-            var snapshot = dataSource.snapshot()
-            if snapshot.itemIdentifiers.contains(.account(id: id)) {
-                snapshot.deleteItems([.account(id: id)])
-                await MainActor.run {
-                    dataSource.apply(snapshot)
-                }
-            }
-            
+            await self.loadAccounts()
         } catch {
             let config = ToastConfiguration(from: error, with: "Error Removing Account", in: self) { [unowned self] toast in
                 toast.dismissToast(animated: true)
@@ -317,7 +309,6 @@ class EditListAccountsViewController: UIViewController, CollectionViewController
     }
     
     private func setReplyPolicy(_ replyPolicy: List.ReplyPolicy) {
-        shouldReloadListTimeline = true
         Task {
             let service = EditListSettingsService(list: list, mastodonController: mastodonController, present: { self.present($0, animated: true) })
             await service.run(replyPolicy: replyPolicy)

Tusker/Screens/Lists/ListTimelineViewController.swift

@@ -16,8 +16,6 @@ class ListTimelineViewController: TimelineViewController {
     
     var presentEditOnAppear = false
     
-    private var noContentView: UIStackView!
-    
     private var listRenamedCancellable: AnyCancellable?
     
     init(for list: List, mastodonController: MastodonController) {
@@ -55,39 +53,6 @@ class ListTimelineViewController: TimelineViewController {
         }
     }
     
-    private func createNoContentView() {
-        let title = UILabel()
-        title.textColor = .secondaryLabel
-        title.font = .preferredFont(forTextStyle: .title1).withTraits(.traitBold)!
-        title.adjustsFontForContentSizeCategory = true
-        title.text = "No Posts"
-        
-        let subtitle = UILabel()
-        subtitle.textColor = .secondaryLabel
-        subtitle.font = .preferredFont(forTextStyle: .body)
-        subtitle.adjustsFontForContentSizeCategory = true
-        subtitle.numberOfLines = 0
-        subtitle.textAlignment = .center
-        subtitle.text = "This list doesn't currently have any posts. Edit it to add accounts if necessary."
-        
-        noContentView = UIStackView(arrangedSubviews: [
-            title,
-            subtitle,
-        ])
-        noContentView.axis = .vertical
-        noContentView.spacing = 8
-        noContentView.alignment = .center
-        noContentView.isAccessibilityElement = true
-        noContentView.accessibilityLabel = subtitle.text
-        noContentView.translatesAutoresizingMaskIntoConstraints = false
-        view.addSubview(noContentView)
-        NSLayoutConstraint.activate([
-            noContentView.centerYAnchor.constraint(equalTo: view.centerYAnchor),
-            noContentView.leadingAnchor.constraint(equalToSystemSpacingAfter: view.safeAreaLayoutGuide.leadingAnchor, multiplier: 1),
-            view.safeAreaLayoutGuide.trailingAnchor.constraint(equalToSystemSpacingAfter: noContentView.trailingAnchor, multiplier: 1),
-        ])
-    }
-    
     private func listChanged() {
         title = list.title
     }
@@ -96,23 +61,10 @@ class ListTimelineViewController: TimelineViewController {
         let editListAccountsController = EditListAccountsViewController(list: list, mastodonController: mastodonController)
         editListAccountsController.navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(editListDoneButtonPressed))
         let navController = UINavigationController(rootViewController: editListAccountsController)
-        navController.sheetPresentationController?.delegate = self
         present(navController, animated: animated)
     }
     
-    private func reloadIfNecessary(editViewController: EditListAccountsViewController) {
-        guard editViewController.shouldReloadListTimeline else {
-            return
-        }
-        noContentView?.removeFromSuperview()
-        noContentView = nil
-        Task {
-            applyInitialSnapshot()
-            await controller.loadInitial()
-        }
-    }
-    
-    // MARK: Interaction
+    // MARK: - Interaction
     
     @objc func editListButtonPressed() {
         presentEdit(animated: true)
@@ -123,28 +75,12 @@ class ListTimelineViewController: TimelineViewController {
         
         dismiss(animated: true)
         
-        if let presented {
-            self.reloadIfNecessary(editViewController: presented)
+        if presented?.changedAccounts == true {
+            Task {
+                applyInitialSnapshot()
+                await controller.loadInitial()
+            }
         }
     }
 
-    // MARK: TimelineLikeControllerDelegate
-    
-    override func handleReplaceAllItems(_ timelineItems: [String]) async {
-        if timelineItems.isEmpty {
-            createNoContentView()
-        }
-        await super.handleReplaceAllItems(timelineItems)
-    }
-
-}
-
-extension ListTimelineViewController: UISheetPresentationControllerDelegate {
-    func presentationControllerWillDismiss(_ presentationController: UIPresentationController) {
-        guard let nav = presentationController.presentedViewController as? UINavigationController,
-              let edit = nav.viewControllers.first as? EditListAccountsViewController else {
-            return
-        }
-        reloadIfNecessary(editViewController: edit)
-    }
 }

Tusker/Screens/Main/MainSidebarViewController.swift

@@ -15,7 +15,6 @@ protocol MainSidebarViewControllerDelegate: AnyObject {
     func sidebarRequestPresentCompose(_ sidebarViewController: MainSidebarViewController)
     func sidebar(_ sidebarViewController: MainSidebarViewController, didSelectItem item: MainSidebarViewController.Item)
     func sidebar(_ sidebarViewController: MainSidebarViewController, showViewController viewController: UIViewController)
-    func sidebar(_ sidebarViewController: MainSidebarViewController, scrollToTopFor item: MainSidebarViewController.Item)
 }
 
 class MainSidebarViewController: UIViewController {
@@ -452,9 +451,7 @@ extension MainSidebarViewController: UICollectionViewDelegate {
             return
         }
         itemLastSelectedTimestamps[item] = Date()
-        if previouslySelectedItem == item {
-            sidebarDelegate?.sidebar(self, scrollToTopFor: item)
-        } else if [MainSidebarViewController.Item.tab(.compose), .addList, .addSavedHashtag, .addSavedInstance].contains(item) {
+        if [MainSidebarViewController.Item.tab(.compose), .addList, .addSavedHashtag, .addSavedInstance].contains(item) {
             if let previous = previouslySelectedItem, let indexPath = dataSource.indexPath(for: previous) {
                 collectionView.selectItem(at: indexPath, animated: false, scrollPosition: .centeredVertically)
             }

Tusker/Screens/Main/MainSplitViewController.swift

@@ -478,10 +478,6 @@ extension MainSplitViewController: MainSidebarViewControllerDelegate {
         }
         secondaryNavController.viewControllers = [viewController]
     }
-    
-    func sidebar(_ sidebarViewController: MainSidebarViewController, scrollToTopFor item: MainSidebarViewController.Item) {
-        (secondaryNavController as? TabBarScrollableViewController)?.tabBarScrollToTop()
-    }
 }
 
 fileprivate extension MainSidebarViewController.Item {

Tusker/Screens/Main/MainTabBarViewController.swift

@@ -241,7 +241,6 @@ extension MainTabBarViewController {
 #if !os(visionOS)
 extension MainTabBarViewController: FastAccountSwitcherViewControllerDelegate {
     func fastAccountSwitcherAddToViewHierarchy(_ fastAccountSwitcher: FastAccountSwitcherViewController) {
-        fastAccountSwitcher.view.translatesAutoresizingMaskIntoConstraints = false
         view.addSubview(fastAccountSwitcher.view)
         NSLayoutConstraint.activate([
             fastAccountSwitcher.accountsStack.bottomAnchor.constraint(equalTo: fastAccountSwitcher.view.bottomAnchor),
@@ -250,10 +249,6 @@ extension MainTabBarViewController: FastAccountSwitcherViewControllerDelegate {
             fastAccountSwitcher.view.trailingAnchor.constraint(equalTo: view.trailingAnchor),
             fastAccountSwitcher.view.topAnchor.constraint(equalTo: view.topAnchor),
             fastAccountSwitcher.view.bottomAnchor.constraint(equalTo: tabBar.topAnchor),
-            
-            // The safe area insets don't automatically propagate for some reason, so do it ourselves.
-            fastAccountSwitcher.view.safeAreaLayoutGuide.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor),
-            fastAccountSwitcher.view.safeAreaLayoutGuide.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor),
         ])
     }
     

Tusker/Screens/Notifications/NotificationsCollectionViewController.swift

@@ -12,9 +12,6 @@ import Combine
 #if canImport(Sentry)
 import Sentry
 #endif
-import OSLog
-
-private let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "NotificationsCVC")
 
 class NotificationsCollectionViewController: UIViewController, TimelineLikeCollectionViewController, CollectionViewController {
     
@@ -35,9 +32,6 @@ class NotificationsCollectionViewController: UIViewController, TimelineLikeColle
     private var newer: RequestRange?
     private var older: RequestRange?
     
-    var updatesNotificationsMarker: Bool = false
-    private var newestDisplayedNotification: Item?
-    
     init(allowedTypes: [Pachyderm.Notification.Kind], mastodonController: MastodonController) {
         self.allowedTypes = allowedTypes
         self.mastodonController = mastodonController
@@ -211,12 +205,6 @@ class NotificationsCollectionViewController: UIViewController, TimelineLikeColle
         }
     }
     
-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-        
-        updateNotificationsMarkerIfNecessary()
-    }
-    
     @objc func refresh() {
         Task { @MainActor in
             if case .notLoadedInitial = controller.state {
@@ -323,23 +311,6 @@ class NotificationsCollectionViewController: UIViewController, TimelineLikeColle
         await apply(snapshot, animatingDifferences: true)
     }
     
-    private func updateNotificationsMarkerIfNecessary() {
-        guard updatesNotificationsMarker,
-              case let .group(group, _, _) = newestDisplayedNotification,
-              let notification = group.notifications.first else {
-            return
-        }
-        logger.debug("Updating notifications marker with \(notification.id)")
-        Task {
-            let req = TimelineMarkers.update(timeline: .notifications, lastReadID: notification.id)
-            do {
-                _ = try await mastodonController.run(req)
-            } catch {
-                logger.error("Failed to update notifications marker: \(String(describing: error))")
-            }
-        }
-    }
-    
 }
 
 extension NotificationsCollectionViewController {
@@ -574,21 +545,6 @@ extension NotificationsCollectionViewController: UICollectionViewDelegate {
         guard case .notifications = dataSource.sectionIdentifier(for: indexPath.section) else {
             return
         }
-        
-        if updatesNotificationsMarker {
-            let shouldUpdateNewestDisplayedNotification: Bool
-            if let newestDisplayedNotification,
-               let currentNewestIndexPath = dataSource.indexPath(for: newestDisplayedNotification) {
-                shouldUpdateNewestDisplayedNotification = indexPath < currentNewestIndexPath
-            } else {
-                shouldUpdateNewestDisplayedNotification = true
-            }
-            if shouldUpdateNewestDisplayedNotification,
-               let item = dataSource.itemIdentifier(for: indexPath) {
-                newestDisplayedNotification = item
-            }
-        }
-        
         let itemsInSection = collectionView.numberOfItems(inSection: indexPath.section)
         if indexPath.row == itemsInSection - 1 {
             Task {
@@ -796,22 +752,3 @@ extension NotificationsCollectionViewController: StatusCollectionViewCellDelegat
         }
     }
 }
-
-extension NotificationsCollectionViewController: TabBarScrollableViewController {
-    func tabBarScrollToTop() {
-        collectionView.scrollToTop()
-    }
-}
-
-extension NotificationsCollectionViewController: StatusBarTappableViewController {
-    func handleStatusBarTapped(xPosition: CGFloat) -> StatusBarTapActionResult {
-        collectionView.scrollToTop()
-        return .stop
-    }
-}
-
-extension NotificationsCollectionViewController: BackgroundableViewController {
-    func sceneDidEnterBackground() {
-        updateNotificationsMarkerIfNecessary()
-    }
-}

Tusker/Screens/Notifications/NotificationsPageViewController.swift

@@ -24,7 +24,6 @@ class NotificationsPageViewController: SegmentedPageViewController<Notifications
             let vc = NotificationsCollectionViewController(allowedTypes: page.allowedTypes, mastodonController: mastodonController)
             vc.title = page.title
             vc.userActivity = page.userActivity(accountID: mastodonController.accountInfo!.id)
-            vc.updatesNotificationsMarker = page == .all
             return vc
         }
         

Tusker/Screens/Preferences/MediaPrefsView.swift

@@ -44,13 +44,8 @@ struct MediaPrefsView: View {
             }
             
             Toggle(isOn: $preferences.showAttachmentBadges) {
-                Text("Show GIF/\(Text("Alt").font(.body.lowercaseSmallCaps())) Badges")
+                Text("Show GIF/ALT Badges")
             }
-            
-            Toggle(isOn: $preferences.attachmentAltBadgeInverted) {
-                Text("Show Badge when Missing \(Text("Alt").font(.body.lowercaseSmallCaps()))")
-            }
-            .disabled(!preferences.showAttachmentBadges)
         }
         .appGroupedListRowBackground()
     }

Tusker/Screens/Timeline/TimelineViewController.swift

@@ -387,6 +387,16 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
                     _ = try await mastodonController.run(req)
                 } catch {
                     stateRestorationLogger.error("TimelineViewController: failed to update timeline marker: \(String(describing: error))")
+                    
+                    #if canImport(Sentry)
+                    if let error = error as? Client.Error,
+                       case .networkError(_) = error.type {
+                        return
+                    }
+                    let event = Event(error: error)
+                    event.message = SentryMessage(formatted: "Failed to update timeline marker: \(String(describing: error))")
+                    SentrySDK.capture(event: event)
+                    #endif
                 }
             }
         }
@@ -563,9 +573,12 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
     @MainActor
     private func restoreStatusesFromMarkerPosition() async -> Bool {
         do {
-            let (marker, _) = try await mastodonController.run(TimelineMarkers.request(timeline: .home))
-            async let status = try await mastodonController.run(Client.getStatus(id: marker.lastReadID)).0
-            async let olderStatuses = try await mastodonController.run(Client.getStatuses(timeline: .home, range: .before(id: marker.lastReadID, count: Self.pageSize))).0
+            let (marker, _) = try await mastodonController.run(TimelineMarkers.request(timelines: [.home]))
+            guard let home = marker.home else {
+                return false
+            }
+            async let status = try await mastodonController.run(Client.getStatus(id: home.lastReadID)).0
+            async let olderStatuses = try await mastodonController.run(Client.getStatuses(timeline: .home, range: .before(id: home.lastReadID, count: Self.pageSize))).0
             
             let allStatuses = try await [status] + olderStatuses
             await mastodonController.persistentContainer.addAll(statuses: allStatuses)
@@ -577,11 +590,21 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
             await apply(snapshot, animatingDifferences: false)
             collectionView.contentOffset = CGPoint(x: 0, y: -collectionView.adjustedContentInset.top)
             
-            stateRestorationLogger.debug("TimelineViewController: restored from timeline marker with last read ID: \(marker.lastReadID)")
+            stateRestorationLogger.debug("TimelineViewController: restored from timeline marker with last read ID: \(home.lastReadID)")
             
             return true
         } catch {
             stateRestorationLogger.error("TimelineViewController: failed to load from timeline marker: \(String(describing: error))")
+            
+            #if canImport(Sentry)
+            if let error = error as? Client.Error,
+               case .networkError(_) = error.type {
+                return false
+            }
+            let event = Event(error: error)
+            event.message = SentryMessage(formatted: "Failed to load from timeline marker: \(String(describing: error))")
+            SentrySDK.capture(event: event)
+            #endif
             return false
         }
     }
@@ -993,18 +1016,6 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
         }
         self.showToast(configuration: config, animated: true)
     }
-    
-    // this is copied from the TimelineLikeCollectionViewController implementation because it needs to be overridable by ListTimelineViewController
-    func handleReplaceAllItems(_ timelineItems: [String]) async {
-        var snapshot = dataSource.snapshot()
-        if snapshot.sectionIdentifiers.contains(.entries) {
-            snapshot.deleteSections([.entries])
-        }
-        snapshot.appendSections([.entries])
-        snapshot.appendItems(timelineItems.map { .fromTimelineItem($0) }, toSection: .entries)
-        await apply(snapshot, animatingDifferences: false)
-    }
-
 }
 
 extension TimelineViewController {

Tusker/Screens/Utilities/SplitNavigationController.swift

@@ -258,12 +258,6 @@ class SplitNavigationController: UIViewController {
     }
 }
 
-extension SplitNavigationController: TabBarScrollableViewController {
-    func tabBarScrollToTop() {
-        (viewControllers.last as? TabBarScrollableViewController)?.tabBarScrollToTop()
-    }
-}
-
 extension SplitNavigationController: StatusBarTappableViewController {
     func handleStatusBarTapped(xPosition: CGFloat) -> StatusBarTapActionResult {
         let vcs = viewControllers

Tusker/Views/Attachments/AttachmentView.swift

@@ -30,8 +30,6 @@ class AttachmentView: GIFImageView {
     var attachment: Attachment!
     var index: Int!
     
-    private var currentBadges: Badges = []
-    
     private var loadAttachmentTask: Task<Void, Never>?
     private var source: Source?
     var attachmentImage: UIImage? {
@@ -105,9 +103,8 @@ class AttachmentView: GIFImageView {
             }
         }
         
-        let newBadges = getBadges()
-        if currentBadges != newBadges {
-            createBadgesView(newBadges)
+        if getBadges().isEmpty != Preferences.shared.showAttachmentBadges {
+            createBadgesView(getBadges())
         }
     }
     
@@ -178,13 +175,8 @@ class AttachmentView: GIFImageView {
             return []
         }
         var badges: Badges = []
-        let hasDescription = attachment.description?.isEmpty == false
-        if hasDescription,
-           !Preferences.shared.attachmentAltBadgeInverted {
+        if attachment.description?.isEmpty == false {
             badges.formUnion(.alt)
-        } else if !hasDescription,
-                  Preferences.shared.attachmentAltBadgeInverted {
-            badges.formUnion(.noAlt)
         }
         if attachment.kind == .gifv || attachment.url.pathExtension == "gif" {
             badges.formUnion(.gif)
@@ -362,8 +354,6 @@ class AttachmentView: GIFImageView {
     }
     
     private func createBadgesView(_ badges: Badges) {
-        currentBadges = badges
-        
         guard !badges.isEmpty else {
             badgeContainer?.removeFromSuperview()
             badgeContainer = nil
@@ -403,9 +393,6 @@ class AttachmentView: GIFImageView {
         if badges.contains(.alt) {
             makeBadgeView(text: "ALT")
         }
-        if badges.contains(.noAlt) {
-            makeBadgeView(text: "No ALT")
-        }
         
         let first = stack.arrangedSubviews.first!
         first.layer.masksToBounds = true
@@ -458,7 +445,6 @@ fileprivate extension AttachmentView {
     struct Badges: OptionSet {
         static let gif = Badges(rawValue: 1 << 0)
         static let alt = Badges(rawValue: 1 << 1)
-        static let noAlt = Badges(rawValue: 1 << 2)
         
         let rawValue: Int
     }

Tusker/Views/Attachments/GifvController.swift

@@ -29,7 +29,6 @@ class GifvController {
         self.isGrayscale = Preferences.shared.grayscaleImages
         
         player.isMuted = true
-        player.preventsDisplaySleepDuringVideoPlayback = false
         
         NotificationCenter.default.addObserver(self, selector: #selector(restartItem), name: .AVPlayerItemDidPlayToEndTime, object: item)
         NotificationCenter.default.addObserver(self, selector: #selector(preferencesChanged), name: .preferencesChanged, object: nil)

Version.xcconfig

@@ -10,7 +10,7 @@
 // https://help.apple.com/xcode/#/dev745c5c974
 
 MARKETING_VERSION = 2024.1
-CURRENT_PROJECT_VERSION = 116
+CURRENT_PROJECT_VERSION = 115
 CURRENT_PROJECT_VERSION = $(inherited)$(CURRENT_PROJECT_VERSION_BUILD_SUFFIX_$(CONFIGURATION))
 
 CURRENT_PROJECT_VERSION_BUILD_SUFFIX_Debug=-dev