Tusker/API/InstanceFeatures.swift

@@ -257,8 +257,8 @@ private func setInstanceBreadcrumb(instance: Instance, nodeInfo: NodeInfo?) {
     ]
     if let nodeInfo {
         crumb.data!["nodeInfo"] = [
-            "software": nodeInfo.software.name,
+            "version": nodeInfo.version,
-            "version": nodeInfo.software.version,
+            "software": nodeInfo.software,
         ]
     }
     SentrySDK.addBreadcrumb(crumb: crumb)

Tusker/Preferences/Preferences.swift

@@ -52,11 +52,7 @@ class Preferences: Codable, ObservableObject {
         self.mentionReblogger = try container.decode(Bool.self, forKey: .mentionReblogger)
         self.useTwitterKeyboard = try container.decodeIfPresent(Bool.self, forKey: .useTwitterKeyboard) ?? false
         
-        if let blurAllMedia = try? container.decodeIfPresent(Bool.self, forKey: .blurAllMedia) {
+        self.blurAllMedia = try container.decode(Bool.self, forKey: .blurAllMedia)
-            self.attachmentBlurMode = blurAllMedia ? .always : .useStatusSetting
-        } else {
-            self.attachmentBlurMode = try container.decode(AttachmentBlurMode.self, forKey: .attachmentBlurMode)
-        }
         self.blurMediaBehindContentWarning = try container.decodeIfPresent(Bool.self, forKey: .blurMediaBehindContentWarning) ?? true
         self.automaticallyPlayGifs = try container.decode(Bool.self, forKey: .automaticallyPlayGifs)
         
@@ -99,7 +95,7 @@ class Preferences: Codable, ObservableObject {
         try container.encode(mentionReblogger, forKey: .mentionReblogger)
         try container.encode(useTwitterKeyboard, forKey: .useTwitterKeyboard)
         
-        try container.encode(attachmentBlurMode, forKey: .attachmentBlurMode)
+        try container.encode(blurAllMedia, forKey: .blurAllMedia)
         try container.encode(blurMediaBehindContentWarning, forKey: .blurMediaBehindContentWarning)
         try container.encode(automaticallyPlayGifs, forKey: .automaticallyPlayGifs)
         
@@ -144,12 +140,10 @@ class Preferences: Codable, ObservableObject {
     @Published var useTwitterKeyboard = false
     
     // MARK: Media
-    @Published var attachmentBlurMode = AttachmentBlurMode.useStatusSetting {
+    @Published var blurAllMedia = false {
         didSet {
-            if attachmentBlurMode == .always {
+            if blurAllMedia {
                 blurMediaBehindContentWarning = true
-            } else if attachmentBlurMode == .never {
-                blurMediaBehindContentWarning = false
             }
         }
     }
@@ -197,8 +191,7 @@ class Preferences: Codable, ObservableObject {
         case mentionReblogger
         case useTwitterKeyboard
         
-        case blurAllMedia // only used for migration
+        case blurAllMedia
-        case attachmentBlurMode
         case blurMediaBehindContentWarning
         case automaticallyPlayGifs
         
@@ -261,23 +254,4 @@ extension Preferences {
     }
 }
 
-extension Preferences {
-    enum AttachmentBlurMode: Codable, Hashable, CaseIterable {
-        case useStatusSetting
-        case always
-        case never
-        
-        var displayName: String {
-            switch self {
-            case .useStatusSetting:
-                return "Default"
-            case .always:
-                return "Always"
-            case .never:
-                return "Never"
-            }
-        }
-    }
-}
-
 extension UIUserInterfaceStyle: Codable {}

Tusker/Screens/Attachment Gallery/GalleryViewController.swift

@@ -136,11 +136,6 @@ class GalleryViewController: UIPageViewController, UIPageViewControllerDataSourc
             vc.player?.play()
         }
     }
-    
-    override func accessibilityPerformEscape() -> Bool {
-        dismiss(animated: true)
-        return true
-    }
 
     // MARK: - Page View Controller Data Source
     

Tusker/Screens/Explore/FeaturedProfileCollectionViewCell.swift

@@ -122,24 +122,5 @@ class FeaturedProfileCollectionViewCell: UICollectionViewCell {
             displayNameLabel.updateForAccountDisplayName(account: account)
         }
     }
-    
+
-    // MARK: Accessibility
-    
-    override var isAccessibilityElement: Bool {
-        get { true }
-        set {}
-    }
-    
-    override var accessibilityAttributedLabel: NSAttributedString? {
-        get {
-            guard let account else {
-                return nil
-            }
-            let s = NSMutableAttributedString(string: "\(account.displayName), ")
-            s.append(noteTextView.attributedText)
-            return s
-        }
-        set {}
-    }
-    
 }

Tusker/Screens/Explore/ProfileDirectoryViewController.swift

@@ -34,9 +34,8 @@ class ProfileDirectoryViewController: UIViewController {
 
         title = NSLocalizedString("Profile Directory", comment: "profile directory title")
         
-        let filterItem = UIBarButtonItem(image: UIImage(systemName: "line.3.horizontal.decrease.circle"), menu: nil)
+        // todo: it would be nice if there were a better "filter" icon
-        filterItem.accessibilityLabel = "Filter"
+        navigationItem.rightBarButtonItem = UIBarButtonItem(image: UIImage(systemName: "scope"), menu: nil)
-        navigationItem.rightBarButtonItem = filterItem
         updateFilterMenu()
         
         let layout = UICollectionViewCompositionalLayout(sectionProvider: { (sectionIndex, layoutEnvironment) in

Tusker/Screens/Large Image/LargeImageViewController.swift

@@ -21,7 +21,6 @@ class LargeImageViewController: UIViewController, UIScrollViewDelegate, LargeIma
     @IBOutlet weak var descriptionLabel: UILabel!
     
     private var shareContainer: UIView!
-    private var closeContainer: UIView!
     private var shareImage: UIImageView!
     private var shareButtonTopConstraint: NSLayoutConstraint!
     private var shareButtonLeadingConstraint: NSLayoutConstraint!
@@ -117,12 +116,6 @@ class LargeImageViewController: UIViewController, UIScrollViewDelegate, LargeIma
         view.addGestureRecognizer(doubleTap)
         
         NotificationCenter.default.addObserver(self, selector: #selector(preferencesChanged), name: .preferencesChanged, object: nil)
-        
-        accessibilityElements = [
-            topControlsView!,
-            contentView,
-            bottomControlsView!,
-        ]
     }
     
     private func setupContentView() {
@@ -142,9 +135,6 @@ class LargeImageViewController: UIViewController, UIScrollViewDelegate, LargeIma
     
     private func setupControls() {
         shareContainer = UIView()
-        shareContainer.isAccessibilityElement = true
-        shareContainer.accessibilityTraits = .button
-        shareContainer.accessibilityLabel = "Share"
         shareContainer.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(sharePressed)))
         shareContainer.translatesAutoresizingMaskIntoConstraints = false
         topControlsView.addSubview(shareContainer)
@@ -171,10 +161,7 @@ class LargeImageViewController: UIViewController, UIScrollViewDelegate, LargeIma
             shareImage.heightAnchor.constraint(equalToConstant: 24),
         ])
         
-        closeContainer = UIView()
+        let closeContainer = UIView()
-        closeContainer.isAccessibilityElement = true
-        closeContainer.accessibilityTraits = .button
-        closeContainer.accessibilityLabel = "Close"
         closeContainer.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(closeButtonPressed)))
         closeContainer.translatesAutoresizingMaskIntoConstraints = false
         topControlsView.addSubview(closeContainer)

