v24.17.0: login-time support nag for non-supporters

Operators not supporting WolfStack (no paid licence, no paying Patreon pledge, no GitHub Sponsor self-attest) now get a freely dismissible modal once per login asking them to sponsor on GitHub or buy a licence. Supporters never see it; the login-prompt coordinator shows the welcome modal XOR the nag, never both.

- is_supporter() reuses the existing entitlement model (licence OR paying Patreon tier OR GitHub self-attest); GET /api/supporter/status drives it. Fail-safe: any error treats the user as a supporter, so a paying customer is never nagged.
- "I'm supporting already" checkbox cancels permanently: instant local flag plus honour-system server self-attest via POST /api/sponsor/github.
- Unit test for PatreonTier::is_paying (Free-exempt boundary).

Co-Authored-By: CodeWolf <paul@wolf.uk.com>
Co-Authored-By: Wolf Software Systems Ltd <paul@wolf.uk.com>

Author: Paul C

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wolfstack"
-version = "24.16.0"
+version = "24.17.0"
 edition = "2024"
 authors = ["Wolf Software Systems Ltd"]
 description = "Server management platform for the Wolf software suite"

src/api/mod.rs

@@ -28185,6 +28185,51 @@ fn beta_access_granted(patreon_tier: &crate::patreon::PatreonTier)
     beta_access_granted_full(patreon_tier, false)
 }
 
