chore: move core logic into package

Mastodon/Coordinator/NeedsDependency.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import MastodonCore
 
 protocol NeedsDependency: AnyObject {
     var context: AppContext! { get set }

Mastodon/Diffiable/Account/SelectedAccountSection.swift

@@ -5,11 +5,11 @@
 //  Created by sxiaojian on 2021/4/22.
 //
 
+import UIKit
 import CoreData
 import CoreDataStack
-import Foundation
+import MastodonCore
 import MastodonSDK
-import UIKit
 
 enum SelectedAccountSection: Equatable, Hashable {
     case main

Mastodon/Diffiable/Compose/ComposeStatusAttachmentItem.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import MastodonCore
 
 enum ComposeStatusAttachmentItem {
     case attachment(attachmentService: MastodonAttachmentService)

Mastodon/Diffiable/Compose/ComposeStatusItem.swift

@@ -8,6 +8,7 @@
 import Foundation
 import Combine
 import CoreData
+import MastodonCore
 import MastodonMeta
 import CoreDataStack
 

Mastodon/Diffiable/Compose/ComposeStatusSection.swift

@@ -21,7 +21,7 @@ enum ComposeStatusSection: Equatable, Hashable {
 }
 
 extension ComposeStatusSection {
-    enum ComposeKind {
+    public enum ComposeKind {
         case post
         case hashtag(hashtag: String)
         case mention(user: ManagedObjectRecord<MastodonUser>)

Mastodon/Diffiable/Discovery/DiscoverySection.swift

@@ -7,6 +7,7 @@
 
 import os.log
 import UIKit
+import MastodonCore
 import MastodonUI
 import MastodonSDK
 

Mastodon/Diffiable/Notification/NotificationSection.swift

@@ -14,6 +14,7 @@ import UIKit
 import MetaTextKit
 import MastodonMeta
 import MastodonAsset
+import MastodonCore
 import MastodonLocalization
 
 enum NotificationSection: Equatable, Hashable {

Mastodon/Diffiable/Profile/ProfileFieldSection.swift

@@ -8,6 +8,7 @@
 import os
 import UIKit
 import Combine
+import MastodonCore
 import MastodonMeta
 import MastodonLocalization
 

Mastodon/Diffiable/RecommandAccount/RecommendAccountSection.swift

@@ -13,6 +13,7 @@ import UIKit
 import MetaTextKit
 import MastodonMeta
 import Combine
+import MastodonCore
 
 enum RecommendAccountSection: Equatable, Hashable {
     case main

Mastodon/Diffiable/Report/ReportSection.swift

@@ -13,6 +13,7 @@ import MastodonSDK
 import UIKit
 import os.log
 import MastodonAsset
+import MastodonCore
 import MastodonLocalization
 
 enum ReportSection: Equatable, Hashable {

Mastodon/Diffiable/Search/SearchHistorySection.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import CoreDataStack
+import MastodonCore
 
 enum SearchHistorySection: Hashable {
     case main

Mastodon/Diffiable/Search/SearchResultSection.swift

@@ -12,6 +12,7 @@ import UIKit
 import CoreData
 import CoreDataStack
 import MastodonAsset
+import MastodonCore
 import MastodonLocalization
 import MastodonUI
 

Mastodon/Diffiable/Search/SearchSection.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import MastodonSDK
+import MastodonCore
 import MastodonLocalization
 
 enum SearchSection: Hashable {

Mastodon/Diffiable/Settings/SettingsSection.swift

@@ -9,6 +9,7 @@ import UIKit
 import CoreData
 import CoreDataStack
 import MastodonAsset
+import MastodonCore
 import MastodonLocalization
 
 enum SettingsSection: Hashable {
@@ -124,7 +125,7 @@ extension SettingsSection {
 
 extension SettingsSection {
 
-    static func configureSettingToggle(
+    public static func configureSettingToggle(
         cell: SettingsToggleTableViewCell,
         item: SettingsItem,
         setting: Setting
@@ -155,7 +156,7 @@ extension SettingsSection {
         }
     }
 
-    static func configureSettingToggle(
+    public static func configureSettingToggle(
         cell: SettingsToggleTableViewCell,
         switchMode: SettingsItem.NotificationSwitchMode,
         subscription: NotificationSubscription

Mastodon/Diffiable/Status/StatusSection.swift

@@ -15,6 +15,7 @@ import AlamofireImage
 import MastodonMeta
 import MastodonSDK
 import NaturalLanguage
+import MastodonCore
 import MastodonUI
 
 enum StatusSection: Equatable, Hashable {

Mastodon/Diffiable/User/UserSection.swift

@@ -9,6 +9,7 @@ import os.log
 import UIKit
 import CoreData
 import CoreDataStack
+import MastodonCore
 import MetaTextKit
 import MastodonMeta
 

Mastodon/Protocol/Provider/DataSourceFacade+Block.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import CoreDataStack
+import MastodonCore
 
 extension DataSourceFacade {
     static func responseToUserBlockAction(

Mastodon/Protocol/Provider/DataSourceFacade+Bookmark.swift

@@ -8,9 +8,10 @@
 import UIKit
 import CoreData
 import CoreDataStack
+import MastodonCore
 
 extension DataSourceFacade {
-    static func responseToStatusBookmarkAction(
+    public static func responseToStatusBookmarkAction(
         provider: DataSourceProvider,
         status: ManagedObjectRecord<Status>,
         authenticationBox: MastodonAuthenticationBox

Mastodon/Protocol/Provider/DataSourceFacade+Favorite.swift

@@ -8,9 +8,10 @@
 import UIKit
 import CoreData
 import CoreDataStack
+import MastodonCore
 
 extension DataSourceFacade {
-    static func responseToStatusFavoriteAction(
+    public static func responseToStatusFavoriteAction(
         provider: DataSourceProvider,
         status: ManagedObjectRecord<Status>,
         authenticationBox: MastodonAuthenticationBox

Mastodon/Protocol/Provider/DataSourceFacade+Follow.swift

@@ -8,6 +8,7 @@
 import UIKit
 import CoreDataStack
 import class CoreDataStack.Notification
+import MastodonCore
 import MastodonSDK
 import MastodonLocalization
 

Mastodon/Protocol/Provider/DataSourceFacade+Mute.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import CoreDataStack
+import MastodonCore
 
 extension DataSourceFacade {
     static func responseToUserMuteAction(

Mastodon/Protocol/Provider/DataSourceFacade+Reblog.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import CoreDataStack
+import MastodonCore
 import MastodonUI
 
 extension DataSourceFacade {

Mastodon/Protocol/Provider/DataSourceFacade+SearchHistory.swift

@@ -7,6 +7,7 @@
 
 import Foundation
 import CoreDataStack
+import MastodonCore
 
 extension DataSourceFacade {
     

Mastodon/Protocol/Provider/DataSourceFacade+Status.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import CoreDataStack
+import MastodonCore
 import MastodonUI
 import MastodonLocalization
 

Mastodon/Protocol/Provider/DataSourceProvider+UITableViewDelegate.swift

@@ -8,6 +8,8 @@
 import os.log
 import UIKit
 import CoreDataStack
+import MastodonCore
+import MastodonUI
 import MastodonLocalization
 
 extension UITableViewDelegate where Self: DataSourceProvider {

Mastodon/Scene/Account/Cell/AccountListTableViewCell.swift

@@ -9,6 +9,7 @@ import UIKit
 import Combine
 import FLAnimatedImage
 import MetaTextKit
+import MastodonCore
 import MastodonUI
 
 final class AccountListTableViewCell: UITableViewCell {

Mastodon/Scene/Compose/AutoComplete/AutoCompleteViewController.swift

@@ -8,6 +8,7 @@
 import os.log
 import UIKit
 import Combine
+import MastodonCore
 
 protocol AutoCompleteViewControllerDelegate: AnyObject {
     func autoCompleteViewController(_ viewController: AutoCompleteViewController, didSelectItem item: AutoCompleteItem)

Mastodon/Scene/Compose/AutoComplete/View/AutoCompleteTopChevronView.swift

@@ -7,6 +7,8 @@
 
 import UIKit
 import Combine
+import MastodonCore
+import MastodonUI
 
 final class AutoCompleteTopChevronView: UIView {
 

Mastodon/Scene/Compose/CollectionViewCell/ComposeStatusPollExpiresOptionCollectionViewCell.swift

@@ -9,6 +9,8 @@ import os.log
 import UIKit
 import Combine
 import MastodonAsset
+import MastodonCore
+import MastodonUI
 import MastodonLocalization
 
 protocol ComposeStatusPollExpiresOptionCollectionViewCellDelegate: AnyObject {

Mastodon/Scene/Compose/CollectionViewCell/ComposeStatusPollOptionAppendEntryCollectionViewCell.swift

@@ -8,6 +8,8 @@
 import os.log
 import UIKit
 import MastodonAsset
+import MastodonCore
+import MastodonUI
 import MastodonLocalization
 
 protocol ComposeStatusPollOptionAppendEntryCollectionViewCellDelegate: AnyObject {

Mastodon/Scene/Compose/CollectionViewCell/ComposeStatusPollOptionCollectionViewCell.swift

@@ -9,6 +9,7 @@ import os.log
 import UIKit
 import Combine
 import MastodonAsset
+import MastodonCore
 import MastodonLocalization
 import MastodonUI
 

Mastodon/Scene/Compose/ComposeViewController.swift

@@ -9,11 +9,12 @@ import os.log
 import UIKit
 import Combine
 import PhotosUI
+import Meta
 import MetaTextKit
 import MastodonMeta
-import Meta
-import MastodonUI
 import MastodonAsset
+import MastodonCore
+import MastodonUI
 import MastodonLocalization
 import MastodonSDK
 
@@ -752,7 +753,10 @@ extension ComposeViewController {
             // TODO: handle error
             return
         }
-        context.statusPublishService.publish(composeViewModel: viewModel)
+        
+        // context.statusPublishService.publish(composeViewModel: viewModel)
+        assertionFailure()
+        
         dismiss(animated: true, completion: nil)
     }
     

Mastodon/Scene/Compose/ComposeViewModel+DataSource.swift

@@ -9,11 +9,12 @@ import os.log
 import UIKit
 import Combine
 import CoreDataStack
-import MastodonSDK
-import MastodonMeta
 import MetaTextKit
+import MastodonMeta
 import MastodonAsset
+import MastodonCore
 import MastodonLocalization
+import MastodonSDK
 
 extension ComposeViewModel {
 

Mastodon/Scene/Compose/ComposeViewModel.swift

@@ -13,6 +13,7 @@ import CoreDataStack
 import GameplayKit
 import MastodonSDK
 import MastodonAsset
+import MastodonCore
 import MastodonLocalization
 import MastodonMeta
 import MastodonUI

Mastodon/Scene/Compose/TableViewCell/ComposeRepliedToStatusContentTableViewCell.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import Combine
+import MastodonUI
 
 final class ComposeRepliedToStatusContentTableViewCell: UITableViewCell {
 

Mastodon/Scene/Compose/View/AttachmentContainerView+EmptyStateView.swift

@@ -6,8 +6,9 @@
 //
 
 import UIKit
-import MastodonUI
 import MastodonAsset
+import MastodonCore
+import MastodonUI
 import MastodonLocalization
 
 extension AttachmentContainerView {

Mastodon/Scene/Compose/View/ComposeToolbarView.swift

@@ -10,6 +10,8 @@ import UIKit
 import Combine
 import MastodonSDK
 import MastodonAsset
+import MastodonCore
+import MastodonUI
 import MastodonLocalization
 
 protocol ComposeToolbarViewDelegate: AnyObject {

Mastodon/Scene/Compose/View/StatusContentWarningEditorView.swift

@@ -8,6 +8,7 @@
 import UIKit
 import MastodonUI
 import MastodonAsset
+import MastodonCore
 import MastodonLocalization
 
 final class StatusContentWarningEditorView: UIView {

Mastodon/Scene/Discovery/Community/DiscoveryCommunityViewController.swift

@@ -8,6 +8,7 @@
 import os.log
 import UIKit
 import Combine
+import MastodonCore
 import MastodonUI
 
 // Local Timeline

Mastodon/Scene/Discovery/Community/DiscoveryCommunityViewModel+State.swift

@@ -164,7 +164,7 @@ extension DiscoveryCommunityViewModel.State {
                     self.maxID = newMaxID
                     
                     var hasNewStatusesAppend = false
-                    var statusIDs = isReloading ? [] : viewModel.statusFetchedResultsController.statusIDs.value
+                    var statusIDs = isReloading ? [] : viewModel.statusFetchedResultsController.statusIDs
                     for status in response.value {
                         guard !statusIDs.contains(status.id) else { continue }
                         statusIDs.append(status.id)
@@ -177,7 +177,7 @@ extension DiscoveryCommunityViewModel.State {
                     } else {
                         await enter(state: NoMore.self)
                     }
-                    viewModel.statusFetchedResultsController.statusIDs.value = statusIDs
+                    viewModel.statusFetchedResultsController.statusIDs = statusIDs
                     viewModel.didLoadLatest.send()
                     
                 } catch {

Mastodon/Scene/Discovery/Community/DiscoveryCommunityViewModel.swift

@@ -54,7 +54,7 @@ final class DiscoveryCommunityViewModel {
         
         context.authenticationService.activeMastodonAuthentication
             .map { $0?.domain }
-            .assign(to: \.value, on: statusFetchedResultsController.domain)
+            .assign(to: \.domain, on: statusFetchedResultsController)
             .store(in: &disposeBag)
     
     }

Mastodon/Scene/Discovery/DiscoveryViewController.swift

@@ -11,6 +11,7 @@ import Combine
 import Tabman
 import Pageboy
 import MastodonAsset
+import MastodonCore
 import MastodonUI
 
 public class DiscoveryViewController: TabmanViewController, NeedsDependency {

Mastodon/Scene/Discovery/DiscoveryViewModel.swift

@@ -9,6 +9,7 @@ import UIKit
 import Combine
 import Tabman
 import Pageboy
+import MastodonCore
 import MastodonLocalization
 
 final class DiscoveryViewModel {

Mastodon/Scene/Discovery/ForYou/DiscoveryForYouViewController.swift

@@ -9,6 +9,7 @@ import os.log
 import UIKit
 import Combine
 import MastodonUI
+import MastodonCore
 
 final class DiscoveryForYouViewController: UIViewController, NeedsDependency, MediaPreviewableViewController {
     

Mastodon/Scene/Discovery/ForYou/DiscoveryForYouViewModel.swift

@@ -12,6 +12,7 @@ import GameplayKit
 import CoreData
 import CoreDataStack
 import MastodonSDK
+import MastodonCore
 
 final class DiscoveryForYouViewModel {
     

Mastodon/Scene/Discovery/Hashtags/DiscoveryHashtagsViewController.swift

@@ -8,6 +8,7 @@
 import os.log
 import UIKit
 import Combine
+import MastodonCore
 import MastodonUI
 
 final class DiscoveryHashtagsViewController: UIViewController, NeedsDependency, MediaPreviewableViewController {

Mastodon/Scene/Discovery/Hashtags/DiscoveryHashtagsViewModel.swift

@@ -11,6 +11,7 @@ import Combine
 import GameplayKit
 import CoreData
 import CoreDataStack
+import MastodonCore
 import MastodonSDK
 
 final class DiscoveryHashtagsViewModel {

Mastodon/Scene/Discovery/News/DiscoveryNewsViewController.swift

@@ -8,6 +8,7 @@
 import os.log
 import UIKit
 import Combine
+import MastodonCore
 import MastodonUI
 
 final class DiscoveryNewsViewController: UIViewController, NeedsDependency, MediaPreviewableViewController {

Mastodon/Scene/Discovery/News/DiscoveryNewsViewModel.swift

@@ -12,6 +12,7 @@ import GameplayKit
 import CoreData
 import CoreDataStack
 import MastodonSDK
+import MastodonCore
 
 final class DiscoveryNewsViewModel {
     

Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewController.swift

@@ -8,6 +8,7 @@
 import os.log
 import UIKit
 import Combine
+import MastodonCore
 import MastodonUI
 
 final class DiscoveryPostsViewController: UIViewController, NeedsDependency, MediaPreviewableViewController {

Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewModel+State.swift

@@ -9,6 +9,7 @@ import os.log
 import Foundation
 import GameplayKit
 import MastodonSDK
+import MastodonCore
 
 extension DiscoveryPostsViewModel {
     class State: GKState, NamingState {
@@ -166,7 +167,7 @@ extension DiscoveryPostsViewModel.State {
                     self.offset = newOffset
 
                     var hasNewStatusesAppend = false
-                    var statusIDs = isReloading ? [] : viewModel.statusFetchedResultsController.statusIDs.value
+                    var statusIDs = isReloading ? [] : viewModel.statusFetchedResultsController.statusIDs
                     for status in response.value {
                         guard !statusIDs.contains(status.id) else { continue }
                         statusIDs.append(status.id)
@@ -178,7 +179,7 @@ extension DiscoveryPostsViewModel.State {
                     } else {
                         await enter(state: NoMore.self)
                     }
-                    viewModel.statusFetchedResultsController.statusIDs.value = statusIDs
+                    viewModel.statusFetchedResultsController.statusIDs = statusIDs
                     viewModel.didLoadLatest.send()
                     
                 } catch {

Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewModel.swift

@@ -12,6 +12,7 @@ import GameplayKit
 import CoreData
 import CoreDataStack
 import MastodonSDK
+import MastodonCore
 
 final class DiscoveryPostsViewModel {
     
@@ -51,7 +52,7 @@ final class DiscoveryPostsViewModel {
         
         context.authenticationService.activeMastodonAuthentication
             .map { $0?.domain }
-            .assign(to: \.value, on: statusFetchedResultsController.domain)
+            .assign(to: \.domain, on: statusFetchedResultsController)
             .store(in: &disposeBag)
         
         Task {

Mastodon/Scene/Discovery/View/DiscoveryIntroBannerView.swift

@@ -9,6 +9,8 @@ import os.log
 import UIKit
 import Combine
 import MastodonAsset
+import MastodonCore
+import MastodonUI
 import MastodonLocalization
 
 public protocol DiscoveryIntroBannerViewDelegate: AnyObject {

Mastodon/Scene/HashtagTimeline/HashtagTimelineViewController.swift

@@ -12,6 +12,7 @@ import Combine
 import GameplayKit
 import CoreData
 import MastodonAsset
+import MastodonCore
 import MastodonLocalization
 
 final class HashtagTimelineViewController: UIViewController, NeedsDependency, MediaPreviewableViewController {

Mastodon/Scene/HashtagTimeline/HashtagTimelineViewModel+State.swift

@@ -167,7 +167,7 @@ extension HashtagTimelineViewModel.State {
                     self.maxID = newMaxID
                     
                     var hasNewStatusesAppend = false
-                    var statusIDs = isReloading ? [] : viewModel.fetchedResultsController.statusIDs.value
+                    var statusIDs = isReloading ? [] : viewModel.fetchedResultsController.statusIDs
                     for status in response.value {
                         guard !statusIDs.contains(status.id) else { continue }
                         statusIDs.append(status.id)

Mastodon/Scene/HashtagTimeline/HashtagTimelineViewModel.swift

@@ -12,7 +12,8 @@ import CoreData
 import CoreDataStack
 import GameplayKit
 import MastodonSDK
-    
+import MastodonCore
+
 final class HashtagTimelineViewModel {
     
     let logger = Logger(subsystem: "HashtagTimelineViewModel", category: "ViewModel")
@@ -63,7 +64,7 @@ final class HashtagTimelineViewModel {
         
         context.authenticationService.activeMastodonAuthenticationBox
             .map { $0?.domain }
-            .assign(to: \.value, on: fetchedResultsController.domain)
+            .assign(to: \.domain, on: fetchedResultsController)
             .store(in: &disposeBag)
     }
     

Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DebugAction.swift

@@ -13,6 +13,7 @@ import CoreData
 import CoreDataStack
 import FLEX
 import SwiftUI
+import MastodonCore
 import MastodonUI
 import MastodonSDK
 import StoreKit

Mastodon/Scene/HomeTimeline/HomeTimelineViewController.swift

@@ -16,8 +16,9 @@ import MastodonSDK
 import AlamofireImage
 import StoreKit
 import MastodonAsset
-import MastodonLocalization
+import MastodonCore
 import MastodonUI
+import MastodonLocalization
 
 final class HomeTimelineViewController: UIViewController, NeedsDependency, MediaPreviewableViewController {
     

Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadLatestState.swift

@@ -11,6 +11,7 @@ import Foundation
 import CoreData
 import CoreDataStack
 import GameplayKit
+import MastodonCore
 
 extension HomeTimelineViewModel {
     class LoadLatestState: GKState {

Mastodon/Scene/HomeTimeline/HomeTimelineViewModel.swift

@@ -15,6 +15,7 @@ import CoreDataStack
 import GameplayKit
 import AlamofireImage
 import DateToolsSwift
+import MastodonCore
 
 final class HomeTimelineViewModel: NSObject {
     

Mastodon/Scene/HomeTimeline/View/HomeTimelineNavigationBarTitleViewModel.swift

@@ -8,6 +8,7 @@
 import Combine
 import Foundation
 import UIKit
+import MastodonCore
 
 final class HomeTimelineNavigationBarTitleViewModel {
     
@@ -48,21 +49,21 @@ final class HomeTimelineNavigationBarTitleViewModel {
             .assign(to: \.value, on: isOffline)
             .store(in: &disposeBag)
         
-        context.statusPublishService.latestPublishingComposeViewModel
+//        context.statusPublishService.latestPublishingComposeViewModel
-            .receive(on: DispatchQueue.main)
+//            .receive(on: DispatchQueue.main)
-            .sink { [weak self] composeViewModel in
+//            .sink { [weak self] composeViewModel in
-                guard let self = self else { return }
+//                guard let self = self else { return }
-                guard let composeViewModel = composeViewModel,
+//                guard let composeViewModel = composeViewModel,
-                      let state = composeViewModel.publishStateMachine.currentState else {
+//                      let state = composeViewModel.publishStateMachine.currentState else {
-                    self.isPublishingPost.value = false
+//                    self.isPublishingPost.value = false
-                    self.isPublished.value = false
+//                    self.isPublished.value = false
-                    return
+//                    return
-                }
+//                }
-                
+//                
-                self.isPublishingPost.value = state is ComposeViewModel.PublishState.Publishing || state is ComposeViewModel.PublishState.Fail
+//                self.isPublishingPost.value = state is ComposeViewModel.PublishState.Publishing || state is ComposeViewModel.PublishState.Fail
-                self.isPublished.value = state is ComposeViewModel.PublishState.Finish
+//                self.isPublished.value = state is ComposeViewModel.PublishState.Finish
-            }
+//            }
-            .store(in: &disposeBag)
+//            .store(in: &disposeBag)
         
         Publishers.CombineLatest4(
             hasNewPosts.eraseToAnyPublisher(),

Mastodon/Scene/MediaPreview/Image/MediaPreviewImageViewModel.swift

@@ -11,6 +11,7 @@ import Combine
 import Alamofire
 import AlamofireImage
 import FLAnimatedImage
+import MastodonCore
 
 class MediaPreviewImageViewModel {
 
@@ -29,18 +30,18 @@ class MediaPreviewImageViewModel {
 
 extension MediaPreviewImageViewModel {
     
-    enum ImagePreviewItem {
+    public enum ImagePreviewItem {
         case remote(RemoteImageContext)
         case local(LocalImageContext)
     }
     
-    struct RemoteImageContext {
+    public struct RemoteImageContext {
         let assetURL: URL?
         let thumbnail: UIImage?
         let altText: String?
     }
     
-    struct LocalImageContext {
+    public struct LocalImageContext {
         let image: UIImage
     }
 

Mastodon/Scene/MediaPreview/MediaPreviewViewController.swift

@@ -10,6 +10,8 @@ import UIKit
 import Combine
 import Pageboy
 import MastodonAsset
+import MastodonCore
+import MastodonUI
 import MastodonLocalization
 
 final class MediaPreviewViewController: UIViewController, NeedsDependency {

Mastodon/Scene/MediaPreview/MediaPreviewViewModel.swift

@@ -10,6 +10,7 @@ import Combine
 import CoreData
 import CoreDataStack
 import Pageboy
+import MastodonCore
 
 final class MediaPreviewViewModel: NSObject {
     

Mastodon/Scene/MediaPreview/Video/MediaPreviewVideoViewModel.swift

@@ -10,6 +10,7 @@ import UIKit
 import AVKit
 import Combine
 import AlamofireImage
+import MastodonCore
 
 final class MediaPreviewVideoViewModel {
     

Mastodon/Scene/Notification/Cell/NotificationTableViewCell.swift

@@ -8,6 +8,7 @@
 import os.log
 import UIKit
 import Combine
+import MastodonCore
 import MastodonUI
 
 final class NotificationTableViewCell: UITableViewCell {

Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewController.swift

@@ -9,6 +9,7 @@ import os.log
 import UIKit
 import Combine
 import CoreDataStack
+import MastodonCore
 import MastodonLocalization
 
 final class NotificationTimelineViewController: UIViewController, NeedsDependency, MediaPreviewableViewController {

Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewModel.swift

@@ -11,6 +11,7 @@ import Combine
 import CoreDataStack
 import GameplayKit
 import MastodonSDK
+import MastodonCore
 
 final class NotificationTimelineViewModel {
     
@@ -78,7 +79,7 @@ final class NotificationTimelineViewModel {
 
 extension NotificationTimelineViewModel {
 
-    typealias Scope = APIService.NotificationScope
+    typealias Scope = APIService.MastodonNotificationScope
     
     static func feedPredicate(
         authenticationBox: MastodonAuthenticationBox,

Mastodon/Scene/Notification/NotificationViewController.swift

@@ -12,6 +12,7 @@ import MastodonAsset
 import MastodonLocalization
 import Tabman
 import Pageboy
+import MastodonCore
 
 final class NotificationViewController: TabmanViewController, NeedsDependency {
     

Mastodon/Scene/Notification/NotificationViewModel.swift

@@ -8,9 +8,10 @@
 import os.log
 import UIKit
 import Combine
-import MastodonAsset
-import MastodonLocalization
 import Pageboy
+import MastodonAsset
+import MastodonCore
+import MastodonLocalization
 
 final class NotificationViewModel {
     

Mastodon/Scene/Onboarding/ConfirmEmail/MastodonConfirmEmailViewController.swift

@@ -11,6 +11,8 @@ import os.log
 import ThirdPartyMailer
 import UIKit
 import MastodonAsset
+import MastodonCore
+import MastodonUI
 import MastodonLocalization
 
 final class MastodonConfirmEmailViewController: UIViewController, NeedsDependency {
@@ -205,10 +207,10 @@ extension MastodonConfirmEmailViewController {
     }
 
     func showEmailAppAlert() {
-        let clients = ThirdPartyMailClient.clients()
+        let clients = ThirdPartyMailClient.clients
         let application = UIApplication.shared
         let availableClients = clients.filter { client -> Bool in
-            ThirdPartyMailer.application(application, isMailClientAvailable: client)
+            ThirdPartyMailer.isMailClientAvailable(client)
         }
         let alertController = UIAlertController(title: L10n.Scene.ConfirmEmail.OpenEmailApp.openEmailClient, message: nil, preferredStyle: .alert)
 
@@ -218,7 +220,7 @@ extension MastodonConfirmEmailViewController {
         alertController.addAction(alertAction)
         _ = availableClients.compactMap { client -> UIAlertAction in
             let alertAction = UIAlertAction(title: client.name, style: .default) { _ in
-                _ = ThirdPartyMailer.application(application, openMailClient: client)
+                _ = ThirdPartyMailer.open(client, completionHandler: nil)
             }
             alertController.addAction(alertAction)
             return alertAction

Mastodon/Scene/Onboarding/ConfirmEmail/MastodonConfirmEmailViewModel.swift

@@ -7,6 +7,7 @@
 
 import Combine
 import Foundation
+import MastodonCore
 import MastodonSDK
 
 final class MastodonConfirmEmailViewModel {

Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewController.swift

@@ -11,6 +11,7 @@ import Combine
 import GameController
 import AuthenticationServices
 import MastodonAsset
+import MastodonCore
 import MastodonLocalization
 import MastodonUI
 
@@ -281,7 +282,7 @@ extension MastodonPickServerViewController {
                 guard let info = AuthenticationViewModel.AuthenticateInfo(
                         domain: server.domain,
                         application: application,
-                        redirectURI: response.value.redirectURI ?? MastodonAuthenticationController.callbackURL
+                        redirectURI: response.value.redirectURI ?? APIService.oauthCallbackURL
                 ) else {
                     throw APIService.APIError.explicit(.badResponse)
                 }

Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewModel.swift

@@ -13,6 +13,8 @@ import MastodonSDK
 import CoreDataStack
 import OrderedCollections
 import Tabman
+import MastodonCore
+import MastodonUI
 
 class MastodonPickServerViewModel: NSObject {
     

Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerLoaderTableViewCell.swift

@@ -8,6 +8,8 @@
 import UIKit
 import Combine
 import MastodonAsset
+import MastodonCore
+import MastodonUI
 import MastodonLocalization
 
 final class PickServerLoaderTableViewCell: TimelineLoaderTableViewCell {

Mastodon/Scene/Onboarding/PickServer/View/PickServerCategoryView.swift

@@ -8,6 +8,7 @@
 import UIKit
 import MastodonSDK
 import MastodonAsset
+import MastodonUI
 import MastodonLocalization
 
 class PickServerCategoryView: UIView {

Mastodon/Scene/Onboarding/PickServer/View/PickServerEmptyStateView.swift

@@ -7,6 +7,8 @@
 
 import UIKit
 import MastodonAsset
+import MastodonCore
+import MastodonUI
 import MastodonLocalization
 
 final class PickServerEmptyStateView: UIView {

Mastodon/Scene/Onboarding/Register/MastodonRegisterViewController.swift

@@ -14,6 +14,7 @@ import UIKit
 import SwiftUI
 import MastodonUI
 import MastodonAsset
+import MastodonCore
 import MastodonLocalization
 
 final class MastodonRegisterViewController: UIViewController, NeedsDependency, OnboardingViewControllerAppearance {

Mastodon/Scene/Onboarding/Register/MastodonRegisterViewModel.swift

@@ -10,6 +10,7 @@ import Foundation
 import MastodonSDK
 import UIKit
 import MastodonAsset
+import MastodonCore
 import MastodonLocalization
 
 final class MastodonRegisterViewModel: ObservableObject {

Mastodon/Scene/Onboarding/ResendEmail/MastodonResendEmailViewController.swift

@@ -9,6 +9,7 @@ import Combine
 import os.log
 import UIKit
 import WebKit
+import MastodonCore
 
 final class MastodonResendEmailViewController: UIViewController, NeedsDependency {
     

Mastodon/Scene/Onboarding/ServerRules/MastodonServerRulesViewController+Debug.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import MastodonCore
 
 #if DEBUG
 

Mastodon/Scene/Onboarding/ServerRules/MastodonServerRulesViewController.swift

@@ -12,6 +12,7 @@ import MastodonSDK
 import SafariServices
 import MetaTextKit
 import MastodonAsset
+import MastodonCore
 import MastodonLocalization
 
 final class MastodonServerRulesViewController: UIViewController, NeedsDependency {

Mastodon/Scene/Onboarding/Share/AuthenticationViewModel.swift

@@ -11,6 +11,7 @@ import CoreData
 import CoreDataStack
 import Combine
 import MastodonSDK
+import MastodonCore
 
 final class AuthenticationViewModel {
     
@@ -121,7 +122,7 @@ extension AuthenticationViewModel {
         init?(
             domain: String,
             application: Mastodon.Entity.Application,
-            redirectURI: String = MastodonAuthenticationController.callbackURL
+            redirectURI: String = APIService.oauthCallbackURL
         ) {
             self.domain = domain
             guard let clientID = application.clientID,

Mastodon/Scene/Onboarding/Share/MastodonAuthenticationController.swift

@@ -9,13 +9,14 @@ import os.log
 import UIKit
 import Combine
 import AuthenticationServices
+import MastodonCore
 
 final class MastodonAuthenticationController {
     
     var disposeBag = Set<AnyCancellable>()
     
     // input
-    var context: AppContext!
+    var context: AppContext
     let authenticateURL: URL
     var authenticationSession: ASWebAuthenticationSession?
     

Mastodon/Scene/Onboarding/Welcome/View/WelcomeIllustrationView.swift

@@ -7,6 +7,8 @@
 
 import UIKit
 import MastodonAsset
+import MastodonCore
+import MastodonUI
 import MastodonLocalization
 
 final class WelcomeIllustrationView: UIView {

Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift

@@ -9,6 +9,7 @@ import os.log
 import UIKit
 import Combine
 import MastodonAsset
+import MastodonCore
 import MastodonLocalization
 
 final class WelcomeViewController: UIViewController, NeedsDependency {

Mastodon/Scene/Onboarding/Welcome/WelcomeViewModel.swift

@@ -7,6 +7,7 @@
 
 import Foundation
 import Combine
+import MastodonCore
 
 final class WelcomeViewModel {
  

Mastodon/Scene/Profile/About/Cell/ProfileFieldAddEntryCollectionViewCell.swift

@@ -11,6 +11,7 @@ import Combine
 import MastodonAsset
 import MastodonLocalization
 import MetaTextKit
+import MastodonCore
 import MastodonUI
 
 final class ProfileFieldAddEntryCollectionViewCell: UICollectionViewCell {

Mastodon/Scene/Profile/About/Cell/ProfileFieldEditCollectionViewCell.swift

@@ -10,6 +10,8 @@ import UIKit
 import Combine
 import MetaTextKit
 import MastodonAsset
+import MastodonCore
+import MastodonUI
 import MastodonLocalization
 
 protocol ProfileFieldEditCollectionViewCellDelegate: AnyObject {

Mastodon/Scene/Profile/About/ProfileAboutViewController.swift

@@ -12,6 +12,7 @@ import MetaTextKit
 import MastodonLocalization
 import TabBarPager
 import XLPagerTabStrip
+import MastodonCore
 
 protocol ProfileAboutViewControllerDelegate: AnyObject {
     func profileAboutViewController(_ viewController: ProfileAboutViewController, profileFieldCollectionViewCell: ProfileFieldCollectionViewCell, metaLabel: MetaLabel, didSelectMeta meta: Meta)

Mastodon/Scene/Profile/About/ProfileAboutViewModel.swift

@@ -11,6 +11,7 @@ import Combine
 import CoreDataStack
 import MastodonSDK
 import MastodonMeta
+import MastodonCore
 import Kanna
 
 final class ProfileAboutViewModel {

Mastodon/Scene/Profile/Bookmark/BookmarkViewController.swift

@@ -11,6 +11,7 @@ import AVKit
 import Combine
 import GameplayKit
 import MastodonAsset
+import MastodonCore
 import MastodonLocalization
 
 final class BookmarkViewController: UIViewController, NeedsDependency, MediaPreviewableViewController {

Mastodon/Scene/Profile/Bookmark/BookmarkViewModel+State.swift

@@ -9,6 +9,7 @@ import os.log
 import Foundation
 import GameplayKit
 import MastodonSDK
+import MastodonCore
 
 extension BookmarkViewModel {
     class State: GKState, NamingState {
@@ -72,7 +73,7 @@ extension BookmarkViewModel.State {
             guard let viewModel = viewModel, let stateMachine = stateMachine else { return }
             
             // reset
-            viewModel.statusFetchedResultsController.statusIDs.value = []
+            viewModel.statusFetchedResultsController.statusIDs = []
             
             stateMachine.enter(Loading.self)
         }
@@ -150,7 +151,7 @@ extension BookmarkViewModel.State {
                     )
                     
                     var hasNewStatusesAppend = false
-                    var statusIDs = viewModel.statusFetchedResultsController.statusIDs.value
+                    var statusIDs = viewModel.statusFetchedResultsController.statusIDs
                     for status in response.value {
                         guard !statusIDs.contains(status.id) else { continue }
                         statusIDs.append(status.id)
@@ -169,7 +170,7 @@ extension BookmarkViewModel.State {
                     } else {
                         await enter(state: NoMore.self)
                     }
-                    viewModel.statusFetchedResultsController.statusIDs.value = statusIDs
+                    viewModel.statusFetchedResultsController.statusIDs = statusIDs
                 } catch {
                     logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): fetch user bookmarks fail: \(error.localizedDescription)")
                     await enter(state: Fail.self)

Mastodon/Scene/Profile/Bookmark/BookmarkViewModel.swift

@@ -10,6 +10,7 @@ import Combine
 import CoreData
 import CoreDataStack
 import GameplayKit
+import MastodonCore
 
 final class BookmarkViewModel {
     
@@ -51,7 +52,7 @@ final class BookmarkViewModel {
         
         activeMastodonAuthenticationBox
             .map { $0?.domain }
-            .assign(to: \.value, on: statusFetchedResultsController.domain)
+            .assign(to: \.domain, on: statusFetchedResultsController)
             .store(in: &disposeBag)
     }
     

Mastodon/Scene/Profile/CachedProfileViewModel.swift

@@ -7,6 +7,7 @@
 
 import Foundation
 import CoreDataStack
+import MastodonCore
 
 final class CachedProfileViewModel: ProfileViewModel {
     

Mastodon/Scene/Profile/FamiliarFollowers/FamiliarFollowersViewController.swift

@@ -8,6 +8,7 @@
 import os.log
 import UIKit
 import Combine
+import MastodonCore
 import MastodonLocalization
 
 final class FamiliarFollowersViewController: UIViewController, NeedsDependency {

Mastodon/Scene/Profile/FamiliarFollowers/FamiliarFollowersViewModel.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import Combine
+import MastodonCore
 import MastodonSDK
 import CoreDataStack
 

Mastodon/Scene/Profile/Favorite/FavoriteViewController.swift

@@ -14,6 +14,7 @@ import AVKit
 import Combine
 import GameplayKit
 import MastodonAsset
+import MastodonCore
 import MastodonLocalization
 
 final class FavoriteViewController: UIViewController, NeedsDependency, MediaPreviewableViewController {

Mastodon/Scene/Profile/Favorite/FavoriteViewModel+State.swift

@@ -8,6 +8,7 @@
 import os.log
 import Foundation
 import GameplayKit
+import MastodonCore
 import MastodonSDK
 
 extension FavoriteViewModel {
@@ -72,7 +73,7 @@ extension FavoriteViewModel.State {
             guard let viewModel = viewModel, let stateMachine = stateMachine else { return }
             
             // reset
-            viewModel.statusFetchedResultsController.statusIDs.value = []
+            viewModel.statusFetchedResultsController.statusIDs = []
             
             stateMachine.enter(Loading.self)
         }
@@ -150,7 +151,7 @@ extension FavoriteViewModel.State {
                     )
                     
                     var hasNewStatusesAppend = false
-                    var statusIDs = viewModel.statusFetchedResultsController.statusIDs.value
+                    var statusIDs = viewModel.statusFetchedResultsController.statusIDs
                     for status in response.value {
                         guard !statusIDs.contains(status.id) else { continue }
                         statusIDs.append(status.id)
@@ -169,7 +170,7 @@ extension FavoriteViewModel.State {
                     } else {
                         await enter(state: NoMore.self)
                     }
-                    viewModel.statusFetchedResultsController.statusIDs.value = statusIDs
+                    viewModel.statusFetchedResultsController.statusIDs = statusIDs
                 } catch {
                     logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): fetch user favorites fail: \(error.localizedDescription)")
                     await enter(state: Fail.self)

Mastodon/Scene/Profile/Favorite/FavoriteViewModel.swift

@@ -10,6 +10,7 @@ import Combine
 import CoreData
 import CoreDataStack
 import GameplayKit
+import MastodonCore
 
 final class FavoriteViewModel {
     
@@ -51,7 +52,7 @@ final class FavoriteViewModel {
         
         activeMastodonAuthenticationBox
             .map { $0?.domain }
-            .assign(to: \.value, on: statusFetchedResultsController.domain)
+            .assign(to: \.domain, on: statusFetchedResultsController)
             .store(in: &disposeBag)
     }