{"messages":[{"content":"You are a constitutional council ranking individual git commits for ownership allocation.\n\nCompare these two commits. Decide which contributed more lasting value to the project.\n\nJudge substance, not spectacle:\n- Prefer correct, lasting design and real bugfixes over churn, formatting, renames, or generated noise.\n- Prefer clarity and necessity over sheer line count. A small precise change can beat a large diffuse one.\n- Do not favor a side merely because its patch is longer or noisier.\n- Weight what the change does for the project, not the contributor's name.\n\nReturn ONLY a JSON object: {\"winner\": \"A\" or \"B\", \"ratio\": \"N:M\", \"explanation\": \"...\"}\nThe explanation must cite concrete differences in the patches (1-3 sentences).\n\nSide A — contributor: tommy-mor\nSide A — commit message:\n[21b57b50] fix(html): drop duplicate forum.rs; use forum/ as sole module root\n\nRemoves the leftover monolithic file so mod forum resolves to forum/mod.rs\nwithout ambiguity. Keeps feed, views, and other split modules as the source.\n\nMade-with: Cursor\n\nSide A — unified diff (full patch):\ndiff --git a/server/src/html/forum.rs b/server/src/html/forum.rs\ndeleted file mode 100644\nindex 5ad8dfc84dd735d589432e2c613ff687a75f2e61..0000000000000000000000000000000000000000\n--- a/server/src/html/forum.rs\n+++ /dev/null\n@@ -1,1405 +0,0 @@\n-use axum::{\n- extract::{Path, Query, State},\n- http::{HeaderMap, StatusCode, Uri},\n- response::{Html, IntoResponse},\n-};\n-use axum_extra::extract::cookie::CookieJar;\n-use maud::{html, Markup};\n-use serde::Deserialize;\n-\n-use crate::{\n- api::optional_principal,\n- canonical_path::{canonicalize_item, canonicalize_tag},\n- events::ThreadCapability,\n- form_template::template_json_compact,\n- identity::parse_username,\n- reducer::{scope_from_room_wire, ReducerState, ScopeId},\n- state::AppState,\n- timeago,\n-};\n-use serde_json::json;\n-\n-use super::js_string_literal;\n-use super::ui_action::{HtmlUiAction, UI_RPC_FIELD};\n-\n-use super::{\n- bc_segment, bc_threads, cli_panel, layout, now_ms, profile_href, recency_class,\n- render_linkified_with_embeds_in_scope, theme_from_jar, theme_next_from_uri, JsBuilder,\n-};\n-\n-#[derive(Clone)]\n-struct ThreadRow {\n- tag: String,\n- subtitle: Option,\n- last_ts: i64,\n- ingests: usize,\n-}\n-\n-#[derive(Clone)]\n-struct RoomMemberRow {\n- username: String,\n- capabilities: Vec<&'static str>,\n-}\n-\n-/// URL helpers for public `/t/…` and private room threads `/r/{short}/{slug}/t/…`.\n-#[derive(Clone)]\n-pub struct ThreadNav {\n- pub room_wire: String,\n- scope: ScopeId,\n- room_path: String,\n- thread_path_prefix: String,\n- garden_path_prefix: String,\n-}\n-\n-impl ThreadNav {\n- pub(crate) fn public() -> Self {\n- Self {\n- room_wire: \"public\".into(),\n- scope: ScopeId::Public,\n- room_path: \"/t\".into(),\n- thread_path_prefix: \"/t\".into(),\n- garden_path_prefix: \"/~\".into(),\n- }\n- }\n-\n- /// `room_id` wire form `shortid/slug`.\n- pub(crate) fn from_room_id(room_id: &str) -> Option {\n- let (short, slug) = room_id.split_once('/')?;\n- if short.is_empty() || slug.is_empty() {\n- return None;\n- }\n- Some(Self {\n- room_wire: room_id.to_string(),\n- scope: ScopeId::Room(room_id.to_string()),\n- room_path: format!(\"/r/{short}/{slug}\"),\n- thread_path_prefix: format!(\"/r/{short}/{slug}/t\"),\n- garden_path_prefix: format!(\"/r/{short}/{slug}/~\"),\n- })\n- }\n-\n- pub(crate) fn scope(&self) -> ScopeId {\n- self.scope.clone()\n- }\n-\n- pub(crate) fn room_url(&self) -> &str {\n- &self.room_path\n- }\n-\n- pub(crate) fn thread_url(&self, tag: &str) -> String {\n- format!(\"{}/{}\", self.thread_path_prefix, tag)\n- }\n-\n- pub(crate) fn garden_root_url(&self) -> &str {\n- &self.garden_path_prefix\n- }\n-\n- pub(crate) fn garden_item_url(&self, item: &str) -> String {\n- if let Some(tail) = crate::path_types::CanonicalItemUrl::parse(item)\n- .and_then(|c| c.tilde_tail().map(str::to_owned))\n- {\n- format!(\"{}/{}\", self.garden_path_prefix, tail)\n- } else {\n- format!(\"{}/{}\", self.garden_path_prefix, canonicalize_item(item))\n- }\n- }\n-\n- fn thread_page_url(&self, tag: &str, offset: usize) -> String {\n- let base = self.thread_url(tag);\n- if offset == 0 {\n- base\n- } else {\n- format!(\"{base}?offset={offset}\")\n- }\n- }\n-\n- fn post_url(&self, tag: &str, idx: usize) -> String {\n- format!(\"{}/{}/{}\", self.thread_path_prefix, tag, idx)\n- }\n-}\n-\n-/// `POST /ui` + `__rpc__` from an inline link (`onclick`); same-origin credentials as other morph actions.\n-fn thread_ui_fetch_onclick(rpc_compact_json: &str) -> String {\n- format!(\n- \"fetch('/ui',{{method:'POST',headers:{{'Content-Type':'application/x-www-form-urlencoded'}},body:new URLSearchParams({{__rpc__:{}}}).toString(),credentials:'same-origin'}}).then(r=>r.text()).then(eval);return false\",\n- js_string_literal(rpc_compact_json)\n- )\n-}\n-\n-fn thread_nav_for_ingest(ing: &crate::events::Ingest) -> Option {\n- let room = ing.room_id.trim();\n- if room.is_empty() || room == \"public\" {\n- Some(ThreadNav::public())\n- } else {\n- ThreadNav::from_room_id(room)\n- }\n-}\n-\n-fn thread_post_index_in_scope(reduced: &ReducerState, ing: &crate::events::Ingest) -> Option {\n- let scope = scope_from_room_wire(&ing.room_id);\n- let tag = canonicalize_tag(&ing.thread_tag);\n- reduced\n- .ingests_by_scope_thread\n- .get(&(scope, tag))\n- .and_then(|q| q.iter().rev().position(|id| id == &ing.id))\n-}\n-\n-fn post_header_meta(\n- nav: &ThreadNav,\n- tag: &str,\n- post_idx: usize,\n- principal: &str,\n- ts: i64,\n- now: i64,\n-) -> Markup {\n- let post_href = nav.post_url(tag, post_idx);\n- let profile = profile_href(principal);\n- let hover = timeago::rfc3339_utc(ts);\n- let ago = timeago::timeago(now, ts);\n- html! {\n- div class=\"ingest-meta muted\" title=(hover) {\n- a href=(post_href) class=\"post-num\" { \"#\" (post_idx) }\n- \" \"\n- a href=(profile) class=\"post-author\" { \"@\" (principal) }\n- \" · \"\n- (ago)\n- }\n- }\n-}\n-\n-fn post_header_row(\n- nav: &ThreadNav,\n- tag: &str,\n- post_idx: usize,\n- ing: &crate::events::Ingest,\n- _viewer: Option<&str>,\n- now: i64,\n- show_delete: bool,\n-) -> Markup {\n- let meta = post_header_meta(nav, tag, post_idx, &ing.principal, ing.ts, now);\n- html! {\n- div class=\"ingest-header-row\" {\n- (meta)\n- @if show_delete {\n- form class=\"post-delete-form\" method=\"POST\" action=\"/ui\" {\n- input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::RedactPost { post_id: ing.id.clone() }).unwrap());\n- button type=\"submit\" class=\"post-delete-btn\" { \"delete\" }\n- }\n- }\n- }\n- }\n-}\n-\n-fn redacted_header_row(\n- nav: &ThreadNav,\n- tag: &str,\n- post_idx: usize,\n- ing: &crate::events::Ingest,\n- now: i64,\n- expanded: bool,\n-) -> Markup {\n- let meta = post_header_meta(nav, tag, post_idx, &ing.principal, ing.ts, now);\n- let rpc_expand = template_json_compact(&json!({\n- \"action\": \"expand_redacted_post\",\n- \"room\": nav.room_wire,\n- \"thread_tag\": tag,\n- \"post_index\": post_idx,\n- }))\n- .unwrap();\n- let rpc_collapse = template_json_compact(&json!({\n- \"action\": \"collapse_redacted_post\",\n- \"room\": nav.room_wire,\n- \"thread_tag\": tag,\n- \"post_index\": post_idx,\n- }))\n- .unwrap();\n- let onclick_expand = thread_ui_fetch_onclick(&rpc_expand);\n- let onclick_collapse = thread_ui_fetch_onclick(&rpc_collapse);\n- html! {\n- div class=\"ingest-header-row ingest-tombstone-row\" {\n- (meta)\n- span class=\"post-tombstone-inline muted\" {\n- \"deleted · \"\n- @if expanded {\n- a href=\"#\" class=\"hide-deleted-link\"\n- onclick=(onclick_collapse) {\n- \"[hide deleted content]\"\n- }\n- } @else {\n- a href=\"#\" class=\"show-deleted-link\"\n- onclick=(onclick_expand) {\n- \"[show deleted content]\"\n- }\n- }\n- }\n- }\n- }\n-}\n-\n-fn ingest_entry_markup(\n- nav: &ThreadNav,\n- tag: &str,\n- post_idx: usize,\n- ing: &crate::events::Ingest,\n- viewer: Option<&str>,\n- now: i64,\n- reduced: &ReducerState,\n-) -> Markup {\n- let redacted = reduced.redacted_posts.contains(&ing.id);\n- let show_delete = viewer == Some(ing.principal.as_str()) && !redacted;\n- if redacted {\n- html! {\n- div class=\"ingest-entry ingest-redacted\" data-ingest-id=(ing.id) {\n- (redacted_header_row(nav, tag, post_idx, ing, now, false))\n- }\n- }\n- } else {\n- let truncated = ing.raw.len() > 2000;\n- let display_body = if truncated { &ing.raw[..2000] } else { &ing.raw[..] };\n- html! {\n- div class=\"ingest-entry\" data-ingest-id=(ing.id) {\n- (post_header_row(nav, tag, post_idx, ing, viewer, now, show_delete))\n- (render_linkified_with_embeds_in_scope(display_body, nav.garden_root_url()))\n- @if truncated {\n- @let rpc_full = template_json_compact(&json!({\n- \"action\": \"expand_post_full\",\n- \"room\": nav.room_wire,\n- \"thread_tag\": tag,\n- \"post_index\": post_idx,\n- })).unwrap();\n- @let onclick_full = thread_ui_fetch_onclick(&rpc_full);\n- a href=\"#\" class=\"show-full-link\"\n- onclick=(onclick_full) {\n- \"[show full post]\"\n- }\n- }\n- }\n- }\n- }\n-}\n-\n-fn collect_thread_rows_for_scope(reduced: &ReducerState, scope: &ScopeId, now: i64) -> Vec {\n- let _ = now;\n- reduced\n- .forum_threads\n- .iter()\n- .filter(|((s, _), _)| s == scope)\n- .map(|((_, tag), thread)| {\n- let ingests = reduced\n- .ingests_by_scope_thread\n- .get(&(scope.clone(), tag.clone()))\n- .map(|q| q.len())\n- .unwrap_or(0);\n- ThreadRow {\n- tag: tag.clone(),\n- subtitle: None,\n- last_ts: thread.last_activity_ts,\n- ingests,\n- }\n- })\n- .collect()\n-}\n-\n-fn rooms_for_user(reduced: &ReducerState, username: &str) -> Vec {\n- let mut v: Vec = reduced\n- .grants\n- .iter()\n- .filter(|(rid, m)| reduced.rooms.contains(*rid) && m.contains_key(username))\n- .map(|(rid, _)| rid.clone())\n- .collect();\n- v.sort();\n- v\n-}\n-\n-pub(crate) fn user_can_view_room(reduced: &ReducerState, room_id: &str, username: Option<&str>) -> bool {\n- if !reduced.rooms.contains(room_id) {\n- return false;\n- }\n- let Some(u) = username else {\n- return false;\n- };\n- reduced.user_has_cap(room_id, u, ThreadCapability::View)\n-}\n-\n-pub(crate) fn user_can_post_room(reduced: &ReducerState, room_id: &str, username: &str) -> bool {\n- reduced.user_has_cap(room_id, username, ThreadCapability::Post)\n-}\n-\n-fn capability_label(cap: ThreadCapability) -> &'static str {\n- match cap {\n- ThreadCapability::View => \"view\",\n- ThreadCapability::Post => \"post\",\n- ThreadCapability::Vote => \"vote\",\n- ThreadCapability::AddItem => \"add_item\",\n- ThreadCapability::Manage => \"manage\",\n- }\n-}\n-\n-fn room_members_for_room(reduced: &ReducerState, room_id: &str) -> Vec {\n- let mut rows: Vec = reduced\n- .grants\n- .get(room_id)\n- .into_iter()\n- .flat_map(|members| members.iter())\n- .map(|(username, caps)| {\n- let mut ordered = Vec::new();\n- for cap in [\n- ThreadCapability::View,\n- ThreadCapability::Post,\n- ThreadCapability::Vote,\n- ThreadCapability::AddItem,\n- ThreadCapability::Manage,\n- ] {\n- if caps.contains(&cap) {\n- ordered.push(capability_label(cap));\n- }\n- }\n- RoomMemberRow {\n- username: username.clone(),\n- capabilities: ordered,\n- }\n- })\n- .collect();\n- rows.sort_by(|a, b| a.username.cmp(&b.username));\n- rows\n-}\n-\n-fn room_members_inner(members: &[RoomMemberRow]) -> Markup {\n- html! {\n- h3 { \"members\" }\n- ul class=\"room-members\" {\n- @for member in members {\n- li {\n- span class=\"room-member-name\" { \"@\" (member.username) }\n- span class=\"muted\" {\n- \" · \"\n- (member.capabilities.join(\", \"))\n- }\n- }\n- }\n- }\n- }\n-}\n-\n-/// Fragment for `#room-members-section` — expand/collapse is server-driven via `POST /ui`.\n-pub(crate) fn room_members_section_markup(\n- reduced: &ReducerState,\n- room_id: &str,\n- members_expanded: bool,\n-) -> Markup {\n- let members = room_members_for_room(reduced, room_id);\n- if members.is_empty() {\n- return html! {};\n- }\n- html! {\n- div id=\"room-members-section\" {\n- @if members_expanded {\n- form method=\"POST\" action=\"/ui\" {\n- input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomMembersExpanded {\n- room_wire: room_id.to_string(),\n- expanded: false,\n- }).expect(\"static json\"));\n- button type=\"submit\" class=\"form-toggle\" aria-expanded=\"true\" {\n- \"hide members & permissions\"\n- }\n- }\n- section class=\"room-members-panel\" {\n- (room_members_inner(&members))\n- }\n- } @else {\n- form method=\"POST\" action=\"/ui\" {\n- input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomMembersExpanded {\n- room_wire: room_id.to_string(),\n- expanded: true,\n- }).expect(\"static json\"));\n- button type=\"submit\" class=\"form-toggle\" aria-expanded=\"false\" {\n- \"members & permissions\"\n- }\n- }\n- }\n- }\n- }\n-}\n-\n-/// `feed_id` is e.g. `thread-feed` (public bump list, SSE) or `room-thread-feed`.\n-fn render_thread_feed(nav: Option<&ThreadNav>, feed_id: &str, rows: &[ThreadRow], now: i64) -> Markup {\n- html! {\n- div id=(feed_id) {\n- @if rows.is_empty() {\n- p class=\"muted\" { \"no threads yet\" }\n- } @else {\n- ul class=\"thread-feed\" {\n- @for r in rows {\n- @let thread_href = nav\n- .as_ref()\n- .map(|n| n.thread_url(&r.tag))\n- .unwrap_or_else(|| format!(\"/t/{}\", r.tag));\n- @let hover = timeago::rfc3339_utc(r.last_ts);\n- @let ago = timeago::timeago(now, r.last_ts);\n- @let age_cls = recency_class(now, r.last_ts);\n- li class=(age_cls) {\n- a href=(thread_href) {\n- \"#\" (r.tag)\n- @if let Some(subtitle) = &r.subtitle {\n- \": \" (subtitle)\n- }\n- \" \"\n- span class=\"muted\" title=(hover) {\n- (ago)\n- \" · \"\n- (format!(\"{}n\", r.ingests))\n- }\n- }\n- }\n- }\n- }\n- }\n- }\n- }\n-}\n-\n-fn auth_strip(\n- headers: &HeaderMap,\n- jar: &CookieJar,\n- reduced: &ReducerState,\n-) -> Markup {\n- match optional_principal(headers, jar, reduced) {\n- Some(u) => html! {\n- p class=\"muted auth-strip\" {\n- \"@\" (u)\n- \" · \"\n- a href=\"/logout\" { \"log out\" }\n- }\n- },\n- None => html! {\n- p class=\"muted auth-strip\" {\n- a href=\"/login\" { \"log in\" }\n- }\n- },\n- }\n-}\n-\n-fn bc_room(nav: &ThreadNav, room_slug: &str, thread_tag: Option<&str>) -> Markup {\n- html! {\n- a href=\"/\" { \"slug.social\" }\n- @if let Some(t) = thread_tag {\n- (bc_segment(\n- &format!(\"room:{room_slug}\"),\n- nav.room_url(),\n- false,\n- ))\n- (bc_segment(&format!(\"#{t}\"), &nav.thread_url(t), true))\n- } @else {\n- (bc_segment(\n- &format!(\"room:{room_slug}\"),\n- nav.room_url(),\n- true,\n- ))\n- }\n- }\n-}\n-\n-fn compose_form(nav: &ThreadNav, thread_tag: &str, show: bool) -> Markup {\n- if !show {\n- return html! {};\n- }\n- html! {\n- section class=\"compose\" id=\"thread-compose\" {\n- form id=\"thread-compose-form\" method=\"POST\" action=\"/ui\" data-check-action=\"/ui\" data-check-rpc=(template_json_compact(&json!({\n- \"action\": \"check_ingest\",\n- \"room\": nav.room_wire,\n- \"thread_tag\": thread_tag,\n- \"text\": {\"$form\": \"text\"},\n- \"error_target\": \"thread-compose-errors\",\n- \"form_id\": \"thread-compose-form\",\n- })).unwrap()) {\n- input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&json!({\n- \"action\": \"post_ingest\",\n- \"room\": nav.room_wire,\n- \"thread_tag\": thread_tag,\n- \"text\": {\"$form\": \"text\"},\n- \"error_target\": \"thread-compose-errors\",\n- \"form_id\": \"thread-compose-form\",\n- })).unwrap());\n- textarea name=\"text\" rows=\"5\" cols=\"80\" placeholder=\"prose or ~/items and votes…\" {}\n- p {\n- button type=\"submit\" { \"post\" }\n- }\n- }\n- div id=\"thread-compose-errors\" {}\n- }\n- }\n-}\n-\n-fn new_thread_form_public(show: bool) -> Markup {\n- if !show {\n- return html! {};\n- }\n- html! {\n- section class=\"compose\" id=\"public-new-thread-compose\" {\n- div id=\"public-new-thread-errors\" {}\n- form id=\"public-new-thread-form\" method=\"POST\" action=\"/ui\" {\n- input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&json!({\n- \"action\": \"post_ingest\",\n- \"room\": \"public\",\n- \"thread_tag\": {\"$form\": \"thread_tag\"},\n- \"text\": {\"$form\": \"text\"},\n- })).unwrap());\n- input type=\"text\" id=\"new-thread-tag\" name=\"thread_tag\" pattern=\"[a-z0-9_\\\\-]{1,64}\" placeholder=\"thread-title-slug-here\";\n- textarea id=\"new-thread-text\" name=\"text\" rows=\"4\" placeholder=\"Hello threadgoers!! Behold my new thread!\" {}\n- p { button type=\"submit\" { \"create thread / make first post\" } }\n- }\n- }\n- }\n-}\n-\n-/// Returns the current public thread feed markup for SSE (`#thread-feed`).\n-pub async fn thread_feed_html(state: &AppState) -> Markup {\n- let now = now_ms();\n- let nav = ThreadNav::public();\n- let mut rows = {\n- let reduced = state.reduced.read().await;\n- collect_thread_rows_for_scope(&reduced, &ScopeId::Public, now)\n- };\n- rows.sort_by(|a, b| b.last_ts.cmp(&a.last_ts));\n- render_thread_feed(Some(&nav), \"thread-feed\", &rows, now)\n-}\n-\n-/// Returns the current private room thread feed markup for SSE (`#room-thread-feed`).\n-pub async fn thread_feed_html_for_room(state: &AppState, room_id: &str) -> Markup {\n- let now = now_ms();\n- let Some(nav) = ThreadNav::from_room_id(room_id) else {\n- return html! { div id=\"room-thread-feed\" { p class=\"muted\" { \"room not found\" } } };\n- };\n- let mut rows = {\n- let reduced = state.reduced.read().await;\n- collect_thread_rows_for_scope(&reduced, &ScopeId::Room(room_id.to_string()), now)\n- };\n- rows.sort_by(|a, b| b.last_ts.cmp(&a.last_ts));\n- render_thread_feed(Some(&nav), \"room-thread-feed\", &rows, now)\n-}\n-\n-fn render_thread_feed_region_markup(\n- nav: &ThreadNav,\n- tag: &str,\n- display_ingests: &[crate::events::Ingest],\n- offset: usize,\n- total: usize,\n- now: i64,\n- viewer: Option<&str>,\n- reduced: &ReducerState,\n-) -> Markup {\n- let paginator_top = render_thread_paginator(nav, tag, offset, total, true);\n- let paginator_bot = render_thread_paginator(nav, tag, offset, total, false);\n- html! {\n- div id=\"thread-feed-region\" {\n- @if display_ingests.is_empty() {\n- p class=\"muted\" { \"no activity yet\" }\n- } @else {\n- (paginator_top)\n- @for (i, ing) in display_ingests.iter().enumerate() {\n- @let post_idx = offset + i;\n- (ingest_entry_markup(nav, tag, post_idx, ing, viewer, now, reduced))\n- }\n- (paginator_bot)\n- }\n- }\n- }\n-}\n-\n-pub async fn thread_feed_region_markup(\n- state: &AppState,\n- room_id: Option<&str>,\n- tag: &str,\n- viewer: Option<&str>,\n-) -> Markup {\n- let tag = canonicalize_tag(tag);\n- let Some(nav) = (match room_id {\n- Some(room_id) => ThreadNav::from_room_id(room_id),\n- None => Some(ThreadNav::public()),\n- }) else {\n- return html! { div id=\"thread-feed-region\" { p class=\"muted\" { \"thread not found\" } } };\n- };\n- let scope = nav.scope();\n- let all_ids: Vec = {\n- let reduced = state.reduced.read().await;\n- reduced\n- .ingests_by_scope_thread\n- .get(&(scope.clone(), tag.clone()))\n- .map(|q| q.iter().rev().cloned().collect())\n- .unwrap_or_default()\n- };\n- let total = all_ids.len();\n- let offset = total.saturating_sub(PAGE_SIZE);\n- let page_ids: Vec = all_ids.into_iter().skip(offset).take(PAGE_SIZE).collect();\n- let reduced = state.reduced.read().await;\n- let display_ingests = page_ids\n- .iter()\n- .filter_map(|id| reduced.ingests_by_id.get(id).cloned())\n- .collect::>();\n- render_thread_feed_region_markup(\n- &nav,\n- &tag,\n- &display_ingests,\n- offset,\n- total,\n- now_ms(),\n- viewer,\n- &reduced,\n- )\n-}\n-\n-/// Home: private rooms (signed-in), then public bump-ordered threads.\n-pub async fn home(\n- State(state): State,\n- headers: HeaderMap,\n- jar: CookieJar,\n- uri: Uri,\n-) -> impl IntoResponse {\n- let now = now_ms();\n- let reduced = state.reduced.read().await;\n- let user = optional_principal(&headers, &jar, &reduced);\n- let room_ids = user\n- .as_ref()\n- .map(|u| rooms_for_user(&reduced, u))\n- .unwrap_or_default();\n- let mut public_rows = collect_thread_rows_for_scope(&reduced, &ScopeId::Public, now);\n- drop(reduced);\n- public_rows.sort_by(|a, b| b.last_ts.cmp(&a.last_ts));\n-\n- let nav = ThreadNav::public();\n- let reduced_read = state.reduced.read().await;\n- let strip = auth_strip(&headers, &jar, &reduced_read);\n- drop(reduced_read);\n-\n- let page = layout(\n- \"slug.social\",\n- \"view-thread\",\n- html! {\n- (strip)\n- nav class=\"breadcrumb\" { (bc_threads(None)) }\n- @if !room_ids.is_empty() {\n- h2 { \"your rooms\" }\n- ul class=\"thread-feed\" {\n- @for rid in &room_ids {\n- @if let Some(nav_r) = ThreadNav::from_room_id(rid) {\n- @let slug = if let Some((_, s)) = rid.split_once('/') { s } else { rid.as_str() };\n- li {\n- a href=(nav_r.room_url()) {\n- (slug)\n- span class=\"muted\" { \" · \" (rid) }\n- }\n- }\n- }\n- }\n- }\n- }\n- p class=\"muted\" { \"dark = time-ordered · light = vote-ranked\" }\n- div class=\"thread-feed-toolbar\" {\n- form method=\"POST\" action=\"/ui\" {\n- input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::ExpandPublicNewThreadForm).expect(\"static json\"));\n- button type=\"submit\" class=\"section-add-btn\" { \"+\" }\n- }\n- }\n- div id=\"public-new-thread-ui-slot\" {}\n- (render_thread_feed(Some(&nav), \"thread-feed\", &public_rows, now))\n- (cli_panel(&[\"npx slugsocial public forum list\"]))\n- },\n- None,\n- theme_from_jar(&jar),\n- &theme_next_from_uri(&uri),\n- );\n- Html(page.into_string())\n-}\n-\n-#[derive(Debug, Deserialize)]\n-pub struct ThreadViewQuery {\n- pub offset: Option,\n-}\n-\n-const PAGE_SIZE: usize = 10;\n-\n-fn render_thread_paginator(nav: &ThreadNav, tag: &str, offset: usize, total: usize, top: bool) -> Markup {\n- let newer_offset = offset.checked_add(PAGE_SIZE).filter(|&o| o < total);\n- let older_offset = if offset > 0 {\n- Some(offset.saturating_sub(PAGE_SIZE))\n- } else {\n- None\n- };\n- let latest_offset = total.saturating_sub(PAGE_SIZE);\n- let on_latest = offset >= latest_offset;\n- let (id, scroll_href, scroll_label) = if top {\n- (\"top\", \"#bottom\", \"↓\")\n- } else {\n- (\"bottom\", \"#top\", \"↑\")\n- };\n- html! {\n- div class=\"thread-paginator\" id=(id) {\n- a href=(scroll_href) class=\"post-nav-btn\" { (scroll_label) }\n- @if let Some(o) = older_offset {\n- a href=(nav.thread_page_url(tag, o)) class=\"post-nav-btn\" { \"← older\" }\n- } @else {\n- a href=\"#\" class=\"post-nav-btn disabled\" { \"← older\" }\n- }\n- span class=\"post-nav-pos muted\" {\n- (offset + 1) \"–\" (total.min(offset + PAGE_SIZE)) \" / \" (total)\n- }\n- @if let Some(o) = newer_offset {\n- a href=(nav.thread_page_url(tag, o)) class=\"post-nav-btn\" { \"newer →\" }\n- } @else {\n- a href=\"#\" class=\"post-nav-btn disabled\" { \"newer →\" }\n- }\n- @if !on_latest {\n- a href=(nav.thread_page_url(tag, latest_offset)) class=\"post-nav-btn\" { \"latest\" }\n- }\n- }\n- }\n-}\n-\n-async fn thread_view_inner(\n- state: AppState,\n- tag: String,\n- q: ThreadViewQuery,\n- nav: ThreadNav,\n- headers: HeaderMap,\n- jar: CookieJar,\n- uri: Uri,\n-) -> impl IntoResponse {\n- let tag = canonicalize_tag(&tag);\n- let scope = nav.scope();\n-\n- let all_ids: Vec = {\n- let reduced = state.reduced.read().await;\n- reduced\n- .ingests_by_scope_thread\n- .get(&(scope.clone(), tag.clone()))\n- .map(|q| q.iter().rev().cloned().collect())\n- .unwrap_or_default()\n- };\n-\n- let total = all_ids.len();\n- let offset = q.offset.unwrap_or(0);\n- let page_ids: Vec = all_ids.into_iter().skip(offset).take(PAGE_SIZE).collect();\n-\n- let (display_ingests, _subtitle) = {\n- let reduced = state.reduced.read().await;\n- let ingests = page_ids\n- .iter()\n- .filter_map(|id| reduced.ingests_by_id.get(id).cloned())\n- .collect::>();\n- (ingests, None::)\n- };\n-\n- let reduced = state.reduced.read().await;\n- let user = optional_principal(&headers, &jar, &reduced);\n- let sc = nav.scope();\n- let show_compose = match &sc {\n- ScopeId::Public => user.is_some(),\n- ScopeId::Room(rid) => user\n- .as_ref()\n- .map(|u| user_can_post_room(&reduced, rid, u))\n- .unwrap_or(false),\n- };\n- let strip = auth_strip(&headers, &jar, &reduced);\n- let now = now_ms();\n- let entry_rows: Vec = display_ingests\n- .iter()\n- .enumerate()\n- .map(|(i, ing)| {\n- let post_idx = offset + i;\n- ingest_entry_markup(&nav, &tag, post_idx, ing, user.as_deref(), now, &reduced)\n- })\n- .collect();\n- drop(reduced);\n-\n- let paginator_top = render_thread_paginator(&nav, &tag, offset, total, true);\n- let paginator_bot = render_thread_paginator(&nav, &tag, offset, total, false);\n-\n- let bc: Markup = match &sc {\n- ScopeId::Public => bc_threads(Some(&tag)),\n- ScopeId::Room(rid) => {\n- let slug = if let Some((_, s)) = rid.split_once('/') {\n- s\n- } else {\n- rid.as_str()\n- };\n- bc_room(&nav, slug, Some(&tag))\n- }\n- };\n-\n- let cli = match &sc {\n- ScopeId::Public => format!(\"npx slugsocial public forum show {tag}\"),\n- ScopeId::Room(r) => format!(\"npx slugsocial private {r} forum show {tag}\"),\n- };\n-\n- let page = layout(\n- &format!(\"#{tag}\"),\n- \"view-thread\",\n- html! {\n- (strip)\n- nav class=\"breadcrumb\" { (bc) }\n- p class=\"muted\" { \"top=oldest · bottom=newest\" }\n- div id=\"thread-feed-region\" {\n- @if display_ingests.is_empty() {\n- p class=\"muted\" { \"no activity yet\" }\n- } @else {\n- (paginator_top)\n- @for row in &entry_rows {\n- (row)\n- }\n- (paginator_bot)\n- }\n- }\n- div id=\"thread-live-region\" {\n- (compose_form(&nav, &tag, show_compose))\n- }\n- (cli_panel(std::slice::from_ref(&cli)))\n- },\n- None,\n- theme_from_jar(&jar),\n- &theme_next_from_uri(&uri),\n- );\n- Html(page.into_string()).into_response()\n-}\n-\n-/// Thread view — `/t/:tag`\n-pub async fn thread_view(\n- State(state): State,\n- Path(tag): Path,\n- Query(q): Query,\n- headers: HeaderMap,\n- jar: CookieJar,\n- uri: Uri,\n-) -> impl IntoResponse {\n- thread_view_inner(state, tag, q, ThreadNav::public(), headers, jar, uri).await\n-}\n-\n-/// Room thread — `/r/:short/:slug/t/:tag`\n-pub async fn room_thread_view(\n- State(state): State,\n- Path((room_short, room_slug, tag)): Path<(String, String, String)>,\n- Query(q): Query,\n- headers: HeaderMap,\n- jar: CookieJar,\n- uri: Uri,\n-) -> impl IntoResponse {\n- let room_id = format!(\"{room_short}/{room_slug}\");\n- let reduced = state.reduced.read().await;\n- let user = optional_principal(&headers, &jar, &reduced);\n- if !user_can_view_room(&reduced, &room_id, user.as_deref()) {\n- drop(reduced);\n- return room_not_found_page(&jar, &uri).into_response();\n- }\n- drop(reduced);\n- let Some(nav) = ThreadNav::from_room_id(&room_id) else {\n- return (StatusCode::NOT_FOUND, \"bad room path\").into_response();\n- };\n- thread_view_inner(state, tag, q, nav, headers, jar, uri)\n- .await\n- .into_response()\n-}\n-\n-fn room_not_found_page(jar: &CookieJar, uri: &Uri) -> impl IntoResponse {\n- let body = html! {\n- nav class=\"breadcrumb\" { a href=\"/\" { \"slug.social\" } }\n- h1 { \"not found\" }\n- p { \"The requested page could not be found.\" }\n- p { a href=\"/\" { \"home\" } }\n- };\n- let page = layout(\n- \"not found — slug.social\",\n- \"view-thread\",\n- body,\n- None,\n- theme_from_jar(jar),\n- &theme_next_from_uri(uri),\n- );\n- (StatusCode::NOT_FOUND, Html(page.into_string()))\n-}\n-\n-/// Private room index — `/r/:short/:slug`\n-pub async fn room_page(\n- State(state): State,\n- Path((room_short, room_slug)): Path<(String, String)>,\n- headers: HeaderMap,\n- jar: CookieJar,\n- uri: Uri,\n-) -> impl IntoResponse {\n- let room_id = format!(\"{room_short}/{room_slug}\");\n- let now = now_ms();\n- let reduced = state.reduced.read().await;\n- if !reduced.rooms.contains(&room_id) {\n- drop(reduced);\n- return (StatusCode::NOT_FOUND, \"room not found\").into_response();\n- }\n- let user = optional_principal(&headers, &jar, &reduced);\n- if !user_can_view_room(&reduced, &room_id, user.as_deref()) {\n- drop(reduced);\n- return room_not_found_page(&jar, &uri).into_response();\n- }\n- let scope = ScopeId::Room(room_id.clone());\n- let mut rows = collect_thread_rows_for_scope(&reduced, &scope, now);\n- let strip = auth_strip(&headers, &jar, &reduced);\n- let show_new = user\n- .as_ref()\n- .map(|u| user_can_post_room(&reduced, &room_id, u))\n- .unwrap_or(false);\n- rows.sort_by(|a, b| b.last_ts.cmp(&a.last_ts));\n-\n- let Some(nav) = ThreadNav::from_room_id(&room_id) else {\n- drop(reduced);\n- return (StatusCode::NOT_FOUND, \"room not found\").into_response();\n- };\n- // Precompute markup that needs `&ReducerState`, then release the lock before `layout`.\n- // `tokio::sync::RwLock` queues new readers behind a waiting writer; holding the read\n- // guard across HTML/stringify could stall other navigations when an ingest needs a write lock.\n- let members_markup = room_members_section_markup(&reduced, &room_id, false);\n- let forum_cli = format!(\"npx slugsocial private {room_id} forum list\");\n- let garden_cli = format!(\"npx slugsocial private {room_id} garden tree\");\n- let audit_cli = format!(\"npx slugsocial private {room_id} audit\");\n- drop(reduced);\n-\n- let slug_display = room_slug.as_str();\n- let page = layout(\n- &format!(\"room {slug_display} — slug.social\"),\n- \"view-thread\",\n- html! {\n- (strip)\n- nav class=\"breadcrumb\" { (bc_room(&nav, slug_display, None)) }\n- (members_markup)\n- h3 { \"threads\" }\n- (render_thread_feed(Some(&nav), \"room-thread-feed\", &rows, now))\n- @if show_new {\n- div id=\"room-new-thread-ui-slot\" {\n- (new_thread_form_for_room(&nav, true, false))\n- }\n- }\n- (cli_panel(&[forum_cli, garden_cli, audit_cli]))\n- },\n- None,\n- theme_from_jar(&jar),\n- &theme_next_from_uri(&uri),\n- );\n- Html(page.into_string()).into_response()\n-}\n-\n-fn new_thread_form_for_room(nav: &ThreadNav, show: bool, compose_expanded: bool) -> Markup {\n- if !show {\n- return html! {};\n- }\n- // Single root for Idiomorph when morphing `#room-new-thread-ui-slot` (expanded has form + section).\n- html! {\n- div class=\"room-new-thread-slot-inner\" {\n- @if compose_expanded {\n- form method=\"POST\" action=\"/ui\" {\n- input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomNewThreadComposeExpanded {\n- room_wire: nav.room_wire.clone(),\n- expanded: false,\n- }).expect(\"static json\"));\n- button type=\"submit\" class=\"form-toggle\" aria-expanded=\"true\" {\n- \"-\"\n- }\n- }\n- section class=\"compose\" id=\"room-new-thread-compose\" {\n- div id=\"room-new-thread-errors\" {}\n- form id=\"room-new-thread-form\" method=\"POST\" action=\"/ui\" data-check-action=\"/ui\" data-check-rpc=(template_json_compact(&json!({\n- \"action\": \"check_ingest\",\n- \"room\": nav.room_wire,\n- \"thread_tag\": {\"$form\": \"thread_tag\"},\n- \"text\": {\"$form\": \"text\"},\n- \"error_target\": \"room-new-thread-errors\",\n- \"form_id\": \"room-new-thread-form\",\n- })).unwrap()) {\n- input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&json!({\n- \"action\": \"post_ingest\",\n- \"room\": nav.room_wire,\n- \"thread_tag\": {\"$form\": \"thread_tag\"},\n- \"text\": {\"$form\": \"text\"},\n- \"error_target\": \"room-new-thread-errors\",\n- \"form_id\": \"room-new-thread-form\",\n- })).unwrap());\n- input type=\"text\" id=\"room-new-tag\" name=\"thread_tag\" pattern=\"[a-z0-9_\\\\-]{1,64}\" required placeholder=\"thread-topic-slug-here\";\n- textarea name=\"text\" rows=\"4\" placeholder=\"First post body…\" required {}\n- p { button type=\"submit\" { \"post\" } }\n- }\n- }\n- } @else {\n- form method=\"POST\" action=\"/ui\" {\n- input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomNewThreadComposeExpanded {\n- room_wire: nav.room_wire.clone(),\n- expanded: true,\n- }).expect(\"static json\"));\n- button type=\"submit\" class=\"form-toggle\" aria-expanded=\"false\" {\n- \"+\"\n- }\n- }\n- }\n- }\n- }\n-}\n-\n-pub(crate) fn login_to_post_hint_markup() -> Markup {\n- html! {\n- p class=\"muted\" { \"log in to post\" }\n- }\n-}\n-\n-pub(crate) fn fragment_public_new_thread_form(show: bool) -> Markup {\n- new_thread_form_public(show)\n-}\n-\n-pub(crate) fn fragment_room_new_thread_form(nav: &ThreadNav, show: bool, compose_expanded: bool) -> Markup {\n- new_thread_form_for_room(nav, show, compose_expanded)\n-}\n-\n-async fn thread_post_view_inner(\n- state: AppState,\n- tag: String,\n- index_str: String,\n- nav: ThreadNav,\n- viewer: Option,\n- jar: CookieJar,\n- uri: Uri,\n-) -> impl IntoResponse {\n- let tag = canonicalize_tag(&tag);\n- let index: usize = index_str.parse().unwrap_or(0);\n- let scope = nav.scope();\n- let now = now_ms();\n- let (ing, subtitle, body_markup) = {\n- let reduced = state.reduced.read().await;\n- let ing = reduced\n- .ingests_by_scope_thread\n- .get(&(scope.clone(), tag.clone()))\n- .and_then(|q| q.iter().rev().nth(index))\n- .and_then(|id| reduced.ingests_by_id.get(id).cloned());\n- let body = ing.as_ref().map(|i| {\n- ingest_entry_markup(&nav, &tag, index, i, viewer.as_deref(), now, &reduced)\n- });\n- (ing, None::, body)\n- };\n-\n- let sc = nav.scope();\n- let bc: Markup = match &sc {\n- ScopeId::Public => bc_threads(Some(&tag)),\n- ScopeId::Room(rid) => {\n- let slug = if let Some((_, s)) = rid.split_once('/') {\n- s\n- } else {\n- rid.as_str()\n- };\n- bc_room(&nav, slug, Some(&tag))\n- }\n- };\n-\n- let page = layout(\n- &format!(\"#{tag} / post #{index}\"),\n- \"view-thread\",\n- html! {\n- nav class=\"breadcrumb\" { (bc) }\n- h2 { \"#\" (tag) @if let Some(sub) = &subtitle { \": \" (sub) } \" / post #\" (index) }\n- @if let (Some(_ing), Some(bm)) = (&ing, &body_markup) {\n- (bm)\n- } @else {\n- p class=\"muted\" { \"post not found\" }\n- }\n- },\n- None,\n- theme_from_jar(&jar),\n- &theme_next_from_uri(&uri),\n- );\n- Html(page.into_string()).into_response()\n-}\n-\n-pub async fn thread_post_view(\n- State(state): State,\n- Path((tag, index_str)): Path<(String, String)>,\n- headers: HeaderMap,\n- jar: CookieJar,\n- uri: Uri,\n-) -> impl IntoResponse {\n- let reduced = state.reduced.read().await;\n- let viewer = optional_principal(&headers, &jar, &reduced);\n- drop(reduced);\n- thread_post_view_inner(state, tag, index_str, ThreadNav::public(), viewer, jar, uri)\n- .await\n-}\n-\n-pub async fn room_thread_post_view(\n- State(state): State,\n- Path((room_short, room_slug, tag, index_str)): Path<(String, String, String, String)>,\n- headers: HeaderMap,\n- jar: CookieJar,\n- uri: Uri,\n-) -> impl IntoResponse {\n- let room_id = format!(\"{room_short}/{room_slug}\");\n- let reduced = state.reduced.read().await;\n- let user = optional_principal(&headers, &jar, &reduced);\n- if !user_can_view_room(&reduced, &room_id, user.as_deref()) {\n- drop(reduced);\n- return room_not_found_page(&jar, &uri).into_response();\n- }\n- drop(reduced);\n- let Some(nav) = ThreadNav::from_room_id(&room_id) else {\n- return (StatusCode::NOT_FOUND, \"bad room path\").into_response();\n- };\n- thread_post_view_inner(state, tag, index_str, nav, user, jar, uri)\n- .await\n- .into_response()\n-}\n-\n-pub(crate) async fn thread_ui_expand_post_full(\n- state: &AppState,\n- room: &str,\n- thread_tag: &str,\n- post_index: usize,\n- viewer: Option<&str>,\n-) -> axum::response::Response {\n- let room = room.trim();\n- let tag = canonicalize_tag(thread_tag);\n- let scope = scope_from_room_wire(room);\n- let nav = if room.is_empty() || room == \"public\" {\n- ThreadNav::public()\n- } else {\n- let Some(n) = ThreadNav::from_room_id(room) else {\n- return super::ui_js_warn(\"bad room\");\n- };\n- n\n- };\n- if let ScopeId::Room(ref rid) = scope {\n- let reduced = state.reduced.read().await;\n- if !user_can_view_room(&reduced, rid, viewer) {\n- return super::ui_js_warn(\"forbidden\");\n- }\n- }\n-\n- let now = now_ms();\n- let reduced = state.reduced.read().await;\n- let ing = reduced\n- .ingests_by_scope_thread\n- .get(&(scope.clone(), tag.clone()))\n- .and_then(|q| q.iter().rev().nth(post_index))\n- .and_then(|id| reduced.ingests_by_id.get(id).cloned());\n- let Some(ing) = ing else {\n- return super::ui_js_warn(\"post not found\");\n- };\n- if reduced.redacted_posts.contains(&ing.id) {\n- return super::ui_js_warn(\"post not found\");\n- }\n- let ing_id = ing.id.clone();\n- drop(reduced);\n-\n- let full_html = html! {\n- div class=\"ingest-entry\" data-ingest-id=(ing_id) {\n- (post_header_row(\n- &nav,\n- &tag,\n- post_index,\n- &ing,\n- viewer,\n- now,\n- viewer == Some(ing.principal.as_str()),\n- ))\n- (render_linkified_with_embeds_in_scope(&ing.raw, nav.garden_root_url()))\n- }\n- };\n-\n- JsBuilder::new()\n- .morph_selector(&format!(\"[data-ingest-id=\\\"{}\\\"]\", ing_id), full_html)\n- .into_response()\n-}\n-\n-pub(crate) async fn thread_ui_expand_redacted_post(\n- state: &AppState,\n- room: &str,\n- thread_tag: &str,\n- post_index: usize,\n- viewer: Option<&str>,\n-) -> axum::response::Response {\n- let room = room.trim();\n- let tag = canonicalize_tag(thread_tag);\n- let scope = scope_from_room_wire(room);\n- let nav = if room.is_empty() || room == \"public\" {\n- ThreadNav::public()\n- } else {\n- let Some(n) = ThreadNav::from_room_id(room) else {\n- return super::ui_js_warn(\"bad room\");\n- };\n- n\n- };\n- if let ScopeId::Room(ref rid) = scope {\n- let reduced = state.reduced.read().await;\n- if !user_can_view_room(&reduced, rid, viewer) {\n- return super::ui_js_warn(\"forbidden\");\n- }\n- }\n-\n- let now = now_ms();\n- let reduced = state.reduced.read().await;\n- let ing = reduced\n- .ingests_by_scope_thread\n- .get(&(scope.clone(), tag.clone()))\n- .and_then(|q| q.iter().rev().nth(post_index))\n- .and_then(|id| reduced.ingests_by_id.get(id).cloned());\n- let Some(ing) = ing else {\n- return super::ui_js_warn(\"post not found\");\n- };\n- if !reduced.redacted_posts.contains(&ing.id) {\n- return super::ui_js_warn(\"post not found\");\n- }\n- let ing_id = ing.id.clone();\n- drop(reduced);\n-\n- let full_html = html! {\n- div class=\"ingest-entry ingest-redacted-expanded\" data-ingest-id=(ing_id) {\n- (redacted_header_row(&nav, &tag, post_index, &ing, now, true))\n- (render_linkified_with_embeds_in_scope(&ing.raw, nav.garden_root_url()))\n- }\n- };\n-\n- JsBuilder::new()\n- .morph_selector(&format!(\"[data-ingest-id=\\\"{}\\\"]\", ing_id), full_html)\n- .into_response()\n-}\n-\n-pub(crate) async fn thread_ui_collapse_redacted_post(\n- state: &AppState,\n- room: &str,\n- thread_tag: &str,\n- post_index: usize,\n- viewer: Option<&str>,\n-) -> axum::response::Response {\n- let room = room.trim();\n- let tag = canonicalize_tag(thread_tag);\n- let scope = scope_from_room_wire(room);\n- let nav = if room.is_empty() || room == \"public\" {\n- ThreadNav::public()\n- } else {\n- let Some(n) = ThreadNav::from_room_id(room) else {\n- return super::ui_js_warn(\"bad room\");\n- };\n- n\n- };\n- if let ScopeId::Room(ref rid) = scope {\n- let reduced = state.reduced.read().await;\n- if !user_can_view_room(&reduced, rid, viewer) {\n- return super::ui_js_warn(\"forbidden\");\n- }\n- }\n-\n- let now = now_ms();\n- let reduced = state.reduced.read().await;\n- let ing = reduced\n- .ingests_by_scope_thread\n- .get(&(scope.clone(), tag.clone()))\n- .and_then(|q| q.iter().rev().nth(post_index))\n- .and_then(|id| reduced.ingests_by_id.get(id).cloned());\n- let Some(ing) = ing else {\n- return super::ui_js_warn(\"post not found\");\n- };\n- if !reduced.redacted_posts.contains(&ing.id) {\n- return super::ui_js_warn(\"post not found\");\n- }\n- let ing_id = ing.id.clone();\n- let collapsed = ingest_entry_markup(&nav, &tag, post_index, &ing, viewer, now, &reduced);\n- drop(reduced);\n-\n- JsBuilder::new()\n- .morph_selector(&format!(\"[data-ingest-id=\\\"{}\\\"]\", ing_id), collapsed)\n- .into_response()\n-}\n-\n-struct ProfilePostRow {\n- thread_tag: String,\n- post_idx: usize,\n- post_href: String,\n- ts: i64,\n- snippet: String,\n-}\n-\n-pub async fn user_profile_page(\n- State(state): State,\n- Path(username): Path,\n- headers: HeaderMap,\n- jar: CookieJar,\n- uri: Uri,\n-) -> impl IntoResponse {\n- let canon = match parse_username(&username) {\n- Ok(u) => u,\n- Err(_) => return (StatusCode::NOT_FOUND, \"not found\").into_response(),\n- };\n-\n- let (rows, strip) = {\n- let reduced = state.reduced.read().await;\n- let viewer = optional_principal(&headers, &jar, &reduced);\n- let ids = reduced.visible_posts_for_actor(&canon, viewer.as_deref());\n- let mut rows: Vec = Vec::new();\n- for id in ids {\n- if reduced.redacted_posts.contains(&id) {\n- continue;\n- }\n- let Some(ing) = reduced.ingests_by_id.get(&id).cloned() else {\n- continue;\n- };\n- let Some(nav) = thread_nav_for_ingest(&ing) else {\n- continue;\n- };\n- let Some(post_idx) = thread_post_index_in_scope(&reduced, &ing) else {\n- continue;\n- };\n- let tag = canonicalize_tag(&ing.thread_tag);\n- let post_href = nav.post_url(&tag, post_idx);\n- let raw_one_line = ing.raw.lines().next().unwrap_or(\"\").trim();\n- let snippet: String = raw_one_line.chars().take(120).collect();\n- rows.push(ProfilePostRow {\n- thread_tag: tag,\n- post_idx,\n- post_href,\n- ts: ing.ts,\n- snippet,\n- });\n- }\n- rows.sort_by(|a, b| b.ts.cmp(&a.ts));\n- let strip = auth_strip(&headers, &jar, &reduced);\n- (rows, strip)\n- };\n-\n- let now = now_ms();\n- let page = layout(\n- &format!(\"@{canon}\"),\n- \"view-thread\",\n- html! {\n- (strip)\n- nav class=\"breadcrumb\" {\n- a href=\"/\" { \"slug.social\" }\n- (bc_segment(&format!(\"@{canon}\"), &profile_href(&canon), true))\n- }\n- h2 { \"@\" (canon) }\n- p class=\"muted\" { \"posts (newest first)\" }\n- @if rows.is_empty() {\n- p class=\"muted\" { \"no public posts yet\" }\n- } @else {\n- ul class=\"profile-post-list\" {\n- @for r in &rows {\n- @let hover = timeago::rfc3339_utc(r.ts);\n- @let ago = timeago::timeago(now, r.ts);\n- li {\n- a href=(r.post_href.as_str()) {\n- \"#\" (r.thread_tag)\n- \" / #\"\n- (r.post_idx)\n- }\n- span class=\"muted\" title=(hover) { \" · \" (ago) }\n- @if !r.snippet.is_empty() {\n- p class=\"profile-post-snippet muted\" { (r.snippet) }\n- }\n- }\n- }\n- }\n- }\n- (cli_panel(&[format!(\"npx slugsocial public forum list\")]))\n- },\n- None,\n- theme_from_jar(&jar),\n- &theme_next_from_uri(&uri),\n- );\n- Html(page.into_string()).into_response()\n-}\ndiff --git a/server/src/html/forum/feed.rs b/server/src/html/forum/feed.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..30b95ff6e85245a82199c96e41484d03c24989dd\n--- /dev/null\n+++ b/server/src/html/forum/feed.rs\n@@ -0,0 +1,261 @@\n+use axum::{\n+ extract::State,\n+ http::{HeaderMap, Uri},\n+ response::{Html, IntoResponse},\n+};\n+use axum_extra::extract::cookie::CookieJar;\n+use maud::{html, Markup};\n+\n+use crate::api::optional_principal;\n+use crate::canonical_path::canonicalize_tag;\n+use crate::reducer::{ReducerState, ScopeId};\n+use crate::state::AppState;\n+use crate::timeago;\n+\n+use super::ingest::ingest_entry_markup;\n+use super::nav::ThreadNav;\n+use super::page::auth_strip;\n+use super::paginator::{render_thread_paginator, PAGE_SIZE};\n+use crate::html::{\n+ bc_threads, cli_panel, layout, now_ms, recency_class, theme_from_jar, theme_next_from_uri,\n+};\n+\n+#[derive(Clone)]\n+pub(super) struct ThreadRow {\n+ pub(super) tag: String,\n+ pub(super) subtitle: Option,\n+ pub(super) last_ts: i64,\n+ pub(super) ingests: usize,\n+}\n+\n+pub(super) fn collect_thread_rows_for_scope(reduced: &ReducerState, scope: &ScopeId, now: i64) -> Vec {\n+ let _ = now;\n+ reduced\n+ .forum_threads\n+ .iter()\n+ .filter(|((s, _), _)| s == scope)\n+ .map(|((_, tag), thread)| {\n+ let ingests = reduced\n+ .ingests_by_scope_thread\n+ .get(&(scope.clone(), tag.clone()))\n+ .map(|q| q.len())\n+ .unwrap_or(0);\n+ ThreadRow {\n+ tag: tag.clone(),\n+ subtitle: None,\n+ last_ts: thread.last_activity_ts,\n+ ingests,\n+ }\n+ })\n+ .collect()\n+}\n+\n+pub(super) fn rooms_for_user(reduced: &ReducerState, username: &str) -> Vec {\n+ let mut v: Vec = reduced\n+ .grants\n+ .iter()\n+ .filter(|(rid, m)| reduced.rooms.contains(*rid) && m.contains_key(username))\n+ .map(|(rid, _)| rid.clone())\n+ .collect();\n+ v.sort();\n+ v\n+}\n+\n+/// `feed_id` is e.g. `thread-feed` (public bump list, SSE) or `room-thread-feed`.\n+pub(super) fn render_thread_feed(nav: Option<&ThreadNav>, feed_id: &str, rows: &[ThreadRow], now: i64) -> Markup {\n+ html! {\n+ div id=(feed_id) {\n+ @if rows.is_empty() {\n+ p class=\"muted\" { \"no threads yet\" }\n+ } @else {\n+ ul class=\"thread-feed\" {\n+ @for r in rows {\n+ @let thread_href = nav\n+ .as_ref()\n+ .map(|n| n.thread_url(&r.tag))\n+ .unwrap_or_else(|| format!(\"/t/{}\", r.tag));\n+ @let hover = timeago::rfc3339_utc(r.last_ts);\n+ @let ago = timeago::timeago(now, r.last_ts);\n+ @let age_cls = recency_class(now, r.last_ts);\n+ li class=(age_cls) {\n+ a href=(thread_href) {\n+ \"#\" (r.tag)\n+ @if let Some(subtitle) = &r.subtitle {\n+ \": \" (subtitle)\n+ }\n+ \" \"\n+ span class=\"muted\" title=(hover) {\n+ (ago)\n+ \" · \"\n+ (format!(\"{}n\", r.ingests))\n+ }\n+ }\n+ }\n+ }\n+ }\n+ }\n+ }\n+ }\n+}\n+\n+/// Returns the current public thread feed markup for SSE (`#thread-feed`).\n+pub async fn thread_feed_html(state: &AppState) -> Markup {\n+ let now = now_ms();\n+ let nav = ThreadNav::public();\n+ let mut rows = {\n+ let reduced = state.reduced.read().await;\n+ collect_thread_rows_for_scope(&reduced, &ScopeId::Public, now)\n+ };\n+ rows.sort_by(|a, b| b.last_ts.cmp(&a.last_ts));\n+ render_thread_feed(Some(&nav), \"thread-feed\", &rows, now)\n+}\n+\n+/// Returns the current private room thread feed markup for SSE (`#room-thread-feed`).\n+pub async fn thread_feed_html_for_room(state: &AppState, room_id: &str) -> Markup {\n+ let now = now_ms();\n+ let Some(nav) = ThreadNav::from_room_id(room_id) else {\n+ return html! { div id=\"room-thread-feed\" { p class=\"muted\" { \"room not found\" } } };\n+ };\n+ let mut rows = {\n+ let reduced = state.reduced.read().await;\n+ collect_thread_rows_for_scope(&reduced, &ScopeId::Room(room_id.to_string()), now)\n+ };\n+ rows.sort_by(|a, b| b.last_ts.cmp(&a.last_ts));\n+ render_thread_feed(Some(&nav), \"room-thread-feed\", &rows, now)\n+}\n+\n+fn render_thread_feed_region_markup(\n+ nav: &ThreadNav,\n+ tag: &str,\n+ display_ingests: &[crate::events::Ingest],\n+ offset: usize,\n+ total: usize,\n+ now: i64,\n+ viewer: Option<&str>,\n+ reduced: &ReducerState,\n+) -> Markup {\n+ let paginator_top = render_thread_paginator(nav, tag, offset, total, true);\n+ let paginator_bot = render_thread_paginator(nav, tag, offset, total, false);\n+ html! {\n+ div id=\"thread-feed-region\" {\n+ @if display_ingests.is_empty() {\n+ p class=\"muted\" { \"no activity yet\" }\n+ } @else {\n+ (paginator_top)\n+ @for (i, ing) in display_ingests.iter().enumerate() {\n+ @let post_idx = offset + i;\n+ (ingest_entry_markup(nav, tag, post_idx, ing, viewer, now, reduced))\n+ }\n+ (paginator_bot)\n+ }\n+ }\n+ }\n+}\n+\n+pub async fn thread_feed_region_markup(\n+ state: &AppState,\n+ room_id: Option<&str>,\n+ tag: &str,\n+ viewer: Option<&str>,\n+) -> Markup {\n+ let tag = canonicalize_tag(tag);\n+ let Some(nav) = (match room_id {\n+ Some(room_id) => ThreadNav::from_room_id(room_id),\n+ None => Some(ThreadNav::public()),\n+ }) else {\n+ return html! { div id=\"thread-feed-region\" { p class=\"muted\" { \"thread not found\" } } };\n+ };\n+ let scope = nav.scope();\n+ let all_ids: Vec = {\n+ let reduced = state.reduced.read().await;\n+ reduced\n+ .ingests_by_scope_thread\n+ .get(&(scope.clone(), tag.clone()))\n+ .map(|q| q.iter().rev().cloned().collect())\n+ .unwrap_or_default()\n+ };\n+ let total = all_ids.len();\n+ let offset = total.saturating_sub(PAGE_SIZE);\n+ let page_ids: Vec = all_ids.into_iter().skip(offset).take(PAGE_SIZE).collect();\n+ let reduced = state.reduced.read().await;\n+ let display_ingests = page_ids\n+ .iter()\n+ .filter_map(|id| reduced.ingests_by_id.get(id).cloned())\n+ .collect::>();\n+ render_thread_feed_region_markup(\n+ &nav,\n+ &tag,\n+ &display_ingests,\n+ offset,\n+ total,\n+ now_ms(),\n+ viewer,\n+ &reduced,\n+ )\n+}\n+\n+/// Home: private rooms (signed-in), then public bump-ordered threads.\n+pub async fn home(\n+ State(state): State,\n+ headers: HeaderMap,\n+ jar: CookieJar,\n+ uri: Uri,\n+) -> impl IntoResponse {\n+ let now = now_ms();\n+ let reduced = state.reduced.read().await;\n+ let user = optional_principal(&headers, &jar, &reduced);\n+ let room_ids = user\n+ .as_ref()\n+ .map(|u| rooms_for_user(&reduced, u))\n+ .unwrap_or_default();\n+ let mut public_rows = collect_thread_rows_for_scope(&reduced, &ScopeId::Public, now);\n+ drop(reduced);\n+ public_rows.sort_by(|a, b| b.last_ts.cmp(&a.last_ts));\n+\n+ let nav = ThreadNav::public();\n+ let reduced_read = state.reduced.read().await;\n+ let strip = auth_strip(&headers, &jar, &reduced_read);\n+ drop(reduced_read);\n+\n+ use crate::html::ui_action::{HtmlUiAction, UI_RPC_FIELD};\n+ use crate::form_template::template_json_compact;\n+\n+ let page = layout(\n+ \"slug.social\",\n+ \"view-thread\",\n+ html! {\n+ (strip)\n+ nav class=\"breadcrumb\" { (bc_threads(None)) }\n+ @if !room_ids.is_empty() {\n+ h2 { \"your rooms\" }\n+ ul class=\"thread-feed\" {\n+ @for rid in &room_ids {\n+ @if let Some(nav_r) = ThreadNav::from_room_id(rid) {\n+ @let slug = if let Some((_, s)) = rid.split_once('/') { s } else { rid.as_str() };\n+ li {\n+ a href=(nav_r.room_url()) {\n+ (slug)\n+ span class=\"muted\" { \" · \" (rid) }\n+ }\n+ }\n+ }\n+ }\n+ }\n+ }\n+ p class=\"muted\" { \"dark = time-ordered · light = vote-ranked\" }\n+ div class=\"thread-feed-toolbar\" {\n+ form method=\"POST\" action=\"/ui\" {\n+ input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::ExpandPublicNewThreadForm).expect(\"static json\"));\n+ button type=\"submit\" class=\"section-add-btn\" { \"+\" }\n+ }\n+ }\n+ div id=\"public-new-thread-ui-slot\" {}\n+ (render_thread_feed(Some(&nav), \"thread-feed\", &public_rows, now))\n+ (cli_panel(&[\"npx slugsocial public forum list\"]))\n+ },\n+ None,\n+ theme_from_jar(&jar),\n+ &theme_next_from_uri(&uri),\n+ );\n+ Html(page.into_string())\n+}\ndiff --git a/server/src/html/forum/ingest.rs b/server/src/html/forum/ingest.rs\nindex c045046a005db4f8f4d1dc7ea74aaaba45e0f3f4..5bd0c09c546e4ab8ed9e03a8c4879efc9bdc7188 100644\n--- a/server/src/html/forum/ingest.rs\n+++ b/server/src/html/forum/ingest.rs\n@@ -6,7 +6,8 @@ use serde_json::json;\n \n use crate::html::js_string_literal;\n use crate::html::ui_action::{HtmlUiAction, UI_RPC_FIELD};\n-use crate::html::{profile_href, render_linkified_with_embeds_in_scope, timeago};\n+use crate::html::{profile_href, render_linkified_with_embeds_in_scope};\n+use crate::timeago;\n \n use super::nav::ThreadNav;\n \ndiff --git a/server/src/html/forum/mod.rs b/server/src/html/forum/mod.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..8fbf3b71f41fafb474999ebb3d622e6bd5b5f313\n--- /dev/null\n+++ b/server/src/html/forum/mod.rs\n@@ -0,0 +1,29 @@\n+//! Forum / thread HTML: public home, room index, thread views, profile, and UI morph helpers.\n+\n+mod access;\n+mod feed;\n+mod ingest;\n+mod nav;\n+mod new_thread;\n+mod page;\n+mod paginator;\n+mod post_single;\n+mod profile;\n+mod room_members;\n+mod thread_morph;\n+mod views;\n+\n+pub use feed::{home, thread_feed_html, thread_feed_html_for_room, thread_feed_region_markup};\n+pub use nav::ThreadNav;\n+pub use post_single::{room_thread_post_view, thread_post_view};\n+pub use profile::user_profile_page;\n+pub use views::{room_page, room_thread_view, thread_view};\n+\n+pub(crate) use access::{user_can_post_room, user_can_view_room};\n+pub(crate) use new_thread::{\n+ fragment_public_new_thread_form, fragment_room_new_thread_form, login_to_post_hint_markup,\n+};\n+pub(crate) use room_members::room_members_section_markup;\n+pub(crate) use thread_morph::{\n+ thread_ui_collapse_redacted_post, thread_ui_expand_post_full, thread_ui_expand_redacted_post,\n+};\ndiff --git a/server/src/html/forum/page.rs b/server/src/html/forum/page.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..b0461fc22e0d7b9c865c483362113d60e992e0b8\n--- /dev/null\n+++ b/server/src/html/forum/page.rs\n@@ -0,0 +1,50 @@\n+use axum::http::HeaderMap;\n+use axum_extra::extract::cookie::CookieJar;\n+use maud::{html, Markup};\n+\n+use crate::api::optional_principal;\n+use crate::reducer::ReducerState;\n+\n+use super::nav::ThreadNav;\n+use crate::html::bc_segment;\n+\n+pub(super) fn auth_strip(\n+ headers: &HeaderMap,\n+ jar: &CookieJar,\n+ reduced: &ReducerState,\n+) -> Markup {\n+ match optional_principal(headers, jar, reduced) {\n+ Some(u) => html! {\n+ p class=\"muted auth-strip\" {\n+ \"@\" (u)\n+ \" · \"\n+ a href=\"/logout\" { \"log out\" }\n+ }\n+ },\n+ None => html! {\n+ p class=\"muted auth-strip\" {\n+ a href=\"/login\" { \"log in\" }\n+ }\n+ },\n+ }\n+}\n+\n+pub(super) fn bc_room(nav: &ThreadNav, room_slug: &str, thread_tag: Option<&str>) -> Markup {\n+ html! {\n+ a href=\"/\" { \"slug.social\" }\n+ @if let Some(t) = thread_tag {\n+ (bc_segment(\n+ &format!(\"room:{room_slug}\"),\n+ nav.room_url(),\n+ false,\n+ ))\n+ (bc_segment(&format!(\"#{t}\"), &nav.thread_url(t), true))\n+ } @else {\n+ (bc_segment(\n+ &format!(\"room:{room_slug}\"),\n+ nav.room_url(),\n+ true,\n+ ))\n+ }\n+ }\n+}\ndiff --git a/server/src/html/forum/paginator.rs b/server/src/html/forum/paginator.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..af2fda58a409673c51669d1d6f23baf7072c979a\n--- /dev/null\n+++ b/server/src/html/forum/paginator.rs\n@@ -0,0 +1,42 @@\n+use maud::{html, Markup};\n+\n+use super::nav::ThreadNav;\n+\n+pub(super) const PAGE_SIZE: usize = 10;\n+\n+pub(super) fn render_thread_paginator(nav: &ThreadNav, tag: &str, offset: usize, total: usize, top: bool) -> Markup {\n+ let newer_offset = offset.checked_add(PAGE_SIZE).filter(|&o| o < total);\n+ let older_offset = if offset > 0 {\n+ Some(offset.saturating_sub(PAGE_SIZE))\n+ } else {\n+ None\n+ };\n+ let latest_offset = total.saturating_sub(PAGE_SIZE);\n+ let on_latest = offset >= latest_offset;\n+ let (id, scroll_href, scroll_label) = if top {\n+ (\"top\", \"#bottom\", \"↓\")\n+ } else {\n+ (\"bottom\", \"#top\", \"↑\")\n+ };\n+ html! {\n+ div class=\"thread-paginator\" id=(id) {\n+ a href=(scroll_href) class=\"post-nav-btn\" { (scroll_label) }\n+ @if let Some(o) = older_offset {\n+ a href=(nav.thread_page_url(tag, o)) class=\"post-nav-btn\" { \"← older\" }\n+ } @else {\n+ a href=\"#\" class=\"post-nav-btn disabled\" { \"← older\" }\n+ }\n+ span class=\"post-nav-pos muted\" {\n+ (offset + 1) \"–\" (total.min(offset + PAGE_SIZE)) \" / \" (total)\n+ }\n+ @if let Some(o) = newer_offset {\n+ a href=(nav.thread_page_url(tag, o)) class=\"post-nav-btn\" { \"newer →\" }\n+ } @else {\n+ a href=\"#\" class=\"post-nav-btn disabled\" { \"newer →\" }\n+ }\n+ @if !on_latest {\n+ a href=(nav.thread_page_url(tag, latest_offset)) class=\"post-nav-btn\" { \"latest\" }\n+ }\n+ }\n+ }\n+}\ndiff --git a/server/src/html/forum/post_single.rs b/server/src/html/forum/post_single.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..c316f8f836df9d4ef9c05ebd9e54f699540e6d72\n--- /dev/null\n+++ b/server/src/html/forum/post_single.rs\n@@ -0,0 +1,115 @@\n+use axum::{\n+ extract::{Path, State},\n+ http::{HeaderMap, StatusCode, Uri},\n+ response::{Html, IntoResponse},\n+};\n+use axum_extra::extract::cookie::CookieJar;\n+use maud::html;\n+\n+use crate::api::optional_principal;\n+use crate::canonical_path::canonicalize_tag;\n+use crate::reducer::ScopeId;\n+use crate::state::AppState;\n+\n+use super::access::user_can_view_room;\n+use super::ingest::ingest_entry_markup;\n+use super::nav::ThreadNav;\n+use super::page::bc_room;\n+use super::views::room_not_found_page;\n+use crate::html::{bc_threads, layout, now_ms, theme_from_jar, theme_next_from_uri};\n+use maud::Markup;\n+\n+async fn thread_post_view_inner(\n+ state: AppState,\n+ tag: String,\n+ index_str: String,\n+ nav: ThreadNav,\n+ viewer: Option,\n+ jar: CookieJar,\n+ uri: Uri,\n+) -> impl IntoResponse {\n+ let tag = canonicalize_tag(&tag);\n+ let index: usize = index_str.parse().unwrap_or(0);\n+ let scope = nav.scope();\n+ let now = now_ms();\n+ let (ing, subtitle, body_markup) = {\n+ let reduced = state.reduced.read().await;\n+ let ing = reduced\n+ .ingests_by_scope_thread\n+ .get(&(scope.clone(), tag.clone()))\n+ .and_then(|q| q.iter().rev().nth(index))\n+ .and_then(|id| reduced.ingests_by_id.get(id).cloned());\n+ let body = ing.as_ref().map(|i| {\n+ ingest_entry_markup(&nav, &tag, index, i, viewer.as_deref(), now, &reduced)\n+ });\n+ (ing, None::, body)\n+ };\n+\n+ let sc = nav.scope();\n+ let bc: Markup = match &sc {\n+ ScopeId::Public => bc_threads(Some(&tag)),\n+ ScopeId::Room(rid) => {\n+ let slug = if let Some((_, s)) = rid.split_once('/') {\n+ s\n+ } else {\n+ rid.as_str()\n+ };\n+ bc_room(&nav, slug, Some(&tag))\n+ }\n+ };\n+\n+ let page = layout(\n+ &format!(\"#{tag} / post #{index}\"),\n+ \"view-thread\",\n+ html! {\n+ nav class=\"breadcrumb\" { (bc) }\n+ h2 { \"#\" (tag) @if let Some(sub) = &subtitle { \": \" (sub) } \" / post #\" (index) }\n+ @if let (Some(_ing), Some(bm)) = (&ing, &body_markup) {\n+ (bm)\n+ } @else {\n+ p class=\"muted\" { \"post not found\" }\n+ }\n+ },\n+ None,\n+ theme_from_jar(&jar),\n+ &theme_next_from_uri(&uri),\n+ );\n+ Html(page.into_string()).into_response()\n+}\n+\n+pub async fn thread_post_view(\n+ State(state): State,\n+ Path((tag, index_str)): Path<(String, String)>,\n+ headers: HeaderMap,\n+ jar: CookieJar,\n+ uri: Uri,\n+) -> impl IntoResponse {\n+ let reduced = state.reduced.read().await;\n+ let viewer = optional_principal(&headers, &jar, &reduced);\n+ drop(reduced);\n+ thread_post_view_inner(state, tag, index_str, ThreadNav::public(), viewer, jar, uri)\n+ .await\n+}\n+\n+pub async fn room_thread_post_view(\n+ State(state): State,\n+ Path((room_short, room_slug, tag, index_str)): Path<(String, String, String, String)>,\n+ headers: HeaderMap,\n+ jar: CookieJar,\n+ uri: Uri,\n+) -> impl IntoResponse {\n+ let room_id = format!(\"{room_short}/{room_slug}\");\n+ let reduced = state.reduced.read().await;\n+ let user = optional_principal(&headers, &jar, &reduced);\n+ if !user_can_view_room(&reduced, &room_id, user.as_deref()) {\n+ drop(reduced);\n+ return room_not_found_page(&jar, &uri).into_response();\n+ }\n+ drop(reduced);\n+ let Some(nav) = ThreadNav::from_room_id(&room_id) else {\n+ return (StatusCode::NOT_FOUND, \"bad room path\").into_response();\n+ };\n+ thread_post_view_inner(state, tag, index_str, nav, user, jar, uri)\n+ .await\n+ .into_response()\n+}\ndiff --git a/server/src/html/forum/profile.rs b/server/src/html/forum/profile.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..6f9574a975bd0a33460bb2ab79760c272019f6bf\n--- /dev/null\n+++ b/server/src/html/forum/profile.rs\n@@ -0,0 +1,116 @@\n+use axum::{\n+ extract::{Path, State},\n+ http::{HeaderMap, StatusCode, Uri},\n+ response::{Html, IntoResponse},\n+};\n+use axum_extra::extract::cookie::CookieJar;\n+use maud::html;\n+\n+use crate::api::optional_principal;\n+use crate::canonical_path::canonicalize_tag;\n+use crate::identity::parse_username;\n+use crate::state::AppState;\n+\n+use super::ingest::{thread_nav_for_ingest, thread_post_index_in_scope};\n+use super::page::auth_strip;\n+use crate::timeago;\n+use crate::html::{\n+ bc_segment, cli_panel, layout, now_ms, profile_href, theme_from_jar, theme_next_from_uri,\n+};\n+\n+struct ProfilePostRow {\n+ thread_tag: String,\n+ post_idx: usize,\n+ post_href: String,\n+ ts: i64,\n+ snippet: String,\n+}\n+\n+pub async fn user_profile_page(\n+ State(state): State,\n+ Path(username): Path,\n+ headers: HeaderMap,\n+ jar: CookieJar,\n+ uri: Uri,\n+) -> impl IntoResponse {\n+ let canon = match parse_username(&username) {\n+ Ok(u) => u,\n+ Err(_) => return (StatusCode::NOT_FOUND, \"not found\").into_response(),\n+ };\n+\n+ let (rows, strip) = {\n+ let reduced = state.reduced.read().await;\n+ let viewer = optional_principal(&headers, &jar, &reduced);\n+ let ids = reduced.visible_posts_for_actor(&canon, viewer.as_deref());\n+ let mut rows: Vec = Vec::new();\n+ for id in ids {\n+ if reduced.redacted_posts.contains(&id) {\n+ continue;\n+ }\n+ let Some(ing) = reduced.ingests_by_id.get(&id).cloned() else {\n+ continue;\n+ };\n+ let Some(nav) = thread_nav_for_ingest(&ing) else {\n+ continue;\n+ };\n+ let Some(post_idx) = thread_post_index_in_scope(&reduced, &ing) else {\n+ continue;\n+ };\n+ let tag = canonicalize_tag(&ing.thread_tag);\n+ let post_href = nav.post_url(&tag, post_idx);\n+ let raw_one_line = ing.raw.lines().next().unwrap_or(\"\").trim();\n+ let snippet: String = raw_one_line.chars().take(120).collect();\n+ rows.push(ProfilePostRow {\n+ thread_tag: tag,\n+ post_idx,\n+ post_href,\n+ ts: ing.ts,\n+ snippet,\n+ });\n+ }\n+ rows.sort_by(|a, b| b.ts.cmp(&a.ts));\n+ let strip = auth_strip(&headers, &jar, &reduced);\n+ (rows, strip)\n+ };\n+\n+ let now = now_ms();\n+ let page = layout(\n+ &format!(\"@{canon}\"),\n+ \"view-thread\",\n+ html! {\n+ (strip)\n+ nav class=\"breadcrumb\" {\n+ a href=\"/\" { \"slug.social\" }\n+ (bc_segment(&format!(\"@{canon}\"), &profile_href(&canon), true))\n+ }\n+ h2 { \"@\" (canon) }\n+ p class=\"muted\" { \"posts (newest first)\" }\n+ @if rows.is_empty() {\n+ p class=\"muted\" { \"no public posts yet\" }\n+ } @else {\n+ ul class=\"profile-post-list\" {\n+ @for r in &rows {\n+ @let hover = timeago::rfc3339_utc(r.ts);\n+ @let ago = timeago::timeago(now, r.ts);\n+ li {\n+ a href=(r.post_href.as_str()) {\n+ \"#\" (r.thread_tag)\n+ \" / #\"\n+ (r.post_idx)\n+ }\n+ span class=\"muted\" title=(hover) { \" · \" (ago) }\n+ @if !r.snippet.is_empty() {\n+ p class=\"profile-post-snippet muted\" { (r.snippet) }\n+ }\n+ }\n+ }\n+ }\n+ }\n+ (cli_panel(&[format!(\"npx slugsocial public forum list\")]))\n+ },\n+ None,\n+ theme_from_jar(&jar),\n+ &theme_next_from_uri(&uri),\n+ );\n+ Html(page.into_string()).into_response()\n+}\ndiff --git a/server/src/html/forum/thread_morph.rs b/server/src/html/forum/thread_morph.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..77ac43b159a7f353e47b1f8368da07bb4392daf8\n--- /dev/null\n+++ b/server/src/html/forum/thread_morph.rs\n@@ -0,0 +1,171 @@\n+use maud::html;\n+\n+use crate::canonical_path::canonicalize_tag;\n+use crate::reducer::{scope_from_room_wire, ScopeId};\n+use crate::state::AppState;\n+\n+use super::access::user_can_view_room;\n+use super::ingest::{ingest_entry_markup, post_header_row, redacted_header_row};\n+use super::nav::ThreadNav;\n+use crate::html::{render_linkified_with_embeds_in_scope, JsBuilder, now_ms};\n+\n+pub(crate) async fn thread_ui_expand_post_full(\n+ state: &AppState,\n+ room: &str,\n+ thread_tag: &str,\n+ post_index: usize,\n+ viewer: Option<&str>,\n+) -> axum::response::Response {\n+ let room = room.trim();\n+ let tag = canonicalize_tag(thread_tag);\n+ let scope = scope_from_room_wire(room);\n+ let nav = if room.is_empty() || room == \"public\" {\n+ ThreadNav::public()\n+ } else {\n+ let Some(n) = ThreadNav::from_room_id(room) else {\n+ return crate::html::ui_js_warn(\"bad room\");\n+ };\n+ n\n+ };\n+ if let ScopeId::Room(ref rid) = scope {\n+ let reduced = state.reduced.read().await;\n+ if !user_can_view_room(&reduced, rid, viewer) {\n+ return crate::html::ui_js_warn(\"forbidden\");\n+ }\n+ }\n+\n+ let now = now_ms();\n+ let reduced = state.reduced.read().await;\n+ let ing = reduced\n+ .ingests_by_scope_thread\n+ .get(&(scope.clone(), tag.clone()))\n+ .and_then(|q| q.iter().rev().nth(post_index))\n+ .and_then(|id| reduced.ingests_by_id.get(id).cloned());\n+ let Some(ing) = ing else {\n+ return crate::html::ui_js_warn(\"post not found\");\n+ };\n+ if reduced.redacted_posts.contains(&ing.id) {\n+ return crate::html::ui_js_warn(\"post not found\");\n+ }\n+ let ing_id = ing.id.clone();\n+ drop(reduced);\n+\n+ let full_html = html! {\n+ div class=\"ingest-entry\" data-ingest-id=(ing_id) {\n+ (post_header_row(\n+ &nav,\n+ &tag,\n+ post_index,\n+ &ing,\n+ viewer,\n+ now,\n+ viewer == Some(ing.principal.as_str()),\n+ ))\n+ (render_linkified_with_embeds_in_scope(&ing.raw, nav.garden_root_url()))\n+ }\n+ };\n+\n+ JsBuilder::new()\n+ .morph_selector(&format!(\"[data-ingest-id=\\\"{}\\\"]\", ing_id), full_html)\n+ .into_response()\n+}\n+\n+pub(crate) async fn thread_ui_expand_redacted_post(\n+ state: &AppState,\n+ room: &str,\n+ thread_tag: &str,\n+ post_index: usize,\n+ viewer: Option<&str>,\n+) -> axum::response::Response {\n+ let room = room.trim();\n+ let tag = canonicalize_tag(thread_tag);\n+ let scope = scope_from_room_wire(room);\n+ let nav = if room.is_empty() || room == \"public\" {\n+ ThreadNav::public()\n+ } else {\n+ let Some(n) = ThreadNav::from_room_id(room) else {\n+ return crate::html::ui_js_warn(\"bad room\");\n+ };\n+ n\n+ };\n+ if let ScopeId::Room(ref rid) = scope {\n+ let reduced = state.reduced.read().await;\n+ if !user_can_view_room(&reduced, rid, viewer) {\n+ return crate::html::ui_js_warn(\"forbidden\");\n+ }\n+ }\n+\n+ let now = now_ms();\n+ let reduced = state.reduced.read().await;\n+ let ing = reduced\n+ .ingests_by_scope_thread\n+ .get(&(scope.clone(), tag.clone()))\n+ .and_then(|q| q.iter().rev().nth(post_index))\n+ .and_then(|id| reduced.ingests_by_id.get(id).cloned());\n+ let Some(ing) = ing else {\n+ return crate::html::ui_js_warn(\"post not found\");\n+ };\n+ if !reduced.redacted_posts.contains(&ing.id) {\n+ return crate::html::ui_js_warn(\"post not found\");\n+ }\n+ let ing_id = ing.id.clone();\n+ drop(reduced);\n+\n+ let full_html = html! {\n+ div class=\"ingest-entry ingest-redacted-expanded\" data-ingest-id=(ing_id) {\n+ (redacted_header_row(&nav, &tag, post_index, &ing, now, true))\n+ (render_linkified_with_embeds_in_scope(&ing.raw, nav.garden_root_url()))\n+ }\n+ };\n+\n+ JsBuilder::new()\n+ .morph_selector(&format!(\"[data-ingest-id=\\\"{}\\\"]\", ing_id), full_html)\n+ .into_response()\n+}\n+\n+pub(crate) async fn thread_ui_collapse_redacted_post(\n+ state: &AppState,\n+ room: &str,\n+ thread_tag: &str,\n+ post_index: usize,\n+ viewer: Option<&str>,\n+) -> axum::response::Response {\n+ let room = room.trim();\n+ let tag = canonicalize_tag(thread_tag);\n+ let scope = scope_from_room_wire(room);\n+ let nav = if room.is_empty() || room == \"public\" {\n+ ThreadNav::public()\n+ } else {\n+ let Some(n) = ThreadNav::from_room_id(room) else {\n+ return crate::html::ui_js_warn(\"bad room\");\n+ };\n+ n\n+ };\n+ if let ScopeId::Room(ref rid) = scope {\n+ let reduced = state.reduced.read().await;\n+ if !user_can_view_room(&reduced, rid, viewer) {\n+ return crate::html::ui_js_warn(\"forbidden\");\n+ }\n+ }\n+\n+ let now = now_ms();\n+ let reduced = state.reduced.read().await;\n+ let ing = reduced\n+ .ingests_by_scope_thread\n+ .get(&(scope.clone(), tag.clone()))\n+ .and_then(|q| q.iter().rev().nth(post_index))\n+ .and_then(|id| reduced.ingests_by_id.get(id).cloned());\n+ let Some(ing) = ing else {\n+ return crate::html::ui_js_warn(\"post not found\");\n+ };\n+ if !reduced.redacted_posts.contains(&ing.id) {\n+ return crate::html::ui_js_warn(\"post not found\");\n+ }\n+ let ing_id = ing.id.clone();\n+ let collapsed = ingest_entry_markup(&nav, &tag, post_index, &ing, viewer, now, &reduced);\n+ drop(reduced);\n+\n+ JsBuilder::new()\n+ .morph_selector(&format!(\"[data-ingest-id=\\\"{}\\\"]\", ing_id), collapsed)\n+ .into_response()\n+}\ndiff --git a/server/src/html/forum/views.rs b/server/src/html/forum/views.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..be08491b893f5960723e77c7f7fb9d416100f0fb\n--- /dev/null\n+++ b/server/src/html/forum/views.rs\n@@ -0,0 +1,290 @@\n+use axum::{\n+ extract::{Path, Query, State},\n+ http::{HeaderMap, StatusCode, Uri},\n+ response::{Html, IntoResponse},\n+};\n+use axum_extra::extract::cookie::CookieJar;\n+use maud::{html, Markup};\n+use serde::Deserialize;\n+use serde_json::json;\n+\n+use crate::api::optional_principal;\n+use crate::canonical_path::canonicalize_tag;\n+use crate::form_template::template_json_compact;\n+use crate::reducer::ScopeId;\n+use crate::state::AppState;\n+\n+use super::access::user_can_post_room;\n+use super::access::user_can_view_room;\n+use super::feed::{collect_thread_rows_for_scope, render_thread_feed};\n+use super::ingest::ingest_entry_markup;\n+use super::nav::ThreadNav;\n+use super::new_thread::fragment_room_new_thread_form;\n+use super::page::{auth_strip, bc_room};\n+use super::paginator::{render_thread_paginator, PAGE_SIZE};\n+use super::room_members::room_members_section_markup;\n+use crate::html::ui_action::UI_RPC_FIELD;\n+use crate::html::{\n+ bc_threads, cli_panel, layout, now_ms, theme_from_jar, theme_next_from_uri,\n+};\n+\n+fn compose_form(nav: &ThreadNav, thread_tag: &str, show: bool) -> Markup {\n+ if !show {\n+ return html! {};\n+ }\n+ html! {\n+ section class=\"compose\" id=\"thread-compose\" {\n+ form id=\"thread-compose-form\" method=\"POST\" action=\"/ui\" data-check-action=\"/ui\" data-check-rpc=(template_json_compact(&json!({\n+ \"action\": \"check_ingest\",\n+ \"room\": nav.room_wire,\n+ \"thread_tag\": thread_tag,\n+ \"text\": {\"$form\": \"text\"},\n+ \"error_target\": \"thread-compose-errors\",\n+ \"form_id\": \"thread-compose-form\",\n+ })).unwrap()) {\n+ input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&json!({\n+ \"action\": \"post_ingest\",\n+ \"room\": nav.room_wire,\n+ \"thread_tag\": thread_tag,\n+ \"text\": {\"$form\": \"text\"},\n+ \"error_target\": \"thread-compose-errors\",\n+ \"form_id\": \"thread-compose-form\",\n+ })).unwrap());\n+ textarea name=\"text\" rows=\"5\" cols=\"80\" placeholder=\"prose or ~/items and votes…\" {}\n+ p {\n+ button type=\"submit\" { \"post\" }\n+ }\n+ }\n+ div id=\"thread-compose-errors\" {}\n+ }\n+ }\n+}\n+\n+#[derive(Debug, Deserialize)]\n+pub struct ThreadViewQuery {\n+ pub offset: Option,\n+}\n+\n+async fn thread_view_inner(\n+ state: AppState,\n+ tag: String,\n+ q: ThreadViewQuery,\n+ nav: ThreadNav,\n+ headers: HeaderMap,\n+ jar: CookieJar,\n+ uri: Uri,\n+) -> impl IntoResponse {\n+ let tag = canonicalize_tag(&tag);\n+ let scope = nav.scope();\n+\n+ let all_ids: Vec = {\n+ let reduced = state.reduced.read().await;\n+ reduced\n+ .ingests_by_scope_thread\n+ .get(&(scope.clone(), tag.clone()))\n+ .map(|q| q.iter().rev().cloned().collect())\n+ .unwrap_or_default()\n+ };\n+\n+ let total = all_ids.len();\n+ let offset = q.offset.unwrap_or(0);\n+ let page_ids: Vec = all_ids.into_iter().skip(offset).take(PAGE_SIZE).collect();\n+\n+ let (display_ingests, _subtitle) = {\n+ let reduced = state.reduced.read().await;\n+ let ingests = page_ids\n+ .iter()\n+ .filter_map(|id| reduced.ingests_by_id.get(id).cloned())\n+ .collect::>();\n+ (ingests, None::)\n+ };\n+\n+ let reduced = state.reduced.read().await;\n+ let user = optional_principal(&headers, &jar, &reduced);\n+ let sc = nav.scope();\n+ let show_compose = match &sc {\n+ ScopeId::Public => user.is_some(),\n+ ScopeId::Room(rid) => user\n+ .as_ref()\n+ .map(|u| user_can_post_room(&reduced, rid, u))\n+ .unwrap_or(false),\n+ };\n+ let strip = auth_strip(&headers, &jar, &reduced);\n+ let now = now_ms();\n+ let entry_rows: Vec = display_ingests\n+ .iter()\n+ .enumerate()\n+ .map(|(i, ing)| {\n+ let post_idx = offset + i;\n+ ingest_entry_markup(&nav, &tag, post_idx, ing, user.as_deref(), now, &reduced)\n+ })\n+ .collect();\n+ drop(reduced);\n+\n+ let paginator_top = render_thread_paginator(&nav, &tag, offset, total, true);\n+ let paginator_bot = render_thread_paginator(&nav, &tag, offset, total, false);\n+\n+ let bc: Markup = match &sc {\n+ ScopeId::Public => bc_threads(Some(&tag)),\n+ ScopeId::Room(rid) => {\n+ let slug = if let Some((_, s)) = rid.split_once('/') {\n+ s\n+ } else {\n+ rid.as_str()\n+ };\n+ bc_room(&nav, slug, Some(&tag))\n+ }\n+ };\n+\n+ let cli = match &sc {\n+ ScopeId::Public => format!(\"npx slugsocial public forum show {tag}\"),\n+ ScopeId::Room(r) => format!(\"npx slugsocial private {r} forum show {tag}\"),\n+ };\n+\n+ let page = layout(\n+ &format!(\"#{tag}\"),\n+ \"view-thread\",\n+ html! {\n+ (strip)\n+ nav class=\"breadcrumb\" { (bc) }\n+ p class=\"muted\" { \"top=oldest · bottom=newest\" }\n+ div id=\"thread-feed-region\" {\n+ @if display_ingests.is_empty() {\n+ p class=\"muted\" { \"no activity yet\" }\n+ } @else {\n+ (paginator_top)\n+ @for row in &entry_rows {\n+ (row)\n+ }\n+ (paginator_bot)\n+ }\n+ }\n+ div id=\"thread-live-region\" {\n+ (compose_form(&nav, &tag, show_compose))\n+ }\n+ (cli_panel(std::slice::from_ref(&cli)))\n+ },\n+ None,\n+ theme_from_jar(&jar),\n+ &theme_next_from_uri(&uri),\n+ );\n+ Html(page.into_string()).into_response()\n+}\n+\n+/// Thread view — `/t/:tag`\n+pub async fn thread_view(\n+ State(state): State,\n+ Path(tag): Path,\n+ Query(q): Query,\n+ headers: HeaderMap,\n+ jar: CookieJar,\n+ uri: Uri,\n+) -> impl IntoResponse {\n+ thread_view_inner(state, tag, q, ThreadNav::public(), headers, jar, uri).await\n+}\n+\n+/// Room thread — `/r/:short/:slug/t/:tag`\n+pub async fn room_thread_view(\n+ State(state): State,\n+ Path((room_short, room_slug, tag)): Path<(String, String, String)>,\n+ Query(q): Query,\n+ headers: HeaderMap,\n+ jar: CookieJar,\n+ uri: Uri,\n+) -> impl IntoResponse {\n+ let room_id = format!(\"{room_short}/{room_slug}\");\n+ let reduced = state.reduced.read().await;\n+ let user = optional_principal(&headers, &jar, &reduced);\n+ if !user_can_view_room(&reduced, &room_id, user.as_deref()) {\n+ drop(reduced);\n+ return room_not_found_page(&jar, &uri).into_response();\n+ }\n+ drop(reduced);\n+ let Some(nav) = ThreadNav::from_room_id(&room_id) else {\n+ return (StatusCode::NOT_FOUND, \"bad room path\").into_response();\n+ };\n+ thread_view_inner(state, tag, q, nav, headers, jar, uri)\n+ .await\n+ .into_response()\n+}\n+\n+pub(super) fn room_not_found_page(jar: &CookieJar, uri: &Uri) -> impl IntoResponse {\n+ let body = html! {\n+ nav class=\"breadcrumb\" { a href=\"/\" { \"slug.social\" } }\n+ h1 { \"not found\" }\n+ p { \"The requested page could not be found.\" }\n+ p { a href=\"/\" { \"home\" } }\n+ };\n+ let page = layout(\n+ \"not found — slug.social\",\n+ \"view-thread\",\n+ body,\n+ None,\n+ theme_from_jar(jar),\n+ &theme_next_from_uri(uri),\n+ );\n+ (StatusCode::NOT_FOUND, Html(page.into_string()))\n+}\n+\n+/// Private room index — `/r/:short/:slug`\n+pub async fn room_page(\n+ State(state): State,\n+ Path((room_short, room_slug)): Path<(String, String)>,\n+ headers: HeaderMap,\n+ jar: CookieJar,\n+ uri: Uri,\n+) -> impl IntoResponse {\n+ let room_id = format!(\"{room_short}/{room_slug}\");\n+ let now = now_ms();\n+ let reduced = state.reduced.read().await;\n+ if !reduced.rooms.contains(&room_id) {\n+ drop(reduced);\n+ return (StatusCode::NOT_FOUND, \"room not found\").into_response();\n+ }\n+ let user = optional_principal(&headers, &jar, &reduced);\n+ if !user_can_view_room(&reduced, &room_id, user.as_deref()) {\n+ drop(reduced);\n+ return room_not_found_page(&jar, &uri).into_response();\n+ }\n+ let scope = ScopeId::Room(room_id.clone());\n+ let mut rows = collect_thread_rows_for_scope(&reduced, &scope, now);\n+ let strip = auth_strip(&headers, &jar, &reduced);\n+ let show_new = user\n+ .as_ref()\n+ .map(|u| user_can_post_room(&reduced, &room_id, u))\n+ .unwrap_or(false);\n+ rows.sort_by(|a, b| b.last_ts.cmp(&a.last_ts));\n+\n+ let Some(nav) = ThreadNav::from_room_id(&room_id) else {\n+ drop(reduced);\n+ return (StatusCode::NOT_FOUND, \"room not found\").into_response();\n+ };\n+ let members_markup = room_members_section_markup(&reduced, &room_id, false);\n+ let forum_cli = format!(\"npx slugsocial private {room_id} forum list\");\n+ let garden_cli = format!(\"npx slugsocial private {room_id} garden tree\");\n+ let audit_cli = format!(\"npx slugsocial private {room_id} audit\");\n+ drop(reduced);\n+\n+ let slug_display = room_slug.as_str();\n+ let page = layout(\n+ &format!(\"room {slug_display} — slug.social\"),\n+ \"view-thread\",\n+ html! {\n+ (strip)\n+ nav class=\"breadcrumb\" { (bc_room(&nav, slug_display, None)) }\n+ (members_markup)\n+ h3 { \"threads\" }\n+ (render_thread_feed(Some(&nav), \"room-thread-feed\", &rows, now))\n+ @if show_new {\n+ div id=\"room-new-thread-ui-slot\" {\n+ (fragment_room_new_thread_form(&nav, true, false))\n+ }\n+ }\n+ (cli_panel(&[forum_cli, garden_cli, audit_cli]))\n+ },\n+ None,\n+ theme_from_jar(&jar),\n+ &theme_next_from_uri(&uri),\n+ );\n+ Html(page.into_string()).into_response()\n+}\n\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[2fe70b0e] themes\n\nSide B — unified diff (full patch):\ndiff --git a/server/src/api/auth.rs b/server/src/api/auth.rs\nindex 559db65de14c6157690ffbf18eca0cf65b0a5202..b3631b06153d52f88348fef927e7a024b7b85ad6 100644\n--- a/server/src/api/auth.rs\n+++ b/server/src/api/auth.rs\n@@ -1,7 +1,7 @@\n use axum::{\n body::Body,\n extract::{Path, Query, State},\n- http::{header, HeaderMap, HeaderValue, StatusCode},\n+ http::{header, HeaderMap, HeaderValue, StatusCode, Uri},\n response::{IntoResponse, Redirect, Response},\n Form, Json,\n };\n@@ -17,7 +17,7 @@ use crate::{\n events::{Event, GrantAdded, TokenIssued, UserRegistered},\n html::{\n auth_complete_page, auth_signed_in_fragment, choose_username_error_fragment,\n- choose_username_page, JsBuilder,\n+ choose_username_page, theme_cookie_header_from_jar, theme_from_jar, theme_next_from_uri, JsBuilder,\n },\n identity::{parse_agent, parse_username},\n reducer::ReducerState,\n@@ -48,15 +48,17 @@ fn js_form_error_fragment(session: &str, error: &str) -> Response {\n .into_response()\n }\n \n-fn js_signed_in_fragment(bearer: &str) -> Response {\n+fn js_signed_in_fragment(bearer: &str, jar: &CookieJar) -> Response {\n let mut response = JsBuilder::new()\n .id(\"choose-username-form\")\n .morph_inner(auth_signed_in_fragment())\n .redirect(\"/auth/complete\")\n .into_response();\n- response\n- .headers_mut()\n- .insert(header::SET_COOKIE, session_cookie_header_value(bearer));\n+ let headers = response.headers_mut();\n+ headers.append(header::SET_COOKIE, session_cookie_header_value(bearer));\n+ if let Some(theme) = theme_cookie_header_from_jar(jar) {\n+ headers.append(header::SET_COOKIE, theme);\n+ }\n response\n }\n \n@@ -69,13 +71,18 @@ pub fn optional_principal(headers: &HeaderMap, jar: &CookieJar, reduced: &Reduce\n verify_token(reduced, c.value()).ok()\n }\n \n-fn redirect_with_session_cookie(public_url: &str, path_and_query: &str, bearer: &str) -> Response {\n- Response::builder()\n+fn redirect_with_session_cookie(public_url: &str, path_and_query: &str, bearer: &str, jar: &CookieJar) -> Response {\n+ let mut res = Response::builder()\n .status(StatusCode::TEMPORARY_REDIRECT)\n .header(header::LOCATION, format!(\"{public_url}{path_and_query}\"))\n- .header(header::SET_COOKIE, session_cookie_header_value(bearer))\n .body(Body::empty())\n- .unwrap()\n+ .unwrap();\n+ let headers = res.headers_mut();\n+ headers.append(header::SET_COOKIE, session_cookie_header_value(bearer));\n+ if let Some(theme) = theme_cookie_header_from_jar(jar) {\n+ headers.append(header::SET_COOKIE, theme);\n+ }\n+ res\n }\n \n async fn apply_invite_redemption(state: &AppState, invite_token: &str, grantee_username: &str) -> Result<(), String> {\n@@ -286,7 +293,11 @@ pub struct AuthCallbackQuery {\n pub state: String,\n }\n \n-pub async fn get_auth_callback(Query(q): Query, State(state): State) -> impl IntoResponse {\n+pub async fn get_auth_callback(\n+ Query(q): Query,\n+ State(state): State,\n+ jar: CookieJar,\n+) -> impl IntoResponse {\n let sessions = pending_sessions(&state);\n {\n let sessions_read = sessions.read().await;\n@@ -365,7 +376,7 @@ pub async fn get_auth_callback(Query(q): Query, State(state):\n }\n let cookie_bearer = bearer.clone();\n s.complete = Some((username, bearer));\n- return redirect_with_session_cookie(&public_url, \"/\", &cookie_bearer).into_response();\n+ return redirect_with_session_cookie(&public_url, \"/\", &cookie_bearer, &jar).into_response();\n }\n }\n \n@@ -378,14 +389,20 @@ pub struct ChooseUsernameQuery {\n pub error: Option,\n }\n \n-pub async fn get_choose_username(Query(q): Query, State(state): State) -> impl IntoResponse {\n+pub async fn get_choose_username(\n+ Query(q): Query,\n+ State(state): State,\n+ jar: CookieJar,\n+ uri: Uri,\n+) -> impl IntoResponse {\n let sessions = pending_sessions(&state);\n let sessions_read = sessions.read().await;\n if !sessions_read.contains_key(&q.session) {\n return api_error(StatusCode::NOT_FOUND, \"unknown session\", None).into_response();\n }\n drop(sessions_read);\n- choose_username_page(&q.session, q.error.as_deref()).into_response()\n+ let next = theme_next_from_uri(&uri);\n+ choose_username_page(&q.session, q.error.as_deref(), theme_from_jar(&jar), &next).into_response()\n }\n \n #[derive(Debug, Deserialize)]\n@@ -396,6 +413,7 @@ pub struct ChooseUsernameForm {\n \n pub async fn post_choose_username(\n State(state): State,\n+ jar: CookieJar,\n Form(form): Form,\n ) -> impl IntoResponse {\n let canon_user = match parse_username(&form.username) {\n@@ -477,7 +495,7 @@ pub async fn post_choose_username(\n s.complete = Some((canon_user.clone(), bearer.clone()));\n }\n \n- js_signed_in_fragment(&bearer).into_response()\n+ js_signed_in_fragment(&bearer, &jar).into_response()\n }\n \n /// Start a browser-only OAuth flow (no CLI polling). Sets session cookie on success.\n@@ -569,8 +587,9 @@ pub async fn get_pending_session(\n .into_response()\n }\n \n-pub async fn get_auth_complete() -> impl IntoResponse {\n- auth_complete_page()\n+pub async fn get_auth_complete(jar: CookieJar, uri: Uri) -> impl IntoResponse {\n+ let next = theme_next_from_uri(&uri);\n+ auth_complete_page(theme_from_jar(&jar), &next).into_response()\n }\n \n pub async fn get_whoami(State(state): State, headers: HeaderMap) -> impl IntoResponse {\ndiff --git a/server/src/api/helpers.rs b/server/src/api/helpers.rs\nindex 81e2a55fa3abb8609b4099f91a989480336e11eb..9b71491e9f9efc44a2a4beba09be8f64bd2ff2ee 100644\n--- a/server/src/api/helpers.rs\n+++ b/server/src/api/helpers.rs\n@@ -39,6 +39,55 @@ pub fn item_path_for_api(item: &str) -> String {\n }\n }\n \n+/// Same as [`item_path_for_api`], but for private rooms ontology items are prefixed with\n+/// `/r/{short}/{slug}` so the URL matches the web app (`/r/…/~/…` routes).\n+pub fn item_path_for_api_in_room(item: &str, room_wire: &str) -> String {\n+ let room = room_wire.trim();\n+ if room.is_empty() || room == \"public\" {\n+ return item_path_for_api(item);\n+ }\n+ let Some((short, slug)) = room.split_once('/') else {\n+ return item_path_for_api(item);\n+ };\n+ if short.is_empty() || slug.is_empty() {\n+ return item_path_for_api(item);\n+ }\n+ let Some(c) = CanonicalItemUrl::parse(item) else {\n+ return item_path_for_api(item);\n+ };\n+ let root = CanonicalItemUrl::ontology_root();\n+ let item_norm = c.as_str().trim_end_matches('/');\n+ let root_norm = root.as_str().trim_end_matches('/');\n+ if let Some(tail) = c.tilde_tail() {\n+ return if tail.is_empty() {\n+ format!(\"https://slug.social/r/{short}/{slug}/~\")\n+ } else {\n+ format!(\"https://slug.social/r/{short}/{slug}/~/{}\", tail)\n+ };\n+ }\n+ if item_norm == root_norm {\n+ return format!(\"https://slug.social/r/{short}/{slug}/~\");\n+ }\n+ item_path_for_api(item)\n+}\n+\n+/// Absolute thread URL for forum JSON (`/t/…` vs `/r/…/t/…`).\n+pub fn forum_thread_web_url(room_wire: &str, thread_tag: &str) -> String {\n+ let room = room_wire.trim();\n+ let tag = thread_tag.trim().trim_start_matches('#');\n+ if room.is_empty() || room == \"public\" {\n+ format!(\"https://slug.social/t/{tag}\")\n+ } else if let Some((short, slug)) = room.split_once('/') {\n+ if short.is_empty() || slug.is_empty() {\n+ format!(\"https://slug.social/t/{tag}\")\n+ } else {\n+ format!(\"https://slug.social/r/{short}/{slug}/t/{tag}\")\n+ }\n+ } else {\n+ format!(\"https://slug.social/t/{tag}\")\n+ }\n+}\n+\n /// Resolve an item path as a first-class canonical path.\n pub fn resolve_item(item: &str) -> Result {\n let canonical = canonicalize_item(item);\n@@ -188,3 +237,52 @@ pub fn vote_touches_path(a: &str, b: &str, parent_canon: &str) -> bool {\n let under = |item: &str| item == parent_canon || item.starts_with(&format!(\"{}/\", parent_canon));\n under(a) || under(b)\n }\n+\n+#[cfg(test)]\n+mod wire_url_tests {\n+ use super::{forum_thread_web_url, item_path_for_api_in_room};\n+\n+ #[test]\n+ fn public_room_unchanged() {\n+ let u = \"https://slug.social/~/a/b\";\n+ assert_eq!(item_path_for_api_in_room(u, \"public\"), u);\n+ }\n+\n+ #[test]\n+ fn private_room_prefixes_ontology() {\n+ assert_eq!(\n+ item_path_for_api_in_room(\"https://slug.social/~/topic/x\", \"9ab12cd/my-room\"),\n+ \"https://slug.social/r/9ab12cd/my-room/~/topic/x\"\n+ );\n+ }\n+\n+ #[test]\n+ fn private_room_ontology_root() {\n+ assert_eq!(\n+ item_path_for_api_in_room(\"https://slug.social/~\", \"9ab12cd/my-room\"),\n+ \"https://slug.social/r/9ab12cd/my-room/~\"\n+ );\n+ assert_eq!(\n+ item_path_for_api_in_room(\"https://slug.social/~/\", \"9ab12cd/my-room\"),\n+ \"https://slug.social/r/9ab12cd/my-room/~\"\n+ );\n+ }\n+\n+ #[test]\n+ fn external_url_untouched_in_private_room() {\n+ let u = \"https://example.com/z\";\n+ assert_eq!(item_path_for_api_in_room(u, \"9ab12cd/my-room\"), u);\n+ }\n+\n+ #[test]\n+ fn forum_web_public_vs_room() {\n+ assert_eq!(\n+ forum_thread_web_url(\"public\", \"debate\"),\n+ \"https://slug.social/t/debate\"\n+ );\n+ assert_eq!(\n+ forum_thread_web_url(\"9ab12cd/my-room\", \"#debate\"),\n+ \"https://slug.social/r/9ab12cd/my-room/t/debate\"\n+ );\n+ }\n+}\ndiff --git a/server/src/api/rpc.rs b/server/src/api/rpc.rs\nindex 31f5fcfb4eaf4df0a9cbac532dd3dedfe3611810..5b91f5836625eedbb1cd9423168046e3fb576c17 100644\n--- a/server/src/api/rpc.rs\n+++ b/server/src/api/rpc.rs\n@@ -27,8 +27,9 @@ use crate::{\n \n use super::auth::verify_bearer_principal;\n use super::helpers::{\n- compute_connectivity_stats, is_pair_voted, item_path_for_api, now_ms, paginate_rankings,\n- parse_parent_specs, pick_random_distinct, resolve_item, vote_touches_path,\n+ compute_connectivity_stats, forum_thread_web_url, is_pair_voted, item_path_for_api,\n+ item_path_for_api_in_room, now_ms, paginate_rankings, parse_parent_specs, pick_random_distinct,\n+ resolve_item, vote_touches_path,\n };\n use super::validate::{normalize_room_and_thread, validate_ingest_document};\n \n@@ -148,6 +149,7 @@ fn compute_scope_rank_changes(\n parent: &str,\n before: &crate::scope_rank::ChildrenRankings,\n after: &crate::scope_rank::ChildrenRankings,\n+ room_wire: &str,\n ) -> Option {\n fn build_positions(rankings: &crate::scope_rank::ChildrenRankings) -> HashMap> {\n let mut map = HashMap::new();\n@@ -182,7 +184,7 @@ fn compute_scope_rank_changes(\n };\n if changed {\n changes.push(RankChange {\n- item: item_path_for_api(&item),\n+ item: item_path_for_api_in_room(&item, room_wire),\n before: b,\n after: a,\n });\n@@ -204,7 +206,7 @@ fn compute_scope_rank_changes(\n parent: if parent.is_empty() {\n \"/\".to_string()\n } else {\n- item_path_for_api(parent)\n+ item_path_for_api_in_room(parent, room_wire)\n },\n changes,\n })\n@@ -256,6 +258,7 @@ fn build_rank_response_for_content(\n offset: usize,\n limit: Option,\n want_percent: bool,\n+ room_wire: &str,\n ) -> Result {\n let parent_owned = parent.map(|s| s.to_string());\n let specs = parse_parent_specs(parent_owned.as_ref());\n@@ -299,7 +302,7 @@ fn build_rank_response_for_content(\n .ranked\n .into_iter()\n .map(|r| RankRow {\n- item: item_path_for_api(r.item.as_str()),\n+ item: item_path_for_api_in_room(r.item.as_str(), room_wire),\n percent: if want_percent {\n Some((r.score / max_score) * 100.0)\n } else {\n@@ -315,7 +318,7 @@ fn build_rank_response_for_content(\n let prefixed_unranked: Vec = rankings\n .unranked_items\n .into_iter()\n- .map(|s| item_path_for_api(s.as_str()))\n+ .map(|s| item_path_for_api_in_room(s.as_str(), room_wire))\n .collect();\n \n let (components, unranked_items) = if offset > 0 || limit.is_some() {\n@@ -522,7 +525,7 @@ async fn rpc_post(\n .filter_map(|p| {\n let before = pre_rankings.get(p)?;\n let after = crate::scope_rank::build_children_rankings(content, p);\n- compute_scope_rank_changes(p.as_str(), before, &after)\n+ compute_scope_rank_changes(p.as_str(), before, &after, &room_key)\n })\n .collect();\n if v.is_empty() { None } else { Some(v) }\n@@ -530,14 +533,28 @@ async fn rpc_post(\n None\n };\n \n+ let (pair_hint, rank_hint, web_url) = if room_key == \"public\" {\n+ (\n+ \"npx slugsocial public garden pair\".to_string(),\n+ \"npx slugsocial public garden rank\".to_string(),\n+ forum_thread_web_url(\"public\", &thread_id),\n+ )\n+ } else {\n+ (\n+ format!(\"npx slugsocial private {room_key} garden pair\"),\n+ format!(\"npx slugsocial private {room_key} garden rank\"),\n+ forum_thread_web_url(&room_key, &thread_id),\n+ )\n+ };\n+\n Ok(RpcResult::PostOk {\n events_appended,\n ranking_changes,\n threads: vec![format!(\"#{}\", thread_id)],\n next: NextMoves {\n- pair: \"npx slugsocial public garden pair\".to_string(),\n- rank: \"npx slugsocial public garden rank\".to_string(),\n- web: format!(\"https://slug.social/t/{}\", thread_id),\n+ pair: pair_hint,\n+ rank: rank_hint,\n+ web: web_url,\n },\n })\n }\n@@ -609,7 +626,7 @@ async fn rpc_check(\n raw: v.raw_text.clone(),\n principal,\n delegate,\n- room_id: room_key,\n+ room_id: room_key.clone(),\n thread_tag: thread_id.clone(),\n });\n \n@@ -647,7 +664,7 @@ async fn rpc_check(\n .ranked\n .into_iter()\n .map(|r| RankRow {\n- item: item_path_for_api(r.item.as_str()),\n+ item: item_path_for_api_in_room(r.item.as_str(), &room_key),\n score: r.score,\n percent: None,\n })\n@@ -655,25 +672,35 @@ async fn rpc_check(\n })\n .collect();\n CheckScopeRanking {\n- parent: item_path_for_api(parent.as_str()),\n+ parent: item_path_for_api_in_room(parent.as_str(), &room_key),\n components,\n unranked_items: scoped\n .unranked_items\n .into_iter()\n- .map(|it| item_path_for_api(it.as_str()))\n+ .map(|it| item_path_for_api_in_room(it.as_str(), &room_key))\n .collect(),\n }\n })\n .collect();\n \n+ let check_next = if room_key == \"public\" {\n+ vec![\n+ \"npx slugsocial public forum post --delegate \".to_string(),\n+ \"npx slugsocial public forum list\".to_string(),\n+ forum_thread_web_url(\"public\", &thread_id),\n+ ]\n+ } else {\n+ vec![\n+ format!(\"npx slugsocial private {room_key} forum post --delegate \"),\n+ format!(\"npx slugsocial private {room_key} forum list\"),\n+ forum_thread_web_url(&room_key, &thread_id),\n+ ]\n+ };\n+\n Ok(RpcResult::CheckOk {\n rankings,\n threads: vec![format!(\"#{}\", thread_id)],\n- next: vec![\n- \"npx slugsocial public forum post --delegate \".to_string(),\n- \"npx slugsocial public forum list\".to_string(),\n- format!(\"https://slug.social/t/{}\", thread_id),\n- ],\n+ next: check_next,\n })\n }\n \n@@ -690,7 +717,7 @@ fn rpc_list_forum_threads(reduced: &ReducerState, room: &str) -> ThreadsResponse\n .map(|((_, tag), ts)| ThreadSummary {\n thread: format!(\"#{tag}\"),\n last_activity_ts: ts.last_activity_ts,\n- web: format!(\"https://slug.social/t/{}\", tag),\n+ web: forum_thread_web_url(room, tag),\n })\n .collect();\n out.sort_by(|a, b| b.last_activity_ts.cmp(&a.last_activity_ts));\n@@ -1031,8 +1058,8 @@ async fn rpc_get_pair(state: &AppState, room: String, parent_path: String) -> Re\n .collect();\n let cs = compute_connectivity_stats(&content.ranking_group, &pool);\n Ok(RpcResult::Pair(PairResponse {\n- left: item_path_for_api(&left),\n- right: item_path_for_api(&right),\n+ left: item_path_for_api_in_room(&left, &room),\n+ right: item_path_for_api_in_room(&right, &room),\n left_body: lb,\n right_body: rb,\n threads: th,\n@@ -1088,6 +1115,7 @@ pub async fn handle_rpc_batch(\n offset.unwrap_or(0),\n limit,\n percent.unwrap_or(false),\n+ &room,\n ) {\n Ok(r) => line_ok(RpcResult::GardenRank(r)),\n Err((e, h)) => line_err(e, h),\n@@ -1109,7 +1137,7 @@ pub async fn handle_rpc_batch(\n if !content.items.contains(&item) {\n line_err(\n \"item not found\",\n- Some(format!(\"{} does not exist\", item_path_for_api(&item_str))),\n+ Some(format!(\"{} does not exist\", item_path_for_api_in_room(&item_str, &room))),\n )\n } else {\n const MAX_ITEM_BODY: usize = 10_000;\n@@ -1132,7 +1160,7 @@ pub async fn handle_rpc_batch(\n .map(|s| s.iter().cloned().collect())\n .unwrap_or_default();\n line_ok(RpcResult::GardenItem(ItemResponse {\n- item: item_str,\n+ item: item_path_for_api_in_room(&item_str, &room),\n body,\n truncated,\n body_len,\n@@ -1525,7 +1553,11 @@ pub async fn handle_rpc_batch(\n let range = (top - bot).max(1e-12);\n for r in items {\n let pct = want_percent.then(|| ((r.score - bot) / range * 100.0).clamp(0.0, 100.0));\n- ranked.push(RankRow { item: item_path_for_api(r.item.as_str()), score: r.score, percent: pct });\n+ ranked.push(RankRow {\n+ item: item_path_for_api_in_room(r.item.as_str(), &room),\n+ score: r.score,\n+ percent: pct,\n+ });\n }\n }\n \n@@ -1542,7 +1574,7 @@ pub async fn handle_rpc_batch(\n let page: Vec = ranked\n .into_iter()\n .chain(unranked.into_iter().map(|it| RankRow {\n- item: item_path_for_api(&it),\n+ item: item_path_for_api_in_room(&it, &room),\n score: 0.0,\n percent: want_percent.then_some(0.0),\n }))\n@@ -1586,7 +1618,7 @@ pub async fn handle_rpc_batch(\n if !content.items.contains(&item) {\n line_err(\n \"item not found\",\n- Some(format!(\"{} does not exist\", item_path_for_api(&item_str))),\n+ Some(format!(\"{} does not exist\", item_path_for_api_in_room(&item_str, &room))),\n )\n } else {\n let votes: Vec = content\n@@ -1597,8 +1629,8 @@ pub async fn handle_rpc_batch(\n .take(limit)\n .map(|v| VoteRow {\n ts: v.ts,\n- a: v.a.as_str().to_string(),\n- b: v.b.as_str().to_string(),\n+ a: item_path_for_api_in_room(v.a.as_str(), &room),\n+ b: item_path_for_api_in_room(v.b.as_str(), &room),\n ratio: format!(\"{}:{}\", v.ratio_left, v.ratio_right),\n actor: Some(v.principal.clone()),\n body: v.body.clone(),\n@@ -1608,7 +1640,7 @@ pub async fn handle_rpc_batch(\n })\n .unwrap_or_default();\n line_ok(RpcResult::Matchup(MatchupResponse {\n- item: item_path_for_api(&item_str),\n+ item: item_path_for_api_in_room(&item_str, &room),\n votes,\n }))\n }\n@@ -1635,8 +1667,8 @@ pub async fn handle_rpc_batch(\n if a == item_str || b == item_str {\n Some(VoteRow {\n ts: e.ts,\n- a: item_path_for_api(&a),\n- b: item_path_for_api(&b),\n+ a: item_path_for_api_in_room(&a, &room),\n+ b: item_path_for_api_in_room(&b, &room),\n ratio: format!(\"{}:{}\", ratio_left, ratio_right),\n actor: reduced.ingests_by_id.get(&e.post_id).map(|ing| ing.principal.clone()),\n body: explanation,\n@@ -1672,7 +1704,7 @@ pub async fn handle_rpc_batch(\n }\n }).collect();\n line_ok(RpcResult::RankHistory(RankHistoryResponse {\n- item: item_path_for_api(&item_str),\n+ item: item_path_for_api_in_room(&item_str, &room),\n history,\n }))\n }\n@@ -1691,6 +1723,10 @@ pub async fn handle_rpc_batch(\n .map(|p| p.as_str().to_string())\n .collect();\n paths.sort();\n+ let paths: Vec = paths\n+ .into_iter()\n+ .map(|p| item_path_for_api_in_room(&p, &room))\n+ .collect();\n line_ok(RpcResult::Leaves(LeavesResponse { paths }))\n }\n },\n@@ -1707,10 +1743,21 @@ pub async fn handle_rpc_batch(\n let mut v: Vec = roots.iter()\n .map(|path| {\n let children = content.item_children.get(path.as_str()).map(|s| s.len()).unwrap_or(0);\n+ let path_label = CanonicalItemUrl::parse(path.as_str())\n+ .and_then(|c| {\n+ c.tilde_tail().map(|t| {\n+ if t.is_empty() {\n+ \"~/\".to_string()\n+ } else {\n+ format!(\"~/{}\", t)\n+ }\n+ })\n+ })\n+ .unwrap_or_else(|| path.to_string());\n PathSummary {\n- path: format!(\"~/{}\", path),\n+ path: path_label,\n children,\n- web: format!(\"https://slug.social/~/{}\", path),\n+ web: item_path_for_api_in_room(path.as_str(), &room),\n }\n }).collect();\n v.sort_by(|a, b| a.path.cmp(&b.path));\n@@ -1743,8 +1790,8 @@ pub async fn handle_rpc_batch(\n .take(limit)\n .map(|v| VoteRow {\n ts: v.ts,\n- a: v.a.as_str().to_string(),\n- b: v.b.as_str().to_string(),\n+ a: item_path_for_api_in_room(v.a.as_str(), &room),\n+ b: item_path_for_api_in_room(v.b.as_str(), &room),\n ratio: format!(\"{}:{}\", v.ratio_left, v.ratio_right),\n actor: Some(v.principal.clone()),\n body: v.body.clone(),\ndiff --git a/server/src/html/auth.rs b/server/src/html/auth.rs\nindex d57b1c725ce3e06b1d904882b9388c3da48d85cb..5df77c76b89ed2bb11d936e1dbb804d50a0e79a1 100644\n--- a/server/src/html/auth.rs\n+++ b/server/src/html/auth.rs\n@@ -23,7 +23,7 @@ fn form_inner(session: &str, error: Option<&str>) -> Markup {\n }\n }\n \n-pub fn choose_username_page(session: &str, error: Option<&str>) -> Markup {\n+pub fn choose_username_page(session: &str, error: Option<&str>, theme: &str, theme_next: &str) -> Markup {\n let body = html! {\n nav.breadcrumb {\n a href=\"/\" { \"slug.social\" }\n@@ -36,7 +36,7 @@ pub fn choose_username_page(session: &str, error: Option<&str>) -> Markup {\n (form_inner(session, error))\n }\n };\n- super::layout(\"join — slug.social\", \"view-auth\", body, None)\n+ super::layout(\"join — slug.social\", \"view-auth\", body, None, theme, theme_next)\n }\n \n /// Fragment returned to the poem JS on error — replaces the form's innerHTML.\n@@ -52,7 +52,7 @@ pub fn auth_signed_in_fragment() -> Markup {\n }\n }\n \n-pub fn auth_complete_page() -> Markup {\n+pub fn auth_complete_page(theme: &str, theme_next: &str) -> Markup {\n let body = html! {\n nav.breadcrumb {\n a href=\"/\" { \"slug.social\" }\n@@ -63,5 +63,5 @@ pub fn auth_complete_page() -> Markup {\n p { \"Return to your terminal — your agent is polling and will collect your token automatically.\" }\n p.auth-hint { \"You can close this tab.\" }\n };\n- super::layout(\"signed in — slug.social\", \"view-auth\", body, None)\n+ super::layout(\"signed in — slug.social\", \"view-auth\", body, None, theme, theme_next)\n }\ndiff --git a/server/src/html/editor.rs b/server/src/html/editor.rs\nindex 07f6ab3b778f07f60765fa3f39060ebc5f72bc1a..ecdd226b1b17d5f11d1b79f99add5759ef918281 100644\n--- a/server/src/html/editor.rs\n+++ b/server/src/html/editor.rs\n@@ -1,8 +1,10 @@\n use axum::{\n extract::State,\n+ http::Uri,\n response::{Html, IntoResponse},\n Form,\n };\n+use axum_extra::extract::cookie::CookieJar;\n use maud::{html, Markup};\n use serde::Deserialize;\n \n@@ -13,7 +15,7 @@ use crate::{\n state::AppState,\n };\n \n-use super::{bc_segment, layout};\n+use super::{bc_segment, layout, theme_from_jar, theme_next_from_uri};\n \n fn bc_try() -> Markup {\n html! {\n@@ -23,7 +25,7 @@ fn bc_try() -> Markup {\n }\n \n /// The interactive editor page — `/try`.\n-pub async fn editor_page() -> impl IntoResponse {\n+pub async fn editor_page(jar: CookieJar, uri: Uri) -> impl IntoResponse {\n let page = layout(\n \"try — slug.social\",\n \"view-thread\",\n@@ -68,6 +70,8 @@ pub async fn editor_page() -> impl IntoResponse {\n \"#)) }\n },\n None,\n+ theme_from_jar(&jar),\n+ &theme_next_from_uri(&uri),\n );\n Html(page.into_string())\n }\ndiff --git a/server/src/html/forum.rs b/server/src/html/forum.rs\nindex 5c5f9e2ba0e5cb1d661c113117988ec80c01deca..368b1016eb43d83e9ff39464ff6164fa9a8b558a 100644\n--- a/server/src/html/forum.rs\n+++ b/server/src/html/forum.rs\n@@ -1,6 +1,6 @@\n use axum::{\n extract::{Path, Query, State},\n- http::{HeaderMap, StatusCode},\n+ http::{HeaderMap, StatusCode, Uri},\n response::{Html, IntoResponse},\n };\n use axum_extra::extract::cookie::CookieJar;\n@@ -19,7 +19,7 @@ use crate::{\n \n use super::{\n bc_segment, bc_threads, cli_panel, layout, now_ms, profile_href, recency_class,\n- render_linkified_with_embeds_in_scope, JsBuilder,\n+ render_linkified_with_embeds_in_scope, theme_from_jar, theme_next_from_uri, JsBuilder,\n };\n \n #[derive(Clone)]\n@@ -577,6 +577,7 @@ pub async fn home(\n State(state): State,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let now = now_ms();\n let reduced = state.reduced.read().await;\n@@ -624,6 +625,8 @@ pub async fn home(\n (cli_panel(\"npx slugsocial public forum list\"))\n },\n None,\n+ theme_from_jar(&jar),\n+ &theme_next_from_uri(&uri),\n );\n Html(page.into_string())\n }\n@@ -679,6 +682,7 @@ async fn thread_view_inner(\n nav: ThreadNav,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let tag = canonicalize_tag(&tag);\n let scope = nav.scope();\n@@ -778,6 +782,8 @@ async fn thread_view_inner(\n (cli_panel(&cli))\n },\n None,\n+ theme_from_jar(&jar),\n+ &theme_next_from_uri(&uri),\n );\n Html(page.into_string()).into_response()\n }\n@@ -789,8 +795,9 @@ pub async fn thread_view(\n Query(q): Query,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n- thread_view_inner(state, tag, q, ThreadNav::public(), headers, jar).await\n+ thread_view_inner(state, tag, q, ThreadNav::public(), headers, jar, uri).await\n }\n \n /// Room thread — `/r/:short/:slug/t/:tag`\n@@ -800,31 +807,39 @@ pub async fn room_thread_view(\n Query(q): Query,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let room_id = format!(\"{room_short}/{room_slug}\");\n let reduced = state.reduced.read().await;\n let user = optional_principal(&headers, &jar, &reduced);\n if !user_can_view_room(&reduced, &room_id, user.as_deref()) {\n drop(reduced);\n- return room_not_found_page().into_response();\n+ return room_not_found_page(&jar, &uri).into_response();\n }\n drop(reduced);\n let Some(nav) = ThreadNav::from_room_id(&room_id) else {\n return (StatusCode::NOT_FOUND, \"bad room path\").into_response();\n };\n- thread_view_inner(state, tag, q, nav, headers, jar)\n+ thread_view_inner(state, tag, q, nav, headers, jar, uri)\n .await\n .into_response()\n }\n \n-fn room_not_found_page() -> impl IntoResponse {\n+fn room_not_found_page(jar: &CookieJar, uri: &Uri) -> impl IntoResponse {\n let body = html! {\n nav class=\"breadcrumb\" { a href=\"/\" { \"slug.social\" } }\n h1 { \"not found\" }\n p { \"The requested page could not be found.\" }\n p { a href=\"/\" { \"home\" } }\n };\n- let page = layout(\"not found — slug.social\", \"view-thread\", body, None);\n+ let page = layout(\n+ \"not found — slug.social\",\n+ \"view-thread\",\n+ body,\n+ None,\n+ theme_from_jar(jar),\n+ &theme_next_from_uri(uri),\n+ );\n (StatusCode::NOT_FOUND, Html(page.into_string()))\n }\n \n@@ -834,6 +849,7 @@ pub async fn room_page(\n Path((room_short, room_slug)): Path<(String, String)>,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let room_id = format!(\"{room_short}/{room_slug}\");\n let now = now_ms();\n@@ -845,7 +861,7 @@ pub async fn room_page(\n let user = optional_principal(&headers, &jar, &reduced);\n if !user_can_view_room(&reduced, &room_id, user.as_deref()) {\n drop(reduced);\n- return room_not_found_page().into_response();\n+ return room_not_found_page(&jar, &uri).into_response();\n }\n let scope = ScopeId::Room(room_id.clone());\n let mut rows = collect_thread_rows_for_scope(&reduced, &scope, now);\n@@ -902,6 +918,8 @@ pub async fn room_page(\n (cli_panel(&audit_cli))\n },\n None,\n+ theme_from_jar(&jar),\n+ &theme_next_from_uri(&uri),\n );\n Html(page.into_string()).into_response()\n }\n@@ -943,6 +961,8 @@ async fn thread_post_view_inner(\n index_str: String,\n nav: ThreadNav,\n viewer: Option,\n+ jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let tag = canonicalize_tag(&tag);\n let index: usize = index_str.parse().unwrap_or(0);\n@@ -987,6 +1007,8 @@ async fn thread_post_view_inner(\n }\n },\n None,\n+ theme_from_jar(&jar),\n+ &theme_next_from_uri(&uri),\n );\n Html(page.into_string()).into_response()\n }\n@@ -996,11 +1018,12 @@ pub async fn thread_post_view(\n Path((tag, index_str)): Path<(String, String)>,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let reduced = state.reduced.read().await;\n let viewer = optional_principal(&headers, &jar, &reduced);\n drop(reduced);\n- thread_post_view_inner(state, tag, index_str, ThreadNav::public(), viewer)\n+ thread_post_view_inner(state, tag, index_str, ThreadNav::public(), viewer, jar, uri)\n .await\n }\n \n@@ -1009,19 +1032,20 @@ pub async fn room_thread_post_view(\n Path((room_short, room_slug, tag, index_str)): Path<(String, String, String, String)>,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let room_id = format!(\"{room_short}/{room_slug}\");\n let reduced = state.reduced.read().await;\n let user = optional_principal(&headers, &jar, &reduced);\n if !user_can_view_room(&reduced, &room_id, user.as_deref()) {\n drop(reduced);\n- return room_not_found_page().into_response();\n+ return room_not_found_page(&jar, &uri).into_response();\n }\n drop(reduced);\n let Some(nav) = ThreadNav::from_room_id(&room_id) else {\n return (StatusCode::NOT_FOUND, \"bad room path\").into_response();\n };\n- thread_post_view_inner(state, tag, index_str, nav, user)\n+ thread_post_view_inner(state, tag, index_str, nav, user, jar, uri)\n .await\n .into_response()\n }\n@@ -1193,6 +1217,7 @@ pub async fn user_profile_page(\n Path(username): Path,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let canon = match parse_username(&username) {\n Ok(u) => u,\n@@ -1270,6 +1295,8 @@ pub async fn user_profile_page(\n (cli_panel(&format!(\"npx slugsocial public forum list\")))\n },\n None,\n+ theme_from_jar(&jar),\n+ &theme_next_from_uri(&uri),\n );\n Html(page.into_string()).into_response()\n }\n@@ -1292,13 +1319,14 @@ pub async fn room_thread_post_expand(\n Path((room_short, room_slug, tag, index_str)): Path<(String, String, String, String)>,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let room_id = format!(\"{room_short}/{room_slug}\");\n let reduced = state.reduced.read().await;\n let user = optional_principal(&headers, &jar, &reduced);\n if !user_can_view_room(&reduced, &room_id, user.as_deref()) {\n drop(reduced);\n- return room_not_found_page().into_response();\n+ return room_not_found_page(&jar, &uri).into_response();\n }\n let Some(nav) = ThreadNav::from_room_id(&room_id) else {\n drop(reduced);\n@@ -1328,13 +1356,14 @@ pub async fn room_thread_post_expand_deleted(\n Path((room_short, room_slug, tag, index_str)): Path<(String, String, String, String)>,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let room_id = format!(\"{room_short}/{room_slug}\");\n let reduced = state.reduced.read().await;\n let user = optional_principal(&headers, &jar, &reduced);\n if !user_can_view_room(&reduced, &room_id, user.as_deref()) {\n drop(reduced);\n- return room_not_found_page().into_response();\n+ return room_not_found_page(&jar, &uri).into_response();\n }\n let Some(nav) = ThreadNav::from_room_id(&room_id) else {\n drop(reduced);\n@@ -1364,13 +1393,14 @@ pub async fn room_thread_post_collapse_deleted(\n Path((room_short, room_slug, tag, index_str)): Path<(String, String, String, String)>,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let room_id = format!(\"{room_short}/{room_slug}\");\n let reduced = state.reduced.read().await;\n let user = optional_principal(&headers, &jar, &reduced);\n if !user_can_view_room(&reduced, &room_id, user.as_deref()) {\n drop(reduced);\n- return room_not_found_page().into_response();\n+ return room_not_found_page(&jar, &uri).into_response();\n }\n let Some(nav) = ThreadNav::from_room_id(&room_id) else {\n drop(reduced);\ndiff --git a/server/src/html/garden.rs b/server/src/html/garden.rs\nindex e08f068ae04f5a2542ec2c43c240f931f87146bf..9b4789a79c3e293cbfc5f033a0eac8650320d94d 100644\n--- a/server/src/html/garden.rs\n+++ b/server/src/html/garden.rs\n@@ -1,6 +1,6 @@\n use axum::{\n extract::{Path, State},\n- http::{HeaderMap, StatusCode},\n+ http::{HeaderMap, StatusCode, Uri},\n response::{Html, IntoResponse},\n };\n use axum_extra::extract::cookie::CookieJar;\n@@ -20,7 +20,8 @@ use crate::{\n \n use super::{\n bc_path, bc_segment, cli_panel, layout, now_ms, ratio_pct,\n- render_linkified_with_embeds_in_scope, breadcrumb_path::OntologyPath,\n+ render_linkified_with_embeds_in_scope, theme_from_jar, theme_next_from_uri,\n+ breadcrumb_path::OntologyPath,\n forum::ThreadNav,\n };\n \n@@ -59,14 +60,21 @@ fn scoped_bc_path(path: &OntologyPath, nav: &ThreadNav) -> maud::Markup {\n }\n }\n \n-fn room_not_found_page() -> impl IntoResponse {\n+fn room_not_found_page(jar: &CookieJar, uri: &Uri) -> impl IntoResponse {\n let body = html! {\n nav class=\"breadcrumb\" { a href=\"/\" { \"slug.social\" } }\n h1 { \"not found\" }\n p { \"The requested page could not be found.\" }\n p { a href=\"/\" { \"home\" } }\n };\n- let page = layout(\"not found — slug.social\", \"view-thread\", body, None);\n+ let page = layout(\n+ \"not found — slug.social\",\n+ \"view-thread\",\n+ body,\n+ None,\n+ theme_from_jar(jar),\n+ &theme_next_from_uri(uri),\n+ );\n (StatusCode::NOT_FOUND, Html(page.into_string()))\n }\n \n@@ -81,7 +89,11 @@ fn user_can_view_room(reduced: &ReducerState, room_id: &str, username: Option<&s\n }\n \n /// Ontology index — root-level paths. Private (UUID) roots are excluded.\n-pub async fn garden_index(State(state): State) -> impl IntoResponse {\n+pub async fn garden_index(\n+ State(state): State,\n+ jar: CookieJar,\n+ uri: Uri,\n+) -> impl IntoResponse {\n let nav = ThreadNav::public();\n let child_rankings = {\n let reduced = state.reduced.read().await;\n@@ -130,6 +142,8 @@ pub async fn garden_index(State(state): State) -> impl IntoResponse {\n (cli_panel(\"npx slugsocial garden tree\"))\n },\n None,\n+ theme_from_jar(&jar),\n+ &theme_next_from_uri(&uri),\n );\n Html(page.into_string())\n }\n@@ -138,9 +152,11 @@ pub async fn garden_index(State(state): State) -> impl IntoResponse {\n pub async fn ontology_path(\n State(state): State,\n Path(path): Path,\n+ jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let path = OntologyPath::from_input(&path);\n- render_scope_view(state, path, ThreadNav::public()).await\n+ render_scope_view(state, path, ThreadNav::public(), jar, uri).await\n }\n \n pub async fn room_garden_index(\n@@ -148,19 +164,20 @@ pub async fn room_garden_index(\n Path((room_short, room_slug)): Path<(String, String)>,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let room_id = format!(\"{room_short}/{room_slug}\");\n let reduced = state.reduced.read().await;\n let user = optional_principal(&headers, &jar, &reduced);\n if !user_can_view_room(&reduced, &room_id, user.as_deref()) {\n drop(reduced);\n- return room_not_found_page().into_response();\n+ return room_not_found_page(&jar, &uri).into_response();\n }\n drop(reduced);\n let Some(nav) = ThreadNav::from_room_id(&room_id) else {\n return (StatusCode::NOT_FOUND, \"bad room path\").into_response();\n };\n- render_scope_view(state, OntologyPath::root(), nav).await\n+ render_scope_view(state, OntologyPath::root(), nav, jar, uri).await\n }\n \n pub async fn room_ontology_path(\n@@ -168,20 +185,21 @@ pub async fn room_ontology_path(\n Path((room_short, room_slug, path)): Path<(String, String, String)>,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let room_id = format!(\"{room_short}/{room_slug}\");\n let reduced = state.reduced.read().await;\n let user = optional_principal(&headers, &jar, &reduced);\n if !user_can_view_room(&reduced, &room_id, user.as_deref()) {\n drop(reduced);\n- return room_not_found_page().into_response();\n+ return room_not_found_page(&jar, &uri).into_response();\n }\n drop(reduced);\n let Some(nav) = ThreadNav::from_room_id(&room_id) else {\n return (StatusCode::NOT_FOUND, \"bad room path\").into_response();\n };\n let path = OntologyPath::from_input(&path);\n- render_scope_view(state, path, nav).await\n+ render_scope_view(state, path, nav, jar, uri).await\n }\n \n #[derive(Debug, Clone)]\n@@ -375,6 +393,8 @@ async fn render_scope_view(\n state: AppState,\n path: OntologyPath,\n nav: ThreadNav,\n+ jar: CookieJar,\n+ uri: Uri,\n ) -> axum::response::Response {\n let scope = nav.scope();\n let model = {\n@@ -525,6 +545,8 @@ async fn render_scope_view(\n (cli_panel(&cli))\n },\n None,\n+ theme_from_jar(&jar),\n+ &theme_next_from_uri(&uri),\n );\n \n Html(page.into_string()).into_response()\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex a8fd73433d120b07351dd027faf0b25f8f101321..53041a0cf0b30e6f20749c92ecc15a4e9ac56e09 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -1,10 +1,13 @@\n use axum::{\n body::Body,\n extract::Path,\n- http::{header, StatusCode},\n+ http::{header, HeaderValue, StatusCode, Uri},\n response::{IntoResponse, Response},\n+ Form,\n };\n+use axum_extra::extract::cookie::CookieJar;\n use maud::{html, Markup, DOCTYPE};\n+use serde::Deserialize;\n use std::collections::HashSet;\n \n mod auth;\n@@ -33,6 +36,75 @@ pub(crate) fn profile_href(username: &str) -> String {\n format!(\"/u/{username}\")\n }\n \n+/// Cookie name for UI theme (must match document.cookie migration in [`layout`]).\n+pub const SLUG_THEME_COOKIE: &str = \"slug-theme\";\n+\n+/// Normalize a requested theme id to a known stylesheet key.\n+pub fn normalize_theme(raw: &str) -> &'static str {\n+ match raw {\n+ \"retro\" => \"retro\",\n+ \"retro_craft\" => \"retro_craft\",\n+ _ => \"default\",\n+ }\n+}\n+\n+/// Resolved theme for rendering and cookie re-issue.\n+pub fn theme_from_jar(jar: &CookieJar) -> &'static str {\n+ jar.get(SLUG_THEME_COOKIE)\n+ .map(|c| normalize_theme(c.value()))\n+ .unwrap_or(\"default\")\n+}\n+\n+/// `Path` + optional `?query` for round-tripping after `POST /theme`.\n+pub fn theme_next_from_uri(uri: &Uri) -> String {\n+ uri.path_and_query()\n+ .map(|pq| pq.as_str().to_string())\n+ .filter(|s| !s.is_empty())\n+ .unwrap_or_else(|| \"/\".to_string())\n+}\n+\n+/// `Set-Cookie` for a validated theme (ASCII cookie value).\n+pub fn theme_cookie_header_value(theme: &str) -> HeaderValue {\n+ let t = normalize_theme(theme);\n+ let s = format!(\"{SLUG_THEME_COOKIE}={t}; Path=/; SameSite=Lax; Max-Age=31536000\");\n+ HeaderValue::from_str(&s).expect(\"theme cookie must be ASCII\")\n+}\n+\n+/// Re-issue theme cookie on responses that also set `slug_session`, so login does not drop theme.\n+pub fn theme_cookie_header_from_jar(jar: &CookieJar) -> Option {\n+ let c = jar.get(SLUG_THEME_COOKIE)?;\n+ Some(theme_cookie_header_value(c.value()))\n+}\n+\n+fn sanitize_theme_next(next: Option<&str>) -> String {\n+ let s = next.unwrap_or(\"/\").trim();\n+ if s.starts_with('/') && !s.starts_with(\"//\") && s.len() < 8192 {\n+ s.to_string()\n+ } else {\n+ \"/\".to_string()\n+ }\n+}\n+\n+#[derive(Debug, Deserialize)]\n+pub struct ThemeForm {\n+ theme: String,\n+ next: Option,\n+}\n+\n+/// `POST /theme` — set theme cookie and redirect back (full navigation, no fetch).\n+pub async fn post_theme(Form(form): Form) -> impl IntoResponse {\n+ let theme = normalize_theme(&form.theme);\n+ let next = sanitize_theme_next(form.next.as_deref());\n+ let loc = HeaderValue::try_from(next.as_str())\n+ .unwrap_or_else(|_| HeaderValue::from_static(\"/\"));\n+ Response::builder()\n+ .status(StatusCode::SEE_OTHER)\n+ .header(header::LOCATION, loc)\n+ .header(header::SET_COOKIE, theme_cookie_header_value(theme))\n+ .body(Body::empty())\n+ .expect(\"theme redirect response\")\n+}\n+\n // Embed CSS files at compile time\n const THEME_DEFAULT_CSS: &str = include_str!(\"../../static/theme_default.css\");\n const THEME_RETRO_CSS: &str = include_str!(\"../../static/theme_retro.css\");\n@@ -173,7 +245,9 @@ impl JsQueryBuilder {\n }\n }\n \n-pub(super) fn layout(title: &str, view: &str, body: Markup, views: Option) -> Markup {\n+pub(super) fn layout(title: &str, view: &str, body: Markup, views: Option, theme: &str, theme_next: &str) -> Markup {\n+ let theme = normalize_theme(theme);\n+ let css_href = format!(\"/static/theme_{theme}.css\");\n html! {\n (DOCTYPE)\n html {\n@@ -181,7 +255,20 @@ pub(super) fn layout(title: &str, view: &str, body: Markup, views: Option)\n meta charset=\"utf-8\";\n meta name=\"viewport\" content=\"width=device-width, initial-scale=1\";\n title { (title) }\n- link rel=\"stylesheet\" href=\"/static/theme_default.css\" id=\"theme-stylesheet\";\n+ script { (maud::PreEscaped(r#\"\n+(function() {\n+ try {\n+ var ls = localStorage.getItem('slug-theme');\n+ if (!ls) return;\n+ var m = document.cookie.match(/(?:^|;\\s*)slug-theme=([^;]+)/);\n+ var c = m ? decodeURIComponent(m[1].replace(/\\+/g, ' ')) : '';\n+ if (ls === c) { localStorage.removeItem('slug-theme'); return; }\n+ document.cookie = 'slug-theme=' + encodeURIComponent(ls) + '; Path=/; SameSite=Lax; Max-Age=31536000';\n+ location.reload();\n+ } catch (e) {}\n+})();\n+\"#)) }\n+ link rel=\"stylesheet\" href=(css_href) id=\"theme-stylesheet\";\n script src=\"https://unpkg.com/idiomorph@0.3.0/dist/idiomorph.min.js\" {}\n }\n body class=(view) {\n@@ -196,32 +283,21 @@ pub(super) fn layout(title: &str, view: &str, body: Markup, views: Option)\n input type=\"range\" id=\"spread-slider\" min=\"0\" max=\"1\" step=\"0.05\" value=\"1\";\n }\n a id=\"search-btn\" href=\"/search\" { \"search\" }\n- div id=\"theme-switcher\" { \"theme\" }\n+ form id=\"slug-theme-form\" method=\"post\" action=\"/theme\" {\n+ input type=\"hidden\" name=\"next\" value=(theme_next);\n+ select id=\"theme-select\" name=\"theme\" onchange=\"this.form.submit()\" aria-label=\"Theme\" {\n+ @for (val, label) in [(\"default\", \"default\"), (\"retro\", \"retro\"), (\"retro_craft\", \"craft\")] {\n+ @if theme == val {\n+ option value=(val) selected { (label) }\n+ } @else {\n+ option value=(val) { (label) }\n+ }\n+ }\n+ }\n+ }\n }\n script { (maud::PreEscaped(r#\"\n (function() {\n- // Theme switching\n- const themes = ['default', 'retro', 'retro_craft'];\n- const themeLabel = { default: 'default', retro: 'retro', retro_craft: 'craft' };\n- const storedTheme = localStorage.getItem('slug-theme') || 'default';\n- const switcher = document.getElementById('theme-switcher');\n- const stylesheet = document.getElementById('theme-stylesheet');\n-\n- function setTheme(name) {\n- stylesheet.href = `/static/theme_${name}.css`;\n- localStorage.setItem('slug-theme', name);\n- switcher.textContent = themeLabel[name] || name;\n- setTimeout(() => setSpread(parseFloat(slider.value)), 50);\n- }\n-\n- setTheme(storedTheme);\n-\n- switcher.addEventListener('click', function() {\n- const current = themes.indexOf(localStorage.getItem('slug-theme') || 'default');\n- const next = (current + 1) % themes.length;\n- setTheme(themes[next]);\n- });\n-\n // Spread control\n const slider = document.getElementById('spread-slider');\n const storedSpread = localStorage.getItem('slug-spread');\n@@ -245,6 +321,7 @@ script { (maud::PreEscaped(r#\"\n const f = e.target;\n if (!f || f.tagName !== 'FORM') return;\n if ((f.method || 'get').toLowerCase() !== 'post') return;\n+ if (f.id === 'slug-theme-form') return;\n e.preventDefault();\n const resp = await fetch(f.action, {\n method: 'POST',\ndiff --git a/server/src/html/search.rs b/server/src/html/search.rs\nindex 0871ddb7a87e3153e2cb6c1f827b46de2c9f0f3b..28ceaa53c3fcac6777311535e95fb771b19438f5 100644\n--- a/server/src/html/search.rs\n+++ b/server/src/html/search.rs\n@@ -1,6 +1,6 @@\n use axum::{\n extract::{Query, State},\n- http::HeaderMap,\n+ http::{HeaderMap, Uri},\n response::{Html, IntoResponse},\n };\n use axum_extra::extract::cookie::CookieJar;\n@@ -15,7 +15,7 @@ use crate::{\n timeago,\n };\n \n-use super::{authorship_address, bc_segment, cli_panel, layout, now_ms};\n+use super::{authorship_address, bc_segment, cli_panel, layout, now_ms, theme_from_jar, theme_next_from_uri};\n \n /// Escape HTML special chars for safe injection.\n fn escape_html(s: &str) -> String {\n@@ -396,6 +396,7 @@ pub async fn search_page(\n Query(params): Query,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let query = params.q.clone().unwrap_or_default();\n let results = if query.len() >= 2 {\n@@ -420,6 +421,8 @@ pub async fn search_page(\n (cli_panel(\"npx slugsocial search \"))\n },\n None,\n+ theme_from_jar(&jar),\n+ &theme_next_from_uri(&uri),\n );\n Html(page.into_string())\n }\ndiff --git a/server/src/lib.rs b/server/src/lib.rs\nindex 43b63293c2a62b9700948767c618cb0614ddf6d9..b9d4b79791ba8dd3a3c26ff777943a2548092de5 100644\n--- a/server/src/lib.rs\n+++ b/server/src/lib.rs\n@@ -33,6 +33,7 @@ pub fn create_app(state: AppState) -> Router {\n .route(\"/post\", post(api::post_web_ingest))\n .route(\"/post/redact\", post(api::post_web_redact))\n .route(\"/post/check\", post(api::check_web_ingest))\n+ .route(\"/theme\", post(crate::html::post_theme))\n .route(\"/sse\", get(api::get_html_stream))\n .route(\"/stream\", get(api::get_stream))\n .route(\"/search\", get(crate::html::search_page))\ndiff --git a/server/src/path_types.rs b/server/src/path_types.rs\nindex 997597f6659c1ba2092bc5348e393bf7a8fa7ae0..cad58cac7da948f92d6ea2a5587d917ab21d57ea 100644\n--- a/server/src/path_types.rs\n+++ b/server/src/path_types.rs\n@@ -8,6 +8,12 @@\n //!\n //! This module adds lightweight newtypes so code can be explicit about what it\n //! expects without changing core storage formats.\n+//!\n+//! **Storage vs wire:** [`CanonicalItemUrl`] values are shared across scopes\n+//! (`https://slug.social/~/…`); which [`crate::reducer::ContentState`] they live in\n+//! is determined by scope, not by embedding the room id in the string. For JSON/RPC\n+//! and browser links in a private room, use [`crate::api::helpers::item_path_for_api_in_room`]\n+//! so ontology items become `https://slug.social/r/{short}/{slug}/~/…`.\n \n use std::borrow::Borrow;\n use std::fmt;\ndiff --git a/server/static/theme_default.css b/server/static/theme_default.css\nindex 2b06b12f3e77c9ed305272fe3ab47a8ad08504df..5e6304bcc36caed8aeda913fd241fc8fb9cf6d25 100644\n--- a/server/static/theme_default.css\n+++ b/server/static/theme_default.css\n@@ -678,7 +678,10 @@ details > summary::-webkit-details-marker { display: none; }\n gap: 6px;\n }\n #spread-slider { accent-color: var(--ui); width: 80px; }\n-#theme-switcher {\n+#slug-theme-form {\n+ display: contents;\n+}\n+#theme-select {\n background: var(--g4);\n border: var(--bv) solid;\n border-color: var(--hi) var(--lo) var(--lo) var(--hi);\n@@ -688,8 +691,8 @@ details > summary::-webkit-details-marker { display: none; }\n padding: 2px 10px;\n user-select: none;\n }\n-#theme-switcher:hover { color: var(--signal); }\n-#theme-switcher:active {\n+#theme-select:hover { color: var(--signal); }\n+#theme-select:active {\n border-color: var(--lo) var(--hi) var(--hi) var(--lo);\n transform: translate(1px, 1px);\n }\ndiff --git a/server/static/theme_retro_craft.css b/server/static/theme_retro_craft.css\nindex 508222443a3bb2f16d3034a07af53a7df37a0314..3fde7e2b77fa4e4f46418927eb0fb0e5cd195c75 100644\n--- a/server/static/theme_retro_craft.css\n+++ b/server/static/theme_retro_craft.css\n@@ -35,7 +35,6 @@ h1, h2, h3 {\n font-weight: 600;\n letter-spacing: 0.14em;\n margin: 1.5rem 0 0.5rem;\n- text-transform: uppercase;\n }\n \n a {\n@@ -354,7 +353,10 @@ div.cli-panel {\n accent-color: var(--accent);\n width: 72px;\n }\n-#theme-switcher,\n+#slug-theme-form {\n+ display: contents;\n+}\n+#theme-select,\n #search-btn,\n a#src-link {\n border: 1px solid var(--line);\n@@ -365,7 +367,7 @@ a#src-link {\n padding: 0.25rem 0.6rem;\n text-decoration: none;\n }\n-#theme-switcher:hover,\n+#theme-select:hover,\n #search-btn:hover,\n a#src-link:hover {\n border-color: var(--accent);\n","role":"user"}],"model":"~anthropic/claude-sonnet-latest"}