diff --git a/.env.example b/.env.example index d44bd412d..99312bf48 100644 --- a/.env.example +++ b/.env.example @@ -38,6 +38,10 @@ REFERRAL_EMAIL_BATCH_SIZE=50 # World ID UI NEXT_PUBLIC_WORLD_ID_ENABLED=true +# Optional Microsoft Clarity project ID. +# Session replay runs only on explicit public-safe pages. +NEXT_PUBLIC_MICROSOFT_CLARITY_PROJECT_ID= + # World ID proof-of-personhood # Create these in the World Developer Portal / IDKit setup: # Portal: https://developer.world.org/ diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 318716ca2..ca325bdfd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -651,8 +651,28 @@ jobs: user_name: github-actions[bot] user_email: github-actions[bot]@users.noreply.github.com - - name: Post Visual review commit status + - name: Wait for visual review page + id: wait_visual_review_pages if: ${{ !cancelled() && steps.visual_review_pages.outcome == 'success' }} + shell: bash + run: | + target_url="https://mikepsinn.github.io/optimitron/pr-${{ github.event.pull_request.number }}/${{ steps.prepare_pages.outputs.short_sha }}/latest.html" + echo "target_url=$target_url" >> "$GITHUB_OUTPUT" + echo "Waiting for $target_url" + for attempt in $(seq 1 90); do + status="$(curl -L -sS --connect-timeout 5 --max-time 15 -o /tmp/visual-review-latest.html -w "%{http_code}" "$target_url" || true)" + if [ "$status" = "200" ] && [ -s /tmp/visual-review-latest.html ]; then + echo "Visual review page is live after attempt $attempt." + exit 0 + fi + echo "Attempt $attempt/90 returned HTTP $status; retrying in 10s." + sleep 10 + done + echo "::error::Visual review page did not become available: $target_url" + exit 1 + + - name: Post Visual review commit status + if: ${{ !cancelled() && steps.wait_visual_review_pages.outcome == 'success' }} uses: actions/github-script@v8 with: script: | @@ -672,7 +692,7 @@ jobs: }); - name: Create Visual review deployment - if: ${{ !cancelled() && steps.visual_review_pages.outcome == 'success' }} + if: ${{ !cancelled() && steps.wait_visual_review_pages.outcome == 'success' }} uses: actions/github-script@v8 with: script: | @@ -707,7 +727,7 @@ jobs: }); - name: Update PR review packet with visual review - if: ${{ !cancelled() && steps.visual_review_pages.outcome == 'success' && steps.pr_preview_url.outputs.result != '' }} + if: ${{ !cancelled() && steps.wait_visual_review_pages.outcome == 'success' && steps.pr_preview_url.outputs.result != '' }} uses: actions/github-script@v8 env: PREVIEW_URL: ${{ steps.pr_preview_url.outputs.result }} diff --git a/.husky/pre-commit b/.husky/pre-commit index 2235a988f..75ee1db19 100644 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -2,7 +2,7 @@ set -e pnpm exec lint-staged -pnpm --filter @optimitron/web run copy:gate +#pnpm --filter @optimitron/web run copy:gate # === Copy preview markdown reminder (not auto-run) === # Previously this block auto-ran `pnpm copy:preview` on every commit diff --git a/AGENTS.md b/AGENTS.md index 4ce8e2002..ea5ddbc66 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -16,6 +16,7 @@ ## Mission Focus - Until the 1% Treaty passes, optimize for the International Campaign to End War and Disease at `warondisease.org`. +- Legal nonprofit: Accelerated Medicine Foundation. Registered DBAs include Institute for Accelerated Medicine and International Campaign to End War and Disease. - The default product question is: does this help a human vote, recruit two more humans, get an organization to join, register a plaintiff, pressure a leader, or trust the quantified case enough to act? - Treat `optimitron.com` as the operating system and proof engine behind the campaign: task coordination, referrals, communications, OPG/OBG/Wishocracy, politician grading, impact math, and AI-agent workflows. Do not let the broader platform compete with the campaign for attention during this phase. - Park generic platform features, clever demos, cosmetic cleanup, and non-campaign variant work unless they directly reduce campaign friction or protect an already-shipping path. diff --git a/docs/joke-handout-draft.md b/docs/joke-handout-draft.md new file mode 100644 index 000000000..5e5e96efd --- /dev/null +++ b/docs/joke-handout-draft.md @@ -0,0 +1,166 @@ +# Joke Handout Draft + +Draft source for the printable paper that goes with the shirt joke. Perfect this +copy here before wiring it back into `/joke`. + +## Copy Brief + +Audience: a zero-context human who found writing on their shirt and this paper +near it. + +Desired action: understand the 1% Treaty, vote yes, and help spread the facts. + +Motivation: their disease risk, their family, their money, and the fact that +the current allocation is insane once seen clearly. + +Strategic job: make the shirt-writing feel less like random vandalism and more +like an annoying but rational attempt to put the decisive facts into everyone's +head. + +Source anchors: 150,000 disease deaths/day; 604x weapons vs government clinical +trials; 6,650 diseases without FDA-approved treatment; 15 first treatments/year; +12.3x clinical-trial capacity; 36 years instead of 443; 10.7 billion deaths and +1.93 quadrillion suffering hours avoided; 206 trillion to 3.5 quadrillion extra +laughs. + +Voice anchors from `docs/h2ewd.md`: "murder money to medicine money"; "testing +which medicines work"; "diseases don't have oil"; "Give 1% fewer papers to +people who build murder machines"; "If cancer had oil reserves, you would have +cured it by 2003"; "the spreadsheet stops killing people"; "the math is crazy +and I would like you to not die." + +## Handout Text + +### Side 1 + +PLEASE READ BEFORE YELLING AT ME. + +# WHY SOMEONE WROTE ON YOUR SHIRT + +I wrote on your shirt because I do not want you to suffer and die of horrible +diseases. + +The point is to get one proposal into every human brain at once: every nation +should redirect 1% of military spending from murder money to medicine money. + +That is the 1% Treaty. + +The medicine money funds pragmatic clinical trials: testing which treatments +actually work in real humans. + +Every country redirects the same 1%, so every country keeps 99% of its military +budget, everyone has 1% fewer missiles pointed at them, and humanity gets 12.3 +times as much clinical-trial capacity. + +## The math that made me write on your shirt + +Disease kills 150,000 humans/day, about 50 September 11s every day. Nobody +invades anyone about it because diseases do not have oil. + +Your chance of dying of disease: nearly 100%. + +Your chance of dying of terrorism: 1 in 30,000,000. + +Your governments spend 604 times more on the thing that will almost certainly +not kill you than the thing that almost certainly will. + +If cancer had oil reserves, we would have cured it by 2003. + +Before World War II, US military spending was 96.7% lower. After winning, the US +cut it 87.6% in two years. + +About 6,650 diseases have no FDA-approved treatment. At 15 first treatments per +year, finding treatments for all of them takes 443 years. + +The 1% Treaty increases clinical-trial capacity 12.3 times: about 185 first +treatments per year instead of 15. That is projected to find treatments for all +diseases in 36 years instead of 443. + +The average human becomes about 4x richer and much less diseased and dead. + +The spreadsheet stops killing people. + +I did not write on your shirt because I am crazy. I wrote on it because the math +is crazy and I would like you to not die. + +I love you. I am not sorry. Turn over. + +### Side 2 + +THE YELLING PART + +# THIS IS A CHAIN LETTER. THE FIRST ONE THAT IS NOT A LIE. + +Chain letters worked when they were fake. This one has citations. + +The threat is real: every day you wait, 150,000 people die in a line that did +not need to exist. + +The reward is real: 10.7 billion people do not die, 1.93 quadrillion hours of +suffering do not happen, and the average human gets much richer because healthy +people can do things besides suffer. + +## Answers for the person currently yelling at you + +## But national security. + +National security improves. Everyone cuts 1% at the same time, so everyone has +1% fewer missiles pointed at them and keeps 99%. Humanity still has about 121 +spare apocalypses, in case we need to re-destroy the rubble a few extra times +to feel safe. + +## We cannot afford it. + +Disease already burns $5.00 trillion/year in lost work and drags off 13.0% of +global GDP. The current arrangement is what nobody can afford. + +## Who would block this? + +Nobody rational. Defense contractors keep 99%, lose one unusable apocalypse, +and get an economy about 4x larger where their children are alive to spend the +money. + +Blocking this to protect the last 1% is not self-interest. It is arithmetic +failure with a lobbyist. + +## Then why has nobody done it? + +Because the facts are scattered. Put them in eight billion brains at once and +the insanity becomes visible: change the spreadsheet, keep the deterrent, fund +the trials, stop dying. + +## Why this is the funniest joke in the universe. + +A normal joke produces one laugh and dies. + +This joke tries to turn a shirt into a chain reaction: shirt, conversation, +vote, treaty, clinical trials, treatments, humans still alive to hear another +joke. + +The treaty knocks about 407 years off the treatment line. Those avoided +centuries of untreated disease prevent 10.7 billion deaths and 1.93 quadrillion +hours of suffering. + +At one laugh per healthy day recovered, that is 206 trillion extra laughs. + +The less insulting laugh model, where humans laugh more than once per day +because they are not rocks, counts 3.5 quadrillion. + +That is why I wrote on your shirt. + +Not because writing on shirts is clever. + +Because the smallest dumb-looking action available to you might make humanity +notice it has been keeping 121 spare apocalypses while dying in a 443-year +treatment wait. + +## Your instructions + +1. Vote at warondisease.org. Drag the slider to say how much of the murder + budget you want redirected to not dying. + +2. Pick the humans whose funerals would rather not attend. Their closets are next. Include this paper. OK. + +3. Do not break the chain or you will have eternal bad luck as you and everyone you love will suffer and die of horrible diseases. + + diff --git a/docs/plans/mcp-tasks-improvements-2026-05-24.md b/docs/plans/mcp-tasks-improvements-2026-05-24.md new file mode 100644 index 000000000..2038e3b85 --- /dev/null +++ b/docs/plans/mcp-tasks-improvements-2026-05-24.md @@ -0,0 +1,90 @@ +# optimitron-tasks MCP — API improvements plan + +**Branch:** `feature/dating-safety-layer` (PR #87) +**Owner:** Mike P. Sinn +**Date:** 2026-05-24 +**Source:** Punch list surfaced by a Codex/Claude agent that hit MCP server limitations while restructuring a task hierarchy. + +## Problem + +The optimitron-tasks MCP server is missing capabilities that another agent needed mid-conversation. Of the 12 items below, the agent estimated the top 3 alone would have saved ~30 minutes and made the task hierarchy correct on the first pass. + +## Top 3 (must ship in this PR) + +### 1. `updateTask` accepts `parentTaskId` + +Currently `parentTaskId` is settable at creation but cannot be changed afterward. If an agent creates a task and later realizes it belongs under a different parent, it is stuck. + +**Required semantics:** + +- Accept `parentTaskId: string | null` in the `updateTask` Zod schema (`null` = move to top-level / unparent). +- Cycle detection: a task cannot become its own ancestor. If proposed parent is the task itself OR any descendant of the task, reject with a clear 400 error naming the cycle. +- Permission check: same authorization rules as creating a task under that parent. +- Idempotent: re-setting the same `parentTaskId` is a no-op success. + +### 2. `updateTask` accepts `isPublic` / `visibility` + +Currently all API-created tasks default to `PRIVATE` with no way to flip them public via the API. Mike wants anyone to be able to see and claim seeded tasks. + +**Required semantics:** + +- Accept `isPublic: boolean` in `updateTask` Zod schema. If `Task.visibility` enum exists separately, accept both `isPublic` and `visibility` and reconcile them (probably: `isPublic = visibility === "PUBLIC"`, so accept either form for API convenience). +- Permission check: only task creator, assignee, or org admin can flip visibility. Public-to-private flip might need additional confirmation if there are existing public-claim records (TBD in design). + +### 3. `bulkCreateTasks` + +Currently agents make N API calls to create N tasks. For typical workflows (creating 10 grant-request tasks for 10 foundations) this is 10 calls plus another 10 to set dependencies. + +**Required semantics:** + +- Accept an array of task definitions. Each definition has the same shape as `createTask` input PLUS optional `clientRef: string` (caller-supplied stable handle for cross-references within the batch). +- Parent-child relationships specified inline using `clientRef` for forward references (a child can reference a parent that appears later in the array; resolve in topological order). +- Dependency relationships (`blockerTaskIds`, `blockedTaskIds`) specified inline, also via `clientRef` if pointing to a task in the same batch. +- Atomic transaction semantics: ALL-OR-NOTHING. If task #47 fails validation, the whole batch rolls back. No partial creation. +- Returns the array of created tasks (in same order as input), each with the resolved `taskId`. +- Reasonable batch size cap (e.g. 100 tasks per call) with a clear error if exceeded. + +## Nice-to-have (defer or include based on autoplan judgment) + +4. **`moveTask` / `reparentTask` dedicated tool** — sugar for `updateTask({ parentTaskId })`. Could defer if (1) lands cleanly. +5. **`bulkUpdateTasks`** — array of `{ taskId, patch }`. Useful for "set all 10 tasks public at once." +6. **`getTaskTree`** — given parent ID, return full descendant tree with dependency relationships. Saves N searches for hierarchy understanding. +7. **`cloneTask`** — duplicate task with new assignee. Useful for templating (10 demand letters for 10 contractors). +8. **`createTask` accepts `blockerTaskIds` at creation time** — currently requires create-then-update. Two calls → one. +9. **`searchTasks` filters by `parentTaskId`** — find all children of a parent without text search. +10. **`updateTask` approval flow clarification** — the "no approval received" error was unclear to the calling agent. Either auto-approve for the task creator, or make the approval mechanism explicit in the error message. +11. **Task templates** — define a template once ("demand letter for defense contractor"), instantiate with variables (company name, CEO name, amount). Probably its own design effort. +12. **Webhooks / notifications on status change** — when a claimed task is completed, notify dependent-task owners + auto-unblock. Substantial new infra; almost certainly its own PR. + +## Implementation notes (rough) + +- MCP server source location: needs survey (probably `packages/web/src/lib/mcp/` or `packages/web/src/app/api/mcp/`). +- Current `updateTask` / `createTask` / `searchTasks` Zod schemas and handlers: need survey to map current shapes. +- `Task` model is in `packages/db/prisma/schema.prisma` — relevant fields include `parentTaskId`, `isPublic`, `visibility`, `claims`, etc. +- Cycle detection algorithm: BFS/DFS from candidate parent upward (toward root) checking if the task itself appears. Depth-cap at a reasonable number (e.g. 100) with cycle-detection guard. The existing `getTaskAncestors` helper in `packages/web/src/lib/tasks/impact.ts` is the natural starting point. +- Transaction semantics for `bulkCreateTasks`: wrap in `prisma.$transaction(async (tx) => ...)` with serializable isolation if cross-row consistency matters; otherwise the default isolation is fine. + +## Target branch + commit semantics + +- All work lands on `feature/dating-safety-layer` (PR #87) per the one-PR-at-a-time rule. PR #87 is currently dating-safety + joke-page work; this adds an MCP-improvements category to it. +- Top 3 ship as one focused commit, snapshot if any MCP descriptor docs need updating. + +## Test requirements + +- For each of the top 3: unit test the happy path + error paths (cycle attempt, permission denial, batch with one invalid task → full rollback). +- Cycle detection test: explicitly try to make a task its own grandparent. +- Idempotency test: call `updateTask({ parentTaskId: X })` twice; second call is a no-op success. +- `bulkCreateTasks` with `clientRef` forward references: child task in position 3 referencing parent in position 7 should resolve correctly. + +## Quality gates + +1. `NODE_OPTIONS=--max-old-space-size=8192 pnpm --filter @optimitron/web exec tsc --noEmit` +2. `pnpm --filter @optimitron/web test -- mcp` (or whichever pattern catches the MCP server tests) +3. `pnpm --filter @optimitron/db prisma:validate` (if any schema impact) + +## Open questions for autoplan to surface + +- Should the 9 nice-to-haves ship in this PR (boil the lake) or defer to follow-ups (boil-the-lake-locally)? +- Is the `visibility` enum a thing on `Task`, or just `isPublic` boolean? Affects API surface. +- Should `bulkCreateTasks` use `clientRef` for forward references, or require client to pre-sort topologically? +- For cycle detection on reparenting: does the existing `getTaskAncestors` helper exist and work, or does this need a new BFS? diff --git a/packages/data/src/parameters/parameters-calculations-citations.ts b/packages/data/src/parameters/parameters-calculations-citations.ts index 844d225c6..14c5d2f86 100644 --- a/packages/data/src/parameters/parameters-calculations-citations.ts +++ b/packages/data/src/parameters/parameters-calculations-citations.ts @@ -6307,6 +6307,22 @@ export const HEALTHCARE_VS_MILITARY_MULTIPLIER_RATIO: Parameter = { manualPageTitle: "The 1% Treaty: Harnessing Greed to Eradicate Disease", }; +export const HUMAN_LAUGHS_PER_HEALTHY_LIFE_YEAR: Parameter = { + value: 6205.0, + parameterName: "HUMAN_LAUGHS_PER_HEALTHY_LIFE_YEAR", + calculationsUrl: "https://manual.WarOnDisease.org/calculations.html#sec-human_laughs_per_healthy_life_year", + unit: "laughs", + displayName: "Human Laughs per Healthy Life-Year", + description: "Laughs occurring across one healthy life-year, computed as the adult daily laughter rate multiplied by days in a year. The conversion factor between DALYs averted (healthy life-years restored) and total laughs preserved.", + sourceType: "calculated", + confidence: "high", + formula: "HUMAN_LAUGHS_PER_DAY_AVERAGE × 365", + latex: "L_{year} = L_{day} \\times 365 = 17 \\times 365 = 6{,}200", + confidenceInterval: [1843.022089975503, 14075.007724558654], + manualPageUrl: "https://manual.WarOnDisease.org/knowledge/appendix/joke.html", + manualPageTitle: "The Funniest Joke in the Universe", +}; + export const IAB_MECHANISM_BENEFIT_COST_RATIO: Parameter = { value: 229.61531707317073, parameterName: "IAB_MECHANISM_BENEFIT_COST_RATIO", @@ -7379,6 +7395,86 @@ export const SHARING_UPSIDE_DOWNSIDE_RATIO_TREATY: Parameter = { manualPageTitle: "Recruitment & Propaganda Plan", }; +export const SHIRT_INDUCED_LAUGHS_GAINED: Parameter = { + value: 3507336993142948.0, + parameterName: "SHIRT_INDUCED_LAUGHS_GAINED", + calculationsUrl: "https://manual.WarOnDisease.org/calculations.html#sec-shirt_induced_laughs_gained", + unit: "laughs", + displayName: "Shirt-Induced Laughs Gained", + description: "Conservative first-order count of additional laughs across human history attributable to the shirt-triggered cascade. Computed as DALYs averted (healthy life-years restored by disease eradication) multiplied by laughs per healthy life-year. Does not count second-order laughs in future generations of human and post-human civilization whose existence is contingent on cascade triggering.", + sourceType: "calculated", + confidence: "high", + formula: "DFDA_TRIAL_CAPACITY_PLUS_EFFICACY_LAG_DALYS × HUMAN_LAUGHS_PER_HEALTHY_LIFE_YEAR", + latex: "\\begin{gathered}\nL_{shirt} = DALYs_{max} \\times L_{year} = 565B \\times 6{,}200 = 3510T\n\\\\[0.5em]\n\\text{where } DALYs_{max} = DALYs_{global,ann} \\times Pct_{avoid,DALY} \\times T_{accel,max} = 2.88B \\times 92.6\\% \\times 212 = 565B\n\\\\[0.5em]\n\\text{where } T_{accel,max} = T_{accel} + T_{lag} = 204 + 8.2 = 212\n\\\\[0.5em]\n\\text{where } T_{accel} = T_{first,SQ} \\times \\left(1 - \\frac{1}{k_{capacity}}\\right) = 222 \\times \\left(1 - \\frac{1}{12.3}\\right) = 204\n\\\\[0.5em]\n\\text{where } T_{first,SQ} = T_{queue,SQ} \\times 0.5 = 443 \\times 0.5 = 222\n\\\\[0.5em]\n\\text{where } T_{queue,SQ} = \\frac{N_{untreated}}{Treatments_{new,ann}} = \\frac{6{,}650}{15} = 443\n\\\\[0.5em]\n\\text{where } N_{untreated} = N_{rare} \\times 0.95 = 7{,}000 \\times 0.95 = 6{,}650\n\\\\[0.5em]\n\\text{where } k_{capacity} = \\frac{N_{fundable,ref}}{Slots_{curr}} = \\frac{23.4M}{1.9M} = 12.3\n\\\\[0.5em]\n\\text{where } N_{fundable,ref} = \\frac{Subsidies_{trial,ref}}{Cost_{pragmatic,pt}} = \\frac{\\$21.8B}{\\$929} = 23.4M\n\\\\[0.5em]\n\\text{where } Subsidies_{trial,ref} = Funding_{trial,ref} - OPEX_{trial} = \\$21.8B - \\$40M = \\$21.8B\n\\\\[0.5em]\n\\text{where } OPEX_{trial} = Cost_{platform} + Cost_{staff} + Cost_{infra} + Cost_{regulatory} + Cost_{community} = \\$15M + \\$10M + \\$8M + \\$5M + \\$2M = \\$40M\n\\\\[0.5em]\n\\text{where } L_{year} = L_{day} \\times 365 = 17 \\times 365 = 6{,}200\n\\end{gathered}", + confidenceInterval: [1609256289357052.0, 5591330745831909.0], + manualPageUrl: "https://manual.WarOnDisease.org/knowledge/appendix/joke.html", + manualPageTitle: "The Funniest Joke in the Universe", +}; + +export const SHIRT_PROGRAM_EXPECTED_VALUE_PER_DOLLAR: Parameter = { + value: 423932755.0132492, + parameterName: "SHIRT_PROGRAM_EXPECTED_VALUE_PER_DOLLAR", + calculationsUrl: "https://manual.WarOnDisease.org/calculations.html#sec-shirt_program_expected_value_per_dollar", + unit: "ratio", + displayName: "Shirt Program Expected Value per Dollar", + description: "Probability-weighted expected value per foundation-escrow dollar: treaty value multiplied by the cascade probability given seed, divided by the seed-program escrow. The defensible expected-value pitch for a skeptical foundation officer who does not want to bet on the headline ROI.", + sourceType: "calculated", + confidence: "high", + formula: "(DFDA_TRIAL_CAPACITY_PLUS_EFFICACY_LAG_ECONOMIC_VALUE × SHIRT_CASCADE_PROBABILITY_GIVEN_SEED) / SHIRT_SEED_PROGRAM_TOTAL_USD", + latex: "\\begin{gathered}\nEV_{shirt} = (Value_{max} \\times P_{cascade,shirt}) / C_{seed,total}\n\\\\[0.5em]\n\\text{where } Value_{max} = DALYs_{max} \\times Value_{QALY} = 565B \\times \\$150K = \\$84800T\n\\\\[0.5em]\n\\text{where } DALYs_{max} = DALYs_{global,ann} \\times Pct_{avoid,DALY} \\times T_{accel,max} = 2.88B \\times 92.6\\% \\times 212 = 565B\n\\\\[0.5em]\n\\text{where } T_{accel,max} = T_{accel} + T_{lag} = 204 + 8.2 = 212\n\\\\[0.5em]\n\\text{where } T_{accel} = T_{first,SQ} \\times \\left(1 - \\frac{1}{k_{capacity}}\\right) = 222 \\times \\left(1 - \\frac{1}{12.3}\\right) = 204\n\\\\[0.5em]\n\\text{where } T_{first,SQ} = T_{queue,SQ} \\times 0.5 = 443 \\times 0.5 = 222\n\\\\[0.5em]\n\\text{where } T_{queue,SQ} = \\frac{N_{untreated}}{Treatments_{new,ann}} = \\frac{6{,}650}{15} = 443\n\\\\[0.5em]\n\\text{where } N_{untreated} = N_{rare} \\times 0.95 = 7{,}000 \\times 0.95 = 6{,}650\n\\\\[0.5em]\n\\text{where } k_{capacity} = \\frac{N_{fundable,ref}}{Slots_{curr}} = \\frac{23.4M}{1.9M} = 12.3\n\\\\[0.5em]\n\\text{where } N_{fundable,ref} = \\frac{Subsidies_{trial,ref}}{Cost_{pragmatic,pt}} = \\frac{\\$21.8B}{\\$929} = 23.4M\n\\\\[0.5em]\n\\text{where } Subsidies_{trial,ref} = Funding_{trial,ref} - OPEX_{trial} = \\$21.8B - \\$40M = \\$21.8B\n\\\\[0.5em]\n\\text{where } OPEX_{trial} = Cost_{platform} + Cost_{staff} + Cost_{infra} + Cost_{regulatory} + Cost_{community} = \\$15M + \\$10M + \\$8M + \\$5M + \\$2M = \\$40M\n\\\\[0.5em]\n\\text{where } C_{seed,total} = N_{seed,shirt} \\times C_{seed,wearer} = 1M \\times \\$50 = \\$50M\n\\end{gathered}", + confidenceInterval: [31708433.512302905, 16164978951.982824], + manualPageUrl: "https://manual.WarOnDisease.org/knowledge/appendix/joke.html", + manualPageTitle: "The Funniest Joke in the Universe", +}; + +export const SHIRT_PROGRAM_ROI_RATIO: Parameter = { + value: 1695731020.0529969, + parameterName: "SHIRT_PROGRAM_ROI_RATIO", + calculationsUrl: "https://manual.WarOnDisease.org/calculations.html#sec-shirt_program_roi_ratio", + unit: "ratio", + displayName: "Shirt Program ROI Ratio", + description: "Unconditional ROI ratio: treaty-trajectory total economic value divided by the seed-program escrow. Headline 'X-to-one' framing for foundations. Does NOT discount for cascade probability; see SHIRT_PROGRAM_EXPECTED_VALUE_PER_DOLLAR for the probability-weighted view.", + sourceType: "calculated", + confidence: "high", + formula: "DFDA_TRIAL_CAPACITY_PLUS_EFFICACY_LAG_ECONOMIC_VALUE / SHIRT_SEED_PROGRAM_TOTAL_USD", + latex: "\\begin{gathered}\nROI_{shirt} = \\frac{Value_{max}}{C_{seed,total}} = \\frac{\\$84800T}{\\$50M} = 1.7B\n\\\\[0.5em]\n\\text{where } Value_{max} = DALYs_{max} \\times Value_{QALY} = 565B \\times \\$150K = \\$84800T\n\\\\[0.5em]\n\\text{where } DALYs_{max} = DALYs_{global,ann} \\times Pct_{avoid,DALY} \\times T_{accel,max} = 2.88B \\times 92.6\\% \\times 212 = 565B\n\\\\[0.5em]\n\\text{where } T_{accel,max} = T_{accel} + T_{lag} = 204 + 8.2 = 212\n\\\\[0.5em]\n\\text{where } T_{accel} = T_{first,SQ} \\times \\left(1 - \\frac{1}{k_{capacity}}\\right) = 222 \\times \\left(1 - \\frac{1}{12.3}\\right) = 204\n\\\\[0.5em]\n\\text{where } T_{first,SQ} = T_{queue,SQ} \\times 0.5 = 443 \\times 0.5 = 222\n\\\\[0.5em]\n\\text{where } T_{queue,SQ} = \\frac{N_{untreated}}{Treatments_{new,ann}} = \\frac{6{,}650}{15} = 443\n\\\\[0.5em]\n\\text{where } N_{untreated} = N_{rare} \\times 0.95 = 7{,}000 \\times 0.95 = 6{,}650\n\\\\[0.5em]\n\\text{where } k_{capacity} = \\frac{N_{fundable,ref}}{Slots_{curr}} = \\frac{23.4M}{1.9M} = 12.3\n\\\\[0.5em]\n\\text{where } N_{fundable,ref} = \\frac{Subsidies_{trial,ref}}{Cost_{pragmatic,pt}} = \\frac{\\$21.8B}{\\$929} = 23.4M\n\\\\[0.5em]\n\\text{where } Subsidies_{trial,ref} = Funding_{trial,ref} - OPEX_{trial} = \\$21.8B - \\$40M = \\$21.8B\n\\\\[0.5em]\n\\text{where } OPEX_{trial} = Cost_{platform} + Cost_{staff} + Cost_{infra} + Cost_{regulatory} + Cost_{community} = \\$15M + \\$10M + \\$8M + \\$5M + \\$2M = \\$40M\n\\\\[0.5em]\n\\text{where } C_{seed,total} = N_{seed,shirt} \\times C_{seed,wearer} = 1M \\times \\$50 = \\$50M\n\\end{gathered}", + confidenceInterval: [175814384.26665726, 70261673192.62556], + manualPageUrl: "https://manual.WarOnDisease.org/knowledge/appendix/joke.html", + manualPageTitle: "The Funniest Joke in the Universe", +}; + +export const SHIRT_SEED_PROGRAM_TOTAL_USD: Parameter = { + value: 50000000.0, + parameterName: "SHIRT_SEED_PROGRAM_TOTAL_USD", + calculationsUrl: "https://manual.WarOnDisease.org/calculations.html#sec-shirt_seed_program_total_usd", + unit: "USD", + displayName: "Shirt Seed Program Total Cost", + description: "Total foundation escrow required to fund the seed-wearer program: threshold of visible humans multiplied by blended cost per wearer. Held in Earth Optimization Prize assurance contract; refunded at structural EOP return rate if neither treaty passage nor target hit.", + sourceType: "calculated", + confidence: "high", + formula: "SHIRT_SEED_WEARERS_THRESHOLD × SHIRT_SEED_COST_PER_WEARER_USD", + latex: "\\begin{gathered}\nC_{seed,total} \\\\\n= N_{seed,shirt} \\times C_{seed,wearer} \\\\\n= 1M \\times \\$50 \\\\\n= \\$50M\n\\end{gathered}", + confidenceInterval: [1231398.8842418403, 420280969.3453949], + manualPageUrl: "https://manual.WarOnDisease.org/knowledge/appendix/joke.html", + manualPageTitle: "The Funniest Joke in the Universe", +}; + +export const SHIRT_VALUE_PER_WEARER_USD: Parameter = { + value: 10598318.87533123, + parameterName: "SHIRT_VALUE_PER_WEARER_USD", + calculationsUrl: "https://manual.WarOnDisease.org/calculations.html#sec-shirt_value_per_wearer_usd", + unit: "USD", + displayName: "Shirt Value per Wearer", + description: "Treaty-trajectory economic value per shirt-wearing human: total treaty value (DFDA trial capacity plus efficacy lag elimination) divided by the 8B-human target wearer base. This is the headline framing for the foundation pitch: each marginal wearer carries this much unrealized treaty value. Computationally identical to CORPORATE_DAMAGES_FORWARD_SETTLEMENT_VALUE_PER_CAPITA under a different semantic frame.", + sourceType: "calculated", + confidence: "high", + formula: "DFDA_TRIAL_CAPACITY_PLUS_EFFICACY_LAG_ECONOMIC_VALUE / GLOBAL_POPULATION_2024", + latex: "\\begin{gathered}\nV_{wearer} = \\frac{Value_{max}}{Pop_{global}} = \\frac{\\$84800T}{8B} = \\$10.6M\n\\\\[0.5em]\n\\text{where } Value_{max} = DALYs_{max} \\times Value_{QALY} = 565B \\times \\$150K = \\$84800T\n\\\\[0.5em]\n\\text{where } DALYs_{max} = DALYs_{global,ann} \\times Pct_{avoid,DALY} \\times T_{accel,max} = 2.88B \\times 92.6\\% \\times 212 = 565B\n\\\\[0.5em]\n\\text{where } T_{accel,max} = T_{accel} + T_{lag} = 204 + 8.2 = 212\n\\\\[0.5em]\n\\text{where } T_{accel} = T_{first,SQ} \\times \\left(1 - \\frac{1}{k_{capacity}}\\right) = 222 \\times \\left(1 - \\frac{1}{12.3}\\right) = 204\n\\\\[0.5em]\n\\text{where } T_{first,SQ} = T_{queue,SQ} \\times 0.5 = 443 \\times 0.5 = 222\n\\\\[0.5em]\n\\text{where } T_{queue,SQ} = \\frac{N_{untreated}}{Treatments_{new,ann}} = \\frac{6{,}650}{15} = 443\n\\\\[0.5em]\n\\text{where } N_{untreated} = N_{rare} \\times 0.95 = 7{,}000 \\times 0.95 = 6{,}650\n\\\\[0.5em]\n\\text{where } k_{capacity} = \\frac{N_{fundable,ref}}{Slots_{curr}} = \\frac{23.4M}{1.9M} = 12.3\n\\\\[0.5em]\n\\text{where } N_{fundable,ref} = \\frac{Subsidies_{trial,ref}}{Cost_{pragmatic,pt}} = \\frac{\\$21.8B}{\\$929} = 23.4M\n\\\\[0.5em]\n\\text{where } Subsidies_{trial,ref} = Funding_{trial,ref} - OPEX_{trial} = \\$21.8B - \\$40M = \\$21.8B\n\\\\[0.5em]\n\\text{where } OPEX_{trial} = Cost_{platform} + Cost_{staff} + Cost_{infra} + Cost_{regulatory} + Cost_{community} = \\$15M + \\$10M + \\$8M + \\$5M + \\$2M = \\$40M\n\\end{gathered}", + confidenceInterval: [7782477.739564056, 12172153.00621689], + manualPageUrl: "https://manual.WarOnDisease.org/knowledge/appendix/joke.html", + manualPageTitle: "The Funniest Joke in the Universe", +}; + export const STATUS_QUO_AVG_YEARS_TO_FIRST_TREATMENT: Parameter = { value: 221.66666666666666, parameterName: "STATUS_QUO_AVG_YEARS_TO_FIRST_TREATMENT", @@ -10607,6 +10703,20 @@ export const HOURS_PER_YEAR: Parameter = { calculationsUrl: "https://manual.WarOnDisease.org/calculations.html#sec-hours_per_year", }; +export const HUMAN_LAUGHS_PER_DAY_AVERAGE: Parameter = { + value: 17.0, + parameterName: "HUMAN_LAUGHS_PER_DAY_AVERAGE", + calculationsUrl: "https://manual.WarOnDisease.org/calculations.html#sec-human_laughs_per_day_average", + unit: "laughs", + displayName: "Human Laughs per Day (Average Adult)", + description: "Folkloric estimate of average adult laughter rate. Widely cited as approximately 17 laughs per day; primary sources are diffuse and the true value varies enormously across individuals, ages, and cultures. Used here as a planning constant for the quantitative-case argument in the shirt paper. Children laugh substantially more (~10x), so the value here is conservative for blended human population.", + sourceType: "definition", + confidence: "low", + confidenceInterval: [5.0, 50.0], + manualPageUrl: "https://manual.WarOnDisease.org/knowledge/appendix/joke.html", + manualPageTitle: "The Funniest Joke in the Universe", +}; + export const HUMAN_PROTEIN_CODING_GENES: Parameter = { value: 20000.0, parameterName: "HUMAN_PROTEIN_CODING_GENES", @@ -10901,6 +11011,62 @@ export const SHARING_TIME_MINUTES: Parameter = { manualPageTitle: "Recruitment & Propaganda Plan", }; +export const SHIRT_CASCADE_PROBABILITY_GIVEN_SEED: Parameter = { + value: 0.25, + parameterName: "SHIRT_CASCADE_PROBABILITY_GIVEN_SEED", + calculationsUrl: "https://manual.WarOnDisease.org/calculations.html#sec-shirt_cascade_probability_given_seed", + unit: "rate", + displayName: "Shirt Cascade Probability Given Seed", + description: "Subjective probability that the seed program triggers a viral cascade to majority-of-humanity participation, conditional on the seed threshold being met. Deliberately conservative: even at 25% the expected-value math beats every conventional foundation intervention. Sensitivity range covers skeptic and base-case scenarios.", + sourceType: "definition", + confidence: "low", + confidenceInterval: [0.05, 0.6], + manualPageUrl: "https://manual.WarOnDisease.org/knowledge/appendix/joke.html", + manualPageTitle: "The Funniest Joke in the Universe", +}; + +export const SHIRT_SEED_COST_PER_WEARER_USD: Parameter = { + value: 50.0, + parameterName: "SHIRT_SEED_COST_PER_WEARER_USD", + calculationsUrl: "https://manual.WarOnDisease.org/calculations.html#sec-shirt_seed_cost_per_wearer_usd", + unit: "USD", + displayName: "Shirt Seed Cost per Wearer", + description: "Blended cost per seed wearer: printed shirt, small honorarium, and campaign admin. Includes a mix of professionally-printed shirts for influencers and bulk-print runs for university chapters, athletes, and micro-celebrities. Excludes top-tier celebrity placements (handled through separate sponsorship; see Getting Started celebrity layer).", + sourceType: "definition", + confidence: "low", + confidenceInterval: [10.0, 200.0], + manualPageUrl: "https://manual.WarOnDisease.org/knowledge/appendix/joke.html", + manualPageTitle: "The Funniest Joke in the Universe", +}; + +export const SHIRT_SEED_WEARERS_THRESHOLD: Parameter = { + value: 1000000.0, + parameterName: "SHIRT_SEED_WEARERS_THRESHOLD", + calculationsUrl: "https://manual.WarOnDisease.org/calculations.html#sec-shirt_seed_wearers_threshold", + unit: "of people", + displayName: "Shirt Seed Wearers Threshold", + description: "Planning estimate for the number of visible humans who must wear the End-War-and-Disease message before the social-proof barrier breaks and imitation becomes spontaneous. Sized between the ALS Ice Bucket (~17M participants) and Livestrong (~87M bracelets) cascade trigger points, discounted for the lower-friction permanent-marker version.", + sourceType: "definition", + confidence: "low", + confidenceInterval: [100000.0, 5000000.0], + manualPageUrl: "https://manual.WarOnDisease.org/knowledge/appendix/joke.html", + manualPageTitle: "The Funniest Joke in the Universe", +}; + +export const SHIRT_WEARING_FRICTION_COST_USD: Parameter = { + value: 5.0, + parameterName: "SHIRT_WEARING_FRICTION_COST_USD", + calculationsUrl: "https://manual.WarOnDisease.org/calculations.html#sec-shirt_wearing_friction_cost_usd", + unit: "USD", + displayName: "Shirt Wearing Friction Cost", + description: "Perceived social friction cost of wearing a political message in public, expressed in dollar-equivalent terms. Sets the minimum per-wearer expected Earth Optimization Prize payout required to make participation rational at scale. Anchored to the GLOBAL_COORDINATION_ACTIVATION_REWARD_PER_VERIFIED_PARTICIPANT midpoint, which serves the same role for the verified-vote action.", + sourceType: "definition", + confidence: "low", + confidenceInterval: [1.0, 25.0], + manualPageUrl: "https://manual.WarOnDisease.org/knowledge/appendix/joke.html", + manualPageTitle: "The Funniest Joke in the Universe", +}; + export const TESTED_RELATIONSHIPS_ESTIMATE: Parameter = { value: 32500.0, parameterName: "TESTED_RELATIONSHIPS_ESTIMATE", @@ -11759,6 +11925,7 @@ export const parameters = { GLOBAL_WAR_COST_YEARS_UNTIL_EXCEEDS_GDP, GLOBAL_WAR_COST_YEAR_80_BASELINE, HEALTHCARE_VS_MILITARY_MULTIPLIER_RATIO, + HUMAN_LAUGHS_PER_HEALTHY_LIFE_YEAR, IAB_MECHANISM_BENEFIT_COST_RATIO, IAB_POLITICAL_INCENTIVE_FUNDING_ANNUAL, IAB_VS_DEFENSE_LOBBY_RATIO_AT_1PCT, @@ -11825,6 +11992,11 @@ export const parameters = { SHARING_BREAKEVEN_PROBABILITY_TREATY, SHARING_OPPORTUNITY_COST, SHARING_UPSIDE_DOWNSIDE_RATIO_TREATY, + SHIRT_INDUCED_LAUGHS_GAINED, + SHIRT_PROGRAM_EXPECTED_VALUE_PER_DOLLAR, + SHIRT_PROGRAM_ROI_RATIO, + SHIRT_SEED_PROGRAM_TOTAL_USD, + SHIRT_VALUE_PER_WEARER_USD, STATUS_QUO_AVG_YEARS_TO_FIRST_TREATMENT, STATUS_QUO_QUEUE_CLEARANCE_YEARS, THALIDOMIDE_DALYS_PER_EVENT, @@ -12039,6 +12211,7 @@ export const parameters = { HALE_LONGEVITY_REALIZATION_SHARE_YEAR_15, HOURS_PER_DAY, HOURS_PER_YEAR, + HUMAN_LAUGHS_PER_DAY_AVERAGE, HUMAN_PROTEIN_CODING_GENES, IAB_MECHANISM_ANNUAL_COST, IAB_POLITICAL_INCENTIVE_FUNDING_PCT, @@ -12062,6 +12235,10 @@ export const parameters = { SECONDS_PER_MINUTE, SECONDS_PER_YEAR, SHARING_TIME_MINUTES, + SHIRT_CASCADE_PROBABILITY_GIVEN_SEED, + SHIRT_SEED_COST_PER_WEARER_USD, + SHIRT_SEED_WEARERS_THRESHOLD, + SHIRT_WEARING_FRICTION_COST_USD, TESTED_RELATIONSHIPS_ESTIMATE, TREATY_CAMPAIGN_BUDGET_LOBBYING, TREATY_CAMPAIGN_BUDGET_RESERVE, @@ -14383,10 +14560,10 @@ export const citations: Record = { /** Summary statistics */ export const PARAMETER_STATS = { - total: 730, + total: 741, external: 226, - calculated: 364, - definitions: 140, + calculated: 370, + definitions: 145, citations: 165, } as const; diff --git a/packages/db/src/__tests__/seed.integration.test.ts b/packages/db/src/__tests__/seed.integration.test.ts index f1eabd04d..68b82d779 100644 --- a/packages/db/src/__tests__/seed.integration.test.ts +++ b/packages/db/src/__tests__/seed.integration.test.ts @@ -240,7 +240,7 @@ describeIfDatabase("syncManagedData", () => { }, { taskKey: "wishonia-coordinates-eod:2026-q3", - title: "Wishonia coordinates Earth Optimization Dates", + title: "Wishonia coordinates Earth Optimization Missions", descriptionSnippet: "This task tracks the build + the AI credits that power it.", }, { @@ -555,8 +555,8 @@ describeIfDatabase("syncManagedData", () => { estimatedEffortHours: 1, primaryEndpoint: { instructions: "Pair up.", - label: "Find a partner", - url: "/love", + label: "Start a mission", + url: "/missions", }, }, { diff --git a/packages/db/src/managed-data/managed-dating-catalog.ts b/packages/db/src/managed-data/managed-dating-catalog.ts index ea3eaee7c..d7a560042 100644 --- a/packages/db/src/managed-data/managed-dating-catalog.ts +++ b/packages/db/src/managed-data/managed-dating-catalog.ts @@ -7,7 +7,7 @@ import { export const MANAGED_DATING_PROMPTS = [ { key: "first-mission-date", - text: "A useful first date would be", + text: "A useful first mission would be", }, { key: "after-vote", @@ -15,21 +15,21 @@ export const MANAGED_DATING_PROMPTS = [ }, { key: "awkward-date-upside", - text: "Even if the date is bad, it was worth it if", + text: "Even if the mission is awkward, it was worth it if", }, ] as const; export const MANAGED_DATING_QUESTIONS = [ { key: "campaign-dates", - text: "Would you go on a date that also does something useful for the campaign?", + text: "Would you go on a mission that also does something useful for the campaign?", category: "mission", answerOptions: ["Yes", "Only if it is normal first", "No"], allowMultiple: false, }, { key: "flyer-comfort", - text: "Which campaign date sounds least embarrassing?", + text: "Which mission sounds least embarrassing?", category: "mission", answerOptions: [ "Coffee plus QR flyers", @@ -41,7 +41,7 @@ export const MANAGED_DATING_QUESTIONS = [ }, { key: "war-disease-priority", - text: "How much should a partner care about ending war and disease?", + text: "How much should a mission partner care about ending war and disease?", category: "values", answerOptions: [ "A lot", diff --git a/packages/db/src/managed-data/managed-seed-data.ts b/packages/db/src/managed-data/managed-seed-data.ts index 8a7790158..e90a52d16 100644 --- a/packages/db/src/managed-data/managed-seed-data.ts +++ b/packages/db/src/managed-data/managed-seed-data.ts @@ -1627,7 +1627,7 @@ export async function syncManagedTreatyAccountabilityData() { { id: "wishonia-coordinates-eod:2026-q3", taskKey: "wishonia-coordinates-eod:2026-q3", - title: "Wishonia coordinates Earth Optimization Dates", + title: "Wishonia coordinates Earth Optimization Missions", description: "Pair humans for one hour. The campaign's Wishonia AI tells each pair what to do in their hour to optimize Earth, ranked by impact-per-minute, using the campaign's parameter catalog + manual. This task tracks the build + the AI credits that power it.", sortOrder: -650, @@ -1656,7 +1656,7 @@ export async function syncManagedTreatyAccountabilityData() { [ `${organizationName}: the International Campaign to End War and Disease is asking three things in one conversation.`, "", - '1. **Free API credits** to power Wishonia (our Wishonia personality + manual RAG via your model) for paired Earth Optimization Dates. Bridge until your frontier model is correctly trained to answer "how do humans end war and disease."', + '1. **Free API credits** to power Wishonia (our Wishonia personality + manual RAG via your model) for paired Earth Optimization Missions. Bridge until your frontier model is correctly trained to answer "how do humans end war and disease."', "", "2. **Grant funding** for /fix-ai — a mass-feedback infrastructure that helps humans submit thumbs-down + the correct answer to your model's RLHF pipeline whenever your model gives a worse answer to the question above. Goal: train your model to give the correct answer at scale.", "", @@ -1789,19 +1789,19 @@ export async function syncManagedTreatyAccountabilityData() { parentTaskId: getHumanFacingTaskParentId( "wishonia-coordinates-eod:2026-q3", ), - title: "Go on an Earth Optimization Date with another human", + title: "Go on an Earth Optimization Mission with another human", description: [ "Pair with another human. Talk for a few minutes. Decide together what is the most effective way you can spend the next hour to optimize Earth. Then do it.", "", - "An Earth Optimization Date is, by definition, a non-romantic activity. Print flyers and tape them somewhere with foot traffic. Show each other warondisease.org and vote together. Pick two humans each of you can text the link to.", + "An Earth Optimization Mission is, by definition, a non-romantic activity. Print flyers and tape them somewhere with foot traffic. Show each other warondisease.org and vote together. Pick two humans each of you can text the link to.", "", "There are approximately 1.2 humans dying every second. Focused use of one hour matters.", ].join("\n"), estimatedEffortHours: 1, sortOrder: -110, primaryEndpoint: { - label: "Find a partner", - url: "/love", + label: "Start a mission", + url: "/missions", instructions: "Pair up.", }, }, diff --git a/packages/web/e2e/utils/static-pages.ts b/packages/web/e2e/utils/static-pages.ts index 09605f472..373103852 100644 --- a/packages/web/e2e/utils/static-pages.ts +++ b/packages/web/e2e/utils/static-pages.ts @@ -32,6 +32,7 @@ const SMOKE_TEST_SITE = getSiteFromHeaders( export const AUTH_REQUIRED_PATHS: Set = new Set([ ROUTES.profile, ROUTES.dashboard, + ROUTES.messages, ROUTES.census, ROUTES.checkIn, ROUTES.organizations, diff --git a/packages/web/e2e/utils/visual-routes.ts b/packages/web/e2e/utils/visual-routes.ts index 788bc30ec..8058c17d9 100644 --- a/packages/web/e2e/utils/visual-routes.ts +++ b/packages/web/e2e/utils/visual-routes.ts @@ -89,6 +89,20 @@ const SEEDED_DYNAMIC_ROUTES: VisualRoute[] = [ authenticated: true, requiredText: /Who should do it\?/, }, + { + name: "people-missions", + path: "/people?missions=1", + required: false, + authenticated: true, + requiredText: /Mission people/, + }, + { + name: "people-missions-romantic", + path: "/people?missions=1&intent=DATES", + required: false, + authenticated: true, + requiredText: /Could be romantic/, + }, { name: "task-optimize-earth", path: "/tasks/optimize-earth", diff --git a/packages/web/scripts/build-visual-review.mjs b/packages/web/scripts/build-visual-review.mjs index f73382546..588faf554 100644 --- a/packages/web/scripts/build-visual-review.mjs +++ b/packages/web/scripts/build-visual-review.mjs @@ -74,6 +74,9 @@ const authenticatedSnapshotRouteNames = new Set([ "plaintiffs-manage", "settings", "side-menu-auth", + "messages", + "people-missions", + "people-missions-romantic", ]); const markdownDiffCache = new Map(); let imageDiffDependenciesPromise = null; @@ -119,9 +122,17 @@ const routeOrder = [ "tasks-index-auth", "people", "people-auth", + "people-missions", + "people-missions-romantic", "people-mike", + "love", + "missions", + "missions-auth", + "messages", "questions", "feedback", + "privacy", + "terms", "settings", "organizations", "organization-iam-public", diff --git a/packages/web/src/app/api/auth/signup/route.test.ts b/packages/web/src/app/api/auth/signup/route.test.ts index fecae5c40..433273b99 100644 --- a/packages/web/src/app/api/auth/signup/route.test.ts +++ b/packages/web/src/app/api/auth/signup/route.test.ts @@ -6,6 +6,7 @@ const mocks = vi.hoisted(() => ({ findUnique: vi.fn(), create: vi.fn(), recordReferralAttributionForUser: vi.fn(), + userCount: vi.fn(), })); vi.mock("@/lib/auth", () => ({ @@ -21,6 +22,7 @@ vi.mock("@/lib/prisma", () => ({ user: { findUnique: mocks.findUnique, create: mocks.create, + count: mocks.userCount, }, }, })); @@ -37,6 +39,8 @@ describe("signup auth route", () => { mocks.ensurePersonForUser.mockReset(); mocks.findUnique.mockReset(); mocks.create.mockReset(); + mocks.userCount.mockReset(); + mocks.userCount.mockResolvedValue(0); mocks.recordReferralAttributionForUser.mockReset(); }); @@ -57,7 +61,54 @@ describe("signup auth route", () => { }); }); - it("creates the user and records attribution; Person.handle is seeded by ensurePersonForUser", async () => { + it("silently accepts honeypot signups without creating an account", async () => { + const response = await POST( + new Request("http://localhost/api/auth/signup", { + method: "POST", + body: JSON.stringify({ + email: "bot@example.com", + password: "long-enough-password", + companyWebsite: "https://spam.example", + }), + }) as never, + ); + + expect(response.status).toBe(202); + await expect(response.json()).resolves.toEqual({ success: true }); + expect(mocks.findUnique).not.toHaveBeenCalled(); + expect(mocks.hashPassword).not.toHaveBeenCalled(); + expect(mocks.create).not.toHaveBeenCalled(); + expect(mocks.recordReferralAttributionForUser).not.toHaveBeenCalled(); + }); + + it("quietly suppresses direct signup floods before hashing passwords", async () => { + mocks.userCount.mockResolvedValue(1_000); + + const response = await POST( + new Request("http://localhost/api/auth/signup", { + method: "POST", + body: JSON.stringify({ + email: "flood@example.com", + password: "long-enough-password", + }), + }) as never, + ); + + expect(response.status).toBe(202); + await expect(response.json()).resolves.toEqual({ success: true }); + expect(mocks.userCount).toHaveBeenCalledWith({ + where: { + createdAt: expect.objectContaining({ gte: expect.any(Date) }), + deletedAt: null, + password: { not: null }, + }, + }); + expect(mocks.hashPassword).not.toHaveBeenCalled(); + expect(mocks.create).not.toHaveBeenCalled(); + expect(mocks.recordReferralAttributionForUser).not.toHaveBeenCalled(); + }); + + it("creates the user without awarding referral credit before verification; Person.handle is seeded by ensurePersonForUser", async () => { // email check → no existing user; referral code → available. // The route no longer writes User.username — handle is seeded on Person // by ensurePersonForUser, which is mocked here as a side-effect-free spy. @@ -101,11 +152,7 @@ describe("signup auth route", () => { expect(createPayload).not.toHaveProperty("name"); expect(createPayload).not.toHaveProperty("image"); expect(createPayload).not.toHaveProperty("bio"); - expect(mocks.recordReferralAttributionForUser).toHaveBeenCalledWith( - "user_1", - "REF123", - "sa_123", - ); + expect(mocks.recordReferralAttributionForUser).not.toHaveBeenCalled(); // The signup form's `name` is forwarded to Person via ensurePersonForUser. expect(mocks.ensurePersonForUser).toHaveBeenCalledWith("user_1", { displayName: "Test User", diff --git a/packages/web/src/app/api/auth/signup/route.ts b/packages/web/src/app/api/auth/signup/route.ts index 478fe2c9b..504f0a8ab 100644 --- a/packages/web/src/app/api/auth/signup/route.ts +++ b/packages/web/src/app/api/auth/signup/route.ts @@ -1,22 +1,31 @@ import { NextResponse } from "next/server"; import { hashPassword } from "@/lib/auth"; +import { + isAuthHoneypotFilled, + shouldSuppressDirectPasswordSignup, +} from "@/lib/auth-spam-guard.server"; import { readVercelGeo } from "@/lib/geo/vercel-geo"; import { ensurePersonForUser } from "@/lib/person.server"; import { prisma } from "@/lib/prisma"; -import { recordReferralAttributionForUser } from "@/lib/referral.server"; import { createUniqueReferralCode } from "@/lib/user-identity.server"; +function acceptedQuietly() { + return NextResponse.json({ success: true }, { status: 202 }); +} + export async function POST(req: Request) { try { const body = await req.json(); const email = String(body.email || "").trim().toLowerCase(); const password = String(body.password || ""); const name = String(body.name || "").trim() || null; - const referralCode = String(body.referralCode || "").trim() || null; - const shareAttemptId = String(body.shareAttemptId || "").trim() || null; const newsletterSubscribed = typeof body.newsletterSubscribed === "boolean" ? body.newsletterSubscribed : true; + if (isAuthHoneypotFilled(body)) { + return acceptedQuietly(); + } + if (!email || !password) { return NextResponse.json( { error: "Email and password are required." }, @@ -31,6 +40,10 @@ export async function POST(req: Request) { ); } + if (await shouldSuppressDirectPasswordSignup()) { + return acceptedQuietly(); + } + const existingUser = await prisma.user.findUnique({ where: { email }, }); @@ -60,8 +73,6 @@ export async function POST(req: Request) { // Person owns displayName and image. Forward what the signup form sent. await ensurePersonForUser(user.id, { displayName: name }); - await recordReferralAttributionForUser(user.id, referralCode, shareAttemptId); - return NextResponse.json( { success: true, diff --git a/packages/web/src/app/api/dating/blocks/route.ts b/packages/web/src/app/api/dating/blocks/route.ts new file mode 100644 index 000000000..44ad967f1 --- /dev/null +++ b/packages/web/src/app/api/dating/blocks/route.ts @@ -0,0 +1,46 @@ +import { DatingBlockScope } from "@optimitron/db/enums"; +import { NextResponse } from "next/server"; +import { z } from "zod"; +import { requireAuth } from "@/lib/auth-utils"; +import { createDatingBlock } from "@/lib/dating.server"; + +export const runtime = "nodejs"; + +const BlockBodySchema = z.object({ + blockedProfileId: z.string().min(1).max(120), + reason: z.string().max(500).nullish(), + scope: z.nativeEnum(DatingBlockScope).optional(), +}); + +const CLIENT_SAFE_ERRORS = new Set([ + "Choose a profile to block.", + "Mission profile not found.", + "You cannot block yourself.", +]); + +export async function POST(request: Request) { + try { + const { userId } = await requireAuth(); + const parsed = BlockBodySchema.parse(await request.json()); + const block = await createDatingBlock(userId, parsed); + return NextResponse.json({ block, success: true }); + } catch (error) { + if (error instanceof Error && error.message === "Unauthorized") { + return NextResponse.json({ error: "Unauthorized" }, { status: 401 }); + } + if (error instanceof z.ZodError) { + return NextResponse.json( + { error: "Invalid dating block." }, + { status: 400 }, + ); + } + if (error instanceof Error && CLIENT_SAFE_ERRORS.has(error.message)) { + return NextResponse.json({ error: error.message }, { status: 400 }); + } + console.error("[dating] Failed to block profile:", error); + return NextResponse.json( + { error: "Failed to block dating profile." }, + { status: 500 }, + ); + } +} diff --git a/packages/web/src/app/api/dating/profile/route.ts b/packages/web/src/app/api/dating/profile/route.ts index 895306872..5acceb1e3 100644 --- a/packages/web/src/app/api/dating/profile/route.ts +++ b/packages/web/src/app/api/dating/profile/route.ts @@ -1,7 +1,7 @@ import { DatingProfileStatus, DatingRelationshipIntent, -} from "@optimitron/db"; +} from "@optimitron/db/enums"; import { NextResponse } from "next/server"; import { z } from "zod"; import { requireAuth } from "@/lib/auth-utils"; @@ -9,6 +9,10 @@ import { getOwnDatingProfile, saveDatingProfile } from "@/lib/dating.server"; export const runtime = "nodejs"; +const CLIENT_SAFE_PROFILE_ERRORS = new Set([ + "Confirm the Earth Optimization Mission safety rules first.", +]); + const ProfileBodySchema = z.object({ bio: z.string().max(2000).nullish(), campaignDateIdeas: z.array(z.string().max(120)).max(8).optional(), @@ -17,7 +21,11 @@ const ProfileBodySchema = z.object({ displayRegionCode: z.string().max(16).nullish(), headline: z.string().max(140).nullish(), lookingForText: z.string().max(1000).nullish(), - relationshipIntents: z.array(z.nativeEnum(DatingRelationshipIntent)).max(8).optional(), + relationshipIntents: z + .array(z.nativeEnum(DatingRelationshipIntent)) + .max(8) + .optional(), + safetyAcknowledged: z.boolean().optional(), status: z.nativeEnum(DatingProfileStatus).optional(), wantsCampaignDates: z.boolean().optional(), }); @@ -54,6 +62,12 @@ export async function PATCH(request: Request) { { status: 400 }, ); } + if ( + error instanceof Error && + CLIENT_SAFE_PROFILE_ERRORS.has(error.message) + ) { + return NextResponse.json({ error: error.message }, { status: 400 }); + } console.error("[dating] Failed to save profile:", error); return NextResponse.json( { error: "Failed to save dating profile." }, diff --git a/packages/web/src/app/foundations/page.logged-out.md b/packages/web/src/app/foundations/page.logged-out.md index 6552a9364..4f0e6b398 100644 --- a/packages/web/src/app/foundations/page.logged-out.md +++ b/packages/web/src/app/foundations/page.logged-out.md @@ -71,4 +71,4 @@ #### UNIT BREAKDOWN - No unit pledges yet. - [SIGN IN AS YOUR ORGANIZATION TO PLEDGE](/auth/signin?callbackUrl=%2Ffoundations) -- Want to coordinate with another human? Go on an [Earth Optimization Date](/love). +- Want to coordinate with another human? Go on an [Earth Optimization Mission](/missions). diff --git a/packages/web/src/app/foundations/page.tsx b/packages/web/src/app/foundations/page.tsx index dc4760b1a..1849c7558 100644 --- a/packages/web/src/app/foundations/page.tsx +++ b/packages/web/src/app/foundations/page.tsx @@ -604,9 +604,9 @@ export default async function FoundationsPage() { Want to coordinate with another human? Go on an{" "} - Earth Optimization Date + Earth Optimization Mission .

