Merge pull request 'release: seed the demo's NPC profiles, factions and chat styles (v0.6.1)' (#66) from edge into main

Reviewed-on: #66

ci/core-ref.json

@@ -1,6 +1,6 @@
 {
-  "$comment": "The core this module is proved against. MODULE_API.md §5.3: the frozen-manifest job clones RunicGateway/website at this exact ref, drops this module in as modules/rust and runs CORE's own routeManifest.js — nothing else can answer whether the URLs the module claims are the URLs it actually serves, because a mount prefix is a string in server/index.js and a documented path is a string in a JSON file, and whether those name the same URL is a fact about a running core. It also answers the blind spot phase 1 had to check by hand: core mounts several routes at the TIER ROOT (/status, /version), which the loader's collision probe cannot see, so /rust being free is asserted here by a core rather than by a reading. Pinned rather than tracking a branch on purpose: core moves for reasons that have nothing to do with this module, and a bump is then a deliberate commit saying which core the module was last proved against, instead of an unexplained red X on someone else's PR. Bump it, regenerate routes.manifest.json, and commit both together. This module needs MODULE_API 1.10.0 (module.json's coreApi is ^1.10.0), which the Event System cutover put on `main` — so unlike Module-uo, which spent the Event System window pinned to `edge`, this repo starts pinned to `main` and should stay there unless it comes to depend on a contract member that has not shipped yet. **2026-09-27, protocol 13 step 2:** this module calls ctx.events.expired (MODULE_API 1.11.0, PLAN_FIXES D183), so coreApi is ^1.11.0. It was pinned to website#209's branch head while that PR was open — a 1.10.0 core refuses to load it — and is back on `main` at the sha #209 merged as. **2026-10-12, protocol 14 (PLAN_REDESIGNS §2):** this module registers an event template and declares param durations, a lease value example and option notes (MODULE_API 1.13.0), so coreApi is ^1.13.0. It was pinned to website#212's branch head while that PR was open, and is back on `main` at the sha #212 merged as (the same tree). **2026-10-12, PLAN_REDESIGNS §12 (permission rewards):** this module declares a param with multiple: true (MODULE_API 1.14.0), so coreApi is ^1.14.0. It was pinned to website#213's branch head while that PR was open, and is back on `main` at the sha #213 merged as (the same tree). **2026-10-15, PLAN_REDESIGNS §14.3.4 (Dangerous Treasures):** the Start a Dangerous Treasures event step answers DT's warm-up with retryAfterMs (MODULE_API 1.15.0, D371), so coreApi is ^1.15.0, pinned to `main` at the sha website#215 merged as. **2026-10-19, Steam sign-in (PLAN_REDESIGNS §15, D392/D396):** this module registers onIdentityLinking and onIdentityLinked (MODULE_API 1.17.0), so coreApi is ^1.17.0. Pinned to the head of website feat/steam-signin while that PR is open — a 1.16.0 core refuses to load it — and is now on `edge` at the sha website#218 merged as. That is `edge`, not `main`, because #218 went into `edge` for the in-progress cutover. **2026-10-22, the cutover (PLAN_LAST_FIXES stage 6):** website#220 put `edge` on `main`, so this is back on `main` at the sha #220 merged as. That tree adds the last fixes' core half (website#219, no MODULE_API bump), whose only route changes are core's own event routes, so routes.manifest.json does not change. **2026-10-26, the public demo (DEMO_MODE.md §3.4, §3.5, DM18):** this module declares demoLocks, reads ctx.demoMode, registers onDemoSeed (MODULE_API 1.18.0) and gives its two console-command actions demoRefuses (1.19.0), so coreApi is ^1.19.0. It was pinned to the head of website feature/demo-step-refusal (website#224) while that PR was open — a 1.18.0 core never asks demoRefuses — and is back on `main` at the sha #224 merged as (the same tree, so routes.manifest.json does not change). **2026-10-30, account deletion (ACCOUNT_DELETION.md §4.4):** this module registers onUserDeleting (MODULE_API 1.20.0), so coreApi is ^1.20.0, pinned to `main` at the sha website#232 merged as.",
+  "$comment": "The core this module is proved against. MODULE_API.md §5.3: the frozen-manifest job clones RunicGateway/website at this exact ref, drops this module in as modules/rust and runs CORE's own routeManifest.js — nothing else can answer whether the URLs the module claims are the URLs it actually serves, because a mount prefix is a string in server/index.js and a documented path is a string in a JSON file, and whether those name the same URL is a fact about a running core. It also answers the blind spot phase 1 had to check by hand: core mounts several routes at the TIER ROOT (/status, /version), which the loader's collision probe cannot see, so /rust being free is asserted here by a core rather than by a reading. Pinned rather than tracking a branch on purpose: core moves for reasons that have nothing to do with this module, and a bump is then a deliberate commit saying which core the module was last proved against, instead of an unexplained red X on someone else's PR. Bump it, regenerate routes.manifest.json, and commit both together. This module needs MODULE_API 1.10.0 (module.json's coreApi is ^1.10.0), which the Event System cutover put on `main` — so unlike Module-uo, which spent the Event System window pinned to `edge`, this repo starts pinned to `main` and should stay there unless it comes to depend on a contract member that has not shipped yet. **2026-09-27, protocol 13 step 2:** this module calls ctx.events.expired (MODULE_API 1.11.0, PLAN_FIXES D183), so coreApi is ^1.11.0. It was pinned to website#209's branch head while that PR was open — a 1.10.0 core refuses to load it — and is back on `main` at the sha #209 merged as. **2026-10-12, protocol 14 (PLAN_REDESIGNS §2):** this module registers an event template and declares param durations, a lease value example and option notes (MODULE_API 1.13.0), so coreApi is ^1.13.0. It was pinned to website#212's branch head while that PR was open, and is back on `main` at the sha #212 merged as (the same tree). **2026-10-12, PLAN_REDESIGNS §12 (permission rewards):** this module declares a param with multiple: true (MODULE_API 1.14.0), so coreApi is ^1.14.0. It was pinned to website#213's branch head while that PR was open, and is back on `main` at the sha #213 merged as (the same tree). **2026-10-15, PLAN_REDESIGNS §14.3.4 (Dangerous Treasures):** the Start a Dangerous Treasures event step answers DT's warm-up with retryAfterMs (MODULE_API 1.15.0, D371), so coreApi is ^1.15.0, pinned to `main` at the sha website#215 merged as. **2026-10-19, Steam sign-in (PLAN_REDESIGNS §15, D392/D396):** this module registers onIdentityLinking and onIdentityLinked (MODULE_API 1.17.0), so coreApi is ^1.17.0. Pinned to the head of website feat/steam-signin while that PR is open — a 1.16.0 core refuses to load it — and is now on `edge` at the sha website#218 merged as. That is `edge`, not `main`, because #218 went into `edge` for the in-progress cutover. **2026-10-22, the cutover (PLAN_LAST_FIXES stage 6):** website#220 put `edge` on `main`, so this is back on `main` at the sha #220 merged as. That tree adds the last fixes' core half (website#219, no MODULE_API bump), whose only route changes are core's own event routes, so routes.manifest.json does not change. **2026-10-26, the public demo (DEMO_MODE.md §3.4, §3.5, DM18):** this module declares demoLocks, reads ctx.demoMode, registers onDemoSeed (MODULE_API 1.18.0) and gives its two console-command actions demoRefuses (1.19.0), so coreApi is ^1.19.0. It was pinned to the head of website feature/demo-step-refusal (website#224) while that PR was open — a 1.18.0 core never asks demoRefuses — and is back on `main` at the sha #224 merged as (the same tree, so routes.manifest.json does not change).",
   "repo": "https://gitea.whitlocktech.com/RunicGateway/website.git",
-  "ref": "7bd93b8bb0da734a642587f256d10c523ca39bea",
-  "refName": "website main @ website#232 merge, MODULE_API 1.20.0"
+  "ref": "69998ec54854d46681def92985a2b299ee3582a6",
+  "refName": "website main @ website#224 merge, MODULE_API 1.19.0"
 }

