Commit `4ce872b9f4`

4ce872b9f4e7fb92680c6c0f71eaec0d8f75e82d

parent: 664ba82d6a

Verified · cmc

cmc <hello@cleberg.net> · 2026-10-14 05:15 UTC

Reactions: none on system lines; spoken names

A line the server posted takes no reaction, so it offers none: kind
marks it (krz/gitbay#332), and an older server's system author does.
VoiceOver reads thumbs up rather than plus one, and the menu marks the
account's own reaction as selected.

Ref #22

Layout: unified · split

gitbay/Issues/IssueModels.swift +8 −1

         let bodyFormat: String?
         let createdAt: Date
         let reactions: [ReactionCount]?
+        /// "system" for a line the server posted (a retarget, a queued
+        /// merge), which takes no reactions (krz/gitbay#332).
+        let kind: String?
         enum CodingKeys: String, CodingKey {
-            case author, body, reactions
+            case author, body, reactions, kind
             case commentID = "id"
             case bodyFormat = "body_format"
             case createdAt = "created_at"
         }
+        /// A server without `kind` names the author "system" on those lines;
+        /// an account can carry that name too, so `kind` wins when present.
+        var isSystem: Bool { kind.map { $0 == "system" } ?? (author == "system") }
         var id: String { author + createdAt.timeIntervalSince1970.description + body }
     }
 }

gitbay/Issues/Reaction.swift +11 −4

     var id: String { name }
+    /// What VoiceOver says; "+1" would be read as "plus one".
+    let spoken: String
     static let all: [Reaction] = [
-        .init(name: "+1", emoji: "👍"), .init(name: "-1", emoji: "👎"),
+        .init(name: "+1", emoji: "👍", spoken: "thumbs up"), .init(name: "-1", emoji: "👎", spoken: "thumbs down"),
-        .init(name: "laugh", emoji: "😄"), .init(name: "hooray", emoji: "🎉"),
+        .init(name: "laugh", emoji: "😄", spoken: "laugh"), .init(name: "hooray", emoji: "🎉", spoken: "hooray"),
-        .init(name: "confused", emoji: "😕"), .init(name: "heart", emoji: "❤️"),
+        .init(name: "confused", emoji: "😕", spoken: "confused"), .init(name: "heart", emoji: "❤️", spoken: "heart"),
-        .init(name: "rocket", emoji: "🚀"), .init(name: "eyes", emoji: "👀"),
+        .init(name: "rocket", emoji: "🚀", spoken: "rocket"), .init(name: "eyes", emoji: "👀", spoken: "eyes"),
     ]
     /// A name a newer server added draws as its name rather than vanishing.
         all.first { $0.name == name }?.emoji ?? name
     }
+    static func spoken(for name: String) -> String {
+        all.first { $0.name == name }?.spoken ?? name
+    }
     /// Picking a reaction the account already gave takes it back, the way
     /// the web's toggle does.
     static func remove(_ name: String, given: [ReactionCount]?) -> Bool {

gitbay/MRs/MRModels.swift +8 −1

         let bodyFormat: String?
         let createdAt: Date
         let reactions: [ReactionCount]?
+        /// "system" for a line the server posted (a retarget, a queued
+        /// merge), which takes no reactions (krz/gitbay#332).
+        let kind: String?
         enum CodingKeys: String, CodingKey {
-            case author, body, reactions
+            case author, body, reactions, kind
             case commentID = "id"
             case bodyFormat = "body_format"
             case createdAt = "created_at"
         }
+        /// A server without `kind` names the author "system" on those lines;
+        /// an account can carry that name too, so `kind` wins when present.
+        var isSystem: Bool { kind.map { $0 == "system" } ?? (author == "system") }
         var id: String { author + createdAt.timeIntervalSince1970.description + body }
     }