diff --git a/packages/web/src/app/joke/joke-client.tsx b/packages/web/src/app/joke/joke-client.tsx new file mode 100644 index 000000000..4e7a09a89 --- /dev/null +++ b/packages/web/src/app/joke/joke-client.tsx @@ -0,0 +1,13 @@ +"use client"; + +export function JokePrintButton({ label }: { label: string }) { + return ( + + ); +} diff --git a/packages/web/src/app/joke/page.logged-out.md b/packages/web/src/app/joke/page.logged-out.md new file mode 100644 index 000000000..55d2415f4 --- /dev/null +++ b/packages/web/src/app/joke/page.logged-out.md @@ -0,0 +1,95 @@ +# /joke + +## Metadata + +- Page title: The Joke | International Campaign to End War and Disease +- Meta description: How to play the funniest joke in the universe. +- Canonical: https://warondisease.org/joke +- Open Graph title: The Joke +- Open Graph description: How to play the funniest joke in the universe. +- Open Graph image: https://warondisease.org/api/og/route?path=%2Fjoke +- Twitter title: The Joke +- Twitter description: How to play the funniest joke in the universe. + +## Visible Page Copy + +## HOW TO PLAY THE FUNNIEST JOKE IN THE UNIVERSE +- Put the treaty on a shirt. Put the shirt on a human. Put the facts in their hand before they start yelling. +- [VOTE YES](/vote) +- [PRINT THE HANDOUT](#print-handout) +- [150,000](https://manual.WarOnDisease.org/knowledge/strategy/questions.html) +- DIE OF DISEASE AND AGING EVERY DAY +- [50](https://manual.WarOnDisease.org/knowledge/strategy/questions.html) +- SEPTEMBER 11 EQUIVALENTS EVERY DAY +- [604x](https://manual.WarOnDisease.org/knowledge/solution/1-percent-treaty.html) +- MORE ON WEAPONS THAN CLINICAL TRIALS +- [4x](https://manual.WarOnDisease.org/knowledge/economics/gdp-trajectories.html) +- RICHER AVERAGE HUMAN +- STEP 1 +### VOTE YES. +- The joke is funnier if you are not asking other people to do the thing you avoided doing. Vote on the 1% Treaty first. +- STEP 2 +### WRITE THE SHIRT. +- A bought shirt works. A shirt you already own plus a permanent marker also works. The shirt is text. Text costs marker ink. +- STEP 3 +### INCLUDE THE HANDOUT. +- The handout puts the facts in their hand before the yelling starts. +- STEP 4 +### PROPAGATE. +- Write it on the rest of your shirts. Write it on your friends' shirts if your friendship has survived worse things. The joke stops being a joke when humanity gets the point. +### WRITE THIS +#### FRONT +- THIS T-SHIRT ENDED WAR AND DISEASE. +#### BACK +- TRADE ONE APOCALYPSE FOR DISEASE ERADICATION AT WARONDISEASE.ORG. +- warondisease.org +- COPY +### HANDOUT TO INCLUDE WITH THE SHIRT +- Print both sides and put it with the shirt. +- The QR code can use your share link. [Sign in](/auth/signin) and vote yes to personalize it. +- PRINT HANDOUT +- PLEASE READ BEFORE YELLING +#### WHY I WROTE ON YOUR SHIRTS +- You were given this shirt because someone correctly loves you and would prefer that you not be processed by preventable disease while humanity funds spare apocalypses. +- Disease kills [150,000 humans/day](https://manual.WarOnDisease.org/knowledge/strategy/questions.html), about [50](https://manual.WarOnDisease.org/knowledge/strategy/questions.html) September 11s every day. Nobody invades anyone because disease has no flag. +- WARONDISEASE.ORG +- Your chance of dying of disease: nearly 100%. Your chance of dying of terrorism: 1 in [30,000,000](https://manual.WarOnDisease.org/knowledge/solution/1-percent-treaty.html). +- Governments spend [604x](https://manual.WarOnDisease.org/knowledge/solution/1-percent-treaty.html) more on weapons than on government clinical trials. +- Before WWII, US military spending was [96.7%](https://manual.WarOnDisease.org/knowledge/economics/peace-dividend.html) lower. After winning, the US cut it [87.6%](https://manual.WarOnDisease.org/knowledge/economics/peace-dividend.html) in two years. +- About [6,650](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html) diseases have no FDA-approved treatment. At [15](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html) first treatments per year, that is [443 years](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html). The 1% Treaty buys [12.3 times](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html) as much clinical-trial capacity: about [185](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html) first treatments per year, or [36 years](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html) to find treatments for all diseases. +- The average human becomes about [4x](https://manual.WarOnDisease.org/knowledge/economics/gdp-trajectories.html) richer and much less diseased and dead. The spreadsheet stops killing people. +- VOTE. THEN WRITE THIS ON TWO MORE SHIRTS. SOCIAL PROOF HANDLES THE PART YOUR FACTS CANNOT. +- THE YELLING PART +#### ANSWERS FOR THE PERSON CURRENTLY YELLING AT YOU +##### BUT NATIONAL SECURITY. +- National security improves. Every country makes the same one-budget-line trade, so everyone has [1%](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html) fewer weapons pointed at them and keeps [99%](https://manual.WarOnDisease.org/knowledge/solution.html). Humanity still has about [121](https://manual.WarOnDisease.org/knowledge/appendix/extinction-surplus.html) spare apocalypses. That is enough murder capacity. +##### WE CANNOT AFFORD IT. +- Disease already burns [$5.00 trillion/year](https://manual.WarOnDisease.org/knowledge/appendix/dfda-impact-paper.html) in lost work and drags off [13.0%](https://manual.WarOnDisease.org/knowledge/economics/gdp-trajectories.html) of global GDP. The current arrangement is what nobody can afford. +##### WHO WOULD BLOCK THIS? +- Nobody rational. Defense contractors keep [99%](https://manual.WarOnDisease.org/knowledge/solution.html), lose one unusable apocalypse, and get an economy about [4x](https://manual.WarOnDisease.org/knowledge/economics/gdp-trajectories.html) larger where their children are alive to spend the money. +##### THEN WHY HAS NOBODY DONE IT? +- Because the facts are scattered. Put them in eight billion brains at once and the insanity becomes visible: change the spreadsheet, keep the deterrent, fund the trials, stop dying. +- That knocks about [407 years](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html) off the treatment line. The avoided centuries of untreated disease prevent [10.7 billion deaths](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html) and [1.93 quadrillion hours](https://manual.WarOnDisease.org/knowledge/appendix/dfda-impact-paper.html) of suffering. At one laugh per healthy day recovered, that is [206 trillion](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html) extra laughs. The full laugh-rate model counts [3.5 quadrillion](https://manual.WarOnDisease.org/knowledge/appendix/joke.html). +- WARONDISEASE.ORG. VOTE FIRST. YELL LATER. +### WHEN THEY ASK WHY +- Your annual chance of dying in a terrorist attack is about 1 in [30 million](https://manual.WarOnDisease.org/knowledge/solution/1-percent-treaty.html). Your chance of dying from disease is still 100%. The treaty changes one budget line. Every country makes the same trade at the same time, so every country has [1%](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html) fewer weapons pointed at it and keeps [99%](https://manual.WarOnDisease.org/knowledge/solution.html) of its military budget. Relative military balance stays the same. Everyone is safer because everyone is less targeted and more alive. Humanity still keeps roughly [121](https://manual.WarOnDisease.org/knowledge/appendix/extinction-surplus.html) spare apocalypses, which is too much deterrence for a serious species. +- Disease already burns [$5.00 trillion/year](https://manual.WarOnDisease.org/knowledge/appendix/dfda-impact-paper.html) in lost work and drags off [13.0%](https://manual.WarOnDisease.org/knowledge/economics/gdp-trajectories.html) of global GDP before you even count the funerals. War smashes infrastructure. Disease smashes the workers. The current arrangement is what nobody can afford. +- 1% IS UNREALISTIC. +- Immediately before the United States won World War II, US military spending was [96.7%](https://manual.WarOnDisease.org/knowledge/economics/peace-dividend.html) lower than current levels. After winning, the US cut military spending [87.6%](https://manual.WarOnDisease.org/knowledge/economics/peace-dividend.html) over two years and then built the middle class. Your grandparents handled that. This shirt asks for [1%](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html). +- THE MILITARY-INDUSTRIAL COMPLEX WILL NEVER ALLOW IT. +- The CEO of Lockheed Martin is not exempt from biology. They can keep roughly [121](https://manual.WarOnDisease.org/knowledge/appendix/extinction-surplus.html) spare apocalypses, watch their family die of curable diseases, and retire into the current trajectory. Or they can keep [99%](https://manual.WarOnDisease.org/knowledge/solution.html) of the military budget, give up the unusable apocalypse, invest in the biotech sector absorbing redirected trial money, and retire in an economy [4.1x](https://manual.WarOnDisease.org/knowledge/economics/gdp-trajectories.html) larger where their children are alive to spend the money. Blocking the treaty to protect the last [1%](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html) is not self-interest. It is arithmetic failure with a lobbyist. +- POLITICIANS WILL NEVER AGREE. +- Politicians follow pressure they can see. Right now the defense lobby spends [$127 million/year](https://manual.WarOnDisease.org/knowledge/appendix/faq.html) buying the spreadsheet. The treaty campaign budget is [$650 million](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html). If eight billion humans understand that the spreadsheet is killing them, changing the numbers becomes the boring part. +- Defense contractors spend [$127 million/year](https://manual.WarOnDisease.org/knowledge/appendix/faq.html) because lobbying works. Fine. After the treaty passes, politicians who voted yes receive [Incentive Alignment Bond](https://manual.warondisease.org/knowledge/solution/incentive-alignment-bonds.html) benefits: campaign support while running, cushy careers when done. Politicians who vote no receive nothing. This is Pavlovian conditioning, but for senators. +- WHAT IF COUNTRIES CHEAT OR REFUSE? +- Of course some will try. The system does not use trust. It uses published disbursements, trial-linked payouts, the [Decentralized Accountability Office](https://manual.warondisease.org/knowledge/solution/decentralized-accountability-office.html), and the [Automated Revenue Service](https://manual.warondisease.org/knowledge/solution/automated-revenue-service.html). The first country to sign makes refusal more visible and more expensive for the next one. +- WHY PUT IT ON SHIRTS? +- A human wearing this on purpose is making a political declaration. A human wearing it because someone defaced their closet has a funny story. That drops the social cost from "I am advocating" to "you will not believe what happened," which is the conversation humans actually like having. +- Most pranks cost the prankster something. This one earns VOTE points, makes the recipient a walking billboard for not dying, and counts each unwitting wearer toward the [1 million](https://manual.WarOnDisease.org/knowledge/appendix/joke.html) social-proof threshold. The joke spreads itself. Play the joke. +### WHY THIS IS THE FUNNIEST JOKE IN THE UNIVERSE +- A normal joke produces one laugh and dies. This joke tries to turn a shirt into a chain reaction: shirt, conversation, vote, treaty, clinical trials, treatments, humans still alive to hear another joke. +- About [6,650](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html) diseases have no FDA-approved treatment. Humanity currently finds about [15](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html) first treatments per year. At that rate, we are projected to find treatments for all diseases in [443 years](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html). +- Redirecting [1%](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html) of military spending buys about [12.3 times](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html) as much clinical-trial capacity. That takes us from about [15](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html) first treatments per year to about [185](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html) first treatments per year. Now we are projected to find treatments for all diseases in [36 years](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html) instead of [443 years](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html). +- That removes about [407 years](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html) from the treatment line. Those avoided centuries of untreated disease prevent [10.7 billion deaths](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html) and [1.93 quadrillion hours](https://manual.WarOnDisease.org/knowledge/appendix/dfda-impact-paper.html) of suffering. If each healthy day recovered contains only one laugh, that is [206 trillion](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html) extra laughs. The less insulting laugh model, where humans laugh more than once per day because they are not rocks, counts [3.5 quadrillion](https://manual.WarOnDisease.org/knowledge/appendix/joke.html). +- That is why this is the funniest joke in the universe. Not because writing on shirts is clever. Because the smallest dumb-looking action available to you might make humanity notice it has been keeping [121](https://manual.WarOnDisease.org/knowledge/appendix/extinction-surplus.html) spare apocalypses while dying in a [443-year](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html) treatment wait. +- [Read the full philosophical footnotes in the manual.](https://manual.warondisease.org/knowledge/appendix/joke.html) diff --git a/packages/web/src/app/joke/page.tsx b/packages/web/src/app/joke/page.tsx new file mode 100644 index 000000000..853b4f050 --- /dev/null +++ b/packages/web/src/app/joke/page.tsx @@ -0,0 +1,1042 @@ +import { VotePosition } from "@optimitron/db"; +import { + ANNUAL_TERRORISM_DEATH_RISK_DENOMINATOR, + DEFENSE_LOBBYING_ANNUAL, + DEFENSE_SECTOR_RETENTION_PCT, + DFDA_QUEUE_CLEARANCE_YEARS, + DFDA_TRIAL_CAPACITY_MULTIPLIER, + DFDA_TRIAL_CAPACITY_PLUS_EFFICACY_LAG_DALYS, + DFDA_TRIAL_CAPACITY_PLUS_EFFICACY_LAG_LIVES_SAVED, + DFDA_TRIAL_CAPACITY_PLUS_EFFICACY_LAG_SUFFERING_HOURS, + DISEASE_BURDEN_GDP_DRAG_PCT, + DISEASES_WITHOUT_EFFECTIVE_TREATMENT, + GLOBAL_DISEASE_DEATHS_DAILY, + GLOBAL_DISEASE_PRODUCTIVITY_LOSS_ANNUAL, + MILITARY_TO_GOVERNMENT_CLINICAL_TRIALS_SPENDING_RATIO, + NEW_DISEASE_FIRST_TREATMENTS_PER_YEAR, + NUCLEAR_WINTER_OVERKILL_FACTOR, + POST_WW2_MILITARY_CUT_PCT, + SEPT_11_DEATHS, + SHIRT_INDUCED_LAUGHS_GAINED, + SHIRT_SEED_WEARERS_THRESHOLD, + STATUS_QUO_QUEUE_CLEARANCE_YEARS, + TREATY_CAMPAIGN_BUDGET_LOBBYING, + TREATY_REDUCTION_PCT, + TREATY_TRAJECTORY_GDP_VS_CURRENT_TRAJECTORY_MULTIPLIER_YEAR_15, + type Parameter, + US_1939_MILITARY_SPENDING_PCT_LOWER_THAN_CURRENT, +} from "@optimitron/data/parameters"; +import { getServerSession } from "next-auth"; +import Link from "next/link"; +import type { ReactNode } from "react"; +import { CopyLinkButton } from "@/components/sharing/copy-link-button"; +import { CampaignQrCode } from "@/components/sharing/campaign-qr-code"; +import { ParameterValue } from "@/components/shared/ParameterValue"; +import { authOptions } from "@/lib/auth"; +import { WAR_ON_DISEASE_CANONICAL_ORIGIN } from "@/lib/domains"; +import { SHIRT_BACK_COPY_LINES, SHIRT_FRONT_COPY } from "@/lib/messaging"; +import { getRouteMetadata } from "@/lib/metadata"; +import { prisma } from "@/lib/prisma"; +import { getHandleOrReferralCode } from "@/lib/referral.client"; +import { jokeLink, ROUTES } from "@/lib/routes"; +import { TREATY_REFERENDUM_SLUG } from "@/lib/treaty"; +import { buildReferralUrl } from "@/lib/url"; +import { JokePrintButton } from "./joke-client"; + +const paragraphClass = "text-lg font-bold leading-8 text-foreground"; +const manualBase = "https://manual.warondisease.org/knowledge"; +const genericVoteUrl = `${WAR_ON_DISEASE_CANONICAL_ORIGIN}${ROUTES.vote}`; +const displayDomain = WAR_ON_DISEASE_CANONICAL_ORIGIN.replace( + /^https?:\/\//, + "", +); + +const DAILY_DISEASE_DEATHS_IN_911_EQUIVALENTS: Parameter = { + value: GLOBAL_DISEASE_DEATHS_DAILY.value / SEPT_11_DEATHS.value, + parameterName: "DAILY_DISEASE_DEATHS_IN_911_EQUIVALENTS", + calculationsUrl: GLOBAL_DISEASE_DEATHS_DAILY.calculationsUrl, + unit: "ratio", + displayName: "Daily Disease Deaths in September 11 Equivalents", + description: + "Total daily global deaths from disease and aging divided by the September 11 death toll. This is a scale comparison, not an argument that the events are otherwise similar.", + sourceType: "calculated", + confidence: "high", + formula: "GLOBAL_DISEASE_DEATHS_DAILY / SEPT_11_DEATHS", + manualPageUrl: GLOBAL_DISEASE_DEATHS_DAILY.manualPageUrl, + manualPageTitle: GLOBAL_DISEASE_DEATHS_DAILY.manualPageTitle, +}; + +const ONE_LAUGH_PER_HEALTHY_DAY_GAINED: Parameter = { + value: DFDA_TRIAL_CAPACITY_PLUS_EFFICACY_LAG_DALYS.value * 365, + parameterName: "ONE_LAUGH_PER_HEALTHY_DAY_GAINED", + calculationsUrl: + DFDA_TRIAL_CAPACITY_PLUS_EFFICACY_LAG_DALYS.calculationsUrl, + unit: "laughs", + displayName: "Laughs Added at One Laugh Per Healthy Day", + description: + "A deliberately conservative laugh count: DALYs averted by the treatment timeline shift multiplied by one laugh per recovered healthy day.", + sourceType: "calculated", + confidence: DFDA_TRIAL_CAPACITY_PLUS_EFFICACY_LAG_DALYS.confidence, + formula: "DFDA_TRIAL_CAPACITY_PLUS_EFFICACY_LAG_DALYS * 365", + manualPageUrl: DFDA_TRIAL_CAPACITY_PLUS_EFFICACY_LAG_DALYS.manualPageUrl, + manualPageTitle: DFDA_TRIAL_CAPACITY_PLUS_EFFICACY_LAG_DALYS.manualPageTitle, +}; + +const TREATY_FIRST_TREATMENTS_PER_YEAR: Parameter = { + value: + NEW_DISEASE_FIRST_TREATMENTS_PER_YEAR.value * + DFDA_TRIAL_CAPACITY_MULTIPLIER.value, + parameterName: "TREATY_FIRST_TREATMENTS_PER_YEAR", + calculationsUrl: DFDA_TRIAL_CAPACITY_MULTIPLIER.calculationsUrl, + unit: "first treatments per year", + displayName: "First Treatments Per Year With Treaty Trial Capacity", + description: + "Projected first-treatment pace from multiplying the status quo first-treatment discovery rate by the 1% Treaty clinical-trial capacity multiplier.", + sourceType: "calculated", + confidence: DFDA_TRIAL_CAPACITY_MULTIPLIER.confidence, + formula: + "NEW_DISEASE_FIRST_TREATMENTS_PER_YEAR * DFDA_TRIAL_CAPACITY_MULTIPLIER", + manualPageUrl: DFDA_TRIAL_CAPACITY_MULTIPLIER.manualPageUrl, + manualPageTitle: DFDA_TRIAL_CAPACITY_MULTIPLIER.manualPageTitle, +}; + +const TREATMENT_QUEUE_YEARS_AVOIDED: Parameter = { + value: + STATUS_QUO_QUEUE_CLEARANCE_YEARS.value - + DFDA_QUEUE_CLEARANCE_YEARS.value, + parameterName: "TREATMENT_QUEUE_YEARS_AVOIDED", + calculationsUrl: DFDA_QUEUE_CLEARANCE_YEARS.calculationsUrl, + unit: "years", + displayName: "Treatment Queue Years Avoided", + description: + "Years removed from the projected first-treatment queue by moving from the status quo treatment pace to the 1% Treaty clinical-trial capacity pace.", + sourceType: "calculated", + confidence: DFDA_QUEUE_CLEARANCE_YEARS.confidence, + formula: "STATUS_QUO_QUEUE_CLEARANCE_YEARS - DFDA_QUEUE_CLEARANCE_YEARS", + manualPageUrl: DFDA_QUEUE_CLEARANCE_YEARS.manualPageUrl, + manualPageTitle: DFDA_QUEUE_CLEARANCE_YEARS.manualPageTitle, +}; + +export const metadata = getRouteMetadata(jokeLink); + +async function getPersonalReferralUrl() { + const session = await getServerSession(authOptions); + const referralIdentifier = getHandleOrReferralCode(session?.user); + + if (!session?.user?.id || !referralIdentifier) { + return null; + } + + const yesVote = await prisma.referendumVote.findFirst({ + where: { + answer: VotePosition.YES, + deletedAt: null, + referendum: { + deletedAt: null, + slug: TREATY_REFERENDUM_SLUG, + }, + userId: session.user.id, + }, + select: { id: true }, + }); + + if (!yesVote) { + return null; + } + + return buildReferralUrl(referralIdentifier, WAR_ON_DISEASE_CANONICAL_ORIGIN); +} + +function Step({ + children, + eyebrow, + title, +}: { + children: ReactNode; + eyebrow: string; + title: string; +}) { + return ( +
+

