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: [0728c06a] Vote pool: use display_path in hrefs; test all 45 pairs + assert ranking. - vote_compare_href and vote_pool_href now encode ~/… and -/… as their short display forms (not the full https://slug.social/… storage URL), matching what users see in the item display and DSL. - Rewrite browser_vote_pool test to vote all C(10,2)=45 pairs in the pool, always preferring the alphabetically-earlier letter, then query GetGardenRank and assert the 10 items form one component ranked a→j. Co-Authored-By: Claude Sonnet 4.6 Side A — unified diff (full patch): diff --git a/server/src/html/garden/vote.rs b/server/src/html/garden/vote.rs index 2682cfcbd2f834b56459a02831aa225cffe67c58..d0ec78cd675eae284d056fb3b8eaf5cc853d6263 100644 --- a/server/src/html/garden/vote.rs +++ b/server/src/html/garden/vote.rs @@ -234,8 +234,10 @@ pub(super) fn vote_compare_href( thread_override: Option<&str>, pool: Option<&ItemId>, ) -> String { - let left_q = urlencoding::encode(left.as_str()); - let right_q = urlencoding::encode(right.as_str()); + let left_dp = left.display_path(); + let right_dp = right.display_path(); + let left_q = urlencoding::encode(&left_dp); + let right_q = urlencoding::encode(&right_dp); let mut base = format!( "{}/vote?left={}&right={}", nav.room_path_prefix_for_vote_compare(), @@ -246,16 +248,20 @@ pub(super) fn vote_compare_href( base = format!("{}&thread={}", base, urlencoding::encode(t)); } if let Some(p) = pool { - base = format!("{}&pool={}", base, urlencoding::encode(p.as_str())); + let pool_dp = p.display_path(); + base = format!("{}&pool={}", base, urlencoding::encode(&pool_dp)); } base } pub(super) fn vote_pool_href(nav: &ThreadNav, pool_item_str: &str) -> String { + let display = ItemId::parse(pool_item_str) + .map(|i| i.display_path()) + .unwrap_or_else(|| pool_item_str.to_string()); format!( "{}/vote?pool={}", nav.room_path_prefix_for_vote_compare(), - urlencoding::encode(pool_item_str) + urlencoding::encode(&display) ) } diff --git a/test/browser_vote_pool.clj b/test/browser_vote_pool.clj index d51f05db47dc3cb013e56e65f3a1edfbbcbd96ab..23d0bd80b02bd8b1b48853454bed02793296550e 100644 --- a/test/browser_vote_pool.clj +++ b/test/browser_vote_pool.clj @@ -1,6 +1,8 @@ (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." + "Pool-scoped voting: seed ~/pool/a-j (10 letters), follow the + vote → next-pair sequence for all C(10,2)=45 pairs voting the + alphabetically-earlier item each time, then assert the garden + ranking is a…j in order." (:require [babashka.fs :as fs] [cheshire.core :as json] [clojure.string :as str] @@ -11,26 +13,38 @@ [test.common :as common] [test.oauth :as oauth])) +(def letters ["a" "b" "c" "d" "e" "f" "g" "h" "i" "j"]) +(def total-pairs (/ (* (count letters) (dec (count letters))) 2)) ; C(10,2) = 45 + (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))] + (let [text (try (locator/text-content (page/locator pg selector)) (catch Exception _ nil))] (if (and (string? text) (str/includes? text expected)) true (if (< (System/currentTimeMillis) deadline) - (do (Thread/sleep 200) (recur)) + (do (Thread/sleep 150) (recur)) false)))))) (defn- element-text [pg selector] - (try (locator/text-content (page/locator pg selector)) (catch Exception _ nil))) + (try (locator/text-content (page/locator pg selector)) (catch Exception _ ""))) (defn- enc [^String s] (java.net.URLEncoder/encode s "UTF-8")) -(def letters ["a" "b" "c" "d" "e" "f" "g" "h" "i" "j"]) +;; Extract the terminal path segment, e.g. "~/pool/c" → "c". +(defn- leaf [path] (last (str/split path #"/"))) + +;; Set the hidden ratio inputs so the alphabetically-earlier item wins. +(defn- set-ratio! [pg left-text right-text] + (let [[rl rr] (if (neg? (compare (leaf left-text) (leaf right-text))) + [100 0] ; left is earlier → prefer left + [0 100])] ; right is earlier → prefer right + (page/evaluate pg (str "document.getElementById('vote-ratio-left').value='" rl "'")) + (page/evaluate pg (str "document.getElementById('vote-ratio-right').value='" rr "'")))) (defn vote-pool-flow! [] - (println "\n━━━ browser vote pool (/vote?pool= seeds + follow next-pair sequence) ━━━\n") + (println (str "\n━━━ browser vote pool (all " total-pairs " pairs → sorted ranking) ━━━\n")) (common/letlocals (bind build (common/run-cargo-build-release! ["slugsocial-server"])) @@ -54,7 +68,6 @@ (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") @@ -77,51 +90,57 @@ (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)))))))) + ;; Vote all 45 pairs, always preferring the alphabetically-earlier item. + (loop [votes-cast 0] + (when (< votes-cast total-pairs) + (let [left-text (element-text pg ".vote-compare-left code") + right-text (element-text pg ".vote-compare-right code")] + (is (str/includes? left-text "~/pool/") + (str "vote " votes-cast ": left is in pool: " left-text)) + (is (str/includes? right-text "~/pool/") + (str "vote " votes-cast ": right is in pool: " right-text)) + (set-ratio! pg left-text right-text) + (let [winner (if (neg? (compare (leaf left-text) (leaf right-text))) + (leaf left-text) (leaf right-text))] + (locator/fill (page/locator pg "#vote-explain") + (str "prefer " winner))) + (locator/click (page/locator pg "#vote-compare-form button[type=submit]")) + (is (wait-for-text pg "ul.vote-edge-history" "prefer " 20000) + (str "vote " votes-cast " appears in edge history")) + (when (< (inc votes-cast) total-pairs) + (is (wait-for-text pg "[data-testid=\"vote-next-pair\"]" "next pair" 8000) + (str "next pair available after vote " votes-cast)) + (locator/click (page/locator pg "[data-testid=\"vote-next-pair\"]")) + (is (wait-for-text pg "body.view-vote-compare" "compare" 10000) + (str "vote page loaded for pair " (inc votes-cast)))) + (recur (inc votes-cast))))) + + (println (str " cast all " total-pairs " votes")) + + ;; Query the ranking via RPC and assert alphabetical order. + (let [rank-resp (oauth/http-post-json + (str base-url "/api/v0/rpc") + [{"GetGardenRank" {"room" "public" + "parent_path" "~/pool"}}] + :headers {"Authorization" (str "Bearer " alice-token)}) + rank-json (json/parse-string (:body rank-resp) true) + result (get-in rank-json [:results 0 :result :GardenRank]) + components (:components result) + unranked (:unranked_items result) + ranked (mapv :item (mapcat :ranking components)) + ranked-leaves (mapv #(last (str/split % #"[/~]+")) ranked)] + (is (= 1 (count components)) + (str "all 10 items form one connected component (got " (count components) ")")) + (is (empty? unranked) + (str "no unranked items (got " (count unranked) ")")) + (is (= 10 (count ranked)) + (str "10 items ranked (got " (count ranked) ")")) + (is (= letters ranked-leaves) + (str "ranking is alphabetical a→j (got " ranked-leaves ")")))))))) (finally (when-some [s @!server] (common/kill-server s)) Side B — contributor: tommy-mor Side B — commit message: [6120bd96] fix redirect urls for custom hosts and deploy from staging Use HOSTNAME and window.location.origin instead of hardcoded staging.sorter.social, and trigger fly deploys on pushes to staging. Co-authored-by: Cursor Side B — unified diff (full patch): diff --git a/.github/workflows/fly-deploy.yml b/.github/workflows/fly-deploy.yml index 3e693915fe6f99a5c2221b2921bf8ebc305180fc..5e11e5c312f62bed34d8cc68bd4a5538f52476b9 100644 --- a/.github/workflows/fly-deploy.yml +++ b/.github/workflows/fly-deploy.yml @@ -3,11 +3,11 @@ name: deploy to fly.io on: push: branches: - - main + - staging workflow_dispatch: concurrency: - group: fly-deploy-main + group: fly-deploy-staging cancel-in-progress: true jobs: diff --git a/borter/src/app/linear.clj b/borter/src/app/linear.clj index f77d8a974e0cf05f9c33233bb625bdb190d2007b..5ef0e34cf1d543826675c6facb66aec079b40561 100644 --- a/borter/src/app/linear.clj +++ b/borter/src/app/linear.clj @@ -6,6 +6,7 @@ [ring.util.response :as response] [app.database :as db] [app.permissions :as perms] + [app.util :as util] [honey.sql.helpers :as h] [sluj.core :refer [sluj]])) @@ -13,9 +14,7 @@ (def client-secret (System/getenv "BORTER_LINEAR_CLIENT_SECRET")) (defn get-hostname [] - (case (.getCanonicalHostName (java.net.InetAddress/getLocalHost)) - "sorter.social" "https://sorter.social/api/linear/callback" - "http://localhost:3000/api/linear/callback")) + (str (util/get-base-url) "/api/linear/callback")) (defn code->token [code] (def code code) diff --git a/borter/src/app/login.clj b/borter/src/app/login.clj index 5d545db9bef7765ba8b3fe7d00261c8ce84e9e1a..86817f8e94bc174e5b108859cc0b342953ab7acb 100644 --- a/borter/src/app/login.clj +++ b/borter/src/app/login.clj @@ -1,6 +1,7 @@ (ns app.login (:require [crypto.password.bcrypt :as password] [app.database :as db] + [app.util :as util] [honey.sql.helpers :as h] [hato.client :as hc] [clojure.data.json :as json] @@ -12,10 +13,7 @@ (def environment (or (System/getenv "ENVIRONMENT") "development")) (defn get-base-url [] - (case environment - "production" "https://sorter.social" - "staging" "https://staging.sorter.social" - "development" "http://localhost:3000")) ; fallback for development + (util/get-base-url)) (defn create-email-content "Creates a standardized email structure with customizable content" diff --git a/borter/src/app/oauth.clj b/borter/src/app/oauth.clj index 1166f2ee30c9e813840711c72d1ad8f1c62e1ffe..2cd0c62f1fe267f7f5f725a97bc3ba0d0889517f 100644 --- a/borter/src/app/oauth.clj +++ b/borter/src/app/oauth.clj @@ -3,6 +3,7 @@ [clojure.data.json :as json] [hato.client :as hc] [app.database :as db] + [app.util :as util] [honey.sql.helpers :as h] [ring.util.codec :as codec]) (:import [java.util Base64])) @@ -13,12 +14,7 @@ encoded-bytes)) (defn get-hostname [] - (let [env (System/getenv "ENVIRONMENT")] - (println "Current environment:" env) - (case env - "production" "https://sorter.social" - "staging" "https://staging.sorter.social" - "http://localhost:3000"))) + (util/get-base-url)) (defn get-origin-hostname [req] (let [origin (get-in req [:headers "origin"]) diff --git a/borter/src/app/spotify.clj b/borter/src/app/spotify.clj index 3e11713119141812fa2707ec956fb7ed612ee69a..b38d734351a1d4f1e142d93d4435ffe7bd20c02d 100644 --- a/borter/src/app/spotify.clj +++ b/borter/src/app/spotify.clj @@ -1,5 +1,6 @@ (ns app.spotify (:require [app.oauth :as oauth] + [app.util :as util] [hato.client :as hc] [clojure.data.json :as json] [ring.util.codec :as codec] @@ -47,10 +48,7 @@ (defn get-hostname [] - (case (System/getenv "ENVIRONMENT") - "production" "https://sorter.social" - "staging" "https://staging.sorter.social" - "http://localhost:3000")) + (util/get-base-url)) (defn create-spotify-tag "Creates a tag for a Spotify entity (artist, album, track) if it doesn't exist" diff --git a/borter/src/app/twitter.clj b/borter/src/app/twitter.clj index ef7b18fa1fcb82bb944b3035ffed44499181237f..b9a3fdccc15d13918a4d11d8c0443de94fd172b4 100644 --- a/borter/src/app/twitter.clj +++ b/borter/src/app/twitter.clj @@ -1,6 +1,7 @@ (ns app.twitter (:require [app.database :as db] [app.permissions :as perms] + [app.util :as util] [honey.sql.helpers :as h] [hato.client :as hc] [clojure.data.json :as json] @@ -37,9 +38,7 @@ (clojure.string/join "&" (map (fn [[k v]] (str (name k) "=" v)) params))) (defn get-hostname [] - (case (.getCanonicalHostName (java.net.InetAddress/getLocalHost)) - "sorter.isnt.online" "https://sorter.isnt.online/api/twitter/callback" - "http://localhost:3000/api/twitter/callback")) + (str (util/get-base-url) "/api/twitter/callback")) (defn encode-b64 [s] (.encodeToString (java.util.Base64/getEncoder) (.getBytes s))) diff --git a/borter/src/app/util.clj b/borter/src/app/util.clj index 384a64306c84aa8288ec44cd5de57edc248a826d..6a8aa0875accb28dc81bf57e645e3961b0a3ace5 100644 --- a/borter/src/app/util.clj +++ b/borter/src/app/util.clj @@ -2,6 +2,18 @@ (:require [clojure.string :as string]) (:import [java.net URLEncoder])) +(defn get-base-url + "Public site base URL for redirects and oauth callbacks." + [] + (if-let [hostname (not-empty (System/getenv "HOSTNAME"))] + (if (string/starts-with? hostname "http") + (string/replace hostname #"/$" "") + (str "https://" (string/replace hostname #"/$" ""))) + (case (or (System/getenv "ENVIRONMENT") "development") + "production" "https://sorter.social" + "staging" "https://staging.sorter.social" + "http://localhost:3000"))) + (defn urlencode-params [params] (clojure.string/join "&" (map (fn [[k v]] (str k "=" (URLEncoder/encode (str v) "UTF-8"))) params))) diff --git a/borter/src/app/youtube.clj b/borter/src/app/youtube.clj index 647ef7c6d4f2503a63a7c074d46dc815b2a23547..fc9a2f5ed516692f19e06b4c0221f510547cf8c0 100644 --- a/borter/src/app/youtube.clj +++ b/borter/src/app/youtube.clj @@ -6,6 +6,7 @@ [ring.util.response :as response] [app.database :as db] [app.permissions :as perms] + [app.util :as util] [honey.sql.helpers :as h] [sluj.core :refer [sluj]])) @@ -32,9 +33,7 @@ :body (json/read-str {:key-fn keyword}))) (defn get-hostname [] - (case (.getCanonicalHostName (java.net.InetAddress/getLocalHost)) - "localhost" "http://localhost:3000/api/youtube/callback" - "https://sorter.isnt.online/api/youtube/callback")) + (str (util/get-base-url) "/api/youtube/callback")) diff --git a/forter/src/utils/authUtils.js b/forter/src/utils/authUtils.js index 145e5db7ad6f7a6439d68c63beb4d07d31b2de08..98ed7fa671f9887f44dc1479d85569951eb4773e 100644 --- a/forter/src/utils/authUtils.js +++ b/forter/src/utils/authUtils.js @@ -5,8 +5,11 @@ import { current_session, fetchSession } from "../session"; let lastSyncTime = 0; const SYNC_THROTTLE_MS = 5000; // Only sync once every 5 seconds -// Get base URL based on Vite's mode +// Get base URL based on current origin, with build-mode fallbacks for SSR/build const getBaseUrl = () => { + if (typeof window !== 'undefined' && window.location?.origin) { + return window.location.origin; + } switch (import.meta.env.MODE) { case 'production': return 'https://sorter.social';