Bump build number and update changelog

Closes #373
See #129

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 2023.5 (84)
+Bugfixes:
+- Fix notifications scrolling to top when refreshing
+- Fix decoding statuses failing on GoToSocial
+- Fix assorted issues when collapsing/expanding between sidebar and tab bar modes
+
 ## 2023.5 (83)
 This build contains significant refactors to the notifications screen, please report any issues you encounter.
 

Packages/ComposeUI/Sources/ComposeUI/Controllers/PollController.swift

@@ -120,8 +120,8 @@ class PollController: ViewController {
             }
             .padding(8)
             .background(
-                backgroundColor
-                    .cornerRadius(10)
+                RoundedRectangle(cornerRadius: 10, style: .continuous)
+                    .foregroundColor(backgroundColor)
             )
             .onChange(of: controller.duration) { newValue in
                 poll.duration = newValue.timeInterval

Packages/ComposeUI/Tests/ComposeUITests/CharacterCounterTests.swift

@@ -1,13 +1,14 @@
 //
 //  CharacterCounterTests.swift
-//  PachydermTests
+//  ComposeUITests
 //
 //  Created by Shadowfacts on 9/29/18.
 //  Copyright © 2018 Shadowfacts. All rights reserved.
 //
 
 import XCTest
-@testable import Pachyderm
+@testable import ComposeUI
+import InstanceFeatures
 
 class CharacterCounterTests: XCTestCase {
 
@@ -17,31 +18,33 @@ class CharacterCounterTests: XCTestCase {
     override func tearDown() {
     }
     
+    let features = InstanceFeatures()
+
     func testCountEmpty() {
-        XCTAssertEqual(CharacterCounter.count(text: ""), 0)
+        XCTAssertEqual(CharacterCounter.count(text: "", for: features), 0)
     }
     
     func testCountPlainText() {
-        XCTAssertEqual(CharacterCounter.count(text: "This is an example message"), 26)
-        XCTAssertEqual(CharacterCounter.count(text: "This is an example message with an Emoji: 😄"), 43)
-        XCTAssertEqual(CharacterCounter.count(text: "😄😄😄😄😄😄😄"), 7)
+        XCTAssertEqual(CharacterCounter.count(text: "This is an example message", for: features), 26)
+        XCTAssertEqual(CharacterCounter.count(text: "This is an example message with an Emoji: 😄", for: features), 43)
+        XCTAssertEqual(CharacterCounter.count(text: "😄😄😄😄😄😄😄", for: features), 7)
     }
     
     func testCountLinks() {
-        XCTAssertEqual(CharacterCounter.count(text: "This is an example with a link: https://example.com"), 55)
-        XCTAssertEqual(CharacterCounter.count(text: "This is an example with a link 😄: https://example.com"), 57)
-        XCTAssertEqual(CharacterCounter.count(text: "😄😄😄😄😄😄😄: https://example.com"), 32)
-        XCTAssertEqual(CharacterCounter.count(text: "This is an example with a link: https://a.much.longer.example.com/link?foo=bar#baz"), 55)
+        XCTAssertEqual(CharacterCounter.count(text: "This is an example with a link: https://example.com", for: features), 55)
+        XCTAssertEqual(CharacterCounter.count(text: "This is an example with a link 😄: https://example.com", for: features), 57)
+        XCTAssertEqual(CharacterCounter.count(text: "😄😄😄😄😄😄😄: https://example.com", for: features), 32)
+        XCTAssertEqual(CharacterCounter.count(text: "This is an example with a link: https://a.much.longer.example.com/link?foo=bar#baz", for: features), 55)
     }
     
     func testCountLocalMentions() {
-        XCTAssertEqual(CharacterCounter.count(text: "hello @example"), 14)
-        XCTAssertEqual(CharacterCounter.count(text: "@some_really_long_name"), 22)
+        XCTAssertEqual(CharacterCounter.count(text: "hello @example", for: features), 14)
+        XCTAssertEqual(CharacterCounter.count(text: "@some_really_long_name", for: features), 22)
     }
     
     func testCountRemoteMentions() {
-        XCTAssertEqual(CharacterCounter.count(text: "hello @example@some.remote.social"), 14)
-        XCTAssertEqual(CharacterCounter.count(text: "hello @some_really_long_name@some-long.remote-instance.social"), 28)
+        XCTAssertEqual(CharacterCounter.count(text: "hello @example@some.remote.social", for: features), 14)
+        XCTAssertEqual(CharacterCounter.count(text: "hello @some_really_long_name@some-long.remote-instance.social", for: features), 28)
     }
 
 }

Packages/Duckable/Sources/Duckable/DuckableContainerViewController.swift

@@ -155,6 +155,7 @@ public class DuckableContainerViewController: UIViewController, DuckableViewCont
         bottomConstraint.isActive = true
         
         child.view.layer.cornerRadius = duckedCornerRadius
+        child.view.layer.cornerCurve = .continuous
         child.view.layer.maskedCorners = [.layerMinXMaxYCorner, .layerMaxXMaxYCorner]
         child.view.layer.masksToBounds = true
     }

Packages/Pachyderm/.swiftpm/xcode/xcshareddata/xcschemes/Pachyderm.xcscheme

@@ -17,7 +17,7 @@
                BlueprintIdentifier = "D61099AA2144B0CC00432DC2"
                BuildableName = "Pachyderm.framework"
                BlueprintName = "Pachyderm"
-               ReferencedContainer = "container:Tusker.xcodeproj">
+               ReferencedContainer = "container:../../Tusker.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -35,7 +35,7 @@
                BlueprintIdentifier = "PachydermTests"
                BuildableName = "PachydermTests"
                BlueprintName = "PachydermTests"
-               ReferencedContainer = "container:Pachyderm">
+               ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
       </Testables>
@@ -56,7 +56,7 @@
             BlueprintIdentifier = "D61099AA2144B0CC00432DC2"
             BuildableName = "Pachyderm.framework"
             BlueprintName = "Pachyderm"
-            ReferencedContainer = "container:Tusker.xcodeproj">
+            ReferencedContainer = "container:../../Tusker.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </LaunchAction>
@@ -72,7 +72,7 @@
             BlueprintIdentifier = "D61099AA2144B0CC00432DC2"
             BuildableName = "Pachyderm.framework"
             BlueprintName = "Pachyderm"
-            ReferencedContainer = "container:Tusker.xcodeproj">
+            ReferencedContainer = "container:../../Tusker.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

Packages/Pachyderm/Sources/Pachyderm/Model/Status.swift

@@ -51,8 +51,12 @@ public final class Status: StatusProtocol, Decodable, Sendable {
         do {
             self.url = try container.decodeIfPresent(WebURL.self, forKey: .url)
         } catch {
-            let s = (try? container.decode(String.self, forKey: .url)) ?? "<failed to decode string>"
-            throw DecodingError.dataCorruptedError(forKey: .url, in: container, debugDescription: "Could not decode URL '\(s)', reason: \(String(describing: error))")
+            let s = try? container.decode(String.self, forKey: .url)
+            if s == "" {
+                self.url = nil
+            } else {
+                throw DecodingError.dataCorrupted(.init(codingPath: container.codingPath + [CodingKeys.url], debugDescription: "Could not decode URL '\(s ?? "<failed to decode string>")'", underlyingError: error))
+            }
         }
         self.account = try container.decode(Account.self, forKey: .account)
         self.inReplyToID = try container.decodeIfPresent(String.self, forKey: .inReplyToID)

Packages/Pachyderm/Tests/PachydermTests/NotificationGroupTests.swift

@@ -8,6 +8,7 @@
 import XCTest
 @testable import Pachyderm
 
+@MainActor
 class NotificationGroupTests: XCTestCase {
     
     let decoder: JSONDecoder = {

Packages/Pachyderm/Tests/PachydermTests/StatusTests.swift

@@ -0,0 +1,53 @@
+//
+//  StatusTests.swift
+//  
+//
+//  Created by Shadowfacts on 5/8/23.
+//
+
+import XCTest
+@testable import Pachyderm
+
+final class StatusTests: XCTestCase {
+
+    func testDecode() {
+        let data = """
+{
+    "id": "1",
+    "uri": "https://example.com/a/1",
+    "url": "",
+    "account": {
+        "id": "2",
+        "username": "a",
+        "acct": "a",
+        "display_name": "",
+        "locked": false,
+        "created_at": 0,
+        "followers_count": 0,
+        "following_count": 0,
+        "statuses_count": 0,
+        "note": "",
+        "url": "https://example.com/a"
+    },
+    "content": "",
+    "created_at": 0,
+    "emojis": [],
+    "reblogs_count": 0,
+    "favourites_count":  0,
+    "sensitive": false,
+    "spoiler_text": "",
+    "visibility": "public",
+    "media_attachments": [],
+    "mentions": [],
+    "tags": []
+}
+""".data(using: .utf8)!
+        do {
+            _ = try JSONDecoder().decode(Status.self, from: data)
+        } catch {
+            print(error)
+            XCTFail()
+        }
+    }
+    
+}

Packages/TuskerComponents/Sources/TuskerComponents/AvatarImageView.swift

@@ -27,7 +27,7 @@ public struct AvatarImageView: View {
         imageView
             .resizable()
             .frame(width: size, height: size)
-            .cornerRadius(style.cornerRadiusFraction * size)
+            .clipShape(RoundedRectangle(cornerRadius: style.cornerRadiusFraction * size, style: .continuous))
             .task { @MainActor in
                 image = nil
                 if let url {

Tusker.xcodeproj/project.pbxproj

@@ -2342,7 +2342,7 @@
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 83;
+				CURRENT_PROJECT_VERSION = 84;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2408,7 +2408,7 @@
 				CODE_SIGN_ENTITLEMENTS = OpenInTusker/OpenInTusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 83;
+				CURRENT_PROJECT_VERSION = 84;
 				INFOPLIST_FILE = OpenInTusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
 				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.3;
@@ -2434,7 +2434,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 83;
+				CURRENT_PROJECT_VERSION = 84;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ShareExtension;
@@ -2463,7 +2463,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 83;
+				CURRENT_PROJECT_VERSION = 84;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ShareExtension;
@@ -2492,7 +2492,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 83;
+				CURRENT_PROJECT_VERSION = 84;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ShareExtension;
@@ -2647,7 +2647,7 @@
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 83;
+				CURRENT_PROJECT_VERSION = 84;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2678,7 +2678,7 @@
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 83;
+				CURRENT_PROJECT_VERSION = 84;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2784,7 +2784,7 @@
 				CODE_SIGN_ENTITLEMENTS = OpenInTusker/OpenInTusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 83;
+				CURRENT_PROJECT_VERSION = 84;
 				INFOPLIST_FILE = OpenInTusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
 				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.3;
@@ -2810,7 +2810,7 @@
 				CODE_SIGN_ENTITLEMENTS = OpenInTusker/OpenInTusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 83;
+				CURRENT_PROJECT_VERSION = 84;
 				INFOPLIST_FILE = OpenInTusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
 				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.3;

Tusker/Screens/Explore/FeaturedProfileCollectionViewCell.swift

@@ -27,7 +27,9 @@ class FeaturedProfileCollectionViewCell: UICollectionViewCell {
         super.awakeFromNib()
         
         avatarContainerView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadius(for: avatarContainerView)
+        avatarContainerView.layer.cornerCurve = .continuous
         avatarImageView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadius(for: avatarImageView)
+        avatarImageView.layer.cornerCurve = .continuous
         
         displayNameLabel.font = UIFontMetrics(forTextStyle: .title1).scaledFont(for: .systemFont(ofSize: 20, weight: .semibold))
         displayNameLabel.adjustsFontForContentSizeCategory = true
@@ -41,6 +43,7 @@ class FeaturedProfileCollectionViewCell: UICollectionViewCell {
         backgroundColor = .clear
         clippingView.backgroundColor = .appBackground
         clippingView.layer.cornerRadius = 5
+        clippingView.layer.cornerCurve = .continuous
         clippingView.layer.borderWidth = 1
         clippingView.layer.masksToBounds = true
         layer.shadowOpacity = 0.2

Tusker/Screens/Explore/SuggestedProfileCardCollectionViewCell.swift

@@ -36,14 +36,17 @@ class SuggestedProfileCardCollectionViewCell: UICollectionViewCell {
         layer.shadowOffset = .zero
         layer.masksToBounds = false
         contentView.layer.cornerRadius = 12.5
+        contentView.layer.cornerCurve = .continuous
         contentView.backgroundColor = .appGroupedCellBackground
         updateLayerColors()
         
         headerImageView.cache = .headers
         
         avatarContainerView.layer.masksToBounds = true
+        avatarContainerView.layer.cornerCurve = .continuous
         avatarImageView.cache = .avatars
         avatarImageView.layer.masksToBounds = true
+        avatarImageView.layer.cornerCurve = .continuous
         
         displayNameLabel.font = UIFontMetrics(forTextStyle: .title1).scaledFont(for: .systemFont(ofSize: 24, weight: .semibold))
         displayNameLabel.adjustsFontForContentSizeCategory = true

Tusker/Screens/Explore/TrendingLinkCardCollectionViewCell.swift

@@ -57,6 +57,7 @@ class TrendingLinkCardCollectionViewCell: UICollectionViewCell {
         layer.shadowOffset = .zero
         layer.masksToBounds = false
         contentView.layer.cornerRadius = 12.5
+        contentView.layer.cornerCurve = .continuous
         contentView.backgroundColor = .appGroupedCellBackground
         updateLayerColors()
         

Tusker/Screens/Fast Account Switcher/FastSwitchingAccountView.swift

@@ -86,7 +86,9 @@ class FastSwitchingAccountView: UIView {
         avatarImageView.translatesAutoresizingMaskIntoConstraints = false
         avatarImageView.layer.masksToBounds = true
         avatarImageView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadiusFraction * 40
+        avatarImageView.layer.cornerCurve = .continuous
         avatarImageView.image = UIImage(systemName: Preferences.shared.avatarStyle == .circle ? "person.crop.circle" : "person.crop.square")
+        // todo: this should really be fit, but somehow the image view ends up being 37pt tall?
         avatarImageView.contentMode = .scaleAspectFill
         addSubview(avatarImageView)
         

Tusker/Screens/Main/MainSplitViewController.swift

@@ -225,6 +225,7 @@ extension MainSplitViewController: UISplitViewControllerDelegate {
             // so that explore items aren't shown multiple times.
             
             let exploreNav = tabBarViewController.viewController(for: .explore) as! UINavigationController
+            // make sure there's a root ExploreViewController
             let explore: ExploreViewController
             if let existing = exploreNav.viewControllers.first as? ExploreViewController {
                 explore = existing
@@ -238,14 +239,23 @@ extension MainSplitViewController: UISplitViewControllerDelegate {
             explore.loadViewIfNeeded()
             
             let search = secondaryNavController.viewControllers.first as! InlineTrendsViewController
-            // Copy the search query from the search VC to the Explore VC's search controller.
-            let query = search.searchController.searchBar.text ?? ""
-            explore.searchController.searchBar.text = query
-            // Instruct the explore controller to show its search controller immediately upon its first appearance.
-            // explore.searchController.isActive can't be set directly, see FB7814561
-            explore.searchControllerStatusOnAppearance = !query.isEmpty
-            // Copy the results from the search VC's results controller to avoid the delay introduced by an extra network request
-            explore.resultsController.loadResults(from: search.resultsController)
+            if search.searchController.isActive {
+                // Copy the search query from the search VC to the Explore VC's search controller.
+                let query = search.searchController.searchBar.text ?? ""
+                explore.searchController.searchBar.text = query
+                // Instruct the explore controller to show its search controller immediately upon its first appearance.
+                // explore.searchController.isActive can't be set directly, see FB7814561
+                explore.searchControllerStatusOnAppearance = !query.isEmpty
+                // Copy the results from the search VC's results controller to avoid the delay introduced by an extra network request
+                explore.resultsController.loadResults(from: search.resultsController)
+            } else {
+                // if there is more than just the InlineTrendsVC, and the search VC is not active,
+                // then the user selected something from the trends screen
+                if secondaryNavController.viewControllers.count >= 2 {
+                    // make sure there's a corresponding trends VC in the collapsed nav that they can go back to
+                    exploreNav.pushViewController(TrendsViewController(mastodonController: mastodonController), animated: false)
+                }
+            }
             
             // Transfer the navigation stack, dropping the search VC, to keep anything the user has opened
             transferNavigationStack(from: .explore, to: exploreNav, dropFirst: true, append: true)
@@ -329,14 +339,16 @@ extension MainSplitViewController: UISplitViewControllerDelegate {
                         exploreItem = .favorites
                     case let listVC as ListTimelineViewController:
                         exploreItem = .list(listVC.list)
-                    case let hashtagVC as HashtagTimelineViewController:
+                    case let hashtagVC as HashtagTimelineViewController where hashtagVC.isHashtagSaved:
                         exploreItem = .savedHashtag(hashtagVC.hashtag)
                     case let instanceVC as InstanceTimelineViewController:
                         exploreItem = .savedInstance(instanceVC.instanceURL)
-                    case is TrendingStatusesViewController, is TrendingHashtagsViewController, is TrendingLinksViewController:
+                    case is TrendsViewController:
                         exploreItem = .explore
-                        // these three VCs are part of the root SearchViewController, so we don't need to transfer them
+                        // skip transferring the ExploreViewController and TrendsViewController
                         skipFirst = 2
+                        // prepend the InlineTrendsViewController
+                        toPrepend = getOrCreateNavigationStack(item: .explore).first!
                     default:
                         // transfer the navigation stack prepending, the existing explore VC
                         // if there was other stuff on the explore stack, it will get discarded

Tusker/Screens/Notifications/ActionNotificationGroupCollectionViewCell.swift

@@ -149,6 +149,7 @@ class ActionNotificationGroupCollectionViewCell: UICollectionViewListCell {
             imageView.contentMode = .scaleAspectFit
             imageView.layer.masksToBounds = true
             imageView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadiusFraction * 30
+            imageView.layer.cornerCurve = .continuous
             avatarStack.addArrangedSubview(imageView)
             imageView.update(for: avatarURL)
         }

Tusker/Screens/Notifications/FollowNotificationGroupCollectionViewCell.swift

@@ -123,6 +123,7 @@ class FollowNotificationGroupCollectionViewCell: UICollectionViewListCell {
             let imageView = CachedImageView(cache: .avatars)
             imageView.layer.masksToBounds = true
             imageView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadiusFraction * 30
+            imageView.layer.cornerCurve = .continuous
             imageView.update(for: avatarURL)
             avatarStack.addArrangedSubview(imageView)
         }

Tusker/Screens/Notifications/FollowRequestNotificationCollectionViewCell.swift

@@ -21,6 +21,7 @@ class FollowRequestNotificationCollectionViewCell: UICollectionViewListCell {
     
     private let avatarImageView = CachedImageView(cache: .avatars).configure {
         $0.layer.masksToBounds = true
+        $0.layer.cornerCurve = .continuous
         NSLayoutConstraint.activate([
             $0.widthAnchor.constraint(equalTo: $0.heightAnchor),
         ])

Tusker/Screens/Notifications/NotificationsCollectionViewController.swift

@@ -355,8 +355,24 @@ extension NotificationsCollectionViewController {
     }
     
     func handlePrependItems(_ timelineItems: [NotificationGroup]) async {
+        let topItem = dataSource.snapshot().itemIdentifiers(inSection: .notifications).first
+        
         // we always replace all, because new items are merged with existing ones
         await handleReplaceAllItems(timelineItems)
+        
+        // preserve the scroll position
+        // todo: this won't work for cmd+r when not at top
+        if let topID = topItem?.group?.notifications.first?.id {
+            // the exact item may have changed, due to merging
+            let newTopGroup = timelineItems.first {
+                $0.notifications.contains {
+                    $0.id == topID
+                }
+            }!
+            if let newTopIndexPath = dataSource.indexPath(for: .group(newTopGroup)) {
+                collectionView.scrollToItem(at: newTopIndexPath, at: .top, animated: false)
+            }
+        }
     }
     
     func loadOlder() async throws -> [NotificationGroup] {

Tusker/Screens/Timeline/HashtagTimelineViewController.swift

@@ -15,7 +15,7 @@ class HashtagTimelineViewController: TimelineViewController {
     
     var toggleSaveButton: UIBarButtonItem!
     
-    private var isHashtagSaved: Bool {
+    var isHashtagSaved: Bool {
         let req = SavedHashtag.fetchRequest(name: hashtag.name, account: mastodonController.accountInfo!)
         return mastodonController.persistentContainer.viewContext.objectExists(for: req)
     }

Tusker/Screens/Utilities/TimelineLikeCollectionViewController.swift

@@ -153,6 +153,7 @@ extension TimelineLikeCollectionViewController {
         }
         await apply(snapshot, animatingDifferences: false)
         
+        // todo: this won't work for cmd+r when not at top
         if let first,
            let indexPath = dataSource.indexPath(for: first) {
             // TODO: i can't tell if this actually works or not

Tusker/Views/Account Cell/AccountCollectionViewCell.swift

@@ -22,6 +22,7 @@ class AccountCollectionViewCell: UICollectionViewListCell {
     
     private let avatarImageView = CachedImageView(cache: .avatars).configure {
         $0.layer.masksToBounds = true
+        $0.layer.cornerCurve = .continuous
         NSLayoutConstraint.activate([
             $0.widthAnchor.constraint(equalToConstant: 50),
             $0.heightAnchor.constraint(equalToConstant: 50),

Tusker/Views/Account Cell/AccountTableViewCell.swift

@@ -28,6 +28,7 @@ class AccountTableViewCell: UITableViewCell {
         super.awakeFromNib()
         
         avatarImageView.layer.masksToBounds = true
+        avatarImageView.layer.cornerCurve = .continuous
         
         usernameLabel.font = UIFontMetrics(forTextStyle: .body).scaledFont(for: .systemFont(ofSize: 15, weight: .light))
         usernameLabel.adjustsFontForContentSizeCategory = true

Tusker/Views/Account Detail/LargeAccountDetailView.swift

@@ -22,6 +22,7 @@ class LargeAccountDetailView: UIView {
         
         avatarImageView.translatesAutoresizingMaskIntoConstraints = false
         avatarImageView.layer.masksToBounds = true
+        avatarImageView.layer.cornerCurve = .continuous
         addSubview(avatarImageView)
         
         displayNameLabel.translatesAutoresizingMaskIntoConstraints = false

Tusker/Views/Attachments/AttachmentView.swift

@@ -368,11 +368,13 @@ class AttachmentView: GIFImageView {
         let first = stack.arrangedSubviews.first!
         first.layer.masksToBounds = true
         first.layer.cornerRadius = 4
+        first.layer.cornerCurve = .continuous
         if stack.arrangedSubviews.count > 1 {
             first.layer.maskedCorners = [.layerMinXMinYCorner, .layerMinXMaxYCorner]
             let last = stack.arrangedSubviews.last!
             last.layer.masksToBounds = true
             last.layer.cornerRadius = 4
+            last.layer.cornerCurve = .continuous
             last.layer.maskedCorners = [.layerMaxXMinYCorner, .layerMaxXMaxYCorner]
         }
         

Tusker/Views/Attachments/AttachmentsContainerView.swift

@@ -85,6 +85,7 @@ class AttachmentsContainerView: UIView {
             case 1:
                 let attachmentView = createAttachmentView(index: 0, hSize: .full, vSize: .full)
                 attachmentView.layer.cornerRadius = 5
+                attachmentView.layer.cornerCurve = .continuous
                 attachmentView.layer.masksToBounds = true
                 fillView(attachmentView)
                 sendSubviewToBack(attachmentView)
@@ -95,10 +96,12 @@ class AttachmentsContainerView: UIView {
             case 2:
                 let left = createAttachmentView(index: 0, hSize: .half, vSize: .full)
                 left.layer.cornerRadius = 5
+                left.layer.cornerCurve = .continuous
                 left.layer.maskedCorners = [.layerMinXMinYCorner, .layerMinXMaxYCorner]
                 left.layer.masksToBounds = true
                 let right = createAttachmentView(index: 1, hSize: .half, vSize: .full)
                 right.layer.cornerRadius = 5
+                right.layer.cornerCurve = .continuous
                 right.layer.maskedCorners = [.layerMaxXMinYCorner, .layerMaxXMaxYCorner]
                 right.layer.masksToBounds = true
                 let stack = createAttachmentsStack(axis: .horizontal, arrangedSubviews: [
@@ -116,14 +119,17 @@ class AttachmentsContainerView: UIView {
             case 3:
                 let left = createAttachmentView(index: 0, hSize: .half, vSize: .full)
                 left.layer.cornerRadius = 5
+                left.layer.cornerCurve = .continuous
                 left.layer.maskedCorners = [.layerMinXMinYCorner, .layerMinXMaxYCorner]
                 left.layer.masksToBounds = true
                 let topRight = createAttachmentView(index: 1, hSize: .half, vSize: .half)
                 topRight.layer.cornerRadius = 5
+                topRight.layer.cornerCurve = .continuous
                 topRight.layer.maskedCorners = .layerMaxXMinYCorner
                 topRight.layer.masksToBounds = true
                 let bottomRight = createAttachmentView(index: 2, hSize: .half, vSize: .half)
                 bottomRight.layer.cornerRadius = 5
+                bottomRight.layer.cornerCurve = .continuous
                 bottomRight.layer.maskedCorners = .layerMaxXMaxYCorner
                 bottomRight.layer.masksToBounds = true
                 let innerStack = createAttachmentsStack(axis: .vertical, arrangedSubviews: [
@@ -148,10 +154,12 @@ class AttachmentsContainerView: UIView {
             case 4:
                 let topLeft = createAttachmentView(index: 0, hSize: .half, vSize: .half)
                 topLeft.layer.cornerRadius = 5
+                topLeft.layer.cornerCurve = .continuous
                 topLeft.layer.maskedCorners = .layerMinXMinYCorner
                 topLeft.layer.masksToBounds = true
                 let bottomLeft = createAttachmentView(index: 2, hSize: .half, vSize: .half)
                 bottomLeft.layer.cornerRadius = 5
+                bottomLeft.layer.cornerCurve = .continuous
                 bottomLeft.layer.maskedCorners = .layerMinXMaxYCorner
                 bottomLeft.layer.masksToBounds = true
                 let left = createAttachmentsStack(axis: .vertical, arrangedSubviews: [
@@ -161,10 +169,12 @@ class AttachmentsContainerView: UIView {
                 attachmentStacks.add(left)
                 let topRight = createAttachmentView(index: 1, hSize: .half, vSize: .half)
                 topRight.layer.cornerRadius = 5
+                topRight.layer.cornerCurve = .continuous
                 topRight.layer.maskedCorners = .layerMaxXMinYCorner
                 topRight.layer.masksToBounds = true
                 let bottomRight = createAttachmentView(index: 3, hSize: .half, vSize: .half)
                 bottomRight.layer.cornerRadius = 5
+                bottomRight.layer.cornerCurve = .continuous
                 bottomRight.layer.maskedCorners = .layerMaxXMaxYCorner
                 bottomRight.layer.masksToBounds = true
                 let right = createAttachmentsStack(axis: .vertical, arrangedSubviews: [
@@ -196,6 +206,7 @@ class AttachmentsContainerView: UIView {
                 moreView.isUserInteractionEnabled = true
                 moreView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(moreViewTapped)))
                 moreView.layer.cornerRadius = 5
+                moreView.layer.cornerCurve = .continuous
                 moreView.layer.maskedCorners = .layerMaxXMaxYCorner
                 moreView.layer.masksToBounds = true
                 let moreLabel = UILabel()
@@ -208,6 +219,7 @@ class AttachmentsContainerView: UIView {
 
                 let topLeft = createAttachmentView(index: 0, hSize: .half, vSize: .half)
                 topLeft.layer.cornerRadius = 5
+                topLeft.layer.cornerCurve = .continuous
                 topLeft.layer.maskedCorners = .layerMinXMinYCorner
                 topLeft.layer.masksToBounds = true
                 let bottomLeft = createAttachmentView(index: 2, hSize: .half, vSize: .half)
@@ -221,6 +233,7 @@ class AttachmentsContainerView: UIView {
                 attachmentStacks.add(left)
                 let topRight = createAttachmentView(index: 1, hSize: .half, vSize: .half)
                 topRight.layer.cornerRadius = 5
+                topRight.layer.cornerCurve = .continuous
                 topRight.layer.maskedCorners = .layerMaxXMinYCorner
                 topRight.layer.masksToBounds = true
                 let right = createAttachmentsStack(axis: .vertical, arrangedSubviews: [

Tusker/Views/Poll/PollOptionCheckboxView.swift

@@ -35,6 +35,7 @@ class PollOptionCheckboxView: UIView {
         
         let size: CGFloat = 20
         layer.cornerRadius = (multiple ? 0.1 : 0.5) * size
+        layer.cornerCurve = .continuous
         layer.borderWidth = 2
         
         imageView.translatesAutoresizingMaskIntoConstraints = false

Tusker/Views/Poll/PollOptionView.swift

@@ -22,6 +22,7 @@ class PollOptionView: UIView {
         
         let minHeight: CGFloat = 35
         layer.cornerRadius = 0.1 * minHeight
+        layer.cornerCurve = .continuous
         backgroundColor = unselectedBackgroundColor
         
         checkbox.translatesAutoresizingMaskIntoConstraints = false
@@ -66,6 +67,7 @@ class PollOptionView: UIView {
             fillView.backgroundColor = .tintColor.withAlphaComponent(0.6)
             fillView.layer.zPosition = -1
             fillView.layer.cornerRadius = layer.cornerRadius
+            fillView.layer.cornerCurve = .continuous
             addSubview(fillView)
             
             NSLayoutConstraint.activate([

Tusker/Views/Profile Header/ProfileHeaderMovedOverlayView.swift

@@ -42,6 +42,7 @@ class ProfileHeaderMovedOverlayView: UIView {
         avatarImageView = CachedImageView(cache: .avatars)
         avatarImageView.layer.masksToBounds = true
         avatarImageView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadiusFraction * 50
+        avatarImageView.layer.cornerCurve = .continuous
         avatarImageView.addInteraction(UIPointerInteraction(delegate: self))
         avatarImageView.isUserInteractionEnabled = true
         

Tusker/Views/Profile Header/ProfileHeaderView.swift

@@ -66,7 +66,9 @@ class ProfileHeaderView: UIView {
         
         avatarContainerView.backgroundColor = .appBackground
         avatarContainerView.layer.masksToBounds = true
+        avatarContainerView.layer.cornerCurve = .continuous
         avatarImageView.layer.masksToBounds = true
+        avatarImageView.layer.cornerCurve = .continuous
         avatarImageView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(avatarPressed)))
         avatarImageView.isUserInteractionEnabled = true
         

Tusker/Views/Status/ConversationMainStatusCollectionViewCell.swift

@@ -29,6 +29,7 @@ class ConversationMainStatusCollectionViewCell: UICollectionViewListCell, Status
     private static let avatarImageViewSize: CGFloat = 50
     private(set) lazy var avatarImageView = CachedImageView(cache: .avatars).configure {
         $0.layer.masksToBounds = true
+        $0.layer.cornerCurve = .continuous
         NSLayoutConstraint.activate([
             $0.heightAnchor.constraint(equalToConstant: ConversationMainStatusCollectionViewCell.avatarImageViewSize),
             $0.widthAnchor.constraint(equalToConstant: ConversationMainStatusCollectionViewCell.avatarImageViewSize),

Tusker/Views/Status/StatusCardView.swift

@@ -102,6 +102,7 @@ class StatusCardView: UIView {
         hStack.spacing = 4
         hStack.clipsToBounds = true
         hStack.layer.borderWidth = 0.5
+        hStack.layer.cornerCurve = .continuous
         hStack.backgroundColor = inactiveBackgroundColor
         updateBorderColor()
         

Tusker/Views/Status/TimelineStatusCollectionViewCell.swift

@@ -33,6 +33,7 @@ class TimelineStatusCollectionViewCell: UICollectionViewListCell, StatusCollecti
         $0.image = reblogIcon
         $0.contentMode = .scaleAspectFit
         $0.layer.masksToBounds = true
+        $0.layer.cornerCurve = .continuous
         $0.tintColor = .secondaryLabel
         NSLayoutConstraint.activate([
             // this needs to be lessThanOrEqualTo not just equalTo b/c otherwise intermediate layouts are broken
@@ -75,6 +76,7 @@ class TimelineStatusCollectionViewCell: UICollectionViewListCell, StatusCollecti
     private static let avatarImageViewSize: CGFloat = 50
     private(set) lazy var avatarImageView = CachedImageView(cache: .avatars).configure {
         $0.layer.masksToBounds = true
+        $0.layer.cornerCurve = .continuous
         NSLayoutConstraint.activate([
             $0.heightAnchor.constraint(equalToConstant: TimelineStatusCollectionViewCell.avatarImageViewSize),
             $0.widthAnchor.constraint(equalToConstant: TimelineStatusCollectionViewCell.avatarImageViewSize),