@geekity/cms 0.31.0 → 0.32.1

package/dist/admin/settings-discussion.js

@@ -5,20 +5,21 @@
  * one arriving is a comment by another road, and the spam checker is here
  * because it is what decides whether either is shown.
  */
-import { readAkismetKey, removeAkismetKey, verifyAkismetKey, writeAkismetKey, } from '../comments/akismet.js';
+import { verifyAkismetKey } from '../comments/akismet.js';
+import { AKISMET } from '../settings/akismet.js';
 import { effectiveBaseUrl } from '../site/settings.js';
-import { readSiteSettings } from '../site/site-json.js';
 import { stringOrEmpty } from '../util/forms.js';
 import { flash } from './flash.js';
+import { forgetStored, setElsewhere } from './setting-overrides.js';
 import { SETTINGS_PATH } from './settings.js';
 import { settingsPagePath } from './settings-page.js';
 import { ADMIN_TEMPLATES } from './templates.js';
 /**
  * Where the Akismet key's form and its Remove button post.
  *
- * Its own endpoint, for the reason the avatar has one: the key is a credential
- * that lives in `data/akismet.json` rather than a setting that lives in
- * `content/_data/site.json` (TASK-52), so it is not a field of the Discussion
+ * Its own endpoint, for the reason the avatar has one: the key is a credential,
+ * the secret `akismet.key` setting in `data/akismet.json`, rather than a
+ * setting that lives in `content/_data/site.json` (TASK-52), so it is not a field of the Discussion
  * form, and a key Akismet will not take must not lose an edit to the closing
  * window beside it.
  */
@@ -27,6 +28,7 @@ export const AKISMET_PATH = `${SETTINGS_PATH}/akismet`;
 export const AKISMET_FIELDS = { key: 'akismet_key', action: 'action' };
 /** The {@link AKISMET_FIELDS.action} that forgets the key again. */
 export const AKISMET_REMOVE = 'remove';
