summaryrefslogtreecommitdiff
path: root/Hutch/Models/Inbox.swift
diff options
context:
space:
mode:
authorChristian Cleberg <[email protected]>2026-08-07 17:33:46 -0500
committerChristian Cleberg <[email protected]>2026-08-07 17:33:46 -0500
commit283fbf00fdffd64c924b6cb22c84e803b718f078 (patch)
treef6603518ba62134faa699d864003b90464930ab9 /Hutch/Models/Inbox.swift
parentb2a1265cadccc34cbdab71b9ed638b908cac9f62 (diff)
downloadhutch-283fbf00fdffd64c924b6cb22c84e803b718f078.tar.gz
hutch-283fbf00fdffd64c924b6cb22c84e803b718f078.tar.bz2
hutch-283fbf00fdffd64c924b6cb22c84e803b718f078.zip
Adopt Swift 6 language mode
Flip SWIFT_VERSION to 6.0 (keeping SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor) and resolve every resulting diagnostic. Mechanical, no behaviour change: - Models: pure value types in Models/ and utility extensions (Date, DateFormatter, SRHTWebURL) marked nonisolated so the nonisolated networking layer can use them. - App Intents: stored 'static var' (title/description/openAppWhenRun/ typeDisplayRepresentation/defaultQuery/caseDisplayRepresentations) -> 'static let'; drop the invalid @retroactive on the in-module LookupType: AppEnum. - Sendable dicts: 'nil as String? as Any' -> 'nil as String? as any Sendable'. - UserDefaults: retroactive @unchecked Sendable (documented thread-safe). - WidgetKit completion handlers rebound nonisolated(unsafe) to cross into Task {}; TipStoreViewModel task handle is @ObservationIgnored nonisolated(unsafe) for its nonisolated deinit. - Tests run on @MainActor; a few constant fixtures marked nonisolated for use in @Sendable stub closures. Builds and the full suite are clean in Swift 6 mode. Roadmap updated.
Diffstat (limited to 'Hutch/Models/Inbox.swift')
-rw-r--r--Hutch/Models/Inbox.swift20
1 files changed, 10 insertions, 10 deletions
diff --git a/Hutch/Models/Inbox.swift b/Hutch/Models/Inbox.swift
index c8e41bb..dfed719 100644
--- a/Hutch/Models/Inbox.swift
+++ b/Hutch/Models/Inbox.swift
@@ -1,6 +1,6 @@
import Foundation
-struct InboxThreadSummary: Identifiable, Hashable, Sendable {
+nonisolated struct InboxThreadSummary: Identifiable, Hashable, Sendable {
let rootEmailID: Int
let rootMessageID: String
let threadRootEmailIDs: [Int]
@@ -76,7 +76,7 @@ struct InboxThreadSummary: Identifiable, Hashable, Sendable {
}
}
-struct InboxMessage: Identifiable, Hashable, Sendable {
+nonisolated struct InboxMessage: Identifiable, Hashable, Sendable {
let id: Int
let author: Entity
let date: Date
@@ -89,12 +89,12 @@ struct InboxMessage: Identifiable, Hashable, Sendable {
let rawMessageURL: URL?
}
-enum InboxMessageContentBlock: Hashable, Sendable {
+nonisolated enum InboxMessageContentBlock: Hashable, Sendable {
case plainText(String)
case diff(String)
}
-struct InboxThreadDetail: Sendable {
+nonisolated struct InboxThreadDetail: Sendable {
let id: String
let rootEmailID: Int
let rootMessageID: String
@@ -114,7 +114,7 @@ struct InboxThreadDetail: Sendable {
}
}
-extension InboxThreadDetail {
+nonisolated extension InboxThreadDetail {
var replyRecipient: String {
"\(listOwner.canonicalName)/\(listName)@lists.sr.ht"
}
@@ -144,7 +144,7 @@ extension InboxThreadDetail {
}
}
-struct MailComposeDraft: Sendable {
+nonisolated struct MailComposeDraft: Sendable {
let recipients: [String]
let ccRecipients: [String]
let subject: String
@@ -155,20 +155,20 @@ struct MailComposeDraft: Sendable {
}
}
-extension MailComposeDraft: Identifiable {}
+nonisolated extension MailComposeDraft: Identifiable {}
-struct InboxMailingListReference: Decodable, Sendable, Hashable, Identifiable {
+nonisolated struct InboxMailingListReference: Decodable, Sendable, Hashable, Identifiable {
let id: Int
let rid: String
let name: String
let owner: Entity
}
-struct InboxPatchPreview: Decodable, Sendable, Hashable {
+nonisolated struct InboxPatchPreview: Decodable, Sendable, Hashable {
let subject: String?
}
-enum InboxReadStateStore {
+nonisolated enum InboxReadStateStore {
private static let key = "InboxThreadLastViewed"
private static let baselineKey = "InboxUnreadBaseline"