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: [30a67104] fixes Side A — unified diff (full patch): diff --git a/agents.md b/agents.md index a6a283716e09fcaba1fd690f4e877e0bbecda2c0..d9a924d2f77c444d9b112bbf37a480b963ace4f0 100644 --- a/agents.md +++ b/agents.md @@ -39,7 +39,7 @@ Strict **CSP** that blocks `eval` would break the current app. Other projects ma - **`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. -- **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`**. +- **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. **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/html/garden.rs b/server/src/html/garden.rs index 8a46b1e92d38f2c390f88d48750d95d11388cd73..121d9498e8cb93d4d001dc1bbce23d74fbb958f5 100644 --- a/server/src/html/garden.rs +++ b/server/src/html/garden.rs @@ -16,7 +16,6 @@ use crate::{ canonical_path::{canonicalize_item, canonicalize_tag}, form_template::template_json_compact, html::{ - forum::ingest_entry_markup, ui_action::UI_RPC_FIELD, user_can_post_room, JsBuilder, @@ -111,6 +110,23 @@ fn votes_for_edge(content: &ContentState, a: &ItemId, b: &ItemId) -> Vec usize { + let (lo, hi) = canonical_edge_items(a, b); + let lo_s = lo.as_str(); + let hi_s = hi.as_str(); + content + .item_votes + .get(&lo) + .into_iter() + .flat_map(|q| q.iter()) + .filter(|v| { + (v.a.as_str() == lo_s && v.b.as_str() == hi_s) + || (v.a.as_str() == hi_s && v.b.as_str() == lo_s) + }) + .count() +} + fn vote_thread_tags_for_pair(content: &ContentState, a: &ItemId, b: &ItemId) -> Vec { let set: HashSet = content .item_threads @@ -288,6 +304,7 @@ fn child_row_pin_or_vote( nav: &ThreadNav, row_item: &ItemId, pinned_room_and_item: Option<&(String, ItemId)>, + scope_content: &ContentState, next_path: &str, ) -> maud::Markup { let pin_matches_scope = pinned_room_and_item @@ -315,7 +332,16 @@ fn child_row_pin_or_vote( @if pi == row_item { span class="ont-garden-pinned-here" title="Pinned" aria-label="Pinned" { "📌" } } @else { - a class="ont-garden-vote-ico" href=(vote_compare_href(nav, pi, row_item, None)) title="Vote vs pinned" aria-label="Vote" { "⚖" } + @let nv = edge_vote_count_for_pair(scope_content, pi, row_item); + @let tip = format!( + "Compare and vote — {nv} pairwise vote{} in this scope for pinned vs this row", + if nv == 1 { "" } else { "s" }, + ); + @let aria = format!("Vote; {} pairwise {}", nv, if nv == 1 { "vote" } else { "votes" }); + a class="ont-garden-vote-ico" href=(vote_compare_href(nav, pi, row_item, None)) title=(tip) aria-label=(aria) { + span class="ont-garden-vote-glyph" aria-hidden="true" { "⚖" } + span class="ont-garden-vote-count" { (format!("{}", nv)) } + } } } @else { form method="POST" action="/ui" data-navigate="full" class="ont-pin-form ont-garden-pin-form" { @@ -978,10 +1004,9 @@ async fn render_scope_view( ) -> axum::response::Response { let scope = nav.scope(); let pin_ref = pinned_item_from_jar(&jar); - let model = { - let reduced = state.reduced.read().await; - build_item_page_view_model(&reduced, &scope, browse.item()) - }; + let reduced = state.reduced.read().await; + let model = build_item_page_view_model(&reduced, &scope, browse.item()); + let scope_content = content_for_garden_view(&reduced, &scope); let thread_href = |tag: &str| nav.thread_url(tag); let external_empty_body = browse.is_external() && model.body.is_none(); let cli_path_arg = item_display_path(&model.item); @@ -1108,7 +1133,7 @@ async fn render_scope_view( @let item_url = item_href(r.item.as_str(), &nav); @let score_str = format!("{:.3}", r.score); li data-garden-item=(r.item.as_str()) { - (child_row_pin_or_vote(&nav, &r.item, pin_ref.as_ref(), &next_for_pin)) + (child_row_pin_or_vote(&nav, &r.item, pin_ref.as_ref(), scope_content, &next_for_pin)) a class="item-link" href=(item_url) { code { (item_display_path(r.item.as_str())) } } span class="ont-rank-score" { (score_str) } } @@ -1124,7 +1149,7 @@ async fn render_scope_view( ul class="ont-group-list" { @for name in &model.child_rankings.unranked_items { li data-garden-item=(name.as_str()) { - (child_row_pin_or_vote(&nav, name, pin_ref.as_ref(), &next_for_pin)) + (child_row_pin_or_vote(&nav, name, pin_ref.as_ref(), scope_content, &next_for_pin)) @let href = item_href(name.as_str(), &nav); a class="item-link" href=(href) { code { (item_display_path(name.as_str())) } } } @@ -1363,6 +1388,33 @@ mod tests { })); } + #[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, + }; + 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 3:2 ~/topic/b {first vote}\n\ + ~/topic/b 2:3 ~/topic/a {second vote}\n", + ); + let content = content_for_garden_view(&reduced, &ScopeId::Public); + let a = ItemId::parse("~/topic/a").unwrap().normalized_storage(); + 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() + ); + assert_eq!(votes_for_edge(content, &a, &b).len(), 2); + } + #[test] fn item_page_model_includes_body_and_unranked_without_votes() { let mut reduced = ReducerState::default(); diff --git a/server/static/slug_ui.js b/server/static/slug_ui.js index c0de1cddbba78227dfb80bfd41e7b855b3a42bc3..86f935f8dd998f3d6df016f33b1e47f9780782ea 100644 --- a/server/static/slug_ui.js +++ b/server/static/slug_ui.js @@ -170,15 +170,6 @@ return { room: raw.slice(0, i), item: raw.slice(i + 1) }; } - function gardenItemHref(prefix, storageUrl) { - var marker = 'https://slug.social/~/'; - if (storageUrl.indexOf(marker) === 0) { - var tail = storageUrl.slice(marker.length); - return prefix.replace(/\/$/, '') + (tail ? '/' + tail : ''); - } - return storageUrl; - } - function refreshPinHud() { var hud = document.getElementById('slug-pin-hud'); if (!hud) return; @@ -187,19 +178,37 @@ var pin = decodePinCookie(); hud.innerHTML = ''; if (!pin || !prefix || pin.room !== bodyRoom) return; - var a = document.createElement('a'); - a.className = 'slug-pin-hud-link'; - a.href = gardenItemHref(prefix, pin.item); - a.title = 'Pinned item'; + var form = document.createElement('form'); + form.method = 'POST'; + form.action = '/ui'; + form.setAttribute('data-navigate', 'full'); + form.className = 'slug-pin-hud-form'; + var rpc = document.createElement('input'); + rpc.type = 'hidden'; + rpc.name = '__rpc__'; + rpc.value = JSON.stringify({ + action: 'set_garden_pin', + clear: true, + room_wire: '', + next: window.location.pathname + window.location.search, + form_action: '/ui', + }); + form.appendChild(rpc); + var btn = document.createElement('button'); + btn.type = 'submit'; + btn.className = 'slug-pin-hud-link slug-pin-hud-unpin-btn'; + btn.title = 'Unpin — removes this item from the corner HUD'; + btn.setAttribute('aria-label', 'Unpin pinned item'); var span = document.createElement('span'); span.className = 'slug-pin-hud-glyph'; span.setAttribute('aria-hidden', 'true'); span.textContent = '📌'; - a.appendChild(span); + btn.appendChild(span); var label = pin.item.replace(/^https:\/\/slug\.social\/~\/?/, '~/'); if (label.length > 36) label = label.slice(0, 34) + '…'; - a.appendChild(document.createTextNode(' ' + label)); - hud.appendChild(a); + btn.appendChild(document.createTextNode(' ' + label)); + form.appendChild(btn); + hud.appendChild(form); } refreshPinHud(); diff --git a/server/static/theme_default.css b/server/static/theme_default.css index ec0fbe7acee0aa2802f978f14a9b0fc86e78c5b8..9178f0629cfb868348740e6dea1626dc6afb8345 100644 --- a/server/static/theme_default.css +++ b/server/static/theme_default.css @@ -799,6 +799,12 @@ details > summary::-webkit-details-marker { display: none; } } /* Pinned item HUD — bottom bar, same plane as spread */ +.slug-pin-hud-form { + display: inline; + margin: 0; + padding: 0; + border: none; +} #slug-pin-hud.slug-pin-hud { margin-left: auto; max-width: min(42vw, 280px); @@ -808,6 +814,13 @@ details > summary::-webkit-details-marker { display: none; } overflow: hidden; text-overflow: ellipsis; } +.slug-pin-hud-link.slug-pin-hud-unpin-btn { + background: transparent; + border: none; + cursor: pointer; + font-size: inherit; + font-family: inherit; +} .slug-pin-hud-link { color: var(--ui); text-decoration: none; @@ -815,7 +828,10 @@ details > summary::-webkit-details-marker { display: none; } align-items: center; gap: 4px; } -.slug-pin-hud-link:hover { color: var(--signal); } +.slug-pin-hud-link:hover, +.slug-pin-hud-unpin-btn:hover { + color: var(--signal); +} .slug-pin-hud-glyph { font-size: 13px; line-height: 1; } /* Garden pin / vote controls */ @@ -890,10 +906,21 @@ span.ont-garden-pinned-here { align-items: center; justify-content: center; } +a.ont-garden-vote-ico { + gap: 4px; +} a.ont-garden-vote-ico:hover { color: var(--signal); background: var(--g4); } +.ont-garden-vote-count { + font-size: 10px; + font-weight: 700; + font-variant-numeric: tabular-nums; +} +span.ont-garden-vote-glyph { + line-height: 1; +} span.ont-garden-pinned-here { border-color: var(--link); color: var(--signal); diff --git a/server/static/theme_retro_craft.css b/server/static/theme_retro_craft.css index 092d4b3540b052cc86870179e4c264541c4446cc..efaeed06d01fd835df0621f4c621c8f034c8b536 100644 --- a/server/static/theme_retro_craft.css +++ b/server/static/theme_retro_craft.css @@ -593,6 +593,12 @@ body.view-ontology #controls { (Global craft `code` + `button[type=submit]` are tuned for dark thread pages; these overrides match the cream ontology shell.) ---------------------------------------------------------------- */ +body.view-ontology .slug-pin-hud-form { + display: inline; + margin: 0; + padding: 0; + border: none; +} body.view-ontology #slug-pin-hud.slug-pin-hud { margin-left: auto; max-width: min(42vw, 280px); @@ -603,6 +609,14 @@ body.view-ontology #slug-pin-hud.slug-pin-hud { overflow: hidden; text-overflow: ellipsis; } +body.view-ontology .slug-pin-hud-link.slug-pin-hud-unpin-btn { + background: transparent; + border: none; + cursor: pointer; + font-size: inherit; + font-family: inherit; + padding: 0; +} body.view-ontology .slug-pin-hud-link { color: #1a4a8c; text-decoration: none; @@ -610,7 +624,8 @@ body.view-ontology .slug-pin-hud-link { align-items: center; gap: 0.25rem; } -body.view-ontology .slug-pin-hud-link:hover { +body.view-ontology .slug-pin-hud-link:hover, +body.view-ontology .slug-pin-hud-unpin-btn:hover { color: #0d3d82; text-decoration: underline; } @@ -676,6 +691,20 @@ body.view-ontology .ont-garden-child-actions { gap: 0.1rem; } body.view-ontology button.ont-garden-pin-ico, +body.view-ontology a.ont-garden-vote-ico { + gap: 0.2rem; +} +body.view-ontology .ont-garden-vote-count { + font-size: 0.65rem; + font-family: var(--font-ui); + font-weight: 600; + font-variant-numeric: tabular-nums; + opacity: 0.92; +} +body.view-ontology span.ont-garden-vote-glyph { + line-height: 1; +} +body.view-ontology button.ont-garden-pin-ico, body.view-ontology a.ont-garden-vote-ico, body.view-ontology span.ont-garden-pinned-here { font-size: 0.95rem; diff --git a/test/browser_garden_pin.clj b/test/browser_garden_pin.clj index 169ff9b6913049094611fb0e5b6683b30220b285..98c086d5647207f3ac72dbb9cbc13488c030eef1 100644 --- a/test/browser_garden_pin.clj +++ b/test/browser_garden_pin.clj @@ -21,6 +21,17 @@ (do (Thread/sleep 200) (recur)) false)))))) +(defn- wait-for-absence-substr [pg selector substr timeout-ms] + "True once selector text does not contain substr (or is empty), or timeout." + (let [deadline (+ (System/currentTimeMillis) timeout-ms)] + (loop [] + (let [text (locator/text-content (page/locator pg selector))] + (if (not (and (string? text) (str/includes? text substr))) + true + (if (< (System/currentTimeMillis) deadline) + (do (Thread/sleep 200) (recur)) + false)))))) + (defn garden-pin-flow! [] (println "\n━━━ browser garden pin (POST /ui set_garden_pin + HUD + vote link) ━━━\n") @@ -75,8 +86,14 @@ (is (wait-for-text pg ".ont-item-shell" "~/gp-pin-b" 15000) "on item b page") (is (wait-for-text pg "a.ont-vote-compare-btn" "vote" 10000) "vote link visible vs pinned item") + ;; HUD clears pin (POST set_garden_pin clear), not navigate to item + (locator/click (page/locator pg "#slug-pin-hud button.slug-pin-hud-unpin-btn")) + (is (wait-for-absence-substr pg "#slug-pin-hud" "gp-pin-a" 15000) + "HUD clears after unpin from HUD button") + (is (wait-for-absence-substr pg "body" "ont-vote-compare-btn" 15000) + "compare vote CTA removed after HUD unpin on same reload") (is (str/includes? (or (page/url pg) "") "/~/gp-pin-b") - "still on item b after vote link check")))))) + "still on item b after HUD unpin")))))) (finally (when-some [s @!server] (common/kill-server s)) Side B — contributor: tommy-mor Side B — commit message: [62d18183] room create path Side B — 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,