CHANGELOG.md

@@ -1,23 +1,5 @@
 # Changelog
 
-## 2022.1 (41)
-Features/Improvements:
-- Rewrite profile screens to use new timeline implementation
-	- Disable Infinite Scrolling preference (Preferences -> Digital Wellness) now applies to profiles
-	- Improve behavior when switching tabs on profiles
-- Improve pointer interaction on timeline status cells
-
-Bugfixes:
-- Fix crash when loading images in certain circumstances
-- Fix gallery dismissal leaving status bar hidden and breaking future gallery dismisses
-- Fix timeline scroll position changing after dismissing gallery
-- Fix images flickering when switching back to the Home tab
-- Fix crash reporter being dismissed when sending email is cancelled
-- Fix crash when long pressing Send Report button in crash reporter on iPad
-- Fix Live Text controls not hiding when other gallery controls are hidden
-- Fix replies appearing multiple times in Drafts list
-- Fix crash when displaying blur hash images on Pleroma
-
 ## 2022.1 (40)
 Bugfixes:
 - Fix selecting reblogged statuses in the timeline

Tusker.xcodeproj/project.pbxproj

@@ -2217,7 +2217,7 @@
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 41;
+				CURRENT_PROJECT_VERSION = 40;
 				DEVELOPMENT_TEAM = V4WK9KR9U2;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2246,7 +2246,7 @@
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 41;
+				CURRENT_PROJECT_VERSION = 40;
 				DEVELOPMENT_TEAM = V4WK9KR9U2;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2356,7 +2356,7 @@
 				CODE_SIGN_ENTITLEMENTS = OpenInTusker/OpenInTusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 41;
+				CURRENT_PROJECT_VERSION = 40;
 				DEVELOPMENT_TEAM = V4WK9KR9U2;
 				INFOPLIST_FILE = OpenInTusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
@@ -2383,7 +2383,7 @@
 				CODE_SIGN_ENTITLEMENTS = OpenInTusker/OpenInTusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 41;
+				CURRENT_PROJECT_VERSION = 40;
 				DEVELOPMENT_TEAM = V4WK9KR9U2;
 				INFOPLIST_FILE = OpenInTusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;

Tusker/CoreData/MastodonCachePersistentStore.swift

@@ -147,20 +147,19 @@ class MastodonCachePersistentStore: NSPersistentContainer {
     }
     
     @discardableResult
