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: [04b81f91] Fix vote compare highlighting Co-authored-by: Cursor Side A — unified diff (full patch): diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs index 588cf62bcea608ed4ede363810f022a67b43b960..e180a0ca542a33e2300c0a4809e6b9cfee07ecfe 100644 --- a/server/src/html/mod.rs +++ b/server/src/html/mod.rs @@ -291,18 +291,17 @@ fn rank_list( label: &str, items: &[RankedItem], start_rank: usize, - total_ranked: usize, - ordinal_offset: usize, highlighted: &HashSet, tree: &GlobalTree, ) -> Markup { + let group_len = items.len(); html! { @if !items.is_empty() { h3 class="rank-heading muted small" { (label) } ol class="rank-list" { @for (i, r) in items.iter().enumerate() { @let href = item_href(&r.item); - @let style = rank_row_style(parent, ordinal_offset + i, total_ranked); + @let style = rank_row_style(parent, i, group_len); @let class = rank_row_class(&r.item, highlighted); li class=(class) data-rank-item=(r.item.as_str()) @@ -420,8 +419,6 @@ pub fn ranking_panel_with_highlights( let has_ranked = !ranked_groups.is_empty(); let multi = ranked_groups.len() > 1; - let total_ranked: usize = ranked_groups.iter().map(|g| g.len()).sum(); - let mut ordinal_offset = 0usize; html! { section id="ranking-panel" class="demo-panel" { @@ -436,8 +433,7 @@ pub fn ranking_panel_with_highlights( } @else { @for (gi, ranked) in ranked_groups.iter().enumerate() { @let label = if multi { format!("Ranking group {}", gi + 1) } else { "Ranking".to_string() }; - (rank_list(item, &label, ranked, 1, total_ranked, ordinal_offset, highlighted, tree)) - @let _ = { ordinal_offset += ranked.len(); }; + (rank_list(item, &label, ranked, 1, highlighted, tree)) } (unranked_list("Unranked", &unranked, highlighted, tree)) } @@ -520,7 +516,20 @@ pub async fn browse(State(state): State, uri: Uri) -> impl IntoRespons #[cfg(test)] mod tests { - use super::SORTER_UI_JS; + use super::{rank_row_style, SORTER_UI_JS}; + use crate::path_types::ItemId; + + #[test] + fn rank_row_style_gradients_per_group_not_globally() { + let parent = ItemId::opaque("test-scope"); + let first_in_four = rank_row_style(&parent, 0, 4); + let last_in_four = rank_row_style(&parent, 3, 4); + let first_in_two = rank_row_style(&parent, 0, 2); + let last_in_two = rank_row_style(&parent, 1, 2); + assert_eq!(first_in_four, first_in_two); + assert_eq!(last_in_four, last_in_two); + assert_ne!(first_in_four, last_in_four); + } #[test] fn vote_slider_left_position_favors_left_item() { diff --git a/server/src/html/vote.rs b/server/src/html/vote.rs index 483c7ff8cd35266744957cf0087f2b5f76f1a237..30dab303b9d1e763a5b9261dffff13a778e3e4e3 100644 --- a/server/src/html/vote.rs +++ b/server/src/html/vote.rs @@ -19,7 +19,7 @@ use crate::{ ui_action::UI_RPC_FIELD, }; -use super::{breadcrumb_path, item_href, layout}; +use super::{breadcrumb_path, layout}; #[derive(Debug, Deserialize)] pub struct VoteQuery { @@ -59,17 +59,6 @@ fn child_title(tree: &GlobalTree, id: &ItemId) -> String { .unwrap_or_else(|| display_label(id)) } -fn ratio_pct(ratio_left: i32, ratio_right: i32) -> f64 { - let l = ratio_left.max(0) as f64; - let r = ratio_right.max(0) as f64; - let sum = l + r; - if sum <= 0.0 { - 50.0 - } else { - (l / sum) * 100.0 - } -} - fn ratios_for_page(v: &VoteData, page_left: &ItemId, page_right: &ItemId) -> (i32, i32) { match (v.a.as_str(), v.b.as_str()) { (a, b) if a == page_left.as_str() && b == page_right.as_str() => { @@ -94,6 +83,37 @@ fn edge_votes(group: &GroupState, left: &ItemId, right: &ItemId) -> Vec &'static str { + if r_left > r_right { + "left" + } else if r_right > r_left { + "right" + } else { + "even" + } +} + +fn winner_text(r_left: i32, r_right: i32) -> &'static str { + match winner_side(r_left, r_right) { + "left" => "left wins", + "right" => "right wins", + _ => "tie", + } +} + +/// Map stored ratios to the live slider position (0 = full left, 100 = full right). +/// Matches `sorter_ui.js`: `left = 100 - v`, `right = v`. +fn slider_value_from_ratios(r_left: i32, r_right: i32) -> i32 { + let l = r_left.max(0) as f64; + let r = r_right.max(0) as f64; + let sum = l + r; + if sum <= 0.0 { + return 50; + } + ((r / sum) * 100.0).round().clamp(0.0, 100.0) as i32 +} + fn vote_edge_history(tree: &GlobalTree, group: &GroupState, left: &ItemId, right: &ItemId) -> Markup { let mut votes = edge_votes(group, left, right); votes.sort_by(|a, b| b.ts.cmp(&a.ts)); @@ -106,17 +126,26 @@ fn vote_edge_history(tree: &GlobalTree, group: &GroupState, left: &ItemId, right h3 class="vote-edge-history-title" { "votes on this pair" } + p class="muted small vote-edge-legend" { + (format!("left: {legend_left} — right: {legend_right}")) + } ul class="vote-edge-history" { @for v in &votes { @let (r_left, r_right) = ratios_for_page(v, left, right); - @let pct = ratio_pct(r_left, r_right); + @let slider_val = slider_value_from_ratios(r_left, r_right); + @let side = winner_side(r_left, r_right); + @let label = winner_text(r_left, r_right); li class="vote-edge-history-row" { div class="vote-edge-meta" { span class="vote-edge-ratio" { (format!("{}:{}", r_left, r_right)) } + span class="vote-edge-winner muted small" { " · " (label) } } - div class="ratio-bar vote-edge-bar" aria-hidden="true" { - div class="ratio-left" style={(format!("width: {:.3}%;", pct))} {} - div class="ratio-right" style={(format!("width: {:.3}%;", 100.0 - pct))} {} + label class="vote-hud-slider vote-edge-slider" aria-hidden="true" { + input type="range" class="vote-edge-range" min="0" max="100" value=(slider_val) + data-winner=(side) + style={(format!("--vote-slider-pct: {}%;", slider_val))} + disabled + tabindex="-1"; } } } @@ -283,7 +312,6 @@ pub async fn vote_page( span class="vote-compare-vs" { "vs" } (vote_compare_item_card(&tree, &right, "vote-compare-right")) } - (vote_back_nav(&parent)) div id="vote-edge-history-region" { (edge_history) } @@ -308,3 +336,66 @@ pub async fn vote_page( ) .into_response() } + +#[cfg(test)] +mod polarity_tests { + use super::*; + use crate::ranking::ranked_items; + use crate::reducer::GlobalTree; + + fn id(s: &str) -> ItemId { + ItemId::parse(s).unwrap() + } + + /// The page's left number must always equal the vote's weight for the + /// item shown on the left, regardless of which order the vote stored a/b. + #[test] + fn ratios_for_page_orients_to_page_left() { + let left = id("left_item"); + let right = id("right_item"); + + // Stored a == page left: keep order. + let v1 = VoteData::from_recorded(1, left.as_str(), right.as_str(), 9, 1).unwrap(); + assert_eq!(ratios_for_page(&v1, &left, &right), (9, 1)); + + // Stored a == page right: swap so left stays left. + let v2 = VoteData::from_recorded(2, right.as_str(), left.as_str(), 9, 1).unwrap(); + assert_eq!(ratios_for_page(&v2, &left, &right), (1, 9)); + } + + #[test] + fn winner_side_follows_larger_ratio() { + assert_eq!(winner_side(9, 1), "left"); + assert_eq!(winner_side(1, 9), "right"); + assert_eq!(winner_side(1, 1), "even"); + } + + #[test] + fn slider_value_matches_hud_mapping() { + assert_eq!(slider_value_from_ratios(9, 1), 10); + assert_eq!(slider_value_from_ratios(1, 4), 80); + assert_eq!(slider_value_from_ratios(1, 1), 50); + } + + /// End-to-end polarity invariant: a vote that favours the LEFT item (higher + /// `ratio_left`, recorded as the RPC's `a`) must make that item rank #1. + /// This is the property the UI must preserve: sliding left => left wins. + #[test] + fn sliding_left_makes_left_item_win_ranking() { + let parent = id("scope"); + let left = id("left_item"); + let right = id("right_item"); + + // Slider dragged left yields e.g. 9:1 with a = left item. + let vote = VoteData::from_recorded(1, left.as_str(), right.as_str(), 9, 1).unwrap(); + let mut tree = GlobalTree::new(); + tree.apply_vote(&parent, vote); + + let group = &tree.get(&parent).unwrap().local_ranking; + let ranked = ranked_items(group); + assert_eq!( + ranked[0].item, left, + "left item should rank first when ratio favours the left" + ); + } +} diff --git a/server/static/sorter.css b/server/static/sorter.css index 5da967e8bfddc2bc34662fced841860f63f1ef36..bdd3d931365703705be08537a07f3ccaf975d3ea 100644 --- a/server/static/sorter.css +++ b/server/static/sorter.css @@ -124,7 +124,7 @@ code { z-index: 1; box-shadow: inset 0 0 0 3px var(--accent), - inset 0 0 0 5px color-mix(in oklch, var(--rank-fg) 70%, transparent); + inset 0 0 0 5px color-mix(in oklch, var(--rank-fg, var(--fg)) 70%, transparent); filter: saturate(1.15) brightness(1.04); } @@ -320,7 +320,7 @@ h1 { grid-template-columns: var(--vote-ratio-col) minmax(0, 1fr) var(--vote-actions-col); gap: 0.5rem 0.65rem; align-items: center; - --vote-ratio-col: 3.25rem; + --vote-ratio-col: 12.5rem; --vote-actions-col: 11.5rem; } @@ -332,7 +332,7 @@ h1 { margin: 0; width: var(--vote-ratio-col); min-width: var(--vote-ratio-col); - text-align: center; + text-align: right; white-space: nowrap; } @@ -474,6 +474,16 @@ h1 { --vote-track-muted: color-mix(in oklch, var(--muted) 55%, var(--bg)); } +/* Center-anchored fill: the accent grows from the midpoint toward the thumb, + so the highlighted mass always sits on the *winning* side (the side the + thumb was dragged toward). Left winning => accent on the left half. */ +.vote-hud-slider input[type="range"][data-winner="even"]::-webkit-slider-runnable-track { + height: 0.65rem; + border-radius: 0; + border: 2px solid var(--border); + background: var(--vote-track-muted); +} + .vote-hud-slider input[type="range"][data-winner="left"]::-webkit-slider-runnable-track { height: 0.65rem; border-radius: 0; @@ -483,7 +493,9 @@ h1 { var(--vote-track-muted) 0%, var(--vote-track-muted) var(--vote-slider-pct, 50%), var(--accent) var(--vote-slider-pct, 50%), - var(--accent) 100% + var(--accent) 50%, + var(--vote-track-muted) 50%, + var(--vote-track-muted) 100% ); } @@ -493,7 +505,9 @@ h1 { border: 2px solid var(--border); background: linear-gradient( to right, - var(--accent) 0%, + var(--vote-track-muted) 0%, + var(--vote-track-muted) 50%, + var(--accent) 50%, var(--accent) var(--vote-slider-pct, 50%), var(--vote-track-muted) var(--vote-slider-pct, 50%), var(--vote-track-muted) 100% @@ -513,26 +527,35 @@ h1 { } .vote-hud-slider input[type="range"][data-winner="left"]::-moz-range-track, -.vote-hud-slider input[type="range"][data-winner="right"]::-moz-range-track { +.vote-hud-slider input[type="range"][data-winner="right"]::-moz-range-track, +.vote-hud-slider input[type="range"][data-winner="even"]::-moz-range-track { height: 0.65rem; border-radius: 0; border: 2px solid var(--border); } +.vote-hud-slider input[type="range"][data-winner="even"]::-moz-range-track { + background: var(--vote-track-muted); +} + .vote-hud-slider input[type="range"][data-winner="left"]::-moz-range-track { background: linear-gradient( to right, var(--vote-track-muted) 0%, var(--vote-track-muted) var(--vote-slider-pct, 50%), var(--accent) var(--vote-slider-pct, 50%), - var(--accent) 100% + var(--accent) 50%, + var(--vote-track-muted) 50%, + var(--vote-track-muted) 100% ); } .vote-hud-slider input[type="range"][data-winner="right"]::-moz-range-track { background: linear-gradient( to right, - var(--accent) 0%, + var(--vote-track-muted) 0%, + var(--vote-track-muted) 50%, + var(--accent) 50%, var(--accent) var(--vote-slider-pct, 50%), var(--vote-track-muted) var(--vote-slider-pct, 50%), var(--vote-track-muted) 100% @@ -573,20 +596,23 @@ h1 { margin-bottom: 0.25rem; } -.ratio-bar { - display: flex; - height: 8px; - border-radius: 0; - overflow: hidden; - background: var(--border); +/* Read-only sliders in vote history — same track/thumb styling as the HUD. */ +.vote-edge-slider { + display: block; + margin-top: 0.15rem; } -.ratio-left { - background: var(--accent); +.vote-edge-slider input[type="range"] { + pointer-events: none; + cursor: default; +} + +.vote-edge-slider input[type="range"]:disabled { + opacity: 1; } -.ratio-right { - background: var(--muted); +.vote-edge-legend { + margin: 0 0 0.5rem; } @media (max-width: 900px) { diff --git a/server/static/sorter_ui.js b/server/static/sorter_ui.js index f665b45f4fd4771427dc4c37e563e4976873beee..5d6d765f69f301722e59248c76e919043559fb78 100644 --- a/server/static/sorter_ui.js +++ b/server/static/sorter_ui.js @@ -138,6 +138,10 @@ function update() { var v = parseInt(slider.value, 10); if (!Number.isFinite(v)) v = 50; + // Slider position drives the colored fill (a center-anchored bar that + // grows toward whichever side is winning — see sorter.css). Sliding the + // thumb left raises the left number; left winning keeps the accent mass + // on the left, matching the "votes on this pair" history bars. slider.style.setProperty('--vote-slider-pct', v + '%'); slider.setAttribute('aria-valuenow', String(v)); var left = Math.max(1, 100 - v); @@ -147,8 +151,12 @@ right = right / divisor; if (leftInput) leftInput.value = String(left); if (rightInput) rightInput.value = String(right); - if (ratioDisplay) ratioDisplay.textContent = left + ':' + right; - slider.dataset.winner = left >= right ? 'left' : 'right'; + var winner = left > right ? 'left' : (right > left ? 'right' : 'even'); + slider.dataset.winner = winner; + if (ratioDisplay) { + var label = winner === 'even' ? 'tie' : (winner + ' wins'); + ratioDisplay.textContent = left + ':' + right + ' \u00b7 ' + label; + } } slider.addEventListener('input', update); update(); Side B — contributor: tommy-mor Side B — 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 B — 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)]