Side B adds a genuine new browser test exercising pool-scoped voting behavior, giving lasting regression protection with clear assertions. Side A's refactor is mixed value: it does split forum.rs into modules, but it also inlines several previously-named RPC helper functions back into duplicated call sites (undoing prior DRY abstractions) and bundles in an unrelated sample-fixture bb script, diluting the refactor's focus and quality.
constitution · epochs · watch · epoch 3
comparison
c_59974b9da42a (tommy-mor) vs c_7ca21f5e83a8 (tommy-mor)
download prompt · raw event · cmp_c878608d0caf2d
council reasoning
B adds a lasting E2E browser test that seeds a pool, drives the vote→next-pair loop, and asserts edge history and pool membership—real regression protection for core behavior. A is mostly a mechanical split of forum.rs into modules plus inlined RPC helpers and an unrelated macOS sample-fixture script, improving layout without changing product behavior.
Side A performs a substantial architectural refactor by extracting forum functionality into focused modules (such as access, navigation, ingest, room members, and new-thread handling) while preserving behavior, and also adds a reusable macOS profiling utility (`sample-fixture`) integrated into the build tasks. Side B adds a valuable end-to-end browser test for pool-scoped voting, but it is verification only and does not change the project's architecture or runtime behavior, making its lasting impact smaller.
sides
A — c_59974b9da42a (tommy-mor)
message
[c99adc26] refactor forum into files
diff preview
diff --git a/bb.edn b/bb.edn
index 4680e82d4227057d2eea6041dc5647beb759131d..ce0f6fcd45a67ead3295b90db2a301e9b304f3da 100644
--- a/bb.edn
+++ b/bb.edn
@@ -51,6 +51,11 @@
:requires ([test.walkthrough-fixture :as walkthrough-fixture])
:task (walkthrough-fixture/run-fixture)}
+ sample-fixture
+ {:doc "macOS: run `sample` on process(es) listening on the fixture TCP port (default 8080). Usage: bb sample-fixture [PORT] [DURATION_SEC] [OUT_DIR]"
+ :requires ([scripts.sample-fixture :as sample-fixture])
+ :task (apply sample-fixture/-main *command-line-args*)}
+
perf
{:doc "Performance test: concurrent HTTP requests to detect blocking I/O"
:requires ([scripts.perf :as perf])
diff --git a/scripts/sample_fixture.bb b/scripts/sample_fixture.bb
new file mode 100644
index 0000000000000000000000000000000000000000..ac2368623c5043ba6e027afef6b5b37d392767b0
--- /dev/null
+++ b/scripts/sample_fixture.bb
@@ -0,0 +1,70 @@
+(ns scripts.sample-fixture
+ "Find process(es) listening on the fixture port (default 8080) and run macOS `sample`."
+ (:require [babashka.fs :as fs]
+ [babashka.process :as p]
+ [clojure.string :as str]))
+
+(defn- usage []
+ (println "Usage: bb sample-fixture [PORT] [DURATION_SEC] [OUT_DIR]")
+ (println "")
+ (println " Finds PIDs bound to TCP LISTEN on PORT (default 8080), then runs")
+ (println " `sample` for each PID. OUT_DIR defaults to the current directory.")
+ (println "")
+ (println " Example: bb sample-fixture")
+ (println " bb sample-fixture 8080 10")
+ (println " bb sample-fixture 8080 5 /tmp")
+ (println "")
+ (println " Requires macOS (the `sample` tool)."))
+
+(defn- parse-long* [s]
+ (try (Long/parseLong s)
+ (catch NumberFormatException _ nil)))
+
+(defn- listen-pids [port]
+ (let [spec (str "TCP:" port)
+ {:keys [out exit]}
+ @(p/process ["lsof" "-nP" (str "-i" spec) "-sTCP:LISTEN" "-t"]
+ {:out :string :err :string})]
+ (when (zero? exit)
+ (->> (str/split-lines out)
+ (map str/trim)
+ (remove str/blank?)
+ (distinct)
+ vec))))
+
+(defn- sample-bin []
+ (or (fs/which "sample")
+ (throw (ex-info "macOS `sample` not found on PATH" {}))))
+
+(defn- run-sample! [sample duration-sec pid out-file]
+ (println (str "sampling PID " pid " for " duration-sec "s → " out-file))
+ (let [{:keys [exit err]} @(p/process [sample (str pid) (str duration-sec) "-file" out-file]
+ {:out :inherit :err :inherit})]
+ (when-not (zero? exit)
+ (binding [*out* *err*]
+ (println "sample failed:" err))
+ (System/exit exit))))
+
+(defn -main [& args]
+ (when (some #{"-h" "--help" "help"} args)
+ (usage)
+ (System/exit 0))
+ (let [port (or (some-> (first args) parse-long*) 8080)
+ duration-sec (or (some-> (second args) parse-long*) 5)
+ out-dir (or (nth args 2 nil) ".")
+ pids (listen-pids port)]
+ (when (or (nil? pids) (empty? pids))
+ (binding [*out* *err*]
+ (println (str "No process listening on TCP " port " (LISTEN). Is `bb fixture` running?")))
+ (System/exit 1))
+ (when-not (fs/exists? out-dir)
+ (binding [*out* *err*]
+ (println "Output directory does not exist:" out-dir))
+ (System/exit 1))
+ (let [sample (sample-bin)
+ ts (str (System/currentTimeMillis))]
+ (println (str "port " port " → PIDs " (str/join ", " pids)))
+ (doseq [pid pids]
+ (let [out-file (str (fs/path out-dir) "/slug-sample-" port "-" pid "-" ts ".txt")]
+ (run-sample! sample duration-sec pid (str out-file))))
+ (println "done."))))
diff --git a/server/src/html/forum.rs b/server/src/html/forum.rs
index a55fc1f79d03719eb74b216865b2c15199c48ea7..5ad8dfc84dd735d589432e2c613ff687a75f2e61 100644
--- a/server/src/html/forum.rs
+++ b/server/src/html/forum.rs
@@ -380,22 +380,6 @@ fn room_members_inner(members: &[RoomMemberRow]) -> Markup {
}
}
-pub(crate) fn set_room_members_expanded_rpc(room_wire: &str, expanded: bool) -> String {
- template_json_compact(&HtmlUiAction::SetRoomMembersExpanded {
- room_wire: room_wire.to_string(),
- expanded,
- })
- .expect("static json")
-}
-
-pub(crate) fn set_room_new_thread_compose_expanded_rpc(nav: &ThreadNav, expanded: bool) -> String {
- template_json_compact(&HtmlUiAction::SetRoomNewThreadComposeExpanded {
- room_wire: nav.room_wire.clone(),
- expanded,
- })
- .expect("static json")
-}
-
/// Fragment for `#room-members-section` — expand/collapse is server-driven via `POST /ui`.
pub(crate) fn room_members_section_markup(
reduced: &ReducerState,
@@ -406,13 +390,14 @@ pub(crate) fn room_members_section_markup(
if members.is_empty() {
return html! {};
}
- let rpc_open = set_room_members_expanded_rpc(room_id, true);
- let rpc_close = set_room_members_expanded_rpc(room_id, false);
html! {
div id="room-members-section" {
@if members_expanded {
form method="POST" action="/ui" {
- input type="hidden" name=(UI_RPC_FIELD) value=(rpc_close);
+ input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomMembersExpanded {
+ room_wire: room_id.to_string(),
+ expanded: false,
+ }).expect("static json"));
button type="submit" class="form-toggle" aria-expanded="true" {
"hide members & permissions"
}
@@ -422,7 +407,10 @@ pub(crate) fn room_members_section_markup(
}
} @else {
form method="POST" action="/ui" {
- input type="hidden" name=(UI_RPC_FIELD) value=(rpc_open);
+ input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomMembersExpanded {
+ room_wire: room_id.to_string(),
+ expanded: true,
+ }).expect("static json"));
button type="submit" class="form-toggle" aria-expanded="false" {
"members & permissions"
}
@@ -514,28 +502,24 @@ fn compose_form(nav: &ThreadNav, thread_tag: &str, show: bool) -> Markup {
if !show {
return html! {};
}
- let rpc_post = template_json_compact(&json!({
- "action": "post_ingest",
- "room": nav.room_wire,
- "thread_tag": thread_tag,
- "text": {"$form": "text"},
- "error_target": "thread-compose-errors",
- "form_id": "thread-compose-form",
- }))
- .unwrap();
- let rpc_check = template_json_compact(&json!({
- "action": "check_ingest",
- "room": nav.room_wire,
- "thread_tag": thread_tag,
- "text": {"$form": "text"},
- "error_target": "thread-compose-errors",
- "form_id": "thread-compose-form",
- }))
- .unwrap();
html! {
section class="compose" id="thread-compose" {
- form id="thread-compose-form" method="POST" action="/ui" data-check-action="/ui" data-check-rpc=(rpc_check) {
- input type="hidden" name=(UI_RPC_FIELD) value=(rpc_post);
+ form id="thread-compose-form" method="POST" action="/ui" data-check-action="/ui" data-check-rpc=(template_json_compact(&json!({
+ "action": "check_ingest",
+ "room": nav.room_wire,
+ "thread_tag": thread_tag,
+ "text": {"$form": "text"},
+ "error_target": "thread-compose-errors",
+ "form_id": "thread-compose-form",
+ })).unwrap()) {
+ input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&json!({
+ "action": "post_ingest",
+ "room": nav.room_wire,
+ "thread_tag": thread_tag,
+ "text": {"$form": "text"},
+ "error_target": "thread-compose-errors",
+ "form_id": "thread-compose-form",
+ })).unwrap());
textarea name="text" rows="5" cols="80" placeholder="prose or ~/items and votes…" {}
p {
button type="submit" { "post" }
@@ -712,7 +696,7 @@ pub async fn home(
p class="muted" { "dark = time-ordered · light = vote-ranked" }
div class="thread-feed-toolbar" {
form method="POST" action="/ui" {
- input type="hidden" name=(UI_RPC_FIELD) value=(expand_public_new_thread_rpc_value());
+ input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::ExpandPublicNewThreadForm).expect("static json"));
button type="submit" class="section-add-btn" { "+" }
}
}
@@ -1002,14 +986,15 @@ fn new_thread_form_for_room(nav: &ThreadNav, show: bool, compose_expanded: bool)
if !show {
return html! {};
}
- let rpc_open = set_room_new_thread_compose_expanded_rpc(nav, true);
- let rpc_close = set_room_new_thread_compose_expanded_rpc(nav, false);
// Single root for Idiomorph when morphing `#room-new-thread-ui-slot` (expanded has form + section).
html! {
div class="room-new-thread-slot-inner" {
@if compose_expanded {
form method="POST" action="/ui" {
- input type="hidden" name=(UI_RPC_FIELD) value=(rpc_close);
+ input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomNewThreadComposeExpanded {
+ room_wire: nav.room_wire.clone(),
+ expanded: false,
+ }).expect("static json"));
button type="submit" class="form-toggle" aria-expanded="true" {
"-"
}
@@ -1039,7 +1024,10 @@ fn new_thread_form_for_room(nav: &ThreadNav, show: bool, compose_expanded: bool)
}
} @else {
form method="POST" action="/ui" {
- input type="hidden" name=(UI_RPC_FIELD) value=(rpc_open);
+ input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomNewThreadComposeExpanded {
+ room_wire: nav.room_wire.clone(),
+ expanded: true,
+ }).expect("static json"));
button type="submit" class="form-toggle" aria-expanded="false" {
"+"
}
@@ -1049,10 +1037,6 @@ fn new_thread_form_for_room(nav: &ThreadNav, show: bool, compose_expanded: bool)
}
}
-pub(crate) fn expand_public_new_thread_rpc_value() -> String {
- template_json_compact(&HtmlUiAction::ExpandPublicNewThreadForm).expect("static json")
-}
-
pub(crate) fn login_to_post_hint_markup() -> Markup {
html! {
p class="muted" { "log in to post" }
diff --git a/server/src/html/forum/access.rs b/server/src/html/forum/access.rs
new file mode 100644
index 0000000000000000000000000000000000000000..f9f7139b63442a6ef3a927b77a72805f15feec3f
--- /dev/null
+++ b/server/src/html/forum/access.rs
@@ -0,0 +1,16 @@
+use crate::events::ThreadCapability;
+use crate::reducer::ReducerState;
+
+pub(crate) fn user_can_view_room(reduced: &ReducerState, room_id: &str, username: Option<&str>) -> bool {
+ if !reduced.rooms.contains(room_id) {
+ return false;
+ }
+ let Some(u) = username else {
+ return false;
+ };
+ reduced.user_has_cap(room_id, u, ThreadCapability::View)
+}
+
+pub(crate) fn user_can_post_room(reduced: &ReducerState, room_id: &str, username: &str) -> bool {
+ reduced.user_has_cap(room_id, username, ThreadCapability::Post)
+}
diff --git a/server/src/html/forum/ingest
… preview truncated; 19,729 characters omittedB — c_7ca21f5e83a8 (tommy-mor)
message
[7287df45] Add browser test for pool-scoped vote sequence. Seeds ~/pool/a-j (10 letters), enters /vote?pool=~/pool, then follows the vote → next-pair loop up to 15 iterations. Asserts each vote lands in edge history and each pair shown belongs to the pool. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
diff preview
diff --git a/test/browser_vote_pool.clj b/test/browser_vote_pool.clj
new file mode 100644
index 0000000000000000000000000000000000000000..d51f05db47dc3cb013e56e65f3a1edfbbcbd96ab
--- /dev/null
+++ b/test/browser_vote_pool.clj
@@ -0,0 +1,137 @@
+(ns test.browser-vote-pool
+ "Pool-scoped voting: seed ~/pool/a-j, enter via /vote?pool=~/pool, follow
+ the vote → next-pair → vote sequence until no next pair or 15 iterations."
+ (:require [babashka.fs :as fs]
+ [cheshire.core :as json]
+ [clojure.string :as str]
+ [clojure.test :refer [deftest is]]
+ [com.blockether.spel.core :as core]
+ [com.blockether.spel.locator :as locator]
+ [com.blockether.spel.page :as page]
+ [test.common :as common]
+ [test.oauth :as oauth]))
+
+(defn- wait-for-text [pg selector expected timeout-ms]
+ (let [deadline (+ (System/currentTimeMillis) timeout-ms)]
+ (loop []
+ (let [text (locator/text-content (page/locator pg selector))]
+ (if (and (string? text) (str/includes? text expected))
+ true
+ (if (< (System/currentTimeMillis) deadline)
+ (do (Thread/sleep 200) (recur))
+ false))))))
+
+(defn- element-text [pg selector]
+ (try (locator/text-content (page/locator pg selector)) (catch Exception _ nil)))
+
+(defn- enc [^String s]
+ (java.net.URLEncoder/encode s "UTF-8"))
+
+(def letters ["a" "b" "c" "d" "e" "f" "g" "h" "i" "j"])
+
+(defn vote-pool-flow! []
+ (println "\n━━━ browser vote pool (/vote?pool= seeds + follow next-pair sequence) ━━━\n")
+
+ (common/letlocals
+ (bind build (common/run-cargo-build-release! ["slugsocial-server"]))
+ (is (zero? (:exit build)) "cargo build succeeds")
+ (bind server-bin "target/release/slugsocial-server")
+
+ (bind tmp-dir (str (fs/create-temp-dir {:prefix "slug-browser-vote-pool-"})))
+ (bind slug-port (common/pick-port))
+ (bind google-port (common/pick-port))
+ (bind base-url (str "http://127.0.0.1:" slug-port))
+ (bind google-url (str "http://127.0.0.1:" google-port))
+
+ (bind !server (atom nil))
+ (bind !google (atom nil))
+ (bind server-env (common/slug-server-env tmp-dir base-url google-url slug-port))
+ (try
+ (reset! !google (oauth/start-mock-google google-port
+ :google-users ["google-user-alice"]))
+ (reset! !server (common/start-server server-bin server-env))
+ (is (common/wait-for-server base-url 10000) "server responds to /healthz")
+
+ (let [alice-token (oauth/fetch-bearer-token! base-url :username "alice")
+ thread-tag "browser-vote-pool"
+ ;; seed ~/pool/a through ~/pool/j as items with bodies
+ item-lines (str/join "\n"
+ (map (fn [l] (str "~/pool/" l " {" l "}")) letters))
+ raw (str "# " thread-tag "\n\n~/pool {root}\n" item-lines "\n")
+ post-resp (oauth/http-post-json
+ (str base-url "/api/v0/rpc")
+ [{"Post" {"room" "public"
+ "thread_tag" thread-tag
+ "text" raw
+ "return_rank_diff" false}}]
+ :headers {"Authorization" (str "Bearer " alice-token)})
+ post-json (json/parse-string (:body post-resp) false)
+ _ (is (true? (get-in post-json ["results" 0 "ok"]))
+ "seed ~/pool/a-j items via rpc")
+ pool-url (str base-url "/vote?pool=" (enc "~/pool"))]
+
+ (core/with-playwright [pw]
+ (core/with-browser [browser (core/launch-chromium pw {:headless true :channel "chrome"})]
+ (core/with-context [ctx (core/new-context browser)]
+ (core/with-page [pg (core/new-page-from-context ctx)]
+ (page/navigate pg (str base-url "/login"))
+ (is (wait-for-text pg "body" "@alice" 15000) "alice session after login")
+
+ ;; Enter via pool URL — page picks first pair automatically.
+ (page/navigate pg pool-url)
+ (is (wait-for-text pg "body.view-vote-compare" "compare" 15000)
+ "pool entry: vote compare page loads")
+
+ ;; Verify the initial pair is within the pool.
+ (let [pair-text (element-text pg ".vote-compare-pair")]
+ (is (and (string? pair-text) (str/includes? pair-text "~/pool/"))
+ (str "initial pair is within ~/pool: " pair-text)))
+
+ ;; Follow vote → next-pair sequence up to 15 iterations.
+ (let [votes-cast
+ (loop [i 0]
+ (if (>= i 15)
+ i
+ (let [explanation (str "pool vote " i " reason")]
+ (locator/fill (page/locator pg "#vote-explain") explanation)
+ (locator/click (page/locator pg "#vote-compare-form button[type=submit]"))
+ ;; Wait for edge history morph confirming the vote landed.
+ (if-not (wait-for-text pg "ul.vote-edge-history" explanation 20000)
+ (do (println " vote" i "history morph timed out — stopping")
+ i)
+ (let [has-next (wait-for-text pg "[data-testid=\"vote-next-pair\"]"
+ "next pair" 8000)]
+ (if-not has-next
+ ;; "no next pair" — pool exhausted.
+ (do (println " no next pair after vote" i " — pool exhausted")
+ (inc i))
+ (do
+ ;; Verify the pair on this page is within the pool before advancing.
+ (let [pt (element-text pg ".vote-compare-pair")]
+ (is (and (string? pt) (str/includes? pt "~/pool/"))
+ (str "pair at vote " i " is within ~/pool: " pt)))
+ (locator/click (page/locator pg "[data-testid=\"vote-next-pair\"]"))
+ ;; Wait for next pair to load.
+ (wait-for-text pg "body.view-vote-compare" "compare" 10000)
+ (recur (inc i)))))))))]
+
+ (is (>= votes-cast 1) (str "cast at least 1 vote, got: " votes-cast))
+ (println (str " pool voting sequence complete: " votes-cast " vote(s) cast")))
+
+ ;; After the sequence, the current page is still a pool-scoped vote page.
+ (let [url (page/url pg)]
+ (is (str/includes? (or url "") "/vote")
+ (str "still on /vote after sequence: " url))))))))
+
+ (finally
+ (when-some [s @!server] (common/kill-server s))
+ (when-some [g @!google] ((:stop-fn g)))
+ (fs/delete-tree tmp-dir)))
+
+ nil))
+
+(defn vote-pool-browser-test [& _args]
+ (vote-pool-flow!))
+
+(deftest browser-vote-pool-sequence
+ (vote-pool-flow!))
Hardlinks — judgments / attempts / prompt
judgments
attempts
Prompt text is loaded only by the download route.