@geekity/cms 0.31.0 → 0.32.0

package/dist/admin/settings-fields.js

@@ -0,0 +1,368 @@
+import path from 'node:path';
+import { LANGUAGE_TAG_PATTERN } from '../content/language.js';
+import { isLocationSharing, LOCATION_SHARING } from '../content/location.js';
+import { parseIconSetting } from '../images/icons.js';
+import { sourceFile } from '../images/paths.js';
+import { MAIL_PROVIDERS } from '../mail/provider.js';
+import { isFileSync } from '../util/files.js';
+import { DEFAULT_FEED_CADENCE, isUpdatePeriod, UPDATE_PERIODS } from '../site/feed-settings.js';
+import { isLicenseUrl } from '../content/license.js';
+import { canonicalLocale } from '../content/locale.js';
+import { AI_CRAWLER_POLICIES, robotsRuleLines, robotsRuleProblem } from '../site/robots.js';
+import { taxonomyBaseProblems } from '../content/taxonomy.js';
+import { PACKAGED_THEME, readTheme, themeNameProblem } from '../theme/themes.js';
+import { EMAIL_PATTERN, isAiCrawlerPolicy, isContentSignalChoice, isLicenseChoice, isMailProvider, isPollCount, isValidTimezone, isWholeDays, normalizeBaseUrl, normalizeLanguageList, normalizeRelayInbox, normalizeSecurityContact, normalizeSecurityPolicy, relayLines, relayList, securityContactList, } from '../site/setting-values.js';
+import { DEFAULT_SITE_SETTINGS, SITE } from '../site/settings.js';
+const checkbox = (value) => (value ? '1' : '');
+const ticked = (value) => value !== '';
+const asIs = (value) => value;
+const lines = (value) => value.join('\n');
+const nothingWrong = () => undefined;
+function text(key, field, options = {}) {
+    return {
+        field,
+        submitted: (form) => form[key].trim(),
+        shown: asIs,
+        check: options.check ?? nothingWrong,
+    };
+}
+function flag(key, field) {
+    return {
+        field,
+        submitted: (form) => ticked(form[key]),
+        shown: checkbox,
+        check: nothingWrong,
+    };
+}
+function choice(key, field, guard, fallback, problem) {
+    return {
+        field,
+        submitted: (form) => (guard(form[key]) ? form[key] : fallback),
+        shown: (value) => value,
+        check: (form) => (guard(form[key]) ? undefined : problem),
+    };
+}
+export function requiredWholeDays(typed) {
+    const trimmed = typed.trim();
+    if (trimmed === '')
+        return undefined;
+    const days = Number(trimmed);
+    return isWholeDays(days) ? days : undefined;
+}
+function retention(key, field) {
+    return {
+        field,
+        submitted: (form) => Number(form[key]),
+        shown: String,
+        check: (form) => requiredWholeDays(form[key]) === undefined
+            ? 'Keep it for a whole number of days, or 0 to keep it forever.'
+            : undefined,
+    };
+}
+function contentSignal(key, field) {
+    return choice(key, field, isContentSignalChoice, '', 'A content signal is yes, no, or not said.');
+}
+function list(key, field, parse, check) {
+    return {
+        field,
+        submitted: (form) => parse(form[key]),
+        shown: lines,
+        check,
+    };
+}
+const isCustomLicense = (form) => form.license.trim() === 'custom';
+const PAGE_SLUG_PATTERN = /^[A-Za-z0-9._~-]{1,200}$/;
+function slugProblem(value, what) {
+    const slug = value.trim();
+    return slug === '' || PAGE_SLUG_PATTERN.test(slug)
+        ? undefined
+        : `${what} is the slug of one of the site's pages, such as about.`;
+}
+function iconProblem(icon) {
+    if (icon === '')
+        return undefined;
+    const parsed = parseIconSetting(icon);
+    if (!('problem' in parsed))
+        return undefined;
+    return parsed.problem === 'not-an-upload'
+        ? 'The site icon has to be a file in the media library, a path such as /uploads/2026/10/icon.png.'
+        : 'The site icon has to be an image: PNG, JPEG, GIF, WebP, AVIF, TIFF or SVG.';
+}
+const ICON_UPLOADED = {
+    dir: 'contentDir',
+    problem: (icon, contentDir) => {
+        const parsed = parseIconSetting(icon);
+        if ('problem' in parsed)
+            return undefined;
+        const file = sourceFile({ contentDir }, parsed.source);
+        return file !== undefined && isFileSync(file)
+            ? undefined
+            : `There is no upload at ${icon}. Upload the picture on the Media screen first.`;
+    },
+};
+export function frontPageOf(form) {
+    const homepage = form.homepage.trim();
+    return { homepage, posts_page: homepage === '' ? '' : form.posts_page.trim() };
+}
+export function frontPageProblems(form) {
+    const homepage = form.homepage.trim();
+    return {
+        homepage: slugProblem(homepage, 'A homepage'),
+        posts_page: postsPageProblem(homepage, form.posts_page.trim()),
+    };
+}
+function postsPageProblem(homepage, posts_page) {
+    if (posts_page === '')
+        return undefined;
+    if (homepage === '') {
+        return 'A posts page needs a homepage: pick the page the front page shows first.';
+    }
+    if (posts_page === homepage) {
+        return 'The homepage and the posts page have to be two different pages.';
+    }
+    return slugProblem(posts_page, 'A posts page');
+}
+function frontPageRows() {
+    const row = (key, field) => ({
+        ...text(key, field),
+        submitted: (form) => frontPageOf(form)[key],
+        check: (form) => frontPageProblems(form)[key],
+    });
+    return { homepage: row('homepage', 'homepage'), posts_page: row('posts_page', 'posts_page') };
+}
+function emailCheck(key, problem) {
+    return (form) => form[key].trim() !== '' && !EMAIL_PATTERN.test(form[key].trim()) ? problem : undefined;
+}
+const THEME_INSTALLED = {
+    dir: 'themesDir',
+    problem: (name, themesDir) => {
+        if (name === PACKAGED_THEME)
+            return undefined;
+        const read = readTheme(path.join(themesDir, name));
+        return read.ok ? undefined : `There is no theme called "${name}": ${read.reason}`;
+    },
+};
+const SETTING_ROWS = {
+    title: text('title', 'title', {
+        check: (form) => (form.title.trim() === '' ? 'The site needs a title.' : undefined),
+    }),
+    tagline: text('tagline', 'tagline'),
+    base_url: {
+        field: 'base_url',
+        submitted: (form) => normalizeBaseUrl(form.base_url) ?? '',
+        shown: asIs,
+        check: (form) => normalizeBaseUrl(form.base_url) === undefined
+            ? 'The base URL has to be an absolute http:// or https:// URL.'
+            : undefined,
+    },
+    posts_per_page: {
+        field: 'posts_per_page',
+        submitted: (form) => Number(form.posts_per_page),
+        shown: String,
+        check: (form) => {
+            const perPage = Number(form.posts_per_page);
+            return !Number.isInteger(perPage) || perPage < 1
+                ? 'Posts per page has to be a whole number of one or more.'
+                : undefined;
+        },
+    },
+    timezone: text('timezone', 'timezone', {
+        check: (form) => isValidTimezone(form.timezone)
+            ? undefined
+            : 'That is not an IANA time zone name, such as Europe/London.',
+    }),
+    language: text('language', 'language', {
+        check: (form) => LANGUAGE_TAG_PATTERN.test(form.language.trim())
+            ? undefined
+            : 'That is not a language tag, such as en, en-GB or pt-BR.',
+    }),
+    tag_base: text('tag_base', 'tag_base', {
+        check: (form) => taxonomyBaseProblems({ tag: form.tag_base, category: form.category_base }).tag,
+    }),
+    category_base: text('category_base', 'category_base', {
+        check: (form) => taxonomyBaseProblems({ tag: form.tag_base, category: form.category_base }).category,
+    }),
+    comments: flag('comments', 'comments'),
+    comments_on_posts: flag('comments_on_posts', 'comments_on_posts'),
+    comments_on_pages: flag('comments_on_pages', 'comments_on_pages'),
+    comments_close_after_days: {
+        field: 'comments_close_after_days',
+        submitted: (form) => Number(form.comments_close_after_days),
+        shown: String,
+        check: (form) => {
+            const typed = form.comments_close_after_days.trim();
+            const days = Number(typed);
+            return typed === '' || !Number.isInteger(days) || days < 0
+                ? 'Comments close after a whole number of days, or 0 for never.'
+                : undefined;
+        },
+    },
+    comment_email_retention_days: retention('comment_email_retention_days', 'comment_email_retention_days'),
+    address_hash_retention_days: retention('address_hash_retention_days', 'address_hash_retention_days'),
+    contact_message_retention_days: retention('contact_message_retention_days', 'contact_message_retention_days'),
+    webmentions_send: flag('webmentions_send', 'webmentions_send'),
+    webmentions_receive: flag('webmentions_receive', 'webmentions_receive'),
+    notify_server: {
+        ...text('notify_server', 'notify_server'),
+        submitted: (form) => normalizeBaseUrl(form.notify_server) ?? '',
+        check: (form) => form.notify_server.trim() !== '' && normalizeBaseUrl(form.notify_server) === undefined
+            ? 'A notify server is an absolute http:// or https:// URL, or empty for none.'
+            : undefined,
+    },
+    feed_update_period: choice('feed_update_period', 'feed_update_period', isUpdatePeriod, DEFAULT_FEED_CADENCE.period, `An update period is one of ${UPDATE_PERIODS.join(', ')}.`),
+    feed_update_frequency: {
+        field: 'feed_update_frequency',
+        submitted: (form) => Number(form.feed_update_frequency),
+        shown: String,
+        check: (form) => form.feed_update_frequency.trim() !== '' && isPollCount(Number(form.feed_update_frequency))
+            ? undefined
+            : 'Polls per period is a whole number, 1 or more.',
+    },
+    ai_crawlers: choice('ai_crawlers', 'ai_crawlers', isAiCrawlerPolicy, 'allow', `An AI-crawler policy is one of ${AI_CRAWLER_POLICIES.join(', ')}.`),
+    content_signal_search: contentSignal('content_signal_search', 'content_signal_search'),
+    content_signal_ai_input: contentSignal('content_signal_ai_input', 'content_signal_ai_input'),
+    content_signal_ai_train: contentSignal('content_signal_ai_train', 'content_signal_ai_train'),
+    robots_rules: list('robots_rules', 'robots_rules', (typed) => robotsRuleLines([typed]), (form) => robotsRuleProblem([form.robots_rules])),
+    llms_txt: flag('llms_txt', 'llms_txt'),
+    index_now: flag('index_now', 'index_now'),
+    mail_provider: choice('mail_provider', 'mail_provider', isMailProvider, 'none', `A mail provider is one of ${MAIL_PROVIDERS.join(', ')}.`),
+    mail_from_name: text('mail_from_name', 'mail_from_name'),
+    mail_from_address: text('mail_from_address', 'mail_from_address', {
+        check: emailCheck('mail_from_address', 'A From address is an email address, such as blog@example.com, or empty for the default.'),
+    }),
+    mail_reply_to: text('mail_reply_to', 'mail_reply_to', {
+        check: emailCheck('mail_reply_to', 'A reply-to is an email address, such as hello@example.com, or empty to reply to the From address.'),
+    }),
+    contact_email: text('contact_email', 'contact_email', {
+        check: emailCheck('contact_email', 'A contact address is an email address, such as hello@example.com, or empty for the first admin with one.'),
+    }),
+    security_contacts: list('security_contacts', 'security_contacts', securityContactList, (form) => {
+        const bad = relayLines(form.security_contacts).find((line) => normalizeSecurityContact(line) === undefined);
+        return bad === undefined
+            ? undefined
+            : 'A security contact is an email address, an https:// URL or a tel: number, one per line. ' +
+                `"${bad}" is not one.`;
+    }),
+    // RFC 9116 wants every web URI in the file to be https.
+    security_policy: {
+        ...text('security_policy', 'security_policy'),
+        submitted: (form) => normalizeSecurityPolicy(form.security_policy) ?? '',
+        check: (form) => form.security_policy.trim() !== '' &&
+            normalizeSecurityPolicy(form.security_policy) === undefined
+            ? 'A security policy is an https:// URL, or empty for none.'
+            : undefined,
+    },
+    security_languages: {
+        ...text('security_languages', 'security_languages'),
+        submitted: (form) => normalizeLanguageList(form.security_languages) ?? '',
+        check: (form) => normalizeLanguageList(form.security_languages) === undefined
+            ? 'Preferred languages are language tags separated by commas, such as en, fr, or empty for none.'
+            : undefined,
+    },
+    relays: list('relays', 'relays', relayList, (form) => {
+        const bad = relayLines(form.relays).find((line) => normalizeRelayInbox(line) === undefined);
+        return bad === undefined
+            ? undefined
+            : `A relay is its inbox as an absolute http:// or https:// URL, one per line. ` +
+                `"${bad}" is not one.`;
+    }),
+    location_sharing: choice('location_sharing', 'location_sharing', isLocationSharing, 'none', `Location sharing is one of ${LOCATION_SHARING.join(', ')}.`),
+    ...frontPageRows(),
+    theme: {
+        ...text('theme', 'theme', { check: (form) => themeNameProblem(form.theme) }),
+        onDisk: THEME_INSTALLED,
+    },
+    locale: text('locale', 'locale', {
+        check: (form) => {
+            const locale = form.locale.trim();
+            return locale === '' ||
+                (LANGUAGE_TAG_PATTERN.test(locale) && canonicalLocale(locale) !== undefined)
+                ? undefined
+                : 'That is not a locale, such as en-US, fr-CA or pt-BR, or empty for the language.';
+        },
+    }),
+    author: text('author', 'author'),
+    icon: {
+        ...text('icon', 'icon', { check: (form) => iconProblem(form.icon.trim()) }),
+        onDisk: ICON_UPLOADED,
+    },
+    license: {
+        field: 'license',
+        submitted: (form) => {
+            const choice = form.license.trim();
+            if (!isLicenseChoice(choice) || choice === '')
+                return DEFAULT_SITE_SETTINGS.license;
+            return choice === 'custom'
+                ? { choice, url: form.license_url.trim(), name: form.license_name.trim() }
+                : { choice, url: '', name: '' };
+        },
+        shown: (value) => value.choice,
+        check: (form) => isLicenseChoice(form.license.trim()) ? undefined : 'Choose a license from the list.',
+    },
+};
+const LICENSE_FIELD_ROWS = {
+    license_url: {
+        field: 'license_url',
+        shown: (value) => value.url,
+        check: (form) => isCustomLicense(form) && !isLicenseUrl(form.license_url.trim())
+            ? 'A custom license needs the URL of its terms, starting http:// or https://.'
+            : undefined,
+    },
+    license_name: {
+        field: 'license_name',
+        shown: (value) => value.name,
+        check: (form) => isCustomLicense(form) && form.license_name.trim() === ''
+            ? 'A custom license needs a name for the footer to show.'
+            : undefined,
+    },
+};
+const FORM_ROWS = {
+    ...SETTING_ROWS,
+    ...LICENSE_FIELD_ROWS,
+};
+export const SETTINGS_FIELD_NAMES = Object.keys(FORM_ROWS);
+function perField(value) {
+    return Object.fromEntries(SETTINGS_FIELD_NAMES.map((name) => [name, value(name)]));
+}
+export const SETTINGS_FIELDS = perField((name) => FORM_ROWS[name].field);
+export function settingOf(field) {
+    return field === 'license_url' || field === 'license_name' ? 'license' : field;
+}
+export function settingsProblems(form, fields = SETTINGS_FIELD_NAMES, context = {}) {
+    const problems = {};
+    for (const name of fields) {
+        const problem = FORM_ROWS[name].check(form) ?? onDiskProblem(name, form, context);
+        if (problem !== undefined)
+            problems[name] = problem;
+    }
+    return problems;
+}
+function onDiskProblem(name, form, context) {
+    const onDisk = FORM_ROWS[name].onDisk;
+    if (onDisk === undefined)
+        return undefined;
+    const dir = context[onDisk.dir];
+    return dir === undefined ? undefined : onDisk.problem(form[name].trim(), dir);
+}
+export function submittedSettings(form, fields) {
+    const keys = [...new Set(fields.map(settingOf))];
+    return Object.fromEntries(keys.map((key) => [key, SETTING_ROWS[key].submitted(form)]));
+}
+export function siteChanges(settings) {
+    const changes = new Map();
+    for (const declaration of SITE.declaration.settings) {
+        if (!(declaration.key in settings))
+            continue;
+        const value = settings[declaration.key];
+        changes.set(declaration.key, declaration.type.toJson(value));
+    }
+    return changes;
+}
+function shownSetting(settings, name) {
+    const value = settings[settingOf(name)];
+    return FORM_ROWS[name].shown(value);
+}
+export function formFromSettings(settings) {
+    return perField((name) => shownSetting(settings, name));
+}
+//# sourceMappingURL=settings-fields.js.map

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"settings-general.d.ts","sourceRoot":"","sources":["../../src/admin/settings-general.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAaH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGvD,iCAAiC;AACjC,eAAO,MAAM,gBAAgB,EAAE,YA6D9B,CAAC"}
+{"version":3,"file":"settings-general.d.ts","sourceRoot":"","sources":["../../src/admin/settings-general.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAYH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGvD,iCAAiC;AACjC,eAAO,MAAM,gBAAgB,EAAE,YAoD9B,CAAC"}

package/dist/admin/settings-general.js

@@ -9,11 +9,10 @@
 import { userForAuthor } from '../content/authors.js';
 import { iconSetting, siteIcons } from '../images/icons.js';
 import { effectiveBaseUrl } from '../site/settings.js';
-import { SETTINGS_FIELDS } from '../site/settings-form.js';
-import { readSiteJson } from '../site/site-json.js';
 import { listUsers } from '../site/users.js';
 import { stringOrEmpty } from '../util/forms.js';
 import { CREATIVE_COMMONS_LICENSES } from '../content/license.js';
+import { SETTINGS_FIELDS } from './settings-fields.js';
 import { settingsPagePath } from './settings-page.js';
 import { ADMIN_TEMPLATES } from './templates.js';
 /** The General settings page. */
@@ -26,14 +25,14 @@ export const GENERAL_SETTINGS = {
         'title',
         'tagline',
         'author',
-        'baseUrl',
+        'base_url',
         'timezone',
         'language',
         'locale',
         'icon',
         'license',
-        'licenseUrl',
-        'licenseName',
+        'license_url',
+        'license_name',
     ],
     // The base URL field shows the one in effect rather than the one the file
     // happens to hold: a site.json with no `url` at all would otherwise render an
@@ -45,9 +44,9 @@ export const GENERAL_SETTINGS = {
     // selects Several authors.
     shown: (config, settings) => ({
         ...settings,
-        baseUrl: effectiveBaseUrl(config, settings),
+        base_url: effectiveBaseUrl(config, settings),
         author: siteAuthorUsername(config, settings.author),
-        icon: iconInEffect(config, settings) ?? '',
+        icon: iconInEffect(settings) ?? '',
     }),
     panels: (c, settings) => ({
         ...baseUrlPanel(c.var.config, settings),
@@ -61,29 +60,21 @@ export const GENERAL_SETTINGS = {
             name: user.profile?.displayName ?? user.username,
         })),
     }),
