@geekity/cms 0.29.0 → 0.31.0

package/dist/comments/intake.d.ts

@@ -0,0 +1,147 @@
+import type { PostComment } from '../store/admin-store.ts';
+import type { CommentRecords } from './records.ts';
+import type { CommentChecker } from '../forms/checker.ts';
+/**
+ * The one door into a post's comments.
+ *
+ * Two things write comments — the form under a post and the webmention
+ * endpoint — and both go through {@link intakeComment}, which is the whole of
+ * what happens between a proposed comment and a comment existing: the address
+ * hashed, the approved-author rule, the {@link CommentChecker}, one
+ * verdict-to-status rule, the write, and the message to whoever was waiting to
+ * hear. What the callers keep is what is really theirs — parsing a form and its
+ * cheap defences, and fetching and verifying a source.
+ */
+/** Who is proposing a comment, which is the one thing the rules differ on. */
+export type CommentOrigin = 
+/** Somebody filled in the form under a post (doc-6). */
+'form'
+/** Another page said it links here, and it was verified (doc-7). */
+ | 'webmention';
+/**
+ * A comment as its writer proposes it: everything but the three things the
+ * intake decides — its name, where it stands, and where it came from.
+ */
+export type ProposedComment = Omit<PostComment, 'id' | 'status' | 'addressHash'>;
+/**
+ * Whoever is told about a comment that has just been written.
+ *
+ * Structural rather than the notifier's own type, so this module does not have
+ * to know how a message is rendered or sent; `CommentNotifier` satisfies it.
+ */
+export interface CommentNotices {
+    /** Something is waiting for a moderator. */
+    pending(comment: PostComment): void;
+    /** A reply is on the page, so whoever it answers may want to know. */
+    replyApproved(reply: PostComment): void;
+}
+/** What {@link intakeComment} needs around a proposed comment. */
+export interface IntakeCommentOptions {
+    /** The files it is written into, and the index over them. */
+    records: CommentRecords;
+    /** Who is proposing it. */
+    origin: CommentOrigin;
+    /** The comment itself, as its writer proposes it. */
+    comment: ProposedComment;
+    /**
+     * The post, as a checker is told it.
+     *
+     * The URL is passed rather than derived because the two callers know
+     * different truths about it: a form knows the post's permalink against the
+     * site's base URL, and a webmention knows the exact target its sender named.
+     */
+    post?: {
+        title: string;
+        url: string;
+    } | undefined;
+    /** Where the address salt lives. */
+    dataDir: string;
+    /** The site's public origin. */
+    baseUrl: string;
+    /** The checker, when the site named one. */
+    checker?: CommentChecker | undefined;
+    /** Who to tell, when there is anybody to tell (TASK-55). */
+    notices?: CommentNotices | undefined;
+    /** Where the submission came from, **unhashed**. Only the checker sees it. */
+    address?: string | undefined;
+    /** The `User-Agent` it arrived with, for the checker. */
+    userAgent?: string | undefined;
+    /** The `Referer` it arrived with, for the checker. */
+    referrer?: string | undefined;
+    /** Where a checker that will not answer is reported. Defaults to `console`. */
+    logger?: {
+        warn(message: string): void;
+    } | undefined;
+}
+/** What became of one proposed comment. */
+export type CommentIntakeOutcome = 
+/**
+ * It is in the file. `created` says whether it is new: a page re-sending its
+ * webmention rewrites the entry it already made, which is not news.
+ */
+{
+    readonly kind: 'stored';
+    readonly comment: PostComment;
+    readonly created: boolean;
+}
+/**
+ * Nothing was stored, because a checker said to throw it away. `removed`
+ * says whether it took a webmention this site was already holding with it.
+ */
+ | {
+    readonly kind: 'discarded';
+    readonly removed: boolean;
+}
+/** The entry it was going to rewrite went while this was deciding. */
+ | {
+    readonly kind: 'gone';
+};
+/**
+ * The one door into `content/_data/comments/`.
+ *
+ * Everything between a proposed comment and a comment existing happens here,
+ * so the form, the webmention endpoint and the admin screen cannot drift into
+ * three different answers to the same four questions.
+ *
+ * **Where the site would put it, before anybody judged it.** A form comment
+ * whose name and email together have been approved before is approved again —
+ * WordPress's rule, and the whole of the auto-approval decision. A webmention
+ * waits, because a page linking here is as much a stranger's words as a form
+ * submission is.
+ *
+ * **What the checker says.** Everything goes through {@link CommentChecker}; a
+ * checker that is down or throws is no opinion, so a service having a bad
+ * afternoon never stops a site taking comments.
+ *
+ * **The one verdict-to-status rule.**
+ *
+ * | Verdict   | A new comment                        | A webmention sent again              |
+ * | --------- | ------------------------------------ | ------------------------------------ |
+ * | `discard` | Nothing is stored.                   | The held entry is deleted.           |
+ * | `spam`    | Filed as spam.                       | Filed as spam.                       |
+ * | `ham`     | Approved.                            | The moderator's decision stands.     |
+ * | `unknown` | Where the site would have put it.    | The moderator's decision stands.     |
+ *
+ * A source re-sending its webmention must not take an approved mention back
+ * into the queue, and must not quietly let a spam one out. A checker that has
+ * changed its mind to `spam` is the one thing that moves it, because that is a
+ * new fact about the content rather than a repeat of an old one.
+ *
+ * **Who hears about it.** A new entry that is waiting sends the moderation
+ * notice, once. A webmention that was merely rewritten sends nothing — the
+ * moderators heard the first time and it has been in the queue ever since —
+ * and neither does one that was approved or filed as spam, because neither is
+ * waiting for anybody. A new comment that is approved instead tells whoever it
+ * answers, when they asked to be told.
+ */
+export declare function intakeComment(options: IntakeCommentOptions): Promise<CommentIntakeOutcome>;
+/**
+ * The webmention this site already holds from that page, if any.
+ *
+ * The source URL is a webmention's identity (doc-7), so this is what stops a
+ * blog post that is edited and re-sent adding a second entry — and what the
+ * endpoint asks before it fetches, so a source that has stopped linking here
+ * knows what to take away.
+ */
+export declare function heldWebmention(records: CommentRecords, slug: string, source: string | null): PostComment | undefined;
+//# sourceMappingURL=intake.d.ts.map

