Packages/InstanceFeatures/Sources/InstanceFeatures/InstanceFeatures.swift

@@ -135,7 +135,7 @@ public class InstanceFeatures: ObservableObject {
     public init() {
     }
     
-    public func update(instance: InstanceInfo, nodeInfo: NodeInfo?) {
+    public func update(instance: Instance, nodeInfo: NodeInfo?) {
         let ver = instance.version.lowercased()
         // check glitch first b/c it still reports "mastodon" as the software in nodeinfo
         if ver.contains("glitch") {

Packages/InstanceFeatures/Sources/InstanceFeatures/InstanceInfo.swift

@@ -1,34 +0,0 @@
-//
-//  InstanceInfo.swift
-//  InstanceFeatures
-//
-//  Created by Shadowfacts on 5/28/23.
-//
-
-import Foundation
-import Pachyderm
-
-public struct InstanceInfo {
-    public let version: String
-    public let maxStatusCharacters: Int?
-    public let configuration: Instance.Configuration?
-    public let pollsConfiguration: Instance.PollsConfiguration?
-    
-    public init(version: String, maxStatusCharacters: Int?, configuration: Instance.Configuration?, pollsConfiguration: Instance.PollsConfiguration?) {
-        self.version = version
-        self.maxStatusCharacters = maxStatusCharacters
-        self.configuration = configuration
-        self.pollsConfiguration = pollsConfiguration
-    }
-}
-
-extension InstanceInfo {
-    public init(instance: Instance) {
-        self.init(
-            version: instance.version,
-            maxStatusCharacters: instance.maxStatusCharacters,
-            configuration: instance.configuration,
-            pollsConfiguration: instance.pollsConfiguration
-        )
-    }
-}

Packages/Pachyderm/Sources/Pachyderm/Model/Instance.swift

@@ -107,7 +107,7 @@ extension Instance {
 }
 
 extension Instance {
-    public struct Configuration: Codable, Sendable {
+    public struct Configuration: Decodable, Sendable {
         public let statuses: StatusesConfiguration
         public let mediaAttachments: MediaAttachmentsConfiguration
         /// Use Instance.pollsConfiguration to support older instance that don't have this nested
@@ -122,7 +122,7 @@ extension Instance {
 }
 
 extension Instance {
-    public struct StatusesConfiguration: Codable, Sendable {
+    public struct StatusesConfiguration: Decodable, Sendable {
         public let maxCharacters: Int
         public let maxMediaAttachments: Int
         public let charactersReservedPerURL: Int
@@ -136,7 +136,7 @@ extension Instance {
 }
 
 extension Instance {
-    public struct MediaAttachmentsConfiguration: Codable, Sendable {
+    public struct MediaAttachmentsConfiguration: Decodable, Sendable {
         public let supportedMIMETypes: [String]
         public let imageSizeLimit: Int
         public let imageMatrixLimit: Int
@@ -156,7 +156,7 @@ extension Instance {
 }
 
 extension Instance {
-    public struct PollsConfiguration: Codable, Sendable {
+    public struct PollsConfiguration: Decodable, Sendable {
         public let maxOptions: Int
         public let maxCharactersPerOption: Int
         public let minExpiration: TimeInterval

Packages/Pachyderm/Sources/Pachyderm/Model/NodeInfo.swift

@@ -8,11 +8,11 @@
 
 import Foundation
 
-public struct NodeInfo: Decodable, Sendable, Equatable {
+public struct NodeInfo: Decodable, Sendable {
     public let version: String
     public let software: Software
     
-    public struct Software: Decodable, Sendable, Equatable {
+    public struct Software: Decodable, Sendable {
         public let name: String
         public let version: String
     }

ShareExtension/ShareMastodonContext.swift

@@ -40,7 +40,7 @@ class ShareMastodonContext: ComposeMastodonContext, ObservableObject {
                 }
             })
             guard let instance = await instance else { return }
-            self.instanceFeatures.update(instance: InstanceInfo(instance: instance), nodeInfo: await nodeInfo)
+            self.instanceFeatures.update(instance: instance, nodeInfo: await nodeInfo)
         }
         
         Task { @MainActor in

Tusker.xcodeproj/project.pbxproj

@@ -29,7 +29,6 @@
 		D601FA61297B539E00A8E8B5 /* ConversationMainStatusCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D601FA60297B539E00A8E8B5 /* ConversationMainStatusCollectionViewCell.swift */; };
 		D601FA83297EEC3F00A8E8B5 /* SuggestedProfileCardCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D601FA81297EEC3F00A8E8B5 /* SuggestedProfileCardCollectionViewCell.swift */; };
 		D601FA84297EEC3F00A8E8B5 /* SuggestedProfileCardCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D601FA82297EEC3F00A8E8B5 /* SuggestedProfileCardCollectionViewCell.xib */; };
-		D608470F2A245D1F00C17380 /* ActiveInstance.swift in Sources */ = {isa = PBXBuildFile; fileRef = D608470E2A245D1F00C17380 /* ActiveInstance.swift */; };
 		D6093F9B25BDD4B9004811E6 /* HashtagSearchResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6093F9A25BDD4B9004811E6 /* HashtagSearchResultsViewController.swift */; };
 		D6093FB725BE0CF3004811E6 /* TrendHistoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6093FB625BE0CF3004811E6 /* TrendHistoryView.swift */; };
 		D60CFFDB24A290BA00D00083 /* SwiftSoup in Frameworks */ = {isa = PBXBuildFile; productRef = D60CFFDA24A290BA00D00083 /* SwiftSoup */; };
@@ -427,7 +426,6 @@
 		D601FA60297B539E00A8E8B5 /* ConversationMainStatusCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationMainStatusCollectionViewCell.swift; sourceTree = "<group>"; };
 		D601FA81297EEC3F00A8E8B5 /* SuggestedProfileCardCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SuggestedProfileCardCollectionViewCell.swift; sourceTree = "<group>"; };
 		D601FA82297EEC3F00A8E8B5 /* SuggestedProfileCardCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SuggestedProfileCardCollectionViewCell.xib; sourceTree = "<group>"; };
-		D608470E2A245D1F00C17380 /* ActiveInstance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActiveInstance.swift; sourceTree = "<group>"; };
 		D6093F9A25BDD4B9004811E6 /* HashtagSearchResultsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HashtagSearchResultsViewController.swift; sourceTree = "<group>"; };
 		D6093FB625BE0CF3004811E6 /* TrendHistoryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendHistoryView.swift; sourceTree = "<group>"; };
 		D60E2F232442372B005F8713 /* StatusMO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusMO.swift; sourceTree = "<group>"; };
@@ -956,7 +954,6 @@
 				D6A3A3812956123A0036B6EF /* TimelinePosition.swift */,
 				D68A76E229524D2A001DA1B3 /* ListMO.swift */,
 				D68A76D929511CA6001DA1B3 /* AccountPreferences.swift */,
-				D608470E2A245D1F00C17380 /* ActiveInstance.swift */,
 				D60E2F2D244248BF005F8713 /* MastodonCachePersistentStore.swift */,
 				D6B936702829F72900237D0E /* NSManagedObjectContext+Helpers.swift */,
 			);
@@ -1962,7 +1959,6 @@
 				D6969E9E240C81B9002843CE /* NSTextAttachment+Emoji.swift in Sources */,
 				D6D79F532A0FFE3200AB2315 /* ToggleableButton.swift in Sources */,
 				D6BC9DB3232D4C07002CA326 /* WellnessPrefsView.swift in Sources */,
-				D608470F2A245D1F00C17380 /* ActiveInstance.swift in Sources */,
 				D6ADB6F028ED1F25009924AB /* CachedImageView.swift in Sources */,
 				D693DE5923FE24310061E07D /* InteractivePushTransition.swift in Sources */,
 				D69693FA25859A8000F4E116 /* ComposeSceneDelegate.swift in Sources */,

Tusker/API/MastodonController.swift

@@ -23,12 +23,15 @@ class MastodonController: ObservableObject {
     @available(*, message: "do something less dumb")
     static var first: MastodonController { all.first!.value }
     
-    @MainActor
     static func getForAccount(_ account: UserAccountInfo) -> MastodonController {
         if let controller = all[account] {
             return controller
         } else {
-            let controller = MastodonController(instanceURL: account.instanceURL, accountInfo: account)
+            let controller = MastodonController(instanceURL: account.instanceURL)
+            controller.accountInfo = account
+            controller.client.clientID = account.clientID
+            controller.client.clientSecret = account.clientSecret
+            controller.client.accessToken = account.accessToken
             all[account] = controller
             return controller
         }
@@ -43,7 +46,7 @@ class MastodonController: ObservableObject {
     }
     
     private let transient: Bool
-    nonisolated let persistentContainer: MastodonCachePersistentStore// = MastodonCachePersistentStore(for: accountInfo, transient: transient)
+    private(set) nonisolated lazy var persistentContainer = MastodonCachePersistentStore(for: accountInfo, transient: transient)
 
     let instanceURL: URL
     var accountInfo: UserAccountInfo?
@@ -52,9 +55,8 @@ class MastodonController: ObservableObject {
     let client: Client!
     let instanceFeatures = InstanceFeatures()
     
-    @Published private(set) var account: AccountMO?
-    @Published private(set) var instance: Instance?
-    @Published private(set) var instanceInfo: InstanceInfo!
+    @Published private(set) var account: Account!
+    @Published private(set) var instance: Instance!
     @Published private(set) var nodeInfo: NodeInfo!
     @Published private(set) var lists: [List] = []
     @Published private(set) var customEmojis: [Emoji]?
@@ -70,46 +72,24 @@ class MastodonController: ObservableObject {
         accountInfo != nil
     }
 
-    // main-actor b/c fetchActiveAccountID and fetchActiveInstance use the viewContext
-    @MainActor
-    init(instanceURL: URL, accountInfo: UserAccountInfo?) {
+    init(instanceURL: URL, transient: Bool = false) {
         self.instanceURL = instanceURL
-        self.accountInfo = accountInfo
+        self.accountInfo = nil
         self.client = Client(baseURL: instanceURL, session: .appDefault)
-        self.transient = accountInfo == nil
-        self.persistentContainer = MastodonCachePersistentStore(for: accountInfo, transient: transient)
-        
-        self.client.clientID = accountInfo?.clientID
-        self.client.clientSecret = accountInfo?.clientSecret
-        self.client.accessToken = accountInfo?.accessToken
-        
-        if !transient {
-            fetchActiveAccount()
-            fetchActiveInstance()
-        }
-        
-        $instanceInfo
-            .compactMap { $0 }
-            .combineLatest($nodeInfo)
-            .sink { [unowned self] (instance, nodeInfo) in
-                self.instanceFeatures.update(instance: instance, nodeInfo: nodeInfo)
-            }
-            .store(in: &cancellables)
-        
-        $instanceInfo
-            .compactMap { $0 }
-            .removeDuplicates(by: { $0.version == $1.version })
-            .combineLatest($nodeInfo.removeDuplicates())
-            .sink { (instance, nodeInfo) in
-                setInstanceBreadcrumb(instance: instance, nodeInfo: nodeInfo)
-            }
-            .store(in: &cancellables)
+        self.transient = transient
         
         $instance
-            .compactMap { $0 }
-            .sink { [unowned self] in
-                self.updateActiveInstance(from: $0)
-                self.instanceInfo = InstanceInfo(instance: $0)
+            .combineLatest($nodeInfo)
+            .compactMap { (instance, nodeInfo) in
+                if let instance {
+                    return (instance, nodeInfo)
+                } else {
+                    return nil
+                }
+            }
+            .sink { [unowned self] (instance, nodeInfo) in
+                self.instanceFeatures.update(instance: instance, nodeInfo: nodeInfo)
+                setInstanceBreadcrumb(instance: instance, nodeInfo: nodeInfo)
             }
             .store(in: &cancellables)
         
@@ -123,12 +103,6 @@ class MastodonController: ObservableObject {
             .store(in: &cancellables)
     }
     
-    @MainActor
-    convenience init(instanceURL: URL, transient: Bool) {
-        precondition(transient, "account info must be provided if transient is false")
-        self.init(instanceURL: instanceURL, accountInfo: nil)
-    }
-    
     @discardableResult
     func run<Result>(_ request: Request<Result>, completion: @escaping Client.Callback<Result>) -> URLSessionTask? {
         return client.run(request, completion: completion)
@@ -233,8 +207,8 @@ class MastodonController: ObservableObject {
         }
     }
     
-    func getOwnAccount(completion: ((Result<AccountMO, Client.Error>) -> Void)? = nil) {
-        if let account {
+    func getOwnAccount(completion: ((Result<Account, Client.Error>) -> Void)? = nil) {
+        if account != nil {
             completion?(.success(account))
         } else {
             let request = Client.getSelfAccount()
@@ -244,25 +218,25 @@ class MastodonController: ObservableObject {
                     completion?(.failure(error))
                     
                 case let .success(account, _):
-                    let context = self.persistentContainer.viewContext
-                    context.perform {
-                        let accountMO: AccountMO
-                        if let existing = self.persistentContainer.account(for: account.id, in: context) {
-                            accountMO = existing
-                            existing.updateFrom(apiAccount: account, container: self.persistentContainer)
-                        } else {
-                            accountMO = self.persistentContainer.addOrUpdateSynchronously(account: account, in: context)
+                    DispatchQueue.main.async {
+                        self.account = account
                     }
-                        accountMO.active = true
-                        self.account = accountMO
-                        completion?(.success(accountMO))
+                    self.persistentContainer.backgroundContext.perform {
+                        if let accountMO = self.persistentContainer.account(for: account.id, in: self.persistentContainer.backgroundContext) {
+                            accountMO.updateFrom(apiAccount: account, container: self.persistentContainer)
+                        } else {
+                            // the first time the user's account is added to the store,
+                            // increment its reference count so that it's never removed
+                            self.persistentContainer.addOrUpdate(account: account)
+                        }
+                        completion?(.success(account))
                     }
                 }
             }
         }
     }
     
-    func getOwnAccount() async throws -> AccountMO {
+    func getOwnAccount() async throws -> Account {
         if let account = account {
             return account
         } else {
@@ -358,37 +332,6 @@ class MastodonController: ObservableObject {
         }
     }
     
-    private func updateActiveInstance(from instance: Instance) {
-        persistentContainer.performBackgroundTask { context in
-            if let existing = try? context.fetch(ActiveInstance.fetchRequest()).first {
-                existing.update(from: instance)
-            } else {
-                let new = ActiveInstance(context: context)
-                new.update(from: instance)
-            }
-            if context.hasChanges {
-                try? context.save()
-            }
-        }
-    }
-    
-    @MainActor
-    private func fetchActiveAccount() {
-        let req = AccountMO.fetchRequest()
-        req.predicate = NSPredicate(format: "active = YES")
-        if let activeAccount = try? persistentContainer.viewContext.fetch(req).first {
-            account = activeAccount
-        }
-    }
-    
-    @MainActor
-    private func fetchActiveInstance() {
-        if let activeInstance = try? persistentContainer.viewContext.fetch(ActiveInstance.fetchRequest()).first {
-            let info = InstanceInfo(activeInstance: activeInstance)
-            self.instanceInfo = info
-        }
-    }
-    
     func getCustomEmojis(completion: @escaping ([Emoji]) -> Void) {
         if let emojis = self.customEmojis {
             completion(emojis)
@@ -579,7 +522,7 @@ class MastodonController: ObservableObject {
     
 }
 
-private func setInstanceBreadcrumb(instance: InstanceInfo, nodeInfo: NodeInfo?) {
+private func setInstanceBreadcrumb(instance: Instance, nodeInfo: NodeInfo?) {
     let crumb = Breadcrumb(level: .info, category: "MastodonController")
     crumb.data = [
         "instance": [

Tusker/AppDelegate.swift

@@ -115,8 +115,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         }
         
         if let clazz = NSClassFromString("SentryInstallation"),
-           let objClazz = clazz as AnyObject as? NSObject,
-           let id = objClazz.value(forKey: "id") as? String {
+           let objClazz = clazz as AnyObject as? NSObjectProtocol,
+           objClazz.responds(to: Selector(("id"))),
+           let id = objClazz.perform(Selector(("id"))).takeUnretainedValue() as? String {
             logger.info("Initialized Sentry with installation/user ID: \(id, privacy: .public)")
         }
     }

Tusker/CoreData/AccountMO.swift

@@ -25,8 +25,6 @@ public final class AccountMO: NSManagedObject, AccountProtocol {
     }
     
     @NSManaged public var acct: String
-    /// Whether this AccountMO is the active (logged-in) account.
-    @NSManaged public var active: Bool
     @NSManaged public var avatar: URL?
     @NSManaged public var botCD: Bool
     @NSManaged public var createdAt: Date

Tusker/CoreData/ActiveInstance.swift

@@ -1,49 +0,0 @@
-//
-//  ActiveInstance.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 5/28/23.
-//  Copyright © 2023 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-import CoreData
-import Pachyderm
-import InstanceFeatures
-
-@objc(ActiveInstance)
-public final class ActiveInstance: NSManagedObject {
-    
-    @nonobjc class public func fetchRequest() -> NSFetchRequest<ActiveInstance> {
-        return NSFetchRequest(entityName: "ActiveInstance")
-    }
-    
-    @NSManaged public var version: String
-    @NSManaged public var maxStatusCharacters: Int
-    @NSManaged private var configurationData: Data?
-    @NSManaged private var pollsConfigurationData: Data?
-    
-    @LazilyDecoding(from: \ActiveInstance.configurationData, fallback: nil)
-    public var configuration: Instance.Configuration?
-    
-    @LazilyDecoding(from: \ActiveInstance.pollsConfigurationData, fallback: nil)
-    public var pollsConfiguration: Instance.PollsConfiguration?
-    
-    func update(from instance: Instance) {
-        self.version = instance.version
-        self.maxStatusCharacters = instance.maxStatusCharacters ?? 500
-        self.configuration = instance.configuration
-        self.pollsConfiguration = instance.pollsConfiguration
-    }
-}
-
-extension InstanceInfo {
-    init(activeInstance: ActiveInstance) {
-        self.init(
-            version: activeInstance.version,
-            maxStatusCharacters: activeInstance.maxStatusCharacters,
-            configuration: activeInstance.configuration,
-            pollsConfiguration: activeInstance.pollsConfiguration
-        )
-    }
-}

Tusker/CoreData/MastodonCachePersistentStore.swift

@@ -311,14 +311,6 @@ class MastodonCachePersistentStore: NSPersistentCloudKitContainer {
         }
     }
     
-    /// The caller is responsible for calling this on a queue appropriate for `context`.
-    func addOrUpdateSynchronously(account: Account, in context: NSManagedObjectContext) -> AccountMO {
-        let accountMO = self.upsert(account: account, in: context)
-        self.save(context: context)
-        self.accountSubject.send(account.id)
-        return accountMO
-    }
-    
     func relationship(forAccount id: String, in context: NSManagedObjectContext? = nil) -> RelationshipMO? {
         let context = context ?? viewContext
         let request: NSFetchRequest<RelationshipMO> = RelationshipMO.fetchRequest()

Tusker/CoreData/Tusker.xcdatamodeld/Tusker.xcdatamodel/contents

@@ -2,7 +2,6 @@
 <model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="21754" systemVersion="22D49" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="Account" representedClassName="AccountMO" syncable="YES">
         <attribute name="acct" attributeType="String"/>
-        <attribute name="active" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
         <attribute name="avatar" optional="YES" attributeType="URI"/>
         <attribute name="botCD" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
         <attribute name="createdAt" attributeType="Date" usesScalarValueType="NO"/>
@@ -34,12 +33,6 @@
         <attribute name="createdAt" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
         <attribute name="pinnedTimelinesData" optional="YES" attributeType="Binary"/>
     </entity>
-    <entity name="ActiveInstance" representedClassName="ActiveInstance" syncable="YES">
-        <attribute name="configurationData" optional="YES" attributeType="Binary"/>
-        <attribute name="maxStatusCharacters" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="pollsConfigurationData" optional="YES" attributeType="Binary"/>
-        <attribute name="version" optional="YES" attributeType="String"/>
-    </entity>
     <entity name="Filter" representedClassName="FilterMO" syncable="YES">
         <attribute name="action" attributeType="String" defaultValueString="warn"/>
         <attribute name="context" attributeType="String"/>
@@ -145,6 +138,7 @@
         <memberEntity name="TimelinePosition"/>
     </configuration>
     <configuration name="Local">
+        <memberEntity name="Account"/>
         <memberEntity name="Filter"/>
         <memberEntity name="FilterKeyword"/>
         <memberEntity name="FollowedHashtag"/>
@@ -152,7 +146,5 @@
         <memberEntity name="Status"/>
         <memberEntity name="TimelineState"/>
         <memberEntity name="List"/>
-        <memberEntity name="Account"/>
-        <memberEntity name="ActiveInstance"/>
     </configuration>
 </model>

Tusker/Screens/Compose/ComposeHostingController.swift

@@ -27,8 +27,6 @@ class ComposeHostingController: UIHostingController<ComposeHostingController.Vie
     let controller: ComposeController
     let mastodonController: MastodonController
     
-    private var cancellables = Set<AnyCancellable>()
-    
     private var assetPickerCompletion: (@MainActor ([PHPickerResult]) -> Void)?
     private var drawingCompletion: ((PKDrawing) -> Void)?
     
@@ -46,6 +44,7 @@ class ComposeHostingController: UIHostingController<ComposeHostingController.Vie
             replyContentView: { AnyView(ComposeReplyContentView(status: $0, mastodonController: mastodonController, heightChanged: $1)) },
             emojiImageView: { AnyView(CustomEmojiImageView(emoji: $0)) }
         )
+        controller.currentAccount = mastodonController.account
         
         self.mastodonController = mastodonController
         
@@ -59,12 +58,6 @@ class ComposeHostingController: UIHostingController<ComposeHostingController.Vie
         
         // set an initial title immediately, in case we're starting ducked
         self.navigationItem.title = self.controller.navigationTitle
-        
-        mastodonController.$account
-            .sink { [unowned self] in
-                self.controller.currentAccount = $0
-            }
-            .store(in: &cancellables)
     }
     
     required init?(coder aDecoder: NSCoder) {

Tusker/Screens/Explore/ExploreViewController.swift

@@ -57,6 +57,10 @@ class ExploreViewController: UIViewController, UICollectionViewDelegate, Collect
         dataSource = createDataSource()
         applyInitialSnapshot()
         
+        if mastodonController.instance == nil {
+            mastodonController.getOwnInstance(completion: self.ownInstanceLoaded(_:))
+        }
+        
         resultsController = SearchResultsViewController(mastodonController: mastodonController)
         resultsController.exploreNavigationController = self.navigationController!
         searchController = UISearchController(searchResultsController: resultsController)
@@ -75,9 +79,6 @@ class ExploreViewController: UIViewController, UICollectionViewDelegate, Collect
         NotificationCenter.default.addObserver(self, selector: #selector(savedInstancesChanged), name: .savedInstancesChanged, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(preferencesChanged), name: .preferencesChanged, object: nil)
         
-        mastodonController.instanceFeatures.featuresUpdated
-            .sink { [unowned self] in self.instanceFeaturesChanged() }
-            .store(in: &cancellables)
         mastodonController.$lists
             .sink { [unowned self] in self.reloadLists($0) }
             .store(in: &cancellables)
@@ -193,7 +194,7 @@ class ExploreViewController: UIViewController, UICollectionViewDelegate, Collect
         snapshot.appendItems([.trends], toSection: .discover)
     }
     
-    private func instanceFeaturesChanged() {
+    private func ownInstanceLoaded(_ instance: Instance) {
         var snapshot = self.dataSource.snapshot()
         if mastodonController.instanceFeatures.trends,
            !snapshot.sectionIdentifiers.contains(.discover) {

Tusker/Screens/Main/MainSidebarViewController.swift

@@ -97,6 +97,10 @@ class MainSidebarViewController: UIViewController {
         
         applyInitialSnapshot()
         
+        if mastodonController.instance == nil {
+            mastodonController.getOwnInstance(completion: self.ownInstanceLoaded(_:))
+        }
+        
         select(item: .tab(.timelines), animated: false)
         
         NotificationCenter.default.addObserver(self, selector: #selector(reloadSavedInstances), name: .savedInstancesChanged, object: nil)
@@ -185,6 +189,14 @@ class MainSidebarViewController: UIViewController {
         reloadSavedInstances()
     }
     
+    private func ownInstanceLoaded(_ instance: Instance) {
+        let prevSelected = collectionView.indexPathsForSelectedItems
+        
+        if let prevSelected = prevSelected?.first {
+            collectionView.selectItem(at: prevSelected, animated: false, scrollPosition: .top)
+        }
+    }
+    
     private func reloadLists(_ lists: [List], animated: Bool) {
         if let selectedItem,
            case .list(let list) = selectedItem,

Tusker/Screens/Onboarding/OnboardingViewController.swift

@@ -150,7 +150,7 @@ class OnboardingViewController: UINavigationController {
         mastodonController.accountInfo = tempAccountInfo
         
         updateStatus("Checking Credentials")
-        let ownAccount: AccountMO
+        let ownAccount: Account
         do {
             ownAccount = try await retrying("Getting own account") {
                 try await mastodonController.getOwnAccount()

Tusker/Screens/Report/ReportSelectRulesView.swift

@@ -31,7 +31,7 @@ struct ReportSelectRulesView: View {
     }
     
     var body: some View {
-        List(mastodonController.instance!.rules!) { rule in
+        List(mastodonController.instance.rules!) { rule in
             Button {
                 if selectedRuleIDs.contains(rule.id) {
                     selectedRuleIDs.removeAll(where: { $0 == rule.id })

Tusker/Screens/Report/ReportView.swift

@@ -24,6 +24,9 @@ struct ReportView: View {
         self.account = mastodonController.persistentContainer.account(for: report.accountID)!
         self.mastodonController = mastodonController
         self._report = StateObject(wrappedValue: report)
+        if mastodonController.instance?.rules == nil {
+            report.reason = .spam
+        }
     }
     
     var body: some View {
@@ -170,11 +173,6 @@ struct ReportView: View {
                 }
             }
         }
-        .onReceive(mastodonController.$instance) { instance in
-            if instance?.rules == nil {
-                report.reason = .spam
-            }
-        }
     }
     
     private func sendReport() {