@geekity/cms 0.8.0 → 0.9.0

package/dist/notifications/optouts.js.map

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

package/dist/privacy/erase.d.ts

@@ -0,0 +1,45 @@
+import type { CommentRecord } from '../admin/store.ts';
+import type { CommentRecords } from '../comments/records.ts';
+/**
+ * Erasing one person's personal data when they ask (TASK-135).
+ *
+ * A person is found by the email they gave, because that is the one thing
+ * they can prove is theirs: a name is anybody's to type. Their comments stay
+ * where they are in the thread, with their status and their words, under the
+ * name {@link ERASED_NAME} and with nothing else of theirs left on them; a
+ * comment deleted outright would take every reply to it out of the thread,
+ * and the Comments screen is there for a comment whose words have to go too.
+ * Their contact messages are deleted, because a message is nothing but what
+ * they wrote and where to answer them, and the opt-out list forgets their
+ * address.
+ */
+/** What an erased comment is signed with. */
+export declare const ERASED_NAME = "Anonymous";
+/** What was found for an address, or what was erased for it. */
+export interface PersonalDataReport {
+    /** Comments carrying the address. */
+    readonly comments: number;
+    /** Contact messages sent from it. */
+    readonly messages: number;
+    /** Whether it is on the list of addresses not to email about replies. */
+    readonly optedOut: boolean;
+}
+/** Where a person's data can be. */
+export interface PersonalDataStores {
+    /** The comment files and the index over them. */
+    readonly records: CommentRecords;
+    /** The data directory the contact messages and the opt-out list live in. */
+    readonly dataDir: string;
+}
+/** A comment with everything that says who wrote it taken off. */
+export declare function eraseCommentAuthor(comment: CommentRecord): CommentRecord;
+/** What the site holds under `email`, without changing any of it. */
+export declare function findPersonalData(stores: PersonalDataStores, email: string): PersonalDataReport;
+/**
+ * Erase everything the site holds under `email`, and say what was erased.
+ *
+ * Both this and {@link findPersonalData} read the files rather than the index,
+ * so a comment written by hand since the last boot is counted and erased.
+ */
+export declare function erasePersonalData(stores: PersonalDataStores, email: string): Promise<PersonalDataReport>;
+//# sourceMappingURL=erase.d.ts.map

package/dist/privacy/erase.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"erase.d.ts","sourceRoot":"","sources":["../../src/privacy/erase.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAK7D;;;;;;;;;;;;GAYG;AAEH,6CAA6C;AAC7C,eAAO,MAAM,WAAW,cAAc,CAAC;AAEvC,gEAAgE;AAChE,MAAM,WAAW,kBAAkB;IACjC,qCAAqC;IACrC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,qCAAqC;IACrC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,yEAAyE;IACzE,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC5B;AAED,oCAAoC;AACpC,MAAM,WAAW,kBAAkB;IACjC,iDAAiD;IACjD,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IACjC,4EAA4E;IAC5E,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAYD,kEAAkE;AAClE,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,aAAa,GAAG,aAAa,CAYxE;AAED,qEAAqE;AACrE,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,GAAG,kBAAkB,CAU9F;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,kBAAkB,EAC1B,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,kBAAkB,CAAC,CAoB7B"}

package/dist/privacy/erase.js

