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: [8d5328d3] -theme Side B — unified diff (full patch): diff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs index 82b2aa51d21ada1d0d849d3ddfc3a81e4241d861..e74e42e0f0ffc4224f5ef5421b486a5f35434999 100644 --- a/server/src/api/ui_html.rs +++ b/server/src/api/ui_html.rs @@ -73,11 +73,7 @@ pub async fn post_ui_html( 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()) - }; + let dest = item.browse_href(); JsBuilder::new() .raw(&format!( "window.location.href={};", diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs index c973cb718ac74b95570dabea76e24459417790b9..a8353c6de0cd6d268219e552b7ca1ba4e3000585 100644 --- a/server/src/html/mod.rs +++ b/server/src/html/mod.rs @@ -1,13 +1,10 @@ use axum::{ body::Body, extract::{Path, State}, - http::{header, HeaderValue, StatusCode, Uri}, + http::{header, StatusCode, Uri}, response::{IntoResponse, Response}, - Form, }; -use axum_extra::extract::cookie::CookieJar; use maud::{html, Markup, DOCTYPE}; -use serde::Deserialize; use crate::{ form_template::template_json_compact, @@ -15,96 +12,25 @@ use crate::{ path_types::ItemId, ranking::{top_bottom, RankedItem}, reducer::{GroupState, NodeState}, - state::{parse_item_param, AppState}, + state::AppState, ui_action::UI_RPC_FIELD, }; -const THEME_DEFAULT_CSS: &str = include_str!("../../static/theme_default.css"); -const THEME_RETRO_CSS: &str = include_str!("../../static/theme_retro.css"); +const SORTER_CSS: &str = include_str!("../../static/sorter.css"); const SORTER_UI_JS: &str = include_str!("../../static/sorter_ui.js"); -pub const SORTER_THEME_COOKIE: &str = "sorter-theme"; - -pub fn normalize_theme(raw: &str) -> &'static str { - match raw { - "retro" => "retro", - _ => "default", - } -} - -pub fn theme_from_jar(jar: &CookieJar) -> &'static str { - jar.get(SORTER_THEME_COOKIE) - .map(|c| normalize_theme(c.value())) - .unwrap_or("default") -} - -pub fn theme_next_from_uri(uri: &Uri) -> String { - uri.path_and_query() - .map(|pq| pq.as_str().to_string()) - .filter(|s| !s.is_empty()) - .unwrap_or_else(|| "/".to_string()) -} - -pub fn theme_cookie_header_value(theme: &str) -> HeaderValue { - let t = normalize_theme(theme); - let s = format!("{SORTER_THEME_COOKIE}={t}; Path=/; SameSite=Lax; Max-Age=31536000"); - HeaderValue::from_str(&s).expect("theme cookie must be ASCII") -} - -fn sanitize_theme_next(next: Option<&str>) -> String { - let s = next.unwrap_or("/").trim(); - if s.starts_with('/') && !s.starts_with("//") && s.len() < 8192 { - s.to_string() - } else { - "/".to_string() - } -} - -#[derive(Debug, Deserialize)] -pub struct ThemeForm { - theme: String, - next: Option, -} - -pub async fn post_theme(Form(form): Form) -> impl IntoResponse { - let theme = normalize_theme(&form.theme); - let next = sanitize_theme_next(form.next.as_deref()); - let loc = - HeaderValue::try_from(next.as_str()).unwrap_or_else(|_| HeaderValue::from_static("/")); - Response::builder() - .status(StatusCode::SEE_OTHER) - .header(header::LOCATION, loc) - .header(header::SET_COOKIE, theme_cookie_header_value(theme)) - .body(Body::empty()) - .expect("theme redirect response") -} - pub async fn serve_static(Path(filename): Path) -> impl IntoResponse { - if filename == "sorter_ui.js" { - return Response::builder() - .status(StatusCode::OK) - .header(header::CONTENT_TYPE, "text/javascript; charset=utf-8") - .header(header::CACHE_CONTROL, "public, max-age=3600") - .body(SORTER_UI_JS.to_string()) - .unwrap() - .into_response(); - } - - let theme = filename - .strip_prefix("theme_") - .and_then(|s| s.strip_suffix(".css")); - - let css = match theme { - Some("default") => THEME_DEFAULT_CSS, - Some("retro") => THEME_RETRO_CSS, + let (content_type, body) = match filename.as_str() { + "sorter.css" => ("text/css; charset=utf-8", SORTER_CSS), + "sorter_ui.js" => ("text/javascript; charset=utf-8", SORTER_UI_JS), _ => return (StatusCode::NOT_FOUND, "static file not found").into_response(), }; Response::builder() .status(StatusCode::OK) - .header(header::CONTENT_TYPE, "text/css; charset=utf-8") + .header(header::CONTENT_TYPE, content_type) .header(header::CACHE_CONTROL, "public, max-age=3600") - .body(css.to_string()) + .body(body.to_string()) .unwrap() .into_response() } @@ -162,8 +88,7 @@ fn asset_version() -> &'static str { V.get_or_init(|| { use std::hash::{Hash, Hasher}; let mut h = std::collections::hash_map::DefaultHasher::new(); - THEME_DEFAULT_CSS.hash(&mut h); - THEME_RETRO_CSS.hash(&mut h); + SORTER_CSS.hash(&mut h); SORTER_UI_JS.hash(&mut h); format!("{:x}", h.finish()) }) @@ -176,9 +101,9 @@ pub fn now_ms() -> i64 { t.as_millis() as i64 } -fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str) -> Markup { +fn layout(title: &str, body: Markup, views: u64) -> Markup { let ver = asset_version(); - let css_href = format!("/static/theme_{theme}.css?v={ver}"); + let css_href = format!("/static/sorter.css?v={ver}"); let js_src = format!("/static/sorter_ui.js?v={ver}"); html! { (DOCTYPE) @@ -187,7 +112,7 @@ fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str) meta charset="utf-8"; meta name="viewport" content="width=device-width, initial-scale=1"; title { (title) } - link rel="stylesheet" href=(css_href) id="theme-stylesheet"; + link rel="stylesheet" href=(css_href); script src="https://unpkg.com/idiomorph@0.3.0/dist/idiomorph.min.js" {} } body class="home" { @@ -196,21 +121,6 @@ fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str) } div id="errors" {} (body) - div id="controls" { - a href="https://github.com/sortersocial/sorter2" id="src-link" { "src" } - form id="sorter-theme-form" method="post" action="/theme" data-navigate="full" { - input type="hidden" name="next" value=(theme_next); - select id="theme-select" name="theme" onchange="this.form.submit()" aria-label="Theme" { - @for (val, label) in [("default", "default"), ("retro", "retro")] { - @if theme == val { - option value=(val) selected { (label) } - } @else { - option value=(val) { (label) } - } - } - } - } - } script src=(js_src) {} } } @@ -218,11 +128,7 @@ 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()) - } + id.browse_href() } fn segment_label(seg: &str) -> &str { @@ -361,39 +267,10 @@ pub fn vote_panel(parent: &ItemId) -> Markup { } -fn query_param(uri: &Uri, key: &str) -> Option { - let q = uri.query()?; - q.split('&').find_map(|pair| { - let mut it = pair.splitn(2, '='); - if it.next()? == key { - Some(it.next().unwrap_or("").to_string()) - } else { - None - } - }) -} - -pub async fn home( - State(state): State, - jar: CookieJar, - uri: Uri, -) -> impl IntoResponse { +async fn item_page(state: AppState, uri: Uri, item: ItemId) -> Markup { let path = uri.path().to_string(); state.views.increment(path.clone()); let views = state.views.get_views(&path); - let theme = theme_from_jar(&jar); - let theme_next = theme_next_from_uri(&uri); - - 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(); @@ -408,5 +285,14 @@ pub async fn home( (vote_panel(&item)) (ranking_panel(&item, group)) }; - layout("sorter2", body, views, theme, &theme_next) + layout("sorter2", body, views) +} + +pub async fn home(State(state): State, uri: Uri) -> impl IntoResponse { + item_page(state, uri, ItemId::root()).await +} + +pub async fn browse(State(state): State, uri: Uri) -> impl IntoResponse { + let item = ItemId::from_browse_uri(uri.path()).unwrap_or(ItemId::root()); + item_page(state, uri, item).await } diff --git a/server/src/lib.rs b/server/src/lib.rs index 14e7cfbc38feb5d07aff859b64bce6e2ec45cf91..cd56743192919cf4dcea539b3d8873a21fb7e72b 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -30,9 +30,9 @@ pub fn create_app(state: AppState) -> Router { Router::new() .route("/healthz", get(|| async { "ok" })) .route("/static/:filename", get(crate::html::serve_static)) + .route("/~/*item_path", get(crate::html::browse)) .route("/", get(crate::html::home)) .route("/ui", post(crate::api::ui_html::post_ui_html)) - .route("/theme", post(crate::html::post_theme)) .with_state(state) .layer(TraceLayer::new_for_http()) } diff --git a/server/src/path_types.rs b/server/src/path_types.rs index b5c41444f7bcd4d8d289ed3af464bc3f14d0df99..12dce9888f5cd4e1a0974d12d6468368d0f775b9 100644 --- a/server/src/path_types.rs +++ b/server/src/path_types.rs @@ -90,6 +90,50 @@ impl ItemId { paths } + /// Full URL for the browser location bar after `/~/`. + pub fn to_browse_url(&self) -> String { + if self.is_root() { + return String::new(); + } + if self.as_str().contains("://") { + return self.as_str().to_string(); + } + if self + .segments() + .first() + .is_some_and(|s| s.contains('.')) + { + format!("https://{}", self.as_str()) + } else { + self.as_str().to_string() + } + } + + /// App route, e.g. `/~/https://reddit.com/r/rust`. + pub fn browse_href(&self) -> String { + if self.is_root() { + "/".to_string() + } else { + format!("/~/{}", self.to_browse_url()) + } + } + + /// Parse the tail after `/~/` in a request path. + pub fn from_browse_tail(tail: &str) -> ItemId { + let raw = normalize_browse_tail(tail); + if raw.is_empty() { + return ItemId::root(); + } + ItemId::from_url(&raw) + .or_else(|| ItemId::parse(&raw)) + .unwrap_or_else(|| ItemId::opaque(raw)) + } + + pub fn from_browse_uri(path: &str) -> Option { + path.strip_prefix("/~/") + .map(ItemId::from_browse_tail) + } + fn canonicalize(raw: &str) -> Option { let s = raw.trim(); if s.is_empty() { @@ -155,6 +199,21 @@ fn normalize_host(host: &str) -> String { } } +fn normalize_browse_tail(tail: &str) -> String { + let t = tail.trim(); + if t.is_empty() { + return String::new(); + } + // Some HTTP stacks collapse `https://` → `https:/` inside a path segment. + if t.starts_with("https:/") && !t.starts_with("https://") { + return format!("https://{}", &t[7..]); + } + if t.starts_with("http:/") && !t.starts_with("http://") { + return format!("http://{}", &t[6..]); + } + t.to_string() +} + fn normalize_reddit_host_path(s: &str) -> String { let (host, path) = s.split_once('/').unwrap_or((s, "")); let host = normalize_host(host); @@ -252,4 +311,22 @@ mod tests { ); assert!(ItemId::from_legacy_scope("").is_root()); } + + #[test] + fn browse_href_wraps_canonical_path() { + let id = ItemId::parse("reddit.com/r/rust").unwrap(); + assert_eq!(id.browse_href(), "/~/https://reddit.com/r/rust"); + } + + #[test] + fn from_browse_tail_parses_full_url() { + let id = ItemId::from_browse_tail("https://reddit.com/r/AmITheAsshole"); + assert_eq!(id.as_str(), "reddit.com/r/amitheasshole"); + } + + #[test] + fn from_browse_uri_strips_prefix() { + let id = ItemId::from_browse_uri("/~/https://reddit.com/r/rust").unwrap(); + assert_eq!(id.as_str(), "reddit.com/r/rust"); + } } diff --git a/server/static/sorter_ui.js b/server/static/sorter_ui.js index 9c475d8e076ba527aaf7a25c177d0d651bd46ca9..d9b016f197547f37ca4b2bcdd7ee6b673d0fb3f0 100644 --- a/server/static/sorter_ui.js +++ b/server/static/sorter_ui.js @@ -24,7 +24,6 @@ var f = e.target; if (!f || f.tagName !== 'FORM') return; if ((f.method || 'get').toLowerCase() !== 'post') return; - if (f.id === 'sorter-theme-form') return; if (f.getAttribute('data-navigate') === 'full') return; e.preventDefault(); await postUiForm(f); diff --git a/server/static/theme_default.css b/server/static/theme_default.css deleted file mode 100644 index 1bf8ac7a25207336c019f93cd4119bd0e06229f0..0000000000000000000000000000000000000000 --- a/server/static/theme_default.css +++ /dev/null @@ -1,186 +0,0 @@ -:root { - --bg: #0f1115; - --fg: #e8eaed; - --muted: #9aa0a6; - --accent: #7cacf8; - --panel: #1a1d24; - --border: #2a2f3a; -} - -* { - box-sizing: border-box; -} - -body { - margin: 0; - font-family: system-ui, -apple-system, sans-serif; - background: var(--bg); - color: var(--fg); - line-height: 1.5; -} - -.muted { - color: var(--muted); -} - -.small { - font-size: 0.875rem; -} - -.view-meta { - position: fixed; - top: 0.5rem; - right: 0.5rem; - font-size: 0.75rem; -} - -#controls { - position: fixed; - bottom: 0; - left: 0; - right: 0; - display: flex; - gap: 1rem; - align-items: center; - padding: 0.75rem 1rem; - background: var(--panel); - border-top: 1px solid var(--border); - font-size: 0.875rem; -} - -#controls a { - color: var(--accent); -} - -.demo-panel { - max-width: 40rem; - margin: 4rem auto 6rem; - padding: 2rem; - background: var(--panel); - border: 1px solid var(--border); - border-radius: 8px; -} - -.demo-panel h1 { - margin-top: 0; -} - -.btn-primary { - background: var(--accent); - color: #0f1115; - border: none; - padding: 0.5rem 1rem; - border-radius: 4px; - font-size: 1rem; - cursor: pointer; -} - -.btn-primary:hover { - filter: brightness(1.1); -} - -code { - font-size: 0.85em; - background: var(--bg); - padding: 0.1em 0.35em; - border-radius: 3px; -} - -.vote-fields { - display: flex; - flex-direction: column; - gap: 0.75rem; - margin-bottom: 1rem; -} - -.vote-fields label { - display: flex; - flex-direction: column; - gap: 0.25rem; -} - -.vote-fields input { - padding: 0.4rem 0.5rem; - border: 1px solid var(--border); - border-radius: 4px; - background: var(--bg); - color: var(--fg); -} - -.rank-list { - margin: 0; - padding-left: 0; - list-style: none; -} - -.rank-list li { - margin-bottom: 0.35rem; -} - -.rank-num { - color: var(--muted); -} - -#parser-input { - width: 100%; - padding: 0.5rem; - border: 1px solid var(--border); - border-radius: 4px; - background: var(--bg); - color: var(--fg); - font-size: 1rem; - font-family: inherit; - resize: vertical; -} - -#parser-form .btn-primary { - margin-top: 0.5rem; -} - -.breadcrumbs { - font-size: 0.875rem; - margin-bottom: 1rem; - color: var(--muted); -} - -.breadcrumbs a { - color: var(--accent); - text-decoration: none; -} - -.breadcrumbs a:hover { - text-decoration: underline; -} - -.breadcrumbs .separator { - color: var(--muted); -} - -.rank-list a { - color: var(--accent); - text-decoration: none; -} - -.rank-list a:hover { - text-decoration: underline; -} - -.entity-card h2 { - margin-top: 0; -} - -.scope-name { - color: var(--accent); - font-weight: 600; -} - -.rank-heading { - margin: 0.75rem 0 0.25rem; - text-transform: uppercase; - letter-spacing: 0.04em; -} - -.rank-gap { - text-align: center; - margin: 0.25rem 0; -} diff --git a/server/static/theme_retro.css b/server/static/theme_retro.css deleted file mode 100644 index ceee99494b873a6e658857be97f02ee739db85e9..0000000000000000000000000000000000000000 --- a/server/static/theme_retro.css +++ /dev/null @@ -1,5 +0,0 @@ -@import url("/static/theme_default.css"); - -:root { - --accent: #f4a261; -} diff --git a/server/tests/integration_ui.rs b/server/tests/integration_ui.rs index f7ac9c26bf9f9277ad5f5708603224c095165fb8..df7d9ab357531c5146d0b326c149fdaa6b531a4a 100644 --- a/server/tests/integration_ui.rs +++ b/server/tests/integration_ui.rs @@ -70,6 +70,22 @@ async fn post_ui_record_vote_morphs_ranking_and_persists() { assert_eq!(ranked[0].item.as_str(), "alpha"); } +#[tokio::test] +async fn browse_url_renders_subreddit_page() { + let (addr, _tmp) = start_test_server().await; + let client = reqwest::Client::new(); + let html = client + .get(format!("http://{addr}/~/https://reddit.com/r/rust")) + .send() + .await + .unwrap() + .text() + .await + .unwrap(); + assert!(html.contains("ranking-panel")); + assert!(html.contains("/~/https://reddit.com/r/rust")); +} + #[tokio::test] async fn post_ui_parse_query_redirects_to_subreddit() { let (addr, _tmp) = start_test_server().await; @@ -93,5 +109,5 @@ async fn post_ui_parse_query_redirects_to_subreddit() { .unwrap(); assert!(body.contains("window.location.href")); - assert!(body.contains("/?item=reddit.com/r/rust")); + assert!(body.contains("/~/https://reddit.com/r/rust")); }