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: [21b57b50] fix(html): drop duplicate forum.rs; use forum/ as sole module root Removes the leftover monolithic file so mod forum resolves to forum/mod.rs without ambiguity. Keeps feed, views, and other split modules as the source. Made-with: Cursor Side A — unified diff (full patch): diff --git a/server/src/html/forum.rs b/server/src/html/forum.rs deleted file mode 100644 index 5ad8dfc84dd735d589432e2c613ff687a75f2e61..0000000000000000000000000000000000000000 --- a/server/src/html/forum.rs +++ /dev/null @@ -1,1405 +0,0 @@ -use axum::{ - extract::{Path, Query, State}, - http::{HeaderMap, StatusCode, Uri}, - response::{Html, IntoResponse}, -}; -use axum_extra::extract::cookie::CookieJar; -use maud::{html, Markup}; -use serde::Deserialize; - -use crate::{ - api::optional_principal, - canonical_path::{canonicalize_item, canonicalize_tag}, - events::ThreadCapability, - form_template::template_json_compact, - identity::parse_username, - reducer::{scope_from_room_wire, ReducerState, ScopeId}, - state::AppState, - timeago, -}; -use serde_json::json; - -use super::js_string_literal; -use super::ui_action::{HtmlUiAction, UI_RPC_FIELD}; - -use super::{ - bc_segment, bc_threads, cli_panel, layout, now_ms, profile_href, recency_class, - render_linkified_with_embeds_in_scope, theme_from_jar, theme_next_from_uri, JsBuilder, -}; - -#[derive(Clone)] -struct ThreadRow { - tag: String, - subtitle: Option, - last_ts: i64, - ingests: usize, -} - -#[derive(Clone)] -struct RoomMemberRow { - username: String, - capabilities: Vec<&'static str>, -} - -/// URL helpers for public `/t/…` and private room threads `/r/{short}/{slug}/t/…`. -#[derive(Clone)] -pub struct ThreadNav { - pub room_wire: String, - scope: ScopeId, - room_path: String, - thread_path_prefix: String, - garden_path_prefix: String, -} - -impl ThreadNav { - pub(crate) fn public() -> Self { - Self { - room_wire: "public".into(), - scope: ScopeId::Public, - room_path: "/t".into(), - thread_path_prefix: "/t".into(), - garden_path_prefix: "/~".into(), - } - } - - /// `room_id` wire form `shortid/slug`. - pub(crate) fn from_room_id(room_id: &str) -> Option { - let (short, slug) = room_id.split_once('/')?; - if short.is_empty() || slug.is_empty() { - return None; - } - Some(Self { - room_wire: room_id.to_string(), - scope: ScopeId::Room(room_id.to_string()), - room_path: format!("/r/{short}/{slug}"), - thread_path_prefix: format!("/r/{short}/{slug}/t"), - garden_path_prefix: format!("/r/{short}/{slug}/~"), - }) - } - - pub(crate) fn scope(&self) -> ScopeId { - self.scope.clone() - } - - pub(crate) fn room_url(&self) -> &str { - &self.room_path - } - - pub(crate) fn thread_url(&self, tag: &str) -> String { - format!("{}/{}", self.thread_path_prefix, tag) - } - - pub(crate) fn garden_root_url(&self) -> &str { - &self.garden_path_prefix - } - - pub(crate) fn garden_item_url(&self, item: &str) -> String { - if let Some(tail) = crate::path_types::CanonicalItemUrl::parse(item) - .and_then(|c| c.tilde_tail().map(str::to_owned)) - { - format!("{}/{}", self.garden_path_prefix, tail) - } else { - format!("{}/{}", self.garden_path_prefix, canonicalize_item(item)) - } - } - - fn thread_page_url(&self, tag: &str, offset: usize) -> String { - let base = self.thread_url(tag); - if offset == 0 { - base - } else { - format!("{base}?offset={offset}") - } - } - - fn post_url(&self, tag: &str, idx: usize) -> String { - format!("{}/{}/{}", self.thread_path_prefix, tag, idx) - } -} - -/// `POST /ui` + `__rpc__` from an inline link (`onclick`); same-origin credentials as other morph actions. -fn thread_ui_fetch_onclick(rpc_compact_json: &str) -> String { - format!( - "fetch('/ui',{{method:'POST',headers:{{'Content-Type':'application/x-www-form-urlencoded'}},body:new URLSearchParams({{__rpc__:{}}}).toString(),credentials:'same-origin'}}).then(r=>r.text()).then(eval);return false", - js_string_literal(rpc_compact_json) - ) -} - -fn thread_nav_for_ingest(ing: &crate::events::Ingest) -> Option { - let room = ing.room_id.trim(); - if room.is_empty() || room == "public" { - Some(ThreadNav::public()) - } else { - ThreadNav::from_room_id(room) - } -} - -fn thread_post_index_in_scope(reduced: &ReducerState, ing: &crate::events::Ingest) -> Option { - let scope = scope_from_room_wire(&ing.room_id); - let tag = canonicalize_tag(&ing.thread_tag); - reduced - .ingests_by_scope_thread - .get(&(scope, tag)) - .and_then(|q| q.iter().rev().position(|id| id == &ing.id)) -} - -fn post_header_meta( - nav: &ThreadNav, - tag: &str, - post_idx: usize, - principal: &str, - ts: i64, - now: i64, -) -> Markup { - let post_href = nav.post_url(tag, post_idx); - let profile = profile_href(principal); - let hover = timeago::rfc3339_utc(ts); - let ago = timeago::timeago(now, ts); - html! { - div class="ingest-meta muted" title=(hover) { - a href=(post_href) class="post-num" { "#" (post_idx) } - " " - a href=(profile) class="post-author" { "@" (principal) } - " · " - (ago) - } - } -} - -fn post_header_row( - nav: &ThreadNav, - tag: &str, - post_idx: usize, - ing: &crate::events::Ingest, - _viewer: Option<&str>, - now: i64, - show_delete: bool, -) -> Markup { - let meta = post_header_meta(nav, tag, post_idx, &ing.principal, ing.ts, now); - html! { - div class="ingest-header-row" { - (meta) - @if show_delete { - form class="post-delete-form" method="POST" action="/ui" { - input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::RedactPost { post_id: ing.id.clone() }).unwrap()); - button type="submit" class="post-delete-btn" { "delete" } - } - } - } - } -} - -fn redacted_header_row( - nav: &ThreadNav, - tag: &str, - post_idx: usize, - ing: &crate::events::Ingest, - now: i64, - expanded: bool, -) -> Markup { - let meta = post_header_meta(nav, tag, post_idx, &ing.principal, ing.ts, now); - let rpc_expand = template_json_compact(&json!({ - "action": "expand_redacted_post", - "room": nav.room_wire, - "thread_tag": tag, - "post_index": post_idx, - })) - .unwrap(); - let rpc_collapse = template_json_compact(&json!({ - "action": "collapse_redacted_post", - "room": nav.room_wire, - "thread_tag": tag, - "post_index": post_idx, - })) - .unwrap(); - let onclick_expand = thread_ui_fetch_onclick(&rpc_expand); - let onclick_collapse = thread_ui_fetch_onclick(&rpc_collapse); - html! { - div class="ingest-header-row ingest-tombstone-row" { - (meta) - span class="post-tombstone-inline muted" { - "deleted · " - @if expanded { - a href="#" class="hide-deleted-link" - onclick=(onclick_collapse) { - "[hide deleted content]" - } - } @else { - a href="#" class="show-deleted-link" - onclick=(onclick_expand) { - "[show deleted content]" - } - } - } - } - } -} - -fn ingest_entry_markup( - nav: &ThreadNav, - tag: &str, - post_idx: usize, - ing: &crate::events::Ingest, - viewer: Option<&str>, - now: i64, - reduced: &ReducerState, -) -> Markup { - let redacted = reduced.redacted_posts.contains(&ing.id); - let show_delete = viewer == Some(ing.principal.as_str()) && !redacted; - if redacted { - html! { - div class="ingest-entry ingest-redacted" data-ingest-id=(ing.id) { - (redacted_header_row(nav, tag, post_idx, ing, now, false)) - } - } - } else { - let truncated = ing.raw.len() > 2000; - let display_body = if truncated { &ing.raw[..2000] } else { &ing.raw[..] }; - html! { - div class="ingest-entry" data-ingest-id=(ing.id) { - (post_header_row(nav, tag, post_idx, ing, viewer, now, show_delete)) - (render_linkified_with_embeds_in_scope(display_body, nav.garden_root_url())) - @if truncated { - @let rpc_full = template_json_compact(&json!({ - "action": "expand_post_full", - "room": nav.room_wire, - "thread_tag": tag, - "post_index": post_idx, - })).unwrap(); - @let onclick_full = thread_ui_fetch_onclick(&rpc_full); - a href="#" class="show-full-link" - onclick=(onclick_full) { - "[show full post]" - } - } - } - } - } -} - -fn collect_thread_rows_for_scope(reduced: &ReducerState, scope: &ScopeId, now: i64) -> Vec { - let _ = now; - reduced - .forum_threads - .iter() - .filter(|((s, _), _)| s == scope) - .map(|((_, tag), thread)| { - let ingests = reduced - .ingests_by_scope_thread - .get(&(scope.clone(), tag.clone())) - .map(|q| q.len()) - .unwrap_or(0); - ThreadRow { - tag: tag.clone(), - subtitle: None, - last_ts: thread.last_activity_ts, - ingests, - } - }) - .collect() -} - -fn rooms_for_user(reduced: &ReducerState, username: &str) -> Vec { - let mut v: Vec = reduced - .grants - .iter() - .filter(|(rid, m)| reduced.rooms.contains(*rid) && m.contains_key(username)) - .map(|(rid, _)| rid.clone()) - .collect(); - v.sort(); - v -} - -pub(crate) fn user_can_view_room(reduced: &ReducerState, room_id: &str, username: Option<&str>) -> bool { - if !reduced.rooms.contains(room_id) { - return false; - } - let Some(u) = username else { - return false; - }; - reduced.user_has_cap(room_id, u, ThreadCapability::View) -} - -pub(crate) fn user_can_post_room(reduced: &ReducerState, room_id: &str, username: &str) -> bool { - reduced.user_has_cap(room_id, username, ThreadCapability::Post) -} - -fn capability_label(cap: ThreadCapability) -> &'static str { - match cap { - ThreadCapability::View => "view", - ThreadCapability::Post => "post", - ThreadCapability::Vote => "vote", - ThreadCapability::AddItem => "add_item", - ThreadCapability::Manage => "manage", - } -} - -fn room_members_for_room(reduced: &ReducerState, room_id: &str) -> Vec { - 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" - } - } - } - } - } -} - -/// `feed_id` is e.g. `thread-feed` (public bump list, SSE) or `room-thread-feed`. -fn render_thread_feed(nav: Option<&ThreadNav>, feed_id: &str, rows: &[ThreadRow], now: i64) -> Markup { - html! { - div id=(feed_id) { - @if rows.is_empty() { - p class="muted" { "no threads yet" } - } @else { - ul class="thread-feed" { - @for r in rows { - @let thread_href = nav - .as_ref() - .map(|n| n.thread_url(&r.tag)) - .unwrap_or_else(|| format!("/t/{}", r.tag)); - @let hover = timeago::rfc3339_utc(r.last_ts); - @let ago = timeago::timeago(now, r.last_ts); - @let age_cls = recency_class(now, r.last_ts); - li class=(age_cls) { - a href=(thread_href) { - "#" (r.tag) - @if let Some(subtitle) = &r.subtitle { - ": " (subtitle) - } - " " - span class="muted" title=(hover) { - (ago) - " · " - (format!("{}n", r.ingests)) - } - } - } - } - } - } - } - } -} - -fn auth_strip( - headers: &HeaderMap, - jar: &CookieJar, - reduced: &ReducerState, -) -> Markup { - match optional_principal(headers, jar, reduced) { - Some(u) => html! { - p class="muted auth-strip" { - "@" (u) - " · " - a href="/logout" { "log out" } - } - }, - None => html! { - p class="muted auth-strip" { - a href="/login" { "log in" } - } - }, - } -} - -fn bc_room(nav: &ThreadNav, room_slug: &str, thread_tag: Option<&str>) -> Markup { - html! { - a href="/" { "slug.social" } - @if let Some(t) = thread_tag { - (bc_segment( - &format!("room:{room_slug}"), - nav.room_url(), - false, - )) - (bc_segment(&format!("#{t}"), &nav.thread_url(t), true)) - } @else { - (bc_segment( - &format!("room:{room_slug}"), - nav.room_url(), - true, - )) - } - } -} - -fn compose_form(nav: &ThreadNav, thread_tag: &str, show: bool) -> Markup { - if !show { - return html! {}; - } - html! { - section class="compose" id="thread-compose" { - 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" } - } - } - div id="thread-compose-errors" {} - } - } -} - -fn new_thread_form_public(show: bool) -> Markup { - if !show { - return html! {}; - } - html! { - section class="compose" id="public-new-thread-compose" { - div id="public-new-thread-errors" {} - form id="public-new-thread-form" method="POST" action="/ui" { - input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&json!({ - "action": "post_ingest", - "room": "public", - "thread_tag": {"$form": "thread_tag"}, - "text": {"$form": "text"}, - })).unwrap()); - input type="text" id="new-thread-tag" name="thread_tag" pattern="[a-z0-9_\\-]{1,64}" placeholder="thread-title-slug-here"; - textarea id="new-thread-text" name="text" rows="4" placeholder="Hello threadgoers!! Behold my new thread!" {} - p { button type="submit" { "create thread / make first post" } } - } - } - } -} - -/// Returns the current public thread feed markup for SSE (`#thread-feed`). -pub async fn thread_feed_html(state: &AppState) -> Markup { - let now = now_ms(); - let nav = ThreadNav::public(); - let mut rows = { - let reduced = state.reduced.read().await; - collect_thread_rows_for_scope(&reduced, &ScopeId::Public, now) - }; - rows.sort_by(|a, b| b.last_ts.cmp(&a.last_ts)); - render_thread_feed(Some(&nav), "thread-feed", &rows, now) -} - -/// Returns the current private room thread feed markup for SSE (`#room-thread-feed`). -pub async fn thread_feed_html_for_room(state: &AppState, room_id: &str) -> Markup { - let now = now_ms(); - let Some(nav) = ThreadNav::from_room_id(room_id) else { - return html! { div id="room-thread-feed" { p class="muted" { "room not found" } } }; - }; - let mut rows = { - let reduced = state.reduced.read().await; - collect_thread_rows_for_scope(&reduced, &ScopeId::Room(room_id.to_string()), now) - }; - rows.sort_by(|a, b| b.last_ts.cmp(&a.last_ts)); - render_thread_feed(Some(&nav), "room-thread-feed", &rows, now) -} - -fn render_thread_feed_region_markup( - nav: &ThreadNav, - tag: &str, - display_ingests: &[crate::events::Ingest], - offset: usize, - total: usize, - now: i64, - viewer: Option<&str>, - reduced: &ReducerState, -) -> Markup { - let paginator_top = render_thread_paginator(nav, tag, offset, total, true); - let paginator_bot = render_thread_paginator(nav, tag, offset, total, false); - html! { - div id="thread-feed-region" { - @if display_ingests.is_empty() { - p class="muted" { "no activity yet" } - } @else { - (paginator_top) - @for (i, ing) in display_ingests.iter().enumerate() { - @let post_idx = offset + i; - (ingest_entry_markup(nav, tag, post_idx, ing, viewer, now, reduced)) - } - (paginator_bot) - } - } - } -} - -pub async fn thread_feed_region_markup( - state: &AppState, - room_id: Option<&str>, - tag: &str, - viewer: Option<&str>, -) -> Markup { - let tag = canonicalize_tag(tag); - let Some(nav) = (match room_id { - Some(room_id) => ThreadNav::from_room_id(room_id), - None => Some(ThreadNav::public()), - }) else { - return html! { div id="thread-feed-region" { p class="muted" { "thread not found" } } }; - }; - let scope = nav.scope(); - let all_ids: Vec = { - let reduced = state.reduced.read().await; - reduced - .ingests_by_scope_thread - .get(&(scope.clone(), tag.clone())) - .map(|q| q.iter().rev().cloned().collect()) - .unwrap_or_default() - }; - let total = all_ids.len(); - let offset = total.saturating_sub(PAGE_SIZE); - let page_ids: Vec = all_ids.into_iter().skip(offset).take(PAGE_SIZE).collect(); - let reduced = state.reduced.read().await; - let display_ingests = page_ids - .iter() - .filter_map(|id| reduced.ingests_by_id.get(id).cloned()) - .collect::>(); - render_thread_feed_region_markup( - &nav, - &tag, - &display_ingests, - offset, - total, - now_ms(), - viewer, - &reduced, - ) -} - -/// Home: private rooms (signed-in), then public bump-ordered threads. -pub async fn home( - State(state): State, - headers: HeaderMap, - jar: CookieJar, - uri: Uri, -) -> impl IntoResponse { - let now = now_ms(); - let reduced = state.reduced.read().await; - let user = optional_principal(&headers, &jar, &reduced); - let room_ids = user - .as_ref() - .map(|u| rooms_for_user(&reduced, u)) - .unwrap_or_default(); - let mut public_rows = collect_thread_rows_for_scope(&reduced, &ScopeId::Public, now); - drop(reduced); - public_rows.sort_by(|a, b| b.last_ts.cmp(&a.last_ts)); - - let nav = ThreadNav::public(); - let reduced_read = state.reduced.read().await; - let strip = auth_strip(&headers, &jar, &reduced_read); - drop(reduced_read); - - let page = layout( - "slug.social", - "view-thread", - html! { - (strip) - nav class="breadcrumb" { (bc_threads(None)) } - @if !room_ids.is_empty() { - h2 { "your rooms" } - ul class="thread-feed" { - @for rid in &room_ids { - @if let Some(nav_r) = ThreadNav::from_room_id(rid) { - @let slug = if let Some((_, s)) = rid.split_once('/') { s } else { rid.as_str() }; - li { - a href=(nav_r.room_url()) { - (slug) - span class="muted" { " · " (rid) } - } - } - } - } - } - } - 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=(template_json_compact(&HtmlUiAction::ExpandPublicNewThreadForm).expect("static json")); - button type="submit" class="section-add-btn" { "+" } - } - } - div id="public-new-thread-ui-slot" {} - (render_thread_feed(Some(&nav), "thread-feed", &public_rows, now)) - (cli_panel(&["npx slugsocial public forum list"])) - }, - None, - theme_from_jar(&jar), - &theme_next_from_uri(&uri), - ); - Html(page.into_string()) -} - -#[derive(Debug, Deserialize)] -pub struct ThreadViewQuery { - pub offset: Option, -} - -const PAGE_SIZE: usize = 10; - -fn render_thread_paginator(nav: &ThreadNav, tag: &str, offset: usize, total: usize, top: bool) -> Markup { - let newer_offset = offset.checked_add(PAGE_SIZE).filter(|&o| o < total); - let older_offset = if offset > 0 { - Some(offset.saturating_sub(PAGE_SIZE)) - } else { - None - }; - let latest_offset = total.saturating_sub(PAGE_SIZE); - let on_latest = offset >= latest_offset; - let (id, scroll_href, scroll_label) = if top { - ("top", "#bottom", "↓") - } else { - ("bottom", "#top", "↑") - }; - html! { - div class="thread-paginator" id=(id) { - a href=(scroll_href) class="post-nav-btn" { (scroll_label) } - @if let Some(o) = older_offset { - a href=(nav.thread_page_url(tag, o)) class="post-nav-btn" { "← older" } - } @else { - a href="#" class="post-nav-btn disabled" { "← older" } - } - span class="post-nav-pos muted" { - (offset + 1) "–" (total.min(offset + PAGE_SIZE)) " / " (total) - } - @if let Some(o) = newer_offset { - a href=(nav.thread_page_url(tag, o)) class="post-nav-btn" { "newer →" } - } @else { - a href="#" class="post-nav-btn disabled" { "newer →" } - } - @if !on_latest { - a href=(nav.thread_page_url(tag, latest_offset)) class="post-nav-btn" { "latest" } - } - } - } -} - -async fn thread_view_inner( - state: AppState, - tag: String, - q: ThreadViewQuery, - nav: ThreadNav, - headers: HeaderMap, - jar: CookieJar, - uri: Uri, -) -> impl IntoResponse { - let tag = canonicalize_tag(&tag); - let scope = nav.scope(); - - let all_ids: Vec = { - let reduced = state.reduced.read().await; - reduced - .ingests_by_scope_thread - .get(&(scope.clone(), tag.clone())) - .map(|q| q.iter().rev().cloned().collect()) - .unwrap_or_default() - }; - - let total = all_ids.len(); - let offset = q.offset.unwrap_or(0); - let page_ids: Vec = all_ids.into_iter().skip(offset).take(PAGE_SIZE).collect(); - - let (display_ingests, _subtitle) = { - let reduced = state.reduced.read().await; - let ingests = page_ids - .iter() - .filter_map(|id| reduced.ingests_by_id.get(id).cloned()) - .collect::>(); - (ingests, None::) - }; - - let reduced = state.reduced.read().await; - let user = optional_principal(&headers, &jar, &reduced); - let sc = nav.scope(); - let show_compose = match &sc { - ScopeId::Public => user.is_some(), - ScopeId::Room(rid) => user - .as_ref() - .map(|u| user_can_post_room(&reduced, rid, u)) - .unwrap_or(false), - }; - let strip = auth_strip(&headers, &jar, &reduced); - let now = now_ms(); - let entry_rows: Vec = display_ingests - .iter() - .enumerate() - .map(|(i, ing)| { - let post_idx = offset + i; - ingest_entry_markup(&nav, &tag, post_idx, ing, user.as_deref(), now, &reduced) - }) - .collect(); - drop(reduced); - - let paginator_top = render_thread_paginator(&nav, &tag, offset, total, true); - let paginator_bot = render_thread_paginator(&nav, &tag, offset, total, false); - - let bc: Markup = match &sc { - ScopeId::Public => bc_threads(Some(&tag)), - ScopeId::Room(rid) => { - let slug = if let Some((_, s)) = rid.split_once('/') { - s - } else { - rid.as_str() - }; - bc_room(&nav, slug, Some(&tag)) - } - }; - - let cli = match &sc { - ScopeId::Public => format!("npx slugsocial public forum show {tag}"), - ScopeId::Room(r) => format!("npx slugsocial private {r} forum show {tag}"), - }; - - let page = layout( - &format!("#{tag}"), - "view-thread", - html! { - (strip) - nav class="breadcrumb" { (bc) } - p class="muted" { "top=oldest · bottom=newest" } - div id="thread-feed-region" { - @if display_ingests.is_empty() { - p class="muted" { "no activity yet" } - } @else { - (paginator_top) - @for row in &entry_rows { - (row) - } - (paginator_bot) - } - } - div id="thread-live-region" { - (compose_form(&nav, &tag, show_compose)) - } - (cli_panel(std::slice::from_ref(&cli))) - }, - None, - theme_from_jar(&jar), - &theme_next_from_uri(&uri), - ); - Html(page.into_string()).into_response() -} - -/// Thread view — `/t/:tag` -pub async fn thread_view( - State(state): State, - Path(tag): Path, - Query(q): Query, - headers: HeaderMap, - jar: CookieJar, - uri: Uri, -) -> impl IntoResponse { - thread_view_inner(state, tag, q, ThreadNav::public(), headers, jar, uri).await -} - -/// Room thread — `/r/:short/:slug/t/:tag` -pub async fn room_thread_view( - State(state): State, - Path((room_short, room_slug, tag)): Path<(String, String, String)>, - Query(q): Query, - headers: HeaderMap, - jar: CookieJar, - uri: Uri, -) -> impl IntoResponse { - let room_id = format!("{room_short}/{room_slug}"); - let reduced = state.reduced.read().await; - let user = optional_principal(&headers, &jar, &reduced); - if !user_can_view_room(&reduced, &room_id, user.as_deref()) { - drop(reduced); - return room_not_found_page(&jar, &uri).into_response(); - } - drop(reduced); - let Some(nav) = ThreadNav::from_room_id(&room_id) else { - return (StatusCode::NOT_FOUND, "bad room path").into_response(); - }; - thread_view_inner(state, tag, q, nav, headers, jar, uri) - .await - .into_response() -} - -fn room_not_found_page(jar: &CookieJar, uri: &Uri) -> impl IntoResponse { - let body = html! { - nav class="breadcrumb" { a href="/" { "slug.social" } } - h1 { "not found" } - p { "The requested page could not be found." } - p { a href="/" { "home" } } - }; - let page = layout( - "not found — slug.social", - "view-thread", - body, - None, - theme_from_jar(jar), - &theme_next_from_uri(uri), - ); - (StatusCode::NOT_FOUND, Html(page.into_string())) -} - -/// Private room index — `/r/:short/:slug` -pub async fn room_page( - State(state): State, - Path((room_short, room_slug)): Path<(String, String)>, - headers: HeaderMap, - jar: CookieJar, - uri: Uri, -) -> impl IntoResponse { - let room_id = format!("{room_short}/{room_slug}"); - let now = now_ms(); - let reduced = state.reduced.read().await; - if !reduced.rooms.contains(&room_id) { - drop(reduced); - return (StatusCode::NOT_FOUND, "room not found").into_response(); - } - let user = optional_principal(&headers, &jar, &reduced); - if !user_can_view_room(&reduced, &room_id, user.as_deref()) { - drop(reduced); - return room_not_found_page(&jar, &uri).into_response(); - } - let scope = ScopeId::Room(room_id.clone()); - let mut rows = collect_thread_rows_for_scope(&reduced, &scope, now); - let strip = auth_strip(&headers, &jar, &reduced); - let show_new = user - .as_ref() - .map(|u| user_can_post_room(&reduced, &room_id, u)) - .unwrap_or(false); - rows.sort_by(|a, b| b.last_ts.cmp(&a.last_ts)); - - let Some(nav) = ThreadNav::from_room_id(&room_id) else { - drop(reduced); - return (StatusCode::NOT_FOUND, "room not found").into_response(); - }; - // Precompute markup that needs `&ReducerState`, then release the lock before `layout`. - // `tokio::sync::RwLock` queues new readers behind a waiting writer; holding the read - // guard across HTML/stringify could stall other navigations when an ingest needs a write lock. - let members_markup = room_members_section_markup(&reduced, &room_id, false); - let forum_cli = format!("npx slugsocial private {room_id} forum list"); - let garden_cli = format!("npx slugsocial private {room_id} garden tree"); - let audit_cli = format!("npx slugsocial private {room_id} audit"); - drop(reduced); - - let slug_display = room_slug.as_str(); - let page = layout( - &format!("room {slug_display} — slug.social"), - "view-thread", - html! { - (strip) - nav class="breadcrumb" { (bc_room(&nav, slug_display, None)) } - (members_markup) - h3 { "threads" } - (render_thread_feed(Some(&nav), "room-thread-feed", &rows, now)) - @if show_new { - div id="room-new-thread-ui-slot" { - (new_thread_form_for_room(&nav, true, false)) - } - } - (cli_panel(&[forum_cli, garden_cli, audit_cli])) - }, - None, - theme_from_jar(&jar), - &theme_next_from_uri(&uri), - ); - Html(page.into_string()).into_response() -} - -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" { - "-" - } - } - section class="compose" id="room-new-thread-compose" { - div id="room-new-thread-errors" {} - form id="room-new-thread-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": {"$form": "thread_tag"}, - "text": {"$form": "text"}, - "error_target": "room-new-thread-errors", - "form_id": "room-new-thread-form", - })).unwrap()) { - input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&json!({ - "action": "post_ingest", - "room": nav.room_wire, - "thread_tag": {"$form": "thread_tag"}, - "text": {"$form": "text"}, - "error_target": "room-new-thread-errors", - "form_id": "room-new-thread-form", - })).unwrap()); - input type="text" id="room-new-tag" name="thread_tag" pattern="[a-z0-9_\\-]{1,64}" required placeholder="thread-topic-slug-here"; - textarea name="text" rows="4" placeholder="First post body…" required {} - p { button type="submit" { "post" } } - } - } - } @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) -} - -async fn thread_post_view_inner( - state: AppState, - tag: String, - index_str: String, - nav: ThreadNav, - viewer: Option, - jar: CookieJar, - uri: Uri, -) -> impl IntoResponse { - let tag = canonicalize_tag(&tag); - let index: usize = index_str.parse().unwrap_or(0); - let scope = nav.scope(); - let now = now_ms(); - let (ing, subtitle, body_markup) = { - let reduced = state.reduced.read().await; - let ing = reduced - .ingests_by_scope_thread - .get(&(scope.clone(), tag.clone())) - .and_then(|q| q.iter().rev().nth(index)) - .and_then(|id| reduced.ingests_by_id.get(id).cloned()); - let body = ing.as_ref().map(|i| { - ingest_entry_markup(&nav, &tag, index, i, viewer.as_deref(), now, &reduced) - }); - (ing, None::, body) - }; - - let sc = nav.scope(); - let bc: Markup = match &sc { - ScopeId::Public => bc_threads(Some(&tag)), - ScopeId::Room(rid) => { - let slug = if let Some((_, s)) = rid.split_once('/') { - s - } else { - rid.as_str() - }; - bc_room(&nav, slug, Some(&tag)) - } - }; - - let page = layout( - &format!("#{tag} / post #{index}"), - "view-thread", - html! { - nav class="breadcrumb" { (bc) } - h2 { "#" (tag) @if let Some(sub) = &subtitle { ": " (sub) } " / post #" (index) } - @if let (Some(_ing), Some(bm)) = (&ing, &body_markup) { - (bm) - } @else { - p class="muted" { "post not found" } - } - }, - None, - theme_from_jar(&jar), - &theme_next_from_uri(&uri), - ); - Html(page.into_string()).into_response() -} - -pub async fn thread_post_view( - State(state): State, - Path((tag, index_str)): Path<(String, String)>, - headers: HeaderMap, - jar: CookieJar, - uri: Uri, -) -> impl IntoResponse { - let reduced = state.reduced.read().await; - let viewer = optional_principal(&headers, &jar, &reduced); - drop(reduced); - thread_post_view_inner(state, tag, index_str, ThreadNav::public(), viewer, jar, uri) - .await -} - -pub async fn room_thread_post_view( - State(state): State, - Path((room_short, room_slug, tag, index_str)): Path<(String, String, String, String)>, - headers: HeaderMap, - jar: CookieJar, - uri: Uri, -) -> impl IntoResponse { - let room_id = format!("{room_short}/{room_slug}"); - let reduced = state.reduced.read().await; - let user = optional_principal(&headers, &jar, &reduced); - if !user_can_view_room(&reduced, &room_id, user.as_deref()) { - drop(reduced); - return room_not_found_page(&jar, &uri).into_response(); - } - drop(reduced); - let Some(nav) = ThreadNav::from_room_id(&room_id) else { - return (StatusCode::NOT_FOUND, "bad room path").into_response(); - }; - thread_post_view_inner(state, tag, index_str, nav, user, jar, uri) - .await - .into_response() -} - -pub(crate) async fn thread_ui_expand_post_full( - state: &AppState, - room: &str, - thread_tag: &str, - post_index: usize, - viewer: Option<&str>, -) -> axum::response::Response { - let room = room.trim(); - let tag = canonicalize_tag(thread_tag); - let scope = scope_from_room_wire(room); - let nav = if room.is_empty() || room == "public" { - ThreadNav::public() - } else { - let Some(n) = ThreadNav::from_room_id(room) else { - return super::ui_js_warn("bad room"); - }; - n - }; - if let ScopeId::Room(ref rid) = scope { - let reduced = state.reduced.read().await; - if !user_can_view_room(&reduced, rid, viewer) { - return super::ui_js_warn("forbidden"); - } - } - - let now = now_ms(); - let reduced = state.reduced.read().await; - let ing = reduced - .ingests_by_scope_thread - .get(&(scope.clone(), tag.clone())) - .and_then(|q| q.iter().rev().nth(post_index)) - .and_then(|id| reduced.ingests_by_id.get(id).cloned()); - let Some(ing) = ing else { - return super::ui_js_warn("post not found"); - }; - if reduced.redacted_posts.contains(&ing.id) { - return super::ui_js_warn("post not found"); - } - let ing_id = ing.id.clone(); - drop(reduced); - - let full_html = html! { - div class="ingest-entry" data-ingest-id=(ing_id) { - (post_header_row( - &nav, - &tag, - post_index, - &ing, - viewer, - now, - viewer == Some(ing.principal.as_str()), - )) - (render_linkified_with_embeds_in_scope(&ing.raw, nav.garden_root_url())) - } - }; - - JsBuilder::new() - .morph_selector(&format!("[data-ingest-id=\"{}\"]", ing_id), full_html) - .into_response() -} - -pub(crate) async fn thread_ui_expand_redacted_post( - state: &AppState, - room: &str, - thread_tag: &str, - post_index: usize, - viewer: Option<&str>, -) -> axum::response::Response { - let room = room.trim(); - let tag = canonicalize_tag(thread_tag); - let scope = scope_from_room_wire(room); - let nav = if room.is_empty() || room == "public" { - ThreadNav::public() - } else { - let Some(n) = ThreadNav::from_room_id(room) else { - return super::ui_js_warn("bad room"); - }; - n - }; - if let ScopeId::Room(ref rid) = scope { - let reduced = state.reduced.read().await; - if !user_can_view_room(&reduced, rid, viewer) { - return super::ui_js_warn("forbidden"); - } - } - - let now = now_ms(); - let reduced = state.reduced.read().await; - let ing = reduced - .ingests_by_scope_thread - .get(&(scope.clone(), tag.clone())) - .and_then(|q| q.iter().rev().nth(post_index)) - .and_then(|id| reduced.ingests_by_id.get(id).cloned()); - let Some(ing) = ing else { - return super::ui_js_warn("post not found"); - }; - if !reduced.redacted_posts.contains(&ing.id) { - return super::ui_js_warn("post not found"); - } - let ing_id = ing.id.clone(); - drop(reduced); - - let full_html = html! { - div class="ingest-entry ingest-redacted-expanded" data-ingest-id=(ing_id) { - (redacted_header_row(&nav, &tag, post_index, &ing, now, true)) - (render_linkified_with_embeds_in_scope(&ing.raw, nav.garden_root_url())) - } - }; - - JsBuilder::new() - .morph_selector(&format!("[data-ingest-id=\"{}\"]", ing_id), full_html) - .into_response() -} - -pub(crate) async fn thread_ui_collapse_redacted_post( - state: &AppState, - room: &str, - thread_tag: &str, - post_index: usize, - viewer: Option<&str>, -) -> axum::response::Response { - let room = room.trim(); - let tag = canonicalize_tag(thread_tag); - let scope = scope_from_room_wire(room); - let nav = if room.is_empty() || room == "public" { - ThreadNav::public() - } else { - let Some(n) = ThreadNav::from_room_id(room) else { - return super::ui_js_warn("bad room"); - }; - n - }; - if let ScopeId::Room(ref rid) = scope { - let reduced = state.reduced.read().await; - if !user_can_view_room(&reduced, rid, viewer) { - return super::ui_js_warn("forbidden"); - } - } - - let now = now_ms(); - let reduced = state.reduced.read().await; - let ing = reduced - .ingests_by_scope_thread - .get(&(scope.clone(), tag.clone())) - .and_then(|q| q.iter().rev().nth(post_index)) - .and_then(|id| reduced.ingests_by_id.get(id).cloned()); - let Some(ing) = ing else { - return super::ui_js_warn("post not found"); - }; - if !reduced.redacted_posts.contains(&ing.id) { - return super::ui_js_warn("post not found"); - } - let ing_id = ing.id.clone(); - let collapsed = ingest_entry_markup(&nav, &tag, post_index, &ing, viewer, now, &reduced); - drop(reduced); - - JsBuilder::new() - .morph_selector(&format!("[data-ingest-id=\"{}\"]", ing_id), collapsed) - .into_response() -} - -struct ProfilePostRow { - thread_tag: String, - post_idx: usize, - post_href: String, - ts: i64, - snippet: String, -} - -pub async fn user_profile_page( - State(state): State, - Path(username): Path, - headers: HeaderMap, - jar: CookieJar, - uri: Uri, -) -> impl IntoResponse { - let canon = match parse_username(&username) { - Ok(u) => u, - Err(_) => return (StatusCode::NOT_FOUND, "not found").into_response(), - }; - - let (rows, strip) = { - let reduced = state.reduced.read().await; - let viewer = optional_principal(&headers, &jar, &reduced); - let ids = reduced.visible_posts_for_actor(&canon, viewer.as_deref()); - let mut rows: Vec = Vec::new(); - for id in ids { - if reduced.redacted_posts.contains(&id) { - continue; - } - let Some(ing) = reduced.ingests_by_id.get(&id).cloned() else { - continue; - }; - let Some(nav) = thread_nav_for_ingest(&ing) else { - continue; - }; - let Some(post_idx) = thread_post_index_in_scope(&reduced, &ing) else { - continue; - }; - let tag = canonicalize_tag(&ing.thread_tag); - let post_href = nav.post_url(&tag, post_idx); - let raw_one_line = ing.raw.lines().next().unwrap_or("").trim(); - let snippet: String = raw_one_line.chars().take(120).collect(); - rows.push(ProfilePostRow { - thread_tag: tag, - post_idx, - post_href, - ts: ing.ts, - snippet, - }); - } - rows.sort_by(|a, b| b.ts.cmp(&a.ts)); - let strip = auth_strip(&headers, &jar, &reduced); - (rows, strip) - }; - - let now = now_ms(); - let page = layout( - &format!("@{canon}"), - "view-thread", - html! { - (strip) - nav class="breadcrumb" { - a href="/" { "slug.social" } - (bc_segment(&format!("@{canon}"), &profile_href(&canon), true)) - } - h2 { "@" (canon) } - p class="muted" { "posts (newest first)" } - @if rows.is_empty() { - p class="muted" { "no public posts yet" } - } @else { - ul class="profile-post-list" { - @for r in &rows { - @let hover = timeago::rfc3339_utc(r.ts); - @let ago = timeago::timeago(now, r.ts); - li { - a href=(r.post_href.as_str()) { - "#" (r.thread_tag) - " / #" - (r.post_idx) - } - span class="muted" title=(hover) { " · " (ago) } - @if !r.snippet.is_empty() { - p class="profile-post-snippet muted" { (r.snippet) } - } - } - } - } - } - (cli_panel(&[format!("npx slugsocial public forum list")])) - }, - None, - theme_from_jar(&jar), - &theme_next_from_uri(&uri), - ); - Html(page.into_string()).into_response() -} diff --git a/server/src/html/forum/feed.rs b/server/src/html/forum/feed.rs new file mode 100644 index 0000000000000000000000000000000000000000..30b95ff6e85245a82199c96e41484d03c24989dd --- /dev/null +++ b/server/src/html/forum/feed.rs @@ -0,0 +1,261 @@ +use axum::{ + extract::State, + http::{HeaderMap, Uri}, + response::{Html, IntoResponse}, +}; +use axum_extra::extract::cookie::CookieJar; +use maud::{html, Markup}; + +use crate::api::optional_principal; +use crate::canonical_path::canonicalize_tag; +use crate::reducer::{ReducerState, ScopeId}; +use crate::state::AppState; +use crate::timeago; + +use super::ingest::ingest_entry_markup; +use super::nav::ThreadNav; +use super::page::auth_strip; +use super::paginator::{render_thread_paginator, PAGE_SIZE}; +use crate::html::{ + bc_threads, cli_panel, layout, now_ms, recency_class, theme_from_jar, theme_next_from_uri, +}; + +#[derive(Clone)] +pub(super) struct ThreadRow { + pub(super) tag: String, + pub(super) subtitle: Option, + pub(super) last_ts: i64, + pub(super) ingests: usize, +} + +pub(super) fn collect_thread_rows_for_scope(reduced: &ReducerState, scope: &ScopeId, now: i64) -> Vec { + let _ = now; + reduced + .forum_threads + .iter() + .filter(|((s, _), _)| s == scope) + .map(|((_, tag), thread)| { + let ingests = reduced + .ingests_by_scope_thread + .get(&(scope.clone(), tag.clone())) + .map(|q| q.len()) + .unwrap_or(0); + ThreadRow { + tag: tag.clone(), + subtitle: None, + last_ts: thread.last_activity_ts, + ingests, + } + }) + .collect() +} + +pub(super) fn rooms_for_user(reduced: &ReducerState, username: &str) -> Vec { + let mut v: Vec = reduced + .grants + .iter() + .filter(|(rid, m)| reduced.rooms.contains(*rid) && m.contains_key(username)) + .map(|(rid, _)| rid.clone()) + .collect(); + v.sort(); + v +} + +/// `feed_id` is e.g. `thread-feed` (public bump list, SSE) or `room-thread-feed`. +pub(super) fn render_thread_feed(nav: Option<&ThreadNav>, feed_id: &str, rows: &[ThreadRow], now: i64) -> Markup { + html! { + div id=(feed_id) { + @if rows.is_empty() { + p class="muted" { "no threads yet" } + } @else { + ul class="thread-feed" { + @for r in rows { + @let thread_href = nav + .as_ref() + .map(|n| n.thread_url(&r.tag)) + .unwrap_or_else(|| format!("/t/{}", r.tag)); + @let hover = timeago::rfc3339_utc(r.last_ts); + @let ago = timeago::timeago(now, r.last_ts); + @let age_cls = recency_class(now, r.last_ts); + li class=(age_cls) { + a href=(thread_href) { + "#" (r.tag) + @if let Some(subtitle) = &r.subtitle { + ": " (subtitle) + } + " " + span class="muted" title=(hover) { + (ago) + " · " + (format!("{}n", r.ingests)) + } + } + } + } + } + } + } + } +} + +/// Returns the current public thread feed markup for SSE (`#thread-feed`). +pub async fn thread_feed_html(state: &AppState) -> Markup { + let now = now_ms(); + let nav = ThreadNav::public(); + let mut rows = { + let reduced = state.reduced.read().await; + collect_thread_rows_for_scope(&reduced, &ScopeId::Public, now) + }; + rows.sort_by(|a, b| b.last_ts.cmp(&a.last_ts)); + render_thread_feed(Some(&nav), "thread-feed", &rows, now) +} + +/// Returns the current private room thread feed markup for SSE (`#room-thread-feed`). +pub async fn thread_feed_html_for_room(state: &AppState, room_id: &str) -> Markup { + let now = now_ms(); + let Some(nav) = ThreadNav::from_room_id(room_id) else { + return html! { div id="room-thread-feed" { p class="muted" { "room not found" } } }; + }; + let mut rows = { + let reduced = state.reduced.read().await; + collect_thread_rows_for_scope(&reduced, &ScopeId::Room(room_id.to_string()), now) + }; + rows.sort_by(|a, b| b.last_ts.cmp(&a.last_ts)); + render_thread_feed(Some(&nav), "room-thread-feed", &rows, now) +} + +fn render_thread_feed_region_markup( + nav: &ThreadNav, + tag: &str, + display_ingests: &[crate::events::Ingest], + offset: usize, + total: usize, + now: i64, + viewer: Option<&str>, + reduced: &ReducerState, +) -> Markup { + let paginator_top = render_thread_paginator(nav, tag, offset, total, true); + let paginator_bot = render_thread_paginator(nav, tag, offset, total, false); + html! { + div id="thread-feed-region" { + @if display_ingests.is_empty() { + p class="muted" { "no activity yet" } + } @else { + (paginator_top) + @for (i, ing) in display_ingests.iter().enumerate() { + @let post_idx = offset + i; + (ingest_entry_markup(nav, tag, post_idx, ing, viewer, now, reduced)) + } + (paginator_bot) + } + } + } +} + +pub async fn thread_feed_region_markup( + state: &AppState, + room_id: Option<&str>, + tag: &str, + viewer: Option<&str>, +) -> Markup { + let tag = canonicalize_tag(tag); + let Some(nav) = (match room_id { + Some(room_id) => ThreadNav::from_room_id(room_id), + None => Some(ThreadNav::public()), + }) else { + return html! { div id="thread-feed-region" { p class="muted" { "thread not found" } } }; + }; + let scope = nav.scope(); + let all_ids: Vec = { + let reduced = state.reduced.read().await; + reduced + .ingests_by_scope_thread + .get(&(scope.clone(), tag.clone())) + .map(|q| q.iter().rev().cloned().collect()) + .unwrap_or_default() + }; + let total = all_ids.len(); + let offset = total.saturating_sub(PAGE_SIZE); + let page_ids: Vec = all_ids.into_iter().skip(offset).take(PAGE_SIZE).collect(); + let reduced = state.reduced.read().await; + let display_ingests = page_ids + .iter() + .filter_map(|id| reduced.ingests_by_id.get(id).cloned()) + .collect::>(); + render_thread_feed_region_markup( + &nav, + &tag, + &display_ingests, + offset, + total, + now_ms(), + viewer, + &reduced, + ) +} + +/// Home: private rooms (signed-in), then public bump-ordered threads. +pub async fn home( + State(state): State, + headers: HeaderMap, + jar: CookieJar, + uri: Uri, +) -> impl IntoResponse { + let now = now_ms(); + let reduced = state.reduced.read().await; + let user = optional_principal(&headers, &jar, &reduced); + let room_ids = user + .as_ref() + .map(|u| rooms_for_user(&reduced, u)) + .unwrap_or_default(); + let mut public_rows = collect_thread_rows_for_scope(&reduced, &ScopeId::Public, now); + drop(reduced); + public_rows.sort_by(|a, b| b.last_ts.cmp(&a.last_ts)); + + let nav = ThreadNav::public(); + let reduced_read = state.reduced.read().await; + let strip = auth_strip(&headers, &jar, &reduced_read); + drop(reduced_read); + + use crate::html::ui_action::{HtmlUiAction, UI_RPC_FIELD}; + use crate::form_template::template_json_compact; + + let page = layout( + "slug.social", + "view-thread", + html! { + (strip) + nav class="breadcrumb" { (bc_threads(None)) } + @if !room_ids.is_empty() { + h2 { "your rooms" } + ul class="thread-feed" { + @for rid in &room_ids { + @if let Some(nav_r) = ThreadNav::from_room_id(rid) { + @let slug = if let Some((_, s)) = rid.split_once('/') { s } else { rid.as_str() }; + li { + a href=(nav_r.room_url()) { + (slug) + span class="muted" { " · " (rid) } + } + } + } + } + } + } + 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=(template_json_compact(&HtmlUiAction::ExpandPublicNewThreadForm).expect("static json")); + button type="submit" class="section-add-btn" { "+" } + } + } + div id="public-new-thread-ui-slot" {} + (render_thread_feed(Some(&nav), "thread-feed", &public_rows, now)) + (cli_panel(&["npx slugsocial public forum list"])) + }, + None, + theme_from_jar(&jar), + &theme_next_from_uri(&uri), + ); + Html(page.into_string()) +} diff --git a/server/src/html/forum/ingest.rs b/server/src/html/forum/ingest.rs index c045046a005db4f8f4d1dc7ea74aaaba45e0f3f4..5bd0c09c546e4ab8ed9e03a8c4879efc9bdc7188 100644 --- a/server/src/html/forum/ingest.rs +++ b/server/src/html/forum/ingest.rs @@ -6,7 +6,8 @@ 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 crate::html::{profile_href, render_linkified_with_embeds_in_scope}; +use crate::timeago; use super::nav::ThreadNav; diff --git a/server/src/html/forum/mod.rs b/server/src/html/forum/mod.rs new file mode 100644 index 0000000000000000000000000000000000000000..8fbf3b71f41fafb474999ebb3d622e6bd5b5f313 --- /dev/null +++ b/server/src/html/forum/mod.rs @@ -0,0 +1,29 @@ +//! Forum / thread HTML: public home, room index, thread views, profile, and UI morph helpers. + +mod access; +mod feed; +mod ingest; +mod nav; +mod new_thread; +mod page; +mod paginator; +mod post_single; +mod profile; +mod room_members; +mod thread_morph; +mod views; + +pub use feed::{home, thread_feed_html, thread_feed_html_for_room, thread_feed_region_markup}; +pub use nav::ThreadNav; +pub use post_single::{room_thread_post_view, thread_post_view}; +pub use profile::user_profile_page; +pub use views::{room_page, room_thread_view, thread_view}; + +pub(crate) use access::{user_can_post_room, user_can_view_room}; +pub(crate) use new_thread::{ + fragment_public_new_thread_form, fragment_room_new_thread_form, login_to_post_hint_markup, +}; +pub(crate) use room_members::room_members_section_markup; +pub(crate) use thread_morph::{ + thread_ui_collapse_redacted_post, thread_ui_expand_post_full, thread_ui_expand_redacted_post, +}; diff --git a/server/src/html/forum/page.rs b/server/src/html/forum/page.rs new file mode 100644 index 0000000000000000000000000000000000000000..b0461fc22e0d7b9c865c483362113d60e992e0b8 --- /dev/null +++ b/server/src/html/forum/page.rs @@ -0,0 +1,50 @@ +use axum::http::HeaderMap; +use axum_extra::extract::cookie::CookieJar; +use maud::{html, Markup}; + +use crate::api::optional_principal; +use crate::reducer::ReducerState; + +use super::nav::ThreadNav; +use crate::html::bc_segment; + +pub(super) fn auth_strip( + headers: &HeaderMap, + jar: &CookieJar, + reduced: &ReducerState, +) -> Markup { + match optional_principal(headers, jar, reduced) { + Some(u) => html! { + p class="muted auth-strip" { + "@" (u) + " · " + a href="/logout" { "log out" } + } + }, + None => html! { + p class="muted auth-strip" { + a href="/login" { "log in" } + } + }, + } +} + +pub(super) fn bc_room(nav: &ThreadNav, room_slug: &str, thread_tag: Option<&str>) -> Markup { + html! { + a href="/" { "slug.social" } + @if let Some(t) = thread_tag { + (bc_segment( + &format!("room:{room_slug}"), + nav.room_url(), + false, + )) + (bc_segment(&format!("#{t}"), &nav.thread_url(t), true)) + } @else { + (bc_segment( + &format!("room:{room_slug}"), + nav.room_url(), + true, + )) + } + } +} diff --git a/server/src/html/forum/paginator.rs b/server/src/html/forum/paginator.rs new file mode 100644 index 0000000000000000000000000000000000000000..af2fda58a409673c51669d1d6f23baf7072c979a --- /dev/null +++ b/server/src/html/forum/paginator.rs @@ -0,0 +1,42 @@ +use maud::{html, Markup}; + +use super::nav::ThreadNav; + +pub(super) const PAGE_SIZE: usize = 10; + +pub(super) fn render_thread_paginator(nav: &ThreadNav, tag: &str, offset: usize, total: usize, top: bool) -> Markup { + let newer_offset = offset.checked_add(PAGE_SIZE).filter(|&o| o < total); + let older_offset = if offset > 0 { + Some(offset.saturating_sub(PAGE_SIZE)) + } else { + None + }; + let latest_offset = total.saturating_sub(PAGE_SIZE); + let on_latest = offset >= latest_offset; + let (id, scroll_href, scroll_label) = if top { + ("top", "#bottom", "↓") + } else { + ("bottom", "#top", "↑") + }; + html! { + div class="thread-paginator" id=(id) { + a href=(scroll_href) class="post-nav-btn" { (scroll_label) } + @if let Some(o) = older_offset { + a href=(nav.thread_page_url(tag, o)) class="post-nav-btn" { "← older" } + } @else { + a href="#" class="post-nav-btn disabled" { "← older" } + } + span class="post-nav-pos muted" { + (offset + 1) "–" (total.min(offset + PAGE_SIZE)) " / " (total) + } + @if let Some(o) = newer_offset { + a href=(nav.thread_page_url(tag, o)) class="post-nav-btn" { "newer →" } + } @else { + a href="#" class="post-nav-btn disabled" { "newer →" } + } + @if !on_latest { + a href=(nav.thread_page_url(tag, latest_offset)) class="post-nav-btn" { "latest" } + } + } + } +} diff --git a/server/src/html/forum/post_single.rs b/server/src/html/forum/post_single.rs new file mode 100644 index 0000000000000000000000000000000000000000..c316f8f836df9d4ef9c05ebd9e54f699540e6d72 --- /dev/null +++ b/server/src/html/forum/post_single.rs @@ -0,0 +1,115 @@ +use axum::{ + extract::{Path, State}, + http::{HeaderMap, StatusCode, Uri}, + response::{Html, IntoResponse}, +}; +use axum_extra::extract::cookie::CookieJar; +use maud::html; + +use crate::api::optional_principal; +use crate::canonical_path::canonicalize_tag; +use crate::reducer::ScopeId; +use crate::state::AppState; + +use super::access::user_can_view_room; +use super::ingest::ingest_entry_markup; +use super::nav::ThreadNav; +use super::page::bc_room; +use super::views::room_not_found_page; +use crate::html::{bc_threads, layout, now_ms, theme_from_jar, theme_next_from_uri}; +use maud::Markup; + +async fn thread_post_view_inner( + state: AppState, + tag: String, + index_str: String, + nav: ThreadNav, + viewer: Option, + jar: CookieJar, + uri: Uri, +) -> impl IntoResponse { + let tag = canonicalize_tag(&tag); + let index: usize = index_str.parse().unwrap_or(0); + let scope = nav.scope(); + let now = now_ms(); + let (ing, subtitle, body_markup) = { + let reduced = state.reduced.read().await; + let ing = reduced + .ingests_by_scope_thread + .get(&(scope.clone(), tag.clone())) + .and_then(|q| q.iter().rev().nth(index)) + .and_then(|id| reduced.ingests_by_id.get(id).cloned()); + let body = ing.as_ref().map(|i| { + ingest_entry_markup(&nav, &tag, index, i, viewer.as_deref(), now, &reduced) + }); + (ing, None::, body) + }; + + let sc = nav.scope(); + let bc: Markup = match &sc { + ScopeId::Public => bc_threads(Some(&tag)), + ScopeId::Room(rid) => { + let slug = if let Some((_, s)) = rid.split_once('/') { + s + } else { + rid.as_str() + }; + bc_room(&nav, slug, Some(&tag)) + } + }; + + let page = layout( + &format!("#{tag} / post #{index}"), + "view-thread", + html! { + nav class="breadcrumb" { (bc) } + h2 { "#" (tag) @if let Some(sub) = &subtitle { ": " (sub) } " / post #" (index) } + @if let (Some(_ing), Some(bm)) = (&ing, &body_markup) { + (bm) + } @else { + p class="muted" { "post not found" } + } + }, + None, + theme_from_jar(&jar), + &theme_next_from_uri(&uri), + ); + Html(page.into_string()).into_response() +} + +pub async fn thread_post_view( + State(state): State, + Path((tag, index_str)): Path<(String, String)>, + headers: HeaderMap, + jar: CookieJar, + uri: Uri, +) -> impl IntoResponse { + let reduced = state.reduced.read().await; + let viewer = optional_principal(&headers, &jar, &reduced); + drop(reduced); + thread_post_view_inner(state, tag, index_str, ThreadNav::public(), viewer, jar, uri) + .await +} + +pub async fn room_thread_post_view( + State(state): State, + Path((room_short, room_slug, tag, index_str)): Path<(String, String, String, String)>, + headers: HeaderMap, + jar: CookieJar, + uri: Uri, +) -> impl IntoResponse { + let room_id = format!("{room_short}/{room_slug}"); + let reduced = state.reduced.read().await; + let user = optional_principal(&headers, &jar, &reduced); + if !user_can_view_room(&reduced, &room_id, user.as_deref()) { + drop(reduced); + return room_not_found_page(&jar, &uri).into_response(); + } + drop(reduced); + let Some(nav) = ThreadNav::from_room_id(&room_id) else { + return (StatusCode::NOT_FOUND, "bad room path").into_response(); + }; + thread_post_view_inner(state, tag, index_str, nav, user, jar, uri) + .await + .into_response() +} diff --git a/server/src/html/forum/profile.rs b/server/src/html/forum/profile.rs new file mode 100644 index 0000000000000000000000000000000000000000..6f9574a975bd0a33460bb2ab79760c272019f6bf --- /dev/null +++ b/server/src/html/forum/profile.rs @@ -0,0 +1,116 @@ +use axum::{ + extract::{Path, State}, + http::{HeaderMap, StatusCode, Uri}, + response::{Html, IntoResponse}, +}; +use axum_extra::extract::cookie::CookieJar; +use maud::html; + +use crate::api::optional_principal; +use crate::canonical_path::canonicalize_tag; +use crate::identity::parse_username; +use crate::state::AppState; + +use super::ingest::{thread_nav_for_ingest, thread_post_index_in_scope}; +use super::page::auth_strip; +use crate::timeago; +use crate::html::{ + bc_segment, cli_panel, layout, now_ms, profile_href, theme_from_jar, theme_next_from_uri, +}; + +struct ProfilePostRow { + thread_tag: String, + post_idx: usize, + post_href: String, + ts: i64, + snippet: String, +} + +pub async fn user_profile_page( + State(state): State, + Path(username): Path, + headers: HeaderMap, + jar: CookieJar, + uri: Uri, +) -> impl IntoResponse { + let canon = match parse_username(&username) { + Ok(u) => u, + Err(_) => return (StatusCode::NOT_FOUND, "not found").into_response(), + }; + + let (rows, strip) = { + let reduced = state.reduced.read().await; + let viewer = optional_principal(&headers, &jar, &reduced); + let ids = reduced.visible_posts_for_actor(&canon, viewer.as_deref()); + let mut rows: Vec = Vec::new(); + for id in ids { + if reduced.redacted_posts.contains(&id) { + continue; + } + let Some(ing) = reduced.ingests_by_id.get(&id).cloned() else { + continue; + }; + let Some(nav) = thread_nav_for_ingest(&ing) else { + continue; + }; + let Some(post_idx) = thread_post_index_in_scope(&reduced, &ing) else { + continue; + }; + let tag = canonicalize_tag(&ing.thread_tag); + let post_href = nav.post_url(&tag, post_idx); + let raw_one_line = ing.raw.lines().next().unwrap_or("").trim(); + let snippet: String = raw_one_line.chars().take(120).collect(); + rows.push(ProfilePostRow { + thread_tag: tag, + post_idx, + post_href, + ts: ing.ts, + snippet, + }); + } + rows.sort_by(|a, b| b.ts.cmp(&a.ts)); + let strip = auth_strip(&headers, &jar, &reduced); + (rows, strip) + }; + + let now = now_ms(); + let page = layout( + &format!("@{canon}"), + "view-thread", + html! { + (strip) + nav class="breadcrumb" { + a href="/" { "slug.social" } + (bc_segment(&format!("@{canon}"), &profile_href(&canon), true)) + } + h2 { "@" (canon) } + p class="muted" { "posts (newest first)" } + @if rows.is_empty() { + p class="muted" { "no public posts yet" } + } @else { + ul class="profile-post-list" { + @for r in &rows { + @let hover = timeago::rfc3339_utc(r.ts); + @let ago = timeago::timeago(now, r.ts); + li { + a href=(r.post_href.as_str()) { + "#" (r.thread_tag) + " / #" + (r.post_idx) + } + span class="muted" title=(hover) { " · " (ago) } + @if !r.snippet.is_empty() { + p class="profile-post-snippet muted" { (r.snippet) } + } + } + } + } + } + (cli_panel(&[format!("npx slugsocial public forum list")])) + }, + None, + theme_from_jar(&jar), + &theme_next_from_uri(&uri), + ); + Html(page.into_string()).into_response() +} diff --git a/server/src/html/forum/thread_morph.rs b/server/src/html/forum/thread_morph.rs new file mode 100644 index 0000000000000000000000000000000000000000..77ac43b159a7f353e47b1f8368da07bb4392daf8 --- /dev/null +++ b/server/src/html/forum/thread_morph.rs @@ -0,0 +1,171 @@ +use maud::html; + +use crate::canonical_path::canonicalize_tag; +use crate::reducer::{scope_from_room_wire, ScopeId}; +use crate::state::AppState; + +use super::access::user_can_view_room; +use super::ingest::{ingest_entry_markup, post_header_row, redacted_header_row}; +use super::nav::ThreadNav; +use crate::html::{render_linkified_with_embeds_in_scope, JsBuilder, now_ms}; + +pub(crate) async fn thread_ui_expand_post_full( + state: &AppState, + room: &str, + thread_tag: &str, + post_index: usize, + viewer: Option<&str>, +) -> axum::response::Response { + let room = room.trim(); + let tag = canonicalize_tag(thread_tag); + let scope = scope_from_room_wire(room); + let nav = if room.is_empty() || room == "public" { + ThreadNav::public() + } else { + let Some(n) = ThreadNav::from_room_id(room) else { + return crate::html::ui_js_warn("bad room"); + }; + n + }; + if let ScopeId::Room(ref rid) = scope { + let reduced = state.reduced.read().await; + if !user_can_view_room(&reduced, rid, viewer) { + return crate::html::ui_js_warn("forbidden"); + } + } + + let now = now_ms(); + let reduced = state.reduced.read().await; + let ing = reduced + .ingests_by_scope_thread + .get(&(scope.clone(), tag.clone())) + .and_then(|q| q.iter().rev().nth(post_index)) + .and_then(|id| reduced.ingests_by_id.get(id).cloned()); + let Some(ing) = ing else { + return crate::html::ui_js_warn("post not found"); + }; + if reduced.redacted_posts.contains(&ing.id) { + return crate::html::ui_js_warn("post not found"); + } + let ing_id = ing.id.clone(); + drop(reduced); + + let full_html = html! { + div class="ingest-entry" data-ingest-id=(ing_id) { + (post_header_row( + &nav, + &tag, + post_index, + &ing, + viewer, + now, + viewer == Some(ing.principal.as_str()), + )) + (render_linkified_with_embeds_in_scope(&ing.raw, nav.garden_root_url())) + } + }; + + JsBuilder::new() + .morph_selector(&format!("[data-ingest-id=\"{}\"]", ing_id), full_html) + .into_response() +} + +pub(crate) async fn thread_ui_expand_redacted_post( + state: &AppState, + room: &str, + thread_tag: &str, + post_index: usize, + viewer: Option<&str>, +) -> axum::response::Response { + let room = room.trim(); + let tag = canonicalize_tag(thread_tag); + let scope = scope_from_room_wire(room); + let nav = if room.is_empty() || room == "public" { + ThreadNav::public() + } else { + let Some(n) = ThreadNav::from_room_id(room) else { + return crate::html::ui_js_warn("bad room"); + }; + n + }; + if let ScopeId::Room(ref rid) = scope { + let reduced = state.reduced.read().await; + if !user_can_view_room(&reduced, rid, viewer) { + return crate::html::ui_js_warn("forbidden"); + } + } + + let now = now_ms(); + let reduced = state.reduced.read().await; + let ing = reduced + .ingests_by_scope_thread + .get(&(scope.clone(), tag.clone())) + .and_then(|q| q.iter().rev().nth(post_index)) + .and_then(|id| reduced.ingests_by_id.get(id).cloned()); + let Some(ing) = ing else { + return crate::html::ui_js_warn("post not found"); + }; + if !reduced.redacted_posts.contains(&ing.id) { + return crate::html::ui_js_warn("post not found"); + } + let ing_id = ing.id.clone(); + drop(reduced); + + let full_html = html! { + div class="ingest-entry ingest-redacted-expanded" data-ingest-id=(ing_id) { + (redacted_header_row(&nav, &tag, post_index, &ing, now, true)) + (render_linkified_with_embeds_in_scope(&ing.raw, nav.garden_root_url())) + } + }; + + JsBuilder::new() + .morph_selector(&format!("[data-ingest-id=\"{}\"]", ing_id), full_html) + .into_response() +} + +pub(crate) async fn thread_ui_collapse_redacted_post( + state: &AppState, + room: &str, + thread_tag: &str, + post_index: usize, + viewer: Option<&str>, +) -> axum::response::Response { + let room = room.trim(); + let tag = canonicalize_tag(thread_tag); + let scope = scope_from_room_wire(room); + let nav = if room.is_empty() || room == "public" { + ThreadNav::public() + } else { + let Some(n) = ThreadNav::from_room_id(room) else { + return crate::html::ui_js_warn("bad room"); + }; + n + }; + if let ScopeId::Room(ref rid) = scope { + let reduced = state.reduced.read().await; + if !user_can_view_room(&reduced, rid, viewer) { + return crate::html::ui_js_warn("forbidden"); + } + } + + let now = now_ms(); + let reduced = state.reduced.read().await; + let ing = reduced + .ingests_by_scope_thread + .get(&(scope.clone(), tag.clone())) + .and_then(|q| q.iter().rev().nth(post_index)) + .and_then(|id| reduced.ingests_by_id.get(id).cloned()); + let Some(ing) = ing else { + return crate::html::ui_js_warn("post not found"); + }; + if !reduced.redacted_posts.contains(&ing.id) { + return crate::html::ui_js_warn("post not found"); + } + let ing_id = ing.id.clone(); + let collapsed = ingest_entry_markup(&nav, &tag, post_index, &ing, viewer, now, &reduced); + drop(reduced); + + JsBuilder::new() + .morph_selector(&format!("[data-ingest-id=\"{}\"]", ing_id), collapsed) + .into_response() +} diff --git a/server/src/html/forum/views.rs b/server/src/html/forum/views.rs new file mode 100644 index 0000000000000000000000000000000000000000..be08491b893f5960723e77c7f7fb9d416100f0fb --- /dev/null +++ b/server/src/html/forum/views.rs @@ -0,0 +1,290 @@ +use axum::{ + extract::{Path, Query, State}, + http::{HeaderMap, StatusCode, Uri}, + response::{Html, IntoResponse}, +}; +use axum_extra::extract::cookie::CookieJar; +use maud::{html, Markup}; +use serde::Deserialize; +use serde_json::json; + +use crate::api::optional_principal; +use crate::canonical_path::canonicalize_tag; +use crate::form_template::template_json_compact; +use crate::reducer::ScopeId; +use crate::state::AppState; + +use super::access::user_can_post_room; +use super::access::user_can_view_room; +use super::feed::{collect_thread_rows_for_scope, render_thread_feed}; +use super::ingest::ingest_entry_markup; +use super::nav::ThreadNav; +use super::new_thread::fragment_room_new_thread_form; +use super::page::{auth_strip, bc_room}; +use super::paginator::{render_thread_paginator, PAGE_SIZE}; +use super::room_members::room_members_section_markup; +use crate::html::ui_action::UI_RPC_FIELD; +use crate::html::{ + bc_threads, cli_panel, layout, now_ms, theme_from_jar, theme_next_from_uri, +}; + +fn compose_form(nav: &ThreadNav, thread_tag: &str, show: bool) -> Markup { + if !show { + return html! {}; + } + html! { + section class="compose" id="thread-compose" { + 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" } + } + } + div id="thread-compose-errors" {} + } + } +} + +#[derive(Debug, Deserialize)] +pub struct ThreadViewQuery { + pub offset: Option, +} + +async fn thread_view_inner( + state: AppState, + tag: String, + q: ThreadViewQuery, + nav: ThreadNav, + headers: HeaderMap, + jar: CookieJar, + uri: Uri, +) -> impl IntoResponse { + let tag = canonicalize_tag(&tag); + let scope = nav.scope(); + + let all_ids: Vec = { + let reduced = state.reduced.read().await; + reduced + .ingests_by_scope_thread + .get(&(scope.clone(), tag.clone())) + .map(|q| q.iter().rev().cloned().collect()) + .unwrap_or_default() + }; + + let total = all_ids.len(); + let offset = q.offset.unwrap_or(0); + let page_ids: Vec = all_ids.into_iter().skip(offset).take(PAGE_SIZE).collect(); + + let (display_ingests, _subtitle) = { + let reduced = state.reduced.read().await; + let ingests = page_ids + .iter() + .filter_map(|id| reduced.ingests_by_id.get(id).cloned()) + .collect::>(); + (ingests, None::) + }; + + let reduced = state.reduced.read().await; + let user = optional_principal(&headers, &jar, &reduced); + let sc = nav.scope(); + let show_compose = match &sc { + ScopeId::Public => user.is_some(), + ScopeId::Room(rid) => user + .as_ref() + .map(|u| user_can_post_room(&reduced, rid, u)) + .unwrap_or(false), + }; + let strip = auth_strip(&headers, &jar, &reduced); + let now = now_ms(); + let entry_rows: Vec = display_ingests + .iter() + .enumerate() + .map(|(i, ing)| { + let post_idx = offset + i; + ingest_entry_markup(&nav, &tag, post_idx, ing, user.as_deref(), now, &reduced) + }) + .collect(); + drop(reduced); + + let paginator_top = render_thread_paginator(&nav, &tag, offset, total, true); + let paginator_bot = render_thread_paginator(&nav, &tag, offset, total, false); + + let bc: Markup = match &sc { + ScopeId::Public => bc_threads(Some(&tag)), + ScopeId::Room(rid) => { + let slug = if let Some((_, s)) = rid.split_once('/') { + s + } else { + rid.as_str() + }; + bc_room(&nav, slug, Some(&tag)) + } + }; + + let cli = match &sc { + ScopeId::Public => format!("npx slugsocial public forum show {tag}"), + ScopeId::Room(r) => format!("npx slugsocial private {r} forum show {tag}"), + }; + + let page = layout( + &format!("#{tag}"), + "view-thread", + html! { + (strip) + nav class="breadcrumb" { (bc) } + p class="muted" { "top=oldest · bottom=newest" } + div id="thread-feed-region" { + @if display_ingests.is_empty() { + p class="muted" { "no activity yet" } + } @else { + (paginator_top) + @for row in &entry_rows { + (row) + } + (paginator_bot) + } + } + div id="thread-live-region" { + (compose_form(&nav, &tag, show_compose)) + } + (cli_panel(std::slice::from_ref(&cli))) + }, + None, + theme_from_jar(&jar), + &theme_next_from_uri(&uri), + ); + Html(page.into_string()).into_response() +} + +/// Thread view — `/t/:tag` +pub async fn thread_view( + State(state): State, + Path(tag): Path, + Query(q): Query, + headers: HeaderMap, + jar: CookieJar, + uri: Uri, +) -> impl IntoResponse { + thread_view_inner(state, tag, q, ThreadNav::public(), headers, jar, uri).await +} + +/// Room thread — `/r/:short/:slug/t/:tag` +pub async fn room_thread_view( + State(state): State, + Path((room_short, room_slug, tag)): Path<(String, String, String)>, + Query(q): Query, + headers: HeaderMap, + jar: CookieJar, + uri: Uri, +) -> impl IntoResponse { + let room_id = format!("{room_short}/{room_slug}"); + let reduced = state.reduced.read().await; + let user = optional_principal(&headers, &jar, &reduced); + if !user_can_view_room(&reduced, &room_id, user.as_deref()) { + drop(reduced); + return room_not_found_page(&jar, &uri).into_response(); + } + drop(reduced); + let Some(nav) = ThreadNav::from_room_id(&room_id) else { + return (StatusCode::NOT_FOUND, "bad room path").into_response(); + }; + thread_view_inner(state, tag, q, nav, headers, jar, uri) + .await + .into_response() +} + +pub(super) fn room_not_found_page(jar: &CookieJar, uri: &Uri) -> impl IntoResponse { + let body = html! { + nav class="breadcrumb" { a href="/" { "slug.social" } } + h1 { "not found" } + p { "The requested page could not be found." } + p { a href="/" { "home" } } + }; + let page = layout( + "not found — slug.social", + "view-thread", + body, + None, + theme_from_jar(jar), + &theme_next_from_uri(uri), + ); + (StatusCode::NOT_FOUND, Html(page.into_string())) +} + +/// Private room index — `/r/:short/:slug` +pub async fn room_page( + State(state): State, + Path((room_short, room_slug)): Path<(String, String)>, + headers: HeaderMap, + jar: CookieJar, + uri: Uri, +) -> impl IntoResponse { + let room_id = format!("{room_short}/{room_slug}"); + let now = now_ms(); + let reduced = state.reduced.read().await; + if !reduced.rooms.contains(&room_id) { + drop(reduced); + return (StatusCode::NOT_FOUND, "room not found").into_response(); + } + let user = optional_principal(&headers, &jar, &reduced); + if !user_can_view_room(&reduced, &room_id, user.as_deref()) { + drop(reduced); + return room_not_found_page(&jar, &uri).into_response(); + } + let scope = ScopeId::Room(room_id.clone()); + let mut rows = collect_thread_rows_for_scope(&reduced, &scope, now); + let strip = auth_strip(&headers, &jar, &reduced); + let show_new = user + .as_ref() + .map(|u| user_can_post_room(&reduced, &room_id, u)) + .unwrap_or(false); + rows.sort_by(|a, b| b.last_ts.cmp(&a.last_ts)); + + let Some(nav) = ThreadNav::from_room_id(&room_id) else { + drop(reduced); + return (StatusCode::NOT_FOUND, "room not found").into_response(); + }; + let members_markup = room_members_section_markup(&reduced, &room_id, false); + let forum_cli = format!("npx slugsocial private {room_id} forum list"); + let garden_cli = format!("npx slugsocial private {room_id} garden tree"); + let audit_cli = format!("npx slugsocial private {room_id} audit"); + drop(reduced); + + let slug_display = room_slug.as_str(); + let page = layout( + &format!("room {slug_display} — slug.social"), + "view-thread", + html! { + (strip) + nav class="breadcrumb" { (bc_room(&nav, slug_display, None)) } + (members_markup) + h3 { "threads" } + (render_thread_feed(Some(&nav), "room-thread-feed", &rows, now)) + @if show_new { + div id="room-new-thread-ui-slot" { + (fragment_room_new_thread_form(&nav, true, false)) + } + } + (cli_panel(&[forum_cli, garden_cli, audit_cli])) + }, + None, + theme_from_jar(&jar), + &theme_next_from_uri(&uri), + ); + Html(page.into_string()).into_response() +} Side B — contributor: tommy-mor Side B — commit message: [8f6be6d0] Add copy button for garden rankings (markdown clipboard) (#168) * Add garden ranking markdown copy button via POST /ui Introduce HtmlUiAction::CopyGardenRank that rebuilds the visible child ranking and returns JsBuilder clipboard JS (fetch → eval), matching CopyThread. Place a copy control on garden ranking headings; clipboard text is a concise markdown numbered list with unranked bullets. Co-authored-by: tommy * Fix paren balance in garden ranking copy browser test Co-authored-by: tommy --------- Co-authored-by: Cursor Agent Side B — unified diff (full patch): diff --git a/agents.md b/agents.md index 7d6fea5791f7c95677e17e8975a14df83f998fd6..1dc989e4b23071f2eef69f2479c9a1ca2bd04b32 100644 --- a/agents.md +++ b/agents.md @@ -40,6 +40,8 @@ Strict **CSP** that blocks `eval` would break the current app. Other projects ma - **Non-morph `POST /ui` responses:** **`SetGardenPin`** returns **`303 See Other`** and **`Set-Cookie`** (same as **`POST /theme`**). Garden pin/unpin is a normal **`
`** — browser navigation applies cookies reliably (see **`test/browser_garden_pin.clj`**). Each **`__rpc__`** payload includes **`form_action: "/ui"`**; **`post_ui_html`** rejects mismatches to bind tokens to the UI endpoint. +- **`CopyGardenRank`:** Browser copy control on garden ranking headings. Returns **`text/javascript`** via **`JsBuilder::clipboard_write_text_and_label_btn`** (same **`fetch` → `eval`** loop as **`CopyThread`**). Payload includes **`room`**, **`parent_path`**, **`depth`**, **`copy_btn_id`**, and optional **`external_hosts`** (for **`/-/`** host-root indexes). Clipboard text is a concise markdown numbered list of display paths (plus unranked bullets). + - **`VoteComparePost`:** On success returns **`text/javascript`** that **morphs** **`#vote-edge-history-region`** (recomputed **`
    `** — ratios match **`left`/`right`** query order, bullets, sorted by strength toward **`left`** then newer) and **`.vote-compare-nav`** (fresh next-pair link). The compare **`GET`** page uses **`layout_full_bleed_chromeless`** (no breadcrumbs, no **`#controls`**, no **`slug-pin-hud`**; **`view-vote-compare-fullscreen`** full-width **`body`**). **`__rpc__`** carries **`form_action: "/ui"`**; **`thread_tag`** and ratio fields come from the same form as **`$form`** holes. **Guests** on a shared pair see the compose UI with **`post vote`** as a link to **`/login?next=`** (class **`vote-compare-login-cta`**); after OAuth / username selection they return to that matchup. An unauthenticated **`VoteComparePost`** (forged/stale form) still JS-redirects to the same **`/login?next=`** target. - **`ThreadGraduate` / `GraduateThread`:** Private-room forum threads with **Manage** can be published to the public site under the same tag. The writer replays non-redacted ingests into **`room: public`** (chronological order), then appends a durable **`ThreadGraduated`** marker. Graduated private threads show a banner linking to public **`/t/:tag`**, block further private posts, and cannot be graduated twice. CLI: **`npx slugsocial private forum graduate `**; RPC: **`ThreadGraduate`**. diff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs index b4a0c9e87e462050bd52728e49e0d6781bf1cfc8..611956d0a46062b49ce350be176e4be139312ff0 100644 --- a/server/src/api/ui_html.rs +++ b/server/src/api/ui_html.rs @@ -24,9 +24,9 @@ use crate::{ external_resolver_status_markup, fragment_new_thread_slot, login_to_post_hint_markup, parse_html_ui_from_form, room_members_section_markup, thread_feed_html, thread_feed_html_for_room, thread_feed_region_markup, thread_ui_collapse_redacted_post, - thread_ui_copy_thread, - thread_ui_expand_post_full, thread_ui_expand_redacted_post, ui_js_warn, user_can_post_room, - user_can_view_room, HtmlUiAction, JsBuilder, ThreadNav, + garden_ui_copy_rank, thread_ui_copy_thread, thread_ui_expand_post_full, + thread_ui_expand_redacted_post, ui_js_warn, user_can_post_room, user_can_view_room, + HtmlUiAction, JsBuilder, ThreadNav, }, reducer::{scope_from_room_wire, ScopeId}, state::AppState, @@ -575,6 +575,25 @@ async fn dispatch_ui_action( let viewer = session.map(|s| s.username.as_str()); thread_ui_copy_thread(state, &room, &thread_tag, ©_btn_id, viewer).await } + HtmlUiAction::CopyGardenRank { + room, + parent_path, + depth, + copy_btn_id, + external_hosts, + } => { + let viewer = session.map(|s| s.username.as_str()); + garden_ui_copy_rank( + state, + &room, + &parent_path, + depth, + ©_btn_id, + external_hosts, + viewer, + ) + .await + } HtmlUiAction::GraduateThread { room, thread_tag } => { let Some(session) = session else { return js_redirect("/login").into_response(); diff --git a/server/src/html/garden/copy.rs b/server/src/html/garden/copy.rs new file mode 100644 index 0000000000000000000000000000000000000000..271ea87c34c99e23ab1b0d8572632fdc41380b78 --- /dev/null +++ b/server/src/html/garden/copy.rs @@ -0,0 +1,199 @@ +//! Copy garden rankings to the clipboard as concise markdown (POST /ui + JsBuilder eval). + +use crate::form_template::template_json_compact; +use crate::html::forum::ThreadNav; +use crate::html::js_string_literal; +use crate::html::ui_action::HtmlUiAction; +use crate::html::{JsBuilder, ui_js_warn}; +use crate::path_types::ItemId; +use crate::reducer::scope_from_room_wire; +use crate::scope_rank::{ + build_children_rankings, build_rankings_for_item_set, external_root_host_items, + resolve_scope_recursive, ChildrenRankings, +}; +use crate::state::AppState; +use maud::{html, Markup}; + +use super::access::user_can_view_room; +use super::item::item_display_path; +use crate::reducer::{ContentState, ScopeId}; + +const COPY_BTN_ID: &str = "garden-rank-copy"; + +/// `POST /ui` + `__rpc__` from an inline button; response body is `eval`'d (same as forum copy). +fn garden_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) + ) +} + +/// Concise markdown for ranked child groups (numbered lists + unranked bullets). +pub(crate) fn format_garden_rank_markdown(rankings: &ChildrenRankings) -> String { + let mut out = String::new(); + let multi = rankings.component_rankings.len() > 1; + for (ci, comp) in rankings.component_rankings.iter().enumerate() { + if ci > 0 { + out.push('\n'); + } + if multi { + out.push_str(&format!("### ordering {}\n\n", ci + 1)); + } + for (i, r) in comp.ranked.iter().enumerate() { + out.push_str(&format!( + "{}. {}\n", + i + 1, + item_display_path(r.item.as_str()) + )); + } + } + if !rankings.unranked_items.is_empty() { + if !out.is_empty() { + out.push('\n'); + } + for name in &rankings.unranked_items { + out.push_str(&format!("- {}\n", item_display_path(name.as_str()))); + } + } + out +} + +fn rankings_for_copy( + state_content: &crate::reducer::ContentState, + parent_path: &str, + depth: usize, + external_hosts: bool, +) -> ChildrenRankings { + if external_hosts { + let hosts = external_root_host_items(state_content); + return build_rankings_for_item_set(state_content, &hosts); + } + let parent = ItemId::parse(parent_path.trim()) + .unwrap_or_else(|| ItemId::ontology_root()) + .normalized_storage(); + let depth = depth.clamp(1, 5); + if depth > 1 { + let items = resolve_scope_recursive(state_content, &[parent.as_str().to_string()], depth); + build_rankings_for_item_set(state_content, &items) + } else { + build_children_rankings(state_content, &parent) + } +} + +pub(crate) async fn garden_ui_copy_rank( + state: &AppState, + room: &str, + parent_path: &str, + depth: usize, + copy_btn_id: &str, + external_hosts: bool, + viewer: Option<&str>, +) -> axum::response::Response { + let room = room.trim(); + let scope = scope_from_room_wire(room); + if let ScopeId::Room(ref rid) = scope { + let reduced = state.reduced.read().await; + if !user_can_view_room(&reduced, rid, viewer) { + return ui_js_warn("forbidden"); + } + } + + let reduced = state.reduced.read().await; + let empty = ContentState::default(); + let content = match &scope { + ScopeId::Public => reduced.public(), + ScopeId::Room(_) => reduced.content_for_scope(&scope).unwrap_or(&empty), + }; + let rankings = rankings_for_copy(content, parent_path, depth, external_hosts); + let text = format_garden_rank_markdown(&rankings); + drop(reduced); + + if text.is_empty() { + return ui_js_warn("nothing to copy"); + } + + JsBuilder::new() + .clipboard_write_text_and_label_btn(&text, copy_btn_id, "copied") + .into_response() +} + +pub(super) fn garden_rank_copy_button_markup( + nav: &ThreadNav, + parent_path: &str, + depth: usize, + external_hosts: bool, +) -> Markup { + let rpc = template_json_compact(&HtmlUiAction::CopyGardenRank { + room: nav.room_wire.clone(), + parent_path: parent_path.to_string(), + depth, + copy_btn_id: COPY_BTN_ID.to_string(), + external_hosts, + }) + .expect("CopyGardenRank serializes"); + html! { + button type="button" id=(COPY_BTN_ID) class="post-nav-btn ont-rank-copy-btn" title="Copy ranking as markdown" + onclick=(garden_ui_fetch_onclick(&rpc)) { + "copy" + } + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::path_types::ItemId; + use crate::ranking::RankedItem; + use crate::scope_rank::ScopedComponent; + + #[test] + fn markdown_single_component_and_unranked() { + let rankings = ChildrenRankings { + component_rankings: vec![ScopedComponent { + pairs: 1, + ranked: vec![ + RankedItem { + item: ItemId::parse("~/a").unwrap(), + score: 0.9, + }, + RankedItem { + item: ItemId::parse("~/b").unwrap(), + score: 0.1, + }, + ], + }], + unranked_items: vec![ItemId::parse("~/c").unwrap()], + }; + assert_eq!( + format_garden_rank_markdown(&rankings), + "1. ~/a\n2. ~/b\n\n- ~/c\n" + ); + } + + #[test] + fn markdown_multi_component_headers() { + let rankings = ChildrenRankings { + component_rankings: vec![ + ScopedComponent { + pairs: 1, + ranked: vec![RankedItem { + item: ItemId::parse("~/a").unwrap(), + score: 1.0, + }], + }, + ScopedComponent { + pairs: 1, + ranked: vec![RankedItem { + item: ItemId::parse("~/b").unwrap(), + score: 1.0, + }], + }, + ], + unranked_items: vec![], + }; + assert_eq!( + format_garden_rank_markdown(&rankings), + "### ordering 1\n\n1. ~/a\n\n### ordering 2\n\n1. ~/b\n" + ); + } +} diff --git a/server/src/html/garden/mod.rs b/server/src/html/garden/mod.rs index ee8696727e5473fe1fa913b8a7b9f3cb9c32d12f..69012a2c1d069e47fa611d63d3bd2a329fd6255d 100644 --- a/server/src/html/garden/mod.rs +++ b/server/src/html/garden/mod.rs @@ -2,6 +2,7 @@ mod access; mod browse; +mod copy; mod external; mod item; mod item_page; @@ -13,6 +14,7 @@ mod vote; #[cfg(test)] mod tests; +pub(crate) use copy::garden_ui_copy_rank; pub(crate) use external::external_resolver_status_markup; pub(crate) use pin::{encode_pin_cookie_value, GARDEN_PIN_COOKIE}; pub(crate) use vote::vote_compare_post_success_js; diff --git a/server/src/html/garden/render.rs b/server/src/html/garden/render.rs index ca546693ecb2bb9ae5fb370f02b860c943f604b9..eed80e807d77e6b4eeeb0c3f38d6372e91ad2852 100644 --- a/server/src/html/garden/render.rs +++ b/server/src/html/garden/render.rs @@ -25,6 +25,7 @@ use crate::{ use super::{ access::content_for_garden_view, browse::{garden_layout_meta, scoped_bc_path_for, GardenBrowsePath}, + copy::garden_rank_copy_button_markup, external::{external_frame_allowed, external_source_href, github_resolver_controls}, item::{child_depth_from_uri, item_code_label, item_display_path, item_href}, item_page::{build_item_page_view_model, sibling_nav_markup}, @@ -196,6 +197,15 @@ pub(super) async fn render_scope_view( " " span class="muted" { (format!("(depth {})", model.child_depth)) } } + @if total_children > 0 { + " " + (garden_rank_copy_button_markup( + &nav, + &item_display_path(&model.item), + model.child_depth, + false, + )) + } @if total_children >= 2 { " " a class="ont-vote-children-btn" href=(vote_pool_href(&nav, &model.item)) { diff --git a/server/src/html/garden/routes.rs b/server/src/html/garden/routes.rs index 8a0499576d9093dbac0fffa1cf2ed88187e14acb..31b61355b1ec75645d405e16ab6abf8205c66380 100644 --- a/server/src/html/garden/routes.rs +++ b/server/src/html/garden/routes.rs @@ -28,6 +28,7 @@ use crate::{ use super::{ access::{content_for_garden_view, room_not_found_page, room_scope_has_garden_content, user_can_view_room}, browse::{GardenBrowsePath, scoped_bc_path_external}, + copy::garden_rank_copy_button_markup, item::{item_display_path, item_href}, render::render_scope_view, }; @@ -52,7 +53,13 @@ pub async fn garden_index( html! { @let root_path = OntologyPath::root(); nav class="breadcrumb" { (bc_path(&root_path)) } - h2 { "paths" } + h2 { + "paths" + @if !(child_rankings.component_rankings.is_empty() && child_rankings.unranked_items.is_empty()) { + " " + (garden_rank_copy_button_markup(&nav, "~/", 1, false)) + } + } @if child_rankings.component_rankings.is_empty() && child_rankings.unranked_items.is_empty() { p class="muted" { "no items yet" } } @else { @@ -137,7 +144,13 @@ pub async fn external_garden_index( "view-ontology view-ontology-light", html! { nav class="breadcrumb" { (bc_path_external(&ext_path)) } - h2 { "external paths" } + h2 { + "external paths" + @if !(child_rankings.component_rankings.is_empty() && child_rankings.unranked_items.is_empty()) { + " " + (garden_rank_copy_button_markup(&nav, "", 1, true)) + } + } p class="muted" { "Items outside slug.social use the " code { "-/" } " prefix followed by the full " code { "https://…" } " URL (legacy " code { "-/host/path" } " still works)." } @if child_rankings.component_rankings.is_empty() && child_rankings.unranked_items.is_empty() { p class="muted" { "no external items indexed yet" } @@ -272,7 +285,13 @@ pub async fn room_external_garden_index( "view-ontology view-ontology-light", html! { nav class="breadcrumb" { (scoped_bc_path_external(&ext_path, &nav)) } - h2 { "external paths" } + h2 { + "external paths" + @if !(child_rankings.component_rankings.is_empty() && child_rankings.unranked_items.is_empty()) { + " " + (garden_rank_copy_button_markup(&nav, "", 1, true)) + } + } @if child_rankings.component_rankings.is_empty() && child_rankings.unranked_items.is_empty() { p class="muted" { "no external items indexed yet" } } @else { diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs index d7014fc7f934e5b0c7fb47ebf00cb4ef50d306c2..645d54f2e117ba901e02ed958ada6ff69a78ae34 100644 --- a/server/src/html/mod.rs +++ b/server/src/html/mod.rs @@ -37,8 +37,8 @@ pub(crate) use forum::{ user_can_post_room, user_can_view_room, }; pub(crate) use garden::{ - encode_pin_cookie_value, external_resolver_status_markup, vote_compare_post_success_js, - GARDEN_PIN_COOKIE, + encode_pin_cookie_value, external_resolver_status_markup, garden_ui_copy_rank, + vote_compare_post_success_js, GARDEN_PIN_COOKIE, }; pub use garden::{ external_garden_index, external_ontology_path, garden_index, ontology_path, diff --git a/server/src/html/ui_action.rs b/server/src/html/ui_action.rs index 5cf3168fb74e7654215cd9ff8942c6ed63fd0002..7dc3db062954370b5504fc311c0ab24bab569f80 100644 --- a/server/src/html/ui_action.rs +++ b/server/src/html/ui_action.rs @@ -118,6 +118,18 @@ pub enum HtmlUiAction { thread_tag: String, copy_btn_id: String, }, + /// Copy garden child ranking as a concise markdown list to the clipboard. + CopyGardenRank { + room: String, + /// Parent item path (storage or display). Ignored when `external_hosts` is true. + parent_path: String, + #[serde(default = "default_garden_rank_depth")] + depth: usize, + copy_btn_id: String, + /// When true, copy rankings for external host roots (`/-/` index), not parent children. + #[serde(default)] + external_hosts: bool, + }, /// Publish a private-room thread to the public forum (Manage only). GraduateThread { room: String, @@ -125,6 +137,10 @@ pub enum HtmlUiAction { }, } +fn default_garden_rank_depth() -> usize { + 1 +} + #[derive(Debug, Error)] pub enum HtmlUiParseError { #[error("missing __rpc__ field")] @@ -272,4 +288,57 @@ mod tests { } ); } + + #[test] + fn copy_garden_rank_round_trip() { + let template = serde_json::json!({ + "action": "copy_garden_rank", + "room": "public", + "parent_path": "~/topic", + "depth": 2, + "copy_btn_id": "garden-rank-copy", + }); + let mut form = HashMap::new(); + form.insert( + UI_RPC_FIELD.to_string(), + serde_json::to_string(&template).unwrap(), + ); + let a = parse_html_ui_from_form(&form).unwrap(); + assert_eq!( + a, + HtmlUiAction::CopyGardenRank { + room: "public".into(), + parent_path: "~/topic".into(), + depth: 2, + copy_btn_id: "garden-rank-copy".into(), + external_hosts: false, + } + ); + } + + #[test] + fn copy_garden_rank_defaults_depth_and_external_hosts() { + let template = serde_json::json!({ + "action": "copy_garden_rank", + "room": "public", + "parent_path": "~/", + "copy_btn_id": "garden-rank-copy", + }); + let mut form = HashMap::new(); + form.insert( + UI_RPC_FIELD.to_string(), + serde_json::to_string(&template).unwrap(), + ); + let a = parse_html_ui_from_form(&form).unwrap(); + assert_eq!( + a, + HtmlUiAction::CopyGardenRank { + room: "public".into(), + parent_path: "~/".into(), + depth: 1, + copy_btn_id: "garden-rank-copy".into(), + external_hosts: false, + } + ); + } } diff --git a/server/tests/integration_ui.rs b/server/tests/integration_ui.rs index d242abff5769cc704b3c8070d7456e5788c31a45..6b1475b773106a2dd3f326475c9fb4cc727f6b4b 100644 --- a/server/tests/integration_ui.rs +++ b/server/tests/integration_ui.rs @@ -490,3 +490,71 @@ async fn test_vote_compare_post_rejects_over_max_ratio() { ); } +#[tokio::test] +async fn test_copy_garden_rank_returns_clipboard_js_with_markdown() { + let (addr, _tmp, _log, _handle) = create_test_server().await; + let client = reqwest::Client::new(); + let bearer = test_bearer(); + + let seed = rpc_batch( + &client, + addr, + Some(&bearer), + serde_json::json!([{ + "Post": { + "room": "public", + "thread_tag": "copy-rank-ui", + "text": "# copy-rank-ui\n\n~/copy-a {a}\n~/copy-b {b}\n~/copy-c {c}\n{vote}\n~/copy-a 2:1 ~/copy-b\n", + "return_rank_diff": false + } + }]), + ) + .await; + assert_eq!(seed["results"][0]["ok"], true, "seed: {:?}", seed); + + let page = client + .get(format!("http://{addr}/~")) + .send() + .await + .unwrap(); + assert!(page.status().is_success()); + let html = page.text().await.unwrap(); + assert!( + html.contains("id=\"garden-rank-copy\"") && html.contains("copy_garden_rank"), + "garden index should include copy button + action payload" + ); + + let rpc = serde_json::json!({ + "action": "copy_garden_rank", + "room": "public", + "parent_path": "~/", + "depth": 1, + "copy_btn_id": "garden-rank-copy", + }) + .to_string(); + let resp = client + .post(format!("http://{addr}/ui")) + .header("Authorization", format!("Bearer {bearer}")) + .form(&[("__rpc__", rpc.as_str())]) + .send() + .await + .unwrap(); + assert_eq!(resp.status(), reqwest::StatusCode::OK); + assert_eq!( + resp.headers() + .get(reqwest::header::CONTENT_TYPE) + .and_then(|v| v.to_str().ok()), + Some("text/javascript; charset=utf-8") + ); + let js = resp.text().await.unwrap(); + assert!( + js.contains("navigator.clipboard.writeText") && js.contains("garden-rank-copy"), + "expected clipboard JsBuilder snippet, got: {js}" + ); + assert!( + js.contains("1. ~/copy-a") && js.contains("2. ~/copy-b") && js.contains("- ~/copy-c"), + "expected concise markdown ranking in clipboard payload, got: {js}" + ); + assert!(js.contains("\"copied\""), "expected button label flip to copied"); +} + diff --git a/test/browser_public_garden.clj b/test/browser_public_garden.clj index 5dd49f1f70c870e25a2a9f5348f0bdb85647e897..8ceb532c664f9fc3d6f66a451e5ea5eaa1671007 100644 --- a/test/browser_public_garden.clj +++ b/test/browser_public_garden.clj @@ -73,6 +73,7 @@ (core/with-playwright [pw] (core/with-browser [browser (core/launch-chromium pw {:headless true :channel "chrome"})] (core/with-context [ctx (core/new-context browser)] + (core/context-grant-permissions! ctx ["clipboard-read" "clipboard-write"]) (core/with-page [pg (core/new-page-from-context ctx)] (page/navigate pg (str base-url "/login")) (is (wait-for-text pg "body" "@alice" 15000) "alice session after login") @@ -84,7 +85,12 @@ (is (wait-for-text pg "body" "~/br-pub-b" 10000) "ranked list shows ~/br-pub-b") (is (wait-for-text pg "body" "unranked" 10000) "unranked section present") (is (wait-for-text pg "body" "~/br-pub-c" 10000) - "unranked list shows ~/br-pub-c")))))) + "unranked list shows ~/br-pub-c") + (is (wait-for-text pg "#garden-rank-copy" "copy" 5000) + "garden ranking copy button visible") + (locator/click (page/locator pg "#garden-rank-copy")) + (is (wait-for-text pg "#garden-rank-copy" "copied" 10000) + "copy button flips to copied after POST /ui eval")))))) (finally (when-some [s @!server] (common/kill-server s))