@@ -0,0 +1,77 @@
+import { commentSlugs, readComments, rewriteComments } from '../comments/records.js';
+import { deleteContactMessage, listContactMessages } from '../contact/records.js';
+import { hasOptedOut, removeCommentOptOut } from '../notifications/optouts.js';
+import { withRedacted } from './retention.js';
+/**
+ * Erasing one person's personal data when they ask (TASK-135).
+ *
+ * A person is found by the email they gave, because that is the one thing
+ * they can prove is theirs: a name is anybody's to type. Their comments stay
+ * where they are in the thread, with their status and their words, under the
+ * name {@link ERASED_NAME} and with nothing else of theirs left on them; a
+ * comment deleted outright would take every reply to it out of the thread,
+ * and the Comments screen is there for a comment whose words have to go too.
+ * Their contact messages are deleted, because a message is nothing but what
+ * they wrote and where to answer them, and the opt-out list forgets their
+ * address.
+ */
+/** What an erased comment is signed with. */
+export const ERASED_NAME = 'Anonymous';
+/** An address as it is compared: trimmed and folded, as the opt-out list keeps it. */
+function folded(email) {
+    return email.trim().toLowerCase();
+}
+/** Whether a comment was left under `email`. */
+function isTheirs(comment, email) {
+    return comment.author.email !== null && folded(comment.author.email) === email;
+}
+/** A comment with everything that says who wrote it taken off. */
+export function eraseCommentAuthor(comment) {
+    return {
+        ...comment,
+        author: { name: ERASED_NAME, url: null, email: null, avatar: null },
+        addressHash: null,
+        notify: false,
+        redacted: withRedacted(comment.redacted, [
+            'email',
+            ...(comment.addressHash === null ? [] : ['addressHash']),
+            'author',
+        ]),
+    };
+}
+/** What the site holds under `email`, without changing any of it. */
+export function findPersonalData(stores, email) {
+    const wanted = folded(email);
+    const { contentDir } = stores.records;
+    const comments = commentSlugs(contentDir)
+        .flatMap((slug) => readComments(contentDir, slug))
+        .filter((comment) => isTheirs(comment, wanted)).length;
+    const messages = listContactMessages(stores.dataDir).filter((message) => folded(message.from.email) === wanted).length;
+    return { comments, messages, optedOut: hasOptedOut(stores.dataDir, wanted) };
+}
+/**
+ * Erase everything the site holds under `email`, and say what was erased.
+ *
+ * Both this and {@link findPersonalData} read the files rather than the index,
+ * so a comment written by hand since the last boot is counted and erased.
+ */
+export async function erasePersonalData(stores, email) {
+    const wanted = folded(email);
+    if (wanted === '')
+        return { comments: 0, messages: 0, optedOut: false };
+    let comments = 0;
+    for (const slug of commentSlugs(stores.records.contentDir)) {
+        const changed = await rewriteComments(stores.records, slug, (comment) => isTheirs(comment, wanted) ? eraseCommentAuthor(comment) : undefined);
+        comments += changed.length;
+    }
+    let messages = 0;
+    for (const message of listContactMessages(stores.dataDir)) {
+        if (folded(message.from.email) !== wanted)
+            continue;
+        if (await deleteContactMessage(stores.dataDir, message.id))
+            messages += 1;
+    }
+    const optedOut = await removeCommentOptOut(stores.dataDir, wanted);
+    return { comments, messages, optedOut };
+}
+//# sourceMappingURL=erase.js.map

package/dist/privacy/erase.js.map

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

package/dist/privacy/policy.d.ts

@@ -0,0 +1,32 @@
+/**
+ * How long this site keeps the personal data its readers hand it (TASK-135).
+ *
+ * Three periods, each in whole days counted from the moment the data arrived,
+ * and `0` for keeping it for as long as the site stands. They are settings in
+ * `content/_data/site.json` rather than config: how long a site keeps what
+ * people give it is the owner's decision, made on the Discussion screen, and a
+ * public file is the right place for a policy a privacy notice will quote.
+ */
+/** Days a commenter's email is kept: long enough for a reply to reach them. */
+export declare const RECOMMENDED_COMMENT_EMAIL_RETENTION_DAYS = 180;
+/** Days an address hash is kept: long enough to spot a run of spam. */
+export declare const RECOMMENDED_ADDRESS_HASH_RETENTION_DAYS = 30;
+/** Days a contact message is kept: a year of correspondence. */
+export declare const RECOMMENDED_CONTACT_MESSAGE_RETENTION_DAYS = 365;
+/** The three periods. Zero keeps that data forever. */
+export interface RetentionPolicy {
+    /** Days a comment keeps its author's email, and with it their reply subscription. */
+    readonly commentEmailDays: number;
+    /** Days a comment or a contact message keeps the hash of the address it came from. */
+    readonly addressHashDays: number;
+    /** Days a contact message is kept at all. */
+    readonly contactMessageDays: number;
+}
+/**
+ * Whether data that arrived at `at` has outlived a period of `days`.
+ *
+ * A date that will not parse has no age, so it is never past anything: a hand
+ * edit that lost a timestamp should not be what deletes somebody's message.
+ */
+export declare function outlived(at: string, days: number, now: Date): boolean;
+//# sourceMappingURL=policy.d.ts.map

