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: [7bb7145d] url stuff Side A — unified diff (full patch): diff --git a/AGENTS.md b/AGENTS.md index e60b9ba6012593361ef10e8fdd9439cd9932e09b..babb889d6fbfb1fa7176c9e6b7544ae17b61dd2e 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -58,4 +58,4 @@ Use **tmux** for `cargo run --package sorter2-server` (dev server). Rebuild afte - First `cargo test` / `cargo build --release` is slow; Clojure smoke test always does a release build. - `legacy/` and `ideas/` are not part of the workspace build. -- **ItemId** for web URLs is a canonical full URL (`https://reddit.com/r/rust`). Rules live in [`server/src/url_rules/`](server/src/url_rules/) (composable Rust, not a config DSL). After changing canonicalization rules, rebuild the projection: `cargo run --package sorter2-server -- replay-index`. +- **ItemId** for web URLs is a canonical full URL (`https://reddit.com/r/rust`). Rules live in [`server/src/url_rules/graph.rs`](server/src/url_rules/graph.rs): a semantic graph (DFA on host + path, query params in `Context`) with a generic internet fallback for unknown sites. After changing rules, rebuild the projection: `cargo run --package sorter2-server -- replay-index`. diff --git a/server/src/url_rules/engine.rs b/server/src/url_rules/engine.rs deleted file mode 100644 index e29b6b48c08deb7bffe031b1e542b1e25a7bef15..0000000000000000000000000000000000000000 --- a/server/src/url_rules/engine.rs +++ /dev/null @@ -1,187 +0,0 @@ -//! Composable URL normalization primitives. - -use std::collections::HashMap; - -use url::Url; - -/// Mutable URL view used by rule combinators before serializing to a canonical string. -#[derive(Debug, Clone)] -pub struct ParsedUrl { - pub scheme: String, - pub host: String, - pub path_segments: Vec, - pub query: HashMap, - pub fragment: Option, -} - -impl ParsedUrl { - pub fn parse(raw: &str) -> Option { - let trimmed = raw.trim(); - if trimmed.is_empty() { - return None; - } - - let with_scheme = if trimmed.contains("://") { - trimmed.to_string() - } else if trimmed.starts_with("r/") || trimmed.starts_with("/r/") { - let rest = trimmed.trim_start_matches('/').trim_start_matches("r/"); - format!("https://reddit.com/r/{rest}") - } else if trimmed.contains('.') && !trimmed.starts_with('/') { - format!("https://{trimmed}") - } else { - trimmed.to_string() - }; - - let url = Url::parse(&with_scheme).ok()?; - let host = url.host_str()?.to_string(); - let path_segments: Vec = url - .path_segments() - .map(|segs| segs.filter(|s| !s.is_empty()).map(str::to_string).collect()) - .unwrap_or_default(); - - let mut query = HashMap::new(); - for (k, v) in url.query_pairs() { - query.insert(k.into_owned(), v.into_owned()); - } - - Some(Self { - scheme: url.scheme().to_string(), - path_segments, - query, - fragment: url.fragment().map(str::to_string), - host, - }) - } - - pub fn with_path_segments(&self, segments: &[String]) -> Self { - let mut u = self.clone(); - u.path_segments = segments.to_vec(); - u - } - - pub fn to_url(&self) -> Option { - let mut url = if self.path_segments.is_empty() { - Url::parse(&format!("{}://{}", self.scheme, self.host)).ok()? - } else { - let path = format!("/{}", self.path_segments.join("/")); - Url::parse(&format!("{}://{}{}", self.scheme, self.host, path)).ok()? - }; - if !self.query.is_empty() { - let mut pairs: Vec<_> = self.query.iter().collect(); - pairs.sort_by(|a, b| a.0.cmp(b.0)); - url.query_pairs_mut().clear(); - for (k, v) in pairs { - url.query_pairs_mut().append_pair(k, v); - } - } - if let Some(ref frag) = self.fragment { - url.set_fragment(Some(frag)); - } - Some(url) - } - - pub fn canonical_string(&self) -> Option { - let url = self.to_url()?; - let mut s = url.to_string(); - if self.path_segments.is_empty() { - s = s.trim_end_matches('/').to_string(); - } - Some(s) - } -} - -pub fn force_https(u: &mut ParsedUrl) { - if u.scheme == "http" { - u.scheme = "https".to_string(); - } -} - -pub fn drop_fragment(u: &mut ParsedUrl) { - u.fragment = None; -} - -pub fn strip_www(u: &mut ParsedUrl) { - if u.host.starts_with("www.") { - u.host = u.host[4..].to_string(); - } -} - -pub fn lowercase_host(u: &mut ParsedUrl) { - u.host = u.host.to_ascii_lowercase(); -} - -pub fn lowercase_path(u: &mut ParsedUrl) { - for seg in &mut u.path_segments { - *seg = seg.to_ascii_lowercase(); - } -} - -pub fn clear_query(u: &mut ParsedUrl) { - u.query.clear(); -} - -pub fn keep_only_query(u: &mut ParsedUrl, keys: &[&str]) { - u.query - .retain(|k, _| keys.iter().any(|want| want == &k.as_str())); -} - -pub fn strip_tracking_params(u: &mut ParsedUrl) { - u.query.retain(|k, _| { - let lower = k.to_ascii_lowercase(); - !(lower.starts_with("utm_") - || matches!( - lower.as_str(), - "fbclid" | "gclid" | "ref" | "ref_src" | "ref_source" | "mc_cid" | "mc_eid" - )) - }); -} - -pub fn truncate_after_segment(u: &mut ParsedUrl, name: &str, keep: usize) { - if let Some(i) = u.path_segments.iter().position(|s| s == name) { - let end = (i + 1 + keep).min(u.path_segments.len()); - u.path_segments.truncate(end); - } -} - -pub fn drop_listing_suffix(u: &mut ParsedUrl, suffixes: &[&str]) { - if u.path_segments.len() >= 3 && u.path_segments.first().map(String::as_str) == Some("r") { - if let Some(last) = u.path_segments.last() { - if suffixes.iter().any(|s| *s == last.as_str()) { - u.path_segments.pop(); - } - } - } -} - -pub fn normalize_reddit_host(u: &mut ParsedUrl) { - if matches!( - u.host.as_str(), - "old.reddit.com" | "new.reddit.com" | "www.reddit.com" - ) { - u.host = "reddit.com".to_string(); - } -} - -pub fn rewrite_youtu_be(u: &mut ParsedUrl) { - if u.host == "youtu.be" && u.path_segments.len() == 1 { - let id = u.path_segments[0].clone(); - u.host = "youtube.com".to_string(); - u.path_segments = vec!["watch".to_string()]; - u.query.insert("v".to_string(), id); - } -} - -pub fn rewrite_youtube_shorts(u: &mut ParsedUrl) { - if u.host == "youtube.com" && u.path_segments.first().map(String::as_str) == Some("shorts") { - if let Some(id) = u.path_segments.get(1).cloned() { - u.path_segments = vec!["watch".to_string()]; - u.query.insert("v".to_string(), id); - } - } -} - -pub fn normalize_youtube_host(u: &mut ParsedUrl) { - if matches!(u.host.as_str(), "m.youtube.com" | "www.youtube.com") { - u.host = "youtube.com".to_string(); - } -} diff --git a/server/src/url_rules/mod.rs b/server/src/url_rules/mod.rs index 03d53bd3e82d704a01ba3fd8dd02b7d31422c0de..9e1445346ce77a49dd6a7e7713bf9c57aef353cc 100644 --- a/server/src/url_rules/mod.rs +++ b/server/src/url_rules/mod.rs @@ -1,8 +1,12 @@ -//! URL canonicalization and hierarchy rules for [`crate::path_types::ItemId`]. +//! URL canonicalization and hierarchy via a semantic graph (DFA + generic fallback). -mod engine; +mod graph; +mod parse; mod registry; +#[cfg(test)] +mod registry_tests; + pub use registry::{ canonicalize_raw, looks_like_url, navigable_breadcrumbs, parent_url, resolve_id, CanonicalResult, }; diff --git a/server/src/url_rules/registry.rs b/server/src/url_rules/registry.rs index 14514e9af8385fb2b9b2f35eb9ee14d453d4b97c..8e6c012ea1fc74b864307bdacdf5a0f5db5259fc 100644 --- a/server/src/url_rules/registry.rs +++ b/server/src/url_rules/registry.rs @@ -1,12 +1,7 @@ -//! Per-domain canonicalization and hierarchy rules. +//! Public API: canonical identity and hierarchy via the URL graph. -use std::collections::HashSet; - -use super::engine::{ - clear_query, drop_fragment, drop_listing_suffix, force_https, keep_only_query, lowercase_host, - lowercase_path, normalize_reddit_host, normalize_youtube_host, rewrite_youtu_be, - rewrite_youtube_shorts, strip_tracking_params, strip_www, truncate_after_segment, ParsedUrl, -}; +use super::graph::graph; +use super::parse::UrlParts; /// Result of canonicalizing a raw URL string. #[derive(Debug, Clone, PartialEq, Eq)] @@ -16,71 +11,16 @@ pub struct CanonicalResult { pub alias_of: Option, } -fn apply_global(u: &mut ParsedUrl) { - force_https(u); - drop_fragment(u); - strip_www(u); - lowercase_host(u); - strip_tracking_params(u); -} - -fn normalize_reddit(u: &mut ParsedUrl) { - normalize_reddit_host(u); - lowercase_path(u); - truncate_after_segment(u, "comments", 1); - drop_listing_suffix(u, &["hot", "top", "new", "rising", "controversial"]); - clear_query(u); -} - -fn normalize_youtube(u: &mut ParsedUrl) { - rewrite_youtu_be(u); - normalize_youtube_host(u); - rewrite_youtube_shorts(u); - keep_only_query(u, &["v", "list"]); -} - -fn normalize_default(_u: &mut ParsedUrl) { - // Global rules only. -} - -fn domain_key(host: &str) -> &'static str { - if host == "reddit.com" || host.ends_with(".reddit.com") { - "reddit.com" - } else if host == "youtube.com" || host == "youtu.be" { - "youtube.com" - } else { - "default" - } -} - -fn normalize_for_host(u: &mut ParsedUrl) { - apply_global(u); - match domain_key(&u.host) { - "reddit.com" => normalize_reddit(u), - "youtube.com" => normalize_youtube(u), - _ => normalize_default(u), - } -} - -/// Structural path segments that must not become standalone tree nodes when more path follows. -fn structural_trailing(host: &str) -> &'static [&'static str] { - match domain_key(host) { - "reddit.com" => &["comments"], - _ => &[], - } -} - /// Canonicalize a raw URL. Returns `None` if the input is not URL-like. pub fn canonicalize_raw(raw: &str) -> Option { let trimmed = raw.trim(); if trimmed.is_empty() { return None; } - let mut u = ParsedUrl::parse(trimmed)?; - let input_snapshot = u.canonical_string()?; - normalize_for_host(&mut u); - let canonical = u.canonical_string()?; - let alias_of = if input_snapshot != canonical { + let parts = UrlParts::parse(trimmed)?; + let g = graph(); + let canonical = g.resolve_canonical(&parts)?; + let alias_of = if trimmed != canonical { Some(trimmed.to_string()) } else { None @@ -98,35 +38,14 @@ pub fn resolve_id(raw: &str) -> Option { /// Navigable ancestor URLs from domain root up to and including `canonical` (full URLs). pub fn navigable_breadcrumbs(canonical: &str) -> Vec { - let Some(u) = ParsedUrl::parse(canonical) else { - return vec![canonical.to_string()]; + let parts = match UrlParts::parse(canonical) { + Some(p) => p, + None => return vec![canonical.to_string()], }; - let structural: HashSet<&str> = structural_trailing(&u.host).iter().copied().collect(); - let n = u.path_segments.len(); - let mut out = Vec::new(); - - // Domain root (no path segments). - if let Some(base) = u.with_path_segments(&[]).canonical_string() { - out.push(base); - } - - for i in 0..n { - let segs: Vec = u.path_segments[..=i].to_vec(); - let is_last = i == n - 1; - let seg = u.path_segments[i].as_str(); - if structural.contains(seg) && !is_last { - continue; - } - if let Some(url) = u.with_path_segments(&segs).canonical_string() { - if out.last() != Some(&url) { - out.push(url); - } - } - } - out + graph().breadcrumbs(&parts) } -/// Immediate parent scope URL, or `None` for tree root / opaque single-segment ids. +/// Immediate parent scope URL, or `None` for tree root. pub fn parent_url(canonical: &str) -> Option { let crumbs = navigable_breadcrumbs(canonical); if crumbs.len() <= 1 { @@ -148,88 +67,3 @@ pub fn looks_like_url(raw: &str) -> bool { || t.starts_with("youtu.be/") } -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn reddit_post_drops_slug_and_normalizes_host() { - let r = canonicalize_raw( - "https://old.reddit.com/r/AmItheAsshole/comments/1trnvdl/aita_for_cancelling/", - ) - .unwrap(); - assert_eq!( - r.canonical, - "https://reddit.com/r/amitheasshole/comments/1trnvdl" - ); - } - - #[test] - fn reddit_strips_query_and_listing() { - assert_eq!( - canonicalize_raw("https://www.reddit.com/r/rust/?sort=top") - .unwrap() - .canonical, - "https://reddit.com/r/rust" - ); - assert_eq!( - canonicalize_raw("https://www.reddit.com/r/programming/hot") - .unwrap() - .canonical, - "https://reddit.com/r/programming" - ); - } - - #[test] - fn reddit_short_path() { - assert_eq!( - canonicalize_raw("r/rust").unwrap().canonical, - "https://reddit.com/r/rust" - ); - } - - #[test] - fn reddit_breadcrumbs_skip_phantom_comments() { - let post = "https://reddit.com/r/aww/comments/1trnvdl"; - let crumbs = navigable_breadcrumbs(post); - assert!(!crumbs.iter().any(|c| c.ends_with("/comments"))); - assert_eq!( - crumbs.last().map(String::as_str), - Some(post) - ); - assert!(crumbs.contains(&"https://reddit.com/r/aww".to_string())); - } - - #[test] - fn reddit_parent_of_post_is_subreddit() { - assert_eq!( - parent_url("https://reddit.com/r/aww/comments/1trnvdl").as_deref(), - Some("https://reddit.com/r/aww") - ); - } - - #[test] - fn youtube_youtu_be_and_watch_same_canonical() { - let a = canonicalize_raw("https://youtu.be/dQw4w9WgXcQ").unwrap().canonical; - let b = canonicalize_raw("https://www.youtube.com/watch?v=dQw4w9WgXcQ&t=10").unwrap(); - assert_eq!(a, b.canonical); - assert_eq!(a, "https://youtube.com/watch?v=dQw4w9WgXcQ"); - } - - #[test] - fn legacy_schemeless_upgrades() { - assert_eq!( - canonicalize_raw("reddit.com/r/rust/comments/aaa/announcing_rust_199") - .unwrap() - .canonical, - "https://reddit.com/r/rust/comments/aaa" - ); - } - - #[test] - fn alias_recorded_when_input_differs() { - let r = canonicalize_raw("https://youtu.be/abc123").unwrap(); - assert_eq!(r.canonical, "https://youtube.com/watch?v=abc123"); - assert!(r.alias_of.is_some()); - } -} Side B — contributor: tommy-mor Side B — commit message: [7964b28f] fix Side B — unified diff (full patch): diff --git a/Cargo.lock b/Cargo.lock index 8c43fb75c472b102e6e1d3b837dce3355be898f2..e55d87f32ab32064686431c7082ef8c9ca872d63 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -923,6 +923,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + [[package]] name = "prettyplease" version = "0.2.37" @@ -980,6 +989,36 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" +[[package]] +name = "rand" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.17", +] + [[package]] name = "regex-automata" version = "0.4.14" @@ -1270,6 +1309,7 @@ dependencies = [ "dotenvy", "futures-util", "maud", + "rand", "reqwest", "serde", "serde_json", @@ -1280,6 +1320,7 @@ dependencies = [ "tower-http 0.5.2", "tracing", "tracing-subscriber", + "urlencoding", ] [[package]] @@ -1656,6 +1697,12 @@ dependencies = [ "serde", ] +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + [[package]] name = "utf8_iter" version = "1.0.4" @@ -2052,6 +2099,26 @@ dependencies = [ "synstructure", ] +[[package]] +name = "zerocopy" +version = "0.8.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b065d4f0e55f82fae73202e189638116a87c55ab6b8e6c2721e13dd9d854ad1" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b631b19d36a892ab55420c92dbc83ccd79274f25be714855d3074aa71cab639" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "zerofrom" version = "0.1.8" diff --git a/server/Cargo.toml b/server/Cargo.toml index c940acb687fb141d21760a3d6656172013cf6f41..6fb7bf52fa58f46f5e8fb0f7fd395247b57506d7 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -20,6 +20,8 @@ reqwest = { version = "0.12", features = ["json"] } dotenvy = "0.15" async-stream = "0.3" futures-util = { version = "0.3", default-features = false, features = ["std"] } +rand = "0.8" +urlencoding = "2" [dev-dependencies] reqwest = { version = "0.12", features = ["json"] } diff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs index e649a7d192feade465e19ce6187a829f6ec74372..06001212820101e0cc953d3687dea64f85e60787 100644 --- a/server/src/api/ui_html.rs +++ b/server/src/api/ui_html.rs @@ -47,6 +47,7 @@ pub async fn post_ui_html( ratio_left, ratio_right, scope, + next, } => { let parent = parent_from_scope(&scope); if let Err(e) = state @@ -56,9 +57,19 @@ pub async fn post_ui_html( return ui_js_warn(&e).into_response(); } let tree = state.tree.read().await; + if !next.trim().is_empty() { + drop(tree); + return JsBuilder::new() + .raw(&format!( + "window.location.href={};", + js_string_literal(next.trim()) + )) + .into_response(); + } let empty = crate::reducer::NodeState::default(); let node = tree.get(&parent).unwrap_or(&empty); let panel = ranking_panel(&parent, node, &tree); + drop(tree); JsBuilder::new() .morph_selector("#ranking-panel", panel) .into_response() @@ -126,6 +137,7 @@ mod tests { ratio_left: 3, ratio_right: 1, scope: String::new(), + next: String::new(), } ); } diff --git a/server/src/form_template.rs b/server/src/form_template.rs index b9bc3982a125e94e67c99175ea9055979541abba..bd4a7195a6eaabfed55333bab5640708ea108b81 100644 --- a/server/src/form_template.rs +++ b/server/src/form_template.rs @@ -7,19 +7,30 @@ pub fn template_json_compact(v: &T) -> serde_json::Result serde_json::to_string(v) } -/// Recursively walk the JSON AST and replace `{"$form": "key"}` with the submitted -/// string for `key` (empty if missing). Other keys are unchanged. +/// Recursively walk the JSON AST and replace form holes with submitted values. +/// +/// - `{"$form": "key"}` → string (empty if missing) +/// - `{"$form:i32": "key"}` → JSON number (0 if missing or unparseable) pub fn substitute_form_vars(val: &mut Value, form_data: &HashMap) { match val { Value::Object(map) => { if map.len() == 1 { - if let Some(Value::String(field_name)) = map.get("$form") { - let submitted = form_data - .get(field_name.as_str()) - .map(|s| s.as_str()) - .unwrap_or(""); - *val = Value::String(submitted.to_string()); - return; + if let Some((hole_key, Value::String(field_name))) = map.iter().next() { + if let Some(form_type) = hole_key.strip_prefix("$form") { + let submitted = form_data + .get(field_name.as_str()) + .map(|s| s.as_str()) + .unwrap_or(""); + *val = match form_type { + "" => Value::String(submitted.to_string()), + ":i32" => { + let n: i32 = submitted.trim().parse().unwrap_or(0); + Value::Number(n.into()) + } + _ => Value::String(submitted.to_string()), + }; + return; + } } } for v in map.values_mut() { @@ -62,6 +73,45 @@ mod tests { text: String, } + #[test] + fn i32_holes_become_numbers() { + let json = r#"{ + "ratio_left": {"$form:i32": "ratio_left"}, + "ratio_right": {"$form:i32": "ratio_right"} + }"#; + let mut form = HashMap::new(); + form.insert("ratio_left".into(), "75".into()); + form.insert("ratio_right".into(), "25".into()); + let v = fill_template_from_form(json, &form).unwrap(); + assert_eq!(v["ratio_left"], 75); + assert_eq!(v["ratio_right"], 25); + + #[derive(Debug, Deserialize, PartialEq, Eq)] + struct Ratios { + ratio_left: i32, + ratio_right: i32, + } + let r: Ratios = serde_json::from_value(v).unwrap(); + assert_eq!( + r, + Ratios { + ratio_left: 75, + ratio_right: 25, + } + ); + } + + #[test] + fn i32_hole_missing_or_bad_defaults_to_zero() { + let json = r#"{"n": {"$form:i32": "missing"}}"#; + let v = fill_template_from_form(json, &HashMap::new()).unwrap(); + assert_eq!(v["n"], 0); + let mut form = HashMap::new(); + form.insert("missing".into(), "nope".into()); + let v = fill_template_from_form(json, &form).unwrap(); + assert_eq!(v["n"], 0); + } + #[test] fn holes_become_strings() { let json = r#"{ diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs index 3bf9fc7e92e50beed24e2c25106a77421038c90b..61cdbc094819ddedb755572c59456ec0d6617619 100644 --- a/server/src/html/mod.rs +++ b/server/src/html/mod.rs @@ -20,6 +20,8 @@ use crate::{ ui_action::UI_RPC_FIELD, }; +pub mod vote; + const SORTER_CSS: &str = include_str!("../../static/sorter.css"); const SORTER_UI_JS: &str = include_str!("../../static/sorter_ui.js"); @@ -131,7 +133,7 @@ fn layout(title: &str, body: Markup, views: u64) -> Markup { } } -fn item_href(id: &ItemId) -> String { +pub(crate) fn item_href(id: &ItemId) -> String { id.browse_href() } @@ -309,11 +311,23 @@ async fn item_page(state: AppState, uri: Uri, item: ItemId) -> Markup { let empty_node = NodeState::default(); let node = tree.get(&item).unwrap_or(&empty_node); + let child_count = node.children.len(); + let vote_link = if child_count >= 2 { + Some(vote::vote_href(&item)) + } else { + None + }; + let body = html! { h1 { "sorter" } (input_panel("", None)) (breadcrumb_path(&item)) (entity_section(&item, node, false)) + @if let Some(href) = vote_link { + p class="vote-cta" { + a class="btn-primary" href=(href) data-testid="vote-children" { "Vote on children" } + } + } (ranking_panel(&item, node, &tree)) }; layout("sorter2", body, views) diff --git a/server/src/lib.rs b/server/src/lib.rs index da5f3ebecec1794b05a2a69cc78379551b2ad769..7f7e28c8ac3758de87f1f8e073b24be4132d38da 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -4,6 +4,7 @@ pub mod events; pub mod fetch; pub mod form_template; pub mod html; +pub mod pair; pub mod parser; pub mod path_types; pub mod ranking; @@ -33,6 +34,7 @@ pub fn create_app(state: AppState) -> Router { .route("/static/:filename", get(crate::html::serve_static)) .route("/~/*item_path", get(crate::html::browse)) .route("/", get(crate::html::home)) + .route("/vote", get(crate::html::vote::vote_page)) .route("/ui", post(crate::api::ui_html::post_ui_html)) .with_state(state) .layer(TraceLayer::new_for_http()) diff --git a/server/src/ui_action.rs b/server/src/ui_action.rs index 2047713762c932ac9bc325fe15624f2aecb3364d..53581e1362bfcc5dfb4ae3069c41ea6f7be41437 100644 --- a/server/src/ui_action.rs +++ b/server/src/ui_action.rs @@ -31,6 +31,9 @@ pub enum HtmlUiAction { /// Parent node [`ItemId`] string; empty = tree root. #[serde(default)] scope: String, + /// After vote, navigate here (vote compare page). + #[serde(default)] + next: String, }, /// Parse pasted Reddit URL/path; redirect to subreddit ranking on success. ParseQuery { @@ -70,6 +73,36 @@ pub fn parse_html_ui_from_form( mod tests { use super::*; + #[test] + fn record_vote_round_trip_with_typed_ratio_holes() { + let template = serde_json::json!({ + "action": "record_vote", + "a": "x", + "b": "y", + "ratio_left": {"$form:i32": "ratio_left"}, + "ratio_right": {"$form:i32": "ratio_right"}, + "scope": "parent", + }); + let mut form = HashMap::new(); + form.insert( + UI_RPC_FIELD.to_string(), + serde_json::to_string(&template).unwrap(), + ); + form.insert("ratio_left".into(), "60".into()); + form.insert("ratio_right".into(), "40".into()); + assert_eq!( + parse_html_ui_from_form(&form).unwrap(), + HtmlUiAction::RecordVote { + a: "x".into(), + b: "y".into(), + ratio_left: 60, + ratio_right: 40, + scope: "parent".into(), + next: String::new(), + } + ); + } + #[test] fn record_vote_round_trip_with_form_holes() { let template = serde_json::json!({ @@ -96,6 +129,7 @@ mod tests { ratio_left: 2, ratio_right: 1, scope: "amitheasshole".into(), + next: String::new(), } ); } @@ -122,6 +156,7 @@ mod tests { ratio_left: 2, ratio_right: 1, scope: String::new(), + next: String::new(), } ); } diff --git a/server/static/sorter.css b/server/static/sorter.css index 021918f8e778b84e4b3eac8559fab7d223a3d490..3c2cec5cb5094013387147c621d75bd341bc06cc 100644 --- a/server/static/sorter.css +++ b/server/static/sorter.css @@ -224,4 +224,148 @@ code { h1 { margin: 0; +} + +.vote-cta { + margin: 0.75rem 0; +} + +.vote-compare-shell { + max-width: 960px; +} + +.vote-compare-scope { + margin: 0.5rem 0 1rem; +} + +.vote-compare-pair { + display: grid; + grid-template-columns: 1fr auto 1fr; + gap: 1rem; + align-items: start; + margin: 1rem 0; +} + +.vote-compare-vs { + align-self: center; + font-size: 1.25rem; + color: var(--muted); + font-weight: 600; +} + +.vote-compare-side { + background: var(--panel); + border: 1px solid var(--border); + border-radius: 8px; + padding: 1rem; + min-height: 120px; +} + +.vote-compare-item { + color: var(--accent); + text-decoration: none; + display: block; +} + +.vote-compare-item:hover { + text-decoration: underline; +} + +.vote-compare-figure { + margin: 0.75rem 0 0; +} + +.vote-compare-image { + display: block; + max-width: 100%; + height: auto; + border-radius: 6px; + border: 1px solid var(--border); +} + +.vote-compare-item-body { + margin-top: 0.75rem; + font-size: 0.9rem; +} + +.vote-compare-nav { + display: flex; + justify-content: space-between; + align-items: center; + gap: 1rem; + margin: 1rem 0; +} + +.vote-compare-next { + color: var(--accent); + text-decoration: none; +} + +.vote-compare-next.is-disabled { + color: var(--muted); +} + +.vote-compare-back { + text-decoration: none; +} + +.vote-compare-back:hover { + text-decoration: underline; +} + +.vote-compare-slider-label { + display: grid; + grid-template-columns: 1fr auto 1fr; + gap: 0.75rem; + align-items: center; + margin: 1.25rem 0; +} + +.vote-compare-slider-label input[type="range"] { + width: 100%; + min-width: 160px; +} + +#vote-slider-left-label { + text-align: right; +} + +#vote-slider-right-label { + text-align: left; +} + +.vote-edge-history-title { + margin: 1.5rem 0 0.5rem; + font-size: 1rem; +} + +.vote-edge-history { + list-style: none; + padding: 0; + margin: 0; +} + +.vote-edge-history-row { + margin-bottom: 0.75rem; +} + +.vote-edge-meta { + font-size: 0.875rem; + margin-bottom: 0.25rem; +} + +.ratio-bar { + display: flex; + height: 8px; + border-radius: 4px; + overflow: hidden; + background: var(--border); +} + +.ratio-left { + background: var(--accent); +} + +.ratio-right { + background: var(--muted); } \ No newline at end of file diff --git a/server/static/sorter_ui.js b/server/static/sorter_ui.js index 62c9158ecb3c2140b83efd2b27ea706a9e0ae127..c8d7c3ef2413399ced7898a7edb3e7a2c8e16163 100644 --- a/server/static/sorter_ui.js +++ b/server/static/sorter_ui.js @@ -81,7 +81,22 @@ }); } + function initVoteSlider() { + var slider = document.getElementById('vote-preference-slider'); + if (!slider) return; + var leftInput = document.getElementById('vote-ratio-left'); + var rightInput = document.getElementById('vote-ratio-right'); + function update() { + var v = parseInt(slider.value, 10); + if (leftInput) leftInput.value = String(v); + if (rightInput) rightInput.value = String(100 - v); + } + slider.addEventListener('input', update); + update(); + } + function initSorterUi() { + initVoteSlider(); document.addEventListener('submit', async function (e) { var f = e.target; if (!f || f.tagName !== 'FORM') return; @@ -89,10 +104,11 @@ if (f.getAttribute('data-navigate') === 'full') return; e.preventDefault(); await postUiForm(f); - if (f.id === 'vote-form') { + if (f.id === 'vote-form' || f.id === 'vote-compare-form') { f.reset(); - var firstField = f.querySelector('input[type="text"]'); - if (firstField) firstField.focus(); + var slider = f.querySelector('#vote-preference-slider'); + if (slider) slider.value = '50'; + initVoteSlider(); } }); }