engagement-triggers.json

@@ -1,6 +1,6 @@
 {
   "_comment": "Generated freeze of module-rust's engagement contract (docs/modules/rust/PLAN.md §25). Regenerate with `npm run engagement:manifest` in server/. A renamed variable, a changed type or a widened ceiling breaks stored templates and rules, so the diff here is the review signal.",
-  "coreApi": "^1.20.0",
+  "coreApi": "^1.19.0",
   "triggers": [
     {
       "id": "rust.base.destroyed",

module.json

@@ -2,7 +2,7 @@
   "id": "rust",
   "name": "Rust",
   "version": "0.1.0",
-  "coreApi": "^1.20.0",
+  "coreApi": "^1.19.0",
   "server": "server/index.js",
   "client": { "entry": "client/dist/entry.js" },
   "schema": "server/db/schema.sql",
@@ -16,7 +16,6 @@
   "capabilities": ["rust", "servers", "killfeed", "leaderboard", "presence", "wipes", "identity", "map"],
   "demoLocks": [
     { "method": "PUT", "path": "/admin/rust/servers/:id" },
-    { "method": "DELETE", "path": "/admin/rust/servers/:id" },
-    { "method": "DELETE", "path": "/player/rust/links/:steamId" }
+    { "method": "DELETE", "path": "/admin/rust/servers/:id" }
   ]
 }

server/demo.js

@@ -1,13 +1,9 @@
 // ── The public demo's module-side locks (DEMO_MODE.md §3.4, §3.5) ──────────
 //
-// Core locks this module's two rig-link routes and the player's Steam unlink by
-// `demoLocks` in module.json. What a route list cannot express lives here, behind
-// `ctx.demoMode` (MODULE_API 1.18.0), and every handler that enforces one of these
-// asks this file:
+// Core locks this module's two link routes by `demoLocks` in module.json. What a
+// route list cannot express lives here, behind `ctx.demoMode` (MODULE_API
+// 1.18.0), and every handler that enforces one of these asks this file:
 //
-//   the staff Steam unlink on Admin → Users (step-5 walk, W4): it serves under
-//     core's users mount, which a module's demoLocks may not name, so its handler
-//     refuses instead. The demo player's seeded link stays put either way;
 //   the console-command deny list (§3.4, DM11): the commands that would break
 //     the rig for every visitor until the next wipe. Asked at save, through
 //     core's `demoRefuses` hook (1.19.0, DM18), and again at run;

server/index.js

@@ -168,13 +168,6 @@ module.exports = function register(ctx, api) {
   api.onIdentityLinking(links.checkSteamSignin)
   api.onIdentityLinked(links.linkFromSteamSignin)
 
-  // Account deletion (MODULE_API 1.20.0; ACCOUNT_DELETION.md §4.4, AD10). Core
-  // asks before the users row goes: every Steam id the account holds is unlinked
-  // through the player's own unlink, and the permission sync is marked dirty so
-  // the withdrawn grants reach the game on the next tick. It cannot stop the
-  // deletion, and never waits on a game.
-  api.onUserDeleting(links.unlinkForDeletion)
-
   // The public demo's seed (MODULE_API 1.18.0, DM15): the rig's server row and
   // demo-player's Steam link, written by this module from its part of the
   // fixture. Called only by `npm run seed:demo` on a DEMO_MODE deployment. The

server/model/links/links.model.js

@@ -19,7 +19,6 @@
 const core = require('../../core')
 const db = require('./links.db')
 const engagement = require('../../engagement/emit')
-const permissionsDb = require('../permissions/permissions.db')
 const servers = require('../servers/servers.model')
 const serversDb = require('../servers/servers.db')
 const sidecar = require('../../sidecarClient')
@@ -352,47 +351,6 @@ async function linkFromSteamSignin({ userId, provider, subject, displayName }) {
   engagement.linked({ userId, steamId, name: displayName || null })
 }
 
-// ── The website account is being deleted (MODULE_API 1.20.0) ──────────────
-//
-// ACCOUNT_DELETION.md §4.4. Core asks before the users row goes, while the
-// person's links can still be read (AD10). The cascade on `rust_account_links`
-// would remove the rows anyway; calling the real unlink keeps what a cascade
-// skips — the `rust.account.unlink` entry staff read and the prompt Teams
-// re-sync — so the game sees exactly what a player's own unlink produces.
-
-/**
- * Core's `api.onUserDeleting`: unlink every Steam id this account holds.
- *
- * The same `unlinkOwned` the player's Rust page calls, one link at a time, each
- * logged as `rust.account.unlink` with `reason: 'account deleted'`. Then every
- * server's permission sync is marked dirty: the desired set reaches a grant's
- * Steam id through the link, so with the links gone the grants have already
- * left it, and the next tick pushes the withdrawal instead of waiting for the
- * digest check.
- *
- * Nothing here waits on a game. The link is the site's own record and the plugin
- * keeps none (the header above), so there is never pending work: what this does
- * not finish, the cascade does.
- */
-async function unlinkForDeletion({ userId, deletedBy }) {
-  const held = await db.listForUser(userId)
-  let removed = 0
-  for (const row of held) {
-    // eslint-disable-next-line no-await-in-loop
-    if (await unlinkOwned(row.steamId, userId)) {
-      removed += 1
-      // eslint-disable-next-line no-await-in-loop
-      await core.activity.log({
-        userId,
-        action: 'rust.account.unlink',
-        detail: { steamId: row.steamId, reason: 'account deleted', deletedBy },
-      })
-    }
-  }
-  if (removed > 0) await permissionsDb.markDirty(null)
-  log.info('rust links removed before an account was deleted', { userId, deletedBy, removed })
-}
-
 /** The admin panel's read: every link this user holds, with per-server totals. */
 async function forAdmin(userId) {
   const links = await db.listForUserWithPlayer(userId)
@@ -435,6 +393,5 @@ module.exports = {
   unlinkFromGame,
   checkSteamSignin,
   linkFromSteamSignin,
-  unlinkForDeletion,
   forAdmin,
 }

server/router/admin/usersRust.controller.js

@@ -8,7 +8,6 @@
 const crypto = require('node:crypto')
 
 const core = require('../../core')
-const demo = require('../../demo')
 
 const backpacks = require('../../model/backpacks/backpacks.model')
 const economics = require('../../model/economics/economics.model')
@@ -55,10 +54,6 @@ async function removeLink(req, res) {
   const { steamId } = req.params
   const userId = req.params.id
 
-  // On the demo the player's own unlink is locked by demoLocks; this route serves
-  // under core's users mount, which a module may not lock by route, so it asks here.
-  if (demo.isDemo()) return demo.refuse(res)
-
   try {
     const removed = await links.unlinkOwned(steamId, userId)
 

server/test/_fakes.js

@@ -173,8 +173,6 @@ function fakeApi() {
     onIdentityLinked(fn) { once('onIdentityLinked'); record.hooks.onIdentityLinked = fn },
     // MODULE_API 1.18.0 (the public demo's seed, DM15).
     onDemoSeed(fn) { once('onDemoSeed'); record.hooks.onDemoSeed = fn },
-    // MODULE_API 1.20.0 (account deletion, ACCOUNT_DELETION.md §4.4).
-    onUserDeleting(fn) { once('onUserDeleting'); record.hooks.onUserDeleting = fn },
   }
   api.record = record
   return api

server/test/demo.test.js

@@ -447,44 +447,11 @@ test('the seed sets the faction table, saves each profile, and styles each group
 
 // ── The manifest (§3.2) ────────────────────────────────────────────────────
 
-test('module.json locks the two rig-link routes and the player Steam unlink, and needs a core that asks demoRefuses', () => {
+test('module.json locks the two link routes and needs a core that asks demoRefuses', () => {
   const manifest = require('../../module.json')
   assert.deepEqual(manifest.demoLocks, [
     { method: 'PUT', path: '/admin/rust/servers/:id' },
     { method: 'DELETE', path: '/admin/rust/servers/:id' },
-    { method: 'DELETE', path: '/player/rust/links/:steamId' },
   ])
-  // A floor, not an exact value: later contract members raise it (1.20.0 for
-  // account deletion), and what this test holds is that it never drops below the
-  // core that asks demoRefuses.
-  const [major, minor] = manifest.coreApi.replace(/^\^/, '').split('.').map(Number)
-  assert.ok(major === 1 && minor >= 19, `coreApi ${manifest.coreApi} is at least ^1.19.0`)
-})
-
-// ── The staff Steam unlink (W4) ────────────────────────────────────────────
-
-test('staff cannot sever a Steam link on the demo, and the link is never touched', async () => {
-  for (const demoMode of [true, false]) {
-    withCore({ demo: demoMode })
-    const links = require('../model/links/links.model')
-    const asked = []
-    links.unlinkOwned = async (steamId, userId) => {
-      asked.push([steamId, userId])
-      return true
-    }
-    const res = fakeRes()
-    await require('../router/admin/usersRust.controller').removeLink(
-      { params: { id: '3', steamId: '76561190000000001' }, user: { id: 1 } },
-      res,
-    )
-    if (demoMode) {
-      assert.equal(res.statusCode, 403)
-      assert.equal(res.body.code, 'DEMO_LOCKED')
-      assert.deepEqual(asked, [])
-    } else {
-      assert.equal(res.statusCode, 200)
-      assert.deepEqual(res.body, { unlinked: true })
-      assert.deepEqual(asked, [['76561190000000001', '3']])
-    }
-  }
+  assert.equal(manifest.coreApi, '^1.19.0')
 })

server/test/entry.test.js

@@ -92,12 +92,6 @@ test('registers both identity hooks, so a Steam sign-in link is a Rust link (D39
   assert.strictEqual(api.record.hooks.onIdentityLinked, links.linkFromSteamSignin)
 })
 
-test('registers the account-deletion hook, so a deleted account is unlinked first (AD10)', () => {
-  const { api } = register()
-  const links = require('../model/links/links.model')
-  assert.strictEqual(api.record.hooks.onUserDeleting, links.unlinkForDeletion)
-})
-
 test('the manifest declares what the loader requires', () => {
   assert.match(manifest.id, /^[a-z][a-z0-9-]{1,31}$/)
   assert.match(manifest.version, /^\d+\.\d+\.\d+/)

server/test/links.test.js

@@ -472,42 +472,6 @@ test('the linked hook writes nothing for a link that is already there, or for an
   assert.equal(ctx.teams.reconcile.calls.length, 0)
 })
 
-// ── The website account is being deleted (MODULE_API 1.20.0, AD10) ─────────
-
-test('a deleted account loses every Steam link through the player’s own unlink, each logged', async () => {
-  const { ctx, queries } = withCore({ select: [[{ steamId: '7656', userId: 4 }, { steamId: STEAM, userId: 4 }]] })
-  const links = require('../model/links/links.model')
-
-  await links.unlinkForDeletion({ userId: 4, deletedBy: 'self' })
-
-  // The same statement `unlinkOwned` uses, scoped by user, once per link.
-  const dels = queries.filter((q) => q.sql.trim().toUpperCase().startsWith('DELETE'))
-  assert.deepEqual(dels.map((q) => q.params), [['7656', 4], [STEAM, 4]])
-
-  // What a cascade would skip: one entry per link, and the Teams re-sync.
-  assert.deepEqual(ctx.activity.log.calls.map((c) => c[0]), [
-    { userId: 4, action: 'rust.account.unlink', detail: { steamId: '7656', reason: 'account deleted', deletedBy: 'self' } },
-    { userId: 4, action: 'rust.account.unlink', detail: { steamId: STEAM, reason: 'account deleted', deletedBy: 'self' } },
-  ])
-  assert.equal(ctx.teams.reconcile.calls.length, 2)
-
-  // Every server is marked dirty, so the withdrawn grants go on the next tick.
-  const dirty = queries.filter((q) => /UPDATE rust_perm_sync SET dirty = 1/.test(q.sql))
-  assert.equal(dirty.length, 1)
-  assert.ok(!/WHERE/.test(dirty[0].sql), 'the whole fleet, not one server')
-})
-
-test('an account with no Steam link deletes without touching the game or the sync', async () => {
-  const { ctx, queries } = withCore({ select: [[]] })
-  const links = require('../model/links/links.model')
-
-  await links.unlinkForDeletion({ userId: 4, deletedBy: 'staff' })
-
-  assert.equal(queries.filter((q) => !q.sql.trim().toUpperCase().startsWith('SELECT')).length, 0)
-  assert.equal(ctx.activity.log.calls.length, 0)
-  assert.equal(ctx.teams.reconcile.calls.length, 0)
-})
-
 test('a /link that lands between core’s check and the hook keeps its link; the hook does not throw', async () => {
   const dup = Object.assign(new Error('dup'), { code: 'ER_DUP_ENTRY' })
   const { ctx } = withCore({ select: [[]], onInsert: () => Promise.reject(dup) })