-    private func upsert(account: Account, in context: NSManagedObjectContext) -> AccountMO {
+    private func upsert(account: Account) -> AccountMO {
-        if let accountMO = self.account(for: account.id, in: context) {
+        if let accountMO = self.account(for: account.id, in: self.backgroundContext) {
             accountMO.updateFrom(apiAccount: account, container: self)
             return accountMO
         } else {
-            return AccountMO(apiAccount: account, container: self, context: context)
+            return AccountMO(apiAccount: account, container: self, context: self.backgroundContext)
         }
     }
     
-    func addOrUpdate(account: Account, in context: NSManagedObjectContext? = nil, completion: ((AccountMO) -> Void)? = nil) {
+    func addOrUpdate(account: Account, completion: ((AccountMO) -> Void)? = nil) {
-        let context = context ?? backgroundContext
+        backgroundContext.perform {
-        context.perform {
+            let accountMO = self.upsert(account: account)
-            let accountMO = self.upsert(account: account, in: context)
+            self.save(context: self.backgroundContext)
-            self.save(context: context)
             completion?(accountMO)
             self.accountSubject.send(account.id)
         }
@@ -200,7 +199,7 @@ class MastodonCachePersistentStore: NSPersistentContainer {
     
     func addAll(accounts: [Account], completion: (() -> Void)? = nil) {
         backgroundContext.perform {
-            accounts.forEach { self.upsert(account: $0, in: self.backgroundContext) }
+            accounts.forEach { self.upsert(account: $0) }
             self.save(context: self.backgroundContext)
             completion?()
             accounts.forEach { self.accountSubject.send($0.id) }
@@ -214,7 +213,7 @@ class MastodonCachePersistentStore: NSPersistentContainer {
             // since the status has the same account as the notification
             let accounts = notifications.filter { $0.kind != .mention }.map { $0.account }
             statuses.forEach { self.upsert(status: $0, context: self.backgroundContext) }
-            accounts.forEach { self.upsert(account: $0, in: self.backgroundContext) }
+            accounts.forEach { self.upsert(account: $0) }
             self.save(context: self.backgroundContext)
             completion?()
             statuses.forEach { self.statusSubject.send($0.id) }
@@ -228,7 +227,7 @@ class MastodonCachePersistentStore: NSPersistentContainer {
             var updatedStatuses = [String]()
             
             block(self.backgroundContext, { (accounts) in
-                accounts.forEach { self.upsert(account: $0, in: self.backgroundContext) }
+                accounts.forEach { self.upsert(account: $0) }
                 updatedAccounts.append(contentsOf: accounts.map { $0.id })
             }, { (statuses) in
                 statuses.forEach { self.upsert(status: $0, context: self.backgroundContext) }

Tusker/DomainBlocks.plist

@@ -2,7 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <array>
-	<string>counter\.social</string>
 	<string>gab\..+</string>
 </array>
 </plist>

Tusker/Screens/Onboarding/InstanceSelectorTableViewController.swift

@@ -18,12 +18,6 @@ fileprivate let instanceCell = "instanceCell"
 
 class InstanceSelectorTableViewController: UITableViewController {
     
-    static var blocks: [NSRegularExpression] = {
-        guard let path = Bundle.main.path(forResource: "DomainBlocks", ofType: "plist"),
-            let array = NSArray(contentsOfFile: path) as? [String] else { return [] }
-        return array.compactMap { try? NSRegularExpression(pattern: $0, options: .caseInsensitive) }
-    }()
-    
     weak var delegate: InstanceSelectorTableViewControllerDelegate?
 
     var dataSource: DataSource!
@@ -106,7 +100,7 @@ class InstanceSelectorTableViewController: UITableViewController {
         loadRecommendedInstances()
     }
     
-    private func parseURLComponents(input: String) -> URLComponents? {
+    private func parseURLComponents(input: String) -> URLComponents {
         // we can't just use the URLComponents(string:) initializer, because when given just a domain (w/o protocol), it interprets it as the path
         var input = input
         var components = URLComponents()
@@ -131,24 +125,13 @@ class InstanceSelectorTableViewController: UITableViewController {
             components.port = Int(parts.last!)
         }
         components.host = input
-        if Self.blocks.contains(where: { $0.numberOfMatches(in: input, range: NSRange(location: 0, length: input.utf16.count)) > 0 }) {
-            return nil
-        }
         return components
     }
     
     private func updateSpecificInstance(domain: String) {
         activityIndicator.startAnimating()
         
-        guard let components = parseURLComponents(input: domain) else {
+        let components = parseURLComponents(input: domain)
-            var snapshot = dataSource.snapshot()
-            if snapshot.indexOfSection(.selected) != nil {
-                snapshot.deleteSections([.selected])
-                dataSource.apply(snapshot)
-            }
-            activityIndicator.stopAnimating()
-            return
-        }
         let url = components.url!
 
         let client = Client(baseURL: url, session: .appDefault)

Tusker/Screens/Onboarding/OnboardingViewController.swift

@@ -17,6 +17,12 @@ protocol OnboardingViewControllerDelegate {
 
 class OnboardingViewController: UINavigationController {
 
+    static var blocks: [NSRegularExpression] = {
+        guard let path = Bundle.main.path(forResource: "DomainBlocks", ofType: "plist"),
+            let array = NSArray(contentsOfFile: path) as? [String] else { return [] }
+        return array.compactMap { try? NSRegularExpression(pattern: $0, options: .caseInsensitive) }
+    }()
+    
     var onboardingDelegate: OnboardingViewControllerDelegate?
     
     var instanceSelector = InstanceSelectorTableViewController()

Tusker/Screens/Profile/ProfileStatusesViewController.swift

@@ -29,9 +29,8 @@ class ProfileStatusesViewController: UIViewController, TimelineLikeCollectionVie
         view as! UICollectionView
     }
     private(set) var dataSource: UICollectionViewDiffableDataSource<Section, Item>!
-    private(set) var headerCell: ProfileHeaderCollectionViewCell?
     
-    private var state: State = .unloaded
+    private(set) var headerCell: ProfileHeaderCollectionViewCell?
     
     init(accountID: String?, kind: Kind, owner: ProfileViewController) {
         self.accountID = accountID
@@ -42,6 +41,16 @@ class ProfileStatusesViewController: UIViewController, TimelineLikeCollectionVie
         
         self.controller = TimelineLikeController(delegate: self)
         
+        mastodonController.persistentContainer.accountSubject
+            .receive(on: DispatchQueue.main)
+            .filter { [unowned self] in $0 == self.accountID }
+            .sink { [unowned self] id in
+                var snapshot = dataSource.snapshot()
+                snapshot.reconfigureItems([.header(id)])
+                dataSource.apply(snapshot, animatingDifferences: true)
+            }
+            .store(in: &cancellables)
+        
         addKeyCommand(MenuController.refreshCommand(discoverabilityTitle: "Refresh Profile"))
     }
     
@@ -88,25 +97,7 @@ class ProfileStatusesViewController: UIViewController, TimelineLikeCollectionVie
     
     override func viewDidLoad() {
         super.viewDidLoad()
-                
+        
-        mastodonController.persistentContainer.accountSubject
-            .receive(on: DispatchQueue.main)
-            .filter { [unowned self] in $0 == self.accountID }
-            .sink { [unowned self] id in
-                switch state {
-                case .unloaded:
-                    Task {
-                        await load()
-                    }
-                case .loading:
-                    break
-                case .loaded, .addedHeader:
-                    var snapshot = dataSource.snapshot()
-                    snapshot.reconfigureItems([.header(id)])
-                    dataSource.apply(snapshot, animatingDifferences: true)
-                }
-            }
-            .store(in: &cancellables)
     }
     
     private func createDataSource() -> UICollectionViewDiffableDataSource<Section, Item> {
@@ -169,26 +160,20 @@ class ProfileStatusesViewController: UIViewController, TimelineLikeCollectionVie
     }
     
     private func load() async {
-        guard isViewLoaded,
+        guard accountID != nil,
-              let accountID,
+              await controller.state == .notLoadedInitial,
-              case .unloaded = state,
+              isViewLoaded else {
-              mastodonController.persistentContainer.account(for: accountID) != nil else {
             return
         }
         
-        state = .loading
-        
         var snapshot = NSDiffableDataSourceSnapshot<Section, Item>()
         snapshot.appendSections([.header, .pinned, .statuses])
         snapshot.appendItems([.header(accountID)], toSection: .header)
         await apply(snapshot, animatingDifferences: false)
-        
+        print("added header item")
-        state = .addedHeader
         
         await controller.loadInitial()
         await tryLoadPinned()
-        
-        state = .loaded
     }
     
     private func tryLoadPinned() async {
@@ -238,15 +223,6 @@ class ProfileStatusesViewController: UIViewController, TimelineLikeCollectionVie
     
 }
 
-extension ProfileStatusesViewController {
-    enum State {
-        case unloaded
-        case loading
-        case addedHeader
-        case loaded
-    }
-}
-
 extension ProfileStatusesViewController {
     enum Kind {
         case statuses, withReplies, onlyMedia
@@ -460,7 +436,7 @@ extension ProfileStatusesViewController: StatusCollectionViewCellDelegate {
         if let indexPath = collectionView.indexPath(for: cell) {
             var snapshot = dataSource.snapshot()
             snapshot.reconfigureItems([dataSource.itemIdentifier(for: indexPath)!])
-            dataSource.apply(snapshot, animatingDifferences: animated, completion: completion)
+            dataSource.apply(snapshot, animatingDifferences: false, completion: completion)
         }
     }
 }

Tusker/Screens/Profile/ProfileViewController.swift

@@ -116,7 +116,7 @@ class ProfileViewController: UIPageViewController {
                 let req = Client.getAccount(id: accountID)
                 let (account, _) = try await mastodonController.run(req)
                 let mo = await withCheckedContinuation { continuation in
-                    mastodonController.persistentContainer.addOrUpdate(account: account, in: mastodonController.persistentContainer.viewContext) { (mo) in
+                    mastodonController.persistentContainer.addOrUpdate(account: account) { (mo) in
                         continuation.resume(returning: mo)
                     }
                 }

Tusker/Views/Status/TimelineStatusCollectionViewCell.swift

@@ -261,7 +261,7 @@ class TimelineStatusCollectionViewCell: UICollectionViewListCell, StatusCollecti
         
         mainContainerTopToReblogLabelConstraint = mainContainer.topAnchor.constraint(equalTo: reblogLabel.bottomAnchor, constant: 4)
         mainContainerTopToSelfConstraint = mainContainer.topAnchor.constraint(equalTo: contentView.topAnchor, constant: 8)
-        mainContainerBottomToActionsConstraint = mainContainer.bottomAnchor.constraint(equalTo: actionsContainer.topAnchor, constant: -4)
+        mainContainerBottomToActionsConstraint = mainContainer.bottomAnchor.constraint(equalTo: actionsContainer.topAnchor)
         mainContainerBottomToSelfConstraint = mainContainer.bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -6)
         
         let metaIndicatorsBottomConstraint = metaIndicatorsView.bottomAnchor.constraint(lessThanOrEqualTo: contentView.bottomAnchor, constant: -6)