Commit `170a37d06b`

170a37d06b3ceac4d3f3b8b940956d9c49228c05

parent: 282c068350

Unsigned

cmc <hello@cleberg.net> · 2026-09-12 06:00 UTC

Watch preference on the account screen (!95)

`notifications settings show` reports `watch` beside `mail` since v1.19.0 (krz/gitbay#194); `notifications settings watch on|off` flips it. A second `SettingToggle` in the Notifications section, shown only when the server answers with the field, so a v1.16–v1.18 instance still shows mail alone. The live account flow flips it and restores it.

Unit suite green on iPhone 17 Pro. The live smoke step is written but not run (needs a fresh ui-smoke token).

Closes #13

Layout: unified · split

gitbay/Account/AccountViewModel.swift +22 −6

     /// Whether activity mail is on (v1.16.0); nil until read, or on a
     /// server without the setting. Inbox rows are filed either way.
     private(set) var mailOn: Bool?
+    /// Whether the account watches every issue and merge request on the
+    /// repositories it can write to (v1.19.0); nil until read, or on a
+    /// server whose `show` has no `watch`.
+    private(set) var watchOn: Bool?
     /// The account's addresses; nil until read, or on a server without
     /// `email list`.
     private(set) var emails: [EmailAddress]?
     // MARK: - Notifications
-    nonisolated private struct MailSetting: Decodable, Sendable {
+    nonisolated private struct NotificationSettings: Decodable, Sendable {
         let mail: Bool
+        let watch: Bool?
     }
-    func loadMailPreference() async {
+    func loadNotificationPreferences() async {
-        mailOn = (try? await client.read(
+        let settings = try? await client.read(
-            ["notifications", "settings", "show"], as: MailSetting.self))?.mail
+            ["notifications", "settings", "show"], as: NotificationSettings.self)
+        mailOn = settings?.mail
+        watchOn = settings?.watch
     }
     /// `notifications settings mail on|off`, then read the value back.
     func setMail(_ on: Bool) async {
+        await setPreference("mail", on)
+    }
+    /// `notifications settings watch on|off`, then read the value back.
+    func setWatch(_ on: Bool) async {
+        await setPreference("watch", on)
+    }
+    private func setPreference(_ name: String, _ on: Bool) async {
         working = true
         actionError = nil
         defer { working = false }
         do {
-            try await client.run(["notifications", "settings", "mail", on ? "on" : "off"])
+            try await client.run(["notifications", "settings", name, on ? "on" : "off"])
-            await loadMailPreference()
+            await loadNotificationPreferences()
         } catch let error as GitbayError {
             actionError = error.userFacingMessage
         } catch {

gitbay/Views/Account/AccountView.swift +12 −5

         .navigationTitle("Account")
         .navigationBarTitleDisplayMode(.inline)
         .task { await model.load() }
-        .task { await model.loadMailPreference() }
+        .task { await model.loadNotificationPreferences() }
         .task { await model.loadEmails() }
         .confirmationDialog(
             "Remove \(removingEmail?.address ?? "")?",
         }
         .refreshable {
             await model.load()
-            await model.loadMailPreference()
+            await model.loadNotificationPreferences()
             await model.loadEmails()
         }
         .sheet(isPresented: $addingSSH) {
     // MARK: - Sections
-    /// `notifications settings mail`: the mail half of notifications. The
+    /// `notifications settings mail` and `watch`. The inbox is filed
-    /// inbox is filed either way, and login links still arrive.
+    /// either way, and login links still arrive. Watch lands with
+    /// v1.19.0; an older server shows mail alone.
     @ViewBuilder
     private var notificationsSection: some View {
         if let mailOn = model.mailOn {
                     await model.setMail($0)
                 }
                 .disabled(model.working)
+                if let watchOn = model.watchOn {
+                    SettingToggle(title: "Watch writable repositories", serverValue: watchOn) {
+                        await model.setWatch($0)
+                    }
+                    .disabled(model.working)
+                }
             } header: {
                 Text("Notifications")
             } footer: {
-                Text("Off keeps the inbox and stops the mail. Login links are not activity and still arrive.")
+                Text("Mail off keeps the inbox and stops the mail; login links are not activity and still arrive. Watching makes you a recipient of every issue and merge request on repositories you can write to.")
             }
         }
     }

gitbayTests/AccountTests.swift +27 −3

     /// v1.16.0: `notifications settings show` says whether activity mail
     /// is on; `notifications settings mail on|off` flips it. The read is
     /// separate from the keys, and an older server leaves it unknown.
+    /// A server before v1.19.0 answers without `watch`, which stays nil.
     @Test func mailPreferenceLoadsAndFlips() async throws {
         let (model, stub) = try await loadedModel()
         stub.enqueue(.init(status: 200, json: #"{"protocol_version":1,"data":{"mail":true},"exit_code":0}"#, match: "argv=settings&argv=show"))
-        await model.loadMailPreference()
+        await model.loadNotificationPreferences()
         #expect(model.mailOn == true)
+        #expect(model.watchOn == nil)
         stub.enqueue(.init(status: 200, json: okJSON, match: "cmd"))
         stub.enqueue(.init(status: 200, json: #"{"protocol_version":1,"data":{"mail":false},"exit_code":0}"#, match: "argv=settings&argv=show"))
         #expect(model.mailOn == false)
     }
-    @Test func anOlderServerLeavesTheMailPreferenceUnknown() async throws {
+    /// v1.19.0: `show` also reports `watch`, and `notifications settings
+    /// watch on|off` flips it.
+    @Test func watchPreferenceLoadsAndFlips() async throws {
+        let (model, stub) = try await loadedModel()
+        stub.enqueue(.init(status: 200, json: #"{"protocol_version":1,"data":{"mail":true,"watch":false},"exit_code":0}"#, match: "argv=settings&argv=show"))
+        await model.loadNotificationPreferences()
+        #expect(model.mailOn == true)
+        #expect(model.watchOn == false)
+        stub.enqueue(.init(status: 200, json: okJSON, match: "cmd"))
+        stub.enqueue(.init(status: 200, json: #"{"protocol_version":1,"data":{"mail":true,"watch":true},"exit_code":0}"#, match: "argv=settings&argv=show"))
+        await model.setWatch(true)
+        let write = try #require(stub.seen.first { $0.method == "POST" })
+        let (argv, _) = try argvOf(write)
+        #expect(argv == ["notifications", "settings", "watch", "on"])
+        #expect(model.watchOn == true)
+    }
+    @Test func anOlderServerLeavesTheNotificationPreferencesUnknown() async throws {
         let (model, stub) = try await loadedModel()
         stub.enqueue(.init(status: 400, json: #"{"protocol_version":1,"error":"no command matches","exit_code":2}"#, match: "argv=settings&argv=show"))
-        await model.loadMailPreference()
+        await model.loadNotificationPreferences()
         #expect(model.mailOn == nil)
+        #expect(model.watchOn == nil)
         #expect(model.actionError == nil)
     }

gitbayUITests/LiveSmokeUITests.swift +17

	@@ -860,6 +860,23 @@ extension LiveSmokeUITests {
860	flipMail()	860	flipMail()
861	XCTAssertTrue(waitForValue(mail, mailWasOn ? "1" : "0", timeout: 10), "mail toggle did not restore")	861	XCTAssertTrue(waitForValue(mail, mailWasOn ? "1" : "0", timeout: 10), "mail toggle did not restore")
862		862
		863	// The watch preference (v1.19.0) flips the same way.
		864	let watch = app.switches["Watch writable repositories"].firstMatch
		865	XCTAssertTrue(scrollTo(watch), "watch toggle not reachable")
		866	let innerWatch = watch.switches.firstMatch
		867	let flipWatch: () -> Void = {
		868	if innerWatch.exists && innerWatch != watch {
		869	innerWatch.tap()
		870	} else {
		871	watch.coordinate(withNormalizedOffset: CGVector(dx: 0.93, dy: 0.5)).tap()
		872	}
		873	}
		874	let watchWasOn = (watch.value as? String) == "1"
		875	flipWatch()
		876	XCTAssertTrue(waitForValue(watch, watchWasOn ? "0" : "1", timeout: 10), "watch toggle did not persist")
		877	flipWatch()
		878	XCTAssertTrue(waitForValue(watch, watchWasOn ? "1" : "0", timeout: 10), "watch toggle did not restore")
		879
863	// A bogus verification code is refused, not swallowed.	880	// A bogus verification code is refused, not swallowed.
864	let code = app.descendants(matching: .any)	881	let code = app.descendants(matching: .any)
865	.matching(identifier: "email-code").firstMatch	882	.matching(identifier: "email-code").firstMatch

Commit 170a37d06b

Commit `170a37d06b`