{"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[7bb7145d] url stuff\n\nSide B — unified diff (full patch):\ndiff --git a/AGENTS.md b/AGENTS.md\nindex e60b9ba6012593361ef10e8fdd9439cd9932e09b..babb889d6fbfb1fa7176c9e6b7544ae17b61dd2e 100644\n--- a/AGENTS.md\n+++ b/AGENTS.md\n@@ -58,4 +58,4 @@ Use **tmux** for `cargo run --package sorter2-server` (dev server). Rebuild afte\n \n - First `cargo test` / `cargo build --release` is slow; Clojure smoke test always does a release build.\n - `legacy/` and `ideas/` are not part of the workspace build.\n-- **ItemId** for web URLs is a canonical full URL (`https://reddit.com/r/rust`). Rules live in [`server/src/url_rules/`](server/src/url_rules/) (composable Rust, not a config DSL). After changing canonicalization rules, rebuild the projection: `cargo run --package sorter2-server -- replay-index`.\n+- **ItemId** for web URLs is a canonical full URL (`https://reddit.com/r/rust`). Rules live in [`server/src/url_rules/graph.rs`](server/src/url_rules/graph.rs): a semantic graph (DFA on host + path, query params in `Context`) with a generic internet fallback for unknown sites. After changing rules, rebuild the projection: `cargo run --package sorter2-server -- replay-index`.\ndiff --git a/server/src/url_rules/engine.rs b/server/src/url_rules/engine.rs\ndeleted file mode 100644\nindex e29b6b48c08deb7bffe031b1e542b1e25a7bef15..0000000000000000000000000000000000000000\n--- a/server/src/url_rules/engine.rs\n+++ /dev/null\n@@ -1,187 +0,0 @@\n-//! Composable URL normalization primitives.\n-\n-use std::collections::HashMap;\n-\n-use url::Url;\n-\n-/// Mutable URL view used by rule combinators before serializing to a canonical string.\n-#[derive(Debug, Clone)]\n-pub struct ParsedUrl {\n- pub scheme: String,\n- pub host: String,\n- pub path_segments: Vec,\n- pub query: HashMap,\n- pub fragment: Option,\n-}\n-\n-impl ParsedUrl {\n- pub fn parse(raw: &str) -> Option {\n- let trimmed = raw.trim();\n- if trimmed.is_empty() {\n- return None;\n- }\n-\n- let with_scheme = if trimmed.contains(\"://\") {\n- trimmed.to_string()\n- } else if trimmed.starts_with(\"r/\") || trimmed.starts_with(\"/r/\") {\n- let rest = trimmed.trim_start_matches('/').trim_start_matches(\"r/\");\n- format!(\"https://reddit.com/r/{rest}\")\n- } else if trimmed.contains('.') && !trimmed.starts_with('/') {\n- format!(\"https://{trimmed}\")\n- } else {\n- trimmed.to_string()\n- };\n-\n- let url = Url::parse(&with_scheme).ok()?;\n- let host = url.host_str()?.to_string();\n- let path_segments: Vec = url\n- .path_segments()\n- .map(|segs| segs.filter(|s| !s.is_empty()).map(str::to_string).collect())\n- .unwrap_or_default();\n-\n- let mut query = HashMap::new();\n- for (k, v) in url.query_pairs() {\n- query.insert(k.into_owned(), v.into_owned());\n- }\n-\n- Some(Self {\n- scheme: url.scheme().to_string(),\n- path_segments,\n- query,\n- fragment: url.fragment().map(str::to_string),\n- host,\n- })\n- }\n-\n- pub fn with_path_segments(&self, segments: &[String]) -> Self {\n- let mut u = self.clone();\n- u.path_segments = segments.to_vec();\n- u\n- }\n-\n- pub fn to_url(&self) -> Option {\n- let mut url = if self.path_segments.is_empty() {\n- Url::parse(&format!(\"{}://{}\", self.scheme, self.host)).ok()?\n- } else {\n- let path = format!(\"/{}\", self.path_segments.join(\"/\"));\n- Url::parse(&format!(\"{}://{}{}\", self.scheme, self.host, path)).ok()?\n- };\n- if !self.query.is_empty() {\n- let mut pairs: Vec<_> = self.query.iter().collect();\n- pairs.sort_by(|a, b| a.0.cmp(b.0));\n- url.query_pairs_mut().clear();\n- for (k, v) in pairs {\n- url.query_pairs_mut().append_pair(k, v);\n- }\n- }\n- if let Some(ref frag) = self.fragment {\n- url.set_fragment(Some(frag));\n- }\n- Some(url)\n- }\n-\n- pub fn canonical_string(&self) -> Option {\n- let url = self.to_url()?;\n- let mut s = url.to_string();\n- if self.path_segments.is_empty() {\n- s = s.trim_end_matches('/').to_string();\n- }\n- Some(s)\n- }\n-}\n-\n-pub fn force_https(u: &mut ParsedUrl) {\n- if u.scheme == \"http\" {\n- u.scheme = \"https\".to_string();\n- }\n-}\n-\n-pub fn drop_fragment(u: &mut ParsedUrl) {\n- u.fragment = None;\n-}\n-\n-pub fn strip_www(u: &mut ParsedUrl) {\n- if u.host.starts_with(\"www.\") {\n- u.host = u.host[4..].to_string();\n- }\n-}\n-\n-pub fn lowercase_host(u: &mut ParsedUrl) {\n- u.host = u.host.to_ascii_lowercase();\n-}\n-\n-pub fn lowercase_path(u: &mut ParsedUrl) {\n- for seg in &mut u.path_segments {\n- *seg = seg.to_ascii_lowercase();\n- }\n-}\n-\n-pub fn clear_query(u: &mut ParsedUrl) {\n- u.query.clear();\n-}\n-\n-pub fn keep_only_query(u: &mut ParsedUrl, keys: &[&str]) {\n- u.query\n- .retain(|k, _| keys.iter().any(|want| want == &k.as_str()));\n-}\n-\n-pub fn strip_tracking_params(u: &mut ParsedUrl) {\n- u.query.retain(|k, _| {\n- let lower = k.to_ascii_lowercase();\n- !(lower.starts_with(\"utm_\")\n- || matches!(\n- lower.as_str(),\n- \"fbclid\" | \"gclid\" | \"ref\" | \"ref_src\" | \"ref_source\" | \"mc_cid\" | \"mc_eid\"\n- ))\n- });\n-}\n-\n-pub fn truncate_after_segment(u: &mut ParsedUrl, name: &str, keep: usize) {\n- if let Some(i) = u.path_segments.iter().position(|s| s == name) {\n- let end = (i + 1 + keep).min(u.path_segments.len());\n- u.path_segments.truncate(end);\n- }\n-}\n-\n-pub fn drop_listing_suffix(u: &mut ParsedUrl, suffixes: &[&str]) {\n- if u.path_segments.len() >= 3 && u.path_segments.first().map(String::as_str) == Some(\"r\") {\n- if let Some(last) = u.path_segments.last() {\n- if suffixes.iter().any(|s| *s == last.as_str()) {\n- u.path_segments.pop();\n- }\n- }\n- }\n-}\n-\n-pub fn normalize_reddit_host(u: &mut ParsedUrl) {\n- if matches!(\n- u.host.as_str(),\n- \"old.reddit.com\" | \"new.reddit.com\" | \"www.reddit.com\"\n- ) {\n- u.host = \"reddit.com\".to_string();\n- }\n-}\n-\n-pub fn rewrite_youtu_be(u: &mut ParsedUrl) {\n- if u.host == \"youtu.be\" && u.path_segments.len() == 1 {\n- let id = u.path_segments[0].clone();\n- u.host = \"youtube.com\".to_string();\n- u.path_segments = vec![\"watch\".to_string()];\n- u.query.insert(\"v\".to_string(), id);\n- }\n-}\n-\n-pub fn rewrite_youtube_shorts(u: &mut ParsedUrl) {\n- if u.host == \"youtube.com\" && u.path_segments.first().map(String::as_str) == Some(\"shorts\") {\n- if let Some(id) = u.path_segments.get(1).cloned() {\n- u.path_segments = vec![\"watch\".to_string()];\n- u.query.insert(\"v\".to_string(), id);\n- }\n- }\n-}\n-\n-pub fn normalize_youtube_host(u: &mut ParsedUrl) {\n- if matches!(u.host.as_str(), \"m.youtube.com\" | \"www.youtube.com\") {\n- u.host = \"youtube.com\".to_string();\n- }\n-}\ndiff --git a/server/src/url_rules/mod.rs b/server/src/url_rules/mod.rs\nindex 03d53bd3e82d704a01ba3fd8dd02b7d31422c0de..9e1445346ce77a49dd6a7e7713bf9c57aef353cc 100644\n--- a/server/src/url_rules/mod.rs\n+++ b/server/src/url_rules/mod.rs\n@@ -1,8 +1,12 @@\n-//! URL canonicalization and hierarchy rules for [`crate::path_types::ItemId`].\n+//! URL canonicalization and hierarchy via a semantic graph (DFA + generic fallback).\n \n-mod engine;\n+mod graph;\n+mod parse;\n mod registry;\n \n+#[cfg(test)]\n+mod registry_tests;\n+\n pub use registry::{\n canonicalize_raw, looks_like_url, navigable_breadcrumbs, parent_url, resolve_id, CanonicalResult,\n };\ndiff --git a/server/src/url_rules/registry.rs b/server/src/url_rules/registry.rs\nindex 14514e9af8385fb2b9b2f35eb9ee14d453d4b97c..8e6c012ea1fc74b864307bdacdf5a0f5db5259fc 100644\n--- a/server/src/url_rules/registry.rs\n+++ b/server/src/url_rules/registry.rs\n@@ -1,12 +1,7 @@\n-//! Per-domain canonicalization and hierarchy rules.\n+//! Public API: canonical identity and hierarchy via the URL graph.\n \n-use std::collections::HashSet;\n-\n-use super::engine::{\n- clear_query, drop_fragment, drop_listing_suffix, force_https, keep_only_query, lowercase_host,\n- lowercase_path, normalize_reddit_host, normalize_youtube_host, rewrite_youtu_be,\n- rewrite_youtube_shorts, strip_tracking_params, strip_www, truncate_after_segment, ParsedUrl,\n-};\n+use super::graph::graph;\n+use super::parse::UrlParts;\n \n /// Result of canonicalizing a raw URL string.\n #[derive(Debug, Clone, PartialEq, Eq)]\n@@ -16,71 +11,16 @@ pub struct CanonicalResult {\n pub alias_of: Option,\n }\n \n-fn apply_global(u: &mut ParsedUrl) {\n- force_https(u);\n- drop_fragment(u);\n- strip_www(u);\n- lowercase_host(u);\n- strip_tracking_params(u);\n-}\n-\n-fn normalize_reddit(u: &mut ParsedUrl) {\n- normalize_reddit_host(u);\n- lowercase_path(u);\n- truncate_after_segment(u, \"comments\", 1);\n- drop_listing_suffix(u, &[\"hot\", \"top\", \"new\", \"rising\", \"controversial\"]);\n- clear_query(u);\n-}\n-\n-fn normalize_youtube(u: &mut ParsedUrl) {\n- rewrite_youtu_be(u);\n- normalize_youtube_host(u);\n- rewrite_youtube_shorts(u);\n- keep_only_query(u, &[\"v\", \"list\"]);\n-}\n-\n-fn normalize_default(_u: &mut ParsedUrl) {\n- // Global rules only.\n-}\n-\n-fn domain_key(host: &str) -> &'static str {\n- if host == \"reddit.com\" || host.ends_with(\".reddit.com\") {\n- \"reddit.com\"\n- } else if host == \"youtube.com\" || host == \"youtu.be\" {\n- \"youtube.com\"\n- } else {\n- \"default\"\n- }\n-}\n-\n-fn normalize_for_host(u: &mut ParsedUrl) {\n- apply_global(u);\n- match domain_key(&u.host) {\n- \"reddit.com\" => normalize_reddit(u),\n- \"youtube.com\" => normalize_youtube(u),\n- _ => normalize_default(u),\n- }\n-}\n-\n-/// Structural path segments that must not become standalone tree nodes when more path follows.\n-fn structural_trailing(host: &str) -> &'static [&'static str] {\n- match domain_key(host) {\n- \"reddit.com\" => &[\"comments\"],\n- _ => &[],\n- }\n-}\n-\n /// Canonicalize a raw URL. Returns `None` if the input is not URL-like.\n pub fn canonicalize_raw(raw: &str) -> Option {\n let trimmed = raw.trim();\n if trimmed.is_empty() {\n return None;\n }\n- let mut u = ParsedUrl::parse(trimmed)?;\n- let input_snapshot = u.canonical_string()?;\n- normalize_for_host(&mut u);\n- let canonical = u.canonical_string()?;\n- let alias_of = if input_snapshot != canonical {\n+ let parts = UrlParts::parse(trimmed)?;\n+ let g = graph();\n+ let canonical = g.resolve_canonical(&parts)?;\n+ let alias_of = if trimmed != canonical {\n Some(trimmed.to_string())\n } else {\n None\n@@ -98,35 +38,14 @@ pub fn resolve_id(raw: &str) -> Option {\n \n /// Navigable ancestor URLs from domain root up to and including `canonical` (full URLs).\n pub fn navigable_breadcrumbs(canonical: &str) -> Vec {\n- let Some(u) = ParsedUrl::parse(canonical) else {\n- return vec![canonical.to_string()];\n+ let parts = match UrlParts::parse(canonical) {\n+ Some(p) => p,\n+ None => return vec![canonical.to_string()],\n };\n- let structural: HashSet<&str> = structural_trailing(&u.host).iter().copied().collect();\n- let n = u.path_segments.len();\n- let mut out = Vec::new();\n-\n- // Domain root (no path segments).\n- if let Some(base) = u.with_path_segments(&[]).canonical_string() {\n- out.push(base);\n- }\n-\n- for i in 0..n {\n- let segs: Vec = u.path_segments[..=i].to_vec();\n- let is_last = i == n - 1;\n- let seg = u.path_segments[i].as_str();\n- if structural.contains(seg) && !is_last {\n- continue;\n- }\n- if let Some(url) = u.with_path_segments(&segs).canonical_string() {\n- if out.last() != Some(&url) {\n- out.push(url);\n- }\n- }\n- }\n- out\n+ graph().breadcrumbs(&parts)\n }\n \n-/// Immediate parent scope URL, or `None` for tree root / opaque single-segment ids.\n+/// Immediate parent scope URL, or `None` for tree root.\n pub fn parent_url(canonical: &str) -> Option {\n let crumbs = navigable_breadcrumbs(canonical);\n if crumbs.len() <= 1 {\n@@ -148,88 +67,3 @@ pub fn looks_like_url(raw: &str) -> bool {\n || t.starts_with(\"youtu.be/\")\n }\n \n-#[cfg(test)]\n-mod tests {\n- use super::*;\n-\n- #[test]\n- fn reddit_post_drops_slug_and_normalizes_host() {\n- let r = canonicalize_raw(\n- \"https://old.reddit.com/r/AmItheAsshole/comments/1trnvdl/aita_for_cancelling/\",\n- )\n- .unwrap();\n- assert_eq!(\n- r.canonical,\n- \"https://reddit.com/r/amitheasshole/comments/1trnvdl\"\n- );\n- }\n-\n- #[test]\n- fn reddit_strips_query_and_listing() {\n- assert_eq!(\n- canonicalize_raw(\"https://www.reddit.com/r/rust/?sort=top\")\n- .unwrap()\n- .canonical,\n- \"https://reddit.com/r/rust\"\n- );\n- assert_eq!(\n- canonicalize_raw(\"https://www.reddit.com/r/programming/hot\")\n- .unwrap()\n- .canonical,\n- \"https://reddit.com/r/programming\"\n- );\n- }\n-\n- #[test]\n- fn reddit_short_path() {\n- assert_eq!(\n- canonicalize_raw(\"r/rust\").unwrap().canonical,\n- \"https://reddit.com/r/rust\"\n- );\n- }\n-\n- #[test]\n- fn reddit_breadcrumbs_skip_phantom_comments() {\n- let post = \"https://reddit.com/r/aww/comments/1trnvdl\";\n- let crumbs = navigable_breadcrumbs(post);\n- assert!(!crumbs.iter().any(|c| c.ends_with(\"/comments\")));\n- assert_eq!(\n- crumbs.last().map(String::as_str),\n- Some(post)\n- );\n- assert!(crumbs.contains(&\"https://reddit.com/r/aww\".to_string()));\n- }\n-\n- #[test]\n- fn reddit_parent_of_post_is_subreddit() {\n- assert_eq!(\n- parent_url(\"https://reddit.com/r/aww/comments/1trnvdl\").as_deref(),\n- Some(\"https://reddit.com/r/aww\")\n- );\n- }\n-\n- #[test]\n- fn youtube_youtu_be_and_watch_same_canonical() {\n- let a = canonicalize_raw(\"https://youtu.be/dQw4w9WgXcQ\").unwrap().canonical;\n- let b = canonicalize_raw(\"https://www.youtube.com/watch?v=dQw4w9WgXcQ&t=10\").unwrap();\n- assert_eq!(a, b.canonical);\n- assert_eq!(a, \"https://youtube.com/watch?v=dQw4w9WgXcQ\");\n- }\n-\n- #[test]\n- fn legacy_schemeless_upgrades() {\n- assert_eq!(\n- canonicalize_raw(\"reddit.com/r/rust/comments/aaa/announcing_rust_199\")\n- .unwrap()\n- .canonical,\n- \"https://reddit.com/r/rust/comments/aaa\"\n- );\n- }\n-\n- #[test]\n- fn alias_recorded_when_input_differs() {\n- let r = canonicalize_raw(\"https://youtu.be/abc123\").unwrap();\n- assert_eq!(r.canonical, \"https://youtube.com/watch?v=abc123\");\n- assert!(r.alias_of.is_some());\n- }\n-}\n","role":"user"}],"model":"~anthropic/claude-sonnet-latest"}