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: [4cd0d15d] more seed Side A — unified diff (full patch): diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..9cb07c60cb0da063f747cfbf1b3b876ecb8ba03e --- /dev/null +++ b/Dockerfile @@ -0,0 +1,34 @@ +# time 0.3.47+ requires Rust 1.88 (edition 2024) +FROM rust:1.88-slim as builder + +WORKDIR /build + +RUN apt-get update && \ + apt-get install -y pkg-config libssl-dev && \ + rm -rf /var/lib/apt/lists/* + +# Copy source and build. (Keep it simple to avoid remote build cache oddities.) +COPY . . +RUN cargo build --release --package slugsocial-server + +FROM debian:bookworm-slim + +RUN apt-get update && \ + apt-get install -y ca-certificates && \ + rm -rf /var/lib/apt/lists/* + +WORKDIR /app + +COPY --from=builder /build/target/release/slugsocial-server /app/slugsocial-server + +# Create data directory for persistent volume +RUN mkdir -p /data + +ENV SLUG_DATA_DIR=/data +ENV SLUG_EVENT_LOG=/data/events.jsonl +ENV PORT=8080 + +EXPOSE 8080 + +CMD ["/app/slugsocial-server"] + diff --git a/deps.edn b/deps.edn new file mode 100644 index 0000000000000000000000000000000000000000..0bf892d44f491cb2313e01ae8a942c3097c52948 --- /dev/null +++ b/deps.edn @@ -0,0 +1,10 @@ +{:paths ["." "test"] + :deps {cheshire/cheshire {:mvn/version "5.13.0"} + http-kit/http-kit {:mvn/version "2.8.0"} + babashka/fs {:mvn/version "0.5.32"} + babashka/process {:mvn/version "0.6.25"} + com.blockether/spel {:mvn/version "0.7.11"}} + :aliases + {:kaocha {:extra-deps {lambdaisland/kaocha {:mvn/version "1.91.1392"} + lambdaisland/kaocha-junit-xml {:mvn/version "1.17.101"}} + :main-opts ["-m" "kaocha.runner"]}}} diff --git a/event_log.rs b/event_log.rs new file mode 100644 index 0000000000000000000000000000000000000000..eaae0d495e43a45d6590603892265a62cc92906e --- /dev/null +++ b/event_log.rs @@ -0,0 +1,83 @@ +use std::path::{Path, PathBuf}; + +use tokio::{ + fs::{self, OpenOptions}, + io::{AsyncBufReadExt, AsyncWriteExt, BufReader}, +}; + +use crate::events::Event; + +#[derive(Debug, thiserror::Error)] +pub enum EventLogError { + #[error("io error: {0}")] + Io(#[from] std::io::Error), + #[error("json error: {0}")] + Json(#[from] serde_json::Error), +} + +#[derive(Debug, Clone)] +pub struct EventLog { + path: PathBuf, +} + +impl EventLog { + pub fn new(path: impl Into) -> Self { + Self { path: path.into() } + } + + pub fn path(&self) -> &Path { + &self.path + } + + pub async fn ensure_parent_dir(&self) -> Result<(), EventLogError> { + if let Some(parent) = self.path.parent() { + fs::create_dir_all(parent).await?; + } + Ok(()) + } + + pub async fn append(&self, event: &Event) -> Result<(), EventLogError> { + self.ensure_parent_dir().await?; + let mut f: tokio::fs::File = OpenOptions::new() + .create(true) + .append(true) + .open(&self.path) + .await?; + + let mut line = serde_json::to_string(event)?; + line.push('\n'); + f.write_all(line.as_bytes()).await?; + f.flush().await?; + Ok(()) + } + + /// Load events from JSONL. Corrupt lines are skipped and returned as `(line_no, line)`. + pub async fn load_all(&self) -> Result<(Vec, Vec<(usize, String)>), EventLogError> { + if !fs::try_exists(&self.path).await? { + return Ok((vec![], vec![])); + } + + let f = fs::File::open(&self.path).await?; + let mut reader = BufReader::new(f).lines(); + + let mut events = Vec::new(); + let mut bad_lines = Vec::new(); + + let mut line_no: usize = 0; + while let Some(line) = reader.next_line().await? { + line_no += 1; + let trimmed = line.trim(); + if trimmed.is_empty() { + continue; + } + match serde_json::from_str::(trimmed) { + Ok(ev) => events.push(ev), + Err(_) => bad_lines.push((line_no, line)), + } + } + + Ok((events, bad_lines)) + } +} + + diff --git a/fly.toml b/fly.toml new file mode 100644 index 0000000000000000000000000000000000000000..bbb9345e527452db1d87a549213645c195eae5fc --- /dev/null +++ b/fly.toml @@ -0,0 +1,42 @@ +app = "slugsocial" +primary_region = "iad" + +[build] + dockerfile = "Dockerfile" + +[env] + SLUG_DATA_DIR = "/data" + SLUG_EVENT_LOG = "/data/events.jsonl" + PORT = "8080" + +[[services]] + internal_port = 8080 + protocol = "tcp" + + [[services.ports]] + port = 80 + handlers = ["http"] + force_https = true + + [[services.ports]] + port = 443 + handlers = ["tls", "http"] + + [services.concurrency] + type = "connections" + hard_limit = 1000 + soft_limit = 500 + + [[services.http_checks]] + interval = "10s" + timeout = "2s" + grace_period = "5s" + method = "GET" + path = "/healthz" + protocol = "http" + tls_skip_verify = false + +[[mounts]] + source = "slugsocial_data" + destination = "/data" + diff --git a/views.rs b/views.rs new file mode 100644 index 0000000000000000000000000000000000000000..d4f0ffc49475f014698b4da0de6f476884430813 --- /dev/null +++ b/views.rs @@ -0,0 +1,63 @@ +use std::{ + collections::HashMap, + sync::{Arc, Mutex}, +}; +use tokio::sync::mpsc; + +type CountMap = Arc>>; + +#[derive(Clone)] +pub struct ViewStore { + counts: CountMap, + flush_tx: mpsc::Sender<()>, +} + +impl ViewStore { + pub fn new(json_path: &str) -> Self { + // Load existing counts from disk on startup (best-effort) + let initial: HashMap = std::fs::read_to_string(json_path) + .ok() + .and_then(|s| serde_json::from_str(&s).ok()) + .unwrap_or_default(); + + let counts: CountMap = Arc::new(Mutex::new(initial)); + let (flush_tx, mut flush_rx) = mpsc::channel::<()>(64); + let path = json_path.to_string(); + + let counts_for_writer = counts.clone(); + tokio::spawn(async move { + while flush_rx.recv().await.is_some() { + while flush_rx.try_recv().is_ok() {} + + let snapshot: HashMap = { + counts_for_writer.lock().unwrap().clone() + }; + + let path = path.clone(); + let _ = tokio::task::spawn_blocking(move || { + if let Ok(json) = serde_json::to_string(&snapshot) { + let tmp = format!("{path}.tmp"); + if std::fs::write(&tmp, &json).is_ok() { + let _ = std::fs::rename(&tmp, &path); + } + } + }) + .await; + } + }); + + Self { counts, flush_tx } + } + + pub fn increment(&self, path: String) { + { + let mut map = self.counts.lock().unwrap(); + *map.entry(path).or_insert(0) += 1; + } + let _ = self.flush_tx.try_send(()); + } + + pub fn get_views(&self, path: &str) -> u64 { + self.counts.lock().unwrap().get(path).copied().unwrap_or(0) + } +} Side B — contributor: tommy-mor Side B — commit message: [78964dd7] nice Side B — unified diff (full patch): diff --git a/server/src/fetch/html.rs b/server/src/fetch/html.rs index 9b6c2d0964640a157bca2a6a64cb0820238d8e4f..3e0309ff1c2ac1b17923922d2340ba6710e0f9d1 100644 --- a/server/src/fetch/html.rs +++ b/server/src/fetch/html.rs @@ -11,6 +11,9 @@ use crate::{ }; fn entity_panel(node: &NodeState) -> Markup { + if let Some(markup) = crate::render::reddit::entity_markup(node) { + return markup; + } html! { @if let Some(data) = &node.data { div id="entity-panel" class="entity-card" { diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs index e88cc43ddc9d8100f7994be6f5960ec4d8f22c55..3bf9fc7e92e50beed24e2c25106a77421038c90b 100644 --- a/server/src/html/mod.rs +++ b/server/src/html/mod.rs @@ -153,16 +153,21 @@ pub fn breadcrumb_path(item: &ItemId) -> Markup { } } -fn rank_list(label: &str, items: &[RankedItem], start_rank: usize) -> Markup { +fn rank_list(label: &str, items: &[RankedItem], start_rank: usize, tree: &GlobalTree) -> Markup { html! { @if !items.is_empty() { h3 class="rank-heading muted small" { (label) } ol class="rank-list" { @for (i, r) in items.iter().enumerate() { - li { + @let href = item_href(&r.item); + li class=(if crate::render::reddit::is_reddit_post(&r.item) { "reddit-post-row" } else { "" }) { span class="rank-num" { (start_rank + i) ". " } - a href=(item_href(&r.item)) { - strong { (display_label(&r.item)) } + @if let Some(row) = crate::render::reddit::child_row_markup(tree, &r.item, &href) { + (row) + } @else { + a href=(href) { + strong { (display_label(&r.item)) } + } } span class="muted" { " — " @@ -196,9 +201,14 @@ fn unranked_list(label: &str, items: &[ItemId], tree: &GlobalTree) -> Markup { h3 class="rank-heading muted small" { (label) } ul class="rank-list unranked" { @for it in items { - li { - a href=(item_href(it)) { - strong { (child_label(tree, it)) } + @let href = item_href(it); + li class=(if crate::render::reddit::is_reddit_post(it) { "reddit-post-row" } else { "" }) { + @if let Some(row) = crate::render::reddit::child_row_markup(tree, it, &href) { + (row) + } @else { + a href=(href) { + strong { (child_label(tree, it)) } + } } } } @@ -253,7 +263,7 @@ pub fn ranking_panel(item: &ItemId, node: &NodeState, tree: &GlobalTree) -> Mark } @else { @for (gi, ranked) in ranked_groups.iter().enumerate() { @let label = if multi { format!("Ranking group {}", gi + 1) } else { "Ranking".to_string() }; - (rank_list(&label, ranked, 1)) + (rank_list(&label, ranked, 1, tree)) } (unranked_list("Unranked", &unranked, tree)) } diff --git a/server/src/lib.rs b/server/src/lib.rs index 0677363e0ed21d244bfa065f7ec728549ddd9e50..da5f3ebecec1794b05a2a69cc78379551b2ad769 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -8,6 +8,7 @@ pub mod parser; pub mod path_types; pub mod ranking; pub mod reddit; +pub mod render; pub mod reducer; pub mod journal; pub mod state; diff --git a/server/src/reddit.rs b/server/src/reddit.rs index 69d979bc7e4a1cb078f70114dc539bdc1986b574..1168ec2afc77c092514eec91b513bac301cbe225 100644 --- a/server/src/reddit.rs +++ b/server/src/reddit.rs @@ -608,6 +608,8 @@ fn parse_subreddit_about(v: &Value) -> Option { author: None, body_html, thumb_url, + image_url: None, + link_url: None, }) } @@ -635,15 +637,64 @@ fn parse_post_listing(v: &Value) -> Option { .and_then(|t| t.as_str()) .filter(|s| s.starts_with("http")) .map(|s| s.to_string()); + let image_url = reddit_post_image_url(child); + let link_url = reddit_post_link_url(child); Some(crate::reducer::EntityData { title, author, body_html, thumb_url, + image_url, + link_url, }) } +fn reddit_post_link_url(data: &Value) -> Option { + for key in ["url_overridden_by_dest", "url"] { + if let Some(u) = data.get(key).and_then(|v| v.as_str()) { + if u.starts_with("http") { + return Some(u.to_string()); + } + } + } + None +} + +/// Full-size still for post detail: direct image `url`, else Reddit preview source. +fn reddit_post_image_url(data: &Value) -> Option { + for key in ["url", "url_overridden_by_dest"] { + if let Some(u) = data.get(key).and_then(|v| v.as_str()) { + if reddit_direct_image_url(u) { + return Some(u.to_string()); + } + } + } + reddit_preview_source_url(data) +} + +fn reddit_preview_source_url(data: &Value) -> Option { + data.pointer("/preview/images/0/source/url") + .and_then(|v| v.as_str()) + .filter(|s| s.starts_with("http")) + .map(str::to_string) +} + +fn reddit_direct_image_url(url: &str) -> bool { + let u = url.to_ascii_lowercase(); + if u.contains("redgifs.com") { + return false; + } + u.contains("i.redd.it") + || u.contains("preview.redd.it") + || u.contains("external-preview.redd.it") + || u.ends_with(".jpg") + || u.ends_with(".jpeg") + || u.ends_with(".png") + || u.ends_with(".gif") + || u.ends_with(".webp") +} + #[cfg(test)] mod tests { use super::*; @@ -672,4 +723,20 @@ mod tests { .unwrap(); assert_eq!(entity.title, "The Rust Programming Language"); } + + #[test] + fn parse_post_listing_extracts_thumb_and_full_preview() { + let json = include_str!("../../test/fixtures/reddit/post_preview.json"); + let v: Value = serde_json::from_str(json).unwrap(); + let id = ItemId::parse("reddit.com/r/nsfw/comments/1tpy6a1/angel_eyes").unwrap(); + let entity = entity_view_from_payload(&id, &v).unwrap(); + assert_eq!(entity.title, "Angel Eyes"); + assert!(entity.thumb_url.as_ref().unwrap().contains("width=140")); + assert!(entity.image_url.as_ref().unwrap().contains("auto=webp")); + assert!(!entity.image_url.as_ref().unwrap().contains("redgifs")); + assert_eq!( + entity.link_url.as_deref(), + Some("http://v3.redgifs.com/watch/impossibleprestigioushedgehog") + ); + } } diff --git a/server/src/reducer.rs b/server/src/reducer.rs index 4e42d0369dab50bb2f8ca664aa69b628292f6c07..336e78b77d3ab59361b89af5c9868e13da4ac962 100644 --- a/server/src/reducer.rs +++ b/server/src/reducer.rs @@ -122,7 +122,12 @@ pub struct EntityData { pub title: String, pub author: Option, pub body_html: Option, + /// Small preview (subreddit listing / child rows). pub thumb_url: Option, + /// Full-size still image for the post detail view. + pub image_url: Option, + /// Outbound link for link/video posts (`url` / `url_overridden_by_dest`). + pub link_url: Option, } /// One node in the fractal tree: entity + ranked children. diff --git a/server/src/render/mod.rs b/server/src/render/mod.rs new file mode 100644 index 0000000000000000000000000000000000000000..c2c41404abe01c671139658fcccdeced5be388e4 --- /dev/null +++ b/server/src/render/mod.rs @@ -0,0 +1,3 @@ +//! Domain-specific HTML fragments for imported entities. + +pub mod reddit; diff --git a/server/src/render/reddit.rs b/server/src/render/reddit.rs new file mode 100644 index 0000000000000000000000000000000000000000..4a18de93cf57d8395ded3caa373a708f39b3f43f --- /dev/null +++ b/server/src/render/reddit.rs @@ -0,0 +1,64 @@ +//! Reddit post cards: thumbnail in child lists, full image on the post page. + +use maud::{html, Markup}; + +use crate::{ + path_types::ItemId, + reducer::{EntityData, GlobalTree, NodeState}, +}; + +pub fn is_reddit_post(id: &ItemId) -> bool { + id.as_str().starts_with("reddit.com/") && id.as_str().contains("/comments/") +} + +/// Post detail card (`#entity-panel`). +pub fn entity_markup(node: &NodeState) -> Option { + if !is_reddit_post(&node.id) { + return None; + } + let data = node.data.as_ref()?; + Some(post_entity_card(data)) +} + +/// One row in a parent ranking list (thumbnail + title). +pub fn child_row_markup(tree: &GlobalTree, id: &ItemId, href: &str) -> Option { + if !is_reddit_post(id) { + return None; + } + let data = tree.get(id)?.data.as_ref()?; + Some(html! { + @if let Some(thumb) = &data.thumb_url { + a class="reddit-post-thumb-link" href=(href) { + img class="reddit-post-thumb" src=(thumb) alt="" loading="lazy"; + } + } + a href=(href) { + strong { (data.title) } + } + }) +} + +fn post_entity_card(data: &EntityData) -> Markup { + let image = data.image_url.as_ref().or(data.thumb_url.as_ref()); + html! { + div id="entity-panel" class="entity-card reddit-post" { + h2 { (data.title) } + @if let Some(author) = &data.author { + p class="muted small" { "by " (author) } + } + @if let Some(url) = &data.link_url { + p class="reddit-post-url muted small" { + a href=(url) rel="noopener noreferrer" { (url) } + } + } + @if let Some(src) = image { + figure class="reddit-post-figure" { + img class="reddit-post-image" src=(src) alt="" loading="lazy"; + } + } + @if let Some(body) = &data.body_html { + div class="entity-body" { (maud::PreEscaped(body)) } + } + } + } +} diff --git a/server/static/sorter.css b/server/static/sorter.css index 1f9f5158414902d43a380dd899232c70d8cf5d63..021918f8e778b84e4b3eac8559fab7d223a3d490 100644 --- a/server/static/sorter.css +++ b/server/static/sorter.css @@ -171,6 +171,41 @@ code { margin-top: 0; } +.reddit-post-row { + display: flex; + align-items: center; + gap: 0.6rem; +} + +.reddit-post-thumb-link { + flex-shrink: 0; + line-height: 0; +} + +.reddit-post-thumb { + width: 64px; + height: 64px; + object-fit: cover; + border-radius: 4px; + border: 1px solid var(--border); +} + +.reddit-post-url a { + word-break: break-all; +} + +.reddit-post-figure { + margin: 0.75rem 0; +} + +.reddit-post-image { + display: block; + max-width: 100%; + height: auto; + border-radius: 6px; + border: 1px solid var(--border); +} + .scope-name { color: var(--accent); font-weight: 600; diff --git a/test/fixtures/reddit/post_preview.json b/test/fixtures/reddit/post_preview.json new file mode 100644 index 0000000000000000000000000000000000000000..c6ed31ae397dc0f7b6e07e5e010e617df78d9c18 --- /dev/null +++ b/test/fixtures/reddit/post_preview.json @@ -0,0 +1,22 @@ +{ + "kind": "t3", + "data": { + "title": "Angel Eyes", + "permalink": "/r/nsfw/comments/1tpy6a1/angel_eyes/", + "author": "alice", + "thumbnail": "https://external-preview.redd.it/Kb6Nf5Q4RAucat-2RFcYMeQb2d6vgYNo5EPlf6kGLbs.jpeg?width=140&height=140&auto=webp&s=d7238240ebf191b954ef5f42b0cf61b67aecec88", + "url": "http://v3.redgifs.com/watch/impossibleprestigioushedgehog", + "post_hint": "rich:video", + "preview": { + "images": [ + { + "source": { + "url": "https://external-preview.redd.it/Kb6Nf5Q4RAucat-2RFcYMeQb2d6vgYNo5EPlf6kGLbs.jpeg?auto=webp&s=ccdabee3b81e46ef2d7cec072f6604a09f61dc9a", + "width": 480, + "height": 480 + } + } + ] + } + } +}