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: [3bc88847] removed optional Side A — unified diff (full patch): diff --git a/server/src/api/rpc.rs b/server/src/api/rpc.rs index ba93ca87182d49f57dffc8220f604ffa150f9a6c..5049a26b096bd8435d6eb9e75ccb751b6f489061 100644 --- a/server/src/api/rpc.rs +++ b/server/src/api/rpc.rs @@ -1337,8 +1337,7 @@ pub async fn handle_rpc_batch( .ingests_by_scope_thread .get(&(scope.clone(), e.thread.clone())) .and_then(|q| q.iter().rev().position(|id| id == &e.post_id)) - .map(|i| i + 1) - .unwrap_or(0); + .expect("rank history post_id must be in ingests_by_scope_thread for (scope, thread)"); RankHistoryRow { ts: e.ts, scope_rank: e.scope_rank, diff --git a/server/src/html/garden.rs b/server/src/html/garden.rs index 319feb15a6b68d2b5df98b4289fedbc9bdd048d3..23245d6fdfc9019b199ab8417150faf5f3297067 100644 --- a/server/src/html/garden.rs +++ b/server/src/html/garden.rs @@ -450,6 +450,7 @@ struct RankHistoryEntryView { scope_total: usize, scope_rank_delta: i32, thread: String, + /// 0-based index as [`crate::html::forum::ingest::thread_post_index_in_scope`] / `/t/tag/N`. thread_post_index: usize, caused_by: Vec, } @@ -573,11 +574,11 @@ fn build_rank_history( }) .unwrap_or_default(); - let thread_post_index = reduced.ingests_by_scope_thread + let thread_post_index = reduced + .ingests_by_scope_thread .get(&(scope.clone(), e.thread.clone())) .and_then(|q| q.iter().rev().position(|id| id == &e.post_id)) - .map(|i| i + 1) - .unwrap_or(0); + .expect("rank history post_id must be in ingests_by_scope_thread for (scope, thread)"); RankHistoryEntryView { ts: e.ts, @@ -704,11 +705,9 @@ async fn render_scope_view( span class="muted" { (ago) (label) } " · " a href=(thread_href(&e.thread)) { "#" (e.thread) } - @if e.thread_post_index > 0 { - " " - a href=(format!("{}/{}", thread_href(&e.thread), e.thread_post_index)) { - span class="muted" { "post #" (e.thread_post_index) } - } + " " + a href=(format!("{}/{}", thread_href(&e.thread), e.thread_post_index)) { + span class="muted" { "post #" (e.thread_post_index) } } } @if e.caused_by.is_empty() { diff --git a/server/tests/integration.rs b/server/tests/integration.rs index d4c5bfe9c6f1c71dc61878bd8c5e729b1b7c69ef..9766adb43ad315a64f5df17b79f66718ce149509 100644 --- a/server/tests/integration.rs +++ b/server/tests/integration.rs @@ -1322,6 +1322,11 @@ async fn test_rank_history() { assert_eq!(entry["scope_rank_delta"], 0, "delta is 0 on first appearance"); let caused_by = entry["caused_by"].as_array().unwrap(); assert_eq!(caused_by.len(), 2, "both votes in the ingest touched rust"); + assert_eq!( + entry["thread_post_index"], + 0, + "rank history links use same 0-based index as /t/hist-test/0" + ); ingest( "00000000-0000-0000-0000-000000000002:rig:test/model", @@ -1349,6 +1354,16 @@ async fn test_rank_history() { assert_eq!(caused_by2.len(), 1); assert!(caused_by2[0]["a"].as_str().unwrap().ends_with("python") || caused_by2[0]["b"].as_str().unwrap().ends_with("python")); + assert_eq!( + hist2[0]["thread_post_index"], + 0, + "first hist-test post is chronological index 0" + ); + assert_eq!( + hist2[1]["thread_post_index"], + 1, + "second ingest is chronological index 1" + ); let hist_rust2 = rpc_batch( &client, diff --git a/types/src/lib.rs b/types/src/lib.rs index edbb923e4d7d41ad82dfc254c3bd697562383527..49abba8ea9f786ef68e3157d2a5d309e15e09ba0 100644 --- a/types/src/lib.rs +++ b/types/src/lib.rs @@ -253,7 +253,7 @@ pub struct FeedPost { /// Primary thread tag (without #), if the ingest declared one. #[serde(skip_serializing_if = "Option::is_none")] pub thread: Option, - /// 1-indexed chronological position of this post within the thread. + /// 1-based display ordinal for this post within the thread (feed only; URLs use 0-based paths). #[serde(skip_serializing_if = "Option::is_none")] pub thread_post_index: Option, /// Full raw body of the ingest document. @@ -628,7 +628,7 @@ pub struct RankHistoryRow { pub score: f64, /// Thread tag of the ingest that triggered this rank change. pub thread: String, - /// 1-indexed chronological position of this post within the thread. + /// 0-indexed chronological position of this post within the thread (same as `/t/tag/N` routes). pub thread_post_index: usize, /// Votes from this ingest that directly touched this item. Empty when change was transitive. pub caused_by: Vec, Side B — contributor: tommy-mor Side B — commit message: [4cd0d15d] more seed Side B — 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) + } +}