package/dist/comments/intake.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"intake.d.ts","sourceRoot":"","sources":["../../src/comments/intake.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAM1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAqC,MAAM,qBAAqB,CAAC;AAE7F;;;;;;;;;;GAUG;AAEH,8EAA8E;AAC9E,MAAM,MAAM,aAAa;AACvB,wDAAwD;AACtD,MAAM;AACR,oEAAoE;GAClE,YAAY,CAAC;AAEjB;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,EAAE,IAAI,GAAG,QAAQ,GAAG,aAAa,CAAC,CAAC;AAEjF;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,4CAA4C;IAC5C,OAAO,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IACpC,sEAAsE;IACtE,aAAa,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI,CAAC;CACzC;AAED,kEAAkE;AAClE,MAAM,WAAW,oBAAoB;IACnC,6DAA6D;IAC7D,OAAO,EAAE,cAAc,CAAC;IACxB,2BAA2B;IAC3B,MAAM,EAAE,aAAa,CAAC;IACtB,qDAAqD;IACrD,OAAO,EAAE,eAAe,CAAC;IACzB;;;;;;OAMG;IACH,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IAClD,oCAAoC;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,gCAAgC;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,4CAA4C;IAC5C,OAAO,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;IACrC,4DAA4D;IAC5D,OAAO,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;IACrC,8EAA8E;IAC9E,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,yDAAyD;IACzD,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,sDAAsD;IACtD,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,+EAA+E;IAC/E,MAAM,CAAC,EAAE;QAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,SAAS,CAAC;CACtD;AAED,2CAA2C;AAC3C,MAAM,MAAM,oBAAoB;AAC9B;;;GAGG;AACD;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;CAAE;AACvF;;;GAGG;GACD;IAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;CAAE;AAC3D,sEAAsE;GACpE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAE9B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAkDhG;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GAAG,IAAI,GACpB,WAAW,GAAG,SAAS,CAMzB"}

package/dist/comments/intake.js