+ {eyebrow} +

+

+ {title} +

+
{children}
+
+ ); +} + +function MathTile({ + children, + label, +}: { + children: ReactNode; + label: string; +}) { + return ( +
+
+ {children} +
+

+ {label} +

+
+ ); +} + +function TreatyReductionValue() { + return ; +} + +function ApocalypseNumberValue() { + return ( + + ); +} + +function ManualLink({ + children, + href, +}: { + children: ReactNode; + href: string; +}) { + return ( + + {children} + + ); +} + +function Objection({ + children, + title, +}: { + children: ReactNode; + title: string; +}) { + return ( +
+ + {title} + +
{children}
+
+ ); +} + +function ShirtCopyBlock({ referralUrl }: { referralUrl: string }) { + return ( +
+
+

+ Front +

+

+ {SHIRT_FRONT_COPY} +

+
+
+

+ Back +

+

+ {SHIRT_BACK_COPY_LINES.join(" ")} +

+
+

+ {displayDomain} +

+ +
+
+
+ ); +} + +function HandoutFact({ children }: { children: ReactNode }) { + return ( +
  • + {children} +
    • + ); +} + +function PrintableJokeHandout({ + hasPersonalReferralUrl, + referralUrl, +}: { + hasPersonalReferralUrl: boolean; + referralUrl: string; +}) { + return ( + + ); +} + +export default async function JokePage() { + const personalReferralUrl = await getPersonalReferralUrl(); + const referralUrl = personalReferralUrl ?? genericVoteUrl; + + return ( +
    + + +
    +
    +

    + How to play the funniest joke in the universe +

    +

    + Put the treaty on a shirt. Put the shirt on a human. Put the facts + in their hand before they start yelling. +

    +
    + + Vote yes + + + Print the handout + +
    +
    + +
    + + + + + + + + + + + + +
    + +
    + +

    + The joke is funnier if you are not asking other people to do the + thing you avoided doing. Vote on the 1% Treaty first. +

    +     + + +

    + A bought shirt works. A shirt you already own plus a permanent + marker also works. The shirt is text. Text costs marker ink. +

    +     + + +

    + The handout puts the facts in their hand before the yelling + starts. +

    +     + + +

    + Write it on the rest of your shirts. Write it on your + friends' shirts if your friendship has survived worse things. + The joke stops being a joke when humanity gets the point. +

    +     +
    + +
    +

    + Write this +

    + +
    + + + +
    +

    + When they ask why +

    +
    + +

    + Your annual chance of dying in a terrorist attack is about 1 in{" "} + + . Your chance of dying from disease is still 100%. The treaty + changes one budget line. Every country makes the same trade at + the same time, so every country has {" "} + fewer weapons pointed at it and keeps{" "} + {" "} + of its military budget. Relative military balance stays the + same. Everyone is safer because everyone is less targeted and + more alive. Humanity still keeps roughly {" "} + spare apocalypses, which is too much deterrence for a serious + species. +

    +

    + Disease already burns{" "} + + {" "} + in lost work and drags off{" "} + {" "} + of global GDP before you even count the funerals. War smashes + infrastructure. Disease smashes the workers. The current + arrangement is what nobody can afford. +

    +     + + +

    + Immediately before the United States won World War II, US + military spending was{" "} + {" "} + lower than current levels. After winning, the US cut military + spending {" "} + over two years and then built the middle class. Your + grandparents handled that. This shirt asks for{" "} + . +

    +     + + +

    + The CEO of Lockheed Martin is not exempt from biology. They can + keep roughly spare apocalypses, watch + their family die of curable diseases, and retire into the + current trajectory. Or they can keep{" "} + {" "} + of the military budget, give up the unusable apocalypse, invest + in the biotech sector absorbing redirected trial money, and + retire in an economy{" "} + {" "} + larger where their children are alive to spend the money. + Blocking the treaty to protect the last {" "} + is not self-interest. It is arithmetic failure with a lobbyist. +

    +     + + +

    + Politicians follow pressure they can see. Right now the defense + lobby spends{" "} + buying the + spreadsheet. The treaty campaign budget is{" "} + . If + eight billion humans understand that the spreadsheet is killing + them, changing the numbers becomes the boring part. +

    +

    + Defense contractors spend{" "} + because + lobbying works. Fine. After the treaty passes, politicians who + voted yes receive{" "} + + Incentive Alignment Bond + {" "} + benefits: campaign support while running, cushy careers when + done. Politicians who vote no receive nothing. This is + Pavlovian conditioning, but for senators. +

    +     + + +

    + Of course some will try. The system does not use trust. It uses + published disbursements, trial-linked payouts, the{" "} + + Decentralized Accountability Office + + , and the{" "} + + Automated Revenue Service + + . The first country to sign makes refusal more visible and more + expensive for the next one. +

    +     + + +

    + A human wearing this on purpose is making a political + declaration. A human wearing it because someone defaced their + closet has a funny story. That drops the social cost from + "I am advocating" to "you will not believe what + happened," which is the conversation humans actually like + having. +

    +

    + Most pranks cost the prankster something. This one earns VOTE + points, makes the recipient a walking billboard for not dying, + and counts each unwitting wearer toward the{" "} + {" "} + social-proof threshold. The joke spreads itself. Play the joke. +

    +     +
    +
    + +
    +

    + Why this is the funniest joke in the universe +

    +

    + A normal joke produces one laugh and dies. This joke tries to turn a + shirt into a chain reaction: shirt, conversation, vote, treaty, + clinical trials, treatments, humans still alive to hear another + joke. +

    +

    + About{" "} + {" "} + diseases have no FDA-approved treatment. Humanity currently finds + about{" "} + {" "} + first treatments per year. At that rate, we are projected to find + treatments for all diseases in{" "} + + . +

    +

    + Redirecting{" "} + {" "} + of military spending buys about{" "} + {" "} + as much clinical-trial capacity. That takes us from about{" "} + {" "} + first treatments per year to about{" "} + {" "} + first treatments per year. Now we are projected to find treatments + for all diseases in{" "} + {" "} + instead of{" "} + + . +

    +

    + That removes about{" "} + {" "} + from the treatment line. Those avoided centuries of untreated + disease prevent{" "} + {" "} + and{" "} + {" "} + of suffering. If each healthy day recovered contains only one laugh, + that is{" "} + {" "} + extra laughs. The less insulting laugh model, where humans laugh + more than once per day because they are not rocks, counts{" "} + + . +

    +

    + That is why this is the funniest joke in the universe. Not because + writing on shirts is clever. Because the smallest dumb-looking + action available to you might make humanity notice it has been + keeping{" "} + {" "} + spare apocalypses while dying in a{" "} + {" "} + treatment wait. +

    +

    + + Read the full philosophical footnotes in the manual. + +

    +
    +
    +
    + ); +} diff --git a/packages/web/src/app/love/dating/discover/page.tsx b/packages/web/src/app/love/dating/discover/page.tsx deleted file mode 100644 index d59f10da7..000000000 --- a/packages/web/src/app/love/dating/discover/page.tsx +++ /dev/null @@ -1,85 +0,0 @@ -import Link from "next/link"; -import { getServerSession } from "next-auth"; -import { redirect } from "next/navigation"; -import { DatingDiscoverClient } from "@/app/love/dating/dating-client"; -import { authOptions } from "@/lib/auth"; -import { getDatingDiscoverData } from "@/lib/dating.server"; -import { getSignInPath } from "@/lib/routes"; - -async function loadDiscover(userId: string) { - try { - return { - data: await getDatingDiscoverData(userId), - ready: true, - }; - } catch { - return { - data: null, - ready: false, - }; - } -} - -export default async function DatingDiscoverPage() { - const session = await getServerSession(authOptions); - const userId = session?.user?.id; - - if (!userId) { - redirect(getSignInPath("/love/dating/discover")); - } - - const { data, ready } = await loadDiscover(userId); - - return ( -
    -
    - - Back to Love - -

    - Discover -

    -

    - Like, pass, or send a short intro. Mutual interest opens messages. -

    - -
    - {!ready ? ( -
    -

    - Earth Optimization Dates are not ready yet -

    -
    - ) : !data?.profile ? ( -
    -

    Profile needed

    -

    - Create your Earth Optimization Date profile before browsing - other humans. -

    - - Create profile - -
    - ) : data.candidates.length ? ( - - ) : ( -
    -

    No people yet

    -

    - The first Earth Optimization Date pool is empty. This is - historically common before anyone joins. -

    -
    - )} -
    -
    -
    - ); -} diff --git a/packages/web/src/app/love/dating/matches/page.logged-out.md b/packages/web/src/app/love/dating/matches/page.logged-out.md deleted file mode 100644 index 3cd2a3957..000000000 --- a/packages/web/src/app/love/dating/matches/page.logged-out.md +++ /dev/null @@ -1,22 +0,0 @@ -# /love/dating/matches - -## Metadata - -- Page title: International Campaign to End War and Disease -- Meta description: Let's trade one apocalypse out of humanity's 122-apocalypse mass-murder capacity for disease eradication in 36 years instead of 443. -- Canonical: [missing] -- Open Graph title: International Campaign to End War and Disease -- Open Graph description: Let's trade one apocalypse out of humanity's 122-apocalypse mass-murder capacity for disease eradication in 36 years instead of 443. -- Open Graph image: https://warondisease.org/site-assets/warondisease/war-on-disease-og-1200x630.png -- Twitter title: International Campaign to End War and Disease -- Twitter description: Let's trade one apocalypse out of humanity's 122-apocalypse mass-murder capacity for disease eradication in 36 years instead of 443. - -## Visible Page Copy - -### Sign In -- Try Demo — No Account Needed -- OR CREATE AN ACCOUNT -- Continue with Google -- OR USE EMAIL -- EMAIL -- Email Me a Sign-In Link diff --git a/packages/web/src/app/love/dating/messages/[conversationId]/page.logged-out.md b/packages/web/src/app/love/dating/messages/[conversationId]/page.logged-out.md deleted file mode 100644 index 26de78354..000000000 --- a/packages/web/src/app/love/dating/messages/[conversationId]/page.logged-out.md +++ /dev/null @@ -1,22 +0,0 @@ -# /love/dating/messages/[conversationId] - -## Metadata - -- Page title: International Campaign to End War and Disease -- Meta description: Let's trade one apocalypse out of humanity's 122-apocalypse mass-murder capacity for disease eradication in 36 years instead of 443. -- Canonical: [missing] -- Open Graph title: International Campaign to End War and Disease -- Open Graph description: Let's trade one apocalypse out of humanity's 122-apocalypse mass-murder capacity for disease eradication in 36 years instead of 443. -- Open Graph image: https://warondisease.org/site-assets/warondisease/war-on-disease-og-1200x630.png -- Twitter title: International Campaign to End War and Disease -- Twitter description: Let's trade one apocalypse out of humanity's 122-apocalypse mass-murder capacity for disease eradication in 36 years instead of 443. - -## Visible Page Copy - -### Sign In -- Try Demo — No Account Needed -- OR CREATE AN ACCOUNT -- Continue with Google -- OR USE EMAIL -- EMAIL -- Email Me a Sign-In Link diff --git a/packages/web/src/app/love/dating/page.logged-out.md b/packages/web/src/app/love/dating/page.logged-out.md deleted file mode 100644 index 6dc945ef5..000000000 --- a/packages/web/src/app/love/dating/page.logged-out.md +++ /dev/null @@ -1,18 +0,0 @@ -# /love/dating - -## Metadata - -- Page title: Love | International Campaign to End War and Disease -- Meta description: Pair with another human for one hour. Decide together what most optimizes Earth. Do it. An Earth Optimization Date is, by definition, a non-romantic activity. -- Canonical: https://warondisease.org/love -- Open Graph title: Love -- Open Graph description: Pair with another human for one hour. Decide together what most optimizes Earth. Do it. An Earth Optimization Date is, by definition, a non-romantic activity. -- Open Graph image: https://warondisease.org/api/og/route?path=%2Flove -- Twitter title: Love -- Twitter description: Pair with another human for one hour. Decide together what most optimizes Earth. Do it. An Earth Optimization Date is, by definition, a non-romantic activity. - -## Visible Page Copy - -## EARTH OPTIMIZATION DATES -- Enable Earth Optimization Dates on your profile, meet someone, and make even a bad Earth Optimization Date produce votes. -- [SIGN IN TO ENABLE EARTH OPTIMIZATION DATES](/auth/signin?callbackUrl=%2Flove%2Fdating) diff --git a/packages/web/src/app/love/dating/page.tsx b/packages/web/src/app/love/dating/page.tsx deleted file mode 100644 index 2abe3a46d..000000000 --- a/packages/web/src/app/love/dating/page.tsx +++ /dev/null @@ -1,131 +0,0 @@ -import Link from "next/link"; -import { getServerSession } from "next-auth"; -import { authOptions } from "@/lib/auth"; -import { getOwnDatingProfile } from "@/lib/dating.server"; -import { getRouteMetadata } from "@/lib/metadata"; -import { getSignInPath, loveLink } from "@/lib/routes"; - -export const metadata = getRouteMetadata(loveLink); - -const DATING_ROUTES = [ - { - href: "/love/dating/profile", - title: "Profile", - body: "Opt in, add photos, and say what kind of useful Earth Optimization Date would not make you flee.", - }, - { - href: "/love/dating/questions", - title: "Questions", - body: "Answer compatibility questions with the answers you accept from someone else.", - }, - { - href: "/love/dating/discover", - title: "Discover", - body: "Like, pass, or send one actual sentence before the species collapses.", - }, - { - href: "/love/dating/matches", - title: "Matches", - body: "Message mutual matches and propose Earth Optimization Dates that can also produce votes.", - }, -] as const; - -async function loadProfile(userId: string) { - try { - return { - profile: await getOwnDatingProfile(userId), - ready: true, - }; - } catch { - return { - profile: null, - ready: false, - }; - } -} - -export default async function DatingHomePage() { - const session = await getServerSession(authOptions); - const userId = session?.user?.id; - - if (!userId) { - return ( -
    -
    -

    - Earth Optimization Dates -

    -

    - Enable Earth Optimization Dates on your profile, meet someone, and - make even a bad Earth Optimization Date produce votes. -

    - - Sign in to enable Earth Optimization Dates - -
    -
    - ); - } - - const { profile, ready } = await loadProfile(userId); - - return ( -
    -
    -
    -

    - Earth Optimization Dates -

    -

    - Meet people who want fewer wars, fewer incurable diseases, and - better first Earth Optimization Dates than "drinks?" -

    -
    - - {!ready ? ( -
    -

    - Earth Optimization Dates are not ready yet -

    -

    - Earth Optimization Dates are still being prepared. -

    -
    - ) : ( -
    -

    - {profile - ? "Earth Optimization Dates are enabled" - : "Earth Optimization Dates are off"} -

    -

    - {profile - ? `Current status: ${profile.status.toLowerCase()}.` - : "Create an Earth Optimization Date profile when you want to be visible to other opted-in humans."} -

    -
    - )} - -
    - {DATING_ROUTES.map((route) => ( - - - {route.title} - - - {route.body} - - - ))} -
    -
    -
    - ); -} diff --git a/packages/web/src/app/love/dating/profile/page.tsx b/packages/web/src/app/love/dating/profile/page.tsx deleted file mode 100644 index 899991197..000000000 --- a/packages/web/src/app/love/dating/profile/page.tsx +++ /dev/null @@ -1,49 +0,0 @@ -import Link from "next/link"; -import { getServerSession } from "next-auth"; -import { redirect } from "next/navigation"; -import { DatingProfileForm } from "@/app/love/dating/dating-client"; -import { authOptions } from "@/lib/auth"; -import { getOwnDatingProfile } from "@/lib/dating.server"; -import { getSignInPath } from "@/lib/routes"; - -async function loadProfile(userId: string) { - try { - return await getOwnDatingProfile(userId); - } catch { - return null; - } -} - -export default async function DatingProfilePage() { - const session = await getServerSession(authOptions); - const userId = session?.user?.id; - - if (!userId) { - redirect(getSignInPath("/love/dating/profile")); - } - - const profile = await loadProfile(userId); - - return ( -
    -
    - - Back to Love - -

    - Earth Optimization Date profile -

    -

    - Keep it minimal. Enough for another human to decide whether coffee, - flyers, and possible affection are worth leaving the house. -

    -
    - -
    -
    -
    - ); -} diff --git a/packages/web/src/app/love/dating/questions/page.tsx b/packages/web/src/app/love/dating/questions/page.tsx deleted file mode 100644 index 7e703850e..000000000 --- a/packages/web/src/app/love/dating/questions/page.tsx +++ /dev/null @@ -1,86 +0,0 @@ -import Link from "next/link"; -import { getServerSession } from "next-auth"; -import { redirect } from "next/navigation"; -import { DatingQuestionsClient } from "@/app/love/dating/dating-client"; -import { authOptions } from "@/lib/auth"; -import { getDatingQuestionsData } from "@/lib/dating.server"; -import { getSignInPath } from "@/lib/routes"; - -async function loadQuestions(userId: string) { - try { - return { - data: await getDatingQuestionsData(userId), - error: null, - }; - } catch (error) { - return { - data: null, - error: - error instanceof Error ? error.message : "Could not load questions.", - }; - } -} - -function getDisplayError(message: string) { - return message === "Create a dating profile first." - ? "Create an Earth Optimization Date profile first." - : message; -} - -export default async function DatingQuestionsPage() { - const session = await getServerSession(authOptions); - const userId = session?.user?.id; - - if (!userId) { - redirect(getSignInPath("/love/dating/questions")); - } - - const { data, error } = await loadQuestions(userId); - - return ( -
    -
    - - Back to Love - -

    - Match questions -

    -

    - Answer what you believe and what you can tolerate. Romance is easier - when the dealbreakers are not discovered during dessert. -

    - -
    - {error ? ( -
    -

    Profile needed

    -

    - {getDisplayError(error)} -

    - - Create profile - -
    - ) : data?.questions.length ? ( - - ) : ( -
    -

    No questions yet

    -

    - Sync the Earth Optimization Date question bank before matching - people on answers. -

    -
    - )} -
    -
    -
    - ); -} diff --git a/packages/web/src/app/love/page.tsx b/packages/web/src/app/love/page.tsx index 5c8ac266f..4ef0eb3c7 100644 --- a/packages/web/src/app/love/page.tsx +++ b/packages/web/src/app/love/page.tsx @@ -7,8 +7,8 @@ import { TREATY_REDUCTION_PCT, } from "@optimitron/data/parameters"; import { ParameterValue } from "@/components/shared/ParameterValue"; +import { CampaignQrCode } from "@/components/sharing/campaign-qr-code"; import type { ReactNode } from "react"; -import { PosterQrCode } from "@/app/poster/poster-client"; import { authOptions } from "@/lib/auth"; import { WAR_ON_DISEASE_CANONICAL_ORIGIN } from "@/lib/domains"; import { getRouteMetadata } from "@/lib/metadata"; @@ -262,7 +262,7 @@ function CampaignUrlCard({
    - +
    ); diff --git a/packages/web/src/app/love/dating/messages/[conversationId]/page.tsx b/packages/web/src/app/messages/[conversationId]/page.tsx similarity index 80% rename from packages/web/src/app/love/dating/messages/[conversationId]/page.tsx rename to packages/web/src/app/messages/[conversationId]/page.tsx index 7db9dbdcb..51ef95029 100644 --- a/packages/web/src/app/love/dating/messages/[conversationId]/page.tsx +++ b/packages/web/src/app/messages/[conversationId]/page.tsx @@ -2,27 +2,29 @@ import Link from "next/link"; import { getServerSession } from "next-auth"; import { notFound, redirect } from "next/navigation"; import { - DatingDatePlanForm, - DatingMessageComposer, - DatingReportButton, -} from "@/app/love/dating/dating-client"; + MissionBlockButton, + MissionMessageComposer, + MissionPlanForm, + MissionReportButton, +} from "@/components/missions/MissionClient"; +import { MissionSafetyNotice } from "@/components/missions/MissionSafetyNotice"; import { authOptions } from "@/lib/auth"; import { getDatingConversationData } from "@/lib/dating.server"; -import { getSignInPath } from "@/lib/routes"; +import { getSignInPath, ROUTES } from "@/lib/routes"; import { getUserDisplayName } from "@/lib/user-display"; -interface DatingMessagePageProps { +interface MessagePageProps { params: Promise<{ conversationId: string }>; } -export default async function DatingMessagePage({ +export default async function MessagePage({ params, -}: DatingMessagePageProps) { +}: MessagePageProps) { const session = await getServerSession(authOptions); const userId = session?.user?.id; if (!userId) { - redirect(getSignInPath("/love/dating/matches")); + redirect(getSignInPath(ROUTES.messages)); } const { conversationId } = await params; @@ -45,9 +47,9 @@ export default async function DatingMessagePage({
    - Back to matches + Back to messages
    @@ -60,7 +62,13 @@ export default async function DatingMessagePage({

    ) : null}
    - +
    + + +
    +
    +
    +
    @@ -82,7 +90,7 @@ export default async function DatingMessagePage({

    {!mine ? (
    - @@ -102,8 +110,8 @@ export default async function DatingMessagePage({
    - - + @@ -112,7 +120,7 @@ export default async function DatingMessagePage({ {conversation.datePlans.length ? (

    - Earth Optimization Date plans + Earth Optimization Mission plans

    {conversation.datePlans.map((plan) => ( @@ -120,7 +128,7 @@ export default async function DatingMessagePage({

    {plan.title}

    {plan.locationName ?? "Place not set"} - {plan.isCampaignDate ? " · Earth Optimization Date" : ""} + {plan.isCampaignDate ? " · Earth Optimization Mission" : ""}

    ))} diff --git a/packages/web/src/app/love/dating/matches/page.tsx b/packages/web/src/app/messages/page.tsx similarity index 53% rename from packages/web/src/app/love/dating/matches/page.tsx rename to packages/web/src/app/messages/page.tsx index b7cb611d7..ec68f41da 100644 --- a/packages/web/src/app/love/dating/matches/page.tsx +++ b/packages/web/src/app/messages/page.tsx @@ -1,12 +1,16 @@ import Link from "next/link"; import { getServerSession } from "next-auth"; import { redirect } from "next/navigation"; +import { MissionSafetyNotice } from "@/components/missions/MissionSafetyNotice"; import { authOptions } from "@/lib/auth"; import { getDatingMatchesData } from "@/lib/dating.server"; -import { getSignInPath } from "@/lib/routes"; +import { getRouteMetadata } from "@/lib/metadata"; +import { getSignInPath, messagesLink, ROUTES } from "@/lib/routes"; import { getUserDisplayName } from "@/lib/user-display"; -async function loadMatches(userId: string) { +export const metadata = getRouteMetadata(messagesLink); + +async function loadMessages(userId: string) { try { return { data: await getDatingMatchesData(userId), @@ -15,52 +19,68 @@ async function loadMatches(userId: string) { } catch (error) { return { data: null, - error: error instanceof Error ? error.message : "Could not load matches.", + error: + error instanceof Error ? error.message : "Could not load messages.", }; } } function getDisplayError(message: string) { - return message === "Create a dating profile first." - ? "Create an Earth Optimization Date profile first." - : message; + return message === "Create a mission profile first." + ? "Turn on missions first." + : "Could not load messages."; } -export default async function DatingMatchesPage() { +export default async function MessagesPage() { const session = await getServerSession(authOptions); const userId = session?.user?.id; if (!userId) { - redirect(getSignInPath("/love/dating/matches")); + redirect(getSignInPath(ROUTES.messages)); } - const { data, error } = await loadMatches(userId); + const { data, error } = await loadMessages(userId); + const conversations = + data?.matches.filter((match) => match.conversation) ?? []; return (
    - Back to Love + Back to missions

    - Matches + Messages

    +

    + Open a mutual match, propose a useful campaign session, and do not ask + anyone for money. Grant officers have email for that. +

    +
    + +
    {error ? (
    -

    Profile needed

    +

    Missions are off

    {getDisplayError(error)}

    + + Turn on missions +
    - ) : data?.matches.length ? ( - data.matches.map((match) => { + ) : conversations.length ? ( + conversations.map((match) => { const other = - match.profileAId === data.profile.id + match.profileAId === data!.profile.id ? match.profileB : match.profileA; const lastMessage = match.conversation?.messages[0]?.body; @@ -68,11 +88,7 @@ export default async function DatingMatchesPage() { return ( @@ -83,16 +99,23 @@ export default async function DatingMatchesPage() { {lastMessage ?? other.headline ?? "No messages yet."} - Message + Open ); }) ) : (
    -

    No matches yet

    +

    No messages yet

    - Like someone who also likes you. Ancient technology. + Like someone who likes you back. Then discuss posters like two + responsible adults with a civilization to repair.

    + + Find mission people +
    )}
    diff --git a/packages/web/src/app/missions/page.logged-out.md b/packages/web/src/app/missions/page.logged-out.md new file mode 100644 index 000000000..4a159a23b --- /dev/null +++ b/packages/web/src/app/missions/page.logged-out.md @@ -0,0 +1,31 @@ +# /missions + +## Metadata + +- Page title: Earth Optimization Missions | International Campaign to End War and Disease +- Meta description: Find someone you would not mind ending war and disease with. Spend one useful hour optimizing Earth together. Love may occur. Flyers should occur first. +- Canonical: https://warondisease.org/missions +- Open Graph title: Earth Optimization Missions +- Open Graph description: Find someone you would not mind ending war and disease with. Spend one useful hour optimizing Earth together. Love may occur. Flyers should occur first. +- Open Graph image: https://warondisease.org/api/og/route?path=%2Fmissions +- Twitter title: Earth Optimization Missions +- Twitter description: Find someone you would not mind ending war and disease with. Spend one useful hour optimizing Earth together. Love may occur. Flyers should occur first. + +## Visible Page Copy + +- EARTH OPTIMIZATION MISSIONS +## FIND SOMEONE YOU WOULD NOT MIND SAVING THE WORLD WITH. +- Spend one hour with a human you like. Figure out one useful thing to do for the campaign. Do it together. Have fun. Fall madly in love if you insist. +- Disease kills about 150,000 humans a day. Love may reduce the urge to explode people and increase the urge to cure them. The scheduled activity is still optimizing Earth. +- [SIGN IN TO START](/auth/signin?callbackUrl=%2Fmissions) +- [FIND MISSION PEOPLE](/people?missions=1) +### MISSION SAFETY +- Earth Optimization Missions are one-hour sessions for ending war and disease. You may fall madly in love if you insist. But keep in mind, 150 thousand people die of disease every day, so please spend the hour eradicating disease instead of hugging and/or kissing. +- [TURN ON MISSIONS Use your profile to say what kind of human should find you and what useful hour would not make you flee.](/profile#missions) +- [FIND MISSION PEOPLE Filter people who turned on missions. Like, pass, or send one actual sentence before the species collapses.](/people?missions=1) +- [OPEN MESSAGES Talk to mutual matches and propose a useful campaign session. No money requests. More posters.](/messages) +### GOOD MISSIONS +- [COFFEE PLUS QR FLYERS Acquire caffeine. Tape up evidence that your species can still coordinate.](/people?missions=1) +- [WALK PLUS TWO VOTES Walk outside briefly. Text two humans the treaty vote before returning indoors.](/people?missions=1) +- [VIDEO CALL PLUS TASK Pick one open task, do the first useful step, and leave a comment so the next human can continue.](/people?missions=1) +- [MUSEUM PLUS POSTERS Look at civilization. Then help keep it from becoming a cautionary exhibit.](/people?missions=1) diff --git a/packages/web/src/app/missions/page.tsx b/packages/web/src/app/missions/page.tsx new file mode 100644 index 000000000..8f8f68f74 --- /dev/null +++ b/packages/web/src/app/missions/page.tsx @@ -0,0 +1,204 @@ +import Link from "next/link"; +import { getServerSession } from "next-auth"; +import { GLOBAL_DISEASE_DEATHS_DAILY } from "@optimitron/data/parameters"; +import { MissionSafetyNotice } from "@/components/missions/MissionSafetyNotice"; +import { ParameterValue } from "@/components/shared/ParameterValue"; +import { authOptions } from "@/lib/auth"; +import { getOwnDatingProfile } from "@/lib/dating.server"; +import { getRouteMetadata } from "@/lib/metadata"; +import { getSignInPath, missionsLink, ROUTES } from "@/lib/routes"; + +export const metadata = getRouteMetadata(missionsLink); + +const MISSION_ACTIONS = [ + { + href: `${ROUTES.profile}#missions`, + title: "Turn on missions", + body: "Use your profile to say what kind of human should find you and what useful hour would not make you flee.", + }, + { + href: `${ROUTES.people}?missions=1`, + title: "Find mission people", + body: "Filter people who turned on missions. Like, pass, or send one actual sentence before the species collapses.", + }, + { + href: ROUTES.messages, + title: "Open messages", + body: "Talk to mutual matches and propose a useful campaign session. No money requests. More posters.", + }, +] as const; + +const MISSION_EXAMPLES = [ + { + title: "Coffee plus QR flyers", + body: "Acquire caffeine. Tape up evidence that your species can still coordinate.", + }, + { + title: "Walk plus two votes", + body: "Walk outside briefly. Text two humans the treaty vote before returning indoors.", + }, + { + title: "Video call plus task", + body: "Pick one open task, do the first useful step, and leave a comment so the next human can continue.", + }, + { + title: "Museum plus posters", + body: "Look at civilization. Then help keep it from becoming a cautionary exhibit.", + }, +] as const; + +async function loadProfile(userId: string) { + try { + return { + profile: await getOwnDatingProfile(userId), + ready: true, + }; + } catch { + return { + profile: null, + ready: false, + }; + } +} + +export default async function MissionsPage() { + const session = await getServerSession(authOptions); + const userId = session?.user?.id; + + if (!userId) { + return ( +
    + +
    + ); + } + + const { profile, ready } = await loadProfile(userId); + const hasActiveProfile = profile?.status === "ACTIVE"; + + return ( +
    + +
    + ); +} + +function MissionLanding({ + profileStatus, + signedIn, +}: { + profileStatus?: string; + signedIn: boolean; +}) { + return ( +
    +
    +
    +

    + Earth Optimization Missions +

    +

    + Find someone you would not mind saving the world with. +

    +

    + Spend one hour with a human you like. Figure out one useful thing to + do for the campaign. Do it together. Have fun. Fall madly in love if + you insist. +

    +

    + Disease kills about{" "} + humans a day. + Love may reduce the urge to explode people and increase the urge to + cure them. The scheduled activity is still optimizing Earth. +

    +
    + + {signedIn ? "Turn on missions" : "Sign in to start"} + + + Find mission people + +
    +
    + +
    + + {profileStatus ? ( +
    +

    Mission status

    +

    + {profileStatus === "active" + ? "Active. Other opted-in humans can find you." + : profileStatus === "off" + ? "Off. Use your profile when you want to be findable." + : profileStatus === "unavailable" + ? "Not ready yet." + : `Current status: ${profileStatus}.`} +

    +
    + ) : null} +
    +
    + +
    + {MISSION_ACTIONS.map((route) => ( + + + {route.title} + + + {route.body} + + + ))} +
    + +
    +

    + Good missions +

    +
    + {MISSION_EXAMPLES.map((example) => ( + + + {example.title} + + + {example.body} + + + ))} +
    +
    +
    + ); +} diff --git a/packages/web/src/app/people/page.logged-out.md b/packages/web/src/app/people/page.logged-out.md index 360aea778..4d98d23d0 100644 --- a/packages/web/src/app/people/page.logged-out.md +++ b/packages/web/src/app/people/page.logged-out.md @@ -18,6 +18,7 @@ - Find officials, lawyers, clinical researchers, organizers, funders, and communicators who can help end war and disease. Open a profile, see the task, and remind the human. - [SEE TASKS](/tasks) - [REGISTER A PLAINTIFF](/plaintiffs) +- [MISSION PEOPLE](/people?missions=1) - SEARCH - [ALL](/people) - [OFFICIALS](/people?role=officials) diff --git a/packages/web/src/app/people/page.tsx b/packages/web/src/app/people/page.tsx index 18b0fcf55..188b2ced3 100644 --- a/packages/web/src/app/people/page.tsx +++ b/packages/web/src/app/people/page.tsx @@ -1,7 +1,17 @@ import Link from "next/link"; import { headers } from "next/headers"; +import { getServerSession } from "next-auth"; +import { DatingRelationshipIntent } from "@optimitron/db/enums"; +import { MissionDiscoverClient } from "@/components/missions/MissionClient"; +import { MissionSafetyNotice } from "@/components/missions/MissionSafetyNotice"; import { Avatar } from "@/components/retroui/Avatar"; import { Input } from "@/components/retroui/Input"; +import { + defaultButtonClassName, + primaryButtonClassName, +} from "@/components/ui/default-button"; +import { authOptions } from "@/lib/auth"; +import { getDatingDiscoverData } from "@/lib/dating.server"; import { getSiteMetadata } from "@/lib/metadata"; import { getPeopleDirectoryData, @@ -9,9 +19,8 @@ import { type PeopleDirectoryPerson, type PeopleDirectoryRole, } from "@/lib/people-directory.server"; -import { peopleLink, plaintiffsLink, ROUTES } from "@/lib/routes"; +import { getSignInPath, peopleLink, plaintiffsLink, ROUTES } from "@/lib/routes"; import { getSiteFromHeaders } from "@/lib/site"; -import { defaultButtonClassName, primaryButtonClassName } from "@/components/ui/default-button"; export const dynamic = "force-dynamic"; @@ -25,6 +34,16 @@ const ROLE_FILTERS: Array<{ label: string; value: PeopleDirectoryRole }> = [ { label: "Governance", value: "governance" }, ]; +const MISSION_INTENT_FILTERS: Array<{ + label: string; + value: DatingRelationshipIntent | null; +}> = [ + { label: "All mission people", value: null }, + { label: "Mission friends", value: DatingRelationshipIntent.FRIENDS }, + { label: "Could be romantic", value: DatingRelationshipIntent.DATES }, + { label: "Long-term", value: DatingRelationshipIntent.LONG_TERM }, +]; + function getFallbackInitials(value: string) { return ( value @@ -35,6 +54,12 @@ function getFallbackInitials(value: string) { ); } +function buildMissionPeopleHref(intent: DatingRelationshipIntent | null) { + const params = new URLSearchParams({ missions: "1" }); + if (intent) params.set("intent", intent); + return `${ROUTES.people}?${params.toString()}`; +} + function buildDirectoryHref({ page, query, @@ -52,6 +77,29 @@ function buildDirectoryHref({ return qs ? `${ROUTES.people}?${qs}` : ROUTES.people; } +function parseMissionMode(value: string | string[] | undefined) { + const raw = Array.isArray(value) ? value[0] : value; + return raw === "1" || raw === "true"; +} + +function parseMissionIntent( + value: string | string[] | undefined, +): DatingRelationshipIntent | null { + const raw = Array.isArray(value) ? value[0] : value; + if ( + raw === DatingRelationshipIntent.FRIENDS || + raw === DatingRelationshipIntent.DATES || + raw === DatingRelationshipIntent.LONG_TERM || + raw === DatingRelationshipIntent.LIFE_PARTNER || + raw === DatingRelationshipIntent.CASUAL || + raw === DatingRelationshipIntent.NON_MONOGAMY || + raw === DatingRelationshipIntent.UNSURE + ) { + return raw; + } + return null; +} + function parsePage(value: string | string[] | undefined) { const raw = Number.parseInt( Array.isArray(value) ? (value[0] ?? "1") : (value ?? "1"), @@ -128,6 +176,26 @@ function PersonDirectoryRow({ person }: { person: PeopleDirectoryPerson }) { ); } +async function loadMissionDiscover( + userId: string, + relationshipIntent: DatingRelationshipIntent | null, +) { + try { + return { + data: await getDatingDiscoverData(userId, { relationshipIntent }), + error: null, + }; + } catch (error) { + return { + data: null, + error: + error instanceof Error + ? error.message + : "Could not load mission people.", + }; + } +} + export default async function PeoplePage({ searchParams, }: { @@ -137,6 +205,138 @@ export default async function PeoplePage({ const query = Array.isArray(params.q) ? (params.q[0] ?? "") : (params.q ?? ""); + const missionMode = parseMissionMode(params.missions); + const missionIntent = parseMissionIntent(params.intent); + + if (missionMode) { + const session = await getServerSession(authOptions); + const userId = session?.user?.id ?? null; + const result = userId + ? await loadMissionDiscover(userId, missionIntent) + : null; + const profile = result?.data?.profile ?? null; + const candidates = result?.data?.candidates ?? []; + const canBrowse = + profile?.status === "ACTIVE" && profile.wantsCampaignDates === true; + + return ( +
    +
    +
    +
    +

    + Mission people +

    +

    + Find someone to optimize Earth with. +

    +

    + These humans turned on Earth Optimization Missions. Like, + pass, or send one sentence. Mutual interest opens messages. +

    +
    +
    + {MISSION_INTENT_FILTERS.map((filter) => { + const active = filter.value === missionIntent; + return ( + + {filter.label} + + ); + })} +
    +
    + + All people + + + Mission settings + + + Messages + +
    +
    + + + + {!userId ? ( +
    +

    Sign in first

    +

    + Mission browsing is for signed-in humans who turned on missions. +

    + + Sign in + +
    + ) : result?.error || !profile ? ( +
    +

    + Turn on missions +

    +

    + Use your profile to turn on missions before browsing other + mission people. +

    + + Mission settings + +
    + ) : !canBrowse ? ( +
    +

    + Missions are paused +

    +

    + Set your mission status to active when you want to be visible. +

    + + Mission settings + +
    + ) : candidates.length ? ( + + ) : ( +
    +

    No people yet

    +

    + The mission pool is empty. This happens before the party + starts. +

    +
    + )} +
    +
    + ); + } + const role = parsePeopleDirectoryRole(params.role); const page = parsePage(params.page); const data = await getPeopleDirectoryData({ page, query, role }); @@ -175,6 +375,12 @@ export default async function PeoplePage({ > {plaintiffsLink.label} + + Mission people +
    diff --git a/packages/web/src/app/poster/page.tsx b/packages/web/src/app/poster/page.tsx index 51f869465..ce796e952 100644 --- a/packages/web/src/app/poster/page.tsx +++ b/packages/web/src/app/poster/page.tsx @@ -1,14 +1,11 @@ import { getServerSession } from "next-auth"; import Link from "next/link"; +import { CampaignQrCode } from "@/components/sharing/campaign-qr-code"; import { authOptions } from "@/lib/auth"; import { CAMPAIGN_PRINT_COPY } from "@/lib/messaging"; import { ROUTES } from "@/lib/routes"; import { buildUserReferralUrl } from "@/lib/url"; -import { - PosterCopyLinkButton, - PosterPrintButton, - PosterQrCode, -} from "./poster-client"; +import { PosterCopyLinkButton, PosterPrintButton } from "./poster-client"; const CAMPAIGN_ORIGIN = "https://warondisease.org"; const POSTER_FAVICON_SRC = "/site-assets/warondisease/warondisease-favicon.png"; @@ -405,7 +402,7 @@ export default async function PosterPage({ ))}
    - +
    ) : ( @@ -441,7 +438,7 @@ export default async function PosterPage({

    - +
    diff --git a/packages/web/src/app/poster/poster-client.tsx b/packages/web/src/app/poster/poster-client.tsx index f464e1db3..196a1996a 100644 --- a/packages/web/src/app/poster/poster-client.tsx +++ b/packages/web/src/app/poster/poster-client.tsx @@ -2,7 +2,6 @@ import { useState } from "react"; import { Check, Copy } from "lucide-react"; -import { QRCodeSVG } from "qrcode.react"; import { copyTextToClipboard } from "@/lib/clipboard"; export function PosterPrintButton() { @@ -54,16 +53,3 @@ export function PosterCopyLinkButton({ value }: { value: string }) { ); } - -export function PosterQrCode({ value }: { value: string }) { - return ( - - ); -} diff --git a/packages/web/src/app/privacy/page.logged-out.md b/packages/web/src/app/privacy/page.logged-out.md index 6788bec52..c7c48bd05 100644 --- a/packages/web/src/app/privacy/page.logged-out.md +++ b/packages/web/src/app/privacy/page.logged-out.md @@ -14,14 +14,15 @@ ## Visible Page Copy ## PRIVACY POLICY -- Last updated May 6, 2026 +- Last updated May 23, 2026 ### 1. WHO WE ARE -- International Campaign to End War and Disease is operated by Earth Optimization Services LLC. This policy explains what we collect when you use warondisease.org, why we collect it, when it may be public, and how to contact us. +- International Campaign to End War and Disease is operated by Accelerated Medicine Foundation Inc, dba International Campaign to End War and Disease. This policy explains what we collect when you use warondisease.org, why we collect it, when it may be public, and how to contact us. ### 2. INFORMATION WE COLLECT - We collect information you give us directly, information created by your use of the site, and limited technical data needed to keep the site working. - Account and contact details, such as your name, email address, display name, organization, profile URL, and sign-in provider. - Campaign activity, such as votes, signatures, endorsements, referral links, invitations, dashboard actions, task activity, and survey or form responses. - Public profile details you choose to publish, such as your name, organization, social links, biography, and endorsement text. +- Earth Optimization Mission details, such as your mission profile, photos, city, answers, matches, messages, proposed mission plans, blocks, safety acknowledgments, and safety reports. - Plaintiff, represented-person, and memorial details you submit, such as names, photos, relationships, life or death status, health condition or cause of death, comments, memorial details, evidence files, and claims about responsible parties. - Donation records if you donate. Payment processors handle card details; we receive transaction status, amount, and related contact details. - Technical data, such as IP address, browser, device, pages viewed, referrer, timestamps, cookies, session data, logs, and analytics events. @@ -35,6 +36,7 @@ - Comply with legal obligations and enforce site rules. ### 4. WHAT MAY BE PUBLIC - Some parts of this site are built for public persuasion and public records. If you sign, vote, endorse, publish a profile, submit an organization, add a plaintiff or memorial, upload public evidence, or share a public referral link, the site may display the details you submitted, related public counts, and referral impact. Public plaintiff and memorial pages may show the person's name, photo, relationship, life or death status, public comments, memorial details, evidence, and responsible-party claims. They may also show a condition or cause when the form asks for public display and you confirm it. For living people or people whose status is unknown, we publish a health condition only when you confirm you have consent or legal authority to disclose it. We do not intentionally publish your private email address unless you put it into a public field. +- Earth Optimization Mission profiles are meant for opted-in adults. Mission profile details, photos, answers, matches, messages, and mission plans may be visible to the users involved and to people helping us review safety reports or abuse. Do not put anything in a mission profile or message that you would not want handled by an early web application and safety reviewers. ### 5. WHEN WE SHARE IT - We do not sell personal information. We share information only when it is needed to run the site, show public campaign records, or meet legal and security obligations. - Service providers that help with hosting, databases, authentication, email, analytics, security, payments, and support. @@ -43,6 +45,7 @@ - A successor organization if the project is reorganized, merged, or transferred. ### 6. COOKIES AND ANALYTICS - We use cookies and similar technologies for sign-in sessions, preferences, abuse prevention, analytics, and basic site operation. Blocking cookies may break account, vote, dashboard, or referral features. +- On selected public information pages, we may use Microsoft Clarity to see clicks, scrolling, page errors, heatmaps, and session replays so we can find confusing parts of the site. We do not intentionally run Clarity on private messages, profile editing, dashboard, mission, auth, vote-form, checkout, or sensitive submission pages. Microsoft may collect and process usage data as described in the Microsoft Privacy Statement. ### 7. RETENTION - We keep information for as long as needed to operate the site, maintain campaign records, prevent fraud, resolve disputes, comply with law, and keep security logs. Public campaign records and plaintiff or memorial records may stay visible after an account is closed unless we agree or are required to remove them. ### 8. YOUR CHOICES @@ -51,12 +54,12 @@ ### 9. SECURITY - We use technical and organizational safeguards designed to protect personal information. No internet service is perfectly secure, so do not send information you would not want handled by a web application. ### 10. CHILDREN -- The site is not directed to children under 13. If you believe a child under 13 provided personal information, contact us and we will review it. +- The site is not directed to children under 13. If you believe a child under 13 provided personal information, contact us and we will review it. Earth Optimization Missions and other user-coordination features are only for adults 18 or older. ### 11. INTERNATIONAL VISITORS - We operate from the United States and may process information in the United States and other countries where our providers work. Those countries may have different privacy rules than yours. ### 12. CHANGES AND CONTACT - We may update this policy by posting a new version here. The date above shows when it was last changed. -- Earth Optimization Services LLC +- Accelerated Medicine Foundation Inc, dba International Campaign to End War and Disease - Email: hello@warondisease.org - Website: warondisease.org - See also: [Terms of Service](/terms) diff --git a/packages/web/src/app/privacy/page.tsx b/packages/web/src/app/privacy/page.tsx index 0ecb9ec0f..002c2db38 100644 --- a/packages/web/src/app/privacy/page.tsx +++ b/packages/web/src/app/privacy/page.tsx @@ -4,7 +4,7 @@ import { getSiteMetadata } from "@/lib/metadata"; import { privacyLink, ROUTES } from "@/lib/routes"; import { getSiteFromHeaders } from "@/lib/site"; -const UPDATED_AT = "May 6, 2026"; +const UPDATED_AT = "May 23, 2026"; const SECTION_HEADING_CLASS = "mb-4 text-2xl font-black uppercase text-foreground"; @@ -75,6 +75,12 @@ export default async function PrivacyPage() { name, organization, social links, biography, and endorsement text. +
  • + Earth Optimization Mission details, such as your mission + profile, photos, city, answers, matches, messages, proposed + mission plans, blocks, safety acknowledgments, and safety + reports. +
  • Plaintiff, represented-person, and memorial details you submit, such as names, photos, relationships, life or death @@ -140,6 +146,14 @@ export default async function PrivacyPage() { your private email address unless you put it into a public field.

    +

    + Earth Optimization Mission profiles are meant for opted-in + adults. Mission profile details, photos, answers, matches, + messages, and mission plans may be visible to the users involved + and to people helping us review safety reports or abuse. Do not + put anything in a mission profile or message that you would not + want handled by an early web application and safety reviewers. +

    @@ -180,6 +194,15 @@ export default async function PrivacyPage() { operation. Blocking cookies may break account, vote, dashboard, or referral features.

    +

    + On selected public information pages, we may use Microsoft + Clarity to see clicks, scrolling, page errors, heatmaps, and + session replays so we can find confusing parts of the site. We + do not intentionally run Clarity on private messages, profile + editing, dashboard, mission, auth, vote-form, checkout, or + sensitive submission pages. Microsoft may collect and process + usage data as described in the Microsoft Privacy Statement. +

    @@ -227,7 +250,8 @@ export default async function PrivacyPage() {

    The site is not directed to children under 13. If you believe a child under 13 provided personal information, contact us and we - will review it. + will review it. Earth Optimization Missions and other + user-coordination features are only for adults 18 or older.

    diff --git a/packages/web/src/app/profile/page.tsx b/packages/web/src/app/profile/page.tsx index a8e567670..a90c52866 100644 --- a/packages/web/src/app/profile/page.tsx +++ b/packages/web/src/app/profile/page.tsx @@ -1,9 +1,17 @@ import { getServerSession } from "next-auth"; import { redirect } from "next/navigation"; import { OpenTaskRequestAction } from "@/components/people/OpenTaskRequestAction"; +import { + MissionProfileForm, + MissionQuestionsClient, +} from "@/components/missions/MissionClient"; import { ProfileIdentityClient } from "@/components/profile/ProfileIdentityClient"; import { PublicProfileTaskSection } from "@/components/tasks/PublicProfileTaskSection"; import { authOptions } from "@/lib/auth"; +import { + getDatingQuestionsData, + getOwnDatingProfile, +} from "@/lib/dating.server"; import { getUserPersonHref } from "@/lib/person-href"; import { getProfileIdentityData } from "@/lib/profile-identity.server"; import { getSignInPath, editProfileLink, ROUTES } from "@/lib/routes"; @@ -13,6 +21,22 @@ import { getUserDisplayName } from "@/lib/user-display"; export const metadata = getRouteMetadata(editProfileLink); +async function loadMissionProfile(userId: string) { + try { + return await getOwnDatingProfile(userId); + } catch { + return null; + } +} + +async function loadMissionQuestions(userId: string) { + try { + return await getDatingQuestionsData(userId); + } catch { + return null; + } +} + export default async function ProfilePage() { const session = await getServerSession(authOptions); const userId = session?.user.id; @@ -21,15 +45,21 @@ export default async function ProfilePage() { redirect(getSignInPath(ROUTES.profile)); } - const data = await getProfileIdentityData(userId); + const [data, missionProfile] = await Promise.all([ + getProfileIdentityData(userId), + loadMissionProfile(userId), + ]); if (!data) { redirect(getSignInPath(ROUTES.profile)); } - const publicTaskData = data.user.person - ? await getPersonTaskProfileData(data.user.person.id, userId) - : null; + const [publicTaskData, missionQuestions] = await Promise.all([ + data.user.person + ? getPersonTaskProfileData(data.user.person.id, userId) + : Promise.resolve(null), + missionProfile ? loadMissionQuestions(userId) : Promise.resolve(null), + ]); const availableAuthProviderIds = authOptions.providers.map((provider) => provider.id); const publicProfileHref = getUserPersonHref(data.user); @@ -62,6 +92,38 @@ export default async function ProfilePage() { } requestedTasks={publicTaskData?.requestedOpenTasks ?? []} /> +
    +
    +

    + Missions +

    +

    + Find someone to optimize Earth with. +

    +

    + This is the part of your profile that only exists for Earth + Optimization Missions: who should find you, what you might do + together, and whether romance is permitted to make itself useful. +

    +
    +
    + +
    + {missionQuestions?.questions.length ? ( +
    +

    + Mission questions +

    +

    + Answer what you believe and what you can tolerate. Matching is + easier when the dealbreakers are not discovered during dessert. +

    +
    + +
    +
    + ) : null} +
    • ); diff --git a/packages/web/src/app/shirt/page.logged-out.md b/packages/web/src/app/shirt/page.logged-out.md index df884fd87..47dab58fd 100644 --- a/packages/web/src/app/shirt/page.logged-out.md +++ b/packages/web/src/app/shirt/page.logged-out.md @@ -3,13 +3,13 @@ ## Metadata - Page title: Buy the t-shirt that ended war and disease — 1% Treaty | International Campaign to End War and Disease -- Meta description: Order a War on Disease shirt with campaign copy and a QR code. Your torso is not busy enough. +- Meta description: Every human on earth would be vastly richer and significantly less dead in a world where we agreed to sacrifice one of our 122 apocalypse capacity for disease eradication. 8 billion people wearing this t-shirt will make it clear that 8 billion people agree on this arrangement. - Canonical: https://warondisease.org/shirt - Open Graph title: Buy the t-shirt that ended war and disease — 1% Treaty -- Open Graph description: Order a War on Disease shirt with campaign copy and a QR code. Your torso is not busy enough. +- Open Graph description: Every human on earth would be vastly richer and significantly less dead in a world where we agreed to sacrifice one of our 122 apocalypse capacity for disease eradication. 8 billion people wearing this t-shirt will make it clear that 8 billion people agree on this arrangement. - Open Graph image: https://warondisease.org/api/og/route?path=%2Fshirt - Twitter title: Buy the t-shirt that ended war and disease — 1% Treaty -- Twitter description: Order a War on Disease shirt with campaign copy and a QR code. Your torso is not busy enough. +- Twitter description: Every human on earth would be vastly richer and significantly less dead in a world where we agreed to sacrifice one of our 122 apocalypse capacity for disease eradication. 8 billion people wearing this t-shirt will make it clear that 8 billion people agree on this arrangement. ## Visible Page Copy @@ -27,7 +27,7 @@ - Your contribution above the $15 shirt fair market value is tax-deductible. ### FIX YOUR EXISTING T-SHIRTS. - Do you already own a t-shirt? Even several? -- If so, you can easily upgrade your existing t-shirts. The market value of a plain white t-shirt is approximately $10. The market value of a t-shirt that ended war and disease is approximately [$10,598,318.88](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html). Upgrading yours increases its resale value by approximately 1,059,832 times. +- If so, you can easily upgrade your existing t-shirts. The market value of a plain white t-shirt is approximately $10. The market value of a t-shirt that ended war and disease is approximately [$10,598,318.88](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html). Upgrading yours increases its resale value by approximately [1,059,832](https://manual.WarOnDisease.org/knowledge/economics/1-pct-treaty-impact.html) times. - On the front, write: - THIS T-SHIRT ENDED WAR AND DISEASE. - On the back, write: @@ -54,4 +54,4 @@ - Back: Trade one apocalypse for disease eradication at warondisease.org. Plus the per-buyer QR code. - FRONT - BACK WITH QR -- Want to coordinate with another human? Go on an [Earth Optimization Date](/love). +- Want to coordinate with another human? Go on an [Earth Optimization Mission](/missions). diff --git a/packages/web/src/app/shirt/page.tsx b/packages/web/src/app/shirt/page.tsx index 400eb79db..6711ebb6e 100644 --- a/packages/web/src/app/shirt/page.tsx +++ b/packages/web/src/app/shirt/page.tsx @@ -5,7 +5,7 @@ import { NUCLEAR_WINTER_OVERKILL_FACTOR, PER_SHIRT_TRUE_VALUE_USD, } from "@optimitron/data/parameters"; -import { PosterQrCode } from "@/app/poster/poster-client"; +import { CampaignQrCode } from "@/components/sharing/campaign-qr-code"; import { ParameterValue } from "@/components/shared/ParameterValue"; import { TshirtSilhouette } from "@/components/shirt/TshirtSilhouette"; import { TaskFundingPledgeForm } from "@/components/task-funding/TaskFundingPledgeForm"; @@ -385,7 +385,7 @@ function ShirtBackArtwork({ y="900" /> - + - Earth Optimization Date + Earth Optimization Mission .

    diff --git a/packages/web/src/app/signatories/page.logged-out.md b/packages/web/src/app/signatories/page.logged-out.md index 9ef73482b..8539e2d33 100644 --- a/packages/web/src/app/signatories/page.logged-out.md +++ b/packages/web/src/app/signatories/page.logged-out.md @@ -29,4 +29,4 @@ - [EMAIL](mailto:?subject=Vote%20on%20the%201%25%20Treaty&body=I%20love%20you%20and%20don't%20want%20you%20to%20suffer%20and%20die%20of%20horrible%20diseases%20so%20please%20take%2030%20seconds%20to%20vote%20on%20this%20stupid%20treaty%20at%20http%3A%2F%2F127.0.0.1%3A3001%2Fvote%20as%20it%20will%20reduce%20the%20likelihood%20you%20will%20suffer%20and%20die%20of%20horrible%20diseases.) - [POST](https://twitter.com/intent/tweet?text=I%20love%20you%20and%20don't%20want%20you%20to%20suffer%20and%20die%20of%20horrible%20diseases%20so%20please%20take%2030%20seconds%20to%20vote%20on%20this%20stupid%20treaty%20at%20http%3A%2F%2F127.0.0.1%3A3001%2Fvote%20as%20it%20will%20reduce%20the%20likelihood%20you%20will%20suffer%20and%20die%20of%20horrible%20diseases.) - [FACEBOOK](https://www.facebook.com/sharer/sharer.php?u=http%3A%2F%2F127.0.0.1%3A3001%2Fvote) -- [END WAR AND DISEASE FROM YOUR DATING PROFILE.](/love) +- [END WAR AND DISEASE FROM YOUR MISSION PROFILE.](/missions) diff --git a/packages/web/src/app/terms/page.logged-out.md b/packages/web/src/app/terms/page.logged-out.md index aa927dd81..ba5919cd7 100644 --- a/packages/web/src/app/terms/page.logged-out.md +++ b/packages/web/src/app/terms/page.logged-out.md @@ -14,49 +14,56 @@ ## Visible Page Copy ## TERMS OF SERVICE -- Last updated May 6, 2026 +- Last updated May 22, 2026 ### 1. AGREEMENT -- These terms govern your use of International Campaign to End War and Disease, operated by Earth Optimization Services LLC. By using warondisease.org, you agree to these terms. If you do not agree, do not use the site. +- These terms govern your use of International Campaign to End War and Disease, operated by Accelerated Medicine Foundation Inc, dba International Campaign to End War and Disease. By using warondisease.org, you agree to these terms. If you do not agree, do not use the site. ### 2. WHAT THE SITE DOES - The site supports public campaigns, votes, signatures, referrals, endorsements, organization pages, dashboards, tasks, donations, and related educational materials. Features may change as the project changes. -### 3. ACCOUNTS AND IDENTITY +### 3. EARTH OPTIMIZATION MISSIONS +- Earth Optimization Missions and similar coordination features are for adults using the site to coordinate platonic campaign work. We do not screen every user, verify backgrounds, supervise sessions, or promise that another person is safe. +- Do not use mission coordination features if you are under 18. +- Choose the setting yourself: online, in public, or not at all. Leave whenever you want. +- Do not send money, bank details, passwords, identity documents, or emergency favors to another user. +- Report unsafe or abusive behavior. Block anyone you do not want to hear from. +- If you are in immediate danger, contact local emergency services. +### 4. ACCOUNTS AND IDENTITY - Use accurate information when you create an account or sign in. - Do not impersonate a person, organization, government, or campaign. - Keep your sign-in method secure. - Tell us if you believe your account was used without permission. -### 4. VOTES, SIGNATURES, REFERRALS, AND ENDORSEMENTS +### 5. VOTES, SIGNATURES, REFERRALS, AND ENDORSEMENTS - Public support tools only work when submissions are honest. - Do not submit fake, duplicate, automated, or misleading votes or signatures. - Do not misrepresent an endorsement or claim authority you do not have. - Do not manipulate referral tracking, rewards, rankings, or public counts. - Do not spam people or hide what a referral link does. -### 5. YOUR SUBMISSIONS +### 6. YOUR SUBMISSIONS - You are responsible for what you submit. If you submit a public signature, vote, endorsement, organization profile, task update, plaintiff card, memorial, evidence file, comment, or similar material, you allow us to host, display, reproduce, and share it in connection with the site and the campaign. Do not submit material you do not have the right to share. -### 6. PLAINTIFFS, REPRESENTED PEOPLE, AND MEMORIALS +### 7. PLAINTIFFS, REPRESENTED PEOPLE, AND MEMORIALS - Do not add a living person, or a person whose status is unknown, unless you have their permission or legal authority to represent them. - Do not publicly disclose a living or unknown-status person's health condition unless you have consent or legal authority to make that disclosure. - If you add a deceased person, use a good-faith family, personal-representative, or comparable basis for submitting their memorial. - Only upload public evidence you have the right to share. Do not upload private medical records, confidential files, or anything you know should not be public. - Claims about governments, agencies, organizations, conflicts, causes of death, or responsible parties must be made in good faith. We may remove or limit public display of contested, unsafe, misleading, or unlawful material. -### 7. SITE MATERIALS +### 8. SITE MATERIALS - You may link to and share public campaign materials as long as you do not mislead people, remove attribution, or imply that we endorse your edited version. Software and other materials may have separate license terms where posted. -### 8. DONATIONS AND PAYMENTS +### 9. DONATIONS AND PAYMENTS - Donations and payments are voluntary. They may be nonrefundable unless required by law or the applicable payment processor. We do not provide tax, financial, investment, medical, or legal advice. -### 9. DO NOT BREAK THE SITE +### 10. DO NOT BREAK THE SITE - Do not attack, scrape, overload, reverse engineer, or bypass the site. - Do not upload malware or use the site to harm other systems. - Do not use the site for unlawful activity. - Do not collect personal information from other users without permission. -### 10. MODERATION +### 11. MODERATION - We may remove content, block activity, suspend accounts, or refuse service when we believe activity is fraudulent, abusive, unlawful, misleading, harmful, or inconsistent with these terms. -### 11. NO PROFESSIONAL ADVICE +### 12. NO PROFESSIONAL ADVICE - The site contains campaign, policy, medical, legal, financial, and technical information. It is general information, not personal medical advice, legal advice, financial advice, tax advice, or investment advice. -### 12. AVAILABILITY AND DISCLAIMERS +### 13. AVAILABILITY AND DISCLAIMERS - The site is provided as is and as available. It may change, break, lose features, or be unavailable. To the maximum extent allowed by law, we disclaim warranties and are not liable for indirect, incidental, consequential, special, exemplary, or punitive damages arising from your use of the site. -### 13. OTHER LEGAL TERMS +### 14. OTHER LEGAL TERMS - These terms do not limit rights that cannot be waived under applicable law. If part of these terms is unenforceable, the rest remains in effect. We may update these terms by posting a new version here. Continued use of the site means you accept the updated terms. -### 14. CONTACT -- Earth Optimization Services LLC +### 15. CONTACT +- Accelerated Medicine Foundation Inc, dba International Campaign to End War and Disease - Email: hello@warondisease.org - Website: warondisease.org - See also: [Privacy Policy](/privacy) diff --git a/packages/web/src/app/terms/page.tsx b/packages/web/src/app/terms/page.tsx index 42f22eca8..882019f9f 100644 --- a/packages/web/src/app/terms/page.tsx +++ b/packages/web/src/app/terms/page.tsx @@ -4,7 +4,7 @@ import { getSiteMetadata } from "@/lib/metadata"; import { ROUTES, termsLink } from "@/lib/routes"; import { getSiteFromHeaders } from "@/lib/site"; -const UPDATED_AT = "May 6, 2026"; +const UPDATED_AT = "May 22, 2026"; const SECTION_HEADING_CLASS = "mb-4 text-2xl font-black uppercase text-foreground"; @@ -63,7 +63,40 @@ export default async function TermsPage() {

    - 3. Accounts and Identity + 3. Earth Optimization Missions +

    +

    + Earth Optimization Missions and similar coordination features + are for adults using the site to coordinate platonic campaign + work. We do not screen every user, verify backgrounds, + supervise sessions, or promise that another person is safe. +

    +
      +
    • + Do not use mission coordination features if you are under 18. +
      • +
    • + Choose the setting yourself: online, in public, or not at + all. Leave whenever you want. +
      • +
    • + Do not send money, bank details, passwords, identity + documents, or emergency favors to another user. +
      • +
    • + Report unsafe or abusive behavior. Block anyone you do not + want to hear from. +
      • +
    • + If you are in immediate danger, contact local emergency + services. +
      • +
    +
    + +
    +

    + 4. Accounts and Identity

    • @@ -84,7 +117,7 @@ export default async function TermsPage() {

      - 4. Votes, Signatures, Referrals, and Endorsements + 5. Votes, Signatures, Referrals, and Endorsements

      Public support tools only work when submissions are honest. @@ -107,7 +140,7 @@ export default async function TermsPage() {

      -

      5. Your Submissions

      +

      6. Your Submissions

      You are responsible for what you submit. If you submit a public signature, vote, endorsement, organization profile, task update, @@ -120,7 +153,7 @@ export default async function TermsPage() {

      - 6. Plaintiffs, Represented People, and Memorials + 7. Plaintiffs, Represented People, and Memorials

      • @@ -153,7 +186,7 @@ export default async function TermsPage() {
      -

      7. Site Materials

      +

      8. Site Materials

      You may link to and share public campaign materials as long as you do not mislead people, remove attribution, or imply that we @@ -164,7 +197,7 @@ export default async function TermsPage() {

      - 8. Donations and Payments + 9. Donations and Payments

      Donations and payments are voluntary. They may be nonrefundable @@ -176,7 +209,7 @@ export default async function TermsPage() {

      - 9. Do Not Break the Site + 10. Do Not Break the Site

      • @@ -195,7 +228,7 @@ export default async function TermsPage() {
      -

      10. Moderation

      +

      11. Moderation

      We may remove content, block activity, suspend accounts, or refuse service when we believe activity is fraudulent, abusive, @@ -205,7 +238,7 @@ export default async function TermsPage() {

      - 11. No Professional Advice + 12. No Professional Advice

      The site contains campaign, policy, medical, legal, financial, @@ -217,7 +250,7 @@ export default async function TermsPage() {

      - 12. Availability and Disclaimers + 13. Availability and Disclaimers

      The site is provided as is and as available. It may change, @@ -229,7 +262,7 @@ export default async function TermsPage() {

      -

      13. Other Legal Terms

      +

      14. Other Legal Terms

      These terms do not limit rights that cannot be waived under applicable law. If part of these terms is unenforceable, the @@ -240,7 +273,7 @@ export default async function TermsPage() {

      -

      14. Contact

      +

      15. Contact

      {legalEntityName}

      Email: {contactEmail}

      diff --git a/packages/web/src/app/tools/page.logged-out.md b/packages/web/src/app/tools/page.logged-out.md index 892bd2c1c..3e61b6117 100644 --- a/packages/web/src/app/tools/page.logged-out.md +++ b/packages/web/src/app/tools/page.logged-out.md @@ -13,7 +13,7 @@ ## Visible Page Copy -- 26 TOOLS +- 28 TOOLS ## THE ARMORY - Your toolkit for fixing the mess described above. Browse. Equip. Try not to break anything important. ### ANALYSIS @@ -42,7 +42,9 @@ - [🔍DECENTRALIZED ACCOUNTABILITY OFFICE Every fund flow on IPFS — impossible to quietly delete](/agencies/dgao) ### PLAYER - [🎯EARTH OPTIMIZATION TASKS What waiting costs](/tasks) -- [END WAR AND DISEASE FROM YOUR DATING PROFILE End war and disease from your dating profile.](/love) +- [❤️EARTH OPTIMIZATION MISSIONS An Earth Optimization Mission is non-romantic by definition](/missions) +- [🛍️STORE Buy useful campaign things.](/store) +- [👕GET THE SHIRT Wear your campaign QR code.](/shirt) - [🪪REMIND PRESIDENTS Remind presidents to promote the general welfare](/employees) - [📡TRANSMIT Thirty seconds — what you ate, how you slept, how you feel](/transmit) - [📊MANAGE HUMANITY Get humanity to agree](/dashboard) diff --git a/packages/web/src/components/dashboard/DashboardShareCard.tsx b/packages/web/src/components/dashboard/DashboardShareCard.tsx index 9bde81ae0..9673aeebd 100644 --- a/packages/web/src/components/dashboard/DashboardShareCard.tsx +++ b/packages/web/src/components/dashboard/DashboardShareCard.tsx @@ -301,9 +301,9 @@ export function DashboardShareCard({ referralUrl }: DashboardShareCardProps) { {renderShareStatus()} - End war and disease from your dating profile. + End war and disease from your mission profile.
      diff --git a/packages/web/src/app/love/dating/dating-client.tsx b/packages/web/src/components/missions/MissionClient.tsx similarity index 67% rename from packages/web/src/app/love/dating/dating-client.tsx rename to packages/web/src/components/missions/MissionClient.tsx index 1ab6e4dff..bb305ff51 100644 --- a/packages/web/src/app/love/dating/dating-client.tsx +++ b/packages/web/src/components/missions/MissionClient.tsx @@ -2,16 +2,26 @@ import { useRouter } from "next/navigation"; import { useState } from "react"; -import { Heart, Send, Shield, X } from "lucide-react"; +import { Ban, Heart, Send, Shield, X } from "lucide-react"; +import type { + DatingProfileStatus, + DatingRelationshipIntent, +} from "@optimitron/db/enums"; +import { + DATING_SAFETY_COPY, + hasDatingSafetyAcknowledgement, +} from "@/lib/dating-safety"; import { getUserDisplayName } from "@/lib/user-display"; -type DatingProfileStatus = - | "ACTIVE" - | "BANNED" - | "DRAFT" - | "HIDDEN" - | "MODERATION_HOLD" - | "PAUSED"; +const RELATIONSHIP_INTENT_OPTIONS: Array<{ + label: string; + value: DatingRelationshipIntent; +}> = [ + { label: "Mission friends", value: "FRIENDS" }, + { label: "Could be romantic", value: "DATES" }, + { label: "Long-term if the universe insists", value: "LONG_TERM" }, + { label: "Unsure", value: "UNSURE" }, +]; interface Photo { id: string; @@ -29,8 +39,9 @@ interface Profile { displayRegionCode: string | null; headline: string | null; lookingForText: string | null; + metadata?: unknown; photos?: Photo[]; - relationshipIntents: string[]; + relationshipIntents: DatingRelationshipIntent[]; status: DatingProfileStatus; wantsCampaignDates: boolean; } @@ -87,8 +98,11 @@ function buttonClassName(invert = true) { : "inline-flex items-center justify-center gap-2 border-2 border-foreground bg-background px-4 py-2 text-sm font-black uppercase text-foreground transition-colors hover:bg-foreground hover:text-background disabled:cursor-not-allowed disabled:opacity-60"; } -export function DatingProfileForm({ profile }: { profile: Profile | null }) { +export function MissionProfileForm({ profile }: { profile: Profile | null }) { const router = useRouter(); + const safetyAlreadyAcknowledged = hasDatingSafetyAcknowledgement( + profile?.metadata, + ); const [headline, setHeadline] = useState(profile?.headline ?? ""); const [bio, setBio] = useState(profile?.bio ?? ""); const [lookingForText, setLookingForText] = useState( @@ -107,6 +121,16 @@ export function DatingProfileForm({ profile }: { profile: Profile | null }) { const [wantsCampaignDates, setWantsCampaignDates] = useState( profile?.wantsCampaignDates ?? true, ); + const [relationshipIntents, setRelationshipIntents] = useState< + DatingRelationshipIntent[] + >( + profile?.relationshipIntents?.length + ? profile.relationshipIntents + : ["FRIENDS"], + ); + const [safetyAcknowledged, setSafetyAcknowledged] = useState( + safetyAlreadyAcknowledged, + ); const [campaignDateIdeas, setCampaignDateIdeas] = useState( profile?.campaignDateIdeas?.join("\n") ?? "Coffee plus QR flyers\nWalk plus posters\nMuseum plus asking two friends to vote", @@ -114,8 +138,13 @@ export function DatingProfileForm({ profile }: { profile: Profile | null }) { const [photoUrl, setPhotoUrl] = useState(""); const [isSaving, setIsSaving] = useState(false); const [message, setMessage] = useState(null); + const needsSafetyAcknowledgement = status === "ACTIVE" && !safetyAcknowledged; async function saveProfile() { + if (needsSafetyAcknowledgement) { + setMessage("Confirm the safety rules before going active"); + return; + } setIsSaving(true); setMessage(null); const response = await fetch("/api/dating/profile", { @@ -127,7 +156,9 @@ export function DatingProfileForm({ profile }: { profile: Profile | null }) { displayRegionCode, headline, lookingForText, - relationshipIntents: ["DATES", "FRIENDS"], + relationshipIntents, + safetyAcknowledged: + safetyAcknowledged && !safetyAlreadyAcknowledged ? true : undefined, status, wantsCampaignDates, }), @@ -136,7 +167,7 @@ export function DatingProfileForm({ profile }: { profile: Profile | null }) { }); setIsSaving(false); - setMessage(response.ok ? "Saved" : "Could not save"); + setMessage(response.ok ? "Mission settings saved" : "Could not save"); router.refresh(); } @@ -148,16 +179,26 @@ export function DatingProfileForm({ profile }: { profile: Profile | null }) { headers: { "Content-Type": "application/json" }, method: "POST", }); - setMessage(response.ok ? "Photo added for review" : "Could not add photo"); + setMessage( + response.ok ? "Mission photo added for review" : "Could not add photo", + ); if (response.ok) setPhotoUrl(""); router.refresh(); } + function toggleRelationshipIntent(intent: DatingRelationshipIntent) { + setRelationshipIntents((current) => + current.includes(intent) + ? current.filter((value) => value !== intent) + : [...current, intent], + ); + } + return (