CHANGELOG.md

@@ -1,23 +1,5 @@
 # Changelog
 
-## 2024.3 (129)
-Bugfixes:
-- Fix excessive network traffic on profile pages
-- Fix attachment gallery controls visibility not being synced between pages
-- Fix video attachments not restarting when play pressed while at ends
-- Fix profile field text being misaligned
-- Fix at sign in timeline statuses usernames sometimes clipping
-- Fix add hashtag/instance to Pinned Timelines sheets dismissing immediately when opened
-- Fix for display name being replaced with incorrect user in certain circumstances
-- Fix profile moved overlay view appearing behind avatar/header
-- Fix profile moved view accessibility with VoiceOver
-- Fix mention/status push notifications not showing content warning
-- Fix sensitive attachment thumbnails being shown in push notifications
-- Fix Dynamic Type not applying to status content
-- Fix expand all option in Conversation not transferring when opening ancestors
-- Fix not being able to resolve remote Mastodon status links in Conversation screen
-- Fix status indicator icons overlapping thread links when Dynamic Type is enabled
-
 ## 2024.3 (128)
 Bugfixes:
 - Fix selecting poll option playing too much haptic feedback

Tusker.xcodeproj/project.pbxproj

@@ -3260,7 +3260,7 @@
 			repositoryURL = "https://git.shadowfacts.net/shadowfacts/HTMLStreamer.git";
 			requirement = {
 				kind = exactVersion;
-				version = 0.3.0;
+				version = 0.2.5;
 			};
 		};
 		D63CC700290EC0B8000E19DE /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = {

Tusker/HTMLConverter.swift

@@ -25,14 +25,8 @@ class HTMLConverter {
     
     private let converter: AttributedStringConverter<Callbacks>
     
-    init(font: UIFont, monospaceFont: UIFont, fontMetrics: UIFontMetrics, color: UIColor, paragraphStyle: NSParagraphStyle) {
+    init(font: UIFont, monospaceFont: UIFont, color: UIColor, paragraphStyle: NSParagraphStyle) {
-        let config = AttributedStringConverterConfiguration(
+        let config = AttributedStringConverterConfiguration(font: font, monospaceFont: monospaceFont, color: color, paragraphStyle: paragraphStyle)
-            font: font,
-            monospaceFont: monospaceFont,
-            fontMetrics: fontMetrics,
-            color: color,
-            paragraphStyle: paragraphStyle
-        )
         self.converter = AttributedStringConverter(configuration: config)
     }
    

Tusker/Screens/Conversation/ConversationCollectionViewController.swift

@@ -364,9 +364,7 @@ extension ConversationCollectionViewController: UICollectionViewDelegate {
                 conv.showStatusesAutomatically = showStatusesAutomatically
                 show(conv)
             } else {
-                let conv = ConversationViewController(for: id, state: state.copy(), mastodonController: mastodonController)
+                selected(status: id, state: state.copy())
-                conv.showStatusesAutomatically = showStatusesAutomatically
-                show(conv)
             }
         case .expandThread(childThreads: let childThreads, inline: _):
             let indexPathBeforeExpandThread = IndexPath(row: indexPath.row - 1, section: indexPath.section)

Tusker/Screens/Conversation/ConversationViewController.swift

@@ -221,16 +221,10 @@ class ConversationViewController: UIViewController {
                 completionHandler(nil)
             }
         }
-        if isLikelyMastodonRemoteStatus(url: url) {
+        if isLikelyMastodonRemoteStatus(url: url),
-            var request = URLRequest(url: url)
+           let (_, response) = try? await URLSession.appDefault.data(from: url, delegate: RedirectBlocker()),
-            // Mastodon uses an intermediate redirect page for browsers which requires user input that we don't want.
+           let location = (response as? HTTPURLResponse)?.value(forHTTPHeaderField: "location") {
-            request.addValue("application/activity+json", forHTTPHeaderField: "accept")
+            effectiveURL = location
-            if let (_, response) = try? await URLSession.appDefault.data(for: request, delegate: RedirectBlocker()),
-              let location = (response as? HTTPURLResponse)?.value(forHTTPHeaderField: "location") {
-               effectiveURL = location
-           } else {
-               effectiveURL = WebURL(url)!.serialized(excludingFragment: true)
-           }
         } else {
             effectiveURL = WebURL(url)!.serialized(excludingFragment: true)
         }
@@ -238,14 +232,9 @@ class ConversationViewController: UIViewController {
         let request = Client.search(query: effectiveURL, types: [.statuses], resolve: true)
         do {
             let (results, _) = try await mastodonController.run(request)
-            let statuses = results.statuses.compactMap(\.value)
+            guard let status = results.statuses.compactMap(\.value).first(where: { $0.url?.serialized() == effectiveURL }) else {
-            // Don't try to exactly match effective URL because the URL form Mastodon
-            // uses for the ActivityPub redirect doesn't match what's returned by the API.
-            // Instead we just assume that, if only one status was returned, it worked.
-            guard statuses.count == 1 else {
                 throw UnableToResolveError()
             }
-            let status = statuses[0]
             _ = mastodonController.persistentContainer.addOrUpdateOnViewContext(status: status)
             mode = .localID(status.id)
             return status.id

Tusker/Screens/Report/ReportStatusView.swift

@@ -12,7 +12,6 @@ import SwiftUI
 private var converter = HTMLConverter(
     font: .preferredFont(forTextStyle: .body),
     monospaceFont: UIFontMetrics.default.scaledFont(for: .monospacedSystemFont(ofSize: 17, weight: .regular)),
-    fontMetrics: .default,
     color: .label,
     paragraphStyle: .default
 )

Tusker/Views/ConfirmReblogStatusPreviewView.swift

@@ -13,7 +13,6 @@ class ConfirmReblogStatusPreviewView: UIView {
     private static let htmlConverter = HTMLConverter(
         font: .preferredFont(forTextStyle: .caption2),
         monospaceFont: UIFontMetrics(forTextStyle: .caption2).scaledFont(for: .monospacedSystemFont(ofSize: 17, weight: .regular)),
-        fontMetrics: UIFontMetrics(forTextStyle: .caption2),
         color: .label,
         paragraphStyle: .default
     )

Tusker/Views/ContentTextView.swift

@@ -25,7 +25,6 @@ class ContentTextView: LinkTextView, BaseEmojiLabel {
     private static let defaultBodyHTMLConverter = HTMLConverter(
         font: .preferredFont(forTextStyle: .body),
         monospaceFont: UIFontMetrics.default.scaledFont(for: .monospacedSystemFont(ofSize: 17, weight: .regular)),
-        fontMetrics: .default,
         color: .label,
         paragraphStyle: .default
     )

Tusker/Views/Profile Header/ProfileFieldValueView.swift

@@ -21,7 +21,6 @@ class ProfileFieldValueView: UIView {
     private static let converter = HTMLConverter(
         font: .preferredFont(forTextStyle: .body),
         monospaceFont: UIFontMetrics.default.scaledFont(for: .monospacedSystemFont(ofSize: 17, weight: .regular)),
-        fontMetrics: .default,
         color: .label,
         paragraphStyle: .default
     )

Tusker/Views/Status/ConversationMainStatusCollectionViewCell.swift

@@ -20,7 +20,6 @@ class ConversationMainStatusCollectionViewCell: UICollectionViewListCell, Status
     private static let htmlConverter = HTMLConverter(
         font: ConversationMainStatusCollectionViewCell.contentFont,
         monospaceFont: ConversationMainStatusCollectionViewCell.monospaceFont,
-        fontMetrics: .default,
         color: .label,
         paragraphStyle: ConversationMainStatusCollectionViewCell.contentParagraphStyle
     )

Tusker/Views/Status/StatusMetaIndicatorsView.swift

@@ -70,7 +70,8 @@ class StatusMetaIndicatorsView: UIView {
     
     private func configureImageView(_ imageView: UIImageView) {
         let weight: UIImage.SymbolWeight = UIAccessibility.isBoldTextEnabled ? .regular : traitCollection.preferredContentSizeCategory > .large ? .light : .thin
-        imageView.preferredSymbolConfiguration = .init(pointSize: 0, weight: weight, scale: .default)
+        let scale: UIImage.SymbolScale = traitCollection.preferredContentSizeCategory > .extraLarge ? .large : .default
+        imageView.preferredSymbolConfiguration = .init(pointSize: 0, weight: weight, scale: scale)
     }
     
     func updateUI(status: StatusMO) {

Tusker/Views/Status/TimelineStatusCollectionViewCell.swift

@@ -23,7 +23,6 @@ class TimelineStatusCollectionViewCell: UICollectionViewListCell, StatusCollecti
     static let htmlConverter = HTMLConverter(
         font: TimelineStatusCollectionViewCell.contentFont,
         monospaceFont: TimelineStatusCollectionViewCell.monospaceFont,
-        fontMetrics: .default,
         color: .label,
         paragraphStyle: TimelineStatusCollectionViewCell.contentParagraphStyle
     )

Version.xcconfig

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