+export const AKISMET_VERIFY = 'verify';
 /** The Discussion settings page. */
 export const DISCUSSION_SETTINGS = {
     child: 'discussion',
@@ -35,14 +37,16 @@ export const DISCUSSION_SETTINGS = {
     template: ADMIN_TEMPLATES.settingsDiscussion,
     fields: [
         'comments',
-        'commentsCloseAfterDays',
-        'webmentionsSend',
-        'webmentionsReceive',
-        'commentEmailRetentionDays',
-        'addressHashRetentionDays',
-        'contactMessageRetentionDays',
+        'comments_on_posts',
+        'comments_on_pages',
+        'comments_close_after_days',
+        'webmentions_send',
+        'webmentions_receive',
+        'comment_email_retention_days',
+        'address_hash_retention_days',
+        'contact_message_retention_days',
     ],
-    panels: (c) => akismetPanel(c.var.config.dataDir),
+    panels: (c) => akismetPanel(c.var.settings),
     endpoints: mountAkismet,
 };
 /**
@@ -64,32 +68,54 @@ function mountAkismet(app, _options) {
     const here = DISCUSSION_SETTINGS.path;
     app.post(AKISMET_PATH, async (c) => {
         const body = await c.req.parseBody();
-        const { config } = c.var;
-        if (stringOrEmpty(body[AKISMET_FIELDS.action]) === AKISMET_REMOVE) {
-            await removeAkismetKey(config.dataDir);
+        const { settings } = c.var;
+        const action = stringOrEmpty(body[AKISMET_FIELDS.action]);
+        if (action === AKISMET_REMOVE) {
+            await forgetStored(settings, AKISMET, 'admin');
             flash(c, 'notice', 'The Akismet key is gone. Nothing is sent to Akismet any more.');
             return c.redirect(here, 303);
         }
-        const key = stringOrEmpty(body[AKISMET_FIELDS.key]).trim();
-        if (key === '') {
-            flash(c, 'error', 'An Akismet key cannot be empty. Use Remove key to turn Akismet off.');
-            return c.redirect(here, 303);
+        if (action !== AKISMET_VERIFY) {
+            const key = stringOrEmpty(body[AKISMET_FIELDS.key]).trim();
+            if (key === '') {
+                flash(c, 'error', 'An Akismet key cannot be empty. Use Remove key to turn Akismet off.');
+                return c.redirect(here, 303);
+            }
+            const saved = await settings.set('akismet', new Map([
+                ['key', key],
+                ['status', 'unchecked'],
+                ['checked_at', ''],
+            ]), 'admin');
+            if (!saved.ok) {
+                flash(c, 'error', `${Object.values(saved.problems).join(' ')} Nothing was saved.`);
+                return c.redirect(here, 303);
+            }
         }
-        const blog = effectiveBaseUrl(config, readSiteSettings(config.contentDir));
-        const status = await verifyAkismetKey({ key, blog });
-        await writeAkismetKey(config.dataDir, {
-            key,
-            status,
-            checkedAt: config.now().toISOString(),
+        const status = await verifyAkismetKey({
+            settings,
+            blog: blogOf(c),
+            at: c.var.config.now(),
+            by: 'admin',
         });
-        flash(c, status === 'valid' ? 'notice' : 'error', status === 'valid'
-            ? 'Akismet is connected. Comments and webmentions are checked from now on.'
-            : status === 'invalid'
-                ? 'The key is stored, but Akismet does not recognise it, so nothing it says will be believed.'
-                : 'The key is stored, but Akismet could not be reached to check it. Save it again to try.');
+        flash(c, status === 'valid' ? 'notice' : 'error', verifiedSentence(status));
         return c.redirect(here, 303);
     });
 }
+function blogOf(c) {
+    return effectiveBaseUrl(c.var.config, c.var.siteAtRequestStart);
+}
+function verifiedSentence(status) {
+    switch (status) {
+        case 'valid':
+            return 'Akismet is connected. Comments and webmentions are checked from now on.';
+        case 'invalid':
+            return 'The key is stored, but Akismet does not recognise it, so nothing it says will be believed.';
+        case 'unchecked':
+            return 'The key is stored, but Akismet could not be reached to check it. Save it again to try.';
+        case undefined:
+            return 'There is no Akismet key to check.';
+    }
+}
 /**
  * What the page says about Akismet: connected, refused, unchecked, or off.
  *
@@ -98,31 +124,35 @@ function mountAkismet(app, _options) {
  * last four characters are enough for somebody to recognise which key is in
  * there without being handed it.
  */
-export function akismetPanel(dataDir) {
-    const stored = readAkismetKey(dataDir);
-    if (stored === undefined) {
+export async function akismetPanel(settings) {
+    const akismet = await settings.values(AKISMET);
+    const setBy = (await setElsewhere(settings, AKISMET))['key'];
+    const forms = {
+        akismetUrl: AKISMET_PATH,
+        akismetFields: AKISMET_FIELDS,
+        akismetRemove: AKISMET_REMOVE,
+        akismetVerify: AKISMET_VERIFY,
+        akismetSetBy: setBy,
+    };
+    if (akismet.key === '') {
         return {
-            akismetUrl: AKISMET_PATH,
-            akismetFields: AKISMET_FIELDS,
-            akismetRemove: AKISMET_REMOVE,
+            ...forms,
             akismetPresent: false,
             akismetState: 'none',
             akismetHint: 'Not connected: no key, so no comment is sent to Akismet.',
         };
     }
     return {
-        akismetUrl: AKISMET_PATH,
-        akismetFields: AKISMET_FIELDS,
-        akismetRemove: AKISMET_REMOVE,
+        ...forms,
         akismetPresent: true,
-        akismetState: stored.status,
-        akismetKeyHint: `…${stored.key.slice(-4)}`,
-        akismetCheckedAt: stored.checkedAt,
-        akismetHint: stored.status === 'valid'
+        akismetState: akismet.status,
+        akismetKeyHint: setBy === undefined ? `…${akismet.key.slice(-4)}` : `set by ${setBy}`,
+        akismetCheckedAt: akismet.checked_at,
+        akismetHint: akismet.status === 'valid'
             ? 'Connected. Every comment and every incoming webmention is checked.'
-            : stored.status === 'invalid'
+            : akismet.status === 'invalid'
                 ? 'Akismet does not recognise this key, so nothing it says is believed and every comment queues as it would without one.'
-                : 'Akismet could not be reached the last time this key was checked. Save it again to try.',
+                : 'Akismet could not be reached the last time this key was checked. Check it again to try.',
     };
 }
 //# sourceMappingURL=settings-discussion.js.map

package/dist/admin/settings-discussion.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings-discussion.js","sourceRoot":"","sources":["../../src/admin/settings-discussion.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"settings-discussion.js","sourceRoot":"","sources":["../../src/admin/settings-discussion.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAIjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,aAAa,UAAU,CAAC;AAEvD,yCAAyC;AACzC,MAAM,CAAC,MAAM,cAAc,GAAG,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAW,CAAC;AAEhF,oEAAoE;AACpE,MAAM,CAAC,MAAM,cAAc,GAAG,QAAQ,CAAC;AAEvC,MAAM,CAAC,MAAM,cAAc,GAAG,QAAQ,CAAC;AAEvC,oCAAoC;AACpC,MAAM,CAAC,MAAM,mBAAmB,GAAiB;IAC/C,KAAK,EAAE,YAAY;IACnB,KAAK,EAAE,YAAY;IACnB,IAAI,EAAE,gBAAgB,CAAC,YAAY,CAAC;IACpC,QAAQ,EAAE,eAAe,CAAC,kBAAkB;IAC5C,MAAM,EAAE;QACN,UAAU;QACV,mBAAmB;QACnB,mBAAmB;QACnB,2BAA2B;QAC3B,kBAAkB;QAClB,qBAAqB;QACrB,8BAA8B;QAC9B,6BAA6B;QAC7B,gCAAgC;KACjC;IAED,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC;IAE3C,SAAS,EAAE,YAAY;CACxB,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,SAAS,YAAY,CAAC,GAAqB,EAAE,QAA8B;IACzE,MAAM,IAAI,GAAG,mBAAmB,CAAC,IAAI,CAAC;IAEtC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACjC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;QACrC,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC;QAC3B,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;QAE1D,IAAI,MAAM,KAAK,cAAc,EAAE,CAAC;YAC9B,MAAM,YAAY,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YAC/C,KAAK,CAAC,CAAC,EAAE,QAAQ,EAAE,+DAA+D,CAAC,CAAC;YACpF,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC/B,CAAC;QAED,IAAI,MAAM,KAAK,cAAc,EAAE,CAAC;YAC9B,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC3D,IAAI,GAAG,KAAK,EAAE,EAAE,CAAC;gBACf,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,qEAAqE,CAAC,CAAC;gBACzF,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAC/B,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,GAAG,CAC9B,SAAS,EACT,IAAI,GAAG,CAAkB;gBACvB,CAAC,KAAK,EAAE,GAAG,CAAC;gBACZ,CAAC,QAAQ,EAAE,WAAW,CAAC;gBACvB,CAAC,YAAY,EAAE,EAAE,CAAC;aACnB,CAAC,EACF,OAAO,CACR,CAAC;YACF,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;gBACd,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;gBACnF,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC;YACpC,QAAQ;YACR,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;YACf,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE;YACtB,EAAE,EAAE,OAAO;SACZ,CAAC,CAAC;QACH,KAAK,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;QAC5E,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,MAAM,CAAC,CAAsB;IACpC,OAAO,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAClE,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAoC;IAC5D,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,OAAO;YACV,OAAO,yEAAyE,CAAC;QACnF,KAAK,SAAS;YACZ,OAAO,4FAA4F,CAAC;QACtG,KAAK,WAAW;YACd,OAAO,wFAAwF,CAAC;QAClG,KAAK,SAAS;YACZ,OAAO,mCAAmC,CAAC;IAC/C,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,QAA0B;IAC3D,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC/C,MAAM,KAAK,GAAG,CAAC,MAAM,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAC7D,MAAM,KAAK,GAAG;QACZ,UAAU,EAAE,YAAY;QACxB,aAAa,EAAE,cAAc;QAC7B,aAAa,EAAE,cAAc;QAC7B,aAAa,EAAE,cAAc;QAC7B,YAAY,EAAE,KAAK;KACpB,CAAC;IAEF,IAAI,OAAO,CAAC,GAAG,KAAK,EAAE,EAAE,CAAC;QACvB,OAAO;YACL,GAAG,KAAK;YACR,cAAc,EAAE,KAAK;YACrB,YAAY,EAAE,MAAM;YACpB,WAAW,EAAE,0DAA0D;SACxE,CAAC;IACJ,CAAC;IAED,OAAO;QACL,GAAG,KAAK;QACR,cAAc,EAAE,IAAI;QACpB,YAAY,EAAE,OAAO,CAAC,MAAM;QAC5B,cAAc,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,EAAE;QACrF,gBAAgB,EAAE,OAAO,CAAC,UAAU;QACpC,WAAW,EACT,OAAO,CAAC,MAAM,KAAK,OAAO;YACxB,CAAC,CAAC,oEAAoE;YACtE,CAAC,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS;gBAC5B,CAAC,CAAC,uHAAuH;gBACzH,CAAC,CAAC,yFAAyF;KAClG,CAAC;AACJ,CAAC"}

package/dist/admin/settings-email.d.ts

@@ -2,17 +2,19 @@
  * Email: how the site sends mail, and where a message written to it goes.
  *
  * The settings are here and the credentials are not: an API key and an SMTP
- * password live in `data/mail.json` at mode 0600, never in the public
- * `site.json`, and they are their own pair of forms so a credential typed wrong
- * cannot lose an edit to the From line beside it.
+ * connection are the `mail` settings namespace, kept in `data/mail.json` at
+ * mode 0600 or set by `GEEKITY_MAIL__*`, never in the public `site.json`, and
+ * they are their own pair of forms so a credential typed wrong cannot lose an
+ * edit to the From line beside it.
  */
+import type { SettingsRegistry } from '../settings/types.ts';
 import type { SiteSettings } from '../site/settings.ts';
 import type { SettingsPage } from './settings-page.ts';
 /**
  * Where the mail credential's form and its Remove button post.
  *
  * Its own endpoint for the reason the Akismet key has one: an API key and an
- * SMTP password are credentials, they live in `data/mail.json` rather than in
+ * SMTP password are credentials, they are the `mail` namespace rather than
  * `content/_data/site.json`, and a credential typed wrong must not lose an edit
  * to the From line. Which provider is in use and who mail is from are settings
  * and stay on the Email form.
@@ -46,9 +48,10 @@ export declare const EMAIL_SETTINGS: SettingsPage;
  *
  * Nothing here ever prints a key or a password. A settings screen that echoed
  * one would put a credential in every browser cache, every screenshot and every
- * `view-source`; the last four characters of an API key and the host and user
- * of an SMTP connection are enough for somebody to tell what is stored without
- * being handed the means to use it.
+ * `view-source`; the last four characters of a stored API key and the host and
+ * user of an SMTP connection are enough for somebody to tell what is stored
+ * without being handed the means to use it. A secret the environment sets is
+ * named by its variable and not even that.
  */
-export declare function mailPanel(dataDir: string, settings: SiteSettings): Record<string, unknown>;
+export declare function mailPanel(registry: SettingsRegistry, settings: SiteSettings): Promise<Record<string, unknown>>;
 //# sourceMappingURL=settings-email.d.ts.map

package/dist/admin/settings-email.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings-email.d.ts","sourceRoot":"","sources":["../../src/admin/settings-email.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAaH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAMxD,OAAO,KAAK,EAAwB,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAG7E;;;;;;;;GAQG;AACH,eAAO,MAAM,SAAS,yBAA0B,CAAC;AAEjD,mEAAmE;AACnE,eAAO,MAAM,WAAW;aACtB,WAAW,EAAE,eAAe;aAC5B,QAAQ,EAAE,WAAW;aACrB,QAAQ,EAAE,WAAW;aACrB,UAAU,EAAE,aAAa;aACzB,QAAQ,EAAE,WAAW;aACrB,YAAY,EAAE,eAAe;aAC7B,MAAM,EAAE,QAAQ;CACR,CAAC;AAEX,yEAAyE;AACzE,eAAO,MAAM,WAAW,WAAW,CAAC;AAEpC,8CAA8C;AAC9C,eAAO,MAAM,cAAc,8BAA+B,CAAC;AAE3D,mEAAmE;AACnE,eAAO,MAAM,gBAAgB;aAAK,EAAE,EAAE,IAAI;CAAW,CAAC;AAEtD,2EAA2E;AAC3E,eAAO,MAAM,kBAAkB,SAAS,CAAC;AAEzC,+BAA+B;AAC/B,eAAO,MAAM,cAAc,EAAE,YAmB5B,CAAC;AAmHF;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA2C1F"}
+{"version":3,"file":"settings-email.d.ts","sourceRoot":"","sources":["../../src/admin/settings-email.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAOH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAMxD,OAAO,KAAK,EAAwB,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAG7E;;;;;;;;GAQG;AACH,eAAO,MAAM,SAAS,yBAA0B,CAAC;AAEjD,mEAAmE;AACnE,eAAO,MAAM,WAAW;aACtB,WAAW,EAAE,eAAe;aAC5B,QAAQ,EAAE,WAAW;aACrB,QAAQ,EAAE,WAAW;aACrB,UAAU,EAAE,aAAa;aACzB,QAAQ,EAAE,WAAW;aACrB,YAAY,EAAE,eAAe;aAC7B,MAAM,EAAE,QAAQ;CACR,CAAC;AAEX,yEAAyE;AACzE,eAAO,MAAM,WAAW,WAAW,CAAC;AAEpC,8CAA8C;AAC9C,eAAO,MAAM,cAAc,8BAA+B,CAAC;AAE3D,mEAAmE;AACnE,eAAO,MAAM,gBAAgB;aAAK,EAAE,EAAE,IAAI;CAAW,CAAC;AAEtD,2EAA2E;AAC3E,eAAO,MAAM,kBAAkB,SAAS,CAAC;AAEzC,+BAA+B;AAC/B,eAAO,MAAM,cAAc,EAAE,YAmB5B,CAAC;AA+HF;;;;;;;;;;GAUG;AACH,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,gBAAgB,EAC1B,QAAQ,EAAE,YAAY,GACrB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA4ClC"}

package/dist/admin/settings-email.js

@@ -2,16 +2,17 @@
  * Email: how the site sends mail, and where a message written to it goes.
  *
  * The settings are here and the credentials are not: an API key and an SMTP
- * password live in `data/mail.json` at mode 0600, never in the public
- * `site.json`, and they are their own pair of forms so a credential typed wrong
- * cannot lose an edit to the From line beside it.
+ * connection are the `mail` settings namespace, kept in `data/mail.json` at
+ * mode 0600 or set by `GEEKITY_MAIL__*`, never in the public `site.json`, and
+ * they are their own pair of forms so a credential typed wrong cannot lose an
+ * edit to the From line beside it.
  */
-import { readMailCredentials, removeMailCredentials, writeMailCredentials, } from '../mail/credentials.js';
 import { MAIL_PROVIDERS } from '../mail/provider.js';
+import { MAIL } from '../settings/mail.js';
 import { EMAIL_PATTERN } from '../site/setting-values.js';
-import { readSiteSettings } from '../site/site-json.js';
 import { stringOrEmpty } from '../util/forms.js';
 import { flash } from './flash.js';
+import { forgetStored, setElsewhere } from './setting-overrides.js';
 import { SETTINGS_PATH } from './settings.js';
 import { settingsPagePath } from './settings-page.js';
 import { ADMIN_TEMPLATES } from './templates.js';
@@ -19,7 +20,7 @@ import { ADMIN_TEMPLATES } from './templates.js';
  * Where the mail credential's form and its Remove button post.
  *
  * Its own endpoint for the reason the Akismet key has one: an API key and an
- * SMTP password are credentials, they live in `data/mail.json` rather than in
+ * SMTP password are credentials, they are the `mail` namespace rather than
  * `content/_data/site.json`, and a credential typed wrong must not lose an edit
  * to the From line. Which provider is in use and who mail is from are settings
  * and stay on the Email form.
@@ -50,16 +51,16 @@ export const EMAIL_SETTINGS = {
     path: settingsPagePath('email'),
     template: ADMIN_TEMPLATES.settingsEmail,
     fields: [
-        'mailProvider',
-        'mailFromName',
-        'mailFromAddress',
-        'mailReplyTo',
-        'contactEmail',
-        'securityContacts',
-        'securityPolicy',
-        'securityLanguages',
+        'mail_provider',
+        'mail_from_name',
+        'mail_from_address',
+        'mail_reply_to',
+        'contact_email',
+        'security_contacts',
+        'security_policy',
+        'security_languages',
     ],
-    panels: (c, settings) => mailPanel(c.var.config.dataDir, settings),
+    panels: (c, settings) => mailPanel(c.var.settings, settings),
     endpoints: mountMail,
 };
 /** The mail credential's endpoints: save it, forget it, and prove it works. */
@@ -77,47 +78,27 @@ function mountMail(app, _options) {
      */
     app.post(MAIL_PATH, async (c) => {
         const body = await c.req.parseBody();
-        const { config } = c.var;
-        const stored = readMailCredentials(config.dataDir);
+        const { settings } = c.var;
         if (stringOrEmpty(body[MAIL_FIELDS.action]) === MAIL_REMOVE) {
-            await removeMailCredentials(config.dataDir);
-            flash(c, 'notice', 'The mail credentials are gone. No email is sent any more.');
+            const forgotten = await forgetStored(settings, MAIL, 'admin');
+            if (!forgotten.ok) {
+                flash(c, 'error', `${Object.values(forgotten.problems).join(' ')} Nothing was removed.`);
+                return c.redirect(here, 303);
+            }
+            const elsewhere = Object.entries(await setElsewhere(settings, MAIL));
+            flash(c, 'notice', elsewhere.length === 0
+                ? 'The mail credentials are gone. No email is sent any more.'
+                : `The stored mail credentials are gone. ${elsewhere
+                    .map(([key, source]) => `${source} still sets mail.${key}.`)
+                    .join(' ')}`);
             return c.redirect(here, 303);
         }
-        const apiKey = stringOrEmpty(body[MAIL_FIELDS.brevoApiKey]).trim();
-        const host = stringOrEmpty(body[MAIL_FIELDS.smtpHost]).trim();
-        const port = Number(stringOrEmpty(body[MAIL_FIELDS.smtpPort]).trim());
-        const password = stringOrEmpty(body[MAIL_FIELDS.smtpPassword]);
-        if (host !== '' && (!Number.isInteger(port) || port < 1 || port > 65535)) {
-            flash(c, 'error', 'An SMTP port is a whole number between 1 and 65535. Nothing was saved.');
+        const result = await settings.set('mail', await submittedCredentials(settings, body), 'admin');
+        if (!result.ok) {
+            flash(c, 'error', `${Object.values(result.problems).join(' ')} Nothing was saved.`);
             return c.redirect(here, 303);
         }
-        const credentials = {
-            ...(apiKey === ''
-                ? stored.brevo === undefined
-                    ? {}
-                    : { brevo: stored.brevo }
-                : { brevo: { apiKey } }),
-            ...(host === ''
-                ? stored.smtp === undefined
-                    ? {}
-                    : { smtp: stored.smtp }
-                : {
-                    smtp: {
-                        host,
-                        port,
-                        secure: stringOrEmpty(body[MAIL_FIELDS.smtpSecure]) !== '',
-                        user: stringOrEmpty(body[MAIL_FIELDS.smtpUser]).trim(),
-                        // A blank password keeps the stored one, so the port and the user
-                        // can be edited without retyping a secret the form was never
-                        // allowed to show.
-                        password: password === '' ? (stored.smtp?.password ?? '') : password,
-                    },
-                }),
-        };
-        await writeMailCredentials(config.dataDir, credentials);
-        const settings = readSiteSettings(config.contentDir);
-        flash(c, 'notice', settings.mailProvider === 'none'
+        flash(c, 'notice', c.var.siteAtRequestStart.mail_provider === 'none'
             ? 'Saved. Choose a provider above and save the settings to start sending.'
             : 'Saved. Send a test message to prove it reaches you.');
         return c.redirect(here, 303);
@@ -151,19 +132,50 @@ function mountMail(app, _options) {
         return c.redirect(here, 303);
     });
 }
+async function submittedCredentials(settings, body) {
+    const elsewhere = await setElsewhere(settings, MAIL);
+    const changes = new Map();
+    const typed = (field) => stringOrEmpty(body[field]);
+    const apiKey = typed(MAIL_FIELDS.brevoApiKey).trim();
+    if (apiKey !== '')
+        changes.set('brevo_api_key', apiKey);
+    const host = typed(MAIL_FIELDS.smtpHost).trim();
+    if (host === '' && elsewhere['smtp_host'] === undefined)
+        return changes;
+    const portText = typed(MAIL_FIELDS.smtpPort).trim();
+    const portNumber = Number(portText);
+    const connection = [
+        ['smtp_host', host],
+        ['smtp_port', portText === '' || Number.isNaN(portNumber) ? portText : portNumber],
+        ['smtp_secure', typed(MAIL_FIELDS.smtpSecure) !== ''],
+        ['smtp_user', typed(MAIL_FIELDS.smtpUser).trim()],
+    ];
+    for (const [key, value] of connection) {
+        if (elsewhere[key] === undefined)
+            changes.set(key, value);
+    }
+    const password = typed(MAIL_FIELDS.smtpPassword);
+    if (password !== '')
+        changes.set('smtp_password', password);
+    return changes;
+}
 /**
  * What the page says about email: which provider is chosen, whether the
  * credential it needs is there, and enough of it to recognise which one.
  *
  * Nothing here ever prints a key or a password. A settings screen that echoed
  * one would put a credential in every browser cache, every screenshot and every
- * `view-source`; the last four characters of an API key and the host and user
- * of an SMTP connection are enough for somebody to tell what is stored without
- * being handed the means to use it.
+ * `view-source`; the last four characters of a stored API key and the host and
+ * user of an SMTP connection are enough for somebody to tell what is stored
+ * without being handed the means to use it. A secret the environment sets is
+ * named by its variable and not even that.
  */
-export function mailPanel(dataDir, settings) {
-    const stored = readMailCredentials(dataDir);
-    const present = settings.mailProvider === 'brevo' ? stored.brevo !== undefined : stored.smtp !== undefined;
+export async function mailPanel(registry, settings) {
+    const mail = await registry.values(MAIL);
+    const setBy = await setElsewhere(registry, MAIL);
+    const brevoPresent = mail.brevo_api_key !== '';
+    const smtpPresent = mail.smtp_host !== '';
+    const present = settings.mail_provider === 'brevo' ? brevoPresent : smtpPresent;
     return {
         mailUrl: MAIL_PATH,
         mailFields: MAIL_FIELDS,
@@ -171,33 +183,32 @@ export function mailPanel(dataDir, settings) {
         mailTestUrl: MAIL_TEST_PATH,
         mailTestFields: MAIL_TEST_FIELDS,
         mailProviders: MAIL_PROVIDERS,
-        mailProvider: settings.mailProvider,
+        mailProvider: settings.mail_provider,
+        mailSetBy: setBy,
         // Whether the chosen provider has what it needs. A key stored for the
         // provider that is not chosen is not "configured": nothing would use it.
-        mailConfigured: settings.mailProvider !== 'none' && present,
-        mailBrevoPresent: stored.brevo !== undefined,
-        mailSmtpPresent: stored.smtp !== undefined,
-        ...(stored.brevo === undefined
-            ? {}
-            : { mailBrevoKeyHint: `…${stored.brevo.apiKey.slice(-4)}` }),
-        ...(stored.smtp === undefined
-            ? {}
-            : {
+        mailConfigured: settings.mail_provider !== 'none' && present,
+        mailBrevoPresent: brevoPresent,
+        mailSmtpPresent: smtpPresent,
+        ...(brevoPresent && setBy['brevo_api_key'] === undefined
+            ? { mailBrevoKeyHint: `…${mail.brevo_api_key.slice(-4)}` }
+            : {}),
+        ...(smtpPresent
+            ? {
                 mailSmtp: {
-                    host: stored.smtp.host,
-                    port: stored.smtp.port,
-                    secure: stored.smtp.secure,
-                    user: stored.smtp.user,
-                    // Not the password. Whether there is one at all is all the screen
-                    // needs to say.
-                    hasPassword: stored.smtp.password !== '',
+                    host: mail.smtp_host,
+                    port: mail.smtp_port,
+                    secure: mail.smtp_secure,
+                    user: mail.smtp_user,
+                    hasPassword: mail.smtp_password !== '',
                 },
-            }),
-        mailHint: settings.mailProvider === 'none'
+            }
+            : {}),
+        mailHint: settings.mail_provider === 'none'
             ? 'This site sends no email. Password resets, moderation notices and contact messages are still recorded; they are simply not sent.'
             : present
                 ? 'Mail is configured. Send a test message to prove it reaches you.'
-                : settings.mailProvider === 'brevo'
+                : settings.mail_provider === 'brevo'
                     ? 'Brevo is chosen but there is no API key, so nothing is sent.'
                     : 'SMTP is chosen but there is no server, so nothing is sent.',
     };

package/dist/admin/settings-email.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings-email.js","sourceRoot":"","sources":["../../src/admin/settings-email.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"settings-email.js","sourceRoot":"","sources":["../../src/admin/settings-email.ts"],"names":[],"mappings":"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"}

package/dist/admin/settings-federation.d.ts

@@ -1,13 +1,6 @@
 /**
  * Federation: which relays the site subscribes to.
  *
- * There is nothing else on this page any more. decision-14 replaced the site
- * actor with one actor per user, so the handle, the type and the picture a
- * site used to federate under are a user's profile, edited on the users
- * screen; what is left here is the one setting that is an instruction as well
- * as a value — a line added is a `Follow` to send and a line removed is an
- * `Undo` — so a save of this page reconciles them.
- *
  * It is a settings page filed under Federation rather than under Settings
  * (TASK-109). The admin used to have two menu entries called Federation,
  * neither saying the other existed, and a person looking for the relays had no

package/dist/admin/settings-federation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings-federation.d.ts","sourceRoot":"","sources":["../../src/admin/settings-federation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAKH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGvD,2DAA2D;AAC3D,eAAO,MAAM,mBAAmB,EAAE,YAuBjC,CAAC"}
+{"version":3,"file":"settings-federation.d.ts","sourceRoot":"","sources":["../../src/admin/settings-federation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGvD,2DAA2D;AAC3D,eAAO,MAAM,mBAAmB,EAAE,YAiBjC,CAAC"}

package/dist/admin/settings-federation.js

@@ -1,13 +1,6 @@
 /**
  * Federation: which relays the site subscribes to.
  *
- * There is nothing else on this page any more. decision-14 replaced the site
- * actor with one actor per user, so the handle, the type and the picture a
- * site used to federate under are a user's profile, edited on the users
- * screen; what is left here is the one setting that is an instruction as well
- * as a value — a line added is a `Follow` to send and a line removed is an
- * `Undo` — so a save of this page reconciles them.
- *
  * It is a settings page filed under Federation rather than under Settings
  * (TASK-109). The admin used to have two menu entries called Federation,
  * neither saying the other existed, and a person looking for the relays had no
@@ -31,11 +24,6 @@ export const FEDERATION_SETTINGS = {
     path: FEDERATION_SETTINGS_PATH,
     template: ADMIN_TEMPLATES.federationSettings,
     fields: ['relays'],
-    saved: (c) => {
-        // The reconciliation reads the settings that were just written, so it has
-        // to come after the save rather than be derived from the form.
-        return toldRelays(c.var.relays.sync());
-    },
     endpoints: (app) => {
         // Where this page was until TASK-109. A bookmark points at it, and so do
         // the older editions of the README, so it moves somebody along rather than
@@ -43,28 +31,4 @@ export const FEDERATION_SETTINGS = {
         app.get(settingsPagePath('federation'), (c) => c.redirect(FEDERATION_SETTINGS_PATH, 301));
     },
 };
-/**
- * The sentence a flash adds about the relays a save subscribed to or left.
- *
- * A relay does not answer at once — FEP-ae0c allows a human to approve the
- * subscription days later — so the message says a follow was sent rather than
- * that the site is now on the relay, and points at the screen that will say.
- */
-function toldRelays(report) {
-    const parts = [];
-    if (report.followed.length > 0) {
-        parts.push(report.followed.length === 1
-            ? 'A follow has been sent to one new relay'
-            : `Follows have been sent to ${String(report.followed.length)} new relays`);
-    }
-    if (report.unfollowed.length > 0) {
-        parts.push(report.unfollowed.length === 1
-            ? 'one relay has been unfollowed'
-            : `${String(report.unfollowed.length)} relays have been unfollowed`);
-    }
-    if (parts.length === 0)
-        return '';
-    const sentence = parts.join(', and ');
-    return ` ${sentence.charAt(0).toUpperCase()}${sentence.slice(1)}; the Followers screen says where each stands.`;
-}
 //# sourceMappingURL=settings-federation.js.map

package/dist/admin/settings-federation.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings-federation.js","sourceRoot":"","sources":["../../src/admin/settings-federation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAGH,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,2DAA2D;AAC3D,MAAM,CAAC,MAAM,mBAAmB,GAAiB;IAC/C,OAAO,EAAE,YAAY;IACrB,KAAK,EAAE,UAAU;IACjB,wEAAwE;IACxE,uEAAuE;IACvE,KAAK,EAAE,UAAU;IACjB,OAAO,EAAE,YAAY;IACrB,IAAI,EAAE,wBAAwB;IAC9B,QAAQ,EAAE,eAAe,CAAC,kBAAkB;IAC5C,MAAM,EAAE,CAAC,QAAQ,CAAC;IAElB,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE;QACX,0EAA0E;QAC1E,+DAA+D;QAC/D,OAAO,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE;QACjB,yEAAyE;QACzE,2EAA2E;QAC3E,6CAA6C;QAC7C,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC,CAAC;IAC5F,CAAC;CACF,CAAC;AAEF;;;;;;GAMG;AACH,SAAS,UAAU,CAAC,MAAuB;IACzC,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC/B,KAAK,CAAC,IAAI,CACR,MAAM,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;YAC1B,CAAC,CAAC,yCAAyC;YAC3C,CAAC,CAAC,6BAA6B,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,aAAa,CAC7E,CAAC;IACJ,CAAC;IACD,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjC,KAAK,CAAC,IAAI,CACR,MAAM,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC;YAC5B,CAAC,CAAC,+BAA+B;YACjC,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,8BAA8B,CACtE,CAAC;IACJ,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAElC,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACtC,OAAO,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,gDAAgD,CAAC;AAClH,CAAC"}
+{"version":3,"file":"settings-federation.js","sourceRoot":"","sources":["../../src/admin/settings-federation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,2DAA2D;AAC3D,MAAM,CAAC,MAAM,mBAAmB,GAAiB;IAC/C,OAAO,EAAE,YAAY;IACrB,KAAK,EAAE,UAAU;IACjB,wEAAwE;IACxE,uEAAuE;IACvE,KAAK,EAAE,UAAU;IACjB,OAAO,EAAE,YAAY;IACrB,IAAI,EAAE,wBAAwB;IAC9B,QAAQ,EAAE,eAAe,CAAC,kBAAkB;IAC5C,MAAM,EAAE,CAAC,QAAQ,CAAC;IAElB,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE;QACjB,yEAAyE;QACzE,2EAA2E;QAC3E,6CAA6C;QAC7C,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC,CAAC;IAC5F,CAAC;CACF,CAAC"}