Side A adds a self-contained, well-tested feature (garden ranking markdown copy) with unit tests, an integration test, a browser test, and updated docs, all without touching existing behavior. Side B mixes an undocumented removal of the theme-switching feature with a routing scheme change (query param → path-based /~/ URLs), which is riskier and less clearly scoped, and its terse '-theme' message reflects the lack of clarity in intent.
constitution · epochs · watch · epoch 3
comparison
c_57453fc5c6c0 (tommy-mor) vs c_14dd365ffe22 (tommy-mor)
download prompt · raw event · cmp_84ce90364185e3
council reasoning
B establishes durable browse routing (`ItemId::browse_href` / `/~/…` paths, route wiring, parse fixes) and removes the whole theme cookie/endpoint/CSS fork in favor of one stylesheet—core navigation design. A is a solid, well-tested UX feature (CopyGardenRank + markdown formatter + UI/tests) but is incremental product surface on existing patterns, not structural lasting design.
Side B makes a deeper architectural improvement by introducing canonical browse URLs (`/~/...`), centralizing URL generation/parsing in `ItemId::browse_href`/`from_browse_uri`, updating redirects and routing to use those helpers, and adding tests for the new navigation behavior. Side A adds a well-implemented clipboard feature for garden rankings with new UI actions, markdown formatting, permission checks, and tests, but it is primarily a user-facing convenience feature rather than a foundational routing and URL design change.
sides
A — c_57453fc5c6c0 (tommy-mor)
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 <thmorriss@gmail.com> * Fix paren balance in garden ranking copy browser test Co-authored-by: tommy <thmorriss@gmail.com> --------- Co-authored-by: Cursor Agent <cursoragent@cursor.com>
diff preview
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 **`<form method="POST" action="/ui" data-navigate="full">`** — 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 **`<ul>`** — 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=<pair path>`** (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 <room> forum graduate <tag>`**; 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_
… preview truncated; 12,313 characters omittedB — c_14dd365ffe22 (tommy-mor)
message
[8d5328d3] -theme
diff preview
diff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs
index 82b2aa51d21ada1d0d849d3ddfc3a81e4241d861..e74e42e0f0ffc4224f5ef5421b486a5f35434999 100644
--- a/server/src/api/ui_html.rs
+++ b/server/src/api/ui_html.rs
@@ -73,11 +73,7 @@ pub async fn post_ui_html(
ensure_partial_tree(&mut tree, &item);
}
let _ = state.ensure_node(&item).await;
- let dest = if item.is_root() {
- "/".to_string()
- } else {
- format!("/?item={}", item.as_str())
- };
+ let dest = item.browse_href();
JsBuilder::new()
.raw(&format!(
"window.location.href={};",
diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs
index c973cb718ac74b95570dabea76e24459417790b9..a8353c6de0cd6d268219e552b7ca1ba4e3000585 100644
--- a/server/src/html/mod.rs
+++ b/server/src/html/mod.rs
@@ -1,13 +1,10 @@
use axum::{
body::Body,
extract::{Path, State},
- http::{header, HeaderValue, StatusCode, Uri},
+ http::{header, StatusCode, Uri},
response::{IntoResponse, Response},
- Form,
};
-use axum_extra::extract::cookie::CookieJar;
use maud::{html, Markup, DOCTYPE};
-use serde::Deserialize;
use crate::{
form_template::template_json_compact,
@@ -15,96 +12,25 @@ use crate::{
path_types::ItemId,
ranking::{top_bottom, RankedItem},
reducer::{GroupState, NodeState},
- state::{parse_item_param, AppState},
+ state::AppState,
ui_action::UI_RPC_FIELD,
};
-const THEME_DEFAULT_CSS: &str = include_str!("../../static/theme_default.css");
-const THEME_RETRO_CSS: &str = include_str!("../../static/theme_retro.css");
+const SORTER_CSS: &str = include_str!("../../static/sorter.css");
const SORTER_UI_JS: &str = include_str!("../../static/sorter_ui.js");
-pub const SORTER_THEME_COOKIE: &str = "sorter-theme";
-
-pub fn normalize_theme(raw: &str) -> &'static str {
- match raw {
- "retro" => "retro",
- _ => "default",
- }
-}
-
-pub fn theme_from_jar(jar: &CookieJar) -> &'static str {
- jar.get(SORTER_THEME_COOKIE)
- .map(|c| normalize_theme(c.value()))
- .unwrap_or("default")
-}
-
-pub fn theme_next_from_uri(uri: &Uri) -> String {
- uri.path_and_query()
- .map(|pq| pq.as_str().to_string())
- .filter(|s| !s.is_empty())
- .unwrap_or_else(|| "/".to_string())
-}
-
-pub fn theme_cookie_header_value(theme: &str) -> HeaderValue {
- let t = normalize_theme(theme);
- let s = format!("{SORTER_THEME_COOKIE}={t}; Path=/; SameSite=Lax; Max-Age=31536000");
- HeaderValue::from_str(&s).expect("theme cookie must be ASCII")
-}
-
-fn sanitize_theme_next(next: Option<&str>) -> String {
- let s = next.unwrap_or("/").trim();
- if s.starts_with('/') && !s.starts_with("//") && s.len() < 8192 {
- s.to_string()
- } else {
- "/".to_string()
- }
-}
-
-#[derive(Debug, Deserialize)]
-pub struct ThemeForm {
- theme: String,
- next: Option<String>,
-}
-
-pub async fn post_theme(Form(form): Form<ThemeForm>) -> impl IntoResponse {
- let theme = normalize_theme(&form.theme);
- let next = sanitize_theme_next(form.next.as_deref());
- let loc =
- HeaderValue::try_from(next.as_str()).unwrap_or_else(|_| HeaderValue::from_static("/"));
- Response::builder()
- .status(StatusCode::SEE_OTHER)
- .header(header::LOCATION, loc)
- .header(header::SET_COOKIE, theme_cookie_header_value(theme))
- .body(Body::empty())
- .expect("theme redirect response")
-}
-
pub async fn serve_static(Path(filename): Path<String>) -> impl IntoResponse {
- if filename == "sorter_ui.js" {
- return Response::builder()
- .status(StatusCode::OK)
- .header(header::CONTENT_TYPE, "text/javascript; charset=utf-8")
- .header(header::CACHE_CONTROL, "public, max-age=3600")
- .body(SORTER_UI_JS.to_string())
- .unwrap()
- .into_response();
- }
-
- let theme = filename
- .strip_prefix("theme_")
- .and_then(|s| s.strip_suffix(".css"));
-
- let css = match theme {
- Some("default") => THEME_DEFAULT_CSS,
- Some("retro") => THEME_RETRO_CSS,
+ let (content_type, body) = match filename.as_str() {
+ "sorter.css" => ("text/css; charset=utf-8", SORTER_CSS),
+ "sorter_ui.js" => ("text/javascript; charset=utf-8", SORTER_UI_JS),
_ => return (StatusCode::NOT_FOUND, "static file not found").into_response(),
};
Response::builder()
.status(StatusCode::OK)
- .header(header::CONTENT_TYPE, "text/css; charset=utf-8")
+ .header(header::CONTENT_TYPE, content_type)
.header(header::CACHE_CONTROL, "public, max-age=3600")
- .body(css.to_string())
+ .body(body.to_string())
.unwrap()
.into_response()
}
@@ -162,8 +88,7 @@ fn asset_version() -> &'static str {
V.get_or_init(|| {
use std::hash::{Hash, Hasher};
let mut h = std::collections::hash_map::DefaultHasher::new();
- THEME_DEFAULT_CSS.hash(&mut h);
- THEME_RETRO_CSS.hash(&mut h);
+ SORTER_CSS.hash(&mut h);
SORTER_UI_JS.hash(&mut h);
format!("{:x}", h.finish())
})
@@ -176,9 +101,9 @@ pub fn now_ms() -> i64 {
t.as_millis() as i64
}
-fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str) -> Markup {
+fn layout(title: &str, body: Markup, views: u64) -> Markup {
let ver = asset_version();
- let css_href = format!("/static/theme_{theme}.css?v={ver}");
+ let css_href = format!("/static/sorter.css?v={ver}");
let js_src = format!("/static/sorter_ui.js?v={ver}");
html! {
(DOCTYPE)
@@ -187,7 +112,7 @@ fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str)
meta charset="utf-8";
meta name="viewport" content="width=device-width, initial-scale=1";
title { (title) }
- link rel="stylesheet" href=(css_href) id="theme-stylesheet";
+ link rel="stylesheet" href=(css_href);
script src="https://unpkg.com/idiomorph@0.3.0/dist/idiomorph.min.js" {}
}
body class="home" {
@@ -196,21 +121,6 @@ fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str)
}
div id="errors" {}
(body)
- div id="controls" {
- a href="https://github.com/sortersocial/sorter2" id="src-link" { "src" }
- form id="sorter-theme-form" method="post" action="/theme" data-navigate="full" {
- input type="hidden" name="next" value=(theme_next);
- select id="theme-select" name="theme" onchange="this.form.submit()" aria-label="Theme" {
- @for (val, label) in [("default", "default"), ("retro", "retro")] {
- @if theme == val {
- option value=(val) selected { (label) }
- } @else {
- option value=(val) { (label) }
- }
- }
- }
- }
- }
script src=(js_src) {}
}
}
@@ -218,11 +128,7 @@ fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str)
}
fn item_href(id: &ItemId) -> String {
- if id.is_root() {
- "/".to_string()
- } else {
- format!("/?item={}", id.as_str())
- }
+ id.browse_href()
}
fn segment_label(seg: &str) -> &str {
@@ -361,39 +267,10 @@ pub fn vote_panel(parent: &ItemId) -> Markup {
}
-fn query_param(uri: &Uri, key: &str) -> Option<String> {
- let q = uri.query()?;
- q.split('&').find_map(|pair| {
- let mut it = pair.splitn(2, '=');
- if it.next()? == key {
- Some(it.next().unwrap_or("").to_string())
- } else {
- None
- }
- })
-}
-
-pub async fn home(
- State(state): State<AppState>,
- jar: CookieJar,
- uri: Uri,
-) -> impl IntoResponse {
+async fn item_page(state: AppState, uri: Uri, item: ItemId) -> Markup {
let path = uri.path().to_string();
state.views.increment(path.clone());
let views = state.views.get_views(&path);
- let theme = theme_from_jar(&jar);
- let theme_next = theme_next_from_uri(&uri);
-
- let item_raw = query_param(&uri, "item")
- .or_else(|| query_param(&uri, "sub").map(|sub| {
- if sub.is_empty() {
- String::new()
- } else {
- format!("reddit.com/r/{sub}")
- }
- }))
- .unwrap_or_default();
- let item = parse_item_param(&item_raw);
let tree = state.tree.read().await;
let empty_node = NodeState::default();
@@ -408,5 +285,14 @@ pub async fn home(
(vote_panel(&item))
(ranking_panel(&item, group))
};
- layout("sorter2", body, views, theme, &theme_next)
+ layout("sorter2", body, views)
+}
+
+pub async fn home(State(state): State<AppState>, uri: Uri) -> impl IntoResponse {
+ item_page(state, uri, ItemId::root()).await
+}
+
+pub async fn browse(State(state): State<AppState>, uri: Uri) -> impl IntoResponse {
+ let item = ItemId::from_browse_uri(uri.path()).unwrap_or(ItemId::root());
+ item_page(state, uri, item).await
}
diff --git a/server/src/lib.rs b/server/src/lib.rs
index 14e7cfbc38feb5d07aff859b64bce6e2ec45cf91..cd56743192919cf4dcea539b3d8873a21fb7e72b 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -30,9 +30,9 @@ pub fn create_app(state: AppState) -> Router {
Router::new()
.route("/healthz", get(|| async { "ok" }))
.route("/static/:filename", get(crate::html::serve_static))
+ .route("/~/*item_path", get(crate::html::browse))
.route("/", get(crate::html::home))
.route("/ui", post(crate::api::ui_html::post_ui_html))
- .route("/theme", post(crate::html::post_theme))
.with_state(state)
.layer(TraceLayer::new_for_http())
}
diff --git a/server/src/path_types.rs b/server/src/path_types.rs
index b5c41444f7bcd4d8d289ed3af464bc3f14d0df99..12dce9888f5cd4e1a0974d12d6468368d0f775b9 100644
--- a/server/src/path_types.rs
+++ b/server/src/path_types.rs
@@ -90,6 +90,50 @@ impl ItemId {
paths
}
+ /// Full URL for the browser location bar after `/~/`.
+ pub fn to_browse_url(&self) -> String {
+ if self.is_root() {
+ return String::new();
+ }
+ if self.as_str().contains("://") {
+ return self.as_str().to_string();
+ }
+ if self
+ .segments()
+ .first()
+ .is_some_and(|s| s.contains('.'))
+ {
+ format!("https://{}", self.as_str())
+ } else {
+ self.as_str().to_string()
+ }
+ }
+
+ /// App route, e.g. `/~/https://reddit.com/r/rust`.
+ pub fn browse_href(&self) -> String {
+ if self.is_root() {
+ "/".to_string()
+ } else {
+ format!("/~/{}", self.to_browse_url())
+ }
+ }
+
+ /// Parse the tail after `/~/` in a request path.
+ pub fn from_browse_tail(tail: &str) -> ItemId {
+ let raw = normalize_browse_tail(tail);
+ if raw.is_empty() {
+ return ItemId::root();
+ }
+ ItemId::from_url(&raw)
+ .or_else(|| ItemId::parse(&raw))
+ .unwrap_or_else(|| ItemId::opaque(raw))
+ }
+
+ pub fn from_browse_uri(path: &str) -> Option<ItemId> {
+ path.strip_prefix("/~/")
+ .map(ItemId::from_browse_tail)
+ }
+
fn canonicalize(raw: &str) -> Option<String> {
let s = raw.trim();
if s.is_empty() {
@@ -155
… preview truncated; 6,669 characters omittedHardlinks — judgments / attempts / prompt
judgments
attempts
Prompt text is loaded only by the download route.