@@ -0,0 +1,161 @@
+import { hashClientAddress } from '../forms/protection.js';
+import { messageOf } from '../util/errors.js';
+import { absoluteUrl } from '../util/url.js';
+import { webmentionKey } from '../content/guids.js';
+import { addComment, deleteComment, updateComment } from './records.js';
+/**
+ * The one door into `content/_data/comments/`.
+ *
+ * Everything between a proposed comment and a comment existing happens here,
+ * so the form, the webmention endpoint and the admin screen cannot drift into
+ * three different answers to the same four questions.
+ *
+ * **Where the site would put it, before anybody judged it.** A form comment
+ * whose name and email together have been approved before is approved again —
+ * WordPress's rule, and the whole of the auto-approval decision. A webmention
+ * waits, because a page linking here is as much a stranger's words as a form
+ * submission is.
+ *
+ * **What the checker says.** Everything goes through {@link CommentChecker}; a
+ * checker that is down or throws is no opinion, so a service having a bad
+ * afternoon never stops a site taking comments.
+ *
+ * **The one verdict-to-status rule.**
+ *
+ * | Verdict   | A new comment                        | A webmention sent again              |
+ * | --------- | ------------------------------------ | ------------------------------------ |
+ * | `discard` | Nothing is stored.                   | The held entry is deleted.           |
+ * | `spam`    | Filed as spam.                       | Filed as spam.                       |
+ * | `ham`     | Approved.                            | The moderator's decision stands.     |
+ * | `unknown` | Where the site would have put it.    | The moderator's decision stands.     |
+ *
+ * A source re-sending its webmention must not take an approved mention back
+ * into the queue, and must not quietly let a spam one out. A checker that has
+ * changed its mind to `spam` is the one thing that moves it, because that is a
+ * new fact about the content rather than a repeat of an old one.
+ *
+ * **Who hears about it.** A new entry that is waiting sends the moderation
+ * notice, once. A webmention that was merely rewritten sends nothing — the
+ * moderators heard the first time and it has been in the queue ever since —
+ * and neither does one that was approved or filed as spam, because neither is
+ * waiting for anybody. A new comment that is approved instead tells whoever it
+ * answers, when they asked to be told.
+ */
+export async function intakeComment(options) {
+    const { records, origin, comment } = options;
+    // What this site would do about it on its own, which is both what a checker
+    // is shown and what `unknown` falls back to.
+    const proposed = {
+        ...comment,
+        status: siteStatusFor(origin, records, comment),
+        addressHash: hashClientAddress(options.dataDir, options.address),
+    };
+    const held = origin === 'webmention' ? heldWebmention(records, comment.slug, comment.url) : undefined;
+    const verdict = await ask(options, proposed);
+    if (verdict === 'discard') {
+        if (held === undefined)
+            return { kind: 'discarded', removed: false };
+        await deleteComment(records, held.id);
+        return { kind: 'discarded', removed: true };
+    }
+    const status = statusFor(verdict, proposed.status, held);
+    if (held !== undefined) {
+        // Its id, its post and its source never move: that is what makes it the
+        // same comment. What the page now says about itself replaces what it said,
+        // what it answers included.
+        const moved = await updateComment(records, held.id, {
+            kind: comment.kind,
+            status,
+            author: comment.author,
+            content: comment.content,
+            submitted: comment.submitted,
+            inReplyTo: comment.inReplyTo,
+            rsvp: comment.rsvp ?? null,
+            via: comment.via ?? null,
+        });
+        return moved === undefined
+            ? { kind: 'gone' }
+            : { kind: 'stored', comment: moved, created: false };
+    }
+    const stored = await addComment(records, {
+        ...proposed,
+        status,
+        id: origin === 'webmention' ? webmentionKey(comment.url, comment.permalink) : undefined,
+    });
+    announce(options.notices, stored);
+    return { kind: 'stored', comment: stored, created: true };
+}
+/**
+ * The webmention this site already holds from that page, if any.
+ *
+ * The source URL is a webmention's identity (doc-7), so this is what stops a
+ * blog post that is edited and re-sent adding a second entry — and what the
+ * endpoint asks before it fetches, so a source that has stopped linking here
+ * knows what to take away.
+ */
+export function heldWebmention(records, slug, source) {
+    if (source === null || source === '')
+        return undefined;
+    return records.admin
+        .listCommentsFor(slug)
+        .find((comment) => comment.source === 'webmention' && comment.url === source);
+}
+/** Where this site's own rules put a comment, before a checker has spoken. */
+function siteStatusFor(origin, records, comment) {
+    if (origin === 'webmention')
+        return 'pending';
+    return records.admin.hasApprovedAuthor(comment.author.name, comment.author.email)
+        ? 'approved'
+        : 'pending';
+}
+/** The verdict-to-status rule, in the one place it is written. */
+function statusFor(verdict, site, held) {
+    if (verdict === 'spam')
+        return 'spam';
+    if (held !== undefined)
+        return held.status;
+    return verdict === 'ham' ? 'approved' : site;
+}
+/** Ask the checker, if there is one, and treat a broken one as no opinion. */
+async function ask(options, comment) {
+    const checker = options.checker;
+    if (checker === undefined)
+        return 'unknown';
+    const post = options.post;
+    const submission = {
+        comment,
+        post: {
+            slug: comment.slug,
+            title: post?.title ?? comment.slug,
+            url: post?.url ?? absoluteUrl(comment.permalink, options.baseUrl),
+        },
+        address: options.address,
+        userAgent: options.userAgent,
+        referrer: options.referrer,
+        baseUrl: options.baseUrl,
+    };
+    try {
+        return await checker.check(submission);
+    }
+    catch (error) {
+        // A checker that is down must not stop a site taking comments; the comment
+        // falls back to whatever the site's own rules said about it.
+        const logger = options.logger ?? console;
+        logger.warn(`The comment checker refused to answer: ${messageOf(error)}`);
+        return 'unknown';
+    }
+}
+/** Tell whoever was waiting on a comment that has just been written. */
+function announce(notices, stored) {
+    if (notices === undefined)
+        return;
+    // Only `pending`: one a checker filed as spam is not waiting for anybody,
+    // and one it said to discard was never stored at all.
+    if (stored.status === 'pending')
+        notices.pending(stored);
+    // A comment the site let straight through is on the page already, so
+    // whoever it answers hears about it now rather than at a moderator's hand.
+    else if (stored.status === 'approved')
+        notices.replyApproved(stored);
+}
+//# sourceMappingURL=intake.js.map

package/dist/comments/intake.js.map

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

