From 7430811ddc6b8760bd8ff0bfbe65d795eee7f788 Mon Sep 17 00:00:00 2001 From: Inferencebot Date: Sun, 8 Nov 2026 02:35:52 +0000 Subject: [PATCH] Rename 'gift' to 'guest' throughout: guest-status/cancel-guest routes, cancel-link wording, ended-state lines (pure rename, no behaviour change) --- app/main.py | 68 ++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/app/main.py b/app/main.py index 3fcb425..f71e034 100644 --- a/app/main.py +++ b/app/main.py @@ -218,12 +218,12 @@ async def api_set_matrix_mxid(request: Request): return JSONResponse({"error": e.detail}, status_code=e.status_code) -@app.get("/api/gift-status") -async def api_gift_status(request: Request): - """What became of the caller's gift account (guest view). +@app.get("/api/guest-status") +async def api_guest_status(request: Request): + """What became of the caller's guest account (guest view). Loaded when the usage view refuses a GUEST (access ended): the portal - answers for ended gift accounts so the dashboard can say plainly that + answers for ended guest accounts so the dashboard can say plainly that access ended, the data is kept, and a membership is still available. Members get guest: false — the caller falls back to the usage error. """ @@ -231,25 +231,25 @@ async def api_gift_status(request: Request): if not identity: return JSONResponse({"error": "unauthenticated"}, status_code=401) try: - return await broker_get(identity, "/broker/gift-status") + return await broker_get(identity, "/broker/guest-status") except HTTPException as e: return JSONResponse({"error": e.detail}, status_code=e.status_code) -@app.post("/api/cancel-gift") -async def api_cancel_gift(request: Request): - """End the caller's own gift account (self-service cancel, guest view). +@app.post("/api/cancel-guest") +async def api_cancel_guest(request: Request): + """End the caller's own guest account (self-service cancel, guest view). One hop to the portal broker, which holds the actual semantics: access ends immediately, unspent credit returns to the co-op, the ledger keeps - the trail, and a repeat call is a no-op. Gift accounts only — the portal + the trail, and a repeat call is a no-op. Guest accounts only — the portal refuses a paying member with 403. """ identity = get_user_identity(request) if not identity: return JSONResponse({"error": "unauthenticated"}, status_code=401) try: - return await broker_post(identity, "/broker/cancel-gift") + return await broker_post(identity, "/broker/cancel-guest") except HTTPException as e: return JSONResponse({"error": e.detail}, status_code=e.status_code) @@ -435,7 +435,7 @@ PAGE_HTML = """ .oc-note a { color: var(--green-deep); font-weight: 600; text-decoration: none; } .oc-note a:hover { text-decoration: underline; } /* Guest self-service cancel: a quiet link that reveals the confirm step, - then ends the gift. Sits under the Become-a-member row. */ + then ends the access. Sits under the Become-a-member row. */ .cancel-row { margin-top: 14px; display: flex; align-items: center; gap: 12px; flex-wrap: wrap; } .cancel-link { font-family: inherit; cursor: pointer; background: none; border: none; @@ -673,11 +673,11 @@ PAGE_HTML = """ Manage your payment on Open Collective →

@@ -782,22 +782,22 @@ function fmtMoney(n) { const v = Math.abs(Number(n)) < 0.005 ? 0 : (Number(n) || // --- Guest self-service cancel (reveal → confirm → ended state) ----------- -function revealCancelGift() { +function revealCancelGuest() { $('cancel-reveal').style.display = 'none'; $('cancel-confirm').style.display = ''; } -function hideCancelGift() { +function hideCancelGuest() { $('cancel-confirm').style.display = 'none'; $('cancel-reveal').style.display = ''; } -async function doCancelGift() { +async function doCancelGuest() { const btn = $('cancel-go'); btn.disabled = true; btn.textContent = 'Ending…'; try { - const r = await fetch('/api/cancel-gift', { method: 'POST' }); + const r = await fetch('/api/cancel-guest', { method: 'POST' }); const d = await r.json().catch(() => ({})); if (!r.ok || d.error) { flash(d.error || 'Cancelling failed — try again', false); @@ -805,8 +805,8 @@ async function doCancelGift() { btn.textContent = 'Confirm — end my access'; return; } - renderGiftEnded({ - gift_status: d.gift_status || 'cancelled by recipient', + renderGuestEnded({ + guest_status: d.guest_status || 'cancelled by recipient', credits_returned: d.credits_returned || 0 }); } catch (e) { @@ -818,27 +818,27 @@ async function doCancelGift() { // The ended state: access over, account and data kept, membership one // contribution away. Replaces the usage card content. -function renderGiftEnded(g) { - const st = String(g.gift_status || ''); +function renderGuestEnded(g) { + const st = String(g.guest_status || ''); let line; if (st === 'cancelled by recipient') { - line = 'You cancelled your gift access.'; + line = 'You cancelled your guest access.'; if (Number(g.credits_returned) > 0) { line += ' Unspent credit of ' + fmtMoney(g.credits_returned) + ' was returned to the co-op.'; } } else if (st === 'expired') { - line = 'The gift ran out of time.'; + line = 'Guest access ran out of time.'; } else if (st === 'depleted') { - line = 'The gift credit was spent.'; + line = 'The guest credit was spent.'; } else { - line = 'Your gift access has ended.'; + line = 'Your guest access has ended.'; } $('usage-header').style.display = 'none'; $('view-coop').style.display = 'none'; $('cancel-row').style.display = 'none'; $('view-mine').innerHTML = '
' + - '

Your gift access has ended

' + + '

Your guest access has ended

' + '

' + line + '

' + '

Your account and data are kept. Become a member anytime with the same login — your account resumes as a full membership, and a member can re-invite you.

' + 'Become a member' + @@ -854,20 +854,20 @@ async function load() { const d = await r.json(); if (d.error) { // A 403 can be an ENDED GUEST (cancelled, expired or spent out): the - // portal answers /api/gift-status for those, so the dashboard says + // portal answers /api/guest-status for those, so the dashboard says // plainly that access ended instead of flashing an error. if (r.status === 403) { try { - const gs = await fetch('/api/gift-status'); + const gs = await fetch('/api/guest-status'); const g = await gs.json(); - if (g && g.guest && g.ended) { renderGiftEnded(g); return; } + if (g && g.guest && g.ended) { renderGuestEnded(g); return; } } catch (e) { /* fall through to the error flash */ } } flash(d.error, false); return; } - // Gift accounts (portal flag): no Matrix section — the card is hidden in + // Guest accounts (portal flag): no Matrix section — the card is hidden in // the markup and only shown to members — and a Become-a-member button in // place of the credit-pack buy path. Everything else stays. const isGuest = !!d.guest; @@ -877,8 +877,8 @@ async function load() { const b = $('buy-btn'); b.href = '@@BECOME_MEMBER_URL@@'; b.textContent = 'Become a member'; - $('buy-credits').textContent = 'Your gift credit never expires · members get a monthly allowance'; - $('meta').textContent = 'A gift from a member — $5 of AI usage across chat and the API.'; + $('buy-credits').textContent = 'Your guest credit never expires · members get a monthly allowance'; + $('meta').textContent = 'Guest access from a member — $5 of AI usage across chat and the API.'; $('cancel-row').style.display = ''; }