-    // A field the form rendered read-only is not submitted, so an overridden base
-    // URL keeps the value it had rather than being cleared by a save.
-    //
     // The author is whoever the submitted username is, and nobody when it is
     // not a user, so the file only ever holds a username or no author at all.
-    reads: ({ c, body, current }) => ({
+    reads: ({ c, body }) => ({
         author: siteAuthorUsername(c.var.config, stringOrEmpty(body[SETTINGS_FIELDS.author])),
-        baseUrl: c.var.config.baseUrlSource === 'default'
-            ? stringOrEmpty(body[SETTINGS_FIELDS.baseUrl])
-            : current.baseUrl === ''
-                ? c.var.config.baseUrl
-                : current.baseUrl,
     }),
 };
 /** The username a stored or submitted author names, or empty for several authors. */
 function siteAuthorUsername(config, author) {
     return userForAuthor(listUsers(config.dataDir), author)?.username ?? '';
 }
-function iconInEffect(config, settings) {
-    return iconSetting({ icon: settings.icon, avatar: readSiteJson(config.contentDir)['avatar'] });
+function iconInEffect(settings) {
+    return iconSetting({ icon: settings.icon, avatar: settings.avatar });
 }
 function iconPanel(config, settings) {
-    const inEffect = iconInEffect(config, settings);
+    const inEffect = iconInEffect(settings);
     const preview = siteIcons(config, inEffect).find((icon) => icon.rel === 'apple-touch-icon');
     return {
         iconInEffect: inEffect ?? '',

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

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

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

@@ -8,21 +8,14 @@
  * into a screen you can read and a form you can save. A page module describes
  * itself and writes its own template; nothing about how a page is wired lives
  * in the page.
- *
- * The save is the part worth reading twice. A page writes only the fields it
- * carries, and it writes them onto `content/_data/site.json` as re-read inside
- * the atomic update (decision-9), not onto the copy the form was rendered
- * from. So two people saving two different pages at the same moment both land:
- * the second save is applied to what the first one actually wrote, and a
- * setting neither page shows is not even in the picture.
  */
 import type { Context, Hono } from 'hono';
 import type { ResolvedConfig } from '../config.ts';
 import type { GeekityEnv } from '../web/env.ts';
 import type { DeliveryReport } from '../federation/delivery.ts';
 import type { SiteSettings } from '../site/settings.ts';
-import type { SettingsField, SettingsForm } from '../site/settings-form.ts';
 import type { AdminRender } from './documents.ts';
+import type { SettingsField, SettingsForm } from './settings-fields.ts';
 /** What {@link mountSettingsPage} needs from the admin around it. */
 export interface MountSettingsOptions {
     /** The admin's renderer, which injects the chrome, the CSRF token and the flash. */
@@ -64,24 +57,11 @@ export interface SettingsPage {
      */
     shown?: (config: ResolvedConfig, settings: SiteSettings) => SiteSettings;
     /** What the page renders beyond its own fields: a panel, a credential, a list. */
-    panels?: (c: Context<GeekityEnv>, settings: SiteSettings) => Record<string, unknown>;
-    /**
-     * The fields this page does not read straight off the body, because
-     * something other than the form decides them — a field rendered read-only
-     * submits nothing, and a save must not clear it.
-     */
+    panels?: (c: Context<GeekityEnv>, settings: SiteSettings) => Promise<Record<string, unknown>> | Record<string, unknown>;
     reads?: (options: {
         c: Context<GeekityEnv>;
         body: SubmittedBody;
-        current: SiteSettings;
     }) => Partial<SettingsForm>;
-    /**
-     * What a save of this page sets off beyond the file, as the sentence the
-     * flash adds. The side effect stays where the field is: the actor is told
-     * about a profile change on the page the profile is on, and the relays are
-     * reconciled on the page the relay list is on.
-     */
-    saved?: (c: Context<GeekityEnv>, before: SiteSettings, after: SiteSettings) => Promise<string> | string;
     /**
      * The page's own endpoints: a credential, a test message. Each is its own
      * POST so a refused one cannot lose an edit to a field.
@@ -99,16 +79,10 @@ export declare function settingsPagePath(child: string): string;
 /**
  * Register one settings page: the screen, the save, and whatever endpoints of
  * its own it has.
- *
- * Every read is of `content/_data/site.json` as it is at that moment, and a
- * save rewrites it: a page is a view of the file rather than of anything this
- * process remembers (decision-9). A form the page's own validator has anything
- * to say about is a 400 that writes nothing at all and comes back with the
- * problems on the fields that have them.
  */
 export declare function mountSettingsPage(app: Hono<GeekityEnv>, page: SettingsPage, options: MountSettingsOptions): void;
 /** Everything one settings page's template renders. */
-export declare function settingsScreen(c: Context<GeekityEnv>, page: SettingsPage, settings: SiteSettings): Record<string, unknown>;
+export declare function settingsScreen(c: Context<GeekityEnv>, page: SettingsPage, settings: SiteSettings, elsewhere: Readonly<Record<string, string>>): Promise<Record<string, unknown>>;
 /**
  * The sentence a flash adds about the followers, when there were any: a save
  * of the profile is also an announcement, and it should say so rather than

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

@@ -1 +1 @@
-{"version":3,"file":"settings-page.d.ts","sourceRoot":"","sources":["../../src/admin/settings-page.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAOxD,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAG5E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAIlD,qEAAqE;AACrE,MAAM,WAAW,oBAAoB;IACnC,oFAAoF;IACpF,MAAM,EAAE,WAAW,CAAC;CACrB;AAED,iEAAiE;AACjE,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEpD,qDAAqD;AACrD,MAAM,WAAW,YAAY;IAC3B,uEAAuE;IACvE,KAAK,EAAE,MAAM,CAAC;IACd,8BAA8B;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,wEAAwE;IACxE,IAAI,EAAE,MAAM,CAAC;IACb,6DAA6D;IAC7D,QAAQ,EAAE,MAAM,CAAC;IACjB,qEAAqE;IACrE,MAAM,EAAE,SAAS,aAAa,EAAE,CAAC;IACjC;;;OAGG;IACH,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,KAAK,YAAY,CAAC;IACzE,kFAAkF;IAClF,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,YAAY,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrF;;;;OAIG;IACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE;QAChB,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;QACvB,IAAI,EAAE,aAAa,CAAC;QACpB,OAAO,EAAE,YAAY,CAAC;KACvB,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IAC5B;;;;;OAKG;IACH,KAAK,CAAC,EAAE,CACN,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EACtB,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,YAAY,KAChB,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;IAC9B;;;OAGG;IACH,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAC;CAC5E;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EACrB,IAAI,EAAE,YAAY,EAClB,OAAO,EAAE,oBAAoB,GAC5B,IAAI,CA2CN;AAED,uDAAuD;AACvD,wBAAgB,cAAc,CAC5B,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EACtB,IAAI,EAAE,YAAY,EAClB,QAAQ,EAAE,YAAY,GACrB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAiBzB;AA2BD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,cAAc,GAAG,SAAS,GAAG,MAAM,CAMxE"}
+{"version":3,"file":"settings-page.d.ts","sourceRoot":"","sources":["../../src/admin/settings-page.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAWlD,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAoB,MAAM,sBAAsB,CAAC;AAG1F,qEAAqE;AACrE,MAAM,WAAW,oBAAoB;IACnC,oFAAoF;IACpF,MAAM,EAAE,WAAW,CAAC;CACrB;AAED,iEAAiE;AACjE,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEpD,qDAAqD;AACrD,MAAM,WAAW,YAAY;IAC3B,uEAAuE;IACvE,KAAK,EAAE,MAAM,CAAC;IACd,8BAA8B;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,wEAAwE;IACxE,IAAI,EAAE,MAAM,CAAC;IACb,6DAA6D;IAC7D,QAAQ,EAAE,MAAM,CAAC;IACjB,qEAAqE;IACrE,MAAM,EAAE,SAAS,aAAa,EAAE,CAAC;IACjC;;;OAGG;IACH,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,KAAK,YAAY,CAAC;IACzE,kFAAkF;IAClF,MAAM,CAAC,EAAE,CACP,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EACtB,QAAQ,EAAE,YAAY,KACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChE,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE;QAAE,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;QAAC,IAAI,EAAE,aAAa,CAAA;KAAE,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IAC5F;;;OAGG;IACH,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAC;CAC5E;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EACrB,IAAI,EAAE,YAAY,EAClB,OAAO,EAAE,oBAAoB,GAC5B,IAAI,CA8CN;AAED,uDAAuD;AACvD,wBAAsB,cAAc,CAClC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EACtB,IAAI,EAAE,YAAY,EAClB,QAAQ,EAAE,YAAY,EACtB,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAC1C,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAmBlC;AAgCD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,cAAc,GAAG,SAAS,GAAG,MAAM,CAMxE"}