+/// Whether this installation supports WolfStack by ANY means — a paid
+/// licence, a paying Patreon pledge (Basic+), or the GitHub Sponsor
+/// self-attest flag. Deliberately broader than `beta_access_granted_full`:
+/// the login-time support nag must exempt EVERYONE who gives us money,
+/// including Patreon Basic backers who don't earn beta access. Nagging a
+/// paying customer is a self-own.
+///
+/// Returns (is_supporter, reason) so the frontend can tailor copy if it wants.
+fn is_supporter(
+    patreon_tier: &crate::patreon::PatreonTier,
+    github_sponsor: bool,
+) -> (bool, &'static str) {
+    if crate::compat::platform_ready() {
+        return (true, "licence");
+    }
+    if patreon_tier.is_paying() {
+        return (true, "patreon");
+    }
+    if github_sponsor {
+        return (true, "github_sponsor");
+    }
+    (false, "none")
+}
+
+/// GET /api/supporter/status — drives the login-time support nag. Reports
+/// whether this install supports WolfStack by any means (licence, paying
+/// Patreon pledge, or GitHub Sponsor self-attest) so the frontend can decide
+/// whether to show the nag. Operator session required.
+async fn supporter_status(req: HttpRequest, state: web::Data<AppState>) -> HttpResponse {
+    if let Err(resp) = require_auth(&req, &state) {
+        return resp;
+    }
+    // Copy the two inputs out and drop the guard BEFORE the (sync) licence
+    // check — never hold the RwLock guard longer than the read needs.
+    let (tier, github_sponsor) = {
+        let config = state.patreon.config.read().unwrap();
+        (config.tier.clone(), config.github_sponsor)
+    };
+    let (granted, reason) = is_supporter(&tier, github_sponsor);
+    HttpResponse::Ok().json(serde_json::json!({
+        "is_supporter": granted,
+        "reason": reason,
+    }))
+}
+
 /// POST /api/patreon/disconnect — unlink Patreon account
 async fn patreon_disconnect(req: HttpRequest, state: web::Data<AppState>) -> HttpResponse {
     if let Err(resp) = require_auth(&req, &state) {
@@ -33885,6 +33930,7 @@ pub fn configure(cfg: &mut web::ServiceConfig) {
         // are independent grants); the persisted state happens to
         // share patreon.json for historical reasons.
         .route("/api/sponsor/github", web::post().to(set_github_sponsor))
+        .route("/api/supporter/status", web::get().to(supporter_status))
         .route("/api/patreon/disconnect", web::post().to(patreon_disconnect))
         // Icon Packs
         .route("/api/icon-packs", web::get().to(icon_packs_list))

src/patreon.rs

@@ -61,6 +61,14 @@ impl PatreonTier {
         matches!(self, PatreonTier::Advanced | PatreonTier::Platinum | PatreonTier::Enterprise)
     }
 
+    /// Whether this tier reflects an actual paid pledge — excludes `None`
+    /// (not linked) and `Free` (follows on Patreon but pledges nothing).
+    /// Used by the login-time support nag to exempt anyone who is in fact
+    /// paying us, even at a tier below beta access.
+    pub fn is_paying(&self) -> bool {
+        matches!(self, PatreonTier::Basic | PatreonTier::Advanced | PatreonTier::Platinum | PatreonTier::Enterprise)
+    }
+
     /// Determine tier from pledge amount in cents.
     pub fn from_cents(cents: i64) -> Self {
         if cents >= 9500 {
@@ -366,4 +374,17 @@ mod tests {
         assert!(PatreonTier::Platinum.has_beta_access());
         assert!(PatreonTier::Enterprise.has_beta_access());
     }
+
+    #[test]
+    fn test_is_paying() {
+        // The support nag must NOT fire for anyone actually paying. The
+        // critical boundary is Free (follows, pledges nothing) vs Basic
+        // (first paid tier).
+        assert!(!PatreonTier::None.is_paying());
+        assert!(!PatreonTier::Free.is_paying());
+        assert!(PatreonTier::Basic.is_paying());
+        assert!(PatreonTier::Advanced.is_paying());
+        assert!(PatreonTier::Platinum.is_paying());
+        assert!(PatreonTier::Enterprise.is_paying());
+    }
 }

web/css/style.css

@@ -4218,3 +4218,8 @@ body.learn-drawer-open #task-log-footer { right: var(--learn-drawer-w) !importan
     .welcome-getstarted { width: 100%; }
     .welcome-dontshow-lbl { justify-content: center; }
 }
+
+/* Support nag — reuses .welcome-modal / .welcome-card / .welcome-action /
+   .welcome-foot / .welcome-dontshow-lbl. The note is the only unique bit. */
+.nag-once-note { margin: 12px 0 0; font-size: 12px; color: var(--text-muted); line-height: 1.45; text-align: center; }
+.nag-once-note strong { color: var(--text-secondary); }

web/index.html

@@ -9851,6 +9851,50 @@ <h2 id="welcome-modal-title">Welcome to WolfStack</h2>
     </div>
 </div>
 
+<!-- Login-time support nag: shown once per login to operators who have dismissed
+     the welcome modal and are NOT supporting WolfStack (no licence, no paying
+     Patreon pledge, no GitHub Sponsor self-attest). Freely dismissible — never
+     blocks the dashboard. Reuses the .welcome-modal styles. See
+     maybeShowLoginPrompt() / showSupportNag() in app.js. -->
+<div id="support-nag" class="welcome-modal" role="dialog" aria-modal="true" aria-labelledby="support-nag-title" style="display:none;">
+    <div class="welcome-backdrop" onclick="closeSupportNag()"></div>
+    <div class="welcome-card" role="document">
+        <button type="button" class="welcome-x" id="support-nag-close-btn" onclick="closeSupportNag()" aria-label="Close support dialog">&times;</button>
+        <div class="welcome-hero">
+            <span class="welcome-action-ico welcome-ico-heart" aria-hidden="true" style="margin:0 auto 10px;width:48px;height:48px;font-size:24px;">&#9829;</span>
+            <h2 id="support-nag-title">Help keep WolfStack free</h2>
+            <p class="welcome-sub">WolfStack is built by a tiny independent team &mdash; no VC money, no ads, no telemetry, and every feature ships free to everyone. If it's useful to you, please consider chipping in to keep it that way.</p>
+        </div>
+        <div class="welcome-actions">
+            <a class="welcome-action welcome-action-primary" href="https://github.com/sponsors/wolfsoftwaresystemsltd" target="_blank" rel="noopener noreferrer">
+                <span class="welcome-action-ico welcome-ico-heart">&#9829;</span>
+                <span class="welcome-action-txt">
+                    <strong>Become a GitHub Sponsor</strong>
+                    <span>Recurring support from a few dollars a month &mdash; cancel anytime.</span>
+                </span>
+                <span class="welcome-action-arrow">&#8599;</span>
+            </a>
+            <a class="welcome-action" href="https://wolfstack.org/enterprise.php" target="_blank" rel="noopener noreferrer">
+                <span class="welcome-action-ico" style="background:rgba(59,130,246,0.14);color:#60a5fa;">
+                    <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/><path d="m9 12 2 2 4-4"/></svg>
+                </span>
+                <span class="welcome-action-txt">
+                    <strong>Buy a licence plan</strong>
+                    <span>Homelab to Enterprise &mdash; dedicated support, and every licence funds development.</span>
+                </span>
+                <span class="welcome-action-arrow">&#8599;</span>
+            </a>
+        </div>
+        <div class="welcome-foot">
+            <label class="welcome-dontshow-lbl">
+                <input type="checkbox" id="nag-supporting"> I'm supporting already
+            </label>
+            <button type="button" class="welcome-getstarted" onclick="closeSupportNag()">Maybe later</button>
+        </div>
+        <p class="nag-once-note">We're asking for your support &mdash; this appears just once each time you sign in. Already a GitHub or Patreon supporter? Tick <strong>&ldquo;I'm supporting already&rdquo;</strong> and we'll stop asking for good &mdash; we can't auto-verify those, so it's on the honour system.</p>
+    </div>
+</div>
+
 </body>
 
 </html>

web/js/app.js

@@ -52072,24 +52072,106 @@ function dismissLearnBanner() {
     if (el) el.style.display = 'none';
 }
 
-// ── Login welcome modal ──────────────────────────────────────────────
-// Shown once per login: login.html sets a per-login sessionStorage flag on a
-// genuine sign-in (password or passkey), which we consume here on first show
-// — so it does NOT reappear on refresh or in-app navigation within the same
-// session, only on the next login. Ticking "Don't show again" sets a
-// permanent localStorage flag that suppresses it for good. Promotes the
-// Getting Started course, the Discord community, and sponsorship.
+// ── Login-time prompt coordinator ────────────────────────────────────
+// Runs once per fresh login: login.html sets a per-login sessionStorage flag
+// on a genuine sign-in (password or passkey), which we consume here on first
+// show — so neither prompt reappears on refresh or in-app navigation within
+// the same session, only on the next login.
+//
+// Two prompts, never stacked:
+//   • Welcome modal — shown while the operator hasn't ticked "Don't show
+//     again" (permanent localStorage flag). Promotes the Getting Started
+//     course, Discord, and sponsorship.
+//   • Support nag — once the welcome is dismissed for good, non-supporters
+//     (no licence, no paying Patreon pledge, no GitHub Sponsor self-attest)
+//     get a focused, freely-dismissible ask to sponsor or buy a licence.
+//     Supporters see nothing further. Fail-safe: on ANY error we treat the
+//     user as a supporter, so we never nag someone who might be paying.
 const WELCOME_DISMISS_KEY = 'wolfstack_welcome_dismissed';
 const WELCOME_FRESH_KEY = 'wolfstack_fresh_login';
+// Set when the operator ticks "I'm supporting already" — a permanent,
+// offline-proof local guarantee that the support nag never shows again in
+// this browser, complementing the server-side self-attest.
+const NAG_DECLARED_KEY = 'wolfstack_support_declared';
 
-function maybeShowWelcomeModal() {
-    let permanent = false, fresh = false;
-    try { permanent = localStorage.getItem(WELCOME_DISMISS_KEY) === '1'; } catch (_) {}
+async function maybeShowLoginPrompt() {
+    let fresh = false;
     try { fresh = sessionStorage.getItem(WELCOME_FRESH_KEY) === '1'; } catch (_) {}
-    if (permanent || !fresh) return;
-    // Consume the per-login flag so the modal shows once per login only.
+    if (!fresh) return;                              // refresh / in-app nav, not a login
+    // Consume the per-login flag so a prompt shows once per login only.
     try { sessionStorage.removeItem(WELCOME_FRESH_KEY); } catch (_) {}
-    showWelcomeModal();
+
+    let permanent = false;
+    try { permanent = localStorage.getItem(WELCOME_DISMISS_KEY) === '1'; } catch (_) {}
+    // Welcome still active → it shows (and already carries a sponsor ask); don't
+    // pile the nag on top.
+    if (!permanent) { showWelcomeModal(); return; }
+
+    // Welcome dismissed → focused support nag for non-supporters only.
+    // First honour a prior self-declaration ("I'm supporting already") without
+    // a round-trip — this never reappears once they've ticked the box.
+    let declared = false;
+    try { declared = localStorage.getItem(NAG_DECLARED_KEY) === '1'; } catch (_) {}
+    if (declared) return;
+
+    let supporter = true; // fail SAFE: never nag on error / unknown / older binary
+    try {
+        const r = await fetch('/api/supporter/status');
+        if (r.ok) {
+            const d = await r.json();
+            supporter = (d && d.is_supporter !== false);
+        }
+    } catch (_) { supporter = true; }
+    if (!supporter) showSupportNag();
+}
+
+// ── Support nag (non-supporters, once per login) ─────────────────────
+function showSupportNag() {
+    const el = document.getElementById('support-nag');
+    if (!el) return;
+    el.style.display = 'flex';
+    requestAnimationFrame(() => el.classList.add('open'));
+    document.addEventListener('keydown', supportNagEscHandler);
+    const close = document.getElementById('support-nag-close-btn');
+    if (close) { try { close.focus(); } catch (_) {} }
+}
+
+function supportNagEscHandler(e) { if (e.key === 'Escape') closeSupportNag(); }
+
+function closeSupportNag() {
+    const el = document.getElementById('support-nag');
+    if (!el) return;
+    // "I'm supporting already" → cancel permanently. Record locally for an
+    // instant, offline-proof guarantee, AND tell the server (honour-system
+    // self-attest) so it persists across browsers and counts everywhere.
+    const cb = document.getElementById('nag-supporting');
+    if (cb && cb.checked) {
+        try { localStorage.setItem(NAG_DECLARED_KEY, '1'); } catch (_) {}
+        nagDeclareSupport();
+    }
+    el.classList.remove('open');
+    document.removeEventListener('keydown', supportNagEscHandler);
+    setTimeout(() => { el.style.display = 'none'; }, 200);
+}
+
+// Tell the server this install supports WolfStack (honour-system; GitHub's
+// API can't be queried to verify the org's sponsors) so the declaration
+// persists across browsers and the operator counts as a supporter everywhere.
+// Best-effort: NAG_DECLARED_KEY already stops the nag in this browser, so a
+// failure here only means it didn't sync off-device.
+async function nagDeclareSupport() {
+    try {
+        const r = await fetch('/api/sponsor/github', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ enabled: true })
+        });
+        if (!r.ok) throw new Error('HTTP ' + r.status);
+        if (typeof showToast === 'function') showToast('Thanks for supporting WolfStack — we won’t ask again.', 'success');
+    } catch (_) {
+        // Warning toasts must not auto-dismiss — duration 0 keeps it until dismissed.
+        if (typeof showToast === 'function') showToast('Noted on this device — couldn’t sync to the server, so it may reappear on other browsers.', 'warning', 0);
+    }
 }
 
 function showWelcomeModal() {
@@ -52124,7 +52206,7 @@ function welcomeStartCourse() {
     openLearnDrawer();
 }
 
-document.addEventListener('DOMContentLoaded', maybeShowWelcomeModal);
+document.addEventListener('DOMContentLoaded', maybeShowLoginPrompt);
 
 // Build (possibly nested) list HTML from a contiguous run of markdown list
 // lines starting at `start`. Nesting is by leading indentation, so a numbered