package/dist/comments/markdown.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"markdown.d.ts","sourceRoot":"","sources":["../../src/comments/markdown.ts"],"names":[],"mappings":"AA2EA;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAG1D"}
+{"version":3,"file":"markdown.d.ts","sourceRoot":"","sources":["../../src/comments/markdown.ts"],"names":[],"mappings":"AA6EA;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAG1D"}

package/dist/comments/markdown.js

@@ -1,4 +1,5 @@
 import MarkdownIt from 'markdown-it';
+import { escapeAttribute, escapeText } from '../util/html.js';
 /**
  * The Markdown a stranger is allowed to write.
  *
@@ -21,7 +22,7 @@ import MarkdownIt from 'markdown-it';
  *
  * Links are also held to an allowlist of schemes, so nothing reaches a reader
  * that a browser would treat as a program. That is the same list
- * `web/sanitize.ts` publishes remote HTML through, spelled again here because
+ * `content/sanitize.ts` publishes remote HTML through, spelled again here because
  * this renderer never sees that module's output.
  */
 /**
@@ -74,12 +75,4 @@ export function renderCommentMarkdown(body) {
     const trimmed = body.trim();
     return trimmed === '' ? '' : markdown.render(trimmed);
 }
-/** A URL as an attribute value. */
-function escapeAttribute(value) {
-    return escapeText(value).replaceAll('"', '"');
-}
-/** Text as markup. */
-function escapeText(value) {
-    return value.replaceAll('&', '&amp;').replaceAll('<', '&lt;').replaceAll('>', '&gt;');
-}
 //# sourceMappingURL=markdown.js.map

package/dist/comments/markdown.js.map

