{"messages":[{"content":"You are a constitutional council ranking individual git commits for ownership allocation.\n\nCompare these two commits. Decide which contributed more lasting value to the project.\n\nJudge substance, not spectacle:\n- Prefer correct, lasting design and real bugfixes over churn, formatting, renames, or generated noise.\n- Prefer clarity and necessity over sheer line count. A small precise change can beat a large diffuse one.\n- Do not favor a side merely because its patch is longer or noisier.\n- Weight what the change does for the project, not the contributor's name.\n\nReturn ONLY a JSON object: {\"winner\": \"A\" or \"B\", \"ratio\": \"N:M\", \"explanation\": \"...\"}\nThe explanation must cite concrete differences in the patches (1-3 sentences).\n\nSide A — contributor: tommy-mor\nSide A — commit message:\n[8d5328d3] -theme\n\nSide A — unified diff (full patch):\ndiff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs\nindex 82b2aa51d21ada1d0d849d3ddfc3a81e4241d861..e74e42e0f0ffc4224f5ef5421b486a5f35434999 100644\n--- a/server/src/api/ui_html.rs\n+++ b/server/src/api/ui_html.rs\n@@ -73,11 +73,7 @@ pub async fn post_ui_html(\n ensure_partial_tree(&mut tree, &item);\n }\n let _ = state.ensure_node(&item).await;\n- let dest = if item.is_root() {\n- \"/\".to_string()\n- } else {\n- format!(\"/?item={}\", item.as_str())\n- };\n+ let dest = item.browse_href();\n JsBuilder::new()\n .raw(&format!(\n \"window.location.href={};\",\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex c973cb718ac74b95570dabea76e24459417790b9..a8353c6de0cd6d268219e552b7ca1ba4e3000585 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -1,13 +1,10 @@\n use axum::{\n body::Body,\n extract::{Path, State},\n- http::{header, HeaderValue, StatusCode, Uri},\n+ http::{header, StatusCode, Uri},\n response::{IntoResponse, Response},\n- Form,\n };\n-use axum_extra::extract::cookie::CookieJar;\n use maud::{html, Markup, DOCTYPE};\n-use serde::Deserialize;\n \n use crate::{\n form_template::template_json_compact,\n@@ -15,96 +12,25 @@ use crate::{\n path_types::ItemId,\n ranking::{top_bottom, RankedItem},\n reducer::{GroupState, NodeState},\n- state::{parse_item_param, AppState},\n+ state::AppState,\n ui_action::UI_RPC_FIELD,\n };\n \n-const THEME_DEFAULT_CSS: &str = include_str!(\"../../static/theme_default.css\");\n-const THEME_RETRO_CSS: &str = include_str!(\"../../static/theme_retro.css\");\n+const SORTER_CSS: &str = include_str!(\"../../static/sorter.css\");\n const SORTER_UI_JS: &str = include_str!(\"../../static/sorter_ui.js\");\n \n-pub const SORTER_THEME_COOKIE: &str = \"sorter-theme\";\n-\n-pub fn normalize_theme(raw: &str) -> &'static str {\n- match raw {\n- \"retro\" => \"retro\",\n- _ => \"default\",\n- }\n-}\n-\n-pub fn theme_from_jar(jar: &CookieJar) -> &'static str {\n- jar.get(SORTER_THEME_COOKIE)\n- .map(|c| normalize_theme(c.value()))\n- .unwrap_or(\"default\")\n-}\n-\n-pub fn theme_next_from_uri(uri: &Uri) -> String {\n- uri.path_and_query()\n- .map(|pq| pq.as_str().to_string())\n- .filter(|s| !s.is_empty())\n- .unwrap_or_else(|| \"/\".to_string())\n-}\n-\n-pub fn theme_cookie_header_value(theme: &str) -> HeaderValue {\n- let t = normalize_theme(theme);\n- let s = format!(\"{SORTER_THEME_COOKIE}={t}; Path=/; SameSite=Lax; Max-Age=31536000\");\n- HeaderValue::from_str(&s).expect(\"theme cookie must be ASCII\")\n-}\n-\n-fn sanitize_theme_next(next: Option<&str>) -> String {\n- let s = next.unwrap_or(\"/\").trim();\n- if s.starts_with('/') && !s.starts_with(\"//\") && s.len() < 8192 {\n- s.to_string()\n- } else {\n- \"/\".to_string()\n- }\n-}\n-\n-#[derive(Debug, Deserialize)]\n-pub struct ThemeForm {\n- theme: String,\n- next: Option,\n-}\n-\n-pub async fn post_theme(Form(form): Form) -> impl IntoResponse {\n- let theme = normalize_theme(&form.theme);\n- let next = sanitize_theme_next(form.next.as_deref());\n- let loc =\n- HeaderValue::try_from(next.as_str()).unwrap_or_else(|_| HeaderValue::from_static(\"/\"));\n- Response::builder()\n- .status(StatusCode::SEE_OTHER)\n- .header(header::LOCATION, loc)\n- .header(header::SET_COOKIE, theme_cookie_header_value(theme))\n- .body(Body::empty())\n- .expect(\"theme redirect response\")\n-}\n-\n pub async fn serve_static(Path(filename): Path) -> impl IntoResponse {\n- if filename == \"sorter_ui.js\" {\n- return Response::builder()\n- .status(StatusCode::OK)\n- .header(header::CONTENT_TYPE, \"text/javascript; charset=utf-8\")\n- .header(header::CACHE_CONTROL, \"public, max-age=3600\")\n- .body(SORTER_UI_JS.to_string())\n- .unwrap()\n- .into_response();\n- }\n-\n- let theme = filename\n- .strip_prefix(\"theme_\")\n- .and_then(|s| s.strip_suffix(\".css\"));\n-\n- let css = match theme {\n- Some(\"default\") => THEME_DEFAULT_CSS,\n- Some(\"retro\") => THEME_RETRO_CSS,\n+ let (content_type, body) = match filename.as_str() {\n+ \"sorter.css\" => (\"text/css; charset=utf-8\", SORTER_CSS),\n+ \"sorter_ui.js\" => (\"text/javascript; charset=utf-8\", SORTER_UI_JS),\n _ => return (StatusCode::NOT_FOUND, \"static file not found\").into_response(),\n };\n \n Response::builder()\n .status(StatusCode::OK)\n- .header(header::CONTENT_TYPE, \"text/css; charset=utf-8\")\n+ .header(header::CONTENT_TYPE, content_type)\n .header(header::CACHE_CONTROL, \"public, max-age=3600\")\n- .body(css.to_string())\n+ .body(body.to_string())\n .unwrap()\n .into_response()\n }\n@@ -162,8 +88,7 @@ fn asset_version() -> &'static str {\n V.get_or_init(|| {\n use std::hash::{Hash, Hasher};\n let mut h = std::collections::hash_map::DefaultHasher::new();\n- THEME_DEFAULT_CSS.hash(&mut h);\n- THEME_RETRO_CSS.hash(&mut h);\n+ SORTER_CSS.hash(&mut h);\n SORTER_UI_JS.hash(&mut h);\n format!(\"{:x}\", h.finish())\n })\n@@ -176,9 +101,9 @@ pub fn now_ms() -> i64 {\n t.as_millis() as i64\n }\n \n-fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str) -> Markup {\n+fn layout(title: &str, body: Markup, views: u64) -> Markup {\n let ver = asset_version();\n- let css_href = format!(\"/static/theme_{theme}.css?v={ver}\");\n+ let css_href = format!(\"/static/sorter.css?v={ver}\");\n let js_src = format!(\"/static/sorter_ui.js?v={ver}\");\n html! {\n (DOCTYPE)\n@@ -187,7 +112,7 @@ fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str)\n meta charset=\"utf-8\";\n meta name=\"viewport\" content=\"width=device-width, initial-scale=1\";\n title { (title) }\n- link rel=\"stylesheet\" href=(css_href) id=\"theme-stylesheet\";\n+ link rel=\"stylesheet\" href=(css_href);\n script src=\"https://unpkg.com/idiomorph@0.3.0/dist/idiomorph.min.js\" {}\n }\n body class=\"home\" {\n@@ -196,21 +121,6 @@ fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str)\n }\n div id=\"errors\" {}\n (body)\n- div id=\"controls\" {\n- a href=\"https://github.com/sortersocial/sorter2\" id=\"src-link\" { \"src\" }\n- form id=\"sorter-theme-form\" method=\"post\" action=\"/theme\" data-navigate=\"full\" {\n- input type=\"hidden\" name=\"next\" value=(theme_next);\n- select id=\"theme-select\" name=\"theme\" onchange=\"this.form.submit()\" aria-label=\"Theme\" {\n- @for (val, label) in [(\"default\", \"default\"), (\"retro\", \"retro\")] {\n- @if theme == val {\n- option value=(val) selected { (label) }\n- } @else {\n- option value=(val) { (label) }\n- }\n- }\n- }\n- }\n- }\n script src=(js_src) {}\n }\n }\n@@ -218,11 +128,7 @@ fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str)\n }\n \n fn item_href(id: &ItemId) -> String {\n- if id.is_root() {\n- \"/\".to_string()\n- } else {\n- format!(\"/?item={}\", id.as_str())\n- }\n+ id.browse_href()\n }\n \n fn segment_label(seg: &str) -> &str {\n@@ -361,39 +267,10 @@ pub fn vote_panel(parent: &ItemId) -> Markup {\n }\n \n \n-fn query_param(uri: &Uri, key: &str) -> Option {\n- let q = uri.query()?;\n- q.split('&').find_map(|pair| {\n- let mut it = pair.splitn(2, '=');\n- if it.next()? == key {\n- Some(it.next().unwrap_or(\"\").to_string())\n- } else {\n- None\n- }\n- })\n-}\n-\n-pub async fn home(\n- State(state): State,\n- jar: CookieJar,\n- uri: Uri,\n-) -> impl IntoResponse {\n+async fn item_page(state: AppState, uri: Uri, item: ItemId) -> Markup {\n let path = uri.path().to_string();\n state.views.increment(path.clone());\n let views = state.views.get_views(&path);\n- let theme = theme_from_jar(&jar);\n- let theme_next = theme_next_from_uri(&uri);\n-\n- let item_raw = query_param(&uri, \"item\")\n- .or_else(|| query_param(&uri, \"sub\").map(|sub| {\n- if sub.is_empty() {\n- String::new()\n- } else {\n- format!(\"reddit.com/r/{sub}\")\n- }\n- }))\n- .unwrap_or_default();\n- let item = parse_item_param(&item_raw);\n \n let tree = state.tree.read().await;\n let empty_node = NodeState::default();\n@@ -408,5 +285,14 @@ pub async fn home(\n (vote_panel(&item))\n (ranking_panel(&item, group))\n };\n- layout(\"sorter2\", body, views, theme, &theme_next)\n+ layout(\"sorter2\", body, views)\n+}\n+\n+pub async fn home(State(state): State, uri: Uri) -> impl IntoResponse {\n+ item_page(state, uri, ItemId::root()).await\n+}\n+\n+pub async fn browse(State(state): State, uri: Uri) -> impl IntoResponse {\n+ let item = ItemId::from_browse_uri(uri.path()).unwrap_or(ItemId::root());\n+ item_page(state, uri, item).await\n }\ndiff --git a/server/src/lib.rs b/server/src/lib.rs\nindex 14e7cfbc38feb5d07aff859b64bce6e2ec45cf91..cd56743192919cf4dcea539b3d8873a21fb7e72b 100644\n--- a/server/src/lib.rs\n+++ b/server/src/lib.rs\n@@ -30,9 +30,9 @@ pub fn create_app(state: AppState) -> Router {\n Router::new()\n .route(\"/healthz\", get(|| async { \"ok\" }))\n .route(\"/static/:filename\", get(crate::html::serve_static))\n+ .route(\"/~/*item_path\", get(crate::html::browse))\n .route(\"/\", get(crate::html::home))\n .route(\"/ui\", post(crate::api::ui_html::post_ui_html))\n- .route(\"/theme\", post(crate::html::post_theme))\n .with_state(state)\n .layer(TraceLayer::new_for_http())\n }\ndiff --git a/server/src/path_types.rs b/server/src/path_types.rs\nindex b5c41444f7bcd4d8d289ed3af464bc3f14d0df99..12dce9888f5cd4e1a0974d12d6468368d0f775b9 100644\n--- a/server/src/path_types.rs\n+++ b/server/src/path_types.rs\n@@ -90,6 +90,50 @@ impl ItemId {\n paths\n }\n \n+ /// Full URL for the browser location bar after `/~/`.\n+ pub fn to_browse_url(&self) -> String {\n+ if self.is_root() {\n+ return String::new();\n+ }\n+ if self.as_str().contains(\"://\") {\n+ return self.as_str().to_string();\n+ }\n+ if self\n+ .segments()\n+ .first()\n+ .is_some_and(|s| s.contains('.'))\n+ {\n+ format!(\"https://{}\", self.as_str())\n+ } else {\n+ self.as_str().to_string()\n+ }\n+ }\n+\n+ /// App route, e.g. `/~/https://reddit.com/r/rust`.\n+ pub fn browse_href(&self) -> String {\n+ if self.is_root() {\n+ \"/\".to_string()\n+ } else {\n+ format!(\"/~/{}\", self.to_browse_url())\n+ }\n+ }\n+\n+ /// Parse the tail after `/~/` in a request path.\n+ pub fn from_browse_tail(tail: &str) -> ItemId {\n+ let raw = normalize_browse_tail(tail);\n+ if raw.is_empty() {\n+ return ItemId::root();\n+ }\n+ ItemId::from_url(&raw)\n+ .or_else(|| ItemId::parse(&raw))\n+ .unwrap_or_else(|| ItemId::opaque(raw))\n+ }\n+\n+ pub fn from_browse_uri(path: &str) -> Option {\n+ path.strip_prefix(\"/~/\")\n+ .map(ItemId::from_browse_tail)\n+ }\n+\n fn canonicalize(raw: &str) -> Option {\n let s = raw.trim();\n if s.is_empty() {\n@@ -155,6 +199,21 @@ fn normalize_host(host: &str) -> String {\n }\n }\n \n+fn normalize_browse_tail(tail: &str) -> String {\n+ let t = tail.trim();\n+ if t.is_empty() {\n+ return String::new();\n+ }\n+ // Some HTTP stacks collapse `https://` → `https:/` inside a path segment.\n+ if t.starts_with(\"https:/\") && !t.starts_with(\"https://\") {\n+ return format!(\"https://{}\", &t[7..]);\n+ }\n+ if t.starts_with(\"http:/\") && !t.starts_with(\"http://\") {\n+ return format!(\"http://{}\", &t[6..]);\n+ }\n+ t.to_string()\n+}\n+\n fn normalize_reddit_host_path(s: &str) -> String {\n let (host, path) = s.split_once('/').unwrap_or((s, \"\"));\n let host = normalize_host(host);\n@@ -252,4 +311,22 @@ mod tests {\n );\n assert!(ItemId::from_legacy_scope(\"\").is_root());\n }\n+\n+ #[test]\n+ fn browse_href_wraps_canonical_path() {\n+ let id = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+ assert_eq!(id.browse_href(), \"/~/https://reddit.com/r/rust\");\n+ }\n+\n+ #[test]\n+ fn from_browse_tail_parses_full_url() {\n+ let id = ItemId::from_browse_tail(\"https://reddit.com/r/AmITheAsshole\");\n+ assert_eq!(id.as_str(), \"reddit.com/r/amitheasshole\");\n+ }\n+\n+ #[test]\n+ fn from_browse_uri_strips_prefix() {\n+ let id = ItemId::from_browse_uri(\"/~/https://reddit.com/r/rust\").unwrap();\n+ assert_eq!(id.as_str(), \"reddit.com/r/rust\");\n+ }\n }\ndiff --git a/server/static/sorter_ui.js b/server/static/sorter_ui.js\nindex 9c475d8e076ba527aaf7a25c177d0d651bd46ca9..d9b016f197547f37ca4b2bcdd7ee6b673d0fb3f0 100644\n--- a/server/static/sorter_ui.js\n+++ b/server/static/sorter_ui.js\n@@ -24,7 +24,6 @@\n var f = e.target;\n if (!f || f.tagName !== 'FORM') return;\n if ((f.method || 'get').toLowerCase() !== 'post') return;\n- if (f.id === 'sorter-theme-form') return;\n if (f.getAttribute('data-navigate') === 'full') return;\n e.preventDefault();\n await postUiForm(f);\ndiff --git a/server/static/theme_default.css b/server/static/theme_default.css\ndeleted file mode 100644\nindex 1bf8ac7a25207336c019f93cd4119bd0e06229f0..0000000000000000000000000000000000000000\n--- a/server/static/theme_default.css\n+++ /dev/null\n@@ -1,186 +0,0 @@\n-:root {\n- --bg: #0f1115;\n- --fg: #e8eaed;\n- --muted: #9aa0a6;\n- --accent: #7cacf8;\n- --panel: #1a1d24;\n- --border: #2a2f3a;\n-}\n-\n-* {\n- box-sizing: border-box;\n-}\n-\n-body {\n- margin: 0;\n- font-family: system-ui, -apple-system, sans-serif;\n- background: var(--bg);\n- color: var(--fg);\n- line-height: 1.5;\n-}\n-\n-.muted {\n- color: var(--muted);\n-}\n-\n-.small {\n- font-size: 0.875rem;\n-}\n-\n-.view-meta {\n- position: fixed;\n- top: 0.5rem;\n- right: 0.5rem;\n- font-size: 0.75rem;\n-}\n-\n-#controls {\n- position: fixed;\n- bottom: 0;\n- left: 0;\n- right: 0;\n- display: flex;\n- gap: 1rem;\n- align-items: center;\n- padding: 0.75rem 1rem;\n- background: var(--panel);\n- border-top: 1px solid var(--border);\n- font-size: 0.875rem;\n-}\n-\n-#controls a {\n- color: var(--accent);\n-}\n-\n-.demo-panel {\n- max-width: 40rem;\n- margin: 4rem auto 6rem;\n- padding: 2rem;\n- background: var(--panel);\n- border: 1px solid var(--border);\n- border-radius: 8px;\n-}\n-\n-.demo-panel h1 {\n- margin-top: 0;\n-}\n-\n-.btn-primary {\n- background: var(--accent);\n- color: #0f1115;\n- border: none;\n- padding: 0.5rem 1rem;\n- border-radius: 4px;\n- font-size: 1rem;\n- cursor: pointer;\n-}\n-\n-.btn-primary:hover {\n- filter: brightness(1.1);\n-}\n-\n-code {\n- font-size: 0.85em;\n- background: var(--bg);\n- padding: 0.1em 0.35em;\n- border-radius: 3px;\n-}\n-\n-.vote-fields {\n- display: flex;\n- flex-direction: column;\n- gap: 0.75rem;\n- margin-bottom: 1rem;\n-}\n-\n-.vote-fields label {\n- display: flex;\n- flex-direction: column;\n- gap: 0.25rem;\n-}\n-\n-.vote-fields input {\n- padding: 0.4rem 0.5rem;\n- border: 1px solid var(--border);\n- border-radius: 4px;\n- background: var(--bg);\n- color: var(--fg);\n-}\n-\n-.rank-list {\n- margin: 0;\n- padding-left: 0;\n- list-style: none;\n-}\n-\n-.rank-list li {\n- margin-bottom: 0.35rem;\n-}\n-\n-.rank-num {\n- color: var(--muted);\n-}\n-\n-#parser-input {\n- width: 100%;\n- padding: 0.5rem;\n- border: 1px solid var(--border);\n- border-radius: 4px;\n- background: var(--bg);\n- color: var(--fg);\n- font-size: 1rem;\n- font-family: inherit;\n- resize: vertical;\n-}\n-\n-#parser-form .btn-primary {\n- margin-top: 0.5rem;\n-}\n-\n-.breadcrumbs {\n- font-size: 0.875rem;\n- margin-bottom: 1rem;\n- color: var(--muted);\n-}\n-\n-.breadcrumbs a {\n- color: var(--accent);\n- text-decoration: none;\n-}\n-\n-.breadcrumbs a:hover {\n- text-decoration: underline;\n-}\n-\n-.breadcrumbs .separator {\n- color: var(--muted);\n-}\n-\n-.rank-list a {\n- color: var(--accent);\n- text-decoration: none;\n-}\n-\n-.rank-list a:hover {\n- text-decoration: underline;\n-}\n-\n-.entity-card h2 {\n- margin-top: 0;\n-}\n-\n-.scope-name {\n- color: var(--accent);\n- font-weight: 600;\n-}\n-\n-.rank-heading {\n- margin: 0.75rem 0 0.25rem;\n- text-transform: uppercase;\n- letter-spacing: 0.04em;\n-}\n-\n-.rank-gap {\n- text-align: center;\n- margin: 0.25rem 0;\n-}\ndiff --git a/server/static/theme_retro.css b/server/static/theme_retro.css\ndeleted file mode 100644\nindex ceee99494b873a6e658857be97f02ee739db85e9..0000000000000000000000000000000000000000\n--- a/server/static/theme_retro.css\n+++ /dev/null\n@@ -1,5 +0,0 @@\n-@import url(\"/static/theme_default.css\");\n-\n-:root {\n- --accent: #f4a261;\n-}\ndiff --git a/server/tests/integration_ui.rs b/server/tests/integration_ui.rs\nindex f7ac9c26bf9f9277ad5f5708603224c095165fb8..df7d9ab357531c5146d0b326c149fdaa6b531a4a 100644\n--- a/server/tests/integration_ui.rs\n+++ b/server/tests/integration_ui.rs\n@@ -70,6 +70,22 @@ async fn post_ui_record_vote_morphs_ranking_and_persists() {\n assert_eq!(ranked[0].item.as_str(), \"alpha\");\n }\n \n+#[tokio::test]\n+async fn browse_url_renders_subreddit_page() {\n+ let (addr, _tmp) = start_test_server().await;\n+ let client = reqwest::Client::new();\n+ let html = client\n+ .get(format!(\"http://{addr}/~/https://reddit.com/r/rust\"))\n+ .send()\n+ .await\n+ .unwrap()\n+ .text()\n+ .await\n+ .unwrap();\n+ assert!(html.contains(\"ranking-panel\"));\n+ assert!(html.contains(\"/~/https://reddit.com/r/rust\"));\n+}\n+\n #[tokio::test]\n async fn post_ui_parse_query_redirects_to_subreddit() {\n let (addr, _tmp) = start_test_server().await;\n@@ -93,5 +109,5 @@ async fn post_ui_parse_query_redirects_to_subreddit() {\n .unwrap();\n \n assert!(body.contains(\"window.location.href\"));\n- assert!(body.contains(\"/?item=reddit.com/r/rust\"));\n+ assert!(body.contains(\"/~/https://reddit.com/r/rust\"));\n }\n\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[8d8230d1] reddit\n\nSide B — unified diff (full patch):\ndiff --git a/.gitignore b/.gitignore\nindex 4c7073f9fac0c30fd2050d79a60ef447af58ebeb..ada462e900d24a3a6d08165d158c80f79c35a5a5 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -7,3 +7,4 @@\n data/\n repomix-output.xml\n dev-data/\n+.env\ndiff --git a/server/Cargo.toml b/server/Cargo.toml\nindex 7906a8547d56b8e6a48ef59c37aa82a8510fdee9..4677fedcb45292eebebe7e9cf6ce2f5738f18ddf 100644\n--- a/server/Cargo.toml\n+++ b/server/Cargo.toml\n@@ -16,6 +16,7 @@ tower = \"0.5\"\n tower-http = { version = \"0.5\", features = [\"trace\"] }\n tracing = \"0.1\"\n tracing-subscriber = { version = \"0.3\", features = [\"env-filter\"] }\n+reqwest = { version = \"0.12\", features = [\"json\"] }\n \n [dev-dependencies]\n reqwest = { version = \"0.12\", features = [\"json\"] }\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex 2864407ed6e8ec284a1dc663acf1805534566b62..df6505021d9f446c2b453e20e3eb3cf696a111f9 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -272,5 +272,16 @@ pub async fn home(State(state): State, uri: Uri) -> impl IntoResponse\n \n pub async fn browse(State(state): State, uri: Uri) -> impl IntoResponse {\n let item = ItemId::from_browse_uri(uri.path()).unwrap_or(ItemId::root());\n+ if item.as_str().starts_with(\"reddit.com\") {\n+ let needs_fetch = {\n+ let tree = state.tree.read().await;\n+ tree.get(&item)\n+ .map(|n| n.data.is_none())\n+ .unwrap_or(true)\n+ };\n+ if needs_fetch {\n+ state.reddit.request_fetch(item.clone());\n+ }\n+ }\n item_page(state, uri, item).await\n }\ndiff --git a/server/src/reddit.rs b/server/src/reddit.rs\nindex d203dca09245daf869b3aa942898447700ae69fb..90053ad03b1d7c8e94f325dd4ee64c2b4f7da900 100644\n--- a/server/src/reddit.rs\n+++ b/server/src/reddit.rs\n@@ -1,4 +1,12 @@\n-//! Reddit API import (async, decoupled from UI request path).\n+//! Reddit API import via a single background worker (rate limits, dedup, backoff).\n+\n+use std::collections::{HashMap, HashSet};\n+use std::sync::Arc;\n+use std::time::{Duration, Instant};\n+\n+use reqwest::{header, Client, StatusCode};\n+use serde::Deserialize;\n+use tokio::sync::{mpsc, RwLock};\n \n use crate::{\n path_types::ItemId,\n@@ -10,12 +18,401 @@ pub fn ensure_partial_tree(tree: &mut GlobalTree, id: &ItemId) {\n tree.ensure_path(id);\n }\n \n-/// Placeholder for Reddit JSON import. Returns entity data when implemented.\n-pub async fn fetch_reddit_entity(_id: &ItemId) -> Option {\n- None\n+pub struct RedditCommand {\n+ pub id: ItemId,\n+}\n+\n+#[derive(Clone)]\n+pub struct RedditBroker {\n+ tx: mpsc::Sender,\n+}\n+\n+#[derive(Clone)]\n+struct RedditCredentials {\n+ client_id: String,\n+ client_secret: String,\n+}\n+\n+struct OAuthToken {\n+ access_token: String,\n+ expires_at: Instant,\n+}\n+\n+impl RedditBroker {\n+ pub fn spawn(tree: Arc>, user_agent: &str) -> Self {\n+ let (tx, rx) = mpsc::channel(100);\n+\n+ let mut headers = header::HeaderMap::new();\n+ headers.insert(\n+ header::USER_AGENT,\n+ header::HeaderValue::from_str(user_agent).expect(\"valid user agent\"),\n+ );\n+\n+ let client = Client::builder()\n+ .default_headers(headers)\n+ .timeout(Duration::from_secs(15))\n+ .build()\n+ .expect(\"reqwest client\");\n+\n+ let creds = RedditCredentials::from_env();\n+ tokio::spawn(reddit_worker(rx, tree, client, creds));\n+\n+ Self { tx }\n+ }\n+\n+ /// Fire-and-forget: queue a fetch; worker updates the tree when done.\n+ pub fn request_fetch(&self, id: ItemId) {\n+ let _ = self.tx.try_send(RedditCommand { id });\n+ }\n+}\n+\n+impl RedditCredentials {\n+ fn from_env() -> Option {\n+ let client_id = std::env::var(\"REDDIT_CLIENT_ID\").ok()?;\n+ let client_secret = std::env::var(\"REDDIT_CLIENT_SECRET\").ok()?;\n+ if client_id.is_empty() || client_secret.is_empty() {\n+ return None;\n+ }\n+ Some(Self {\n+ client_id,\n+ client_secret,\n+ })\n+ }\n+}\n+\n+pub fn default_user_agent() -> String {\n+ std::env::var(\"REDDIT_USER_AGENT\").unwrap_or_else(|_| {\n+ \"web:sorter2.social:v0.0.1 (by /u/sorter2)\".to_string()\n+ })\n }\n \n-/// Apply fetched entity data to a node (called from async worker).\n-pub fn apply_entity(tree: &mut GlobalTree, id: &ItemId, data: EntityData) {\n- tree.set_entity_data(id, data);\n+async fn reddit_worker(\n+ mut rx: mpsc::Receiver,\n+ tree: Arc>,\n+ client: Client,\n+ creds: Option,\n+) {\n+ let mut in_flight = HashSet::new();\n+ let mut recently_fetched: HashMap = HashMap::new();\n+ let mut current_delay = Duration::from_secs(1);\n+ let mut oauth: Option = None;\n+ let cache_ttl = Duration::from_secs(300);\n+\n+ while let Some(cmd) = rx.recv().await {\n+ let now = Instant::now();\n+ recently_fetched.retain(|_, t| now.duration_since(*t) < cache_ttl);\n+\n+ if in_flight.contains(&cmd.id) || recently_fetched.contains_key(&cmd.id) {\n+ continue;\n+ }\n+\n+ in_flight.insert(cmd.id.clone());\n+ let fetch_id = cmd.id.clone();\n+\n+ tokio::time::sleep(current_delay).await;\n+\n+ if let Some(c) = &creds {\n+ oauth = ensure_oauth_token(&client, c, oauth.take()).await;\n+ }\n+\n+ let token = oauth.as_ref().map(|t| t.access_token.as_str());\n+ let use_oauth = token.is_some();\n+\n+ match do_fetch(&client, &fetch_id, use_oauth, token).await {\n+ Ok(FetchOutcome::Entity(data)) => {\n+ let mut w = tree.write().await;\n+ w.set_entity_data(&fetch_id, data);\n+ recently_fetched.insert(fetch_id.clone(), Instant::now());\n+ current_delay = Duration::from_millis(600);\n+ }\n+ Ok(FetchOutcome::NotFound) => {\n+ recently_fetched.insert(fetch_id.clone(), Instant::now());\n+ }\n+ Ok(FetchOutcome::RateLimited { reset_secs }) => {\n+ let wait = Duration::from_secs(reset_secs.max(1));\n+ tracing::warn!(\n+ \"Reddit rate limit for {}; sleeping {}s\",\n+ fetch_id,\n+ wait.as_secs()\n+ );\n+ tokio::time::sleep(wait).await;\n+ current_delay = (current_delay * 2).min(Duration::from_secs(60));\n+ }\n+ Err(e) => {\n+ tracing::warn!(\"Reddit fetch failed for {}: {}\", fetch_id, e);\n+ current_delay = (current_delay * 2).min(Duration::from_secs(60));\n+ }\n+ }\n+\n+ in_flight.remove(&fetch_id);\n+ }\n+}\n+\n+enum FetchOutcome {\n+ Entity(EntityData),\n+ NotFound,\n+ RateLimited { reset_secs: u64 },\n+}\n+\n+async fn ensure_oauth_token(\n+ client: &Client,\n+ creds: &RedditCredentials,\n+ existing: Option,\n+) -> Option {\n+ if let Some(t) = existing {\n+ if Instant::now() < t.expires_at - Duration::from_secs(60) {\n+ return Some(t);\n+ }\n+ }\n+\n+ let resp = client\n+ .post(\"https://www.reddit.com/api/v1/access_token\")\n+ .basic_auth(&creds.client_id, Some(&creds.client_secret))\n+ .form(&[(\"grant_type\", \"client_credentials\")])\n+ .send()\n+ .await;\n+\n+ let resp = match resp {\n+ Ok(r) => r,\n+ Err(e) => {\n+ tracing::warn!(\"Reddit OAuth token request failed: {e}\");\n+ return None;\n+ }\n+ };\n+\n+ if !resp.status().is_success() {\n+ tracing::warn!(\"Reddit OAuth token HTTP {}\", resp.status());\n+ return None;\n+ }\n+\n+ #[derive(Deserialize)]\n+ struct TokenResponse {\n+ access_token: String,\n+ expires_in: u64,\n+ }\n+\n+ let body: TokenResponse = match resp.json().await {\n+ Ok(b) => b,\n+ Err(e) => {\n+ tracing::warn!(\"Reddit OAuth token parse failed: {e}\");\n+ return None;\n+ }\n+ };\n+\n+ Some(OAuthToken {\n+ access_token: body.access_token,\n+ expires_at: Instant::now() + Duration::from_secs(body.expires_in),\n+ })\n+}\n+\n+async fn do_fetch(\n+ client: &Client,\n+ id: &ItemId,\n+ use_oauth: bool,\n+ bearer: Option<&str>,\n+) -> Result {\n+ let url = map_item_to_reddit_api(id, use_oauth);\n+ if url.is_empty() {\n+ return Ok(FetchOutcome::NotFound);\n+ }\n+\n+ let mut req = client.get(&url);\n+ if let Some(token) = bearer {\n+ req = req.bearer_auth(token);\n+ }\n+\n+ let resp = req.send().await.map_err(|e| e.to_string())?;\n+\n+ if resp.status() == StatusCode::TOO_MANY_REQUESTS {\n+ let reset = rate_limit_reset_secs(&resp);\n+ return Ok(FetchOutcome::RateLimited { reset_secs: reset });\n+ }\n+\n+ if resp.status() == StatusCode::SERVICE_UNAVAILABLE {\n+ return Err(\"Reddit unavailable (503)\".to_string());\n+ }\n+\n+ if !resp.status().is_success() {\n+ return Ok(FetchOutcome::NotFound);\n+ }\n+\n+ if rate_limit_remaining(&resp) == Some(0) {\n+ let reset = rate_limit_reset_secs(&resp);\n+ return Ok(FetchOutcome::RateLimited { reset_secs: reset });\n+ }\n+\n+ let bytes = resp.bytes().await.map_err(|e| e.to_string())?;\n+ Ok(parse_reddit_json(id, &bytes)\n+ .map(FetchOutcome::Entity)\n+ .unwrap_or(FetchOutcome::NotFound))\n+}\n+\n+fn rate_limit_remaining(resp: &reqwest::Response) -> Option {\n+ resp.headers()\n+ .get(\"x-ratelimit-remaining\")\n+ .and_then(|v| v.to_str().ok())\n+ .and_then(|s| s.parse::().ok())\n+ .map(|f| f.floor() as u64)\n+}\n+\n+fn rate_limit_reset_secs(resp: &reqwest::Response) -> u64 {\n+ resp.headers()\n+ .get(\"x-ratelimit-reset\")\n+ .and_then(|v| v.to_str().ok())\n+ .and_then(|s| s.parse::().ok())\n+ .map(|f| f.ceil() as u64)\n+ .unwrap_or(5)\n+}\n+\n+/// Map canonical item id to Reddit JSON API URL.\n+pub fn map_item_to_reddit_api(id: &ItemId, oauth: bool) -> String {\n+ let path = id.as_str();\n+ if !path.starts_with(\"reddit.com/\") && path != \"reddit.com\" {\n+ return String::new();\n+ }\n+\n+ let base = if oauth {\n+ \"https://oauth.reddit.com\"\n+ } else {\n+ \"https://www.reddit.com\"\n+ };\n+\n+ let segments: Vec<&str> = path.split('/').collect();\n+\n+ if let Some(i) = segments.iter().position(|&p| p == \"comments\") {\n+ if segments.len() > i + 1 {\n+ let api_path = segments[1..=i + 1].join(\"/\");\n+ return format!(\"{base}/{api_path}.json?raw_json=1\");\n+ }\n+ }\n+\n+ if segments.len() == 3 && segments[1] == \"r\" {\n+ return format!(\"{base}/r/{}/about.json?raw_json=1\", segments[2]);\n+ }\n+\n+ String::new()\n+}\n+\n+fn parse_reddit_json(id: &ItemId, bytes: &[u8]) -> Option {\n+ let v: serde_json::Value = serde_json::from_slice(bytes).ok()?;\n+ let segments: Vec<&str> = id.as_str().split('/').collect();\n+\n+ if segments.iter().any(|&p| p == \"comments\") {\n+ parse_post_listing(&v)\n+ } else {\n+ parse_subreddit_about(&v)\n+ }\n+}\n+\n+fn parse_subreddit_about(v: &serde_json::Value) -> Option {\n+ let data = v.get(\"data\")?;\n+ let title = data\n+ .get(\"title\")\n+ .or_else(|| data.get(\"display_name\"))\n+ .and_then(|t| t.as_str())?\n+ .to_string();\n+ let body_html = data\n+ .get(\"public_description_html\")\n+ .or_else(|| data.get(\"public_description\"))\n+ .and_then(|t| t.as_str())\n+ .map(|s| s.to_string());\n+ let thumb_url = data\n+ .get(\"icon_img\")\n+ .or_else(|| data.get(\"community_icon\"))\n+ .and_then(|t| t.as_str())\n+ .filter(|s| !s.is_empty())\n+ .map(|s| s.to_string());\n+\n+ Some(EntityData {\n+ title,\n+ author: None,\n+ body_html,\n+ thumb_url,\n+ })\n+}\n+\n+fn parse_post_listing(v: &serde_json::Value) -> Option {\n+ let listing = v.as_array()?.first()?;\n+ let child = listing\n+ .pointer(\"/data/children/0/data\")?;\n+ let title = child.get(\"title\")?.as_str()?.to_string();\n+ let author = child\n+ .get(\"author\")\n+ .and_then(|a| a.as_str())\n+ .filter(|a| *a != \"[deleted]\")\n+ .map(|s| s.to_string());\n+ let body_html = child\n+ .get(\"selftext_html\")\n+ .and_then(|t| t.as_str())\n+ .filter(|s| !s.is_empty())\n+ .map(|s| s.to_string());\n+ let thumb_url = child\n+ .get(\"thumbnail\")\n+ .and_then(|t| t.as_str())\n+ .filter(|s| s.starts_with(\"http\"))\n+ .map(|s| s.to_string());\n+\n+ Some(EntityData {\n+ title,\n+ author,\n+ body_html,\n+ thumb_url,\n+ })\n+}\n+\n+#[cfg(test)]\n+mod tests {\n+ use super::*;\n+\n+ #[test]\n+ fn map_subreddit_about_url() {\n+ let id = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+ assert_eq!(\n+ map_item_to_reddit_api(&id, false),\n+ \"https://www.reddit.com/r/rust/about.json?raw_json=1\"\n+ );\n+ assert_eq!(\n+ map_item_to_reddit_api(&id, true),\n+ \"https://oauth.reddit.com/r/rust/about.json?raw_json=1\"\n+ );\n+ }\n+\n+ #[test]\n+ fn map_post_url() {\n+ let id =\n+ ItemId::parse(\"reddit.com/r/amitheasshole/comments/1trnvdl\").unwrap();\n+ assert_eq!(\n+ map_item_to_reddit_api(&id, false),\n+ \"https://www.reddit.com/r/amitheasshole/comments/1trnvdl.json?raw_json=1\"\n+ );\n+ }\n+\n+ #[test]\n+ fn map_non_reddit_empty() {\n+ let id = ItemId::opaque(\"example.com/foo\");\n+ assert!(map_item_to_reddit_api(&id, false).is_empty());\n+ }\n+\n+ #[test]\n+ fn parse_subreddit_fixture() {\n+ let json = r#\"{\"kind\":\"t5\",\"data\":{\"title\":\"Rust\",\"display_name\":\"rust\",\"public_description\":\"systems\"}}\"#;\n+ let entity = parse_reddit_json(\n+ &ItemId::parse(\"reddit.com/r/rust\").unwrap(),\n+ json.as_bytes(),\n+ )\n+ .unwrap();\n+ assert_eq!(entity.title, \"Rust\");\n+ }\n+\n+ #[test]\n+ fn parse_post_fixture() {\n+ let json = r#\"[{\"kind\":\"Listing\",\"data\":{\"children\":[{\"kind\":\"t3\",\"data\":{\"title\":\"AITA\",\"author\":\"op\",\"selftext_html\":\"<p>hi</p>\",\"thumbnail\":\"https://b.thumbs.redditmedia.com/x.jpg\"}}]}}]\"#;\n+ let entity = parse_reddit_json(\n+ &ItemId::parse(\"reddit.com/r/x/comments/abc\").unwrap(),\n+ json.as_bytes(),\n+ )\n+ .unwrap();\n+ assert_eq!(entity.title, \"AITA\");\n+ assert_eq!(entity.author.as_deref(), Some(\"op\"));\n+ }\n }\ndiff --git a/server/src/state.rs b/server/src/state.rs\nindex cc1722f5a5bf4d415f2327ea585c488a15a75592..8c03aa60c15aee803a534439400b69935b1a3d84 100644\n--- a/server/src/state.rs\n+++ b/server/src/state.rs\n@@ -5,9 +5,10 @@ use tokio::sync::RwLock;\n use crate::{\n event_log::EventLog,\n events::Event,\n+ journal::JournalClient,\n path_types::ItemId,\n+ reddit::{default_user_agent, RedditBroker},\n reducer::{GlobalTree, VoteData},\n- journal::JournalClient,\n views::ViewStore,\n };\n \n@@ -73,6 +74,7 @@ pub struct AppState {\n pub views: ViewStore,\n pub tree: Arc>,\n journal: JournalClient,\n+ pub reddit: RedditBroker,\n }\n \n impl AppState {\n@@ -112,6 +114,7 @@ impl AppState {\n \n let tree = Arc::new(RwLock::new(tree));\n let journal = JournalClient::spawn(tree.clone(), event_log.clone());\n+ let reddit = RedditBroker::spawn(tree.clone(), &default_user_agent());\n \n Self {\n cfg: Arc::new(cfg),\n@@ -119,6 +122,7 @@ impl AppState {\n views,\n tree,\n journal,\n+ reddit,\n }\n }\n \n@@ -127,8 +131,11 @@ impl AppState {\n id: id.as_str().to_string(),\n };\n self.event_log.append(&event).await.map_err(|e| e.to_string())?;\n- let mut w = self.tree.write().await;\n- w.ensure_path(id);\n+ {\n+ let mut w = self.tree.write().await;\n+ w.ensure_path(id);\n+ }\n+ self.reddit.request_fetch(id.clone());\n Ok(())\n }\n \ndiff --git a/todo b/todo\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..d196e8cb4cc80ccb95eeff01c73607d520e13212\n--- /dev/null\n+++ b/todo\n@@ -0,0 +1,7 @@\n+reddit import (only on explicit request)\n+reddit rendering\n+vote redering\n+pair chosing\n+nsfw gate\n+\n+logins (uuid user, two sides, oauths, and pseudonyms)\n","role":"user"}],"model":"openai/gpt-chat-latest"}