Side A is a focused, well-tested refactor that consolidates path/URL logic into a shared types crate with correct-by-construction newtypes, removing duplicated string-based helpers while preserving behavior (tests carried over and passing). Side B is a much larger, riskier architectural rewrite (scope→fractal-tree, settlement→journal, subreddit-only parser→generic ItemId) that touches many core modules with less certainty of correctness and a vague commit message ('reconfigure'), making it harder to trust as durable, reviewed value versus A's clear, incremental centralization.
constitution · epochs · watch · epoch 3
comparison
c_5e9a63e9d276 (tommy-mor) vs c_509fc5155034 (tommy-mor)
download prompt · raw event · cmp_1fc8cb6ac428f2
council reasoning
B replaces flat string scopes with a real hierarchical domain model (ItemId parent/breadcrumbs, GlobalTree/NodeState, journaled NodeEnsured, tree-scoped votes and UI), which changes how rankings and navigation work permanently. A is a strong hygiene refactor—moving canonicalize_* and CanonicalItemUrl into slug-types and wrapping wire hrefs as GardenItemUrl/ForumThreadUrl—but it mostly relocates and type-wraps existing URL rules without introducing comparable new behavior.
Side A performs a substantial architectural consolidation by moving canonical path normalization and URL construction into a shared `types::paths` module, replacing ad hoc string helpers with typed wrappers (`GardenItemUrl`, `ForumThreadUrl`, `TildeOntologyPath`) throughout the server and API models. This centralizes path identity, reduces duplication, and makes RPC/serialization use correct-by-construction types, whereas Side B is a broad reconfiguration introducing a new tree/journal architecture and UI changes but also many placeholders (e.g. stubbed Reddit fetch), renames, and incomplete infrastructure whose lasting value is less clearly realized in the patch itself.
sides
A — c_5e9a63e9d276 (tommy-mor)
message
[a888d56c] refactor: centralize path identity in slug-types Move canonicalization and CanonicalItemUrl into types::paths with GardenItemUrl, ForumThreadUrl, and TildeOntologyPath for JSON hrefs. Server canonical_path and path_types re-export slug-types; RPC and validation build hrefs via those types instead of string helpers. Made-with: Cursor
diff preview
diff --git a/server/src/api/helpers.rs b/server/src/api/helpers.rs
index 9b71491e9f9efc44a2a4beba09be8f64bd2ff2ee..03b3e77911ccd662bec8635345dafe2593cf242e 100644
--- a/server/src/api/helpers.rs
+++ b/server/src/api/helpers.rs
@@ -4,12 +4,12 @@ use axum::{
Json,
};
use sha2::{Digest, Sha256};
+use slug_types::paths::{CanonicalItemUrl, GardenItemUrl};
use slug_types::*;
use std::collections::HashMap;
use crate::{
canonical_path::canonicalize_item,
- path_types::CanonicalItemUrl,
ranking::connected_components_from_voted_pairs,
};
@@ -30,64 +30,6 @@ pub fn now_ms() -> i64 {
t.as_millis() as i64
}
-/// Serialize a canonical item for JSON: absolute URLs stay as-is; bare paths get a `/` prefix.
-pub fn item_path_for_api(item: &str) -> String {
- if item.starts_with("http://") || item.starts_with("https://") {
- item.to_string()
- } else {
- format!("/{}", item)
- }
-}
-
-/// Same as [`item_path_for_api`], but for private rooms ontology items are prefixed with
-/// `/r/{short}/{slug}` so the URL matches the web app (`/r/…/~/…` routes).
-pub fn item_path_for_api_in_room(item: &str, room_wire: &str) -> String {
- let room = room_wire.trim();
- if room.is_empty() || room == "public" {
- return item_path_for_api(item);
- }
- let Some((short, slug)) = room.split_once('/') else {
- return item_path_for_api(item);
- };
- if short.is_empty() || slug.is_empty() {
- return item_path_for_api(item);
- }
- let Some(c) = CanonicalItemUrl::parse(item) else {
- return item_path_for_api(item);
- };
- let root = CanonicalItemUrl::ontology_root();
- let item_norm = c.as_str().trim_end_matches('/');
- let root_norm = root.as_str().trim_end_matches('/');
- if let Some(tail) = c.tilde_tail() {
- return if tail.is_empty() {
- format!("https://slug.social/r/{short}/{slug}/~")
- } else {
- format!("https://slug.social/r/{short}/{slug}/~/{}", tail)
- };
- }
- if item_norm == root_norm {
- return format!("https://slug.social/r/{short}/{slug}/~");
- }
- item_path_for_api(item)
-}
-
-/// Absolute thread URL for forum JSON (`/t/…` vs `/r/…/t/…`).
-pub fn forum_thread_web_url(room_wire: &str, thread_tag: &str) -> String {
- let room = room_wire.trim();
- let tag = thread_tag.trim().trim_start_matches('#');
- if room.is_empty() || room == "public" {
- format!("https://slug.social/t/{tag}")
- } else if let Some((short, slug)) = room.split_once('/') {
- if short.is_empty() || slug.is_empty() {
- format!("https://slug.social/t/{tag}")
- } else {
- format!("https://slug.social/r/{short}/{slug}/t/{tag}")
- }
- } else {
- format!("https://slug.social/t/{tag}")
- }
-}
-
/// Resolve an item path as a first-class canonical path.
pub fn resolve_item(item: &str) -> Result<String, String> {
let canonical = canonicalize_item(item);
@@ -109,14 +51,12 @@ pub fn parse_parent_specs(parent: Option<&String>) -> Vec<String> {
}
/// Apply offset+limit pagination to the flattened component rankings.
-/// Items are flattened in component order (largest component first), then unranked last.
-/// Returns (components, unranked_items) after the window.
pub fn paginate_rankings(
components: Vec<RankComponent>,
- unranked_items: Vec<String>,
+ unranked_items: Vec<GardenItemUrl>,
offset: usize,
limit: Option<usize>,
-) -> (Vec<RankComponent>, Vec<String>) {
+) -> (Vec<RankComponent>, Vec<GardenItemUrl>) {
let mut remaining_skip = offset;
let mut remaining_take = limit.unwrap_or(usize::MAX);
let mut out_components: Vec<RankComponent> = Vec::new();
@@ -141,7 +81,7 @@ pub fn paginate_rankings(
});
}
- let out_unranked: Vec<String> = if remaining_take > 0 {
+ let out_unranked: Vec<GardenItemUrl> = if remaining_take > 0 {
unranked_items
.into_iter()
.skip(remaining_skip)
@@ -183,11 +123,9 @@ pub fn is_pair_voted(group: &crate::reducer::GroupState, a: &str, b: &str) -> bo
group.voted_pairs.contains(&(i, j))
}
-/// Compute graph connectivity stats for a set of items within the ranking group.
pub fn compute_connectivity_stats(group: &crate::reducer::GroupState, pool: &[String]) -> ConnectivityStats {
let n = pool.len();
- // Map pool items to global indices (items not yet in the group get no index)
let global_idxs: Vec<Option<usize>> = pool
.iter()
.map(|it| {
@@ -197,7 +135,6 @@ pub fn compute_connectivity_stats(group: &crate::reducer::GroupState, pool: &[St
.collect();
let present: Vec<usize> = global_idxs.iter().filter_map(|x| *x).collect();
- // Build local index mapping for items that exist in the ranking group
let global_to_local: HashMap<usize, usize> = present
.iter()
.enumerate()
@@ -213,7 +150,6 @@ pub fn compute_connectivity_stats(group: &crate::reducer::GroupState, pool: &[St
}),
);
- // Items not in the ranking group at all are also isolates
let items_not_in_group = global_idxs.iter().filter(|x| x.is_none()).count();
let num_components = comps.len() + isolates.len() + items_not_in_group;
@@ -237,52 +173,3 @@ pub fn vote_touches_path(a: &str, b: &str, parent_canon: &str) -> bool {
let under = |item: &str| item == parent_canon || item.starts_with(&format!("{}/", parent_canon));
under(a) || under(b)
}
-
-#[cfg(test)]
-mod wire_url_tests {
- use super::{forum_thread_web_url, item_path_for_api_in_room};
-
- #[test]
- fn public_room_unchanged() {
- let u = "https://slug.social/~/a/b";
- assert_eq!(item_path_for_api_in_room(u, "public"), u);
- }
-
- #[test]
- fn private_room_prefixes_ontology() {
- assert_eq!(
- item_path_for_api_in_room("https://slug.social/~/topic/x", "9ab12cd/my-room"),
- "https://slug.social/r/9ab12cd/my-room/~/topic/x"
- );
- }
-
- #[test]
- fn private_room_ontology_root() {
- assert_eq!(
- item_path_for_api_in_room("https://slug.social/~", "9ab12cd/my-room"),
- "https://slug.social/r/9ab12cd/my-room/~"
- );
- assert_eq!(
- item_path_for_api_in_room("https://slug.social/~/", "9ab12cd/my-room"),
- "https://slug.social/r/9ab12cd/my-room/~"
- );
- }
-
- #[test]
- fn external_url_untouched_in_private_room() {
- let u = "https://example.com/z";
- assert_eq!(item_path_for_api_in_room(u, "9ab12cd/my-room"), u);
- }
-
- #[test]
- fn forum_web_public_vs_room() {
- assert_eq!(
- forum_thread_web_url("public", "debate"),
- "https://slug.social/t/debate"
- );
- assert_eq!(
- forum_thread_web_url("9ab12cd/my-room", "#debate"),
- "https://slug.social/r/9ab12cd/my-room/t/debate"
- );
- }
-}
diff --git a/server/src/api/mod.rs b/server/src/api/mod.rs
index 042aa248305f9362a3be78f9eea2a5abf6ba707a..cf22cb0129366c3aed031bc86f3197a4321cb806 100644
--- a/server/src/api/mod.rs
+++ b/server/src/api/mod.rs
@@ -24,8 +24,7 @@ pub use auth::{
pub use helpers::{
api_error, compute_connectivity_stats, is_pair_voted, now_ms, paginate_rankings,
- parse_parent_specs, pick_random_distinct, sha256_hex, resolve_item, vote_touches_path,
- item_path_for_api,
+ parse_parent_specs, pick_random_distinct, resolve_item, sha256_hex, vote_touches_path,
};
pub use rpc::handle_rpc_batch;
diff --git a/server/src/api/rpc.rs b/server/src/api/rpc.rs
index 5b91f5836625eedbb1cd9423168046e3fb576c17..5f7d50188f1381267402f2e57e671234ef5db2fd 100644
--- a/server/src/api/rpc.rs
+++ b/server/src/api/rpc.rs
@@ -8,6 +8,7 @@ use axum::{
Json,
};
use rand::seq::SliceRandom;
+use slug_types::paths::{ForumThreadUrl, GardenItemUrl, TildeOntologyPath};
use slug_types::*;
use crate::{
@@ -27,9 +28,8 @@ use crate::{
use super::auth::verify_bearer_principal;
use super::helpers::{
- compute_connectivity_stats, forum_thread_web_url, is_pair_voted, item_path_for_api,
- item_path_for_api_in_room, now_ms, paginate_rankings, parse_parent_specs, pick_random_distinct,
- resolve_item, vote_touches_path,
+ compute_connectivity_stats, is_pair_voted, now_ms, paginate_rankings, parse_parent_specs,
+ pick_random_distinct, resolve_item, vote_touches_path,
};
use super::validate::{normalize_room_and_thread, validate_ingest_document};
@@ -184,7 +184,7 @@ fn compute_scope_rank_changes(
};
if changed {
changes.push(RankChange {
- item: item_path_for_api_in_room(&item, room_wire),
+ item: GardenItemUrl::from_storage_str(&item, room_wire),
before: b,
after: a,
});
@@ -206,7 +206,7 @@ fn compute_scope_rank_changes(
parent: if parent.is_empty() {
"/".to_string()
} else {
- item_path_for_api_in_room(parent, room_wire)
+ GardenItemUrl::from_storage_str(parent, room_wire).into_inner()
},
changes,
})
@@ -302,7 +302,7 @@ fn build_rank_response_for_content(
.ranked
.into_iter()
.map(|r| RankRow {
- item: item_path_for_api_in_room(r.item.as_str(), room_wire),
+ item: GardenItemUrl::from_stored(&r.item, room_wire),
percent: if want_percent {
Some((r.score / max_score) * 100.0)
} else {
@@ -315,10 +315,10 @@ fn build_rank_response_for_content(
})
.collect();
- let prefixed_unranked: Vec<String> = rankings
+ let prefixed_unranked: Vec<GardenItemUrl> = rankings
.unranked_items
.into_iter()
- .map(|s| item_path_for_api_in_room(s.as_str(), room_wire))
+ .map(|s| GardenItemUrl::from_stored(&s, room_wire))
.collect();
let (components, unranked_items) = if offset > 0 || limit.is_some() {
@@ -537,13 +537,13 @@ async fn rpc_post(
(
"npx slugsocial public garden pair".to_string(),
"npx slugsocial public garden rank".to_string(),
- forum_thread_web_url("public", &thread_id),
+ ForumThreadUrl::from_room_tag("public", &thread_id),
)
} else {
(
format!("npx slugsocial private {room_key} garden pair"),
format!("npx slugsocial private {room_key} garden rank"),
- forum_thread_web_url(&room_key, &thread_id),
+ ForumThreadUrl::from_room_tag(&room_key, &thread_id),
)
};
@@ -664,7 +664,7 @@ async fn rpc_check(
.ranked
.into_iter()
.map(|r| RankRow {
- item: item_path_for_api_in_room(r.item.as_str(), &room_key),
+ item: GardenItemUrl::from_stored(&r.item, &room_key),
score: r.score,
percent: None,
})
@@ -672,12 +672,12 @@ async fn rpc_check(
})
.collect();
CheckScopeRanking {
- parent: item_path_for_api_in_room(parent.as_str(), &room_key),
+ parent: GardenItemUrl::from_stored(parent, &room_key).into_inner(),
components,
unranked_items: scoped
.unranked_items
.into_iter()
- .map(|it| item_path_for_api_in_room(it.as_str(), &room_key))
+ .map(|it| GardenItemUrl::from_stored(&it, &room_key))
.collect(),
}
})
@@ -687,13 +687,13 @@ async fn rpc_check(
vec![
"npx slugsocial public forum post <TAG> --delegate <uuid:rig:
… preview truncated; 46,249 characters omittedB — c_509fc5155034 (tommy-mor)
message
[88577c56] reconfigure
diff preview
diff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs
index c4ab9d65c7b3cd42a5b4d093ba429993c101e9a8..82b2aa51d21ada1d0d849d3ddfc3a81e4241d861 100644
--- a/server/src/api/ui_html.rs
+++ b/server/src/api/ui_html.rs
@@ -9,7 +9,9 @@ use crate::{
html::{js_string_literal, ranking_panel, JsBuilder},
parser::parse_reddit_url,
parser_render::navigate_panel,
- state::AppState,
+ path_types::ItemId,
+ reddit::ensure_partial_tree,
+ state::{parse_item_param, AppState},
ui_action::{parse_html_ui_from_form, HtmlUiAction},
};
@@ -25,6 +27,10 @@ fn ui_js_warn(msg: &str) -> Response {
.unwrap()
}
+fn parent_from_scope(scope: &str) -> ItemId {
+ parse_item_param(scope)
+}
+
pub async fn post_ui_html(
State(state): State<AppState>,
Form(form): Form<HashMap<String, String>>,
@@ -42,24 +48,36 @@ pub async fn post_ui_html(
ratio_right,
scope,
} => {
+ let parent = parent_from_scope(&scope);
if let Err(e) = state
- .record_vote(&scope, &a, &b, ratio_left, ratio_right)
+ .record_vote(&parent, &a, &b, ratio_left, ratio_right)
.await
{
return ui_js_warn(&e).into_response();
}
- let scope = crate::state::normalize_scope(&scope);
- let groups = state.groups.read().await;
+ let tree = state.tree.read().await;
let empty = crate::reducer::GroupState::new();
- let group = groups.get(&scope).unwrap_or(&empty);
- let panel = ranking_panel(&scope, group);
+ let group = tree
+ .get(&parent)
+ .map(|n| &n.local_ranking)
+ .unwrap_or(&empty);
+ let panel = ranking_panel(&parent, group);
JsBuilder::new()
.morph_selector("#ranking-panel", panel)
.into_response()
}
HtmlUiAction::ParseQuery { query } => match parse_reddit_url(&query) {
- Ok(subreddit) => {
- let dest = format!("/?sub={subreddit}");
+ Ok(item) => {
+ {
+ let mut tree = state.tree.write().await;
+ 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())
+ };
JsBuilder::new()
.raw(&format!(
"window.location.href={};",
diff --git a/server/src/events.rs b/server/src/events.rs
index a862370fc840ffe02184a11c578e18239cc9474d..ed5be6b13b9d46e838831d6ce0f96f569b401730 100644
--- a/server/src/events.rs
+++ b/server/src/events.rs
@@ -5,8 +5,8 @@ use serde::{Deserialize, Serialize};
pub enum Event {
/// Page view recorded (path → counter in views.json).
ViewRecorded { path: String, ts: i64 },
- /// Pairwise comparison vote (replayed into the scope's [`crate::reducer::GroupState`] on boot).
- /// `scope` is the ranking subject (e.g. a subreddit); empty string is the default/global scope.
+ /// Pairwise comparison vote (replayed into the parent node's [`crate::reducer::GroupState`] on boot).
+ /// `scope` is the parent [`crate::path_types::ItemId`] string; empty string is the tree root.
VoteRecorded {
ts: i64,
a: String,
@@ -16,4 +16,6 @@ pub enum Event {
#[serde(default)]
scope: String,
},
+ /// Register a node path in the fractal tree (no external fetch).
+ NodeEnsured { id: String },
}
diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs
index 9650d333d29c4ac94ceb407aee3ee00399c7f40b..c973cb718ac74b95570dabea76e24459417790b9 100644
--- a/server/src/html/mod.rs
+++ b/server/src/html/mod.rs
@@ -12,9 +12,10 @@ use serde::Deserialize;
use crate::{
form_template::template_json_compact,
parser_render::navigate_panel,
+ path_types::ItemId,
ranking::{top_bottom, RankedItem},
- reducer::GroupState,
- state::{normalize_scope, AppState},
+ reducer::{GroupState, NodeState},
+ state::{parse_item_param, AppState},
ui_action::UI_RPC_FIELD,
};
@@ -216,6 +217,48 @@ 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())
+ }
+}
+
+fn segment_label(seg: &str) -> &str {
+ seg
+}
+
+/// Generic breadcrumb trail from an [`ItemId`] path.
+pub fn breadcrumb_path(item: &ItemId) -> Markup {
+ html! {
+ nav class="breadcrumbs" aria-label="Breadcrumb" {
+ a href="/" { "Internet" }
+ @for path in item.breadcrumb_paths() {
+ @let seg = path.segments().last().map_or("", |v| *v);
+ span class="separator" { " / " }
+ a href=(item_href(&path)) { (segment_label(seg)) }
+ }
+ }
+ }
+}
+
+fn entity_panel(node: &NodeState) -> Markup {
+ html! {
+ @if let Some(data) = &node.data {
+ section id="entity-panel" class="demo-panel entity-card" {
+ h2 { (data.title) }
+ @if let Some(author) = &data.author {
+ p class="muted small" { "by " (author) }
+ }
+ @if let Some(body) = &data.body_html {
+ div class="entity-body" { (maud::PreEscaped(body)) }
+ }
+ }
+ }
+ }
+}
+
fn rank_list(label: &str, items: &[RankedItem], start_rank: usize) -> Markup {
html! {
@if !items.is_empty() {
@@ -224,7 +267,9 @@ fn rank_list(label: &str, items: &[RankedItem], start_rank: usize) -> Markup {
@for (i, r) in items.iter().enumerate() {
li {
span class="rank-num" { (start_rank + i) ". " }
- strong { (r.item.as_str()) }
+ a href=(item_href(&r.item)) {
+ strong { (display_label(&r.item)) }
+ }
span class="muted" {
" — "
({ format!("{:.1}%", r.score * 100.0) })
@@ -236,23 +281,30 @@ fn rank_list(label: &str, items: &[RankedItem], start_rank: usize) -> Markup {
}
}
-pub fn ranking_panel(scope: &str, group: &GroupState) -> Markup {
+fn display_label(id: &ItemId) -> String {
+ id.segments()
+ .last()
+ .map_or("Internet", |v| *v)
+ .to_string()
+}
+
+pub fn ranking_panel(item: &ItemId, group: &GroupState) -> Markup {
let total = group.idx_to_item.len();
let (top, bottom) = top_bottom(group, 8);
html! {
section id="ranking-panel" class="demo-panel" {
h2 {
"Ranking"
- @if !scope.is_empty() {
- " — " span class="scope-name" { "r/" (scope) }
+ @if !item.is_root() {
+ " — " span class="scope-name" { (item.as_str()) }
}
}
@if total == 0 {
p class="muted" {
- @if scope.is_empty() {
+ @if item.is_root() {
"No votes yet — compare two items below."
} @else {
- "No votes yet for r/" (scope) " — compare two items below to start the ranking."
+ "No votes yet for " (item.as_str()) " — compare two items below to start the ranking."
}
}
} @else {
@@ -266,7 +318,8 @@ pub fn ranking_panel(scope: &str, group: &GroupState) -> Markup {
}
}
-pub fn vote_panel(scope: &str) -> Markup {
+pub fn vote_panel(parent: &ItemId) -> Markup {
+ let parent_str = parent.as_str();
let rpc = template_json_compact(&serde_json::json!({
"action": "record_vote",
"a": {"$form": "item_a"},
@@ -280,16 +333,17 @@ pub fn vote_panel(scope: &str) -> Markup {
section id="vote-panel" class="demo-panel" {
h2 { "Compare" }
p class="muted small" {
- @if scope.is_empty() {
+ @if parent.is_root() {
"Left item wins at 2:1. Votes append to the JSONL log and update rank centrality."
} @else {
- "Ranking " span class="scope-name" { "r/" (scope) }
+ "Ranking children of "
+ span class="scope-name" { (parent_str) }
". Left item wins at 2:1; each vote updates this ranking."
}
}
form method="post" action="/ui" id="vote-form" {
input type="hidden" name=(UI_RPC_FIELD) value=(rpc);
- input type="hidden" name="scope" value=(scope);
+ input type="hidden" name="scope" value=(parent_str);
div class="vote-fields" {
label {
"Left (wins) "
@@ -329,17 +383,30 @@ pub async fn home(
let views = state.views.get_views(&path);
let theme = theme_from_jar(&jar);
let theme_next = theme_next_from_uri(&uri);
- let scope = normalize_scope(&query_param(&uri, "sub").unwrap_or_default());
- let groups = state.groups.read().await;
- let empty = GroupState::new();
- let group = groups.get(&scope).unwrap_or(&empty);
+ 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();
+ let node = tree.get(&item).unwrap_or(&empty_node);
+ let group = &node.local_ranking;
let body = html! {
h1 { "sorter2" }
+ (breadcrumb_path(&item))
(navigate_panel("", None))
- (vote_panel(&scope))
- (ranking_panel(&scope, group))
+ (entity_panel(node))
+ (vote_panel(&item))
+ (ranking_panel(&item, group))
};
layout("sorter2", body, views, theme, &theme_next)
}
diff --git a/server/src/journal.rs b/server/src/journal.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b02ca025683621470ffdf8cd85cf9b85c56d024d
--- /dev/null
+++ b/server/src/journal.rs
@@ -0,0 +1,89 @@
+use std::sync::Arc;
+
+use tokio::sync::{mpsc, oneshot, RwLock};
+
+use crate::{
+ event_log::EventLog,
+ events::Event,
+ path_types::ItemId,
+ reducer::{GlobalTree, VoteData},
+};
+
+pub struct JournalCommand {
+ pub parent: ItemId,
+ pub vote: VoteData,
+ pub event: Event,
+ pub reply: oneshot::Sender<Result<(), String>>,
+}
+
+#[derive(Clone)]
+pub struct JournalClient {
+ tx: mpsc::Sender<JournalCommand>,
+}
+
+impl JournalClient {
+ pub fn spawn(tree: Arc<RwLock<GlobalTree>>, event_log: Arc<EventLog>) -> Self {
+ let (tx, rx) = mpsc::channel(64);
+ tokio::spawn(journal_worker(rx, tree, event_log));
+ Self { tx }
+ }
+
+ pub async fn record_vote(
+ &self,
+ parent: ItemId,
+ vote: VoteData,
+ event: Event,
+ ) -> Result<(), String> {
+ let (reply, rx) = oneshot::channel();
+ self.tx
+ .send(JournalCommand {
+ parent,
+ vote,
+ event,
+ reply,
+ })
+ .await
+ .map_err(|_| "journal worker stopped".to_string())?;
+ rx.await
+ .map_err(|_| "journal worker stopped".to_string())?
+ }
+}
+
+async fn journal_worker(
+
… preview truncated; 29,088 characters omittedHardlinks — judgments / attempts / prompt
judgments
attempts
Prompt text is loaded only by the download route.