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: [a45842df] better dev iteration script Side A — unified diff (full patch): diff --git a/.gitignore b/.gitignore index 9cd2eaece834481bee87639cd7cb6be77f33e302..b70cf5b97cd3556e061233d8b0aefd333568a991 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ target/ repomix-output.xml psalms_kjv.txt dev-data/ +fixture-data/ .worktrees/ .specstory/ .specstory/ diff --git a/bb.edn b/bb.edn index 5d1d642d75d03f70879d7673e7ad95360336a8b1..4680e82d4227057d2eea6041dc5647beb759131d 100644 --- a/bb.edn +++ b/bb.edn @@ -47,7 +47,7 @@ "RUST_LOG" "info"})})))} fixture - {:doc "Run local server + mock OAuth + seeded walkthrough data for manual browser demos" + {:doc "Run local server via cargo-watch + mock OAuth + seeded walkthrough data (persistent ./fixture-data/, prefers PORT 8080). Requires cargo-watch." :requires ([test.walkthrough-fixture :as walkthrough-fixture]) :task (walkthrough-fixture/run-fixture)} diff --git a/server/src/html/forum.rs b/server/src/html/forum.rs index e00e7110e2ad778d63b3d00b0cc4ffe20ba2e0d4..815fc6529062b103553644fc15e516334aec2b88 100644 --- a/server/src/html/forum.rs +++ b/server/src/html/forum.rs @@ -976,12 +976,6 @@ pub async fn room_page( html! { (strip) nav class="breadcrumb" { (bc_room(&nav, slug_display, None)) } - h2 { (slug_display) } - p class="muted" { (room_id) } - p class="muted room-links" { - "room garden · " - a href=(nav.garden_root_url()) { "~" } - } (room_members_section_markup(&reduced, &room_id, false)) h3 { "threads" } (render_thread_feed(Some(&nav), "room-thread-feed", &rows, now)) diff --git a/test/common.clj b/test/common.clj index 76a3e99fdb67c10bcb5c2f53d8bcd0917398af50..c6deba0d90995b0e3f9c4b8ad66a516ed19b870e 100644 --- a/test/common.clj +++ b/test/common.clj @@ -107,6 +107,16 @@ (.close ss) port)) +(defn pick-port-prefer + "Use `preferred` if it can be bound, otherwise an ephemeral port (same as `pick-port`)." + [preferred] + (try + (let [ss (java.net.ServerSocket. preferred)] + (.close ss) + preferred) + (catch java.io.IOException _ + (pick-port)))) + (defn wait-for-server "Poll /healthz until it returns 'ok', up to `timeout-ms`." [base-url timeout-ms] diff --git a/test/walkthrough_fixture.clj b/test/walkthrough_fixture.clj index 4b814822029c913e38151ca53848d1c64fb58373..a487ff1ef8548580577914fb33f321586859c9af 100644 --- a/test/walkthrough_fixture.clj +++ b/test/walkthrough_fixture.clj @@ -1,11 +1,18 @@ (ns test.walkthrough-fixture "Launch a local slug server with mock OAuth and seed browser-friendly demo data." (:require [babashka.fs :as fs] + [babashka.process :as p] [cheshire.core :as json] [clojure.string :as str] [test.common :as common] [test.oauth :as oauth])) +(def ^:private fixture-data-dir "fixture-data") +;; Prefer the same port as `bb dev` / `bb watch`; fall back if something else is listening. +(def ^:private preferred-slug-port 8080) +;; First `cargo watch` compile can exceed a release-binary startup; allow several minutes. +(def ^:private health-wait-ms 300000) + (defn- assert! [pred msg] (when-not pred (throw (ex-info msg {})))) @@ -85,49 +92,87 @@ :thread_url (str base-url "/r/" room-short "/" room-slug "/t/walkthrough-thread") :garden_url (str base-url "/r/" room-short "/" room-slug "/~/secret/item")}})) +(defn- rebase-fixture-summary [saved current-base-url current-google-url current-data-dir] + (let [inner (:summary saved) + room (:room inner) + rs (:short room) + lg (:slug room)] + (assoc saved + :base_url current-base-url + :mock_google_url current-google-url + :data_dir (str current-data-dir) + :summary (assoc inner + :room (assoc room + :url (str current-base-url "/r/" rs "/" lg) + :thread_url (str current-base-url "/r/" rs "/" lg "/t/walkthrough-thread") + :garden_url (str current-base-url "/r/" rs "/" lg "/~/secret/item")))))) + +(defn- fixture-log-present? [data-dir] + (let [p (fs/path data-dir "events.jsonl")] + (and (fs/exists? p) (pos? (fs/size p))))) + +(defn- load-or-seed-summary! + [base-url google-url data-dir summary-path] + (if (and (fixture-log-present? data-dir) (fs/exists? summary-path)) + (let [saved (json/parse-string (slurp summary-path) true) + rebased (rebase-fixture-summary saved base-url google-url data-dir)] + (spit summary-path (json/generate-string rebased {:pretty true})) + (println "") + (println "reusing fixture-data/ (delete the directory for a fresh seed)") + rebased) + (let [seeded (seed-demo! base-url) + s {:base_url base-url + :mock_google_url google-url + :data_dir (str data-dir) + :summary seeded}] + (spit summary-path (json/generate-string s {:pretty true})) + s))) + (defn run-fixture [& _args] - (let [build (common/run-cargo-build-release! ["slugsocial-server"]) - _ (assert! (zero? (:exit build)) "cargo build --release failed") - server-bin "target/release/slugsocial-server" - tmp-dir (str (fs/create-temp-dir {:prefix "slug-walkthrough-"})) - slug-port (common/pick-port) + (let [data-dir (str (fs/absolutize (fs/path (fs/cwd) fixture-data-dir))) + slug-port (common/pick-port-prefer preferred-slug-port) google-port (common/pick-port) base-url (str "http://127.0.0.1:" slug-port) google-url (str "http://127.0.0.1:" google-port) - stable-dir "/tmp/slug-walkthrough-fixture" - summary-path (str stable-dir "/summary.json") + summary-path (str (fs/path data-dir "summary.json")) !server (atom nil) !google (atom nil) - server-env (common/slug-server-env tmp-dir base-url google-url slug-port)] + server-env (merge (common/slug-server-env data-dir base-url google-url slug-port) + {"RUST_LOG" "info"}) + watch-cmd [(common/cargo-bin) "watch" + "-x" "run -p slugsocial-server" + "-w" "server/src" + "-w" "server/static" + "-w" "types/src"]] (try - (fs/create-dirs stable-dir) + (fs/create-dirs data-dir) (reset! !google (oauth/start-mock-google google-port :google-users ["google-user-alice" "google-user-bob"])) - (reset! !server (common/start-server server-bin server-env)) - (assert! (common/wait-for-server base-url 10000) "server did not become healthy") - (let [seeded (seed-demo! base-url) - summary {:base_url base-url - :mock_google_url google-url - :data_dir tmp-dir - :summary seeded}] - (spit summary-path (json/generate-string summary {:pretty true})) + (println "") + (println "starting cargo-watch (first compile may take a while)…") + (flush) + (reset! !server (p/process watch-cmd {:inherit true :env server-env})) + (assert! (common/wait-for-server base-url health-wait-ms) "server did not become healthy") + (let [summary (load-or-seed-summary! base-url google-url data-dir summary-path)] (println "") (println "walkthrough fixture ready") (println (str " base url: " base-url)) (println (str " room page: " (get-in summary [:summary :room :url]))) (println (str " thread page: " (get-in summary [:summary :room :thread_url]))) (println (str " garden page: " (get-in summary [:summary :room :garden_url]))) + (println (str " data dir: " data-dir)) (println (str " summary json: " summary-path)) (println "") (println "seeded users") (println " alice / bob via mock OAuth") (println "") + (println "editing server/src or server/static reloads the server; data persists in fixture-data/") + (println "") (println "press Ctrl-C to stop") (flush) (while true (Thread/sleep 1000))) (finally (when-some [s @!server] (common/kill-server s)) - (when-some [g @!google] ((:stop-fn g))) - (fs/delete-tree tmp-dir))))) + (when-some [g @!google] ((:stop-fn g))))))) Side B — contributor: tommy-mor Side B — commit message: [c99adc26] refactor forum into files Side B — 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" + } + } + } + } + } +}