Make view models @mainactor

Mastodon/Coordinator/SceneCoordinator.swift

@@ -14,6 +14,7 @@ import MastodonAsset
 import MastodonLocalization
 import MBProgressHUD
 
+@MainActor
 final public class SceneCoordinator {
 
     private var disposeBag = Set<AnyCancellable>()

Mastodon/Protocol/Provider/DataSourceFacade+URL.swift

@@ -23,7 +23,7 @@ extension DataSourceFacade {
            url.pathComponents[1] == "web",
            url.pathComponents[2] == "statuses" {
             let statusID = url.pathComponents[3]
-            let threadViewModel = RemoteThreadViewModel(context: provider.context, authenticationBox: provider.authenticationBox, statusID: statusID)
+            let threadViewModel = await RemoteThreadViewModel(context: provider.context, authenticationBox: provider.authenticationBox, statusID: statusID)
             _ = await provider.coordinator.present(scene: .thread(viewModel: threadViewModel), from: nil, transition: .show)
         } else {
             _ = await provider.coordinator.present(scene: .safari(url: url), from: nil, transition: .safariPresent(animated: true, completion: nil))

Mastodon/Scene/Account/AccountListViewModel.swift

@@ -14,6 +14,7 @@ import MastodonMeta
 import MastodonCore
 import MastodonUI
 
+@MainActor
 final class AccountListViewModel: NSObject {
 
     var disposeBag = Set<AnyCancellable>()

Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadLatestState.swift

@@ -81,12 +81,12 @@ extension HomeTimelineViewModel.LoadLatestState {
 
         override func didEnter(from previousState: GKState?) {
             guard let viewModel else { return }
-            guard let diffableDataSource = viewModel.diffableDataSource else {
-                assertionFailure()
-                return
-            }
-
-            OperationQueue.main.addOperation {
+            Task { @MainActor in
+                guard let diffableDataSource = viewModel.diffableDataSource else {
+                    assertionFailure()
+                    return
+                }
+                
                 viewModel.dataController.records = []
                 var snapshot = NSDiffableDataSourceSnapshot<StatusSection, StatusItem>()
                 snapshot.appendSections([.main])
@@ -104,10 +104,10 @@ extension HomeTimelineViewModel.LoadLatestState {
         super.didEnter(from: previousState)
 
         guard let viewModel else { return }
-
-        viewModel.timelineIsEmpty.send(nil)
 
         Task { @MainActor in
+            viewModel.timelineIsEmpty.send(nil)
+
             let latestFeedRecords = viewModel.dataController.records
 
             let latestStatusIDs: [Status.ID] = latestFeedRecords.compactMap { record in

Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadOldestState.swift

@@ -37,6 +37,7 @@ extension HomeTimelineViewModel.LoadOldestState {
         }
     }
 
+    @MainActor
     class Loading: HomeTimelineViewModel.LoadOldestState {
         override func isValidNextState(_ stateClass: AnyClass) -> Bool {
             return stateClass == Fail.self || stateClass == Idle.self || stateClass == NoMore.self
@@ -125,11 +126,11 @@ extension HomeTimelineViewModel.LoadOldestState {
 
         override func didEnter(from previousState: GKState?) {
             guard let viewModel = viewModel else { return }
-            guard let diffableDataSource = viewModel.diffableDataSource else {
-                assertionFailure()
-                return
-            }
             DispatchQueue.main.async {
+                guard let diffableDataSource = viewModel.diffableDataSource else {
+                    assertionFailure()
+                    return
+                }
                 var snapshot = diffableDataSource.snapshot()
                 snapshot.deleteItems([.bottomLoader])
                 diffableDataSource.apply(snapshot)

Mastodon/Scene/HomeTimeline/HomeTimelineViewModel.swift

@@ -17,6 +17,7 @@ import MastodonCore
 import MastodonUI
 import MastodonSDK
 
+@MainActor
 final class HomeTimelineViewModel: NSObject {
     var disposeBag = Set<AnyCancellable>()
     var observations = Set<NSKeyValueObservation>()

Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewModel+LoadOldestState.swift

@@ -119,11 +119,11 @@ extension NotificationTimelineViewModel.LoadOldestState {
 
         override func didEnter(from previousState: GKState?) {
             guard let viewModel = viewModel else { return }
-            guard let diffableDataSource = viewModel.diffableDataSource else {
-                assertionFailure()
-                return
-            }
             DispatchQueue.main.async {
+                guard let diffableDataSource = viewModel.diffableDataSource else {
+                    assertionFailure()
+                    return
+                }
                 var snapshot = diffableDataSource.snapshot()
                 snapshot.deleteItems([.bottomLoader])
                 diffableDataSource.apply(snapshot)

Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewModel.swift

@@ -13,6 +13,7 @@ import MastodonSDK
 import MastodonCore
 import MastodonLocalization
 
+@MainActor
 final class NotificationTimelineViewModel {
 
     var disposeBag = Set<AnyCancellable>()

Mastodon/Scene/Onboarding/Login/MastodonLoginViewModel.swift

@@ -14,6 +14,7 @@ protocol MastodonLoginViewModelDelegate: AnyObject {
   func serversUpdated(_ viewModel: MastodonLoginViewModel)
 }
 
+@MainActor
 class MastodonLoginViewModel {
 
   private var serverList: [Mastodon.Entity.Server] = []

Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewModel+LoadIndexedServerState.swift

@@ -28,6 +28,7 @@ extension MastodonPickServerViewModel.LoadIndexedServerState {
         }
     }
 
+    @MainActor
     class Loading: MastodonPickServerViewModel.LoadIndexedServerState {
         override func isValidNextState(_ stateClass: AnyClass) -> Bool {
             return stateClass == Fail.self || stateClass == Idle.self

Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewModel.swift

@@ -16,6 +16,7 @@ import MastodonCore
 import MastodonUI
 import MastodonLocalization
 
+@MainActor
 class MastodonPickServerViewModel: NSObject {
 
     enum EmptyStateViewState {

Mastodon/Scene/Onboarding/Register/MastodonRegisterViewModel.swift

@@ -13,6 +13,7 @@ import MastodonAsset
 import MastodonCore
 import MastodonLocalization
 
+@MainActor
 final class MastodonRegisterViewModel: ObservableObject {
     var disposeBag = Set<AnyCancellable>()
 

Mastodon/Scene/Onboarding/Share/AuthenticationViewModel.swift

@@ -12,6 +12,7 @@ import Combine
 import MastodonSDK
 import MastodonCore
 
+@MainActor
 final class AuthenticationViewModel {
 
     var disposeBag = Set<AnyCancellable>()

Mastodon/Scene/Onboarding/Welcome/WelcomeViewModel.swift

@@ -10,6 +10,7 @@ import Combine
 import MastodonCore
 import MastodonSDK
 
+@MainActor
 final class WelcomeViewModel {
 
     var disposeBag = Set<AnyCancellable>()

Mastodon/Scene/Profile/ProfileViewModel.swift

@@ -16,6 +16,7 @@ import MastodonLocalization
 import MastodonUI
 
 // please override this base class
+@MainActor
 class ProfileViewModel: NSObject {
 
     typealias UserID = String

Mastodon/Scene/Root/Sidebar/SidebarViewModel.swift

@@ -15,6 +15,7 @@ import MastodonAsset
 import MastodonCore
 import MastodonLocalization
 
+@MainActor
 final class SidebarViewModel {
     var disposeBag = Set<AnyCancellable>()
 

Mastodon/Scene/Settings/SettingsCoordinator.swift

@@ -16,6 +16,7 @@ protocol SettingsCoordinatorDelegate: AnyObject {
     func openProfileSettingsURL(_ settingsCoordinator: SettingsCoordinator)
 }
 
+@MainActor
 class SettingsCoordinator: NSObject, Coordinator {
 
     let navigationController: UINavigationController

Mastodon/Scene/Thread/ThreadViewModel+LoadThreadState.swift

@@ -54,12 +54,12 @@ extension ThreadViewModel.LoadThreadState {
 
             guard let viewModel, let stateMachine else { return }
 
-            guard let threadContext = viewModel.threadContext else {
-                stateMachine.enter(Fail.self)
-                return
-            }
 
             Task { @MainActor in
+                guard let threadContext = viewModel.threadContext else {
+                    stateMachine.enter(Fail.self)
+                    return
+                }
                 do {
                     let response = try await APIService.shared.statusContext(
                         statusID: threadContext.statusID,

Mastodon/Scene/Thread/ThreadViewModel.swift

@@ -16,6 +16,7 @@ import MastodonAsset
 import MastodonCore
 import MastodonLocalization
 
+@MainActor
 class ThreadViewModel {
 
     var disposeBag = Set<AnyCancellable>()

MastodonIntent/Handler/FollowersCountIntentHandler.swift

@@ -6,6 +6,7 @@ import MastodonCore
 import MastodonSDK
 import MastodonLocalization
 
+@MainActor
 class FollowersCountIntentHandler: INExtension, FollowersCountIntentHandling {
     func resolveShowChart(for intent: FollowersCountIntent) async -> INBooleanResolutionResult {
         return .success(with: intent.showChart?.boolValue ?? false)

MastodonIntent/Handler/HashtagIntentHandler.swift

@@ -4,7 +4,7 @@ import Foundation
 import Intents
 import MastodonSDK
 import MastodonCore
-
+@MainActor
 class HashtagIntentHandler: INExtension, HashtagIntentHandling {
     func provideHashtagOptionsCollection(for intent: HashtagIntent, searchTerm: String?) async throws -> INObjectCollection<NSString> {
 

MastodonIntent/Handler/MultiFollowersCountIntentHandler.swift

@@ -6,6 +6,7 @@ import MastodonCore
 import MastodonSDK
 import MastodonLocalization
 
+@MainActor
 class MultiFollowersCountIntentHandler: INExtension, MultiFollowersCountIntentHandling {
     func provideAccountsOptionsCollection(for intent: MultiFollowersCountIntent, searchTerm: String?) async throws -> INObjectCollection<NSString> {
         guard

MastodonIntent/Handler/SendPostIntentHandler.swift

@@ -13,6 +13,7 @@ import CoreDataStack
 import MastodonSDK
 import MastodonCore
 
+@MainActor
 final class SendPostIntentHandler: NSObject {
 
     var disposeBag = Set<AnyCancellable>()
@@ -118,7 +119,7 @@ extension SendPostIntentHandler: SendPostIntentHandling {
     }   // end func
 
     // content
-    func resolveContent(for intent: SendPostIntent, with completion: @escaping (INStringResolutionResult) -> Void) {
+    nonisolated func resolveContent(for intent: SendPostIntent, with completion: @escaping (INStringResolutionResult) -> Void) {
         guard let content = intent.content, !content.isEmpty else {
             completion(.needsValue())
             return
@@ -146,7 +147,7 @@ extension SendPostIntentHandler: SendPostIntentHandling {
     }
 
     // visibility
-    func resolveVisibility(for intent: SendPostIntent, with completion: @escaping (PostVisibilityResolutionResult) -> Void) {
+    nonisolated func resolveVisibility(for intent: SendPostIntent, with completion: @escaping (PostVisibilityResolutionResult) -> Void) {
         completion(.success(with: intent.visibility))
     }
 

MastodonIntent/Model/Account+Fetch.swift

@@ -36,6 +36,7 @@ extension Account {
 }
 
 extension Array where Element == Account {
+    @MainActor
     func mastodonAuthentication() throws -> [MastodonAuthentication] {
         let identifiers = self
             .compactMap { $0.identifier }

MastodonSDK/Sources/MastodonCore/AppContext.swift

@@ -41,6 +41,7 @@ public class PersistenceManager {
     }
 }
 
+@MainActor
 public class AppContext: ObservableObject {
     public static let shared = { AppContext() }()
 

MastodonSDK/Sources/MastodonCore/AuthenticationServiceProvider.swift

@@ -8,6 +8,7 @@ import KeychainAccess
 import MastodonCommon
 import os.log
 
+@MainActor
 public class AuthenticationServiceProvider: ObservableObject {
     private let logger = Logger(subsystem: "AuthenticationServiceProvider", category: "Authentication")
 
@@ -21,6 +22,9 @@ public class AuthenticationServiceProvider: ObservableObject {
     public let updateActiveUserAccountPublisher = PassthroughSubject<Void, Never>()
 
     private init() {
+        prepareForUse()
+        authentications = authenticationSortedByActivation()
+
         $mastodonAuthenticationBoxes
             .throttle(for: 3, scheduler: DispatchQueue.main, latest: true)
             .sink { [weak self] boxes in
@@ -52,8 +56,6 @@ public class AuthenticationServiceProvider: ObservableObject {
                     in: PersistenceManager.shared.managedObjectContext
                 )
             }
-            await prepareForUse()
-            authentications = authenticationSortedByActivation()
         }
     }
 

MastodonSDK/Sources/MastodonCore/Service/API/APIService.swift

@@ -13,6 +13,7 @@ import MastodonSDK
 import AlamofireImage
 // import AlamofireNetworkActivityIndicator
 
+@MainActor
 public final class APIService {
 
     @MainActor

MastodonSDK/Sources/MastodonCore/Service/BlockDomainService.swift

@@ -13,6 +13,7 @@ import MastodonSDK
 import OSLog
 import UIKit
 
+@MainActor
 public final class BlockDomainService {
 
     // input

MastodonSDK/Sources/MastodonCore/Service/Emoji/EmojiService+CustomEmojiViewModel+LoadState.swift

@@ -31,6 +31,7 @@ extension EmojiService.CustomEmojiViewModel.LoadState {
             return stateClass == Fail.self || stateClass == Finish.self
         }
 
+        @MainActor
         override func didEnter(from previousState: GKState?) {
             super.didEnter(from: previousState)
             guard let viewModel,

MastodonSDK/Sources/MastodonCore/Service/Emoji/EmojiService.swift

@@ -9,6 +9,7 @@ import Foundation
 import Combine
 import MastodonSDK
 
+@MainActor
 public final class EmojiService {
     public static let shared = { EmojiService() }()
     let workingQueue = DispatchQueue(label: "org.joinmastodon.app.EmojiService.working-queue")

MastodonSDK/Sources/MastodonCore/Service/InstanceService.swift

@@ -11,6 +11,7 @@ import CoreData
 import CoreDataStack
 import MastodonSDK
 
+@MainActor
 public final class InstanceService {
 
     var disposeBag = Set<AnyCancellable>()

MastodonSDK/Sources/MastodonCore/Service/MastodonAttachment/MastodonAttachmentService+UploadState.swift

@@ -18,6 +18,7 @@ extension MastodonAttachmentService {
             self.service = service
         }
 
+        @MainActor
         public override func didEnter(from previousState: GKState?) {
             service?.uploadStateMachineSubject.send(self)
         }
@@ -51,6 +52,7 @@ extension MastodonAttachmentService.UploadState {
                 || stateClass == Processing.self
         }
 
+        @MainActor
         public override func didEnter(from previousState: GKState?) {
             super.didEnter(from: previousState)
 

MastodonSDK/Sources/MastodonCore/Service/Notification/NotificationService.swift

@@ -13,6 +13,7 @@ import MastodonSDK
 import MastodonCommon
 import MastodonLocalization
 
+@MainActor
 public final class NotificationService {
 
     public static let shared = { NotificationService() }()

MastodonSDK/Sources/MastodonCore/Service/PhotoLibraryService.swift

@@ -11,6 +11,7 @@ import Photos
 import Alamofire
 import AlamofireImage
 
+@MainActor
 public final class PhotoLibraryService: NSObject {
     public static let shared = { PhotoLibraryService() }()
 

MastodonSDK/Sources/MastodonCore/Service/PlaceholderImageCacheService.swift

@@ -8,6 +8,7 @@
 import UIKit
 import AlamofireImage
 
+@MainActor
 public final class PlaceholderImageCacheService {
 
     let cache = NSCache<Key, UIImage>()

MastodonSDK/Sources/MastodonCore/Service/PublisherService/PublisherService.swift

@@ -8,6 +8,7 @@
 import UIKit
 import Combine
 
+@MainActor
 public final class PublisherService {
 
     public static let shared = { PublisherService() }()

MastodonSDK/Sources/MastodonCore/Service/PublisherService/StatusPublisher.swift

@@ -8,6 +8,7 @@
 import Foundation
 import Combine
 
+@MainActor
 public protocol StatusPublisher: ProgressReporting {
     var state: Published<StatusPublisherState>.Publisher { get }
     var reactor: StatusPublisherReactor? { get set }