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: [601d3a05] fix(html): drop home toolbar + and ExpandNewThreadForm (single + flow) Public home now SSRs #new-thread-ui-slot like room pages: collapsed compose for signed-in users, login hint when logged out. Removes the extra toolbar that morphed the same collapsed state and the expand_new_thread_form action. Made-with: Cursor Side A — unified diff (full patch): diff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs index e979053ff1ba8c0e2bf55add0a32b7de11cf1e56..f3ce5cb2ab2f923440a8479d0f1fb4acbba166ca 100644 --- a/server/src/api/ui_html.rs +++ b/server/src/api/ui_html.rs @@ -139,51 +139,6 @@ async fn dispatch_ui_action( } } } - HtmlUiAction::ExpandNewThreadForm { room_wire } => { - let room_wire = room_wire.trim().to_string(); - if room_wire.is_empty() { - return ui_js_warn("missing room").into_response(); - } - if room_wire == "public" { - let reduced = state.reduced.read().await; - let user = session.map(|s| s.username.as_str()); - drop(reduced); - let markup = if user.is_some() { - fragment_new_thread_slot(&ThreadNav::public(), true, false) - } else { - login_to_post_hint_markup() - }; - return JsBuilder::new() - .morph_inner_selector("#new-thread-ui-slot", markup) - .into_response(); - } - let reduced = state.reduced.read().await; - let user = session.map(|s| s.username.as_str()); - if !reduced.rooms.contains(&room_wire) { - drop(reduced); - return ui_js_warn("room not found").into_response(); - } - if !user_can_view_room(&reduced, &room_wire, user) { - drop(reduced); - return ui_js_warn("forbidden").into_response(); - } - let can_post = session - .as_ref() - .map(|s| user_can_post_room(&reduced, &room_wire, &s.username)) - .unwrap_or(false); - drop(reduced); - let Some(nav) = ThreadNav::from_room_id(&room_wire) else { - return ui_js_warn("bad room").into_response(); - }; - let markup = if can_post { - fragment_new_thread_slot(&nav, true, false) - } else { - login_to_post_hint_markup() - }; - JsBuilder::new() - .morph_inner_selector("#new-thread-ui-slot", markup) - .into_response() - } HtmlUiAction::SetRoomMembersExpanded { room_wire, expanded } => { let room_wire = room_wire.trim().to_string(); if room_wire.is_empty() { diff --git a/server/src/html/forum/feed.rs b/server/src/html/forum/feed.rs index 1b4ae7baa3ad4757b74172d7b67f3f2b33d1075d..945bdd6c48bc164e2cf91fd0996c4321b75f5abf 100644 --- a/server/src/html/forum/feed.rs +++ b/server/src/html/forum/feed.rs @@ -14,6 +14,7 @@ use crate::timeago; use super::ingest::ingest_entry_markup; use super::nav::ThreadNav; +use super::new_thread::{fragment_new_thread_slot, login_to_post_hint_markup}; use super::page::auth_strip; use super::paginator::{render_thread_paginator, PAGE_SIZE}; use crate::html::{ @@ -217,9 +218,6 @@ pub async fn home( 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", @@ -243,15 +241,13 @@ pub async fn home( } } p class="muted" { "dark = time-ordered · light = vote-ranked" } - div class="thread-feed-toolbar" { - form method="POST" action="/ui" { - input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::ExpandNewThreadForm { - room_wire: "public".into(), - }).expect("static json")); - button type="submit" class="section-add-btn" { "+" } + div id="new-thread-ui-slot" { + @if user.is_some() { + (fragment_new_thread_slot(&nav, true, false)) + } @else { + (login_to_post_hint_markup()) } } - div id="new-thread-ui-slot" {} (render_thread_feed(Some(&nav), "thread-feed", &public_rows, now)) (cli_panel(&["npx slugsocial public forum list"])) }, diff --git a/server/src/html/ui_action.rs b/server/src/html/ui_action.rs index 5031ebfeb928f28e471f23210b8c644654adb7c7..da0c9b3541e8e4988a78768cddef22324755c3f2 100644 --- a/server/src/html/ui_action.rs +++ b/server/src/html/ui_action.rs @@ -38,11 +38,6 @@ pub enum HtmlUiAction { RedactPost { post_id: String, }, - /// Morph `#new-thread-ui-slot` inner to the collapsed compose toggle (or login hint). - /// Use `room_wire: "public"` for the public forum home; otherwise a private room id (`short/slug`). - ExpandNewThreadForm { - room_wire: String, - }, /// Morph `#room-members-section` — members list open or collapsed (server-rendered). SetRoomMembersExpanded { room_wire: String, @@ -131,26 +126,6 @@ mod tests { ); } - #[test] - fn expand_new_thread_form_public() { - let template = serde_json::json!({ - "action": "expand_new_thread_form", - "room_wire": "public", - }); - let mut form = HashMap::new(); - form.insert( - UI_RPC_FIELD.to_string(), - serde_json::to_string(&template).unwrap(), - ); - let a = parse_html_ui_from_form(&form).unwrap(); - assert_eq!( - a, - HtmlUiAction::ExpandNewThreadForm { - room_wire: "public".into(), - } - ); - } - #[test] fn expand_post_full_round_trip() { let template = serde_json::json!({ Side B — contributor: tommy-mor Side B — commit message: [65bce99f] sibling groups #130 Side B — unified diff (full patch): diff --git a/server/src/html/garden.rs b/server/src/html/garden.rs index 82c1b4b4f36ea13a906035a1789ba893222b3695..e3c56d124ab7b0fa08c7f9ae736103e6b7cf5862 100644 --- a/server/src/html/garden.rs +++ b/server/src/html/garden.rs @@ -837,7 +837,8 @@ struct SiblingNavGroup { links: Vec, } -/// Siblings under the same parent, grouped like child rankings (components then isolates). +/// Siblings under the same parent: one group per ranking component (ordered list), then one +/// group per isolated unranked sibling (each shows rank `1`, separated like components). #[derive(Debug, Clone)] struct SiblingNavBar { groups: Vec, @@ -890,15 +891,12 @@ fn build_sibling_nav( groups.push(SiblingNavGroup { links }); } } - if !rankings.unranked_items.is_empty() { - let links: Vec = rankings - .unranked_items - .iter() - .map(|u| SiblingNavLink { + for u in &rankings.unranked_items { + groups.push(SiblingNavGroup { + links: vec![SiblingNavLink { path: u.clone().normalized_storage().to_storage_string(), - }) - .collect(); - groups.push(SiblingNavGroup { links }); + }], + }); } let sibling_total: usize = groups.iter().map(|g| g.links.len()).sum(); if sibling_total <= 1 { @@ -1541,6 +1539,29 @@ mod tests { assert_eq!(nav.groups[1].links.len(), 1); } + #[test] + fn sibling_nav_splits_each_unranked_into_its_own_group() { + let mut reduced = ReducerState::default(); + apply_ingest( + &mut reduced, + 1, + "@00000000-0000-0000-0000-000000000000:test:local/test\n\ + ~/topic {topic body}\n\ + ~/topic/a {alpha}\n\ + ~/topic/b {beta}\n\ + ~/topic/c {gamma}\n\ + ~/topic/d {delta}\n\ + {a beats b}\n ~/topic/a 2:1 ~/topic/b\n", + ); + + let model = build_item_page_view_model(&reduced, &ScopeId::Public, "~/topic/a"); + let nav = model.sibling_nav.expect("expected sibling nav"); + assert_eq!(nav.groups.len(), 3); + assert_eq!(nav.groups[0].links.len(), 2); + assert_eq!(nav.groups[1].links.len(), 1); + assert_eq!(nav.groups[2].links.len(), 1); + } + #[test] fn item_page_model_builds_ranked_child_components() { let mut reduced = ReducerState::default();