krz/hutch

an ios client for sourcehut client ios sourcehut swift https://krz.sh/apps/hutch/

Commit 134442898a

134442898a1e807cc48d7bc2a8e4f5a535815ef4

parent: 1c32074b4f

Unsigned

cmc <hello@cleberg.net> · 2026-04-20 18:04 UTC 

fix: add mark all read actions and avoid resending unchanged repo metadata

Layout: unified · split

Hutch/Views/Home/HomeViewModel.swift +14
@@ -627,6 +627,20 @@ final class HomeViewModel {
627627 persistNeedsAttentionSnapshot()
628628 }
629629
630 func markAllInboxThreadsRead() {
631 guard !unreadInboxThreads.isEmpty else { return }
632
633 let viewedAt = Date()
634 for thread in unreadInboxThreads {
635 InboxReadStateStore.markViewed(max(viewedAt, thread.lastActivityAt), for: thread.id, defaults: defaults)
636 }
637
638 unreadInboxThreads = []
639 unreadInboxThreadCount = 0
640 hasUnreadInboxThreads = false
641 persistNeedsAttentionSnapshot()
642 }
643
630644 func markInboxThreadUnread(_ thread: InboxThreadSummary) {
631645 InboxReadStateStore.markUnread(for: thread.id, defaults: defaults)
632646 if unreadInboxThreads.contains(where: { $0.id == thread.id }) == false {
Hutch/Views/Projects/ProjectMailingListView.swift +46 −6
@@ -105,6 +105,39 @@ final class MailingListDetailViewModel {
105105 NeedsAttentionSnapshotStore.adjustUnreadInboxThreads(by: 1, accountID: accountID)
106106 }
107107
108 func markAllThreadsRead() {
109 let unreadThreads = threads.filter(\.isUnread)
110 guard !unreadThreads.isEmpty else { return }
111
112 let viewedAt = Date()
113 for thread in unreadThreads {
114 InboxReadStateStore.markViewed(max(viewedAt, thread.lastActivityAt), for: thread.id, defaults: defaults)
115 }
116
117 threads = threads.map { thread in
118 guard thread.isUnread else { return thread }
119 return InboxThreadSummary(
120 rootEmailID: thread.rootEmailID,
121 rootMessageID: thread.rootMessageID,
122 threadRootEmailIDs: thread.threadRootEmailIDs,
123 threadRootMessageIDs: thread.threadRootMessageIDs,
124 listID: thread.listID,
125 listRID: thread.listRID,
126 listName: thread.listName,
127 listOwner: thread.listOwner,
128 subject: thread.subject,
129 latestSender: thread.latestSender,
130 lastActivityAt: thread.lastActivityAt,
131 messageCount: thread.messageCount,
132 repo: thread.repo,
133 containsPatch: thread.containsPatch,
134 isUnread: false
135 )
136 }
137
138 NeedsAttentionSnapshotStore.adjustUnreadInboxThreads(by: -unreadThreads.count, accountID: accountID)
139 }
140
108141 private func makeSummary(from thread: ProjectMailingListThreadPayload) -> InboxThreadSummary {
109142 let normalizedSubject = thread.subject
110143 .replacingOccurrences(of: #"\s+"#, with: " ", options: .regularExpression)
@@ -241,6 +274,10 @@ struct MailingListDetailView: View {
241274 return HomePinStore.isPinned(.mailingList(mailingList), for: currentUserKey, defaults: appState.accountDefaults)
242275 }
243276
277 private var hasUnreadThreads: Bool {
278 viewModel?.threads.contains(where: \.isUnread) == true
279 }
280
244281 var body: some View {
245282 Group {
246283 if let viewModel {
@@ -252,6 +289,12 @@ struct MailingListDetailView: View {
252289 .navigationTitle(mailingList.name)
253290 .navigationBarTitleDisplayMode(.inline)
254291 .toolbar {
292 ToolbarItem(placement: .topBarTrailing) {
293 Button("Mark All Read") {
294 viewModel?.markAllThreadsRead()
295 }
296 .disabled(hasUnreadThreads == false)
297 }
255298 if currentUserKey != nil {
256299 ToolbarItem(placement: .topBarTrailing) {
257300 Button {
@@ -299,16 +342,13 @@ struct MailingListDetailView: View {
299342 ThreadDetailView(
300343 thread: thread,
301344 onViewed: {
302 InboxReadStateStore.markViewed(max(Date(), thread.lastActivityAt), for: thread.id, defaults: appState.accountDefaults)
303 NeedsAttentionSnapshotStore.adjustUnreadInboxThreads(by: -1, accountID: appState.activeAccountID)
345 viewModel.markThreadRead(thread)
304346 },
305347 onMarkRead: {
306 InboxReadStateStore.markViewed(max(Date(), thread.lastActivityAt), for: thread.id, defaults: appState.accountDefaults)
307 NeedsAttentionSnapshotStore.adjustUnreadInboxThreads(by: -1, accountID: appState.activeAccountID)
348 viewModel.markThreadRead(thread)
308349 },
309350 onMarkUnread: {
310 InboxReadStateStore.markUnread(for: thread.id, defaults: appState.accountDefaults)
311 NeedsAttentionSnapshotStore.adjustUnreadInboxThreads(by: 1, accountID: appState.activeAccountID)
351 viewModel.markThreadUnread(thread)
312352 }
313353 )
314354 } label: {
Hutch/Views/Repositories/RepositorySettingsViewModel.swift +15 −4
@@ -166,10 +166,7 @@ final class RepositorySettingsViewModel {
166166 defer { isSavingMetadata = false }
167167 error = nil
168168
169 let input: [String: any Sendable] = [
170 "name": normalizedEditedName,
171 "description": normalizedEditedDescription
172 ]
169 let input = metadataInputForSave()
173170
174171 do {
175172 return try await updateRepository(with: input)
@@ -295,4 +292,18 @@ final class RepositorySettingsViewModel {
295292 RepositorySummary.displayBranchName(for: $0.name) == normalizedEditedHead
296293 }?.name
297294 }
295
296 func metadataInputForSave() -> [String: any Sendable] {
297 var input: [String: any Sendable] = [:]
298
299 if normalizedEditedName != repository.name {
300 input["name"] = normalizedEditedName
301 }
302
303 if normalizedEditedDescription != (repository.description ?? "") {
304 input["description"] = normalizedEditedDescription.isEmpty ? Optional<String>.none as String? : normalizedEditedDescription
305 }
306
307 return input
308 }
298309}
Hutch/Views/Work/WorkView.swift +8
@@ -26,6 +26,14 @@ struct WorkView: View {
2626 }
2727 .navigationTitle("Work")
2828 .navigationBarTitleDisplayMode(.inline)
29 .toolbar {
30 ToolbarItem(placement: .topBarTrailing) {
31 Button("Mark All Read") {
32 viewModel?.markAllInboxThreadsRead()
33 }
34 .disabled(viewModel.map { unreadCount($0) } ?? 0 == 0)
35 }
36 }
2937 .task {
3038 guard let currentUser = appState.currentUser else { return }
3139 await ensureViewModel(currentUser: currentUser).loadDashboard()
HutchTests/RepositorySettingsViewModelTests.swift +33
@@ -115,6 +115,39 @@ struct RepositorySettingsViewModelTests {
115115 #expect(viewModel.isMetadataDirty == false)
116116 }
117117
118 @Test
119 @MainActor
120 func metadataInputOmitsUnchangedNameWhenOnlyDescriptionChanges() {
121 let viewModel = RepositorySettingsViewModel(
122 repository: makeRepository(headName: "refs/heads/main"),
123 branches: [ReferenceDetail(name: "refs/heads/main", target: nil, date: nil)],
124 client: SRHTClient(token: "test-token")
125 )
126 viewModel.editedDescription = "an ios client for sourcehut"
127
128 let input = viewModel.metadataInputForSave()
129
130 #expect(input["name"] == nil)
131 #expect(input["description"] as? String == "an ios client for sourcehut")
132 }
133
134 @Test
135 @MainActor
136 func metadataInputUsesNilToClearDescription() {
137 let viewModel = RepositorySettingsViewModel(
138 repository: makeRepository(headName: "refs/heads/main"),
139 branches: [ReferenceDetail(name: "refs/heads/main", target: nil, date: nil)],
140 client: SRHTClient(token: "test-token")
141 )
142 viewModel.editedDescription = " "
143
144 let input = viewModel.metadataInputForSave()
145
146 #expect(input["name"] == nil)
147 #expect(input.keys.contains("description"))
148 #expect(input["description"] as? String == nil)
149 }
150
118151 @MainActor
119152 private func makeRepository(headName: String?) -> RepositorySummary {
120153 RepositorySummary(