Tusker/Screens/Preferences/MediaPrefsView.swift

@@ -21,18 +21,14 @@ struct MediaPrefsView: View {
     
     var viewingSection: some View {
         Section(header: Text("Viewing")) {
-            Picker(selection: $preferences.attachmentBlurMode) {
+            Toggle(isOn: $preferences.blurAllMedia) {
-                ForEach(Preferences.AttachmentBlurMode.allCases, id: \.self) { mode in
+                Text("Blur All Media")
-                    Text(mode.displayName).tag(mode)
-                }
-            } label: {
-                Text("Blur Media")
             }
             
             Toggle(isOn: $preferences.blurMediaBehindContentWarning) {
                 Text("Blur Media Behind Content Warning")
             }
-            .disabled(preferences.attachmentBlurMode != .useStatusSetting)
+            .disabled(preferences.blurAllMedia)
             
             Toggle(isOn: $preferences.automaticallyPlayGifs) {
                 Text("Automatically Play GIFs")

Tusker/Screens/Timeline/TimelineViewController.swift

@@ -345,7 +345,7 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
     
     private func removeTimelineDescriptionCell() {
         var snapshot = dataSource.snapshot()
-        snapshot.deleteItems([.publicTimelineDescription])
+        snapshot.deleteSections([.header])
         dataSource.apply(snapshot, animatingDifferences: true)
         isShowingTimelineDescription = false
     }

Tusker/Views/ContentTextView.swift

@@ -173,17 +173,15 @@ class ContentTextView: LinkTextView, BaseEmojiLabel {
     
     // MARK: - Navigation
     
-    func getViewController(forLink url: URL, inRange range: NSRange) -> UIViewController? {
+    func getViewController(forLink url: URL, inRange range: NSRange) -> UIViewController {
         let text = (self.text as NSString).substring(with: range)
         
         if let mention = getMention(for: url, text: text) {
             return ProfileViewController(accountID: mention.id, mastodonController: mastodonController!)
         } else if let tag = getHashtag(for: url, text: text) {
             return HashtagTimelineViewController(for: tag, mastodonController: mastodonController!)
-        } else if url.scheme == "https" || url.scheme == "http" {
-            return SFSafariViewController(url: url)
         } else {
-            return nil
+            return SFSafariViewController(url: url)
         }
     }
     

Tusker/Views/Status/BaseStatusTableViewCell.swift

@@ -231,17 +231,16 @@ class BaseStatusTableViewCell: UITableViewCell {
     
     func updateUIForPreferences(account: AccountMO, status: StatusMO) {
         avatarImageView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadius(for: avatarImageView)
-        switch Preferences.shared.attachmentBlurMode {
+        if Preferences.shared.blurAllMedia {
-        case .never:
-            attachmentsView.contentHidden = false
-        case .always:
             attachmentsView.contentHidden = true
-        default:
+        } else if status.sensitive {
-            if status.sensitive {
+            if !Preferences.shared.blurMediaBehindContentWarning && !status.spoilerText.isEmpty {
-                attachmentsView.contentHidden = status.spoilerText.isEmpty || Preferences.shared.blurMediaBehindContentWarning
-            } else {
                 attachmentsView.contentHidden = false
+            } else {
+                attachmentsView.contentHidden = true
             }
+        } else {
+            attachmentsView.contentHidden = false
         }
         
         updateStatusIconsForPreferences(status)

Tusker/Views/Status/StatusCollectionViewCell.swift

@@ -148,17 +148,16 @@ extension StatusCollectionViewCell {
     
     func baseUpdateUIForPreferences(status: StatusMO) {
         avatarImageView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadiusFraction * Self.avatarImageViewSize
-        switch Preferences.shared.attachmentBlurMode {
+        if Preferences.shared.blurAllMedia {
-        case .never:
-            contentContainer.attachmentsView.contentHidden = false
-        case .always:
             contentContainer.attachmentsView.contentHidden = true
-        default:
+        } else if status.sensitive {
-            if status.sensitive {
+            if !Preferences.shared.blurMediaBehindContentWarning && !status.spoilerText.isEmpty {
-                contentContainer.attachmentsView.contentHidden = status.spoilerText.isEmpty || Preferences.shared.blurMediaBehindContentWarning
-            } else {
                 contentContainer.attachmentsView.contentHidden = false
+            } else {
+                contentContainer.attachmentsView.contentHidden = true
             }
+        } else {
+            contentContainer.attachmentsView.contentHidden = false
         }
         
         let reblogButtonImage: UIImage

Tusker/Views/Status/TimelineStatusCollectionViewCell.swift

@@ -369,13 +369,7 @@ class TimelineStatusCollectionViewCell: UICollectionViewListCell, StatusCollecti
             guard let status = mastodonController.persistentContainer.status(for: statusID) else {
                 return nil
             }
-            var str: AttributedString = ""
+            var str = AttributedString("\(status.account.displayOrUserName), ")
-            if let rebloggerID,
-               let reblogger = mastodonController.persistentContainer.account(for: rebloggerID) {
-                str += AttributedString("Reblogged by \(reblogger.displayOrUserName): ")
-            }
-            str += AttributedString(status.account.displayOrUserName)
-            str += ", "
             if statusState.collapsed ?? false {
                 if !status.spoilerText.isEmpty {
                     str += AttributedString(status.spoilerText)
@@ -384,24 +378,15 @@ class TimelineStatusCollectionViewCell: UICollectionViewListCell, StatusCollecti
                 str += "collapsed"
             } else {
                 str += AttributedString(contentTextView.attributedText)
-
-                if status.attachments.count > 0 {
-                    if status.attachments.count  == 1 {
-                        let attachment = status.attachments[0]
-                        let desc = attachment.description?.isEmpty == false ? attachment.description! : "no description"
-                        str += AttributedString(", attachment: \(desc)")
-                    } else {
-                        for (index, attachment) in status.attachments.enumerated() {
-                            let desc = attachment.description?.isEmpty == false ? attachment.description! : "no description"
-                            str += AttributedString(", attachment \(index + 1): \(desc)")
-                        }
-                    }
-                }
-                if status.poll != nil {
-                    str += ", poll"
-                }
             }
-            
+
+            if status.attachments.count > 0 {
+                // TODO: localize me
+                str += AttributedString(", \(status.attachments.count) attachment\(status.attachments.count > 1 ? "s" : "")")
+            }
+            if status.poll != nil {
+                str += ", poll"
+            }
             str += AttributedString(", \(status.createdAt.formatted(.relative(presentation: .numeric)))")
             if status.visibility < .unlisted {
                 str += AttributedString(", \(status.visibility.displayName)")
@@ -409,6 +394,10 @@ class TimelineStatusCollectionViewCell: UICollectionViewListCell, StatusCollecti
             if status.localOnly {
                 str += ", local"
             }
+            if let rebloggerID,
+               let reblogger = mastodonController.persistentContainer.account(for: rebloggerID) {
+                str += AttributedString(", reblogged by \(reblogger.displayOrUserName)")
+            }
             return NSAttributedString(str)
         }
         set {}

Tusker/Views/Status/TimelineStatusTableViewCell.swift

@@ -254,13 +254,7 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
             guard let status = mastodonController.persistentContainer.status(for: statusID) else {
                 return nil
             }
-            var str: AttributedString = ""
+            var str = AttributedString("\(status.account.displayOrUserName), ")
-            if let rebloggerID,
-               let reblogger = mastodonController.persistentContainer.account(for: rebloggerID) {
-                str += AttributedString("Reblogged by \(reblogger.displayOrUserName): ")
-            }
-            str += AttributedString(status.account.displayOrUserName)
-            str += ", "
             if statusState.collapsed ?? false {
                 if !status.spoilerText.isEmpty {
                     str += AttributedString(status.spoilerText)
@@ -269,24 +263,15 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
                 str += "collapsed"
             } else {
                 str += AttributedString(contentTextView.attributedText)
-
-                if status.attachments.count > 0 {
-                    if status.attachments.count  == 1 {
-                        let attachment = status.attachments[0]
-                        let desc = attachment.description?.isEmpty == false ? attachment.description! : "no description"
-                        str += AttributedString(", attachment: \(desc)")
-                    } else {
-                        for (index, attachment) in status.attachments.enumerated() {
-                            let desc = attachment.description?.isEmpty == false ? attachment.description! : "no description"
-                            str += AttributedString(", attachment \(index + 1): \(desc)")
-                        }
-                    }
-                }
-                if status.poll != nil {
-                    str += ", poll"
-                }
             }
-            
+
+            if status.attachments.count > 0 {
+                // TODO: localize me
+                str += AttributedString(", \(status.attachments.count) attachment\(status.attachments.count > 1 ? "s" : "")")
+            }
+            if status.poll != nil {
+                str += ", poll"
+            }
             str += AttributedString(", \(status.createdAt.formatted(.relative(presentation: .numeric)))")
             if status.visibility < .unlisted {
                 str += AttributedString(", \(status.visibility.displayName)")
@@ -294,6 +279,10 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
             if status.localOnly {
                 str += ", local"
             }
+            if let rebloggerID,
+               let reblogger = mastodonController.persistentContainer.account(for: rebloggerID) {
+                str += AttributedString(", reblogged by \(reblogger.displayOrUserName)")
+            }
             return NSAttributedString(str)
         }
         set {}