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: [1c914c6e] stage set Side A — unified diff (full patch): diff --git a/plan.md b/plan.md new file mode 100644 index 0000000000000000000000000000000000000000..00d6867a1e0ed144a16a020ea037f685ce646c73 --- /dev/null +++ b/plan.md @@ -0,0 +1,155 @@ +# Plan: `ItemId` + `RouteContext` (identity vs hrefs) + +This document is for **the next agent** to continue the refactor without re-deriving context from chat. It supersedes ad-hoc notes: treat it as the checklist of record until the work lands and this file is deleted or trimmed. + +## Goal + +- **Identity** (what lives in the reducer graph, votes, indexes) becomes a **structural `ItemId` enum** in `slug-types`, not a canonical `String` / `CanonicalItemUrl` newtype. +- **Presentation** (tilde / dash display, breadcrumbs) derives from `ItemId` via explicit methods, not string stripping. +- **Routing** (browser `href`s for public vs room) goes through **`RouteContext`** (started in `server/src/html/routing.rs`) so Maud/handlers do not stitch `/r/…` vs `/~` ad hoc. + +**Non-goals for v1 of the migration:** backward-compatible JSONL or dual-read of old canonical strings in the event log (project has accepted breaking changes). If you reintroduce compat, document it here. + +## Current state (as of this plan) + +- **`CanonicalItemUrl`** (`types/src/paths.rs`): newtype around `String`; `parse` / `parent` / `display_path` / `tilde_tail` / etc. Reducer `ContentState`, `VoteData`, ranking, RPC, search, garden, breadcrumbs all use it or `String` keys derived from it. +- **`ThreadNav`** (`server/src/html/forum/nav.rs`): encodes scope prefixes for threads and garden URLs; **`RouteContext`** now wraps `ThreadNav` (`server/src/html/routing.rs`, re-exported from `server/src/html/mod.rs`) but **most HTML still takes `&ThreadNav` directly** — migration incomplete. +- **URL normalization** lives in `types/src/url_normalize.rs` + `canonicalize_item` / `finalize_external_identity_url` in `paths.rs` (YouTube, sorted query params, room path `room_route_segment` in `paths.rs`). +- **Room HTTP paths** are `/r/{short}{slug}` (fused segment); wire **`room_id`** remains `short/slug` for RPC/events. + +## Target architecture + +### `ItemId` (types) + +Suggested shape (adjust after profiling `Ord` / `Hash` / serde size): + +```text +ItemId::Root — tilde ontology root (today `SLUG_TILDE_ONTOLOGY_ROOT`) +ItemId::Local { segments } — slug.social ~/… path as Vec (lowercase segments, non-empty for non-root) +ItemId::External { url: Url } — normalized `url::Url` (crate `url` already in `slug-types`) +``` + +**API surface (minimum):** + +- `ItemId::parse(&str) -> Option` — single entry from DSL / user input / legacy wire (internally may call `canonicalize_item` + structured split). +- `ItemId::to_wire_url(&self) -> String` — only for **external** boundaries if needed (HTTP fetch, rare assertions); avoid using as the primary key once maps use `ItemId`. +- `parent`, `display_path`, `tilde_tail` / `tilde_http_tail`, `tilde_segments`, `last_segment`, `normalized_storage` — port from `CanonicalItemUrl`. +- **`Ord` + `Hash` + `Eq`** stable for `BTreeSet` / `HashMap` (see `write_actor` scope-rank snapshots). +- **`Serialize` / `Deserialize`** — decide **tagged JSON** for any persisted or API-carried structs (e.g. `VoteData` in tests). If RPC must stay stringy for clients, use a **DTO layer** that converts `ItemId` ↔ wire at the boundary only. + +**Remove:** `CanonicalItemUrl` type and all `path_types::CanonicalItemUrl` / `slug_types::paths::CanonicalItemUrl` exports once call sites are migrated. **`Borrow`** on the old newtype goes away; update `nav!` / any code that assumed map keys borrowed as `str`. + +### `RouteContext` (server HTML) + +- **File:** `server/src/html/routing.rs` — **`RouteContext(ThreadNav)`** with `item_href`, `item_href_raw`, `thread_url`, `garden_root_url`, `room_url`, `From`/`Into` `ThreadNav`. +- **Direction:** new code and refactored Maud should take **`&RouteContext`** (or owned where appropriate) instead of `&ThreadNav` when building links. Long term, **`item_href(&ItemId)`** should not parse strings — it should pattern-match `ItemId` and append tilde tail or `/-/…` external tail using the same rules as today’s `ThreadNav::garden_item_url`. + +### Axum / garden routes + +- **No** single catch-all route (explicit decision): keep the existing router layout in `server/src/lib.rs`. +- Room routes stay **`/r/:room_key/...`** with `room_key` fused; parsing via `slug_types::room_id_from_route_segment` / `room_route_segment` in `paths.rs`. + +## Phased execution (recommended order) + +### Phase 0 — Preconditions (quick) + +1. Read **`AGENTS.md`** (UI contract, durability matrix, `RpcCommand` vs `HtmlUiAction`). +2. Run **`cargo test --workspace`** and **`./scripts/clj-test.sh`** on clean `main` before large diffs; repeat after each phase. + +### Phase 1 — `ItemId` in `slug-types` (no server yet) + +1. Add **`ItemId`** (new file e.g. `types/src/item_id.rs` **or** inline at bottom of `paths.rs` — see **Module cycle** below). +2. Implement **`ItemId::parse`** using existing **`canonicalize_item`** + normalization; port **`CanonicalItemUrl`** methods to **`ItemId`** with tests ported from `paths.rs` `#[cfg(test)] mod tests`. +3. **`GardenItemUrl::from_stored(&ItemId, room_wire)`** (and thread helpers) — build absolute hrefs from structure, not from re-parsing a canonical string. +4. **`TildeHttpPathTail::to_item_id`** (rename from `to_canonical`) / **`tilde_http_path_to_item_id`**. +5. **`TildeOntologyPath::from_stored(&ItemId)`**. +6. Export **`ItemId`** from **`types/src/lib.rs`**; update **`server/src/path_types.rs`** re-exports. +7. **Delete `CanonicalItemUrl`** and fix all **in-crate** references in `types` only until `cargo test` passes for `slug-types`. + +**Module cycle trap:** `item_id.rs` must not `use crate::paths::{...}` if `paths.rs` also imports `ItemId` for `GardenItemUrl` in the same module. **Fix one of:** + +- **A)** Put `ItemId` **inside `paths.rs`** below `canonicalize_item` / helpers (simplest, large file), or +- **B)** Split **`canonicalize_item`** (+ dash host helpers + `finalize_external_identity_url`) into **`types/src/item_wire.rs`**, then `paths.rs` + `item_id.rs` both depend on `item_wire` only (cleaner, more files). + +### Phase 2 — Reducer + ranking (server core) + +1. **`server/src/reducer.rs`**: `ContentState` / `GroupState` / **`VoteData`** — replace **`CanonicalItemUrl`** with **`ItemId`** on all maps, sets, deques, vectors. +2. **`apply_vote`**: normalize `a`/`b` via **`ItemId::parse`** or **`ItemId`**-aware logic (remove string round-trip). +3. **`apply_ingest_to_content`**: **`dsl`** still yields strings for item titles in statements; normalize to **`ItemId`** at ingest boundary via **`ItemId::parse`** once per item. +4. **`server/src/ranking.rs`**, **`server/src/scope_rank.rs`**, **`server/src/api/write_actor.rs`** (including **`BTreeSet`** ordering), **`server/src/api/validate.rs`**, **`server/src/api/helpers.rs`** — propagate **`ItemId`**. +5. **`server/tests/basic.rs`** and any reducer tests constructing **`VoteData`** — use **`ItemId::parse(...).unwrap()`** or helpers. + +### Phase 3 — RPC + search + external resolver + +1. **`server/src/api/rpc.rs`**: rank/pair/matchup/search payloads; today many paths use **`GardenItemUrl::from_storage_str(item.as_str(), …)`** — switch to **`ItemId`** + **`GardenItemUrl::from_stored(&item_id, …)`** (or equivalent). +2. **`server/src/html/search.rs`**: scoring uses item path strings — derive from **`ItemId::display_path`** / **`to_wire_url`** only at the scoring boundary if needed. +3. **`server/src/external_resolver.rs`**: take **`&ItemId`** or **`ItemId::external_url()`** instead of **`&CanonicalItemUrl`**. + +### Phase 4 — HTML / Maud + +1. **`ThreadNav::garden_item_url`**: overload or replace with **`garden_item_href(&self, item: &ItemId)`** (no `CanonicalItemUrl::parse` inside). +2. **`RouteContext`**: extend **`item_href(&ItemId)`**; migrate call sites from **`ThreadNav`** to **`RouteContext`** where only link-building is needed (keep **`ThreadNav`** where scope / auth helpers need the full struct). +3. **`server/src/html/garden.rs`**, **`breadcrumb_path.rs`**, **`forum/*`**, **`editor.rs`**: replace **`CanonicalItemUrl`** with **`ItemId`**; breadcrumbs should walk **`ItemId::parent`** without string `rsplit`. +4. **`types` JSON types** (`RankRow`, etc.): decide whether **`GardenItemUrl`** stays string for JSON or becomes a structured field; keep **one** wire format for the public API. + +### Phase 5 — Cleanup + docs + +1. Remove dead **`canonical_path`** / **`breadcrumb_path`** string logic if fully superseded. +2. Update **`AGENTS.md`** if durability, `POST /ui`, or command surfaces change. +3. Delete or shrink **`plan.md`** when done. + +## File / symbol checklist (non-exhaustive — grep-driven) + +Run periodically: + +```bash +rg "CanonicalItemUrl" -g'*.rs' +rg "path_types::CanonicalItemUrl" -g'*.rs' +rg "tilde_http_path_to_canonical" -g'*.rs' +``` + +**High-touch files (from prior exploration):** + +| Area | Files | +|------|--------| +| Types | `types/src/paths.rs`, `types/src/lib.rs`, `types/src/url_normalize.rs`, (optional) `types/src/item_id.rs`, `types/src/item_wire.rs` | +| Server re-exports | `server/src/path_types.rs`, `server/src/canonical_path.rs` | +| Reducer / ingest | `server/src/reducer.rs`, `server/src/dsl.rs` (parse output types if changed) | +| Ranking | `server/src/ranking.rs`, `server/src/scope_rank.rs` | +| Writer / RPC | `server/src/api/write_actor.rs`, `server/src/api/rpc.rs`, `server/src/api/helpers.rs`, `server/src/api/validate.rs` | +| HTML | `server/src/html/garden.rs`, `server/src/html/breadcrumb_path.rs`, `server/src/html/forum/nav.rs`, `server/src/html/routing.rs`, `server/src/html/search.rs`, `server/src/html/editor.rs`, `server/src/html/forum/ingest.rs`, … | +| Tests | `server/tests/basic.rs`, `server/tests/integration.rs`, `types/src/paths.rs` tests, Clojure under `test/` if URLs/assertions mention canonical shapes | + +## Events / JSONL + +- **`Ingest`** events store **`raw` DSL** only — no change required for item identity inside the event. +- If any future event type stores item ids as strings, migrate to **structured `ItemId` serde** or accept string only at the event boundary with immediate parse into **`ItemId`** on `apply_event`. + +## `nav!` macro (`server/src/paths.rs`) + +- Macros use **`keypath($key)`** with **`.clone()`** — **`ItemId`** must be **`Clone`** (already for enums). Remove any reliance on **`Borrow`** for map keys. + +## Testing gate + +After each phase: + +```bash +cargo test --workspace +./scripts/clj-test.sh +``` + +## Risks / gotchas + +1. **`Ord` on `ItemId`**: must match prior **`CanonicalItemUrl`** / `String` ordering wherever **`BTreeSet`** is used (e.g. deterministic scope-rank snapshots in **`write_actor`**). +2. **External `ItemId`**: **`Url`** equality / hashing — normalization is already centralized in **`url_normalize`**; ensure **`ItemId::parse`** always inserts normalized **`Url`** into **`External`**. +3. **Fake parent URLs** in garden (e.g. **`https://.`** for external root ranking): find all **`parse("https://.")`** style hacks and express as **`ItemId`** or a dedicated sentinel. +4. **Serde**: tests and any RPC clients that snapshot JSON may need expectation updates if **`VoteData`** shape changes. + +## Optional follow-ups (not blocking `ItemId`) + +- More **domain normalizers** in **`url_normalize.rs`** (e.g. `music.youtube.com`, Spotify, etc.). +- **Room wire** vs **HTTP segment** helpers already in **`paths.rs`** (`ROOM_SHORT_ID_LEN`, `room_route_segment`, `room_id_from_route_segment`). + +--- + +**End state criteria:** `rg CanonicalItemUrl` returns nothing; reducer maps use **`ItemId`**; HTML link generation for items goes through **`RouteContext` + `ItemId`**; tests and Kaocha green. diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs index c3dccd03dc6da2a2f6f6fa828657e33a951884b1..668403a35c415e6f091362b28c63ac294057fb6d 100644 --- a/server/src/html/mod.rs +++ b/server/src/html/mod.rs @@ -15,6 +15,7 @@ mod breadcrumb_path; mod editor; mod forum; mod garden; +pub mod routing; mod search; pub mod ui_action; use breadcrumb_path::{ExternalOntologyPath, OntologyPath}; @@ -35,6 +36,7 @@ pub use garden::{ external_garden_index, external_ontology_path, garden_index, ontology_path, room_external_garden_index, room_external_ontology_path, room_garden_index, room_ontology_path, }; +pub use routing::RouteContext; pub use search::{search_page, search_results_fragment}; pub use forum::user_profile_page; pub use ui_action::{parse_html_ui_from_form, HtmlUiAction, HtmlUiParseError, UI_RPC_FIELD}; diff --git a/server/src/html/routing.rs b/server/src/html/routing.rs new file mode 100644 index 0000000000000000000000000000000000000000..13e9ae0cbe32d454e34a7737edf8234d2a558502 --- /dev/null +++ b/server/src/html/routing.rs @@ -0,0 +1,71 @@ +//! Scoped browser paths for HTML. **RouteContext** is the intended single place to build `href`s +//! given public vs room scope (the original blueprint name); today it wraps [`ThreadNav`]. +//! +//! Prefer `RouteContext::item_href` / [`RouteContext::thread_url`] in new Maud over stitching +//! `/r/…` vs `/~` manually. Call sites can migrate incrementally from passing `&ThreadNav`. + +use crate::path_types::CanonicalItemUrl; + +use super::forum::ThreadNav; + +#[derive(Clone)] +pub struct RouteContext(ThreadNav); + +impl RouteContext { + #[inline] + pub fn public() -> Self { + Self(ThreadNav::public()) + } + + #[inline] + pub fn from_room_id(room_id: &str) -> Option { + ThreadNav::from_room_id(room_id).map(Self) + } + + #[inline] + pub fn thread_nav(&self) -> &ThreadNav { + &self.0 + } + + #[inline] + pub fn into_thread_nav(self) -> ThreadNav { + self.0 + } + + /// Relative path for a stored canonical item in this scope’s garden. + pub fn item_href(&self, item: &CanonicalItemUrl) -> String { + self.0.garden_item_url(item.as_str()) + } + + /// Same as [`Self::item_href`] but parses `item` first (raw DSL / user paste). + pub fn item_href_raw(&self, item: &str) -> String { + self.0.garden_item_url(item) + } + + #[inline] + pub fn thread_url(&self, tag: &str) -> String { + self.0.thread_url(tag) + } + + #[inline] + pub fn garden_root_url(&self) -> &str { + self.0.garden_root_url() + } + + #[inline] + pub fn room_url(&self) -> &str { + self.0.room_url() + } +} + +impl From for RouteContext { + fn from(nav: ThreadNav) -> Self { + Self(nav) + } +} + +impl From for ThreadNav { + fn from(ctx: RouteContext) -> Self { + ctx.0 + } +} 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" + } + } + } + } + } +}