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