You are a constitutional council ranking individual git commits for ownership allocation. Compare these two commits. Decide which contributed more lasting value to the project. Judge substance, not spectacle: - Prefer correct, lasting design and real bugfixes over churn, formatting, renames, or generated noise. - Prefer clarity and necessity over sheer line count. A small precise change can beat a large diffuse one. - Do not favor a side merely because its patch is longer or noisier. - Weight what the change does for the project, not the contributor's name. Return ONLY a JSON object: {"winner": "A" or "B", "ratio": "N:M", "explanation": "..."} The explanation must cite concrete differences in the patches (1-3 sentences). Side A — contributor: tommy-mor Side A — commit message: [c99adc26] refactor forum into files Side A — unified diff (full patch): diff --git a/bb.edn b/bb.edn index 4680e82d4227057d2eea6041dc5647beb759131d..ce0f6fcd45a67ead3295b90db2a301e9b304f3da 100644 --- a/bb.edn +++ b/bb.edn @@ -51,6 +51,11 @@ :requires ([test.walkthrough-fixture :as walkthrough-fixture]) :task (walkthrough-fixture/run-fixture)} + sample-fixture + {:doc "macOS: run `sample` on process(es) listening on the fixture TCP port (default 8080). Usage: bb sample-fixture [PORT] [DURATION_SEC] [OUT_DIR]" + :requires ([scripts.sample-fixture :as sample-fixture]) + :task (apply sample-fixture/-main *command-line-args*)} + perf {:doc "Performance test: concurrent HTTP requests to detect blocking I/O" :requires ([scripts.perf :as perf]) diff --git a/scripts/sample_fixture.bb b/scripts/sample_fixture.bb new file mode 100644 index 0000000000000000000000000000000000000000..ac2368623c5043ba6e027afef6b5b37d392767b0 --- /dev/null +++ b/scripts/sample_fixture.bb @@ -0,0 +1,70 @@ +(ns scripts.sample-fixture + "Find process(es) listening on the fixture port (default 8080) and run macOS `sample`." + (:require [babashka.fs :as fs] + [babashka.process :as p] + [clojure.string :as str])) + +(defn- usage [] + (println "Usage: bb sample-fixture [PORT] [DURATION_SEC] [OUT_DIR]") + (println "") + (println " Finds PIDs bound to TCP LISTEN on PORT (default 8080), then runs") + (println " `sample` for each PID. OUT_DIR defaults to the current directory.") + (println "") + (println " Example: bb sample-fixture") + (println " bb sample-fixture 8080 10") + (println " bb sample-fixture 8080 5 /tmp") + (println "") + (println " Requires macOS (the `sample` tool).")) + +(defn- parse-long* [s] + (try (Long/parseLong s) + (catch NumberFormatException _ nil))) + +(defn- listen-pids [port] + (let [spec (str "TCP:" port) + {:keys [out exit]} + @(p/process ["lsof" "-nP" (str "-i" spec) "-sTCP:LISTEN" "-t"] + {:out :string :err :string})] + (when (zero? exit) + (->> (str/split-lines out) + (map str/trim) + (remove str/blank?) + (distinct) + vec)))) + +(defn- sample-bin [] + (or (fs/which "sample") + (throw (ex-info "macOS `sample` not found on PATH" {})))) + +(defn- run-sample! [sample duration-sec pid out-file] + (println (str "sampling PID " pid " for " duration-sec "s → " out-file)) + (let [{:keys [exit err]} @(p/process [sample (str pid) (str duration-sec) "-file" out-file] + {:out :inherit :err :inherit})] + (when-not (zero? exit) + (binding [*out* *err*] + (println "sample failed:" err)) + (System/exit exit)))) + +(defn -main [& args] + (when (some #{"-h" "--help" "help"} args) + (usage) + (System/exit 0)) + (let [port (or (some-> (first args) parse-long*) 8080) + duration-sec (or (some-> (second args) parse-long*) 5) + out-dir (or (nth args 2 nil) ".") + pids (listen-pids port)] + (when (or (nil? pids) (empty? pids)) + (binding [*out* *err*] + (println (str "No process listening on TCP " port " (LISTEN). Is `bb fixture` running?"))) + (System/exit 1)) + (when-not (fs/exists? out-dir) + (binding [*out* *err*] + (println "Output directory does not exist:" out-dir)) + (System/exit 1)) + (let [sample (sample-bin) + ts (str (System/currentTimeMillis))] + (println (str "port " port " → PIDs " (str/join ", " pids))) + (doseq [pid pids] + (let [out-file (str (fs/path out-dir) "/slug-sample-" port "-" pid "-" ts ".txt")] + (run-sample! sample duration-sec pid (str out-file)))) + (println "done.")))) diff --git a/server/src/html/forum.rs b/server/src/html/forum.rs index a55fc1f79d03719eb74b216865b2c15199c48ea7..5ad8dfc84dd735d589432e2c613ff687a75f2e61 100644 --- a/server/src/html/forum.rs +++ b/server/src/html/forum.rs @@ -380,22 +380,6 @@ fn room_members_inner(members: &[RoomMemberRow]) -> Markup { } } -pub(crate) fn set_room_members_expanded_rpc(room_wire: &str, expanded: bool) -> String { - template_json_compact(&HtmlUiAction::SetRoomMembersExpanded { - room_wire: room_wire.to_string(), - expanded, - }) - .expect("static json") -} - -pub(crate) fn set_room_new_thread_compose_expanded_rpc(nav: &ThreadNav, expanded: bool) -> String { - template_json_compact(&HtmlUiAction::SetRoomNewThreadComposeExpanded { - room_wire: nav.room_wire.clone(), - expanded, - }) - .expect("static json") -} - /// Fragment for `#room-members-section` — expand/collapse is server-driven via `POST /ui`. pub(crate) fn room_members_section_markup( reduced: &ReducerState, @@ -406,13 +390,14 @@ pub(crate) fn room_members_section_markup( if members.is_empty() { return html! {}; } - let rpc_open = set_room_members_expanded_rpc(room_id, true); - let rpc_close = set_room_members_expanded_rpc(room_id, false); html! { div id="room-members-section" { @if members_expanded { form method="POST" action="/ui" { - input type="hidden" name=(UI_RPC_FIELD) value=(rpc_close); + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomMembersExpanded { + room_wire: room_id.to_string(), + expanded: false, + }).expect("static json")); button type="submit" class="form-toggle" aria-expanded="true" { "hide members & permissions" } @@ -422,7 +407,10 @@ pub(crate) fn room_members_section_markup( } } @else { form method="POST" action="/ui" { - input type="hidden" name=(UI_RPC_FIELD) value=(rpc_open); + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomMembersExpanded { + room_wire: room_id.to_string(), + expanded: true, + }).expect("static json")); button type="submit" class="form-toggle" aria-expanded="false" { "members & permissions" } @@ -514,28 +502,24 @@ fn compose_form(nav: &ThreadNav, thread_tag: &str, show: bool) -> Markup { if !show { return html! {}; } - let rpc_post = template_json_compact(&json!({ - "action": "post_ingest", - "room": nav.room_wire, - "thread_tag": thread_tag, - "text": {"$form": "text"}, - "error_target": "thread-compose-errors", - "form_id": "thread-compose-form", - })) - .unwrap(); - let rpc_check = template_json_compact(&json!({ - "action": "check_ingest", - "room": nav.room_wire, - "thread_tag": thread_tag, - "text": {"$form": "text"}, - "error_target": "thread-compose-errors", - "form_id": "thread-compose-form", - })) - .unwrap(); html! { section class="compose" id="thread-compose" { - form id="thread-compose-form" method="POST" action="/ui" data-check-action="/ui" data-check-rpc=(rpc_check) { - input type="hidden" name=(UI_RPC_FIELD) value=(rpc_post); + form id="thread-compose-form" method="POST" action="/ui" data-check-action="/ui" data-check-rpc=(template_json_compact(&json!({ + "action": "check_ingest", + "room": nav.room_wire, + "thread_tag": thread_tag, + "text": {"$form": "text"}, + "error_target": "thread-compose-errors", + "form_id": "thread-compose-form", + })).unwrap()) { + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&json!({ + "action": "post_ingest", + "room": nav.room_wire, + "thread_tag": thread_tag, + "text": {"$form": "text"}, + "error_target": "thread-compose-errors", + "form_id": "thread-compose-form", + })).unwrap()); textarea name="text" rows="5" cols="80" placeholder="prose or ~/items and votes…" {} p { button type="submit" { "post" } @@ -712,7 +696,7 @@ pub async fn home( p class="muted" { "dark = time-ordered · light = vote-ranked" } div class="thread-feed-toolbar" { form method="POST" action="/ui" { - input type="hidden" name=(UI_RPC_FIELD) value=(expand_public_new_thread_rpc_value()); + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::ExpandPublicNewThreadForm).expect("static json")); button type="submit" class="section-add-btn" { "+" } } } @@ -1002,14 +986,15 @@ fn new_thread_form_for_room(nav: &ThreadNav, show: bool, compose_expanded: bool) if !show { return html! {}; } - let rpc_open = set_room_new_thread_compose_expanded_rpc(nav, true); - let rpc_close = set_room_new_thread_compose_expanded_rpc(nav, false); // Single root for Idiomorph when morphing `#room-new-thread-ui-slot` (expanded has form + section). html! { div class="room-new-thread-slot-inner" { @if compose_expanded { form method="POST" action="/ui" { - input type="hidden" name=(UI_RPC_FIELD) value=(rpc_close); + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomNewThreadComposeExpanded { + room_wire: nav.room_wire.clone(), + expanded: false, + }).expect("static json")); button type="submit" class="form-toggle" aria-expanded="true" { "-" } @@ -1039,7 +1024,10 @@ fn new_thread_form_for_room(nav: &ThreadNav, show: bool, compose_expanded: bool) } } @else { form method="POST" action="/ui" { - input type="hidden" name=(UI_RPC_FIELD) value=(rpc_open); + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomNewThreadComposeExpanded { + room_wire: nav.room_wire.clone(), + expanded: true, + }).expect("static json")); button type="submit" class="form-toggle" aria-expanded="false" { "+" } @@ -1049,10 +1037,6 @@ fn new_thread_form_for_room(nav: &ThreadNav, show: bool, compose_expanded: bool) } } -pub(crate) fn expand_public_new_thread_rpc_value() -> String { - template_json_compact(&HtmlUiAction::ExpandPublicNewThreadForm).expect("static json") -} - pub(crate) fn login_to_post_hint_markup() -> Markup { html! { p class="muted" { "log in to post" } diff --git a/server/src/html/forum/access.rs b/server/src/html/forum/access.rs new file mode 100644 index 0000000000000000000000000000000000000000..f9f7139b63442a6ef3a927b77a72805f15feec3f --- /dev/null +++ b/server/src/html/forum/access.rs @@ -0,0 +1,16 @@ +use crate::events::ThreadCapability; +use crate::reducer::ReducerState; + +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) +} diff --git a/server/src/html/forum/ingest.rs b/server/src/html/forum/ingest.rs new file mode 100644 index 0000000000000000000000000000000000000000..c045046a005db4f8f4d1dc7ea74aaaba45e0f3f4 --- /dev/null +++ b/server/src/html/forum/ingest.rs @@ -0,0 +1,171 @@ +use crate::canonical_path::canonicalize_tag; +use crate::form_template::template_json_compact; +use crate::reducer::{scope_from_room_wire, ReducerState}; +use maud::{html, Markup}; +use serde_json::json; + +use crate::html::js_string_literal; +use crate::html::ui_action::{HtmlUiAction, UI_RPC_FIELD}; +use crate::html::{profile_href, render_linkified_with_embeds_in_scope, timeago}; + +use super::nav::ThreadNav; + +/// `POST /ui` + `__rpc__` from an inline link (`onclick`); same-origin credentials as other morph actions. +pub(super) 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) + ) +} + +pub(super) fn thread_nav_for_ingest(ing: &crate::events::Ingest) -> Option { + let room = ing.room_id.trim(); + if room.is_empty() || room == "public" { + Some(ThreadNav::public()) + } else { + ThreadNav::from_room_id(room) + } +} + +pub(super) fn thread_post_index_in_scope(reduced: &ReducerState, ing: &crate::events::Ingest) -> Option { + 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) + } + } +} + +pub(super) 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" } + } + } + } + } +} + +pub(super) 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]" + } + } + } + } + } +} + +pub(super) 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]" + } + } + } + } + } +} diff --git a/server/src/html/forum/nav.rs b/server/src/html/forum/nav.rs new file mode 100644 index 0000000000000000000000000000000000000000..f5d437f2b1c6a0b727f1540d83774ba4e440f0b1 --- /dev/null +++ b/server/src/html/forum/nav.rs @@ -0,0 +1,78 @@ +use crate::canonical_path::canonicalize_item; +use crate::reducer::ScopeId; + +/// 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 { + 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)) + } + } + + pub(crate) 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}") + } + } + + pub(crate) fn post_url(&self, tag: &str, idx: usize) -> String { + format!("{}/{}/{}", self.thread_path_prefix, tag, idx) + } +} diff --git a/server/src/html/forum/new_thread.rs b/server/src/html/forum/new_thread.rs new file mode 100644 index 0000000000000000000000000000000000000000..b2d24b8ab3ec7eee0edd16bed8ee6605e49bf408 --- /dev/null +++ b/server/src/html/forum/new_thread.rs @@ -0,0 +1,157 @@ +use crate::form_template::template_json_compact; +use crate::html::ui_action::{HtmlUiAction, UI_RPC_FIELD}; +use maud::{html, Markup}; +use serde_json::json; + +use super::nav::ThreadNav; + +struct NewThreadIds { + compose_section_id: &'static str, + errors_id: &'static str, + form_id: &'static str, + tag_input_id: &'static str, + text_input_id: Option<&'static str>, +} + +const PUBLIC_IDS: NewThreadIds = NewThreadIds { + compose_section_id: "public-new-thread-compose", + errors_id: "public-new-thread-errors", + form_id: "public-new-thread-form", + tag_input_id: "new-thread-tag", + text_input_id: Some("new-thread-text"), +}; + +const ROOM_IDS: NewThreadIds = NewThreadIds { + compose_section_id: "room-new-thread-compose", + errors_id: "room-new-thread-errors", + form_id: "room-new-thread-form", + tag_input_id: "room-new-tag", + text_input_id: None, +}; + +#[derive(Clone, Copy)] +enum NewThreadComposeKind { + /// Home page: no client-side check RPC; post template omits `error_target` / `form_id`. + Public, + /// Room page: `check_ingest` + error targets on post (matches thread compose). + Room, +} + +/// Shared `
` for creating a thread + first post. +fn new_thread_compose_section(room_wire: &str, ids: &NewThreadIds, kind: NewThreadComposeKind) -> Markup { + let client_check = matches!(kind, NewThreadComposeKind::Room); + let (tag_placeholder, text_placeholder, submit_label) = match kind { + NewThreadComposeKind::Public => ( + "thread-title-slug-here", + "Hello threadgoers!! Behold my new thread!", + "create thread / make first post", + ), + NewThreadComposeKind::Room => ( + "thread-topic-slug-here", + "First post body…", + "post", + ), + }; + + html! { + section class="compose" id=(ids.compose_section_id) { + div id=(ids.errors_id) {} + @if client_check { + form id=(ids.form_id) method="POST" action="/ui" data-check-action="/ui" data-check-rpc=(template_json_compact(&json!({ + "action": "check_ingest", + "room": room_wire, + "thread_tag": {"$form": "thread_tag"}, + "text": {"$form": "text"}, + "error_target": ids.errors_id, + "form_id": ids.form_id, + })).unwrap()) { + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&json!({ + "action": "post_ingest", + "room": room_wire, + "thread_tag": {"$form": "thread_tag"}, + "text": {"$form": "text"}, + "error_target": ids.errors_id, + "form_id": ids.form_id, + })).unwrap()); + input type="text" id=(ids.tag_input_id) name="thread_tag" pattern="[a-z0-9_\\-]{1,64}" required placeholder=(tag_placeholder); + @if let Some(tid) = ids.text_input_id { + textarea id=(tid) name="text" rows="4" placeholder=(text_placeholder) required {} + } @else { + textarea name="text" rows="4" placeholder=(text_placeholder) required {} + } + p { button type="submit" { (submit_label) } } + } + } @else { + form id=(ids.form_id) method="POST" action="/ui" { + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&json!({ + "action": "post_ingest", + "room": room_wire, + "thread_tag": {"$form": "thread_tag"}, + "text": {"$form": "text"}, + })).unwrap()); + input type="text" id=(ids.tag_input_id) name="thread_tag" pattern="[a-z0-9_\\-]{1,64}" placeholder=(tag_placeholder); + @if let Some(tid) = ids.text_input_id { + textarea id=(tid) name="text" rows="4" placeholder=(text_placeholder) {} + } @else { + textarea name="text" rows="4" placeholder=(text_placeholder) {} + } + p { button type="submit" { (submit_label) } } + } + } + } + } +} + +fn new_thread_form_public(show: bool) -> Markup { + if !show { + return html! {}; + } + new_thread_compose_section("public", &PUBLIC_IDS, NewThreadComposeKind::Public) +} + +fn new_thread_form_for_room(nav: &ThreadNav, show: bool, compose_expanded: bool) -> Markup { + if !show { + return html! {}; + } + // Single root for Idiomorph when morphing `#room-new-thread-ui-slot` (expanded has form + section). + html! { + div class="room-new-thread-slot-inner" { + @if compose_expanded { + form method="POST" action="/ui" { + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomNewThreadComposeExpanded { + room_wire: nav.room_wire.clone(), + expanded: false, + }).expect("static json")); + button type="submit" class="form-toggle" aria-expanded="true" { + "-" + } + } + (new_thread_compose_section(&nav.room_wire, &ROOM_IDS, NewThreadComposeKind::Room)) + } @else { + form method="POST" action="/ui" { + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomNewThreadComposeExpanded { + room_wire: nav.room_wire.clone(), + expanded: true, + }).expect("static json")); + button type="submit" class="form-toggle" aria-expanded="false" { + "+" + } + } + } + } + } +} + +pub(crate) fn login_to_post_hint_markup() -> Markup { + html! { + p class="muted" { "log in to post" } + } +} + +pub(crate) fn fragment_public_new_thread_form(show: bool) -> Markup { + new_thread_form_public(show) +} + +pub(crate) fn fragment_room_new_thread_form(nav: &ThreadNav, show: bool, compose_expanded: bool) -> Markup { + new_thread_form_for_room(nav, show, compose_expanded) +} diff --git a/server/src/html/forum/room_members.rs b/server/src/html/forum/room_members.rs new file mode 100644 index 0000000000000000000000000000000000000000..bc13d3eb8030f00799c90c47e689a876168f522c --- /dev/null +++ b/server/src/html/forum/room_members.rs @@ -0,0 +1,108 @@ +use crate::events::ThreadCapability; +use crate::form_template::template_json_compact; +use crate::reducer::ReducerState; +use maud::{html, Markup}; + +use crate::html::ui_action::{HtmlUiAction, UI_RPC_FIELD}; + +#[derive(Clone)] +pub(super) struct RoomMemberRow { + pub(super) username: String, + pub(super) capabilities: Vec<&'static str>, +} + +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 { + let mut rows: Vec = 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" } + ul class="room-members" { + @for member in members { + li { + span class="room-member-name" { "@" (member.username) } + span class="muted" { + " · " + (member.capabilities.join(", ")) + } + } + } + } + } +} + +/// Fragment for `#room-members-section` — expand/collapse is server-driven via `POST /ui`. +pub(crate) fn room_members_section_markup( + reduced: &ReducerState, + room_id: &str, + members_expanded: bool, +) -> Markup { + let members = room_members_for_room(reduced, room_id); + if members.is_empty() { + return html! {}; + } + html! { + div id="room-members-section" { + @if members_expanded { + form method="POST" action="/ui" { + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomMembersExpanded { + room_wire: room_id.to_string(), + expanded: false, + }).expect("static json")); + button type="submit" class="form-toggle" aria-expanded="true" { + "hide members & permissions" + } + } + section class="room-members-panel" { + (room_members_inner(&members)) + } + } @else { + form method="POST" action="/ui" { + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomMembersExpanded { + room_wire: room_id.to_string(), + expanded: true, + }).expect("static json")); + button type="submit" class="form-toggle" aria-expanded="false" { + "members & permissions" + } + } + } + } + } +} Side B — contributor: tommy-mor Side B — commit message: [cdeb4072] tree nixed Side B — unified diff (full patch): diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs index 82c5993fabfeaf2ea8b9034bccaef37924100264..9c5af9654c7010d2cdb100e4cf63ba63e77c8c57 100644 --- a/server/src/html/mod.rs +++ b/server/src/html/mod.rs @@ -12,7 +12,6 @@ mod editor; mod forum; mod garden; mod search; -mod tree; use breadcrumb_path::OntologyPath; pub use auth::{auth_complete_page, auth_signed_in_fragment, choose_username_error_fragment, choose_username_page}; @@ -20,7 +19,6 @@ pub use editor::{editor_check, editor_page}; pub use forum::{index, thread_feed_html, thread_post_expand, thread_post_view, thread_view}; pub use garden::{garden_index, ontology_path}; pub use search::{search_page, search_results_fragment}; -pub use tree::{tree_path, tree_root, tree_select, tree_toggle}; // Embed CSS files at compile time const THEME_DEFAULT_CSS: &str = include_str!("../../static/theme_default.css"); diff --git a/server/src/html/tree.rs b/server/src/html/tree.rs deleted file mode 100644 index 6aed7db08682f088df3d52d0358b8dc954e9e1df..0000000000000000000000000000000000000000 --- a/server/src/html/tree.rs +++ /dev/null @@ -1,819 +0,0 @@ -use axum::{ - extract::{Path, State}, - http::{header, StatusCode}, - response::{Html, IntoResponse, Response}, - Form, -}; -use axum::response::Redirect; -use axum_extra::extract::Query; -use base64::engine::general_purpose::URL_SAFE_NO_PAD; -use base64::Engine as _; -use maud::{html, Markup}; -use serde::{Deserialize, Serialize}; -use std::collections::BTreeSet; - -use crate::{ - canonical_path::canonicalize_item, - path_types::{CanonicalItemUrl, RelativePath}, - scope_rank::ChildrenRankings, - state::AppState, -}; - -// Convenience alias used throughout this module. -type CanonSet = BTreeSet; - -use super::{layout, render_linkified_with_embeds}; - -/// Query-state for the expandable tree UI. -#[derive(Debug, Clone, Default, Deserialize)] -pub struct TreeQuery { - /// Opaque state blob (base64url postcard). - #[serde(default)] - pub s: Option, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -struct TreeStateV1 { - v: u8, - #[serde(default)] - open: Vec, - #[serde(default)] - selected: Option, -} - -// Note: TreeStateV1/V2 intentionally use raw `String` / `Vec` because -// they are wire-format structs serialised with postcard. All semantic types -// (`CanonicalItemUrl`, `RelativePath`) are used in the in-memory -// `DecodedTreeState` and in every function that works with live data. - -#[derive(Debug, Clone, Serialize, Deserialize)] -enum SelectedRefV2 { - /// Index into the expanded open list. - I(u32), -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -struct TreeStateV2 { - v: u8, - /// Common prefix shared by open paths (and optionally selected), ending on a `/` boundary. - #[serde(default)] - base: String, - /// Each entry is a relative path suffix (joined with `base`). - #[serde(default)] - open_suffixes: Vec, - #[serde(default)] - selected: Option, -} - -#[derive(Debug, Clone)] -struct DecodedTreeState { - open: CanonSet, - selected: Option, -} - -fn common_base_boundary(paths: &[String]) -> String { - if paths.is_empty() { - return String::new(); - } - let mut prefix = paths[0].as_str(); - for p in &paths[1..] { - let mut i = 0usize; - let bytes_a = prefix.as_bytes(); - let bytes_b = p.as_bytes(); - let n = bytes_a.len().min(bytes_b.len()); - while i < n && bytes_a[i] == bytes_b[i] { - i += 1; - } - prefix = &prefix[..i]; - if prefix.is_empty() { - break; - } - } - // Snap to last '/' boundary (include the slash). - match prefix.rfind('/') { - None => String::new(), - Some(idx) => prefix[..=idx].to_string(), - } -} - -fn canon_root(root: &str) -> Option { - CanonicalItemUrl::parse(root) -} - -fn canon_to_relative(root: &CanonicalItemUrl, item: &str) -> Option { - // Only support ontology items under the same root. - let root_str = root.as_str(); - let item_can = canonicalize_item(item); - if item_can.is_empty() { - return None; - } - // Root must be ontology (`https://slug.social/~/...`) - root.tilde_tail()?; - if item_can == root_str { - return RelativePath::new(""); - } - let prefix = if root_str.ends_with('/') { - root_str.to_string() - } else { - format!("{}/", root_str) - }; - if !item_can.starts_with(&prefix) { - return None; - } - let suffix = &item_can[prefix.len()..]; - RelativePath::new(suffix) -} - -fn relative_to_canon(root: &CanonicalItemUrl, rel: &RelativePath) -> Option { - rel.join_under_ontology_root(root) -} - -fn encode_state_blob_v2( - root: &str, - open: &CanonSet, - selected: Option<&CanonicalItemUrl>, -) -> String { - let Some(root_can) = canon_root(root) else { - return String::new(); - }; - - // Convert to sorted relative paths (strings for wire encoding). - let mut rels: Vec = open - .iter() - .filter_map(|it| canon_to_relative(&root_can, it.as_str()).map(|r| r.0.clone())) - .collect(); - rels.sort(); - rels.dedup(); - - let sel_rel: Option = selected - .and_then(|s| canon_to_relative(&root_can, s.as_str())) - .map(|r| r.0.clone()); - - // In v2 we enforce: selected ∈ open. This allows selected to be encoded as an index only. - if let Some(sr) = &sel_rel { - rels.push(sr.clone()); - rels.sort(); - rels.dedup(); - } - - // base dedupe over open rels + selection (if present) - let mut base_inputs = rels.clone(); - if let Some(sr) = &sel_rel { - base_inputs.push(sr.clone()); - } - let base = common_base_boundary(&base_inputs); - - let open_suffixes: Vec = rels - .iter() - .map(|r| r.strip_prefix(&base).unwrap_or(r).to_string()) - .collect(); - - let selected_ref: Option = sel_rel.and_then(|full| { - rels.iter() - .position(|r| r == &full) - .map(|idx| SelectedRefV2::I(idx as u32)) - }); - - let st = TreeStateV2 { - v: 2, - base, - open_suffixes, - selected: selected_ref, - }; - let bytes = postcard::to_allocvec(&st).unwrap_or_default(); - URL_SAFE_NO_PAD.encode(bytes) -} - -fn decode_state_blob_any(root: &str, s: &str) -> Option { - let root_can = canon_root(root)?; - let bytes = URL_SAFE_NO_PAD.decode(s).ok()?; - // Try v2 first. - if let Ok(st2) = postcard::from_bytes::(&bytes) { - if st2.v == 2 { - let mut open: CanonSet = BTreeSet::new(); - for suf in st2.open_suffixes { - let full_rel = format!("{}{}", st2.base, suf); - if let Some(rp) = RelativePath::new(&full_rel) { - if let Some(c) = relative_to_canon(&root_can, &rp) { - open.insert(c); - } - } - } - let selected: Option = match st2.selected { - None => None, - Some(SelectedRefV2::I(i)) => { - let idx = i as usize; - // Index into the sorted open set (BTreeSet iteration is sorted). - open.iter().nth(idx).cloned() - } - // v2 always encodes selected as an index; no string fallback - }; - return Some(DecodedTreeState { open, selected }); - } - } - // Fallback v1 (stored canonical-ish strings). - let st1: TreeStateV1 = postcard::from_bytes(&bytes).ok()?; - if st1.v != 1 { - return None; - } - let open: CanonSet = st1 - .open - .into_iter() - .filter_map(|s| CanonicalItemUrl::parse(&canonicalize_item(&s))) - .collect(); - let selected = st1 - .selected - .as_ref() - .and_then(|s| CanonicalItemUrl::parse(&canonicalize_item(s))); - Some(DecodedTreeState { open, selected }) -} - -fn baseline_state_blob() -> String { - // Root doesn't affect empty state; V2 encodes open=[], selected=None. - // We still build it via V2 encoder for forward-compat. - encode_state_blob_v2("https://slug.social/~/", &CanonSet::new(), None) -} - -fn href_for(root: &str, open: &CanonSet, selected: Option<&CanonicalItemUrl>) -> String { - let blob = encode_state_blob_v2(root, open, selected); - let base = format!("/tree/{}", root.trim_start_matches("https://slug.social/~/")) - .trim_end_matches('/') - .to_string(); - format!("{base}?s={blob}") -} - -fn tree_root_from_path(path: Option<&str>) -> String { - // Interpret /tree and /tree/*path as `~/...` under slug.social. - // Empty path => "~/" - match path { - None => canonicalize_item("~/"), - Some(p) if p.trim().is_empty() => canonicalize_item("~/"), - Some(p) => canonicalize_item(&format!("~/{}", p.trim_start_matches('/'))), - } -} - -fn ranked_children_public( - reduced: &crate::reducer::ReducerState, - parent: &str, -) -> Vec { - // Reducer parent keys are derived from `item_parent_path`, which uses - // item_children uses "https://slug.social/~" (no trailing slash) as the root - // parent key. Use ontology_root() for the root case, or parse the given parent. - let parent_can = if parent.trim_end_matches('/') == "https://slug.social/~" || parent == "https://slug.social/~/" { - CanonicalItemUrl::ontology_root() - } else { - CanonicalItemUrl::parse(parent.trim_end_matches('/')) - .unwrap_or_else(CanonicalItemUrl::ontology_root) - }; - let rankings: ChildrenRankings = - crate::scope_rank::build_children_rankings(reduced.public(), &parent_can); - let mut out: Vec = Vec::new(); - let mut seen: std::collections::HashSet = std::collections::HashSet::new(); - - for comp in rankings.component_rankings { - for r in comp.ranked { - seen.insert(r.item.clone()); - out.push(r.item); - } - } - for it in rankings.unranked_items { - seen.insert(it.clone()); - out.push(it); - } - - // Also surface phantom intermediate nodes: keys of item_children that are - // direct children of parent but were never explicitly ingested as items - // (so they don't appear in any ranking). Example: ~/languages exists only as - // a parent of ~/languages/rust etc., never ranked at the root level. - let phantom_parent_prefix = format!("{}/", parent_can.as_str()); - for key in reduced.public().item_children.keys() { - let key_str = key.as_str(); - if !key_str.starts_with(&phantom_parent_prefix) { - continue; - } - // Must be a direct child: no further '/' after the prefix. - let tail = &key_str[phantom_parent_prefix.len()..]; - if tail.contains('/') { - continue; - } - if seen.contains(key) { - continue; - } - seen.insert(key.clone()); - out.push(key.clone()); - } - - out -} - -fn node_id(path: &str) -> String { - // Stable DOM id derived from canonical path. - let mut h: u64 = 1469598103934665603; // FNV-1a 64-bit offset basis - for b in path.as_bytes() { - h ^= *b as u64; - h = h.wrapping_mul(1099511628211); - } - format!("node-{:016x}", h) -} - -fn render_tree_node( - reduced: &crate::reducer::ReducerState, - path: &CanonicalItemUrl, - root: &str, - open: &CanonSet, - selected: Option<&CanonicalItemUrl>, -) -> Markup { - let path_str = path.as_str(); - let id = node_id(path_str); - let is_open = open.contains(path); - let is_selected = selected == Some(path); - - let children: Vec = if is_open { - ranked_children_public(reduced, path_str) - } else { - vec![] - }; - - let label = path.last_segment().to_string(); - let has_children = reduced - .public() - .item_children - .get(path_str) - .map(|s| !s.is_empty()) - .unwrap_or(false); - - let row_cls = if is_selected { "tree-row selected" } else { "tree-row" }; - let twist = if has_children { - if is_open { "▾" } else { "▸" } - } else { - " " - }; - - let state_blob = encode_state_blob_v2(root, open, selected); - - html! { - // Children are nested inside the li so the bevel border on .tree-children - // is the only structural indicator of depth — no explicit padding math. - li id=(id) class=(row_cls) { - @if has_children { - form method="post" action="/tree/toggle" class="tree-toggle-form" { - input type="hidden" name="root" value=(root); - input type="hidden" name="target" value=(path_str); - input type="hidden" name="s" value=(state_blob); - button type="submit" class="tree-twist" title="toggle" { (twist) } - } - } @else { - span class="tree-twist" { (twist) } - } - - form method="post" action="/tree/select" class="tree-select-form" { - input type="hidden" name="root" value=(root); - input type="hidden" name="target" value=(path_str); - input type="hidden" name="s" value=(state_blob); - button type="submit" class="tree-label" { code { (label) } } - } - - @if is_open && !children.is_empty() { - ul class="tree-children" { - @for child in &children { - (render_tree_node(reduced, child, root, open, selected)) - } - } - } - } - } -} - -fn render_tree_pane( - reduced: &crate::reducer::ReducerState, - root: &str, - open: &CanonSet, - selected: Option<&CanonicalItemUrl>, -) -> Markup { - let roots: Vec = ranked_children_public(reduced, root); - html! { - div id="tree-pane" { - div class="muted" { "tree: " code { "~/" (root.strip_prefix("https://slug.social/~/").unwrap_or("")) } } - ul class="tree-list" { - @for r in roots { - (render_tree_node(reduced, &r, root, open, selected)) - } - } - } - } -} - -fn render_detail_pane( - reduced: &crate::reducer::ReducerState, - selected: Option<&CanonicalItemUrl>, -) -> Markup { - let Some(sel) = selected else { - return html! { - div id="detail-pane" { - p class="muted" { "select a node" } - } - }; - }; - let sel_str = sel.as_str(); - let body = reduced.public().item_bodies.get(sel).cloned(); - html! { - div id="detail-pane" { - h3 { "selected" } - p { code { (sel_str) } } - @if let Some(b) = body { - (render_linkified_with_embeds(&b)) - } @else { - p class="muted" { "no body yet" } - } - } - } -} - -fn tree_page_js() -> String { - // Intercept all tree forms (toggle + select) ourselves so we can eval() the JS - // response. We call stopPropagation() to prevent the global layout POST handler - // from also firing (it discards the response body and rewrites button text). - r#" -(function() { - async function treePost(action, formData, btn) { - try { - if (btn) btn.disabled = true; - const r = await fetch(action, { - method: 'POST', - body: new URLSearchParams(formData), - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - credentials: 'same-origin', - }); - const js = await r.text(); - eval(js); - } finally { - if (btn) btn.disabled = false; - } - } - - function interceptTreeForms() { - document.querySelectorAll('form.tree-toggle-form, form.tree-select-form').forEach((f) => { - if (f.__tree_bound) return; - f.__tree_bound = true; - f.addEventListener('submit', (e) => { - e.preventDefault(); - e.stopPropagation(); - const btn = f.querySelector('button[type="submit"]'); - treePost(f.action, new FormData(f), btn); - }); - }); - } - - interceptTreeForms(); - const mo = new MutationObserver(() => interceptTreeForms()); - mo.observe(document.body, { subtree: true, childList: true }); -})(); -"# - .to_string() -} - -pub async fn tree_root( - State(state): State, - Query(q): Query, -) -> impl IntoResponse { - tree_render(State(state), Path("".to_string()), Query(q)).await -} - -pub async fn tree_path( - State(state): State, - Path(path): Path, - Query(q): Query, -) -> impl IntoResponse { - tree_render(State(state), Path(path), Query(q)).await -} - -async fn tree_render( - State(state): State, - Path(path): Path, - Query(q): Query, -) -> axum::response::Response { - let root = tree_root_from_path(Some(&path)); - if path.trim().is_empty() { - // /tree maps to "~/" - } - - let blob = match q.s.as_deref().map(str::trim) { - None | Some("") => { - let base = format!("/tree/{}", root.trim_start_matches("https://slug.social/~/")) - .trim_end_matches('/') - .to_string(); - let loc = format!("{base}?s={}", baseline_state_blob()); - // Use 302; good enough for browser refresh/share flows here. - return Redirect::temporary(&loc).into_response(); - } - Some(s) => s, - }; - let Some(decoded) = decode_state_blob_any(&root, blob) else { - return (StatusCode::BAD_REQUEST, "invalid state blob").into_response(); - }; - let open = decoded.open; - let selected = decoded.selected; - - let reduced = state.reduced.read().await; - let tree = render_tree_pane(&reduced, &root, &open, selected.as_ref()); - let detail = render_detail_pane(&reduced, selected.as_ref()); - - let page = layout( - "tree — slug.social", - "view-tree", - html! { - style { (maud::PreEscaped(r#" - .tree-shell { padding: 14px; padding-right: calc(360px + 18px); } - .tree-list, .tree-children { list-style: none; margin: 0; padding: 0; } - .tree-children { - margin-left: 10px; - margin-top: 2px; - padding-left: 10px; - } - .tree-row { display: flex; align-items: baseline; flex-wrap: wrap; gap: 4px; min-height: 22px; padding: 1px 0; } - .tree-row.selected > .tree-select-form > .tree-label code { background: rgba(255,255,255,0.07); border-radius: 2px; } - .tree-twist { - font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; - background: transparent; border: 0; padding: 0 2px; cursor: pointer; color: inherit; flex-shrink: 0; - } - .tree-label { - background: transparent; border: 0; padding: 0; cursor: pointer; - color: inherit; text-align: left; font: inherit; - } - .tree-label code { font-size: 12px; } - .tree-toggle-form, .tree-select-form { display: inline; margin: 0; } - #detail-pane { - position: fixed; top: 0; right: 0; width: 360px; height: 100vh; - overflow-y: auto; border-left: 1px solid rgba(128,128,128,0.2); - padding: 14px; box-sizing: border-box; z-index: 10; - } - #detail-pane pre { white-space: pre-wrap; } - "#)) } - h2 { "tree" } - p class="muted" { - "state is fully encoded in " - code { "?s=..." } - } - div class="tree-shell" { - (tree) - (detail) - } - script { (maud::PreEscaped(tree_page_js())) } - }, - None, - ); - - Html(page.into_string()).into_response() -} - -#[derive(Debug, Deserialize)] -pub struct ToggleForm { - pub root: String, - pub target: String, - #[serde(default)] - pub s: Option, -} - -/// POST /tree/toggle -/// Returns JS that morphs the tree pane and updates the URL. -pub async fn tree_toggle( - State(state): State, - Form(f): Form, -) -> impl IntoResponse { - let root = canonicalize_item(&f.root); - let target = canonicalize_item(&f.target); - - if root.is_empty() || target.is_empty() { - return (StatusCode::BAD_REQUEST, "missing root/target").into_response(); - } - - let Some(ref blob) = f.s else { - return (StatusCode::BAD_REQUEST, "missing state").into_response(); - }; - let Some(decoded) = decode_state_blob_any(&root, blob) else { - return (StatusCode::BAD_REQUEST, "invalid state").into_response(); - }; - let target_can = match CanonicalItemUrl::parse(&target) { - Some(c) => c, - None => return (StatusCode::BAD_REQUEST, "invalid target").into_response(), - }; - let mut open: CanonSet = decoded.open; - - if open.contains(&target_can) { - open.remove(&target_can); - } else { - open.insert(target_can.clone()); - } - - let selected: Option = decoded - .selected - .or(Some(target_can)); - - let reduced = state.reduced.read().await; - let new_tree_html = render_tree_pane(&reduced, &root, &open, selected.as_ref()).into_string(); - let new_detail_html = render_detail_pane(&reduced, selected.as_ref()).into_string(); - drop(reduced); - - let next_url = href_for(&root, &open, selected.as_ref()); - - // Escape for template literal - let esc = |s: String| s.replace('\\', "\\\\").replace('`', "\\`").replace("${", "\\${"); - let tree_esc = esc(new_tree_html); - let detail_esc = esc(new_detail_html); - let url_esc = next_url.replace('\\', "\\\\").replace('`', "\\`").replace("'", "\\'"); - - let js = format!( - "Idiomorph.morph(document.getElementById('tree-pane'), `{tree_esc}`);\ - Idiomorph.morph(document.getElementById('detail-pane'), `{detail_esc}`);\ - history.replaceState(null, '', '{url_esc}');" - ); - - Response::builder() - .status(StatusCode::OK) - .header(header::CONTENT_TYPE, "text/javascript; charset=utf-8") - .body(js) - .unwrap() - .into_response() -} - -#[derive(Debug, Deserialize)] -pub struct SelectForm { - pub root: String, - pub target: String, - #[serde(default)] - pub s: Option, -} - -/// POST /tree/select -/// Changes `selected` to `target` without altering the open set. -/// Returns JS that morphs both panes and updates the browser URL. -pub async fn tree_select( - State(state): State, - Form(f): Form, -) -> impl IntoResponse { - let root = canonicalize_item(&f.root); - let target = canonicalize_item(&f.target); - - if root.is_empty() || target.is_empty() { - return (StatusCode::BAD_REQUEST, "missing root/target").into_response(); - } - let target_can = match CanonicalItemUrl::parse(&target) { - Some(c) => c, - None => return (StatusCode::BAD_REQUEST, "invalid target").into_response(), - }; - - // Preserve the existing open set; only selection changes. - let open: CanonSet = f - .s - .as_deref() - .and_then(|blob| decode_state_blob_any(&root, blob)) - .map(|d| d.open) - .unwrap_or_default(); - - let selected = Some(target_can); - - let reduced = state.reduced.read().await; - let new_tree_html = render_tree_pane(&reduced, &root, &open, selected.as_ref()).into_string(); - let new_detail_html = render_detail_pane(&reduced, selected.as_ref()).into_string(); - drop(reduced); - - let next_url = href_for(&root, &open, selected.as_ref()); - - let esc = |s: String| s.replace('\\', "\\\\").replace('`', "\\`").replace("${", "\\${"); - let tree_esc = esc(new_tree_html); - let detail_esc = esc(new_detail_html); - let url_esc = next_url.replace('\\', "\\\\").replace('`', "\\`").replace("'", "\\'"); - - let js = format!( - "Idiomorph.morph(document.getElementById('tree-pane'), `{tree_esc}`);\ - Idiomorph.morph(document.getElementById('detail-pane'), `{detail_esc}`);\ - history.replaceState(null, '', '{url_esc}');" - ); - - Response::builder() - .status(StatusCode::OK) - .header(header::CONTENT_TYPE, "text/javascript; charset=utf-8") - .body(js) - .unwrap() - .into_response() -} - -#[cfg(test)] -mod tests { - use super::*; - - use crate::canonical_path::canonicalize_item; - use crate::events::{Event, Ingest}; - use crate::reducer::ReducerState; - - fn ingest(raw: &str) -> Event { - Event::Ingest(Ingest { - ts: 1, - id: "test-ingest".to_string(), - raw: raw.to_string(), - principal: "tester".to_string(), - delegate: None, - room_id: "public".to_string(), - thread_tag: String::new(), - }) - } - - fn reduced_with_items(raw: &str) -> ReducerState { - let mut r = ReducerState::default(); - r.apply_event(ingest(raw)); - r - } - - #[test] - fn common_base_boundary_snaps_to_slash_boundary() { - let paths = vec![ - "alphabet/a".to_string(), - "alphabet/b".to_string(), - "alphabet/c/d".to_string(), - ]; - assert_eq!(common_base_boundary(&paths), "alphabet/".to_string()); - } - - #[test] - fn tree_root_from_path_canonicalizes_ontology_root() { - assert_eq!(tree_root_from_path(None), "https://slug.social/~/".to_string()); - assert_eq!( - tree_root_from_path(Some("alphabet")), - "https://slug.social/~/alphabet".to_string() - ); - assert_eq!( - tree_root_from_path(Some("/alphabet/")), - "https://slug.social/~/alphabet".to_string() - ); - } - - #[test] - fn canon_relative_roundtrip_under_root() { - let root = CanonicalItemUrl::parse("https://slug.social/~/alphabet").unwrap(); - let item = "https://slug.social/~/alphabet/a/b"; - let rel = canon_to_relative(&root, item).unwrap(); - assert_eq!(rel.0, "a/b".to_string()); - let back = relative_to_canon(&root, &rel).unwrap(); - assert_eq!(back.as_str(), item); - } - - #[test] - fn encode_decode_state_blob_v2_roundtrips() { - let root = "https://slug.social/~/alphabet"; - let mut open: CanonSet = BTreeSet::new(); - open.insert(CanonicalItemUrl::parse("https://slug.social/~/alphabet/a").unwrap()); - open.insert(CanonicalItemUrl::parse("https://slug.social/~/alphabet/b").unwrap()); - let selected = CanonicalItemUrl::parse("https://slug.social/~/alphabet/b").unwrap(); - - let s = encode_state_blob_v2(root, &open, Some(&selected)); - let decoded = decode_state_blob_any(root, &s).expect("decode"); - assert_eq!(decoded.open, open); - assert_eq!(decoded.selected.as_ref().map(|c| c.as_str()), Some(selected.as_str())); - } - - #[test] - fn baseline_state_blob_decodes() { - let root = "https://slug.social/~/"; - let s = baseline_state_blob(); - let decoded = decode_state_blob_any(root, &s).expect("decode baseline"); - assert!(decoded.open.is_empty()); - assert!(decoded.selected.is_none()); - } - - #[test] - fn node_id_is_stable_for_same_path() { - let p = "https://slug.social/~/alphabet/a"; - assert_eq!(node_id(p), node_id(p)); - assert_ne!(node_id(p), node_id("https://slug.social/~/alphabet/b")); - } - - #[test] - fn reducer_parent_key_for_tilde_items_is_without_trailing_slash() { - // This is the reducer invariant that the tree view must match. - let item = canonicalize_item("~/alphabet/a"); - assert_eq!(crate::canonical_path::item_parent_path(&item).unwrap(), "https://slug.social/~/alphabet"); - let item2 = canonicalize_item("~/a"); - assert_eq!(crate::canonical_path::item_parent_path(&item2).unwrap(), "https://slug.social/~"); - } - - #[test] - fn ranked_children_public_root_lists_children_under_tree_root() { - // Regression test: /tree root uses "https://slug.social/~/", but reducer stores - // top-level ontology children under parent "https://slug.social/~". - let reduced = reduced_with_items( - r#" -#t -~/a -~/b -"#, - ); - - let root = "https://slug.social/~/"; - let kids = ranked_children_public(&reduced, root); - let kids_s: BTreeSet = kids.into_iter().map(|c| c.as_str().to_string()).collect(); - - assert!(kids_s.contains("https://slug.social/~/a")); - assert!(kids_s.contains("https://slug.social/~/b")); - } -} -