gitbay/Views/Issues/IssueView.swift +1 −1

	@@ -173,7 +173,7 @@ struct IssueView: View {
173	}	173	}
174	FormattedBodyView(text: comment.body, format: comment.bodyFormat, repo: model.repoPath)	174	FormattedBodyView(text: comment.body, format: comment.bodyFormat, repo: model.repoPath)
175	.font(.gbSans(.subheadline))	175	.font(.gbSans(.subheadline))
176	if let id = comment.commentID {	176	if let id = comment.commentID, !comment.isSystem {
177	ReactionBar(reactions: comment.reactions ?? [], disabled: model.working,	177	ReactionBar(reactions: comment.reactions ?? [], disabled: model.working,
178	idPrefix: "issue-comment-\(id)-reaction") { name in	178	idPrefix: "issue-comment-\(id)-reaction") { name in
179	Task { await model.react(name, comment: id) }	179	Task { await model.react(name, comment: id) }

gitbay/Views/MRs/MRView.swift +1 −1

	@@ -539,7 +539,7 @@ struct MRView: View {
539	}	539	}
540	FormattedBodyView(text: comment.body, format: comment.bodyFormat, repo: model.repoPath)	540	FormattedBodyView(text: comment.body, format: comment.bodyFormat, repo: model.repoPath)
541	.font(.gbSans(.subheadline))	541	.font(.gbSans(.subheadline))
542	if let id = comment.commentID {	542	if let id = comment.commentID, !comment.isSystem {
543	ReactionBar(reactions: comment.reactions ?? [], disabled: model.working,	543	ReactionBar(reactions: comment.reactions ?? [], disabled: model.working,
544	idPrefix: "mr-comment-\(id)-reaction") { name in	544	idPrefix: "mr-comment-\(id)-reaction") { name in
545	Task { await model.react(name, comment: id) }	545	Task { await model.react(name, comment: id) }

gitbay/Views/Shared/ReactionBar.swift +3 −1

                             Text("\(reaction.emoji)  \(reaction.name)")
                         }
                     }
+                    .accessibilityLabel(Reaction.spoken(for: reaction.name))
+                    .accessibilityAddTraits(Reaction.remove(reaction.name, given: reactions) ? .isSelected : [])
                 }
             } label: {
                 Image(systemName: "face.smiling")
     private func label(for given: ReactionCount) -> String {
         let count = given.count == 1 ? "1 reaction" : "\(given.count) reactions"
-        return "\(given.reaction), \(count)\(given.me ? ", including yours" : "")"
+        return "\(Reaction.spoken(for: given.reaction)), \(count)\(given.me ? ", including yours" : "")"
     }
 }

gitbayTests/ReactionTests.swift +8 −1

     {"protocol_version":1,"data":{"number":3,"title":"t","state":"open","author":"krz",\
     "source":"feat","target_ref":"main","head_sha":"abc","created_at":"2026-08-20T10:00:00.000Z",\
     "reactions":[{"reaction":"rocket","count":1,"me":true}],\
-    "comments":[{"id":9,"author":"cmc","body":"lgtm","created_at":"2026-08-22T09:00:00.000Z"}]},\
+    "comments":[{"id":9,"author":"cmc","body":"lgtm","created_at":"2026-08-22T09:00:00.000Z"},\
+    {"id":10,"author":"cmc","body":"queued the merge","kind":"system","created_at":"2026-08-22T09:01:00.000Z"},\
+    {"id":11,"author":"system","body":"retargeted","created_at":"2026-08-22T09:02:00.000Z"}]},\
     "exit_code":0}
     """
         #expect(Reaction.emoji(for: "hooray") == "🎉")
         // An unknown name from a newer server still draws.
         #expect(Reaction.emoji(for: "sparkles") == "sparkles")
+        #expect(Reaction.spoken(for: "+1") == "thumbs up")
     }
     @Test func argvReactsToTheItemOrAComment() {
         #expect(mr.reactions == [ReactionCount(reaction: "rocket", count: 1, me: true)])
         #expect(mr.comments?.first?.commentID == 9)
         #expect(mr.comments?.first?.reactions == nil)
+        #expect(mr.comments?.first?.isSystem == false)
+        #expect(mr.comments?[1].isSystem == true)
+        // An older server sends no kind; its system lines are authored "system".
+        #expect(mr.comments?.last?.isSystem == true)
         await model.react("eyes", comment: 9)

Commit 4ce872b9f4

Commit `4ce872b9f4`