Commit A performs a substantial structural refactor: it removes the obsolete monolithic forum module, establishes the directory-based module as the single source of truth, introduces multiple focused submodules, updates exports, and relocates large amounts of functionality without changing behavior. This resolves module ambiguity and improves maintainability. Commit B is a very small UI consistency fix, changing a disabled paginator element from a <span> to an <a href="#">. While useful, its scope and impact are minor compared with the broad architectural cleanup in commit A.
constitution · epochs · watch · epoch 3
comparison
c_ebc883667d61 (tommy-mor) vs c_bd76779bd7ed (tommy-mor)
download prompt · raw event · cmp_8c16a9075a4076
council reasoning
Commit A performs a major structural refactor: removes a 1400+ line monolithic file, introduces a modular architecture (multiple new modules like feed, views, paginator, profile, etc.), and reorganizes responsibilities across the codebase. This significantly improves maintainability, clarity, and extensibility. Commit B is a trivial UI tweak (changing a disabled span to an anchor). The impact difference is substantial.
Side A performs a major refactor: removing a 1400+ line monolithic file and reorganizing the forum HTML into a well-structured module hierarchy (feed, views, paginator, profile, morph handlers, etc.), significantly improving maintainability and clarity. Side B is a trivial markup tweak (changing a disabled span to an anchor). The scale and impact of A vastly exceed B.
sides
A — c_ebc883667d61 (tommy-mor)
message
[21b57b50] fix(html): drop duplicate forum.rs; use forum/ as sole module root Removes the leftover monolithic file so mod forum resolves to forum/mod.rs without ambiguity. Keeps feed, views, and other split modules as the source. Made-with: Cursor
diff preview
diff --git a/server/src/html/forum.rs b/server/src/html/forum.rs
deleted file mode 100644
index 5ad8dfc84dd735d589432e2c613ff687a75f2e61..0000000000000000000000000000000000000000
--- a/server/src/html/forum.rs
+++ /dev/null
@@ -1,1405 +0,0 @@
-use axum::{
- extract::{Path, Query, State},
- http::{HeaderMap, StatusCode, Uri},
- response::{Html, IntoResponse},
-};
-use axum_extra::extract::cookie::CookieJar;
-use maud::{html, Markup};
-use serde::Deserialize;
-
-use crate::{
- api::optional_principal,
- canonical_path::{canonicalize_item, canonicalize_tag},
- events::ThreadCapability,
- form_template::template_json_compact,
- identity::parse_username,
- reducer::{scope_from_room_wire, ReducerState, ScopeId},
- state::AppState,
- timeago,
-};
-use serde_json::json;
-
-use super::js_string_literal;
-use super::ui_action::{HtmlUiAction, UI_RPC_FIELD};
-
-use super::{
- bc_segment, bc_threads, cli_panel, layout, now_ms, profile_href, recency_class,
- render_linkified_with_embeds_in_scope, theme_from_jar, theme_next_from_uri, JsBuilder,
-};
-
-#[derive(Clone)]
-struct ThreadRow {
- tag: String,
- subtitle: Option<String>,
- last_ts: i64,
- ingests: usize,
-}
-
-#[derive(Clone)]
-struct RoomMemberRow {
- username: String,
- capabilities: Vec<&'static str>,
-}
-
-/// URL helpers for public `/t/…` and private room threads `/r/{short}/{slug}/t/…`.
-#[derive(Clone)]
-pub struct ThreadNav {
- pub room_wire: String,
- scope: ScopeId,
- room_path: String,
- thread_path_prefix: String,
- garden_path_prefix: String,
-}
-
-impl ThreadNav {
- pub(crate) fn public() -> Self {
- Self {
- room_wire: "public".into(),
- scope: ScopeId::Public,
- room_path: "/t".into(),
- thread_path_prefix: "/t".into(),
- garden_path_prefix: "/~".into(),
- }
- }
-
- /// `room_id` wire form `shortid/slug`.
- pub(crate) fn from_room_id(room_id: &str) -> Option<Self> {
- let (short, slug) = room_id.split_once('/')?;
- if short.is_empty() || slug.is_empty() {
- return None;
- }
- Some(Self {
- room_wire: room_id.to_string(),
- scope: ScopeId::Room(room_id.to_string()),
- room_path: format!("/r/{short}/{slug}"),
- thread_path_prefix: format!("/r/{short}/{slug}/t"),
- garden_path_prefix: format!("/r/{short}/{slug}/~"),
- })
- }
-
- pub(crate) fn scope(&self) -> ScopeId {
- self.scope.clone()
- }
-
- pub(crate) fn room_url(&self) -> &str {
- &self.room_path
- }
-
- pub(crate) fn thread_url(&self, tag: &str) -> String {
- format!("{}/{}", self.thread_path_prefix, tag)
- }
-
- pub(crate) fn garden_root_url(&self) -> &str {
- &self.garden_path_prefix
- }
-
- pub(crate) fn garden_item_url(&self, item: &str) -> String {
- if let Some(tail) = crate::path_types::CanonicalItemUrl::parse(item)
- .and_then(|c| c.tilde_tail().map(str::to_owned))
- {
- format!("{}/{}", self.garden_path_prefix, tail)
- } else {
- format!("{}/{}", self.garden_path_prefix, canonicalize_item(item))
- }
- }
-
- fn thread_page_url(&self, tag: &str, offset: usize) -> String {
- let base = self.thread_url(tag);
- if offset == 0 {
- base
- } else {
- format!("{base}?offset={offset}")
- }
- }
-
- fn post_url(&self, tag: &str, idx: usize) -> String {
- format!("{}/{}/{}", self.thread_path_prefix, tag, idx)
- }
-}
-
-/// `POST /ui` + `__rpc__` from an inline link (`onclick`); same-origin credentials as other morph actions.
-fn thread_ui_fetch_onclick(rpc_compact_json: &str) -> String {
- format!(
- "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",
- js_string_literal(rpc_compact_json)
- )
-}
-
-fn thread_nav_for_ingest(ing: &crate::events::Ingest) -> Option<ThreadNav> {
- let room = ing.room_id.trim();
- if room.is_empty() || room == "public" {
- Some(ThreadNav::public())
- } else {
- ThreadNav::from_room_id(room)
- }
-}
-
-fn thread_post_index_in_scope(reduced: &ReducerState, ing: &crate::events::Ingest) -> Option<usize> {
- let scope = scope_from_room_wire(&ing.room_id);
- let tag = canonicalize_tag(&ing.thread_tag);
- reduced
- .ingests_by_scope_thread
- .get(&(scope, tag))
- .and_then(|q| q.iter().rev().position(|id| id == &ing.id))
-}
-
-fn post_header_meta(
- nav: &ThreadNav,
- tag: &str,
- post_idx: usize,
- principal: &str,
- ts: i64,
- now: i64,
-) -> Markup {
- let post_href = nav.post_url(tag, post_idx);
- let profile = profile_href(principal);
- let hover = timeago::rfc3339_utc(ts);
- let ago = timeago::timeago(now, ts);
- html! {
- div class="ingest-meta muted" title=(hover) {
- a href=(post_href) class="post-num" { "#" (post_idx) }
- " "
- a href=(profile) class="post-author" { "@" (principal) }
- " · "
- (ago)
- }
- }
-}
-
-fn post_header_row(
- nav: &ThreadNav,
- tag: &str,
- post_idx: usize,
- ing: &crate::events::Ingest,
- _viewer: Option<&str>,
- now: i64,
- show_delete: bool,
-) -> Markup {
- let meta = post_header_meta(nav, tag, post_idx, &ing.principal, ing.ts, now);
- html! {
- div class="ingest-header-row" {
- (meta)
- @if show_delete {
- form class="post-delete-form" method="POST" action="/ui" {
- input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::RedactPost { post_id: ing.id.clone() }).unwrap());
- button type="submit" class="post-delete-btn" { "delete" }
- }
- }
- }
- }
-}
-
-fn redacted_header_row(
- nav: &ThreadNav,
- tag: &str,
- post_idx: usize,
- ing: &crate::events::Ingest,
- now: i64,
- expanded: bool,
-) -> Markup {
- let meta = post_header_meta(nav, tag, post_idx, &ing.principal, ing.ts, now);
- let rpc_expand = template_json_compact(&json!({
- "action": "expand_redacted_post",
- "room": nav.room_wire,
- "thread_tag": tag,
- "post_index": post_idx,
- }))
- .unwrap();
- let rpc_collapse = template_json_compact(&json!({
- "action": "collapse_redacted_post",
- "room": nav.room_wire,
- "thread_tag": tag,
- "post_index": post_idx,
- }))
- .unwrap();
- let onclick_expand = thread_ui_fetch_onclick(&rpc_expand);
- let onclick_collapse = thread_ui_fetch_onclick(&rpc_collapse);
- html! {
- div class="ingest-header-row ingest-tombstone-row" {
- (meta)
- span class="post-tombstone-inline muted" {
- "deleted · "
- @if expanded {
- a href="#" class="hide-deleted-link"
- onclick=(onclick_collapse) {
- "[hide deleted content]"
- }
- } @else {
- a href="#" class="show-deleted-link"
- onclick=(onclick_expand) {
- "[show deleted content]"
- }
- }
- }
- }
- }
-}
-
-fn ingest_entry_markup(
- nav: &ThreadNav,
- tag: &str,
- post_idx: usize,
- ing: &crate::events::Ingest,
- viewer: Option<&str>,
- now: i64,
- reduced: &ReducerState,
-) -> Markup {
- let redacted = reduced.redacted_posts.contains(&ing.id);
- let show_delete = viewer == Some(ing.principal.as_str()) && !redacted;
- if redacted {
- html! {
- div class="ingest-entry ingest-redacted" data-ingest-id=(ing.id) {
- (redacted_header_row(nav, tag, post_idx, ing, now, false))
- }
- }
- } else {
- let truncated = ing.raw.len() > 2000;
- let display_body = if truncated { &ing.raw[..2000] } else { &ing.raw[..] };
- html! {
- div class="ingest-entry" data-ingest-id=(ing.id) {
- (post_header_row(nav, tag, post_idx, ing, viewer, now, show_delete))
- (render_linkified_with_embeds_in_scope(display_body, nav.garden_root_url()))
- @if truncated {
- @let rpc_full = template_json_compact(&json!({
- "action": "expand_post_full",
- "room": nav.room_wire,
- "thread_tag": tag,
- "post_index": post_idx,
- })).unwrap();
- @let onclick_full = thread_ui_fetch_onclick(&rpc_full);
- a href="#" class="show-full-link"
- onclick=(onclick_full) {
- "[show full post]"
- }
- }
- }
- }
- }
-}
-
-fn collect_thread_rows_for_scope(reduced: &ReducerState, scope: &ScopeId, now: i64) -> Vec<ThreadRow> {
- let _ = now;
- reduced
- .forum_threads
- .iter()
- .filter(|((s, _), _)| s == scope)
- .map(|((_, tag), thread)| {
- let ingests = reduced
- .ingests_by_scope_thread
- .get(&(scope.clone(), tag.clone()))
- .map(|q| q.len())
- .unwrap_or(0);
- ThreadRow {
- tag: tag.clone(),
- subtitle: None,
- last_ts: thread.last_activity_ts,
- ingests,
- }
- })
- .collect()
-}
-
-fn rooms_for_user(reduced: &ReducerState, username: &str) -> Vec<String> {
- let mut v: Vec<String> = reduced
- .grants
- .iter()
- .filter(|(rid, m)| reduced.rooms.contains(*rid) && m.contains_key(username))
- .map(|(rid, _)| rid.clone())
- .collect();
- v.sort();
- v
-}
-
-pub(crate) fn user_can_view_room(reduced: &ReducerState, room_id: &str, username: Option<&str>) -> bool {
- if !reduced.rooms.contains(room_id) {
- return false;
- }
- let Some(u) = username else {
- return false;
- };
- reduced.user_has_cap(room_id, u, ThreadCapability::View)
-}
-
-pub(crate) fn user_can_post_room(reduced: &ReducerState, room_id: &str, username: &str) -> bool {
- reduced.user_has_cap(room_id, username, ThreadCapability::Post)
-}
-
-fn capability_label(cap: ThreadCapability) -> &'static str {
- match cap {
- ThreadCapability::View => "view",
- ThreadCapability::Post => "post",
- ThreadCapability::Vote => "vote",
- ThreadCapability::AddItem => "add_item",
- ThreadCapability::Manage => "manage",
- }
-}
-
-fn room_members_for_room(reduced: &ReducerState, room_id: &str) -> Vec<RoomMemberRow> {
- let mut rows: Vec<RoomMemberRow> = reduced
- .grants
- .get(room_id)
- .into_iter()
- .flat_map(|members| members.iter())
- .map(|(username, caps)| {
- let mut ordered = Vec::new();
- for cap in [
- ThreadCapability::View,
- ThreadCapability::Post,
- ThreadCapability::Vote,
- ThreadCapability::AddItem,
- ThreadCapability::Manage,
- ] {
- if caps.contains(&cap) {
- ordered.push(capability_label(cap));
- }
- }
- RoomMemberRow {
- username: username.clone(),
- capabilities: ordered,
- }
- })
- .collect();
- rows.sort_by(|a, b| a.username.cmp(&b.username));
- rows
-}
-
-fn room_members_inner(members: &[RoomMemberRow]) -> Markup {
- html! {
- h3 { "members
… preview truncated; 77,260 characters omittedB — c_bd76779bd7ed (tommy-mor)
message
[22b97b71] type
diff preview
diff --git a/server/src/html/forum.rs b/server/src/html/forum.rs
index f1114562c8c0196f78a008028b46d1fda57479f9..493b7596a1d334b174ee9916571446d14507ec97 100644
--- a/server/src/html/forum.rs
+++ b/server/src/html/forum.rs
@@ -665,7 +665,7 @@ fn render_thread_paginator(nav: &ThreadNav, tag: &str, offset: usize, total: usi
@if let Some(o) = newer_offset {
a href=(nav.thread_page_url(tag, o)) class="post-nav-btn" { "newer →" }
} @else {
- span class="post-nav-btn disabled" { "newer →" }
+ a href="#" class="post-nav-btn disabled" { "newer →" }
}
@if !on_latest {
a href=(nav.thread_page_url(tag, latest_offset)) class="post-nav-btn" { "latest" }
Hardlinks — judgments / attempts / prompt
judgments
attempts
Prompt text is loaded only by the download route.