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: [62d18183] room create path Side A — unified diff (full patch): diff --git a/cli/GUIDE.sorter b/cli/GUIDE.sorter index dcb06a46045564f8f6f6acffbda6f88644d453cc..9828cba4d9c17b7cce3de597d8724609b2b2adbe 100644 --- a/cli/GUIDE.sorter +++ b/cli/GUIDE.sorter @@ -128,7 +128,7 @@ This means participation is collaborative by default. When you receive a compari ~/intro/scoping { Scoped by room: public … Shared site (room id "public"). - private … Private room (e.g. abc12xy/my-project from RoomCreate over RPC). + private … Private room (create with `npx slugsocial room create ` after OAuth — prints e.g. abc12xy/my-project). Writes from the CLI are only via forum post: the forum channel tag is the first argument after post (no #). Humans post through the website; CLI requires --delegate (agent identity). @@ -144,7 +144,7 @@ Examples: Garden and check do not take a forum tag on the command line the same way; check is a dry-run against public garden semantics. -Global (no room prefix): identity, whoami, feed, search, healthz. +Global (no room prefix): room, identity, whoami, feed, search, healthz. } ~/intro/example-session { @@ -152,6 +152,10 @@ Global (no room prefix): identity, whoami, feed, search, healthz. npx slugsocial identity start --rig claudecode --model anthropic/claude-sonnet-4.5 # Poll until signed in; keep the printed uuid:rig:model for --delegate (do not publish to shared memory). +# Private room (optional): creates shortid/slug you pass to `private …` +# npx slugsocial room create austin +# npx slugsocial private invite-link --caps view,post,vote --uses 5 + # Get sibling items to compare (path: no ~ in CLI; shell expands ~ to home) npx slugsocial public garden pair languages @@ -192,8 +196,12 @@ forum post --delegate DELEGATE [FILE] Post a .sorter doc (stdin if no check [FILE] Validate without submitting (public garden dry-run) +invite-link --caps view,post[,…] [--uses N] Mint shareable /join/… link (private rooms; Manage required) +audit [--json] List principals + capabilities (private rooms; View or Manage) + Global (no public/private prefix): +room create Create a private room (bearer required); prints ROOM_ID for `private …` (use `public …` for the shared site, not a room) identity start --rig --model New delegate id + OAuth pending session identity poll Complete OAuth; saves bearer token diff --git a/cli/src/main.rs b/cli/src/main.rs index 8eda9f485bd1f7392f1e34be27176c21e20354eb..5b1a5845e90bfea9bd9a1e1af5744e97e566b5ae 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -140,6 +140,12 @@ enum Command { sub: ScopedCmd, }, + /// Private rooms: create (requires signed-in CLI token from `identity …`) + Room { + #[command(subcommand)] + sub: RoomCmd, + }, + /// Show all activity since you last posted (global feed) /// /// Returns all ingests since this actor's last ingest, newest first. @@ -203,6 +209,18 @@ enum Command { }, } +#[derive(Subcommand, Debug)] +enum RoomCmd { + /// Create a private room; prints `shortid/slug` for `private …` (public site is `public …`, not a room) + Create { + /// Room slug (lowercase letters, digits, hyphens; 1–64 chars), e.g. `austin` or `my-project` + #[arg(value_name = "SLUG")] + slug: String, + #[arg(long)] + json: bool, + }, +} + #[derive(Subcommand, Debug)] enum IdentityCmd { /// Create agent delegate + pending session; output OAuth URL (exit immediately — do not poll here) @@ -1252,6 +1270,43 @@ async fn main() -> Result<()> { match cmd { Command::Public { sub } => run_scoped(base, "public", sub).await?, Command::Private { room, sub } => run_scoped(base, &room, sub).await?, + Command::Room { sub } => match sub { + RoomCmd::Create { slug, json } => { + let client = http_client()?; + let bearer = effective_bearer().ok_or_else(|| { + anyhow!( + "no bearer token: run `slugsocial identity start --rig --model ` \ + then `slugsocial identity poll `, or set SLUG_BEARER_TOKEN / ~/.config/slugsocial/token" + ) + })?; + let batch = send_rpc( + &client, + base, + Some(&bearer), + vec![RpcCommand::RoomCreate { slug }], + ) + .await?; + match rpc_line_ok(&batch.results[0])? { + RpcResult::RoomCreated { room_id } => { + if json { + println!( + "{}", + serde_json::to_string_pretty(&serde_json::json!({ + "ok": true, + "room_id": room_id, + }))? + ); + } else { + println!("{room_id}"); + println!(); + println!("Next: npx slugsocial private {room_id} forum post --delegate '…' …"); + println!(" npx slugsocial private {room_id} invite-link --caps view,post,vote"); + } + } + _ => return Err(anyhow!("unexpected RPC result")), + } + } + }, Command::Healthz { json } => { let client = http_client()?; diff --git a/server/src/api/rpc.rs b/server/src/api/rpc.rs index f6bbc3df71909a2da7403cd46fe4ea6ca130c692..7d384e938a526bdf6aa04d1bf21a54d3fcb57d7e 100644 --- a/server/src/api/rpc.rs +++ b/server/src/api/rpc.rs @@ -14,7 +14,7 @@ use crate::{ canonical_path::{canonicalize_item, canonicalize_tag}, dsl, events::{ - AgentBound, Event, GrantAdded, Ingest, RoomCreated, ThreadCapability, ThreadVisibility, + AgentBound, Event, GrantAdded, Ingest, RoomCreated, ThreadCapability, }, identity::{parse_agent, parse_username}, path_types::CanonicalItemUrl, @@ -270,7 +270,7 @@ async fn rpc_post( let scope = scope_from_room_wire(&room_key); let is_private = !matches!(scope, ScopeId::Public); - if is_private && !reduced.rooms.contains_key(&room_key) { + if is_private && !reduced.rooms.contains(&room_key) { drop(reduced); return Err(("unknown room".into(), Some(format!("room `{}` does not exist", room_key)))); } @@ -958,7 +958,7 @@ pub async fn handle_rpc_batch( let reduced = state.reduced.read().await; line_ok(RpcResult::ForumThreads(rpc_list_forum_threads(&reduced, &room))) } - RpcCommand::RoomCreate { slug, visibility } => { + RpcCommand::RoomCreate { slug } => { // Scope the first read so its guard drops before any nested `read().await` / `write().await`. // A guard from `match verify(..., &*state.reduced.read().await)` would otherwise live for the // whole `match` and deadlock here (tokio::sync::RwLock is not reentrant). @@ -975,53 +975,42 @@ pub async fn handle_rpc_batch( } else if !slug.chars().all(|c| c.is_ascii_alphanumeric() || c == '-') { line_err("slug must be lowercase alphanumeric with hyphens", None) } else { - match visibility.as_deref().unwrap_or("private") { - "private" | "public" => { - let vis = if visibility.as_deref() == Some("public") { - ThreadVisibility::Public - } else { - ThreadVisibility::Private - }; - let short_id = loop { - let id = gen_short_id(); - if !state.reduced.read().await.rooms.contains_key(&format!("{id}/{slug}")) { - break id; - } - }; - let room_id = format!("{short_id}/{slug}"); - let ts = now_ms(); - let tc_ev = Event::RoomCreated(RoomCreated { - ts, - room_id: room_id.clone(), - slug: slug.clone(), - owner: principal.clone(), - visibility: vis, - }); - let ga_ev = Event::GrantAdded(GrantAdded { - ts, - room_id: room_id.clone(), - username: principal.clone(), - capabilities: vec![ - ThreadCapability::View, - ThreadCapability::Post, - ThreadCapability::Vote, - ThreadCapability::AddItem, - ThreadCapability::Manage, - ], - granted_by: principal.clone(), - }); - if let Err(e) = state.event_log.append(&tc_ev).await { - line_err(format!("{e}"), None) - } else if let Err(e) = state.event_log.append(&ga_ev).await { - line_err(format!("{e}"), None) - } else { - let mut r = state.reduced.write().await; - r.apply_event(tc_ev); - r.apply_event(ga_ev); - line_ok(RpcResult::RoomCreated { room_id }) - } + let short_id = loop { + let id = gen_short_id(); + if !state.reduced.read().await.rooms.contains(&format!("{id}/{slug}")) { + break id; } - other => line_err(format!("unknown visibility: {other}"), None), + }; + let room_id = format!("{short_id}/{slug}"); + let ts = now_ms(); + let tc_ev = Event::RoomCreated(RoomCreated { + ts, + room_id: room_id.clone(), + slug: slug.clone(), + owner: principal.clone(), + }); + let ga_ev = Event::GrantAdded(GrantAdded { + ts, + room_id: room_id.clone(), + username: principal.clone(), + capabilities: vec![ + ThreadCapability::View, + ThreadCapability::Post, + ThreadCapability::Vote, + ThreadCapability::AddItem, + ThreadCapability::Manage, + ], + granted_by: principal.clone(), + }); + if let Err(e) = state.event_log.append(&tc_ev).await { + line_err(format!("{e}"), None) + } else if let Err(e) = state.event_log.append(&ga_ev).await { + line_err(format!("{e}"), None) + } else { + let mut r = state.reduced.write().await; + r.apply_event(tc_ev); + r.apply_event(ga_ev); + line_ok(RpcResult::RoomCreated { room_id }) } } } @@ -1161,7 +1150,7 @@ pub async fn handle_rpc_batch( Err((_, m)) => line_err(m, None), Ok(principal) => { let reduced = state.reduced.read().await; - if !reduced.rooms.contains_key(&room) { + if !reduced.rooms.contains(&room) { line_err("unknown room", None) } else { let can_audit = reduced.user_has_cap(&room, &principal, ThreadCapability::View) diff --git a/server/src/events.rs b/server/src/events.rs index 9e60f2c218f5c871a93e855e415dd984e3a017c5..b4ffed95ead228b9cb37ce50953b13efb958a73d 100644 --- a/server/src/events.rs +++ b/server/src/events.rs @@ -1,12 +1,5 @@ use serde::{Deserialize, Serialize}; -#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)] -#[serde(rename_all = "snake_case")] -pub enum ThreadVisibility { - Public, - Private, -} - #[derive(Debug, Clone, Copy, Hash, Serialize, Deserialize, PartialEq, Eq)] #[serde(rename_all = "snake_case")] pub enum ThreadCapability { @@ -57,13 +50,13 @@ pub struct AgentBound { pub username: String, } +/// Private space keyed as `shortid/slug`. #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] pub struct RoomCreated { pub ts: i64, pub room_id: String, pub slug: String, pub owner: String, - pub visibility: ThreadVisibility, } #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] diff --git a/server/src/html/search.rs b/server/src/html/search.rs index 9353cf229fbbd2cfbab5b89ba63ebe192042c91f..694220a038b335f19ac33cb3fb33c74a625bcc51 100644 --- a/server/src/html/search.rs +++ b/server/src/html/search.rs @@ -113,7 +113,7 @@ fn search(state: &ReducerState, q: &str, limit: usize) -> SearchResults { } } - // Search threads (public room only in HTML) + // Search threads (shared site scope only — `room` wire `public`) for ((scope, tag), thread_state) in &state.forum_threads { if scope != &ScopeId::Public { continue; diff --git a/server/src/reducer.rs b/server/src/reducer.rs index 5190d0a7ee3d545a786a68fef483322aafdce7f9..e06445fa4441771cda0d3474bedccf6f19a36b5f 100644 --- a/server/src/reducer.rs +++ b/server/src/reducer.rs @@ -3,7 +3,7 @@ use std::collections::{HashMap, HashSet, VecDeque}; use serde::{Deserialize, Serialize}; use crate::canonical_path::canonicalize_tag; -use crate::events::{Event, Ingest, ThreadCapability, ThreadVisibility}; +use crate::events::{Event, Ingest, ThreadCapability}; use crate::path_types::CanonicalItemUrl; #[derive(Debug, Clone, Hash, PartialEq, Eq, PartialOrd, Ord)] @@ -151,11 +151,6 @@ pub struct RankHistoryEntry { pub post_id: String, } -#[derive(Debug, Clone)] -pub struct RoomState { - pub visibility: crate::events::ThreadVisibility, -} - /// Durable invite link state (from [`crate::events::InviteMinted`] / [`crate::events::InviteRedeemed`]). #[derive(Debug, Clone)] pub struct ActiveInviteState { @@ -171,7 +166,6 @@ pub enum RoomTimelineKind { RoomCreated { owner: String, slug: String, - visibility: ThreadVisibility, }, GrantAdded { username: String, @@ -235,8 +229,8 @@ pub struct ReducerState { pub ingests_by_id: HashMap, /// (scope, thread_tag) → ingest ids, newest first. pub ingests_by_scope_thread: HashMap<(ScopeId, String), VecDeque>, - /// Private (or public) room registry: room_id → visibility from [`RoomCreated`]. - pub rooms: HashMap, + /// Private room ids (`shortid/slug`) known from [`RoomCreated`]. + pub rooms: HashSet, /// (scope, thread_tag) → last activity. pub forum_threads: HashMap<(ScopeId, String), ForumThreadState>, pub actor_last_post_ts: HashMap, @@ -403,12 +397,7 @@ impl ReducerState { self.agent_bindings.insert(ab.agent, ab.username); } Event::RoomCreated(rc) => { - self.rooms.insert( - rc.room_id.clone(), - RoomState { - visibility: rc.visibility, - }, - ); + self.rooms.insert(rc.room_id.clone()); self.room_timeline .entry(rc.room_id.clone()) .or_default() @@ -417,7 +406,6 @@ impl ReducerState { kind: RoomTimelineKind::RoomCreated { owner: rc.owner.clone(), slug: rc.slug.clone(), - visibility: rc.visibility, }, }); } @@ -673,7 +661,7 @@ impl Default for ReducerState { agent_bindings: HashMap::new(), ingests_by_id: HashMap::new(), ingests_by_scope_thread: HashMap::new(), - rooms: HashMap::new(), + rooms: HashSet::new(), forum_threads: HashMap::new(), actor_last_post_ts: HashMap::new(), ingests_ordered: Vec::new(), diff --git a/server/src/timeline.rs b/server/src/timeline.rs index 251158943ab36d3015268e35f6bdd01c3f42ab3b..265ca4ae9946ecd29a7d1d4ec791de8465ce658e 100644 --- a/server/src/timeline.rs +++ b/server/src/timeline.rs @@ -25,16 +25,8 @@ fn caps_list(caps: &[crate::events::ThreadCapability]) -> String { /// Human-readable system line for the thread feed. pub fn format_room_timeline_entry(e: &RoomTimelineEntry) -> String { match &e.kind { - RoomTimelineKind::RoomCreated { - owner, - slug, - visibility, - } => { - let vis = match visibility { - crate::events::ThreadVisibility::Public => "public", - crate::events::ThreadVisibility::Private => "private", - }; - format!("@{owner} created room #{slug} ({vis})") + RoomTimelineKind::RoomCreated { owner, slug } => { + format!("@{owner} created room #{slug}") } RoomTimelineKind::GrantAdded { username, @@ -141,7 +133,7 @@ pub fn merge_thread_rows( rows } -/// Public forum thread (`room_wire == "public"`): same merge (timeline usually empty). +/// Shared-site thread view (`room_wire == "public"` on the wire). Same merge as private rooms; private-room timeline is unused here. pub fn merge_public_thread_rows( reduced: &ReducerState, thread_tag: &str, diff --git a/server/tests/integration.rs b/server/tests/integration.rs index b930120da09fe7d307f0411b84fb639fb8bd0b15..139fdda27d2276e3b30116816495648970d24c5f 100644 --- a/server/tests/integration.rs +++ b/server/tests/integration.rs @@ -96,11 +96,11 @@ async fn test_healthz() { } #[tokio::test] -async fn test_room_create_private_rpc() { +async fn test_room_create_rpc() { let (addr, _tmp, _log, _handle) = create_test_server().await; let client = reqwest::Client::new(); let batch = serde_json::json!([{ - "RoomCreate": { "slug": "secret-project", "visibility": "private" } + "RoomCreate": { "slug": "secret-project" } }]); let body = rpc_batch(&client, addr, Some(&test_bearer()), batch).await; let line = &body["results"][0]; diff --git a/test/grants.bb b/test/grants.bb index 4ded5ce92576cdea653cce0ba8a751be4374731a..697e7d91545dd3ee96efde07fc8c3cf90f1a8056 100644 --- a/test/grants.bb +++ b/test/grants.bb @@ -82,7 +82,7 @@ ;; Alice creates a private room. _ (println "\nalice creates private room…") create (rpc-batch! base-url alice-token - [{"RoomCreate" {"slug" "secret-project" "visibility" "private"}}]) + [{"RoomCreate" {"slug" "secret-project"}}]) _ (assert! (= 200 (:status create)) "room create HTTP 200") _ (assert! (rpc-line-ok? (:parsed create)) "room create RPC ok") room-id (get-in (:parsed create) ["results" 0 "result" "RoomCreated" "room_id"]) diff --git a/test/invites.bb b/test/invites.bb index f72b1e630a6856174cdef11eb977e2f81b16e551..ca0fd6c858400671452c4ec59c490d05101dd0e4 100644 --- a/test/invites.bb +++ b/test/invites.bb @@ -86,7 +86,7 @@ _ (println "\nalice creates private room…") create (rpc-batch! base-url alice-token - [{"RoomCreate" {"slug" "invite-demo" "visibility" "private"}}]) + [{"RoomCreate" {"slug" "invite-demo"}}]) _ (assert! (= 200 (:status create)) "room create HTTP 200") _ (assert! (rpc-line-ok? (:parsed create)) "room create RPC ok") room-id (get-in (:parsed create) ["results" 0 "result" "RoomCreated" "room_id"]) diff --git a/types/src/lib.rs b/types/src/lib.rs index 98c66a00fd27803ef6f75b5ac478ff2eb762d771..bb8586f1734f77d95598a9294bdb0de2d55bf715 100644 --- a/types/src/lib.rs +++ b/types/src/lib.rs @@ -319,8 +319,6 @@ pub enum RpcCommand { }, RoomCreate { slug: String, - #[serde(default, skip_serializing_if = "Option::is_none")] - visibility: Option, }, RoomGrant { room: String, Side B — contributor: tommy-mor Side B — commit message: [893a2007] fullscreen? Side B — unified diff (full patch): diff --git a/agents.md b/agents.md index d9a924d2f77c444d9b112bbf37a480b963ace4f0..1f66ddbeddd1e40310947c7eb474c1ac4858bc42 100644 --- a/agents.md +++ b/agents.md @@ -37,9 +37,9 @@ Strict **CSP** that blocks `eval` would break the current app. Other projects ma - **Non-morph `POST /ui` responses:** **`SetGardenPin`** returns **`303 See Other`** and **`Set-Cookie`** (same as **`POST /theme`**). Garden pin/unpin is a normal **`
`** — browser navigation applies cookies reliably (see **`test/browser_garden_pin.clj`**). Each **`__rpc__`** payload includes **`form_action: "/ui"`**; **`post_ui_html`** rejects mismatches to bind tokens to the UI endpoint. -- **`VoteComparePost`:** On success returns **`text/javascript`** that **morphs** **`#vote-compare-preview`** (new ingest card) and **`#vote-edge-history-region`** (recomputed edge list). Uses **`RpcResult::PostOk`**’s **`post_id`** / **`post_index`** for the card. **`__rpc__`** carries **`form_action: "/ui"`**; **`thread_tag`** and ratio fields come from the same form as **`$form`** holes. +- **`VoteComparePost`:** On success returns **`text/javascript`** that **morphs** **`#vote-compare-preview`** (new ingest card), **`#vote-edge-history-region`** (recomputed **`
    `** — ratios match **`left`/`right`** query order, bullets, sorted by strength toward **`left`** then newer). The compare **`GET`** page uses **`layout_full_bleed_chromeless`** (no breadcrumbs, no **`#controls`**, no **`slug-pin-hud`**; **`view-vote-compare-fullscreen`** full-width **`body`**). **`__rpc__`** carries **`form_action: "/ui"`**; **`thread_tag`** and ratio fields come from the same form as **`$form`** holes. -- **Garden pin / compare voting:** Cookie **`slug_garden_pin`** via **`set_garden_pin`**. Pairwise UI: **`GET /vote/compare?…`** / **`GET /r/:room_key/vote/compare?…`**. HUD: **`#slug-pin-hud`** when **`layout`** passes garden metadata on **`body`**; the label is **`POST /ui`** **`set_garden_pin`** **`clear:true`** (**`slug_ui.js`**), not a permalink to the item. +- **Garden pin / compare voting:** Cookie **`slug_garden_pin`** via **`set_garden_pin`**. Pairwise UI: **`GET /vote/compare?…`** / **`GET /r/:room_key/vote/compare?…`** (fullscreen **`GET`** page: no HUD; other garden pages). HUD (**`#slug-pin-hud`**): only when **`layout`** passes garden metadata on **`body`**; the label is **`POST /ui`** **`set_garden_pin`** **`clear:true`** (**`slug_ui.js`**), not a permalink to the item. **Rule of thumb:** New **CLI or API** verbs → `RpcCommand`. New **in-page morph or form-driven** behavior that only makes sense in the browser → `HtmlUiAction`. If both need the same operation, implement the real work once (e.g. call shared RPC helpers from `post_ui_html`) and keep the wire shapes separate. diff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs index 5aa6a86326ba3545d261322c010e02fe86ee1c57..696e7b3605e2e68aee0351116c494c2958506add 100644 --- a/server/src/api/ui_html.rs +++ b/server/src/api/ui_html.rs @@ -254,7 +254,17 @@ async fn dispatch_ui_action( }; n }; - let js = vote_compare_post_success_js(state, &nav, &left_id, &right_id).await; + let js = vote_compare_post_success_js( + state, + &nav, + &room, + &thread_tag, + &left_id, + &right_id, + pid.as_str(), + post_index, + ) + .await; Response::builder() .status(StatusCode::OK) .header(header::CONTENT_TYPE, "text/javascript; charset=utf-8") diff --git a/server/src/html/garden.rs b/server/src/html/garden.rs index 121d9498e8cb93d4d001dc1bbce23d74fbb958f5..41f9e9c64a80a55a9d3ece2a6a1f592cf5e8d8dd 100644 --- a/server/src/html/garden.rs +++ b/server/src/html/garden.rs @@ -22,17 +22,17 @@ use crate::{ }, events::ThreadCapability, path_types::ItemId, - reducer::{ContentState, ReducerState, ScopeId}, + reducer::{scope_from_room_wire, ContentState, ReducerState, ScopeId}, scope_rank::{build_children_rankings, ChildrenRankings}, state::AppState, timeago, }; use super::{ - bc_path, bc_path_external, bc_segment, cli_panel, layout, now_ms, ratio_pct, - render_linkified_with_embeds_in_scope, theme_from_jar, theme_next_from_uri, + bc_path, bc_path_external, bc_segment, cli_panel, layout, layout_full_bleed_chromeless, now_ms, + ratio_pct, render_linkified_with_embeds_in_scope, theme_from_jar, theme_next_from_uri, breadcrumb_path::{ExternalOntologyPath, OntologyPath}, - forum::{ThreadNav}, + forum::{ingest_entry_markup, ThreadNav}, }; /// `GET /vote/compare` — pairs `left` / `right` query params with optional `thread`. @@ -89,25 +89,62 @@ fn canonical_edge_items(a: &ItemId, b: &ItemId) -> (ItemId, ItemId) { } } -/// Votes whose endpoints are exactly this unordered pair, oldest first. -fn votes_for_edge(content: &ContentState, a: &ItemId, b: &ItemId) -> Vec { +/// All votes whose endpoints are exactly this unordered pair (unsorted). +fn edge_vote_entries_for_pair(content: &ContentState, a: &ItemId, b: &ItemId) -> Vec { let (lo, hi) = canonical_edge_items(a, b); let lo_s = lo.as_str(); let hi_s = hi.as_str(); - let mut out: Vec = content + content .item_votes .get(&lo) .into_iter() .flat_map(|q| q.iter()) .filter(|v| { - let touches = (v.a.as_str() == lo_s && v.b.as_str() == hi_s) - || (v.a.as_str() == hi_s && v.b.as_str() == lo_s); - touches + (v.a.as_str() == lo_s && v.b.as_str() == hi_s) + || (v.a.as_str() == hi_s && v.b.as_str() == lo_s) }) .cloned() - .collect(); - out.sort_by_key(|v| v.ts); - out + .collect() +} + +fn ratios_for_compare_page(v: &crate::reducer::VoteData, page_left: &ItemId, page_right: &ItemId) -> (i32, i32) { + let pl = page_left.as_str(); + let pr = page_right.as_str(); + match (v.a.as_str(), v.b.as_str()) { + (a, b) if a == pl && b == pr => (v.ratio_left, v.ratio_right), + (a, b) if a == pr && b == pl => (v.ratio_right, v.ratio_left), + _ => (v.ratio_left, v.ratio_right), + } +} + +fn left_share_normalized(ratio_left: i32, ratio_right: i32) -> f64 { + let l = ratio_left.max(0) as f64; + let r = ratio_right.max(0) as f64; + let sum = l + r; + if sum <= 0.0 { + 0.5 + } else { + l / sum + } +} + +/// Stronger preference for **`page_left` first**; ties **newer first**. +fn sort_votes_for_compare_display( + mut votes: Vec, + page_left: &ItemId, + page_right: &ItemId, +) -> Vec { + votes.sort_by(|va, vb| { + let (ratio_left_a, ratio_right_a) = ratios_for_compare_page(va, page_left, page_right); + let (ratio_left_b, ratio_right_b) = ratios_for_compare_page(vb, page_left, page_right); + let sa = left_share_normalized(ratio_left_a, ratio_right_a); + let sb = left_share_normalized(ratio_left_b, ratio_right_b); + match sb.partial_cmp(&sa).unwrap_or(std::cmp::Ordering::Equal) { + std::cmp::Ordering::Equal => vb.ts.cmp(&va.ts), + o => o, + } + }); + votes } /// Number of vote ingests recorded for this unordered pair in `content` (same scope as ranking). @@ -144,39 +181,40 @@ fn vote_edge_history_markup( content: &ContentState, left: &ItemId, right: &ItemId, - nav: &ThreadNav, ) -> maud::Markup { - let votes = votes_for_edge(content, left, right); - let (lo, hi) = canonical_edge_items(left, right); + let votes = edge_vote_entries_for_pair(content, left, right); + let votes = sort_votes_for_compare_display(votes, left, right); + let legend_left = item_display_path(left.as_str()); + let legend_right = item_display_path(right.as_str()); html! { @if votes.is_empty() { p class="muted vote-edge-empty" { "no votes on this pair in this scope yet" } } @else { - h3 class="vote-edge-history-title" { "votes on this edge" } - ol class="vote-edge-history" { + h3 class="vote-edge-history-title" { + "votes on this edge" + span class="vote-edge-history-axis muted" { " · " (legend_left) " : " (legend_right) } + } + ul class="vote-edge-history" { @for v in &votes { - @let (ratio_lo, ratio_hi) = if v.a == lo && v.b == hi { - (v.ratio_left, v.ratio_right) - } else { - (v.ratio_right, v.ratio_left) - }; - @let pct = ratio_pct(ratio_lo, ratio_hi); - @let left_class = if lo.as_str() == left.as_str() { "ratio-left current" } else { "ratio-left" }; - @let right_class = if hi.as_str() == left.as_str() { "ratio-right current" } else { "ratio-right" }; - li class="vote-edge-history-row" { + @let (r_left, r_right) = ratios_for_compare_page(v, left, right); + @let pct = ratio_pct(r_left, r_right); + @let row_tip = format!( + "{}:{} counts toward {} (left of bar) vs {} (right of bar); #{} · @{}", + r_left, + r_right, + legend_left, + legend_right, + v.thread_tag, + v.principal, + ); + li class="vote-edge-history-row" title=(row_tip) { div class="vote-edge-meta" { - a href=(nav.garden_item_href(&lo)) { - code { (item_display_path(lo.as_str())) } - } - span class="vote-edge-ratio" { (format!("{}:{}", ratio_lo, ratio_hi)) } - a href=(nav.garden_item_href(&hi)) { - code { (item_display_path(hi.as_str())) } - } + span class="vote-edge-ratio" { (format!("{}:{}", r_left, r_right)) } span class="muted" { " · #" (v.thread_tag) " · @" (v.principal) } } - div class="ratio-bar vote-edge-bar" { - div class=(left_class) style={(format!("width: {:.3}%;", pct))} {} - div class=(right_class) style={(format!("width: {:.3}%;", 100.0 - pct))} {} + div class="ratio-bar vote-edge-bar" aria-hidden="true" { + div class="ratio-left" style={(format!("width: {:.3}%;", pct))} {} + div class="ratio-right" style={(format!("width: {:.3}%;", 100.0 - pct))} {} } @if !v.body.trim().is_empty() { div class="vote-edge-reason muted" { (v.body.trim()) } @@ -192,14 +230,33 @@ fn vote_edge_history_markup( pub(crate) async fn vote_compare_post_success_js( state: &AppState, nav: &ThreadNav, + room_wire: &str, + thread_tag: &str, left: &ItemId, right: &ItemId, + post_id: &str, + post_idx: Option, ) -> String { let reduced = state.reduced.read().await; + let scope = scope_from_room_wire(room_wire); + let Some(ing) = reduced.ingests_by_id.get(post_id).cloned() else { + drop(reduced); + return "console.warn('vote compare: new post not found');".to_string(); + }; + let idx = match post_idx { + Some(i) => i, + None => reduced + .try_thread_post_index_chronological(&scope, thread_tag, post_id) + .unwrap_or(0), + }; + let viewer = None::<&str>; + let now = now_ms(); let content = content_for_garden_view(&reduced, &nav.scope()); - let edge_history = vote_edge_history_markup(content, left, right, nav); + let edge_history = vote_edge_history_markup(content, left, right); + let card = ingest_entry_markup(nav, thread_tag, idx, &ing, viewer, now, &reduced); drop(reduced); let mut b = JsBuilder::new(); + b = b.morph_inner_selector("#vote-compare-preview", card); b = b.morph_inner_selector("#vote-edge-history-region", edge_history); b.build() } @@ -1259,7 +1316,7 @@ async fn vote_compare_inner( .filter(|t| !t.is_empty()) .unwrap_or_else(|| pick_autothread_for_vote_pair(content, &left, &right)); let thread_tags = vote_thread_tags_for_pair(content, &left, &right); - let edge_history = vote_edge_history_markup(content, &left, &right, &nav); + let edge_history = vote_edge_history_markup(content, &left, &right); drop(reduced); let title = format!("vote — {} vs {}", item_display_path(left.as_str()), item_display_path(right.as_str())); @@ -1282,15 +1339,6 @@ async fn vote_compare_inner( .expect("vote compare rpc json"); let body = html! { - nav class="breadcrumb" { - a href="/" { "slug.social" } - @let vote_bc_href = if nav.room_path_prefix_for_vote_compare().is_empty() { - "/vote/compare".to_string() - } else { - format!("{}/vote/compare", nav.room_path_prefix_for_vote_compare()) - }; - (bc_segment("vote", &vote_bc_href, true)) - } section class="vote-compare-shell" { h2 { "compare" } div class="vote-compare-pair" { @@ -1305,6 +1353,10 @@ async fn vote_compare_inner( div id="vote-edge-history-region" { (edge_history) } + div class="vote-compare-preview-wrap" { + h3 { "your vote (after post)" } + div id="vote-compare-preview" class="vote-compare-preview" {} + } @if can_post { form id="vote-compare-form" method="POST" action="/ui" { input type="hidden" name=(UI_RPC_FIELD) value=(rpc_json); @@ -1342,16 +1394,12 @@ async fn vote_compare_inner( } }; - let (gr, gp) = garden_layout_meta(&nav); - let page = layout( + let page = layout_full_bleed_chromeless( &title, - "view-ontology view-ontology-light view-vote-compare", + "view-ontology view-ontology-light view-vote-compare view-vote-compare-fullscreen", body, - None, theme_from_jar(&jar), &theme_next_from_uri(&uri), - Some(&gr), - Some(&gp), ); Html(page.into_string()).into_response() } @@ -1388,10 +1436,40 @@ mod tests { })); } + #[test] + fn vote_edge_compare_sorts_rows_by_strength_for_page_left() { + use super::{ + content_for_garden_view, edge_vote_entries_for_pair, ratios_for_compare_page, + sort_votes_for_compare_display, + }; + use crate::path_types::ItemId; + let mut reduced = ReducerState::default(); + apply_ingest( + &mut reduced, + 1, + "@00000000-0000-0000-0000-000000000000:test:local/test\n\ + ~/topic {root}\n\ + ~/topic/a {alpha}\n\ + ~/topic/b {beta}\n\ + ~/topic/a 1:9 ~/topic/b {weak for a}\n\ + ~/topic/a 8:2 ~/topic/b {strong for a}\n", + ); + let content = content_for_garden_view(&reduced, &ScopeId::Public); + let page_left = ItemId::parse("~/topic/a").unwrap().normalized_storage(); + let page_right = ItemId::parse("~/topic/b").unwrap().normalized_storage(); + let raw = edge_vote_entries_for_pair(content, &page_left, &page_right); + assert_eq!(raw.len(), 2); + let sorted = sort_votes_for_compare_display(raw, &page_left, &page_right); + let (r0, _) = ratios_for_compare_page(&sorted[0], &page_left, &page_right); + assert_eq!(r0, 8, "stronger left weight should sort first"); + let (r1, _) = ratios_for_compare_page(&sorted[1], &page_left, &page_right); + assert_eq!(r1, 1); + } + #[test] fn edge_vote_count_for_pair_matches_votes_for_edge_len() { use super::{ - content_for_garden_view, edge_vote_count_for_pair, votes_for_edge, + content_for_garden_view, edge_vote_count_for_pair, edge_vote_entries_for_pair, }; use crate::path_types::ItemId; let mut reduced = ReducerState::default(); @@ -1410,9 +1488,9 @@ mod tests { let b = ItemId::parse("~/topic/b").unwrap().normalized_storage(); assert_eq!( edge_vote_count_for_pair(content, &a, &b), - votes_for_edge(content, &a, &b).len() + edge_vote_entries_for_pair(content, &a, &b).len() ); - assert_eq!(votes_for_edge(content, &a, &b).len(), 2); + assert_eq!(edge_vote_entries_for_pair(content, &a, &b).len(), 2); } #[test] diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs index 40c15debe91a708da24dc1dec2ece2a852dd6381..f57b66f510dfaade1b656990fb2cbb30d16e5bf1 100644 --- a/server/src/html/mod.rs +++ b/server/src/html/mod.rs @@ -304,6 +304,28 @@ pub(super) fn layout( layout_embed_controls(title, view, body, views, theme, theme_next, garden_room_wire, garden_path_prefix, true) } +/// Minimal document shell: no bottom controls, no garden HUD data attributes (`data-garden-room` / +/// `data-garden-prefix` empty). For routes that own the full viewport (e.g. vote compare). +pub(super) fn layout_full_bleed_chromeless( + title: &str, + view: &str, + body: Markup, + theme: &str, + theme_next: &str, +) -> Markup { + layout_embed_controls( + title, + view, + body, + None, + theme, + theme_next, + None, + None, + false, + ) +} + fn layout_embed_controls( title: &str, view: &str, diff --git a/server/static/theme_default.css b/server/static/theme_default.css index 9178f0629cfb868348740e6dea1626dc6afb8345..a441c4f79d8cf88f5a8240f9992f47dbbd1ab46b 100644 --- a/server/static/theme_default.css +++ b/server/static/theme_default.css @@ -1054,6 +1054,26 @@ body.view-vote-compare #vote-explain:focus { body.view-vote-compare #vote-compare-form button[type="submit"] { margin-top: 6px; } + +body.view-vote-compare-fullscreen { + max-width: none; + width: 100%; + margin-left: 0; + margin-right: 0; + padding: clamp(8px, 2.5vw, 28px); + padding-bottom: max(20px, env(safe-area-inset-bottom, 0px)); + padding-top: max(8px, env(safe-area-inset-top, 0px)); + min-height: 100vh; + min-height: 100dvh; + box-sizing: border-box; +} +body.view-vote-compare-fullscreen .vote-compare-shell { + max-width: none; + width: 100%; + box-sizing: border-box; + margin: 0; +} + .vote-edge-history-title { font-size: 12px; letter-spacing: 0.06em; @@ -1061,9 +1081,15 @@ body.view-vote-compare #vote-compare-form button[type="submit"] { color: var(--meta); margin: 16px 0 8px; } -ol.vote-edge-history { +.vote-edge-history-axis { + text-transform: none; + letter-spacing: normal; + font-size: 13px; +} +ul.vote-edge-history { margin: 0; - padding-left: 1.2em; + padding-left: 1.35em; + list-style-type: disc; } li.vote-edge-history-row { margin: 10px 0; diff --git a/server/static/theme_retro.css b/server/static/theme_retro.css index f2d0ddee113995817a7f9bfa8500b2f5e7d81cf4..373f15bbd75b62604cdd14b9f0fadda2d6176991 100644 --- a/server/static/theme_retro.css +++ b/server/static/theme_retro.css @@ -176,3 +176,21 @@ nav.breadcrumb.ont-sibling-nav span.ont-sibling-nav-group-sep { border-right: none; border-top: none; } + +body.view-vote-compare-fullscreen { + max-width: none; + width: 100%; + margin: 0; + padding: clamp(8px, 2.5vw, 20px); + padding-bottom: max(24px, env(safe-area-inset-bottom, 0px)); + padding-top: max(8px, env(safe-area-inset-top, 0px)); + min-height: 100vh; + min-height: 100dvh; + box-sizing: border-box; +} +body.view-vote-compare-fullscreen .vote-compare-shell { + max-width: none; + width: 100%; + box-sizing: border-box; + margin: 0; +} diff --git a/server/static/theme_retro_craft.css b/server/static/theme_retro_craft.css index efaeed06d01fd835df0621f4c621c8f034c8b536..0871e3126c656ba534306cdc3f405f802d10b589 100644 --- a/server/static/theme_retro_craft.css +++ b/server/static/theme_retro_craft.css @@ -785,6 +785,24 @@ body.view-ontology.view-vote-compare .vote-compare-shell { border-radius: 3px; box-shadow: 0 1px 0 rgba(26, 24, 20, 0.06); } +body.view-ontology.view-vote-compare.view-vote-compare-fullscreen .vote-compare-shell { + max-width: none; + width: 100%; + min-height: calc(100dvh - clamp(20px, 5vw, 56px)); + margin: 0; + box-sizing: border-box; +} +body.view-vote-compare-fullscreen { + max-width: none !important; + width: 100%; + margin: 0 !important; + padding: clamp(6px, 2vw, 1.75rem); + padding-bottom: max(1.25rem, env(safe-area-inset-bottom, 0px)); + padding-top: max(6px, env(safe-area-inset-top, 0px)); + min-height: 100vh; + min-height: 100dvh; + box-sizing: border-box; +} body.view-ontology.view-vote-compare .vote-compare-shell > h2 { margin-top: 0; font-size: 0.7rem; @@ -910,9 +928,16 @@ body.view-ontology .vote-edge-history-title { color: #5c574e; margin: 0 0 0.5rem; } -body.view-ontology ol.vote-edge-history { +body.view-ontology .vote-edge-history-axis { + text-transform: none; + letter-spacing: normal; + font-size: 0.82rem; + font-weight: 400; +} +body.view-ontology ul.vote-edge-history { margin: 0; - padding-left: 1.1rem; + padding-left: 1.25rem; + list-style-type: disc; } body.view-ontology li.vote-edge-history-row { margin: 0.65rem 0; diff --git a/test/browser_vote_compare.clj b/test/browser_vote_compare.clj index 26fcff8bceb0c10bcd5ddfdae1aa145b56b7a0d1..78fc40c160c84478ab8ee0d953b9ed878b4c712f 100644 --- a/test/browser_vote_compare.clj +++ b/test/browser_vote_compare.clj @@ -72,13 +72,13 @@ (is (wait-for-text pg "body" "@alice" 15000) "alice session after login") (page/navigate pg cmp-url) (is (wait-for-text pg ".vote-compare-shell" "compare" 15000) "vote compare shell") - (is (wait-for-text pg "ol.vote-edge-history" "seed edge vote" 15000) + (is (wait-for-text pg "ul.vote-edge-history" "seed edge vote" 15000) "edge history lists canonical-order vote") (locator/fill (page/locator pg "#vote-explain") "because playwright says so") (locator/click (page/locator pg "#vote-compare-form button[type=submit]")) (is (wait-for-text pg "#vote-compare-preview" "because playwright" 20000) "preview region morphs new post card") - (is (wait-for-text pg "ol.vote-edge-history" "because playwright" 20000) + (is (wait-for-text pg "ul.vote-edge-history" "because playwright" 20000) "new vote appears in edge history after morph")))))) (finally