{"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[674964ef] refactor: Deref for href newtypes, CanonicalItemUrl through resolve_item\n\n- Implement Deref for GardenItemUrl, ForumThreadUrl, TildeOntologyPath\n- resolve_item returns CanonicalItemUrl; validate uses HashSet\n- compute_scope_rank_changes keys are CanonicalItemUrl; pair RPC uses Vec pool\n- pick_random_distinct_canonical; connectivity stats on &[CanonicalItemUrl]\n- Global rank unranked uses stored ids before GardenItemUrl mapping\n\nMade-with: Cursor\n\nSide B — unified diff (full patch):\ndiff --git a/server/src/api/helpers.rs b/server/src/api/helpers.rs\nindex 03b3e77911ccd662bec8635345dafe2593cf242e..1b291db83df7364a026f2e147e0a29a70a399371 100644\n--- a/server/src/api/helpers.rs\n+++ b/server/src/api/helpers.rs\n@@ -30,13 +30,13 @@ pub fn now_ms() -> i64 {\n t.as_millis() as i64\n }\n \n-/// Resolve an item path as a first-class canonical path.\n-pub fn resolve_item(item: &str) -> Result {\n+/// Resolve DSL/user input to a stored canonical item id.\n+pub fn resolve_item(item: &str) -> Result {\n let canonical = canonicalize_item(item);\n if canonical.is_empty() {\n return Err(format!(\"empty item path: `{}`\", item));\n }\n- Ok(canonical)\n+ Ok(CanonicalItemUrl(canonical))\n }\n \n pub fn parse_parent_specs(parent: Option<&String>) -> Vec {\n@@ -94,7 +94,7 @@ pub fn paginate_rankings(\n (out_components, out_unranked)\n }\n \n-pub fn pick_random_distinct(items: &[String]) -> Option<(String, String)> {\n+pub fn pick_random_distinct_canonical(items: &[CanonicalItemUrl]) -> Option<(CanonicalItemUrl, CanonicalItemUrl)> {\n use rand::seq::SliceRandom;\n if items.len() < 2 {\n return None;\n@@ -123,15 +123,12 @@ pub fn is_pair_voted(group: &crate::reducer::GroupState, a: &str, b: &str) -> bo\n group.voted_pairs.contains(&(i, j))\n }\n \n-pub fn compute_connectivity_stats(group: &crate::reducer::GroupState, pool: &[String]) -> ConnectivityStats {\n+pub fn compute_connectivity_stats(group: &crate::reducer::GroupState, pool: &[CanonicalItemUrl]) -> ConnectivityStats {\n let n = pool.len();\n \n let global_idxs: Vec> = pool\n .iter()\n- .map(|it| {\n- let key = CanonicalItemUrl(it.clone());\n- group.item_to_idx.get(&key).copied()\n- })\n+ .map(|it| group.item_to_idx.get(it).copied())\n .collect();\n let present: Vec = global_idxs.iter().filter_map(|x| *x).collect();\n \ndiff --git a/server/src/api/mod.rs b/server/src/api/mod.rs\nindex cf22cb0129366c3aed031bc86f3197a4321cb806..a10ce662105cff8fad949c6b83f7035ce79bed18 100644\n--- a/server/src/api/mod.rs\n+++ b/server/src/api/mod.rs\n@@ -24,7 +24,7 @@ pub use auth::{\n \n pub use helpers::{\n api_error, compute_connectivity_stats, is_pair_voted, now_ms, paginate_rankings,\n- parse_parent_specs, pick_random_distinct, resolve_item, sha256_hex, vote_touches_path,\n+ parse_parent_specs, pick_random_distinct_canonical, resolve_item, sha256_hex, vote_touches_path,\n };\n \n pub use rpc::handle_rpc_batch;\ndiff --git a/server/src/api/rpc.rs b/server/src/api/rpc.rs\nindex 5f7d50188f1381267402f2e57e671234ef5db2fd..de0955d0887d32740e1fd18365205c5bdb53c247 100644\n--- a/server/src/api/rpc.rs\n+++ b/server/src/api/rpc.rs\n@@ -29,7 +29,7 @@ use crate::{\n use super::auth::verify_bearer_principal;\n use super::helpers::{\n compute_connectivity_stats, is_pair_voted, now_ms, paginate_rankings, parse_parent_specs,\n- pick_random_distinct, resolve_item, vote_touches_path,\n+ pick_random_distinct_canonical, resolve_item, vote_touches_path,\n };\n use super::validate::{normalize_room_and_thread, validate_ingest_document};\n \n@@ -146,21 +146,21 @@ fn authorize_room_read(reduced: &ReducerState, headers: &HeaderMap, room: &str)\n }\n \n fn compute_scope_rank_changes(\n- parent: &str,\n+ parent: &CanonicalItemUrl,\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+ fn build_positions(rankings: &crate::scope_rank::ChildrenRankings) -> HashMap> {\n let mut map = HashMap::new();\n for comp in &rankings.component_rankings {\n let total = comp.ranked.len();\n for (i, item) in comp.ranked.iter().enumerate() {\n- map.insert(item.item.as_str().to_string(), Some(RankPosition { rank: i + 1, of: total }));\n+ map.insert(item.item.clone(), Some(RankPosition { rank: i + 1, of: total }));\n }\n }\n for item in &rankings.unranked_items {\n- map.insert(item.as_str().to_string(), None);\n+ map.insert(item.clone(), None);\n }\n map\n }\n@@ -168,7 +168,7 @@ fn compute_scope_rank_changes(\n let before_pos = build_positions(before);\n let after_pos = build_positions(after);\n \n- let all_items: std::collections::BTreeSet = before_pos.keys().cloned()\n+ let all_items: std::collections::BTreeSet = before_pos.keys().cloned()\n .chain(after_pos.keys().cloned())\n .collect();\n \n@@ -184,7 +184,7 @@ fn compute_scope_rank_changes(\n };\n if changed {\n changes.push(RankChange {\n- item: GardenItemUrl::from_storage_str(&item, room_wire),\n+ item: GardenItemUrl::from_stored(&item, room_wire),\n before: b,\n after: a,\n });\n@@ -203,11 +203,7 @@ fn compute_scope_rank_changes(\n });\n \n Some(ScopeRankChanges {\n- parent: if parent.is_empty() {\n- \"/\".to_string()\n- } else {\n- GardenItemUrl::from_storage_str(parent, room_wire).into_inner()\n- },\n+ parent: GardenItemUrl::from_stored(parent, room_wire).into_inner(),\n changes,\n })\n }\n@@ -473,8 +469,8 @@ async fn rpc_post(\n for s in &v.doc.statements {\n if let dsl::Stmt::Vote { item1, item2, .. } = s {\n if let (Ok(a), Ok(b)) = (resolve_item(item1), resolve_item(item2)) {\n- if let Some(p) = CanonicalItemUrl::parse(&a).and_then(|c| c.parent()) { parents.insert(p); }\n- if let Some(p) = CanonicalItemUrl::parse(&b).and_then(|c| c.parent()) { parents.insert(p); }\n+ if let Some(p) = a.parent() { parents.insert(p); }\n+ if let Some(p) = b.parent() { parents.insert(p); }\n }\n }\n }\n@@ -525,7 +521,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, &room_key)\n+ compute_scope_rank_changes(p, before, &after, &room_key)\n })\n .collect();\n if v.is_empty() { None } else { Some(v) }\n@@ -638,8 +634,8 @@ async fn rpc_check(\n for s in &v.doc.statements {\n if let dsl::Stmt::Vote { item1, item2, .. } = s {\n if let (Ok(a), Ok(b)) = (resolve_item(item1), resolve_item(item2)) {\n- if let Some(p) = CanonicalItemUrl::parse(&a).and_then(|c| c.parent()) { parents.insert(p); }\n- if let Some(p) = CanonicalItemUrl::parse(&b).and_then(|c| c.parent()) { parents.insert(p); }\n+ if let Some(p) = a.parent() { parents.insert(p); }\n+ if let Some(p) = b.parent() { parents.insert(p); }\n }\n }\n }\n@@ -961,7 +957,7 @@ fn rpc_search(reduced: &ReducerState, q: &str, limit: usize, principal: Option<&\n async fn rpc_get_pair(state: &AppState, room: String, parent_path: String) -> Result {\n let scope = scope_from_room_wire(&room);\n let reduced_arc = state.reduced.clone();\n- let pool: Vec = {\n+ let pool: Vec = {\n let reduced = reduced_arc.read().await;\n let content = content_for_room(&reduced, &room);\n let tmp = if parent_path.trim().is_empty() {\n@@ -970,12 +966,11 @@ async fn rpc_get_pair(state: &AppState, room: String, parent_path: String) -> Re\n Some(parent_path.clone())\n };\n let specs = parse_parent_specs(tmp.as_ref());\n- let raw_pool: Vec = if specs.is_empty() {\n+ if specs.is_empty() {\n content.ranking_group.idx_to_item.clone()\n } else {\n crate::scope_rank::resolve_scope(content, &specs)\n- };\n- raw_pool.into_iter().map(|it| it.0).collect()\n+ }\n };\n if pool.len() < 2 {\n return Err((\n@@ -983,31 +978,30 @@ async fn rpc_get_pair(state: &AppState, room: String, parent_path: String) -> Re\n Some(\"add items via ingest\".into()),\n ));\n }\n- let selected: Option<(String, String)> = {\n+ let selected: Option<(CanonicalItemUrl, CanonicalItemUrl)> = {\n let mut reduced = reduced_arc.write().await;\n let content = reduced.content.entry(scope.clone()).or_default();\n let group = &mut content.ranking_group;\n if group.idx_to_item.is_empty() {\n- pick_random_distinct(&pool)\n+ pick_random_distinct_canonical(&pool)\n } else {\n let mut rng = rand::thread_rng();\n- let idxs: Vec = pool.iter()\n- .filter_map(|it| {\n- let key = CanonicalItemUrl(it.clone());\n- group.item_to_idx.get(&key).copied()\n- })\n+ let idxs: Vec = pool\n+ .iter()\n+ .filter_map(|it| group.item_to_idx.get(it).copied())\n .collect();\n let ranked = ranked_items_subset(group, &idxs, 10000, 1e-8);\n- let ranked_set: HashSet = ranked.iter().map(|r| r.item.as_str().to_string()).collect();\n- let unsorted: Vec = pool.iter()\n+ let ranked_set: HashSet = ranked.iter().map(|r| r.item.clone()).collect();\n+ let unsorted: Vec = pool\n+ .iter()\n .filter(|it| !ranked_set.contains(*it))\n .cloned()\n .collect();\n- let mut pick: Option<(String, String)> = None;\n+ let mut pick: Option<(CanonicalItemUrl, CanonicalItemUrl)> = None;\n if !unsorted.is_empty() {\n if let Some(left) = unsorted.choose(&mut rng).cloned() {\n- let mut candidates: Vec = if !ranked.is_empty() {\n- ranked.iter().map(|r| r.item.as_str().to_string()).collect()\n+ let mut candidates: Vec = if !ranked.is_empty() {\n+ ranked.iter().map(|r| r.item.clone()).collect()\n } else {\n pool.clone()\n };\n@@ -1021,21 +1015,21 @@ async fn rpc_get_pair(state: &AppState, room: String, parent_path: String) -> Re\n let a = ranked[i].item.as_str();\n let b = ranked[i + 1].item.as_str();\n if a != b && !is_pair_voted(group, a, b) {\n- pick = Some((a.to_string(), b.to_string()));\n+ pick = Some((ranked[i].item.clone(), ranked[i + 1].item.clone()));\n break;\n }\n }\n if pick.is_none() {\n for _ in 0..64 {\n let (Some(a), Some(b)) = (pool.choose(&mut rng).cloned(), pool.choose(&mut rng).cloned()) else { break; };\n- if a != b && !is_pair_voted(group, &a, &b) {\n+ if a != b && !is_pair_voted(group, a.as_str(), b.as_str()) {\n pick = Some((a, b));\n break;\n }\n }\n }\n }\n- pick.or_else(|| pick_random_distinct(&pool))\n+ pick.or_else(|| pick_random_distinct_canonical(&pool))\n }\n };\n let Some((left, right)) = selected else {\n@@ -1043,8 +1037,8 @@ async fn rpc_get_pair(state: &AppState, room: String, parent_path: String) -> Re\n };\n let reduced = reduced_arc.read().await;\n let content = content_for_room(&reduced, &room);\n- let left_key = CanonicalItemUrl(left.clone());\n- let right_key = CanonicalItemUrl(right.clone());\n+ let left_key = left.clone();\n+ let right_key = right.clone();\n let lb = content.item_bodies.get(&left_key).cloned();\n let rb = content.item_bodies.get(&right_key).cloned();\n let th: Vec = content\n@@ -1058,8 +1052,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: GardenItemUrl::from_storage_str(&left, &room),\n- right: GardenItemUrl::from_storage_str(&right, &room),\n+ left: GardenItemUrl::from_stored(&left, &room),\n+ right: GardenItemUrl::from_stored(&right, &room),\n left_body: lb,\n right_body: rb,\n threads: th,\n@@ -1554,7 +1548,7 @@ pub async fn handle_rpc_batch(\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 {\n- item: GardenItemUrl::from_storage_str(r.item.as_str(), &room),\n+ item: GardenItemUrl::from_stored(&r.item, &room),\n score: r.score,\n percent: pct,\n });\n@@ -1562,11 +1556,11 @@ pub async fn handle_rpc_batch(\n }\n \n let ranked_total = ranked.len();\n- let mut unranked: Vec = content\n+ let mut unranked: Vec = content\n .items\n .iter()\n .filter(|it| !group.item_to_idx.contains_key(*it))\n- .map(|it| it.as_str().to_string())\n+ .cloned()\n .collect();\n unranked.sort();\n let unranked_total = unranked.len();\n@@ -1574,7 +1568,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: GardenItemUrl::from_storage_str(&it, &room),\n+ item: GardenItemUrl::from_stored(&it, &room),\n score: 0.0,\n percent: want_percent.then_some(0.0),\n }))\n@@ -1722,7 +1716,7 @@ pub async fn handle_rpc_batch(\n .filter(|p| !parents.contains(p.as_str()))\n .map(|p| GardenItemUrl::from_stored(p, &room))\n .collect();\n- paths.sort_by(|a, b| a.as_str().cmp(b.as_str()));\n+ paths.sort();\n line_ok(RpcResult::Leaves(LeavesResponse { paths }))\n }\n },\ndiff --git a/server/src/api/validate.rs b/server/src/api/validate.rs\nindex a51c783ee9785569b5a44c0b1572471fe00d174b..3c7aa80fd485cf247231fe5c5c7e6fea62f22534 100644\n--- a/server/src/api/validate.rs\n+++ b/server/src/api/validate.rs\n@@ -52,7 +52,7 @@ pub fn validate_ingest_document(\n };\n \n let ts = super::helpers::now_ms();\n- let mut defined_in_doc: HashSet = HashSet::new();\n+ let mut defined_in_doc: HashSet = HashSet::new();\n \n for s in &doc.statements {\n match s {\n@@ -66,14 +66,14 @@ pub fn validate_ingest_document(\n let Some(body_text) = body else {\n return Err((\n StatusCode::BAD_REQUEST,\n- format!(\"item missing body: {}\", GardenItemUrl::from_storage_str(&item, room_wire)),\n+ format!(\"item missing body: {}\", GardenItemUrl::from_stored(&item, room_wire)),\n Some(\"items must be declared with bodies, e.g. `~/path/item { ... }`\".to_string()),\n ));\n };\n if body_text.trim().is_empty() {\n return Err((\n StatusCode::BAD_REQUEST,\n- format!(\"item body is empty: {}\", GardenItemUrl::from_storage_str(&item, room_wire)),\n+ format!(\"item body is empty: {}\", GardenItemUrl::from_stored(&item, room_wire)),\n Some(\"write at least one sentence inside `{ ... }`\".to_string()),\n ));\n }\n@@ -102,11 +102,8 @@ pub fn validate_ingest_document(\n };\n let missing: Vec = [&a, &b]\n .into_iter()\n- .filter(|it| {\n- let key = CanonicalItemUrl((*it).clone());\n- !defined_in_doc.contains(*it) && !item_exists(&key)\n- })\n- .map(|it| GardenItemUrl::from_storage_str(it, room_wire).into_inner())\n+ .filter(|it| !defined_in_doc.contains(*it) && !item_exists(it))\n+ .map(|it| GardenItemUrl::from_stored(it, room_wire).into_inner())\n .collect();\n if !missing.is_empty() {\n return Err((\n@@ -120,11 +117,8 @@ pub fn validate_ingest_document(\n }\n let missing_body: Vec = [&a, &b]\n .into_iter()\n- .filter(|it| {\n- let key = CanonicalItemUrl((*it).clone());\n- !defined_in_doc.contains(*it) && !body_exists(&key)\n- })\n- .map(|it| GardenItemUrl::from_storage_str(it, room_wire).into_inner())\n+ .filter(|it| !defined_in_doc.contains(*it) && !body_exists(it))\n+ .map(|it| GardenItemUrl::from_stored(it, room_wire).into_inner())\n .collect();\n if !missing_body.is_empty() {\n return Err((\ndiff --git a/server/src/html/editor.rs b/server/src/html/editor.rs\nindex ecdd226b1b17d5f11d1b79f99add5759ef918281..26d648d7c8d6e5d53ce5ed7a051b44856fca2fcf 100644\n--- a/server/src/html/editor.rs\n+++ b/server/src/html/editor.rs\n@@ -130,8 +130,8 @@ pub async fn editor_check(\n for s in &v.doc.statements {\n if let crate::dsl::Stmt::Vote { item1, item2, .. } = s {\n if let (Ok(a), Ok(b)) = (resolve_item(item1), resolve_item(item2)) {\n- if let Some(p) = crate::path_types::CanonicalItemUrl::parse(&a).and_then(|c| c.parent()) { parents.insert(p); }\n- if let Some(p) = crate::path_types::CanonicalItemUrl::parse(&b).and_then(|c| c.parent()) { parents.insert(p); }\n+ if let Some(p) = a.parent() { parents.insert(p); }\n+ if let Some(p) = b.parent() { parents.insert(p); }\n }\n }\n }\ndiff --git a/types/src/paths.rs b/types/src/paths.rs\nindex 2950a7502255927583fbacdfd2adb700f0b0c221..839684dfa0ecdd6c2572e2d8132ecee4d5c41bf8 100644\n--- a/types/src/paths.rs\n+++ b/types/src/paths.rs\n@@ -3,6 +3,7 @@\n \n use std::borrow::Borrow;\n use std::fmt;\n+use std::ops::Deref;\n \n use serde::{Deserialize, Serialize};\n \n@@ -319,6 +320,14 @@ impl fmt::Display for GardenItemUrl {\n }\n }\n \n+impl Deref for GardenItemUrl {\n+ type Target = str;\n+\n+ fn deref(&self) -> &Self::Target {\n+ &self.0\n+ }\n+}\n+\n fn garden_href_string(item: &str, room_wire: &str) -> String {\n let room = room_wire.trim();\n if room.is_empty() || room == \"public\" {\n@@ -386,6 +395,14 @@ impl fmt::Display for ForumThreadUrl {\n }\n }\n \n+impl Deref for ForumThreadUrl {\n+ type Target = str;\n+\n+ fn deref(&self) -> &Self::Target {\n+ &self.0\n+ }\n+}\n+\n /// `~/a/b` style path for list UIs (paths index `path` field).\n #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]\n #[serde(transparent)]\n@@ -412,6 +429,14 @@ impl fmt::Display for TildeOntologyPath {\n }\n }\n \n+impl Deref for TildeOntologyPath {\n+ type Target = str;\n+\n+ fn deref(&self) -> &Self::Target {\n+ &self.0\n+ }\n+}\n+\n #[cfg(test)]\n mod tests {\n use super::*;\n@@ -452,6 +477,13 @@ mod tests {\n assert_eq!(c.tilde_segments(), Vec::<&str>::new());\n }\n \n+ #[test]\n+ fn garden_item_url_deref_to_str() {\n+ let g = GardenItemUrl::from_storage_str(\"https://slug.social/~/x\", \"public\");\n+ let s: &str = &*g;\n+ assert_eq!(s, \"https://slug.social/~/x\");\n+ }\n+\n #[test]\n fn garden_public_passthrough_https() {\n let u = \"https://slug.social/~/a/b\";\n","role":"user"}],"model":"~x-ai/grok-latest"}