package/dist/privacy/policy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"policy.d.ts","sourceRoot":"","sources":["../../src/privacy/policy.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AASH,+EAA+E;AAC/E,eAAO,MAAM,wCAAwC,MAAM,CAAC;AAE5D,uEAAuE;AACvE,eAAO,MAAM,uCAAuC,KAAK,CAAC;AAE1D,gEAAgE;AAChE,eAAO,MAAM,0CAA0C,MAAM,CAAC;AAE9D,uDAAuD;AACvD,MAAM,WAAW,eAAe;IAC9B,qFAAqF;IACrF,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,sFAAsF;IACtF,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,6CAA6C;IAC7C,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;CACrC;AAID;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,GAAG,OAAO,CAKrE"}

package/dist/privacy/policy.js

@@ -0,0 +1,37 @@
+/**
+ * How long this site keeps the personal data its readers hand it (TASK-135).
+ *
+ * Three periods, each in whole days counted from the moment the data arrived,
+ * and `0` for keeping it for as long as the site stands. They are settings in
+ * `content/_data/site.json` rather than config: how long a site keeps what
+ * people give it is the owner's decision, made on the Discussion screen, and a
+ * public file is the right place for a policy a privacy notice will quote.
+ */
+/*
+ * A site that never chose a period keeps everything: a `site.json` without the
+ * keys reads as `0`, so upgrading the package never deletes anything. The
+ * periods below are what `geekity init` writes for a new site and what the
+ * Discussion screen recommends to an existing one.
+ */
+/** Days a commenter's email is kept: long enough for a reply to reach them. */
+export const RECOMMENDED_COMMENT_EMAIL_RETENTION_DAYS = 180;
+/** Days an address hash is kept: long enough to spot a run of spam. */
+export const RECOMMENDED_ADDRESS_HASH_RETENTION_DAYS = 30;
+/** Days a contact message is kept: a year of correspondence. */
+export const RECOMMENDED_CONTACT_MESSAGE_RETENTION_DAYS = 365;
+const DAY_MS = 24 * 60 * 60 * 1000;
+/**
+ * Whether data that arrived at `at` has outlived a period of `days`.
+ *
+ * A date that will not parse has no age, so it is never past anything: a hand
+ * edit that lost a timestamp should not be what deletes somebody's message.
+ */
+export function outlived(at, days, now) {
+    if (days <= 0)
+        return false;
+    const arrived = Date.parse(at);
+    if (Number.isNaN(arrived))
+        return false;
+    return now.getTime() - arrived > days * DAY_MS;
+}
+//# sourceMappingURL=policy.js.map

package/dist/privacy/policy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"policy.js","sourceRoot":"","sources":["../../src/privacy/policy.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH;;;;;GAKG;AAEH,+EAA+E;AAC/E,MAAM,CAAC,MAAM,wCAAwC,GAAG,GAAG,CAAC;AAE5D,uEAAuE;AACvE,MAAM,CAAC,MAAM,uCAAuC,GAAG,EAAE,CAAC;AAE1D,gEAAgE;AAChE,MAAM,CAAC,MAAM,0CAA0C,GAAG,GAAG,CAAC;AAY9D,MAAM,MAAM,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAEnC;;;;;GAKG;AACH,MAAM,UAAU,QAAQ,CAAC,EAAU,EAAE,IAAY,EAAE,GAAS;IAC1D,IAAI,IAAI,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC/B,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;QAAE,OAAO,KAAK,CAAC;IACxC,OAAO,GAAG,CAAC,OAAO,EAAE,GAAG,OAAO,GAAG,IAAI,GAAG,MAAM,CAAC;AACjD,CAAC"}

package/dist/privacy/retention.d.ts

