You are a constitutional council ranking individual git commits for ownership allocation. Compare these two commits. Decide which contributed more lasting value to the project. Judge substance, not spectacle: - Prefer correct, lasting design and real bugfixes over churn, formatting, renames, or generated noise. - Prefer clarity and necessity over sheer line count. A small precise change can beat a large diffuse one. - Do not favor a side merely because its patch is longer or noisier. - Weight what the change does for the project, not the contributor's name. Return ONLY a JSON object: {"winner": "A" or "B", "ratio": "N:M", "explanation": "..."} The explanation must cite concrete differences in the patches (1-3 sentences). Side A — contributor: tommy-mor Side A — commit message: [36e92cf2] Fix /vote/compare page: attribution, fallback, swap button, and route rename. - Pass WEB_BROWSER_AGENT as delegate_opt out-of-band (not in DSL body text) - Error instead of falling back to all items when sibling pool < 2 - Remove pointless "swap sides" button - Rename route /vote/compare → /vote Co-Authored-By: Claude Sonnet 4.6 Side A — unified diff (full patch): diff --git a/server/src/api/rpc.rs b/server/src/api/rpc.rs index 0b7070a2b7289e5c40778c8d062bd4150285a8df..8e3d8e34922ddaaa89ea699edd99402bd40fdb1b 100644 --- a/server/src/api/rpc.rs +++ b/server/src/api/rpc.rs @@ -281,6 +281,7 @@ pub async fn rpc_post_with_bearer( bearer_token: &str, room: String, thread_tag: String, + delegate_opt: Option, text: String, ) -> Result { use axum::http::{header, HeaderMap, HeaderValue}; @@ -288,7 +289,7 @@ pub async fn rpc_post_with_bearer( let hv = HeaderValue::from_str(&format!("Bearer {bearer_token}")) .map_err(|_| ("invalid session token".into(), None))?; headers.insert(header::AUTHORIZATION, hv); - rpc_post(state, &headers, room, thread_tag, None, text, false).await + rpc_post(state, &headers, room, thread_tag, delegate_opt, text, false).await } async fn rpc_check( diff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs index a13a94767d8905adc09e31effff838e166781b6c..5faa642451d69555cb391974beb0ad22c9355c8c 100644 --- a/server/src/api/ui_html.rs +++ b/server/src/api/ui_html.rs @@ -118,6 +118,7 @@ async fn dispatch_ui_action( &session.bearer, room.clone(), thread_tag.clone(), + None, text, ) .await @@ -246,8 +247,7 @@ async fn dispatch_ui_action( } let text = format!( - "@{}\n{{\n{}\n}}\n{} {}:{} {}\n", - crate::api::auth::WEB_BROWSER_AGENT, + "{{\n{}\n}}\n{} {}:{} {}\n", exp, left_id.as_str(), rl, @@ -260,6 +260,7 @@ async fn dispatch_ui_action( &session.bearer, room.clone(), thread_tag.clone(), + Some(crate::api::auth::WEB_BROWSER_AGENT.to_string()), text, ) .await diff --git a/server/src/html/forum/nav.rs b/server/src/html/forum/nav.rs index d33dc50f0b89a5ed7730c3bca204a67f6309388f..ae67f550a4bdf0bbeff58384c29a715015b64bd5 100644 --- a/server/src/html/forum/nav.rs +++ b/server/src/html/forum/nav.rs @@ -85,7 +85,7 @@ impl ThreadNav { format!("{}/{}/{}", self.thread_path_prefix, tag, idx) } - /// Empty for public; `/r/:seg` for room — prefix for routes like `/vote/compare`. + /// Empty for public; `/r/:seg` for room — prefix for routes like `/vote`. pub(crate) fn room_path_prefix_for_vote_compare(&self) -> String { match &self.scope { ScopeId::Public => String::new(), diff --git a/server/src/html/garden/vote.rs b/server/src/html/garden/vote.rs index bdb4008c29ba49d7dc97b1cd2c32d9cdfce1ca04..1d7fc8aa7436bfa9c1186dfd940a8d751ab7e088 100644 --- a/server/src/html/garden/vote.rs +++ b/server/src/html/garden/vote.rs @@ -208,7 +208,7 @@ pub(crate) async fn vote_compare_post_success_js( state: &AppState, nav: &ThreadNav, _room_wire: &str, - thread_tag: &str, + _thread_tag: &str, left: &ItemId, right: &ItemId, _post_id: &str, @@ -218,8 +218,7 @@ pub(crate) async fn vote_compare_post_success_js( let content = content_for_garden_view(&reduced, &nav.scope()); let edge_history = vote_edge_history_markup(content, left, right); let next_pair = suggest_next_vote_pair(content, left, right); - let nav_markup = - vote_compare_nav_markup(nav, next_pair.as_ref(), left, right, Some(thread_tag)); + let nav_markup = vote_compare_nav_markup(nav, next_pair.as_ref()); drop(reduced); JsBuilder::new() .morph_inner_selector("#vote-edge-history-region", edge_history) @@ -236,7 +235,7 @@ pub(super) fn vote_compare_href( let left_q = urlencoding::encode(left.as_str()); let right_q = urlencoding::encode(right.as_str()); let base = format!( - "{}/vote/compare?left={}&right={}", + "{}/vote?left={}&right={}", nav.room_path_prefix_for_vote_compare(), left_q, right_q @@ -251,12 +250,8 @@ pub(super) fn vote_compare_href( fn vote_compare_nav_markup( nav: &ThreadNav, next_pair: Option<&(ItemId, ItemId)>, - left: &ItemId, - right: &ItemId, - thread_override: Option<&str>, ) -> maud::Markup { let next_pair_href = next_pair.map(|(nl, nr)| vote_compare_href(nav, nl, nr, None)); - let swap_pair_href = vote_compare_href(nav, right, left, thread_override); html! { div class="vote-compare-nav" { @if let Some(href) = &next_pair_href { @@ -264,7 +259,6 @@ fn vote_compare_nav_markup( } @else { span class="vote-compare-next is-disabled" { "no next pair" } } - a class="vote-compare-next" href=(swap_pair_href) { "swap sides" } } } } @@ -274,7 +268,7 @@ pub(super) fn suggest_next_vote_pair( current_left: &ItemId, current_right: &ItemId, ) -> Option<(ItemId, ItemId)> { - let mut pool: Vec = if current_left.parent().as_ref().map(|p| p.as_str()) + let pool: Vec = if current_left.parent().as_ref().map(|p| p.as_str()) == current_right.parent().as_ref().map(|p| p.as_str()) { current_left @@ -291,7 +285,7 @@ pub(super) fn suggest_next_vote_pair( Vec::new() }; if pool.len() < 2 { - pool = content.items.iter().cloned().collect(); + return None; } suggest_next_pair_in_pool( &content.ranking_group, @@ -334,7 +328,7 @@ pub struct VoteCompareQuery { pub thread: Option, } -/// Public pairwise vote UI — `/vote/compare?left=&right=&thread=`. +/// Public pairwise vote UI — `/vote?left=&right=&thread=`. pub async fn vote_compare_page( State(state): State, Query(q): Query, @@ -426,7 +420,7 @@ async fn vote_compare_inner( let next_path = uri .path_and_query() .map(|pq| pq.as_str().to_string()) - .unwrap_or_else(|| "/vote/compare".into()); + .unwrap_or_else(|| "/vote".into()); let rpc_json = template_json_compact(&json!({ "action": "vote_compare_post", @@ -462,7 +456,7 @@ async fn vote_compare_inner( Some(&item_bodies_for_cards), )) } - (vote_compare_nav_markup(&nav, next_pair.as_ref(), &left, &right, q.thread.as_deref())) + (vote_compare_nav_markup(&nav, next_pair.as_ref())) div id="vote-edge-history-region" { (edge_history) } diff --git a/server/src/html/ui_action.rs b/server/src/html/ui_action.rs index c7b643c8dde37dd1e3001f5ff716fe4f79d24c5e..dd5294202569454acf9f41b458718700bbf96f39 100644 --- a/server/src/html/ui_action.rs +++ b/server/src/html/ui_action.rs @@ -38,7 +38,7 @@ pub enum HtmlUiAction { #[serde(default)] form_id: Option, }, - /// Post a pairwise vote from `/vote/compare` (browser compose). + /// Post a pairwise vote from `/vote` (browser compose). VoteComparePost { room: String, thread_tag: String, diff --git a/server/src/lib.rs b/server/src/lib.rs index ad8e31099c807fb5844acb16cd5086a2f19327a7..e102e73ec167fa35dcc22d4ec8c6f40202982429 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -82,9 +82,9 @@ pub fn create_app(state: AppState) -> Router { .route("/u/:username", get(crate::html::user_profile_page)) .route("/try", get(crate::html::editor_page)) .route("/try/check", post(crate::html::editor_check)) - .route("/vote/compare", get(crate::html::vote_compare_page)) + .route("/vote", get(crate::html::vote_compare_page)) .route( - "/r/:room_key/vote/compare", + "/r/:room_key/vote", get(crate::html::room_vote_compare_page), ) .route("/~", get(crate::html::garden_index)) diff --git a/server/tests/integration_html.rs b/server/tests/integration_html.rs index a25a456c7cafd74a69e65e0c2e8ed2bfb2e27498..b3e31376737b2d5aabb739f408984a1f5ae0c974 100644 --- a/server/tests/integration_html.rs +++ b/server/tests/integration_html.rs @@ -52,12 +52,12 @@ async fn test_view_counts_increment_and_display() { .normalized_storage() .to_storage_string(); let vote_q_right_first = format!( - "/vote/compare?right={}&left={}", + "/vote?right={}&left={}", urlencoding::encode(&right), urlencoding::encode(&left) ); let vote_q_left_first = format!( - "/vote/compare?left={}&right={}", + "/vote?left={}&right={}", urlencoding::encode(&left), urlencoding::encode(&right) ); @@ -148,7 +148,7 @@ https://github.com/ghvotehi/a/issues/10 {\n\ .normalized_storage() .to_storage_string(); let q = format!( - "/vote/compare?left={}&right={}", + "/vote?left={}&right={}", urlencoding::encode(&left), urlencoding::encode(&right) ); diff --git a/server/tests/integration_ui.rs b/server/tests/integration_ui.rs index 091afd922d28f48ab36aa9b9084aa825036d1f74..23db7b5672418d5bb0ab7529e05ef1f89e59062a 100644 --- a/server/tests/integration_ui.rs +++ b/server/tests/integration_ui.rs @@ -110,7 +110,7 @@ async fn test_choose_username_carries_redirect_next() { .expect("pending session must exist"); pending.provider = Some("google".to_string()); pending.provider_id = Some("google-user-redirect".to_string()); - pending.redirect_next = Some("/vote/compare?left=%7E%2Fa&right=%7E%2Fb".to_string()); + pending.redirect_next = Some("/vote?left=%7E%2Fa&right=%7E%2Fb".to_string()); } let choose = client @@ -122,7 +122,7 @@ async fn test_choose_username_carries_redirect_next() { assert_eq!(choose.status(), reqwest::StatusCode::OK); let body = choose.text().await.unwrap(); - assert!(body.contains("window.location = \"/vote/compare?left=%7E%2Fa&right=%7E%2Fb\"")); + assert!(body.contains("window.location = \"/vote?left=%7E%2Fa&right=%7E%2Fb\"")); } #[tokio::test] diff --git a/test/browser_vote_compare.clj b/test/browser_vote_compare.clj index 7cd1e467fdd8a4480df1be2afd78adb45b9cdc6d..a98e144756421e1fa5064db6a9fc0dd8b08471c7 100644 --- a/test/browser_vote_compare.clj +++ b/test/browser_vote_compare.clj @@ -66,7 +66,7 @@ :headers {"Authorization" (str "Bearer " alice-token)}) post-json (json/parse-string (:body post-resp) false) _ (is (true? (get-in post-json ["results" 0 "ok"])) "seed items + edge vote via rpc") - cmp-url (str base-url "/vote/compare?left=" (enc left-url) "&right=" (enc third-url))] + cmp-url (str base-url "/vote?left=" (enc left-url) "&right=" (enc third-url))] (core/with-playwright [pw] (core/with-browser [browser (core/launch-chromium pw {:headless true :channel "chrome"})] (core/with-context [ctx (core/new-context browser)] Side B — contributor: tommy-mor Side B — commit message: [02cd761c] Make ranked child group pin icons clickable to unpin. Lets users clear the garden pin from the ranked child groups list via the same POST /ui set_garden_pin flow as the HUD and item header. Co-authored-by: Cursor Side B — unified diff (full patch): diff --git a/server/src/html/garden/pin.rs b/server/src/html/garden/pin.rs index 1820d7fe7ee167ecbf5ad5124f23b2ab92ffb01f..b7ea92bbe67d6d499915edb607a3a0b36178d7f6 100644 --- a/server/src/html/garden/pin.rs +++ b/server/src/html/garden/pin.rs @@ -101,6 +101,7 @@ pub(super) fn child_row_pin_or_vote( row_item: &ItemId, pinned_room_and_item: Option<&(String, ItemId)>, scope_content: &ContentState, + next_path: &str, ) -> maud::Markup { let pin_matches_scope = pinned_room_and_item .map(|(r, _)| r == nav.room_wire.as_str()) @@ -108,12 +109,25 @@ pub(super) fn child_row_pin_or_vote( let pinned_item = pinned_room_and_item .filter(|_| pin_matches_scope) .map(|(_, i)| i); + let unpin_rpc = template_json_compact(&json!({ + "action": "set_garden_pin", + "clear": true, + "room_wire": "", + "next": next_path, + "form_action": "/ui", + })) + .expect("unpin rpc json"); html! { @if let Some(pi) = pinned_item { span class="ont-garden-child-actions" data-garden-room=(nav.room_wire.as_str()) { @if pi == row_item { - span class="ont-garden-pinned-here" title="Pinned" aria-label="Pinned" { "📌" } + form method="POST" action="/ui" data-navigate="full" class="ont-garden-pin-form" { + input type="hidden" name=(UI_RPC_FIELD) value=(unpin_rpc); + button type="submit" class="ont-garden-pin-ico ont-garden-pin-ico-active" title="Unpin" aria-label="Unpin from HUD" { + span class="ont-garden-pin-glyph" aria-hidden="true" { "📌" } + } + } } @else { @let nv = edge_vote_count_for_pair(scope_content, pi, row_item); @let tip = format!( diff --git a/server/src/html/garden/render.rs b/server/src/html/garden/render.rs index bd8cbce059ee789de6e8dc9b6f69f54beee2f994..7bfaadc0786b734db8973c53b82296a188d26e22 100644 --- a/server/src/html/garden/render.rs +++ b/server/src/html/garden/render.rs @@ -216,7 +216,7 @@ pub(super) async fn render_scope_view( @let item_url = item_href(r.item.as_str(), &nav); @let score_str = format!("{:.3}", r.score); li data-garden-item=(r.item.as_str()) { - (child_row_pin_or_vote(&nav, &r.item, pin_ref.as_ref(), scope_content)) + (child_row_pin_or_vote(&nav, &r.item, pin_ref.as_ref(), scope_content, &next_for_pin)) a class="item-link" href=(item_url) { code { (item_display_path(r.item.as_str())) } } span class="ont-rank-score" { (score_str) } } @@ -232,7 +232,7 @@ pub(super) async fn render_scope_view( ul class="ont-group-list" { @for name in &model.child_rankings.unranked_items { li data-garden-item=(name.as_str()) { - (child_row_pin_or_vote(&nav, name, pin_ref.as_ref(), scope_content)) + (child_row_pin_or_vote(&nav, name, pin_ref.as_ref(), scope_content, &next_for_pin)) @let href = item_href(name.as_str(), &nav); a class="item-link" href=(href) { code { (item_display_path(name.as_str())) } } } diff --git a/server/static/theme_default.css b/server/static/theme_default.css index 2dabf3a7094cecd89d0c9674d27efe30cd01c010..b846ab86cb6eb5fb56be87efb054fb8b18082583 100644 --- a/server/static/theme_default.css +++ b/server/static/theme_default.css @@ -891,8 +891,7 @@ button.ont-pin-btn-active { vertical-align: middle; } button.ont-garden-pin-ico, -a.ont-garden-vote-ico, -span.ont-garden-pinned-here { +a.ont-garden-vote-ico { font-size: 13px; line-height: 1; padding: 2px 6px; @@ -910,6 +909,11 @@ span.ont-garden-pinned-here { align-items: center; justify-content: center; } +form.ont-garden-pin-form { + display: inline; + margin: 0; + padding: 0; +} a.ont-garden-vote-ico { gap: 4px; } @@ -925,10 +929,14 @@ a.ont-garden-vote-ico:hover { span.ont-garden-vote-glyph { line-height: 1; } -span.ont-garden-pinned-here { +button.ont-garden-pin-ico-active { border-color: var(--link); color: var(--signal); - cursor: default; + background: color-mix(in srgb, var(--link) 12%, var(--g3)); +} +button.ont-garden-pin-ico-active:hover { + color: var(--signal); + background: color-mix(in srgb, var(--link) 18%, var(--g4)); } button.ont-garden-pin-ico:focus-visible { outline: 2px solid var(--link); diff --git a/server/static/theme_retro_craft.css b/server/static/theme_retro_craft.css index bdd9031b82154a5019782e6dcb8bf7589fafce09..5d4954812ad43f2ee7e63c71c7f0ae0b3e3fc95b 100644 --- a/server/static/theme_retro_craft.css +++ b/server/static/theme_retro_craft.css @@ -711,8 +711,7 @@ body.view-ontology span.ont-garden-vote-glyph { line-height: 1; } body.view-ontology button.ont-garden-pin-ico, -body.view-ontology a.ont-garden-vote-ico, -body.view-ontology span.ont-garden-pinned-here { +body.view-ontology a.ont-garden-vote-ico { font-size: 0.95rem; line-height: 1; padding: 0.1rem 0.35rem; @@ -732,10 +731,14 @@ body.view-ontology a.ont-garden-vote-ico:hover { border-color: #a68e6b; background: #ebe6dc; } -body.view-ontology span.ont-garden-pinned-here { +body.view-ontology button.ont-garden-pin-ico-active { border-color: #1a4a8c; background: color-mix(in srgb, #1a4a8c 10%, #f7f3eb); - cursor: default; + color: #0d2d5c; +} +body.view-ontology button.ont-garden-pin-ico-active:hover { + border-color: #a68e6b; + background: color-mix(in srgb, #1a4a8c 14%, #ebe6dc); } body.view-ontology form.ont-garden-pin-form { display: inline; diff --git a/test/browser_garden_pin.clj b/test/browser_garden_pin.clj index d4fa9ed60b45e872ec60e29307cfa61bcd9dd6b2..579976f4c2493a149f9eba081862ca07919f4fe9 100644 --- a/test/browser_garden_pin.clj +++ b/test/browser_garden_pin.clj @@ -58,10 +58,11 @@ (let [alice-token (oauth/fetch-bearer-token! base-url :username "alice") thread-tag "browser-garden-pin" raw (str "# " thread-tag "\n\n" - "~/gp-pin-a {alpha}\n" - "~/gp-pin-b {beta}\n" + "~/gp-parent {parent}\n" + "~/gp-parent/pin-a {alpha}\n" + "~/gp-parent/pin-b {beta}\n" "{pin test vote}\n" - "~/gp-pin-a 2:1 ~/gp-pin-b\n") + "~/gp-parent/pin-a 2:1 ~/gp-parent/pin-b\n") post-resp (oauth/http-post-json (str base-url "/api/v0/rpc") [{"Post" {"room" "public" @@ -77,23 +78,43 @@ (core/with-page [pg (core/new-page-from-context ctx)] (page/navigate pg (str base-url "/login")) (is (wait-for-text pg "body" "@alice" 15000) "alice session after login") - (page/navigate pg (str base-url "/~/gp-pin-a")) - (is (wait-for-text pg ".ont-item-shell" "~/gp-pin-a" 15000) "on item a page") + (page/navigate pg (str base-url "/~/gp-parent/pin-a")) + (is (wait-for-text pg ".ont-item-shell" "~/gp-parent/pin-a" 15000) "on item a page") ;; Native form POST /ui (data-navigate=full) — not fetch/eval (locator/click (page/locator pg ".ont-item-pin-zone form.ont-pin-form button[type=submit]")) - (is (wait-for-text pg "#slug-pin-hud" "gp-pin-a" 15000) + (is (wait-for-text pg "#slug-pin-hud" "gp-parent/pin-a" 15000) "HUD shows pinned item label after redirect") - (page/navigate pg (str base-url "/~/gp-pin-b")) - (is (wait-for-text pg ".ont-item-shell" "~/gp-pin-b" 15000) "on item b page") + (page/navigate pg (str base-url "/~/gp-parent/pin-b")) + (is (wait-for-text pg ".ont-item-shell" "~/gp-parent/pin-b" 15000) "on item b page") (is (wait-for-text pg "a.ont-vote-compare-btn" "vote" 10000) "vote link visible vs pinned item") - ;; HUD clears pin (POST set_garden_pin clear), not navigate to item + ;; Unpin from ranked child groups on parent page + (page/navigate pg (str base-url "/~/gp-parent")) + (is (wait-for-text pg ".ont-tab-panel-children" "ranked child groups" 15000) + "parent page shows ranked child groups") + (is (wait-for-text pg ".ont-ranking-list button.ont-garden-pin-ico-active" "📌" 10000) + "pinned row shows active pin in ranked list") + (locator/click (page/locator pg ".ont-ranking-list button.ont-garden-pin-ico-active")) + (is (wait-for-absence-substr pg "#slug-pin-hud" "gp-parent/pin-a" 15000) + "HUD clears after unpin from ranked child list") + (is (wait-for-absence-substr pg ".ont-ranking-list" "ont-garden-vote-ico" 10000) + "vote icons removed from ranked list after unpin") + (page/navigate pg (str base-url "/~/gp-parent/pin-b")) + (is (wait-for-text pg ".ont-item-shell" "~/gp-parent/pin-b" 15000) "on item b page again") + (is (wait-for-absence-substr pg "body" "ont-vote-compare-btn" 15000) + "compare vote CTA removed after ranked-list unpin") + ;; HUD unpin still works from item page context + (page/navigate pg (str base-url "/~/gp-parent/pin-a")) + (locator/click (page/locator pg ".ont-item-pin-zone form.ont-pin-form button[type=submit]")) + (is (wait-for-text pg "#slug-pin-hud" "gp-parent/pin-a" 15000) + "re-pin from item page for HUD unpin test") + (page/navigate pg (str base-url "/~/gp-parent/pin-b")) (locator/click (page/locator pg "#slug-pin-hud button.slug-pin-hud-unpin-btn")) - (is (wait-for-absence-substr pg "#slug-pin-hud" "gp-pin-a" 15000) + (is (wait-for-absence-substr pg "#slug-pin-hud" "gp-parent/pin-a" 15000) "HUD clears after unpin from HUD button") (is (wait-for-absence-substr pg "body" "ont-vote-compare-btn" 15000) "compare vote CTA removed after HUD unpin on same reload") - (is (str/includes? (or (page/url pg) "") "/~/gp-pin-b") + (is (str/includes? (or (page/url pg) "") "/~/gp-parent/pin-b") "still on item b after HUD unpin")))))) (finally