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: [674964ef] refactor: Deref for href newtypes, CanonicalItemUrl through resolve_item - Implement Deref for GardenItemUrl, ForumThreadUrl, TildeOntologyPath - resolve_item returns CanonicalItemUrl; validate uses HashSet - compute_scope_rank_changes keys are CanonicalItemUrl; pair RPC uses Vec pool - pick_random_distinct_canonical; connectivity stats on &[CanonicalItemUrl] - Global rank unranked uses stored ids before GardenItemUrl mapping Made-with: Cursor Side B — unified diff (full patch): diff --git a/server/src/api/helpers.rs b/server/src/api/helpers.rs index 03b3e77911ccd662bec8635345dafe2593cf242e..1b291db83df7364a026f2e147e0a29a70a399371 100644 --- a/server/src/api/helpers.rs +++ b/server/src/api/helpers.rs @@ -30,13 +30,13 @@ pub fn now_ms() -> i64 { t.as_millis() as i64 } -/// Resolve an item path as a first-class canonical path. -pub fn resolve_item(item: &str) -> Result { +/// Resolve DSL/user input to a stored canonical item id. +pub fn resolve_item(item: &str) -> Result { let canonical = canonicalize_item(item); if canonical.is_empty() { return Err(format!("empty item path: `{}`", item)); } - Ok(canonical) + Ok(CanonicalItemUrl(canonical)) } pub fn parse_parent_specs(parent: Option<&String>) -> Vec { @@ -94,7 +94,7 @@ pub fn paginate_rankings( (out_components, out_unranked) } -pub fn pick_random_distinct(items: &[String]) -> Option<(String, String)> { +pub fn pick_random_distinct_canonical(items: &[CanonicalItemUrl]) -> Option<(CanonicalItemUrl, CanonicalItemUrl)> { use rand::seq::SliceRandom; if items.len() < 2 { return None; @@ -123,15 +123,12 @@ pub fn is_pair_voted(group: &crate::reducer::GroupState, a: &str, b: &str) -> bo group.voted_pairs.contains(&(i, j)) } -pub fn compute_connectivity_stats(group: &crate::reducer::GroupState, pool: &[String]) -> ConnectivityStats { +pub fn compute_connectivity_stats(group: &crate::reducer::GroupState, pool: &[CanonicalItemUrl]) -> ConnectivityStats { let n = pool.len(); let global_idxs: Vec> = pool .iter() - .map(|it| { - let key = CanonicalItemUrl(it.clone()); - group.item_to_idx.get(&key).copied() - }) + .map(|it| group.item_to_idx.get(it).copied()) .collect(); let present: Vec = global_idxs.iter().filter_map(|x| *x).collect(); diff --git a/server/src/api/mod.rs b/server/src/api/mod.rs index cf22cb0129366c3aed031bc86f3197a4321cb806..a10ce662105cff8fad949c6b83f7035ce79bed18 100644 --- a/server/src/api/mod.rs +++ b/server/src/api/mod.rs @@ -24,7 +24,7 @@ pub use auth::{ pub use helpers::{ api_error, compute_connectivity_stats, is_pair_voted, now_ms, paginate_rankings, - parse_parent_specs, pick_random_distinct, resolve_item, sha256_hex, vote_touches_path, + parse_parent_specs, pick_random_distinct_canonical, resolve_item, sha256_hex, vote_touches_path, }; pub use rpc::handle_rpc_batch; diff --git a/server/src/api/rpc.rs b/server/src/api/rpc.rs index 5f7d50188f1381267402f2e57e671234ef5db2fd..de0955d0887d32740e1fd18365205c5bdb53c247 100644 --- a/server/src/api/rpc.rs +++ b/server/src/api/rpc.rs @@ -29,7 +29,7 @@ use crate::{ use super::auth::verify_bearer_principal; use super::helpers::{ compute_connectivity_stats, is_pair_voted, now_ms, paginate_rankings, parse_parent_specs, - pick_random_distinct, resolve_item, vote_touches_path, + pick_random_distinct_canonical, resolve_item, vote_touches_path, }; use super::validate::{normalize_room_and_thread, validate_ingest_document}; @@ -146,21 +146,21 @@ fn authorize_room_read(reduced: &ReducerState, headers: &HeaderMap, room: &str) } fn compute_scope_rank_changes( - parent: &str, + parent: &CanonicalItemUrl, before: &crate::scope_rank::ChildrenRankings, after: &crate::scope_rank::ChildrenRankings, room_wire: &str, ) -> Option { - fn build_positions(rankings: &crate::scope_rank::ChildrenRankings) -> HashMap> { + fn build_positions(rankings: &crate::scope_rank::ChildrenRankings) -> HashMap> { let mut map = HashMap::new(); for comp in &rankings.component_rankings { let total = comp.ranked.len(); for (i, item) in comp.ranked.iter().enumerate() { - map.insert(item.item.as_str().to_string(), Some(RankPosition { rank: i + 1, of: total })); + map.insert(item.item.clone(), Some(RankPosition { rank: i + 1, of: total })); } } for item in &rankings.unranked_items { - map.insert(item.as_str().to_string(), None); + map.insert(item.clone(), None); } map } @@ -168,7 +168,7 @@ fn compute_scope_rank_changes( let before_pos = build_positions(before); let after_pos = build_positions(after); - let all_items: std::collections::BTreeSet = before_pos.keys().cloned() + let all_items: std::collections::BTreeSet = before_pos.keys().cloned() .chain(after_pos.keys().cloned()) .collect(); @@ -184,7 +184,7 @@ fn compute_scope_rank_changes( }; if changed { changes.push(RankChange { - item: GardenItemUrl::from_storage_str(&item, room_wire), + item: GardenItemUrl::from_stored(&item, room_wire), before: b, after: a, }); @@ -203,11 +203,7 @@ fn compute_scope_rank_changes( }); Some(ScopeRankChanges { - parent: if parent.is_empty() { - "/".to_string() - } else { - GardenItemUrl::from_storage_str(parent, room_wire).into_inner() - }, + parent: GardenItemUrl::from_stored(parent, room_wire).into_inner(), changes, }) } @@ -473,8 +469,8 @@ async fn rpc_post( for s in &v.doc.statements { if let dsl::Stmt::Vote { item1, item2, .. } = s { if let (Ok(a), Ok(b)) = (resolve_item(item1), resolve_item(item2)) { - if let Some(p) = CanonicalItemUrl::parse(&a).and_then(|c| c.parent()) { parents.insert(p); } - if let Some(p) = CanonicalItemUrl::parse(&b).and_then(|c| c.parent()) { parents.insert(p); } + if let Some(p) = a.parent() { parents.insert(p); } + if let Some(p) = b.parent() { parents.insert(p); } } } } @@ -525,7 +521,7 @@ async fn rpc_post( .filter_map(|p| { let before = pre_rankings.get(p)?; let after = crate::scope_rank::build_children_rankings(content, p); - compute_scope_rank_changes(p.as_str(), before, &after, &room_key) + compute_scope_rank_changes(p, before, &after, &room_key) }) .collect(); if v.is_empty() { None } else { Some(v) } @@ -638,8 +634,8 @@ async fn rpc_check( for s in &v.doc.statements { if let dsl::Stmt::Vote { item1, item2, .. } = s { if let (Ok(a), Ok(b)) = (resolve_item(item1), resolve_item(item2)) { - if let Some(p) = CanonicalItemUrl::parse(&a).and_then(|c| c.parent()) { parents.insert(p); } - if let Some(p) = CanonicalItemUrl::parse(&b).and_then(|c| c.parent()) { parents.insert(p); } + if let Some(p) = a.parent() { parents.insert(p); } + if let Some(p) = b.parent() { parents.insert(p); } } } } @@ -961,7 +957,7 @@ fn rpc_search(reduced: &ReducerState, q: &str, limit: usize, principal: Option<& async fn rpc_get_pair(state: &AppState, room: String, parent_path: String) -> Result { let scope = scope_from_room_wire(&room); let reduced_arc = state.reduced.clone(); - let pool: Vec = { + let pool: Vec = { let reduced = reduced_arc.read().await; let content = content_for_room(&reduced, &room); let tmp = if parent_path.trim().is_empty() { @@ -970,12 +966,11 @@ async fn rpc_get_pair(state: &AppState, room: String, parent_path: String) -> Re Some(parent_path.clone()) }; let specs = parse_parent_specs(tmp.as_ref()); - let raw_pool: Vec = if specs.is_empty() { + if specs.is_empty() { content.ranking_group.idx_to_item.clone() } else { crate::scope_rank::resolve_scope(content, &specs) - }; - raw_pool.into_iter().map(|it| it.0).collect() + } }; if pool.len() < 2 { return Err(( @@ -983,31 +978,30 @@ async fn rpc_get_pair(state: &AppState, room: String, parent_path: String) -> Re Some("add items via ingest".into()), )); } - let selected: Option<(String, String)> = { + let selected: Option<(CanonicalItemUrl, CanonicalItemUrl)> = { let mut reduced = reduced_arc.write().await; let content = reduced.content.entry(scope.clone()).or_default(); let group = &mut content.ranking_group; if group.idx_to_item.is_empty() { - pick_random_distinct(&pool) + pick_random_distinct_canonical(&pool) } else { let mut rng = rand::thread_rng(); - let idxs: Vec = pool.iter() - .filter_map(|it| { - let key = CanonicalItemUrl(it.clone()); - group.item_to_idx.get(&key).copied() - }) + let idxs: Vec = pool + .iter() + .filter_map(|it| group.item_to_idx.get(it).copied()) .collect(); let ranked = ranked_items_subset(group, &idxs, 10000, 1e-8); - let ranked_set: HashSet = ranked.iter().map(|r| r.item.as_str().to_string()).collect(); - let unsorted: Vec = pool.iter() + let ranked_set: HashSet = ranked.iter().map(|r| r.item.clone()).collect(); + let unsorted: Vec = pool + .iter() .filter(|it| !ranked_set.contains(*it)) .cloned() .collect(); - let mut pick: Option<(String, String)> = None; + let mut pick: Option<(CanonicalItemUrl, CanonicalItemUrl)> = None; if !unsorted.is_empty() { if let Some(left) = unsorted.choose(&mut rng).cloned() { - let mut candidates: Vec = if !ranked.is_empty() { - ranked.iter().map(|r| r.item.as_str().to_string()).collect() + let mut candidates: Vec = if !ranked.is_empty() { + ranked.iter().map(|r| r.item.clone()).collect() } else { pool.clone() }; @@ -1021,21 +1015,21 @@ async fn rpc_get_pair(state: &AppState, room: String, parent_path: String) -> Re let a = ranked[i].item.as_str(); let b = ranked[i + 1].item.as_str(); if a != b && !is_pair_voted(group, a, b) { - pick = Some((a.to_string(), b.to_string())); + pick = Some((ranked[i].item.clone(), ranked[i + 1].item.clone())); break; } } if pick.is_none() { for _ in 0..64 { let (Some(a), Some(b)) = (pool.choose(&mut rng).cloned(), pool.choose(&mut rng).cloned()) else { break; }; - if a != b && !is_pair_voted(group, &a, &b) { + if a != b && !is_pair_voted(group, a.as_str(), b.as_str()) { pick = Some((a, b)); break; } } } } - pick.or_else(|| pick_random_distinct(&pool)) + pick.or_else(|| pick_random_distinct_canonical(&pool)) } }; let Some((left, right)) = selected else { @@ -1043,8 +1037,8 @@ async fn rpc_get_pair(state: &AppState, room: String, parent_path: String) -> Re }; let reduced = reduced_arc.read().await; let content = content_for_room(&reduced, &room); - let left_key = CanonicalItemUrl(left.clone()); - let right_key = CanonicalItemUrl(right.clone()); + let left_key = left.clone(); + let right_key = right.clone(); let lb = content.item_bodies.get(&left_key).cloned(); let rb = content.item_bodies.get(&right_key).cloned(); let th: Vec = content @@ -1058,8 +1052,8 @@ async fn rpc_get_pair(state: &AppState, room: String, parent_path: String) -> Re .collect(); let cs = compute_connectivity_stats(&content.ranking_group, &pool); Ok(RpcResult::Pair(PairResponse { - left: GardenItemUrl::from_storage_str(&left, &room), - right: GardenItemUrl::from_storage_str(&right, &room), + left: GardenItemUrl::from_stored(&left, &room), + right: GardenItemUrl::from_stored(&right, &room), left_body: lb, right_body: rb, threads: th, @@ -1554,7 +1548,7 @@ pub async fn handle_rpc_batch( for r in items { let pct = want_percent.then(|| ((r.score - bot) / range * 100.0).clamp(0.0, 100.0)); ranked.push(RankRow { - item: GardenItemUrl::from_storage_str(r.item.as_str(), &room), + item: GardenItemUrl::from_stored(&r.item, &room), score: r.score, percent: pct, }); @@ -1562,11 +1556,11 @@ pub async fn handle_rpc_batch( } let ranked_total = ranked.len(); - let mut unranked: Vec = content + let mut unranked: Vec = content .items .iter() .filter(|it| !group.item_to_idx.contains_key(*it)) - .map(|it| it.as_str().to_string()) + .cloned() .collect(); unranked.sort(); let unranked_total = unranked.len(); @@ -1574,7 +1568,7 @@ pub async fn handle_rpc_batch( let page: Vec = ranked .into_iter() .chain(unranked.into_iter().map(|it| RankRow { - item: GardenItemUrl::from_storage_str(&it, &room), + item: GardenItemUrl::from_stored(&it, &room), score: 0.0, percent: want_percent.then_some(0.0), })) @@ -1722,7 +1716,7 @@ pub async fn handle_rpc_batch( .filter(|p| !parents.contains(p.as_str())) .map(|p| GardenItemUrl::from_stored(p, &room)) .collect(); - paths.sort_by(|a, b| a.as_str().cmp(b.as_str())); + paths.sort(); line_ok(RpcResult::Leaves(LeavesResponse { paths })) } }, diff --git a/server/src/api/validate.rs b/server/src/api/validate.rs index a51c783ee9785569b5a44c0b1572471fe00d174b..3c7aa80fd485cf247231fe5c5c7e6fea62f22534 100644 --- a/server/src/api/validate.rs +++ b/server/src/api/validate.rs @@ -52,7 +52,7 @@ pub fn validate_ingest_document( }; let ts = super::helpers::now_ms(); - let mut defined_in_doc: HashSet = HashSet::new(); + let mut defined_in_doc: HashSet = HashSet::new(); for s in &doc.statements { match s { @@ -66,14 +66,14 @@ pub fn validate_ingest_document( let Some(body_text) = body else { return Err(( StatusCode::BAD_REQUEST, - format!("item missing body: {}", GardenItemUrl::from_storage_str(&item, room_wire)), + format!("item missing body: {}", GardenItemUrl::from_stored(&item, room_wire)), Some("items must be declared with bodies, e.g. `~/path/item { ... }`".to_string()), )); }; if body_text.trim().is_empty() { return Err(( StatusCode::BAD_REQUEST, - format!("item body is empty: {}", GardenItemUrl::from_storage_str(&item, room_wire)), + format!("item body is empty: {}", GardenItemUrl::from_stored(&item, room_wire)), Some("write at least one sentence inside `{ ... }`".to_string()), )); } @@ -102,11 +102,8 @@ pub fn validate_ingest_document( }; let missing: Vec = [&a, &b] .into_iter() - .filter(|it| { - let key = CanonicalItemUrl((*it).clone()); - !defined_in_doc.contains(*it) && !item_exists(&key) - }) - .map(|it| GardenItemUrl::from_storage_str(it, room_wire).into_inner()) + .filter(|it| !defined_in_doc.contains(*it) && !item_exists(it)) + .map(|it| GardenItemUrl::from_stored(it, room_wire).into_inner()) .collect(); if !missing.is_empty() { return Err(( @@ -120,11 +117,8 @@ pub fn validate_ingest_document( } let missing_body: Vec = [&a, &b] .into_iter() - .filter(|it| { - let key = CanonicalItemUrl((*it).clone()); - !defined_in_doc.contains(*it) && !body_exists(&key) - }) - .map(|it| GardenItemUrl::from_storage_str(it, room_wire).into_inner()) + .filter(|it| !defined_in_doc.contains(*it) && !body_exists(it)) + .map(|it| GardenItemUrl::from_stored(it, room_wire).into_inner()) .collect(); if !missing_body.is_empty() { return Err(( diff --git a/server/src/html/editor.rs b/server/src/html/editor.rs index ecdd226b1b17d5f11d1b79f99add5759ef918281..26d648d7c8d6e5d53ce5ed7a051b44856fca2fcf 100644 --- a/server/src/html/editor.rs +++ b/server/src/html/editor.rs @@ -130,8 +130,8 @@ pub async fn editor_check( for s in &v.doc.statements { if let crate::dsl::Stmt::Vote { item1, item2, .. } = s { if let (Ok(a), Ok(b)) = (resolve_item(item1), resolve_item(item2)) { - if let Some(p) = crate::path_types::CanonicalItemUrl::parse(&a).and_then(|c| c.parent()) { parents.insert(p); } - if let Some(p) = crate::path_types::CanonicalItemUrl::parse(&b).and_then(|c| c.parent()) { parents.insert(p); } + if let Some(p) = a.parent() { parents.insert(p); } + if let Some(p) = b.parent() { parents.insert(p); } } } } diff --git a/types/src/paths.rs b/types/src/paths.rs index 2950a7502255927583fbacdfd2adb700f0b0c221..839684dfa0ecdd6c2572e2d8132ecee4d5c41bf8 100644 --- a/types/src/paths.rs +++ b/types/src/paths.rs @@ -3,6 +3,7 @@ use std::borrow::Borrow; use std::fmt; +use std::ops::Deref; use serde::{Deserialize, Serialize}; @@ -319,6 +320,14 @@ impl fmt::Display for GardenItemUrl { } } +impl Deref for GardenItemUrl { + type Target = str; + + fn deref(&self) -> &Self::Target { + &self.0 + } +} + fn garden_href_string(item: &str, room_wire: &str) -> String { let room = room_wire.trim(); if room.is_empty() || room == "public" { @@ -386,6 +395,14 @@ impl fmt::Display for ForumThreadUrl { } } +impl Deref for ForumThreadUrl { + type Target = str; + + fn deref(&self) -> &Self::Target { + &self.0 + } +} + /// `~/a/b` style path for list UIs (paths index `path` field). #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)] #[serde(transparent)] @@ -412,6 +429,14 @@ impl fmt::Display for TildeOntologyPath { } } +impl Deref for TildeOntologyPath { + type Target = str; + + fn deref(&self) -> &Self::Target { + &self.0 + } +} + #[cfg(test)] mod tests { use super::*; @@ -452,6 +477,13 @@ mod tests { assert_eq!(c.tilde_segments(), Vec::<&str>::new()); } + #[test] + fn garden_item_url_deref_to_str() { + let g = GardenItemUrl::from_storage_str("https://slug.social/~/x", "public"); + let s: &str = &*g; + assert_eq!(s, "https://slug.social/~/x"); + } + #[test] fn garden_public_passthrough_https() { let u = "https://slug.social/~/a/b";