@@ -0,0 +1,79 @@
+import type { AdminStore, CommentRecord, RedactedField } from '../admin/store.ts';
+import type { ResolvedConfig } from '../config.ts';
+import type { ContactMessage } from '../contact/records.ts';
+import type { NotificationTimers } from '../notifications/digest.ts';
+import type { RetentionPolicy } from './policy.ts';
+/**
+ * The retention sweep (TASK-135): what removes the personal data a site has
+ * kept for longer than it said it would.
+ *
+ * The files are the truth (decision-9), so the sweep reads them rather than
+ * the index: every comment file under `content/_data/comments/` and every
+ * message under `data/contact/`, each rewritten inside the lock every other
+ * writer of that file takes, and each comment it changes put back into the
+ * index in the same step. Removing a value that is already gone is not a
+ * change, so a sweep run twice, or run again after a crash halfway through,
+ * finishes in the same place and writes nothing the second time.
+ */
+/** How often the sweep runs once the site serves. */
+export declare const RETENTION_SWEEP_MS: number;
+/** What one sweep changed. */
+export interface RetentionReport {
+    /** Comments that lost an email, an address hash or both. */
+    readonly comments: number;
+    /** Contact messages deleted for being older than the site keeps them. */
+    readonly messagesDeleted: number;
+    /** Contact messages that lost their address hash. */
+    readonly messagesRedacted: number;
+}
+/**
+ * One comment as the policy leaves it, or `undefined` when it has nothing to
+ * give up. The email goes with the reply subscription it served, since there
+ * is nowhere left to send one; the thread, the status and the words stay.
+ */
+export declare function expireComment(comment: CommentRecord, policy: RetentionPolicy, now: Date): CommentRecord | undefined;
+/** What a contact message comes to under the policy. */
+export type ContactExpiry = {
+    readonly kind: 'keep';
+} | {
+    readonly kind: 'delete';
+} | {
+    readonly kind: 'redact';
+    readonly message: ContactMessage;
+};
+/**
+ * One contact message under the policy: kept as it is, deleted outright, or
+ * kept without the hash of the address it came from. A message is its
+ * sender's words and address together, so it has no smaller form to shrink
+ * to once its own period is up.
+ */
+export declare function expireContactMessage(message: ContactMessage, policy: RetentionPolicy, now: Date): ContactExpiry;
+/** `held` with `added` joined in, in {@link REDACTED_FIELDS} order. */
+export declare function withRedacted(held: readonly RedactedField[] | undefined, added: readonly RedactedField[]): RedactedField[];
+/** What {@link createRetentionService} needs. */
+export interface CreateRetentionServiceOptions {
+    /** The comment index the sweep keeps in step with the files. */
+    readonly admin: AdminStore;
+    /** Where the files are, and the clock the ages are measured by. */
+    readonly config: Pick<ResolvedConfig, 'contentDir' | 'dataDir' | 'now'>;
+    /** Defaults to the real interval timer. */
+    readonly timers?: NotificationTimers | undefined;
+    /** Defaults to `console`. */
+    readonly logger?: {
+        warn(message: string): void;
+    } | undefined;
+}
+/** The sweep, on a timer once the site serves. */
+export interface RetentionService {
+    /** Sweep now, queued behind any sweep already running, and say what changed. */
+    sweep(): Promise<RetentionReport>;
+    /** Sweep now and then every {@link RETENTION_SWEEP_MS}. Safe twice. */
+    start(): void;
+    /** Stop the timer. Safe before starting and safe twice. */
+    stop(): void;
+    /** Resolve once the sweep in flight has finished. */
+    settled(): Promise<void>;
+}
+/** Build the retention sweep for one site. */
+export declare function createRetentionService(options: CreateRetentionServiceOptions): RetentionService;
+//# sourceMappingURL=retention.d.ts.map

package/dist/privacy/retention.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"retention.d.ts","sourceRoot":"","sources":["../../src/privacy/retention.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAIlF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAMnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAErE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD;;;;;;;;;;;GAWG;AAEH,qDAAqD;AACrD,eAAO,MAAM,kBAAkB,QAAqB,CAAC;AAErD,8BAA8B;AAC9B,MAAM,WAAW,eAAe;IAC9B,4DAA4D;IAC5D,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,yEAAyE;IACzE,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,qDAAqD;IACrD,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;CACnC;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,eAAe,EACvB,GAAG,EAAE,IAAI,GACR,aAAa,GAAG,SAAS,CAiB3B;AAED,wDAAwD;AACxD,MAAM,MAAM,aAAa,GACrB;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACzB;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,GAC3B;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAA;CAAE,CAAC;AAElE;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,eAAe,EACvB,GAAG,EAAE,IAAI,GACR,aAAa,CAMf;AAED,uEAAuE;AACvE,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,aAAa,EAAE,GAAG,SAAS,EAC1C,KAAK,EAAE,SAAS,aAAa,EAAE,GAC9B,aAAa,EAAE,CAGjB;AAED,iDAAiD;AACjD,MAAM,WAAW,6BAA6B;IAC5C,gEAAgE;IAChE,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,mEAAmE;IACnE,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,YAAY,GAAG,SAAS,GAAG,KAAK,CAAC,CAAC;IACxE,2CAA2C;IAC3C,QAAQ,CAAC,MAAM,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACjD,6BAA6B;IAC7B,QAAQ,CAAC,MAAM,CAAC,EAAE;QAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,SAAS,CAAC;CAC/D;AAED,kDAAkD;AAClD,MAAM,WAAW,gBAAgB;IAC/B,gFAAgF;IAChF,KAAK,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;IAClC,uEAAuE;IACvE,KAAK,IAAI,IAAI,CAAC;IACd,2DAA2D;IAC3D,IAAI,IAAI,IAAI,CAAC;IACb,qDAAqD;IACrD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAID,8CAA8C;AAC9C,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,6BAA6B,GAAG,gBAAgB,CAsE/F"}