@@ -1 +1 @@
-{"version":3,"file":"markdown.js","sourceRoot":"","sources":["../../src/comments/markdown.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,aAAa,CAAC;AAGrC;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH;;;;;;GAMG;AACH,MAAM,eAAe,GAAsB,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;AAE9E,wDAAwD;AACxD,MAAM,QAAQ,GAAG,cAAc,CAAC;AAEhC,MAAM,QAAQ,GAAuB,IAAI,UAAU,CAAC;IAClD,IAAI,EAAE,KAAK;IACX,OAAO,EAAE,IAAI;IACb,MAAM,EAAE,IAAI;CACb,CAAC,CAAC;AAEH,QAAQ,CAAC,YAAY,GAAG,CAAC,GAAG,EAAE,EAAE;IAC9B,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACzC,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC;AAEF,yEAAyE;AACzE,uEAAuE;AACvE,6CAA6C;AAC7C,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;IAC5E,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC5B,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAChC,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,+EAA+E;AAC/E,2EAA2E;AAC3E,2DAA2D;AAC3D,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;IACvE,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC5B,MAAM,GAAG,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,QAAQ,IAAI,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IACzE,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;IACjD,yEAAyE;IACzE,4DAA4D;IAC5D,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC;QAAE,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC;IAEzD,OAAO,YAAY,eAAe,CAAC,IAAI,CAAC,UAAU,QAAQ,KAAK,UAAU,CAAC,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC;AAC/F,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAC,IAAY;IAChD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAC5B,OAAO,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AACxD,CAAC;AAED,mCAAmC;AACnC,SAAS,eAAe,CAAC,KAAa;IACpC,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;AACrD,CAAC;AAED,sBAAsB;AACtB,SAAS,UAAU,CAAC,KAAa;IAC/B,OAAO,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACxF,CAAC"}
+{"version":3,"file":"markdown.js","sourceRoot":"","sources":["../../src/comments/markdown.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,aAAa,CAAC;AAGrC,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE9D;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH;;;;;;GAMG;AACH,MAAM,eAAe,GAAsB,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;AAE9E,wDAAwD;AACxD,MAAM,QAAQ,GAAG,cAAc,CAAC;AAEhC,MAAM,QAAQ,GAAuB,IAAI,UAAU,CAAC;IAClD,IAAI,EAAE,KAAK;IACX,OAAO,EAAE,IAAI;IACb,MAAM,EAAE,IAAI;CACb,CAAC,CAAC;AAEH,QAAQ,CAAC,YAAY,GAAG,CAAC,GAAG,EAAE,EAAE;IAC9B,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACzC,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC;AAEF,yEAAyE;AACzE,uEAAuE;AACvE,6CAA6C;AAC7C,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;IAC5E,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC5B,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAChC,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,+EAA+E;AAC/E,2EAA2E;AAC3E,2DAA2D;AAC3D,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;IACvE,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC5B,MAAM,GAAG,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,QAAQ,IAAI,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IACzE,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;IACjD,yEAAyE;IACzE,4DAA4D;IAC5D,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC;QAAE,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC;IAEzD,OAAO,YAAY,eAAe,CAAC,IAAI,CAAC,UAAU,QAAQ,KAAK,UAAU,CAAC,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC;AAC/F,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAC,IAAY;IAChD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAC5B,OAAO,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AACxD,CAAC"}

package/dist/comments/migrations.d.ts

@@ -0,0 +1,45 @@
+import type { CommentRecords } from './records.ts';
+/** What moving the emails out of `content/` changed. */
+export interface CommentEmailMigrationReport {
+    /** How many comment files were rewritten. */
+    files: number;
+}
+/**
+ * Move every email still in a comment file into `data/` (TASK-182).
+ *
+ * A site that kept comments before the emails moved has them in
+ * `content/_data/comments/`, and a comment file somebody edits by hand may
+ * gain one again. Boot calls this before `rebuildCommentIndexes`, so
+ * both end up in the private file and out of the published one. It edits each
+ * file's JSON as it finds it, taking off `author.email` and `notify` and
+ * nothing else, so a key this version does not know and an entry it cannot
+ * read survive it. An email `data/` already holds for that comment wins. A file
+ * with nothing to take off is not written, so a second boot writes nothing.
+ *
+ * Synchronous, like the other boot migrations, and run before anything else
+ * can be writing a comment.
+ */
+export declare function migrateCommentEmails(records: Pick<CommentRecords, 'contentDir' | 'dataDir'>): CommentEmailMigrationReport;
+/** What giving the stored comments keys changed. */
+export interface CommentKeyMigrationReport {
+    /** How many comments were given a key. */
+    comments: number;
+}
+/**
+ * Give every stored comment whose id is not a key the key of that id
+ * (decision-51): the first 16 hex digits of its SHA-256, so every boot works
+ * out the same one. A UUID a form comment or a webmention was given before
+ * keys, and a URL an import wrote, both become keys this way.
+ *
+ * What names an old id follows it: a comment's `inReplyTo`, the email `data/`
+ * keeps for it, and a document naming its old page or anchor, such as a reply
+ * post's `in-reply-to`. The documents go first, then for each post the private
+ * file with both keys, the comment file, and the private file with the new key
+ * alone, so a boot stopped anywhere loses nothing and the next one finishes
+ * the job. A site whose ids are all keys has its files read and none written.
+ *
+ * Synchronous, like the other boot migrations, and run before anything else
+ * can be writing a comment.
+ */
+export declare function migrateCommentKeys(records: Pick<CommentRecords, 'contentDir' | 'dataDir'>): CommentKeyMigrationReport;
+//# sourceMappingURL=migrations.d.ts.map

package/dist/comments/migrations.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../../src/comments/migrations.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAkB,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnE,wDAAwD;AACxD,MAAM,WAAW,2BAA2B;IAC1C,6CAA6C;IAC7C,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,YAAY,GAAG,SAAS,CAAC,GACtD,2BAA2B,CA6C7B;AAED,oDAAoD;AACpD,MAAM,WAAW,yBAAyB;IACxC,0CAA0C;IAC1C,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,YAAY,GAAG,SAAS,CAAC,GACtD,yBAAyB,CAmE3B"}

package/dist/comments/migrations.js

@@ -0,0 +1,194 @@
+import { readdirSync, readFileSync } from 'node:fs';
+import path from 'node:path';
+import { COMMENT_PAGE_PREFIX, commentPageHref, repliesKey, isKey } from '../content/guids.js';
+import { readFileIfPresentSync, writeFileAtomicallySync } from '../files/atomic.js';
+import { nonEmptyStringOrNull } from '../util/forms.js';
+import { isRecord } from '../util/guards.js';
+import { COMMENT_EMAILS_FILE_MODE, commentEmailsFile, commentSlugs, commentsFile, contactsIn, contactsJson, } from './records.js';
+/**
+ * Move every email still in a comment file into `data/` (TASK-182).
+ *
+ * A site that kept comments before the emails moved has them in
+ * `content/_data/comments/`, and a comment file somebody edits by hand may
+ * gain one again. Boot calls this before `rebuildCommentIndexes`, so
+ * both end up in the private file and out of the published one. It edits each
+ * file's JSON as it finds it, taking off `author.email` and `notify` and
+ * nothing else, so a key this version does not know and an entry it cannot
+ * read survive it. An email `data/` already holds for that comment wins. A file
+ * with nothing to take off is not written, so a second boot writes nothing.
+ *
+ * Synchronous, like the other boot migrations, and run before anything else
+ * can be writing a comment.
+ */
+export function migrateCommentEmails(records) {
+    let files = 0;
+    for (const slug of commentSlugs(records.contentDir)) {
+        const file = commentsFile(records.contentDir, slug);
+        let parsed;
+        try {
+            parsed = JSON.parse(readFileIfPresentSync(file) ?? '');
+        }
+        catch {
+            continue;
+        }
+        if (!isRecord(parsed) || !Array.isArray(parsed['comments']))
+            continue;
+        const found = new Map();
+        let stripped = false;
+        const entries = parsed['comments'].map((entry) => {
+            if (!isRecord(entry))
+                return entry;
+            const author = isRecord(entry['author']) ? entry['author'] : undefined;
+            if (!('notify' in entry) && !(author !== undefined && 'email' in author))
+                return entry;
+            stripped = true;
+            const email = nonEmptyStringOrNull(author?.['email']);
+            const id = entry['id'];
+            if (typeof id === 'string' && id !== '' && email !== null) {
+                found.set(id, { email, notify: entry['notify'] === true });
+            }
+            const kept = without(entry, 'notify');
+            if (author !== undefined)
+                kept['author'] = without(author, 'email');
+            return kept;
+        });
+        if (!stripped)
+            continue;
+        const privateFile = commentEmailsFile(records.dataDir, slug);
+        const contacts = contactsIn(readFileIfPresentSync(privateFile));
+        for (const [id, contact] of found)
+            if (!contacts.has(id))
+                contacts.set(id, contact);
+        if (contacts.size > 0) {
+            writeFileAtomicallySync(privateFile, contactsJson(contacts), {
+                mode: COMMENT_EMAILS_FILE_MODE,
+            });
+        }
+        writeFileAtomicallySync(file, `${JSON.stringify({ ...parsed, comments: entries }, null, 2)}\n`);
+        files += 1;
+    }
+    return { files };
+}
+/**
+ * Give every stored comment whose id is not a key the key of that id
+ * (decision-51): the first 16 hex digits of its SHA-256, so every boot works
+ * out the same one. A UUID a form comment or a webmention was given before
+ * keys, and a URL an import wrote, both become keys this way.
+ *
+ * What names an old id follows it: a comment's `inReplyTo`, the email `data/`
+ * keeps for it, and a document naming its old page or anchor, such as a reply
+ * post's `in-reply-to`. The documents go first, then for each post the private
+ * file with both keys, the comment file, and the private file with the new key
+ * alone, so a boot stopped anywhere loses nothing and the next one finishes
+ * the job. A site whose ids are all keys has its files read and none written.
+ *
+ * Synchronous, like the other boot migrations, and run before anything else
+ * can be writing a comment.
+ */
+export function migrateCommentKeys(records) {
+    const keys = new Map();
+    const held = [];
+    for (const slug of commentSlugs(records.contentDir)) {
+        const file = commentsFile(records.contentDir, slug);
+        let parsed;
+        try {
+            parsed = JSON.parse(readFileIfPresentSync(file) ?? '');
+        }
+        catch {
+            continue;
+        }
+        if (!isRecord(parsed) || !Array.isArray(parsed['comments']))
+            continue;
+        for (const entry of parsed['comments']) {
+            const id = isRecord(entry) ? entry['id'] : undefined;
+            if (typeof id === 'string' && id !== '' && !isKey(id))
+                keys.set(id, repliesKey(id));
+        }
+        held.push({ slug, file, parsed, entries: parsed['comments'] });
+    }
+    const renamed = renamer(keys);
+    if (keys.size > 0)
+        rewriteDocuments(records.contentDir, renamed);
+    for (const { slug, file, parsed, entries } of held) {
+        const rekeyed = entries.map((entry) => {
+            if (!isRecord(entry))
+                return entry;
+            const id = entry['id'];
+            const inReplyTo = entry['inReplyTo'];
+            return {
+                ...entry,
+                ...(typeof id === 'string' && keys.has(id) ? { id: keys.get(id) } : {}),
+                ...(typeof inReplyTo === 'string'
+                    ? { inReplyTo: keys.get(inReplyTo) ?? renamed(inReplyTo) }
+                    : {}),
+            };
+        });
+        const changed = JSON.stringify(rekeyed) !== JSON.stringify(entries);
+        const privateFile = commentEmailsFile(records.dataDir, slug);
+        const contacts = contactsIn(readFileIfPresentSync(privateFile));
+        const keyed = new Map();
+        for (const [id, contact] of contacts) {
+            const key = isKey(id) ? id : repliesKey(id);
+            if (!keyed.has(key) || id === key)
+                keyed.set(key, contact);
+        }
+        const stale = [...contacts.keys()].some((id) => !isKey(id));
+        const writePrivate = (written) => {
+            writeFileAtomicallySync(privateFile, contactsJson(written), {
+                mode: COMMENT_EMAILS_FILE_MODE,
+            });
+        };
+        if (changed) {
+            if (stale)
+                writePrivate(new Map([...contacts, ...keyed]));
+            writeFileAtomicallySync(file, `${JSON.stringify({ ...parsed, comments: rekeyed }, null, 2)}\n`);
+        }
+        if (stale)
+            writePrivate(keyed);
+    }
+    return { comments: keys.size };
+}
+/**
+ * Text with every old comment page and anchor in it naming the comment by its
+ * key. The longest ids go first, so an id that begins another cannot take a
+ * piece of it.
+ */
+function renamer(keys) {
+    const swaps = [...keys]
+        .sort(([left], [right]) => right.length - left.length)
+        .flatMap(([id, key]) => [
+        [`${COMMENT_PAGE_PREFIX}${encodeURIComponent(id)}/`, commentPageHref(key)],
+        [`#comment-${id}`, `#comment-${key}`],
+    ]);
+    return (text) => swaps.reduce((said, [from = '', to = '']) => said.replaceAll(from, to), text);
+}
+/** Every Markdown file under the content directory, rewritten where `renamed` changes it. */
+function rewriteDocuments(contentDir, renamed) {
+    let names;
+    try {
+        names = readdirSync(contentDir, { recursive: true, encoding: 'utf8' });
+    }
+    catch {
+        return;
+    }
+    for (const name of names) {
+        if (!/\.(md|markdown)$/i.test(name) || name.split(path.sep).includes('node_modules'))
+            continue;
+        const file = path.join(contentDir, name);
+        let text;
+        try {
+            text = readFileSync(file, 'utf8');
+        }
+        catch {
+            continue;
+        }
+        const next = renamed(text);
+        if (next !== text)
+            writeFileAtomicallySync(file, next);
+    }
+}
+/** A copy of a record without one key, every other key where it was. */
+function without(record, key) {
+    return Object.fromEntries(Object.entries(record).filter(([name]) => name !== key));
+}
+//# sourceMappingURL=migrations.js.map

package/dist/comments/migrations.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../src/comments/migrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACpD,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC9F,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AACpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EACL,wBAAwB,EACxB,iBAAiB,EACjB,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,YAAY,GACb,MAAM,cAAc,CAAC;AAStB;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,oBAAoB,CAClC,OAAuD;IAEvD,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,KAAK,MAAM,IAAI,IAAI,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QACpD,IAAI,MAAe,CAAC;QACpB,IAAI,CAAC;YACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACzD,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAAE,SAAS;QAEtE,MAAM,KAAK,GAAG,IAAI,GAAG,EAA0B,CAAC;QAChD,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,KAAc,EAAE,EAAE;YACxD,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;gBAAE,OAAO,KAAK,CAAC;YACnC,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACvE,IAAI,CAAC,CAAC,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,IAAI,OAAO,IAAI,MAAM,CAAC;gBAAE,OAAO,KAAK,CAAC;YAEvF,QAAQ,GAAG,IAAI,CAAC;YAChB,MAAM,KAAK,GAAG,oBAAoB,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;YACtD,MAAM,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;YACvB,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,EAAE,KAAK,EAAE,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBAC1D,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;YAC7D,CAAC;YACD,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACtC,IAAI,MAAM,KAAK,SAAS;gBAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACpE,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ;YAAE,SAAS;QAExB,MAAM,WAAW,GAAG,iBAAiB,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC7D,MAAM,QAAQ,GAAG,UAAU,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC,CAAC;QAChE,KAAK,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,KAAK;YAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QACpF,IAAI,QAAQ,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YACtB,uBAAuB,CAAC,WAAW,EAAE,YAAY,CAAC,QAAQ,CAAC,EAAE;gBAC3D,IAAI,EAAE,wBAAwB;aAC/B,CAAC,CAAC;QACL,CAAC;QACD,uBAAuB,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QAChG,KAAK,IAAI,CAAC,CAAC;IACb,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,CAAC;AACnB,CAAC;AAQD;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,kBAAkB,CAChC,OAAuD;IAEvD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAkB,CAAC;IACvC,MAAM,IAAI,GAKJ,EAAE,CAAC;IACT,KAAK,MAAM,IAAI,IAAI,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QACpD,IAAI,MAAe,CAAC;QACpB,IAAI,CAAC;YACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACzD,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAAE,SAAS;QACtE,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YACvC,MAAM,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACrD,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;QACtF,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC;QAAE,gBAAgB,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAEjE,KAAK,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC;QACnD,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,KAAc,EAAE,EAAE;YAC7C,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;gBAAE,OAAO,KAAK,CAAC;YACnC,MAAM,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;YACvB,MAAM,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;YACrC,OAAO;gBACL,GAAG,KAAK;gBACR,GAAG,CAAC,OAAO,EAAE,KAAK,QAAQ,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACvE,GAAG,CAAC,OAAO,SAAS,KAAK,QAAQ;oBAC/B,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,SAAS,CAAC,EAAE;oBAC1D,CAAC,CAAC,EAAE,CAAC;aACR,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAEpE,MAAM,WAAW,GAAG,iBAAiB,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC7D,MAAM,QAAQ,GAAG,UAAU,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC,CAAC;QAChE,MAAM,KAAK,GAAG,IAAI,GAAG,EAA0B,CAAC;QAChD,KAAK,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE,CAAC;YACrC,MAAM,GAAG,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YAC5C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,GAAG;gBAAE,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC7D,CAAC;QACD,MAAM,KAAK,GAAG,CAAC,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;QAE5D,MAAM,YAAY,GAAG,CAAC,OAA4C,EAAQ,EAAE;YAC1E,uBAAuB,CAAC,WAAW,EAAE,YAAY,CAAC,OAAO,CAAC,EAAE;gBAC1D,IAAI,EAAE,wBAAwB;aAC/B,CAAC,CAAC;QACL,CAAC,CAAC;QACF,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,KAAK;gBAAE,YAAY,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,QAAQ,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAC1D,uBAAuB,CACrB,IAAI,EACJ,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CACjE,CAAC;QACJ,CAAC;QACD,IAAI,KAAK;YAAE,YAAY,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;AACjC,CAAC;AAED;;;;GAIG;AACH,SAAS,OAAO,CAAC,IAAiC;IAChD,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC;SACpB,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;SACrD,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;QACtB,CAAC,GAAG,mBAAmB,GAAG,kBAAkB,CAAC,EAAE,CAAC,GAAG,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC;QAC1E,CAAC,YAAY,EAAE,EAAE,EAAE,YAAY,GAAG,EAAE,CAAC;KACtC,CAAC,CAAC;IACL,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;AACjG,CAAC;AAED,6FAA6F;AAC7F,SAAS,gBAAgB,CAAC,UAAkB,EAAE,OAAiC;IAC7E,IAAI,KAAe,CAAC;IACpB,IAAI,CAAC;QACH,KAAK,GAAG,WAAW,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IACzE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO;IACT,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC;YAAE,SAAS;QAC/F,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QACzC,IAAI,IAAY,CAAC;QACjB,IAAI,CAAC;YACH,IAAI,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACpC,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;QACD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAC3B,IAAI,IAAI,KAAK,IAAI;YAAE,uBAAuB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACzD,CAAC;AACH,CAAC;AAED,wEAAwE;AACxE,SAAS,OAAO,CAAC,MAA+B,EAAE,GAAW;IAC3D,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC;AACrF,CAAC"}

package/dist/comments/moderate.d.ts

@@ -1,6 +1,6 @@
-import type { CommentStatus, PostComment } from '../admin/store.ts';
+import type { CommentStatus, PostComment } from '../store/admin-store.ts';
 import type { CommentRecords } from './records.ts';
-import type { CommentChecker } from './submission.ts';
+import type { CommentChecker } from '../forms/checker.ts';
 /**
  * The three things that can be done to a stored comment, in one place.
  *

package/dist/comments/moderate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"moderate.d.ts","sourceRoot":"","sources":["../../src/comments/moderate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEpE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAiB,MAAM,iBAAiB,CAAC;AAErE;;;;;;;;;;;;;GAaG;AAEH,kEAAkE;AAClE,eAAO,MAAM,kBAAkB,YAAI,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAU,CAAC;AAEzE,yCAAyC;AACzC,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEnE,qCAAqC;AACrC,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,gBAAgB,CAE3E;AAED,qCAAqC;AACrC,MAAM,MAAM,iBAAiB;AAC3B,yEAAyE;AACvE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE;AAC3B,2DAA2D;GACzD;IAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAA;CAAE;AAC/D,iDAAiD;GAC/C;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAA;CAAE;AAC3F,+DAA+D;GAC7D;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAA;CAAE,CAAC;AAEhE,oDAAoD;AACpD,MAAM,WAAW,sBAAsB;IACrC,2DAA2D;IAC3D,OAAO,EAAE,cAAc,CAAC;IACxB,qBAAqB;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,wBAAwB;IACxB,MAAM,EAAE,gBAAgB,CAAC;IACzB,iFAAiF;IACjF,OAAO,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;IACrC,kEAAkE;IAClE,OAAO,EAAE,MAAM,CAAC;IAChB,mEAAmE;IACnE,MAAM,CAAC,EAAE;QAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,SAAS,CAAC;CACtD;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAkBjG"}
+{"version":3,"file":"moderate.d.ts","sourceRoot":"","sources":["../../src/comments/moderate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAI1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAiB,MAAM,qBAAqB,CAAC;AAEzE;;;;;;;;;;;;;GAaG;AAEH,kEAAkE;AAClE,eAAO,MAAM,kBAAkB,YAAI,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAU,CAAC;AAEzE,yCAAyC;AACzC,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEnE,qCAAqC;AACrC,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,gBAAgB,CAE3E;AAED,qCAAqC;AACrC,MAAM,MAAM,iBAAiB;AAC3B,yEAAyE;AACvE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE;AAC3B,2DAA2D;GACzD;IAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAA;CAAE;AAC/D,iDAAiD;GAC/C;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAA;CAAE;AAC3F,+DAA+D;GAC7D;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAA;CAAE,CAAC;AAEhE,oDAAoD;AACpD,MAAM,WAAW,sBAAsB;IACrC,2DAA2D;IAC3D,OAAO,EAAE,cAAc,CAAC;IACxB,qBAAqB;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,wBAAwB;IACxB,MAAM,EAAE,gBAAgB,CAAC;IACzB,iFAAiF;IACjF,OAAO,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;IACrC,kEAAkE;IAClE,OAAO,EAAE,MAAM,CAAC;IAChB,mEAAmE;IACnE,MAAM,CAAC,EAAE;QAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,SAAS,CAAC;CACtD;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAkBjG"}