package/dist/privacy/retention.js

@@ -0,0 +1,133 @@
+import { REDACTED_FIELDS } from '../admin/store.js';
+import { readSiteSettings, retentionPolicyOf } from '../admin/settings.js';
+import { commentSlugs, rewriteComments } from '../comments/records.js';
+import { deleteContactMessage, listContactMessages, updateContactMessage, } from '../contact/records.js';
+import { systemNotificationTimers } from '../notifications/digest.js';
+import { outlived } from './policy.js';
+/**
+ * The retention sweep (TASK-135): what removes the personal data a site has
+ * kept for longer than it said it would.
+ *
+ * The files are the truth (decision-9), so the sweep reads them rather than
+ * the index: every comment file under `content/_data/comments/` and every
+ * message under `data/contact/`, each rewritten inside the lock every other
+ * writer of that file takes, and each comment it changes put back into the
+ * index in the same step. Removing a value that is already gone is not a
+ * change, so a sweep run twice, or run again after a crash halfway through,
+ * finishes in the same place and writes nothing the second time.
+ */
+/** How often the sweep runs once the site serves. */
+export const RETENTION_SWEEP_MS = 6 * 60 * 60 * 1000;
+/**
+ * One comment as the policy leaves it, or `undefined` when it has nothing to
+ * give up. The email goes with the reply subscription it served, since there
+ * is nowhere left to send one; the thread, the status and the words stay.
+ */
+export function expireComment(comment, policy, now) {
+    const email = comment.author.email !== null && outlived(comment.submitted, policy.commentEmailDays, now);
+    const address = comment.addressHash !== null && outlived(comment.submitted, policy.addressHashDays, now);
+    if (!email && !address)
+        return undefined;
+    return {
+        ...comment,
+        author: email ? { ...comment.author, email: null } : comment.author,
+        addressHash: address ? null : comment.addressHash,
+        notify: email ? false : comment.notify,
+        redacted: withRedacted(comment.redacted, [
+            ...(email ? ['email'] : []),
+            ...(address ? ['addressHash'] : []),
+        ]),
+    };
+}
+/**
+ * One contact message under the policy: kept as it is, deleted outright, or
+ * kept without the hash of the address it came from. A message is its
+ * sender's words and address together, so it has no smaller form to shrink
+ * to once its own period is up.
+ */
+export function expireContactMessage(message, policy, now) {
+    if (outlived(message.received, policy.contactMessageDays, now))
+        return { kind: 'delete' };
+    if (message.addressHash !== null && outlived(message.received, policy.addressHashDays, now)) {
+        return { kind: 'redact', message: { ...message, addressHash: null } };
+    }
+    return { kind: 'keep' };
+}
+/** `held` with `added` joined in, in {@link REDACTED_FIELDS} order. */
+export function withRedacted(held, added) {
+    const all = new Set([...(held ?? []), ...added]);
+    return REDACTED_FIELDS.filter((field) => all.has(field));
+}
+const NOTHING = { comments: 0, messagesDeleted: 0, messagesRedacted: 0 };
+/** Build the retention sweep for one site. */
+export function createRetentionService(options) {
+    const { admin, config } = options;
+    const timers = options.timers ?? systemNotificationTimers;
+    const logger = options.logger ?? console;
+    let sweeping = Promise.resolve();
+    let handle;
+    async function sweepOnce() {
+        // Read every time, so a period changed on the Discussion screen holds from
+        // the next sweep without a restart.
+        const policy = retentionPolicyOf(readSiteSettings(config.contentDir));
+        const now = config.now();
+        const records = { admin, contentDir: config.contentDir };
+        let comments = 0;
+        for (const slug of commentSlugs(config.contentDir)) {
+            const changed = await rewriteComments(records, slug, (comment) => expireComment(comment, policy, now));
+            comments += changed.length;
+        }
+        let messagesDeleted = 0;
+        let messagesRedacted = 0;
+        for (const listed of listContactMessages(config.dataDir)) {
+            const expiry = expireContactMessage(listed, policy, now);
+            if (expiry.kind === 'delete') {
+                if (await deleteContactMessage(config.dataDir, listed.id))
+                    messagesDeleted += 1;
+            }
+            else if (expiry.kind === 'redact') {
+                let redacted = false;
+                // Decided again on the message as the lock finds it, so a Mark read
+                // that landed since the listing is kept.
+                await updateContactMessage(config.dataDir, listed.id, (current) => {
+                    const again = expireContactMessage(current, policy, now);
+                    if (again.kind !== 'redact')
+                        return undefined;
+                    redacted = true;
+                    return again.message;
+                });
+                if (redacted)
+                    messagesRedacted += 1;
+            }
+        }
+        return { comments, messagesDeleted, messagesRedacted };
+    }
+    return {
+        sweep() {
+            const next = sweeping.then(sweepOnce).catch((thrown) => {
+                logger.warn(`The retention sweep failed: ${messageOf(thrown)}`);
+                return NOTHING;
+            });
+            sweeping = next;
+            return next;
+        },
+        start() {
+            if (handle !== undefined)
+                return;
+            void this.sweep();
+            handle = timers.set(() => void this.sweep(), RETENTION_SWEEP_MS);
+        },
+        stop() {
+            if (handle !== undefined)
+                timers.clear(handle);
+            handle = undefined;
+        },
+        async settled() {
+            await sweeping;
+        },
+    };
+}
+function messageOf(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+//# sourceMappingURL=retention.js.map

package/dist/privacy/retention.js.map

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

package/dist/web/conversation.d.ts

@@ -62,7 +62,10 @@ export interface InteractionAuthor {
     readonly handle: string | null;
     /** Their profile page, for a reader following the link. */
     readonly url: string | null;
-    /** Their avatar, when the site knows one. */
+    /**
+     * Their avatar, when the site knows one: always a same-origin path, never
+     * the remote URL, so a reader's browser asks this site for it (TASK-134).
+     */
     readonly avatar: string | null;
     /** Their id, which is what identifies them however they are named. */
     readonly actorId: string | null;
@@ -130,6 +133,11 @@ export interface ConversationContext {
      * showing while the post it is about is there to read.
      */
     readonly store: ContentStore;
+    /**
+     * Where the quote approvals are: a quote of a post is shown only while the
+     * post's author vouches for it (FEP-044f, TASK-171).
+     */
+    readonly contentDir: string;
     /** The site's public origin, for the post's object id. */
     readonly baseUrl: string;
 }

package/dist/web/conversation.d.ts.map

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

package/dist/web/conversation.js

@@ -1,5 +1,7 @@
+import { avatarHref } from '../avatars/avatars.js';
 import { postLabel } from '../content/post-type.js';
-import { actorHandle, replyFrom, REPLY_ACTIVITY_TYPE } from '../federation/replies.js';
+import { readAllQuoteAuthorizations } from '../federation/quotes.js';
+import { actorHandle, quoteFrom, replyFrom, REPLY_ACTIVITY_TYPE } from '../federation/replies.js';
 import { activityStreamsId, isPublicDocument, permalinkOfObjectId } from './documents.js';
 import { absoluteUrl } from './negotiate.js';
 import { sanitizeCommentHtml } from './sanitize.js';
@@ -42,14 +44,17 @@ function postConversation(context, document) {
     const root = objectId ?? document.permalink;
     const activities = objectId === undefined ? [] : activitiesAround(context.admin, objectId);
     const native = approvedComments(context.admin, document);
-    if (activities.length === 0 && native.length === 0)
-        return NOTHING;
     const naming = authorNaming(context.admin);
+    const quotes = objectId === undefined
+        ? []
+        : quotesOf(context.admin, readAllQuoteAuthorizations(context.contentDir), objectId, naming);
+    if (activities.length === 0 && native.length === 0 && quotes.length === 0)
+        return NOTHING;
     const withdrawn = withdrawnBy(activities);
     const written = [];
     const likes = [];
     const boosts = [];
-    const mentions = [];
+    const mentions = [...quotes];
     const reacted = new Set();
     for (const activity of activities) {
         const kind = REACTIONS[activity.activityType];
@@ -154,6 +159,16 @@ function siteConversation(context, limit) {
                 break;
         }
     }
+    // Every quote the site vouches for, rather than a page of them: there is one
+    // approval per quote, and a site has few enough to read whole.
+    for (const approval of readAllQuoteAuthorizations(context.contentDir)) {
+        const post = posts.get(approval.post);
+        if (post === undefined)
+            continue;
+        for (const quote of quotesOf(context.admin, [approval], approval.post, naming)) {
+            said.push({ ...quote, post });
+        }
+    }
     for (const stored of context.admin.listComments({
         status: 'approved',
         limit: limit * OVERSCAN,
@@ -168,9 +183,14 @@ function siteConversation(context, limit) {
 /** How many answers each of these posts has, by permalink. */
 function commentCounts(context, documents) {
     const counts = new Map();
+    const approvals = readAllQuoteAuthorizations(context.contentDir);
+    const naming = authorNaming(context.admin);
     for (const document of documents) {
         const objectId = activityStreamsId(document, context.baseUrl);
-        const federated = objectId === undefined ? 0 : context.admin.countRepliesTo(objectId);
+        const federated = objectId === undefined
+            ? 0
+            : context.admin.countRepliesTo(objectId) +
+                quotesOf(context.admin, approvals, objectId, naming).length;
         counts.set(document.permalink, federated + context.admin.countCommentsFor(document.slug, 'approved'));
     }
     return counts;
@@ -184,6 +204,46 @@ function commentCounts(context, documents) {
  * whose posts do not.
  */
 const OVERSCAN = 4;
+/**
+ * The approved quotes of one post, as mentions, in no order.
+ *
+ * The approval is what makes a quote showable (FEP-044f: a quote its author
+ * never approved should not be displayed), so the approvals are walked and the
+ * log is asked for each one's note, rather than the other way about. The note
+ * has to be the approved one, by the approved actor, quoting this post: an
+ * approval of one quote vouches for nothing else. Both are files (decision-9),
+ * so a rebuilt index shows exactly what the live one did.
+ */
+function quotesOf(admin, approvals, objectId, naming) {
+    const quotes = [];
+    for (const approval of approvals) {
+        if (approval.post !== objectId)
+            continue;
+        for (const activity of admin.listActivitiesAbout([approval.quote])) {
+            if (activity.actorId !== approval.actor)
+                continue;
+            const quote = quoteFrom(activity);
+            if (quote?.id !== approval.quote || quote.quoted !== objectId)
+                continue;
+            quotes.push({
+                id: quote.id,
+                source: 'activitypub',
+                kind: 'mention',
+                author: naming(quote.actorId),
+                url: quote.url,
+                content: sanitizeCommentHtml(quote.html),
+                published: quote.published,
+                inReplyTo: null,
+                status: 'published',
+                replies: [],
+            });
+            // The first `Create` of the note is the one shown: a redelivery is the
+            // same quote again.
+            break;
+        }
+    }
+    return quotes;
+}
 /** One logged fediverse reply as the thread's own shape. */
 function federatedInteraction(reply, author) {
     return {
@@ -229,7 +289,7 @@ function interactionOf(comment, permalink) {
             url: comment.author.url,
             // Only a webmention has one: it came out of the source page's `h-card`,
             // and a form asks nobody for a picture.
-            avatar: comment.author.avatar,
+            avatar: comment.author.avatar === null ? null : avatarHref(comment.author.avatar),
             actorId: null,
         },
         // Where it can be read. A comment written here lives here, at its own
@@ -513,11 +573,12 @@ function authorNaming(admin) {
         profiles ??= new Map(admin.listFollowers().map((entry) => [entry.actorId, entry]));
         const follower = profiles.get(actorId);
         const handle = follower?.handle ?? actorHandle(actorId) ?? null;
+        const icon = follower?.iconUrl ?? null;
         const author = {
             name: follower?.name ?? handle ?? actorId,
             handle,
             url: follower?.url ?? actorId,
-            avatar: follower?.iconUrl ?? null,
+            avatar: icon === null ? null : avatarHref(icon),
             actorId,
         };
         known.set(actorId, author);