@geekity/cms 0.3.0 → 0.5.0

package/dist/federation/article.js

@@ -1,37 +1,84 @@
 import { Article, Create, Delete, Hashtag, PUBLIC_COLLECTION, Source, Tombstone, Update, } from '@fedify/vocab';
 import { Temporal as TemporalPolyfill } from '@js-temporal/polyfill';
-import { isPublicDocument } from '../web/documents.js';
+import { listUsers, primaryUser } from '../admin/accounts.js';
+import { readSiteSettings, taxonomyBasesFromSettings } from '../admin/settings.js';
+import { userForAuthor } from '../web/authors.js';
+import { isPublicDocument, postObjectId } from '../web/documents.js';
 import { absoluteUrl } from '../web/negotiate.js';
-import { tagHref } from '../web/routes.js';
-import { SITE_ACTOR_IDENTIFIER } from './keys.js';
+import { categoryHref, tagHref } from '../web/taxonomy.js';
+import { actorId } from './actor.js';
 import { createActivityId, deleteActivityId, updateActivityId } from './paths.js';
+/**
+ * The user a post is announced by: the one its `author` names, and the site's
+ * first account for one that names nobody.
+ *
+ * decision-14 attributes a post to a person rather than to the site, and
+ * `userForAuthor` is the one rule that decides which — a username exactly, a
+ * display name only when exactly one person answers to it (TASK-67). The
+ * fallback matters because an `author` is free text in a file: a post that
+ * names a person who has since been deleted, or names nobody at all, is still
+ * a post this site has to be able to announce, and the first account is the
+ * only actor that can be chosen without guessing between people.
+ *
+ * `undefined` only for a site with no accounts, which is one in first-run
+ * setup and federates nothing.
+ */
+export function documentAuthor(context, document) {
+    const { dataDir } = context.data.config;
+    return userForAuthor(listUsers(dataDir), document.author) ?? primaryUser(dataDir);
+}
+/**
+ * The actor id and followers collection a post's activities are addressed
+ * with, or a thrown error for a site with no accounts.
+ *
+ * Every activity in this module names the same two URLs, and they have to be
+ * the same two: an `Article` attributed to one actor and `cc`'d to another's
+ * followers would be a post nobody could place.
+ */
+function attribution(context, document) {
+    const user = documentAuthor(context, document);
+    if (user === undefined) {
+        throw new Error(`The post "${document.slug}" cannot be federated: the site has no accounts, ` +
+            'and decision-14 makes a user the actor a post is announced by.');
+    }
+    return { actor: actorId(context, user), followers: context.getFollowersUri(user.username) };
+}
 /** The media type an `Article`'s `source` is labelled with. */
 export const SOURCE_MEDIA_TYPE = 'text/markdown';
 /**
  * Whether a document is one of the objects this site federates.
  *
  * doc-4 federates published posts and nothing else: pages are standing
- * content with no place in a timeline, and a draft or a trashed post is not
- * public at all. This is the one rule, so the object dispatcher, the outbox
- * and the permalink all agree about what exists.
+ * content with no place in a timeline, and a draft, a trashed post or one
+ * whose date has not arrived is not public at all. This is the one rule, so
+ * the object dispatcher, the outbox and the permalink all agree about what
+ * exists.
  */
-export function isFederatedDocument(document) {
-    return document.type === 'post' && isPublicDocument(document);
+export function isFederatedDocument(document, now = new Date()) {
+    return document.type === 'post' && isPublicDocument(document, now);
 }
 /**
  * One post as the `Article` doc-4 describes.
  *
- * The id comes from the Fedify context rather than from string concatenation,
- * so it stays in step with the path the object dispatcher is registered under,
- * and it is built from the slug rather than from the permalink, so moving a
- * post does not mint a second object. `url` is the permalink, which is the
- * page a human should land on.
+ * Its `id` and its `url` are the same URL — the permalink — because
+ * decision-13 gives a post one name for both audiences: a browser asking for
+ * HTML gets the page, a peer asking for ActivityStreams gets this. The
+ * exception is a post whose file already names an `activitypub.id`, which
+ * keeps it; see {@link articleObjectId}.
  *
  * `source` carries the Markdown the file holds, so a peer that wants to quote
  * or re-render the post has the text rather than only the rendering of it.
+ *
+ * `attributedTo` is the actor of the user the post's `author` names
+ * (decision-14), and `cc` is that user's followers: a post belongs to a person
+ * on this site, not to the site.
  */
 export function postArticle(context, document) {
     const { baseUrl } = context.data.config;
+    const { actor, followers } = attribution(context, document);
+    // The archives an activity points at are wherever the site currently serves
+    // them, which is a setting rather than a constant (TASK-36).
+    const bases = taxonomyBasesFromSettings(readSiteSettings(context.data.config.contentDir));
     return new Article({
         id: articleObjectId(context, document),
         url: new URL(absoluteUrl(document.permalink, baseUrl)),
@@ -40,17 +87,24 @@ export function postArticle(context, document) {
         source: new Source({ content: document.body, mediaType: SOURCE_MEDIA_TYPE }),
         published: toInstant(document.date) ?? null,
         updated: toInstant(document.updated) ?? null,
-        attribution: context.getActorUri(SITE_ACTOR_IDENTIFIER),
+        attribution: actor,
         // Public addressing, as a blog post is: anybody may fetch it, and every
-        // follower is told about it.
+        // follower of its author is told about it.
         to: PUBLIC_COLLECTION,
-        cc: context.getFollowersUri(SITE_ACTOR_IDENTIFIER),
-        tags: document.tags.map((tag) => new Hashtag({
-            name: `#${tag}`,
-            href: new URL(absoluteUrl(tagHref(tag, 0), baseUrl)),
-        })),
+        cc: followers,
+        // Both taxonomies become hashtags: a relay or a search that keys on a
+        // hashtag has no reason to care which of the two a term came from, and
+        // each one points at the archive the site serves for it.
+        tags: [
+            ...document.tags.map((tag) => hashtag(tag, tagHref(tag, 0, bases), baseUrl)),
+            ...document.categories.map((category) => hashtag(category, categoryHref(category, 0, bases), baseUrl)),
+        ],
     });
 }
+/** One taxonomy term as a `Hashtag` pointing at its archive. */
+function hashtag(term, href, baseUrl) {
+    return new Hashtag({ name: `#${term}`, href: new URL(absoluteUrl(href, baseUrl)) });
+}
 /**
  * The `Create` that announces a post: what the outbox lists, and what delivery
  * sends.
@@ -61,13 +115,14 @@ export function postArticle(context, document) {
  */
 export function postCreateActivity(context, document) {
     const article = postArticle(context, document);
+    const { actor, followers } = attribution(context, document);
     return new Create({
         id: createActivityId(articleObjectId(context, document)),
-        actor: context.getActorUri(SITE_ACTOR_IDENTIFIER),
+        actor,
         object: article,
         published: toInstant(document.date) ?? null,
         to: PUBLIC_COLLECTION,
-        cc: context.getFollowersUri(SITE_ACTOR_IDENTIFIER),
+        cc: followers,
     });
 }
 /**
@@ -77,16 +132,23 @@ export function postCreateActivity(context, document) {
  * ActivityPub offers and all a peer can apply. Its id carries the document's
  * hash, so two edits are two activities and the same edit delivered twice is
  * one; see {@link updateActivityId}.
+ *
+ * `revision` overrides that. A resend (decision-9) is asking for a revision
+ * the followers have already been offered to be offered again, and an activity
+ * id a peer has seen is one it is entitled to drop, so a resend passes the
+ * moment instead of the hash. Everything else about the activity is the same,
+ * which is what makes a resent `Update` and a saved one the same shape.
  */
-export function postUpdateActivity(context, document) {
+export function postUpdateActivity(context, document, revision = revisionOf(document)) {
     const article = postArticle(context, document);
+    const { actor, followers } = attribution(context, document);
     return new Update({
-        id: updateActivityId(articleObjectId(context, document), revisionOf(document)),
-        actor: context.getActorUri(SITE_ACTOR_IDENTIFIER),
+        id: updateActivityId(articleObjectId(context, document), revision),
+        actor,
         object: article,
         published: toInstant(document.updated ?? document.date) ?? null,
         to: PUBLIC_COLLECTION,
-        cc: context.getFollowersUri(SITE_ACTOR_IDENTIFIER),
+        cc: followers,
     });
 }
 /**
@@ -103,40 +165,30 @@ export function postUpdateActivity(context, document) {
  */
 export function postDeleteActivity(context, document, deleted) {
     const objectId = articleObjectId(context, document);
+    const { actor, followers } = attribution(context, document);
     return new Delete({
         id: deleteActivityId(objectId, deleted),
-        actor: context.getActorUri(SITE_ACTOR_IDENTIFIER),
+        actor,
         object: new Tombstone({
             id: objectId,
             formerType: Article,
             deleted: toInstant(deleted) ?? null,
         }),
         to: PUBLIC_COLLECTION,
-        cc: context.getFollowersUri(SITE_ACTOR_IDENTIFIER),
+        cc: followers,
     });
 }
 /**
- * A post's ActivityStreams object id: the one written into its front matter if
- * it has been federated, and the one its slug implies if it has not.
+ * A post's ActivityStreams object id, off the Fedify context: its permalink,
+ * or the id its file already names (decision-13).
  *
- * The stored id is what makes a rename invisible to a follower. Ids are minted
- * from the slug, so a post renamed after it was announced would otherwise
- * become a second object and be delivered as a `Create` all over again; doc-4
- * asks the `activitypub.id` key to prevent exactly that. The object dispatcher
- * resolves a stored id back to its post, so the old URL keeps answering.
+ * A thin wrapper over {@link postObjectId} so everything in this module reads
+ * the id the same way and off the same base URL the article's `url` is built
+ * on. The rule itself lives in `web/documents.ts`, because the page, the feed
+ * item and the object are one identity now rather than three.
  */
 export function articleObjectId(context, document) {
-    const stored = document.activitypub?.id;
-    if (stored !== undefined && stored !== '') {
-        try {
-            return new URL(stored);
-        }
-        catch {
-            // A hand-written `activitypub.id` that is not a URL is not an id. Fall
-            // back to the derived one rather than failing the delivery.
-        }
-    }
-    return context.getObjectUri(Article, { slug: document.slug });
+    return new URL(postObjectId(document, context.data.config.baseUrl));
 }
 /**
  * Which revision of a document an `Update` is announcing.

package/dist/federation/article.js.map

@@ -1 +1 @@
-{"version":3,"file":"article.js","sourceRoot":"","sources":["../../src/federation/article.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EACP,MAAM,EACN,MAAM,EACN,OAAO,EACP,iBAAiB,EACjB,MAAM,EACN,SAAS,EACT,MAAM,GACP,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,QAAQ,IAAI,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAElF,+DAA+D;AAC/D,MAAM,CAAC,MAAM,iBAAiB,GAAG,eAAe,CAAC;AAEjD;;;;;;;GAOG;AACH,MAAM,UAAU,mBAAmB,CAAC,QAAkB;IACpD,OAAO,QAAQ,CAAC,IAAI,KAAK,MAAM,IAAI,gBAAgB,CAAC,QAAQ,CAAC,CAAC;AAChE,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,WAAW,CAAC,OAAuC,EAAE,QAAkB;IACrF,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;IAExC,OAAO,IAAI,OAAO,CAAC;QACjB,EAAE,EAAE,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC;QACtC,GAAG,EAAE,IAAI,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACtD,IAAI,EAAE,QAAQ,CAAC,KAAK;QACpB,OAAO,EAAE,QAAQ,CAAC,IAAI;QACtB,MAAM,EAAE,IAAI,MAAM,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC;QAC5E,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI;QAC3C,OAAO,EAAE,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,IAAI;QAC5C,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,qBAAqB,CAAC;QACvD,wEAAwE;QACxE,6BAA6B;QAC7B,EAAE,EAAE,iBAAiB;QACrB,EAAE,EAAE,OAAO,CAAC,eAAe,CAAC,qBAAqB,CAAC;QAClD,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CACrB,CAAC,GAAG,EAAE,EAAE,CACN,IAAI,OAAO,CAAC;YACV,IAAI,EAAE,IAAI,GAAG,EAAE;YACf,IAAI,EAAE,IAAI,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;SACrD,CAAC,CACL;KACF,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAChC,OAAuC,EACvC,QAAkB;IAElB,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAE/C,OAAO,IAAI,MAAM,CAAC;QAChB,EAAE,EAAE,gBAAgB,CAAC,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACxD,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,qBAAqB,CAAC;QACjD,MAAM,EAAE,OAAO;QACf,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI;QAC3C,EAAE,EAAE,iBAAiB;QACrB,EAAE,EAAE,OAAO,CAAC,eAAe,CAAC,qBAAqB,CAAC;KACnD,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAChC,OAAuC,EACvC,QAAkB;IAElB,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAE/C,OAAO,IAAI,MAAM,CAAC;QAChB,EAAE,EAAE,gBAAgB,CAAC,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC9E,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,qBAAqB,CAAC;QACjD,MAAM,EAAE,OAAO;QACf,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI;QAC/D,EAAE,EAAE,iBAAiB;QACrB,EAAE,EAAE,OAAO,CAAC,eAAe,CAAC,qBAAqB,CAAC;KACnD,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,kBAAkB,CAChC,OAAuC,EACvC,QAAkB,EAClB,OAAe;IAEf,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAEpD,OAAO,IAAI,MAAM,CAAC;QAChB,EAAE,EAAE,gBAAgB,CAAC,QAAQ,EAAE,OAAO,CAAC;QACvC,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,qBAAqB,CAAC;QACjD,MAAM,EAAE,IAAI,SAAS,CAAC;YACpB,EAAE,EAAE,QAAQ;YACZ,UAAU,EAAE,OAAO;YACnB,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,IAAI,IAAI;SACpC,CAAC;QACF,EAAE,EAAE,iBAAiB;QACrB,EAAE,EAAE,OAAO,CAAC,eAAe,CAAC,qBAAqB,CAAC;KACnD,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,eAAe,CAAC,OAAuC,EAAE,QAAkB;IACzF,MAAM,MAAM,GAAG,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC;IACxC,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,EAAE,EAAE,CAAC;QAC1C,IAAI,CAAC;YACH,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;QACzB,CAAC;QAAC,MAAM,CAAC;YACP,uEAAuE;YACvE,4DAA4D;QAC9D,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;AAChE,CAAC;AAED;;;;;GAKG;AACH,SAAS,UAAU,CAAC,QAAkB;IACpC,OAAO,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AACpC,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,SAAS,CAAC,KAAyB;IACjD,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7B,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAAE,OAAO,SAAS,CAAC;IACnD,OAAO,gBAAgB,CAAC,OAAO,CAAC,qBAAqB,CACnD,IAAI,CAAC,OAAO,EAAE,CACgB,CAAC;AACnC,CAAC"}
+{"version":3,"file":"article.js","sourceRoot":"","sources":["../../src/federation/article.ts"],"names":[],"mappings":"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"}

package/dist/federation/delivery.d.ts

@@ -1,20 +1,25 @@
+import type { Recipient } from '@fedify/vocab';
+import type { User } from '../admin/accounts.ts';
 import type { AdminStore, Delivery, Follower } from '../admin/store.ts';
 import type { ResolvedConfig } from '../config.ts';
 import type { ContentStore } from '../content/store.ts';
 import type { DocumentChange } from '../content/sync.ts';
 import type { SiteFederation } from './federation.ts';
-/** What one activity's delivery came to, follower by follower. */
+/** What one activity's delivery came to, recipient by recipient. */
 export interface DeliveryReport {
     /** The activity that went out. */
     readonly activityId: string;
     /** `Create`, `Update` or `Delete`. */
     readonly activityType: string;
     /**
-     * The ActivityStreams id of what it was about: a post, or the site's own
-     * actor when the profile itself was what moved.
+     * The ActivityStreams id of what it was about: a post, or a user's own actor
+     * when the profile itself was what moved.
      */
     readonly objectId: string;
-    /** One row per follower, as recorded. Empty when nobody follows the site. */
+    /**
+     * One row per follower and per accepted relay, as recorded. Empty when the
+     * author has no followers and the site has no relay.
+     */
     readonly deliveries: readonly Delivery[];
 }
 /** Where a delivery service reports what it could not do. `console` will do. */
@@ -35,7 +40,8 @@ export interface CreateDeliveryServiceOptions {
     logger?: DeliveryLogger | undefined;
 }
 /**
- * Sends a site's posts to its followers, and remembers how that went.
+ * Sends a site's posts to its followers and its relays, and remembers how that
+ * went.
  *
  * Deliveries run one after another on a queue of their own rather than at
  * once, because ActivityPub has no way of saying that a `Create` came before
@@ -50,22 +56,34 @@ export interface DeliveryService {
      */
     handle(change: DocumentChange): Promise<void>;
     /**
-     * Tell the followers that the site's own profile has moved: an `Update`
-     * whose object is the actor, which is how a peer learns that the name, the
+     * Tell one user's followers that their profile has moved: an `Update` whose
+     * object is their actor, which is how a peer learns that the name, the
      * summary or the avatar it cached is out of date.
      *
-     * `undefined` when nobody follows the site, in which case nothing is built
-     * and nothing is recorded: there is no cached profile anywhere to refresh.
+     * `undefined` when that user has no followers and the site has no accepted
+     * relay, in which case nothing is built and nothing is recorded: there is no
+     * cached profile anywhere to refresh.
      */
-    updateActor(): Promise<DeliveryReport | undefined>;
+    updateActor(user: User): Promise<DeliveryReport | undefined>;
     /**
-     * Send a recorded activity again, to every follower the site has now.
+     * Send one post as it now reads to every follower and every accepted relay
+     * the site has.
+     *
+     * Not "send that activity again": the activity is built from the file at the
+     * moment this is called (decision-9), so a follower whose server was down
+     * ends up holding the post as it stands rather than the revision that failed
+     * to reach it. Which activity that is follows the same rule a save does — a
+     * published post no follower has been told about is a `Create` and is
+     * stamped, a published post they have is an `Update`, a draft or a trashed
+     * one is a `Delete` of a `Tombstone` — so a resend and an ordinary publish
+     * produce the same shapes.
      *
-     * decision-5 accepts that an activity queued when the process exits is lost
-     * and promises this as the way back. `undefined` means no such activity was
-     * ever sent.
+     * `undefined` when there is nothing to send: no post answers to that slug,
+     * or the post is one nobody outside the site has ever been told about and is
+     * not published now, so there is neither a copy to withdraw nor anything to
+     * announce.
      */
-    redeliver(activityId: string): Promise<DeliveryReport | undefined>;
+    resend(slug: string): Promise<DeliveryReport | undefined>;
     /** Resolve once every queued delivery has finished, however it finished. */
     settled(): Promise<void>;
 }
@@ -82,6 +100,36 @@ export interface DeliveryService {
  * archive to every follower every time somebody deleted the database.
  */
 export declare function createDeliveryService(options: CreateDeliveryServiceOptions): DeliveryService;
+/**
+ * One inbox a POST goes to, and who is behind it.
+ *
+ * The unit a fan-out works in. A follower group and a relay are the same thing
+ * from here — an inbox, the recipients Fedify addresses it with, and the actors
+ * whose delivery rows the outcome is written to — which is what lets a relay
+ * be recorded like a follower without pretending to be one.
+ */
+export interface DeliveryTarget {
+    /** The inbox one POST reaches: a shared inbox, a personal one, or a relay's. */
+    readonly inboxId: string;
+    /** What Fedify is handed to address it. */
+    readonly recipients: Recipient[];
+    /** Whose outcome rows this delivery writes: the followers, or the relay. */
+    readonly actorIds: readonly string[];
+}
+/**
+ * Everywhere one public activity goes: one user's followers, grouped by the
+ * inbox they share, and every accepted relay.
+ *
+ * The followers are one person's (decision-14) and the relays are the site's:
+ * a relay subscribes to everything public this site sends, whoever wrote it,
+ * so it is a target of every author's activities.
+ *
+ * A relay is one target of its own rather than a member of a group, because it
+ * is one inbox with one actor behind it and no shared inbox to fold into. A
+ * pending or rejected relay is not here at all — {@link acceptedRelays} is
+ * where that rule lives.
+ */
+export declare function deliveryTargets(admin: AdminStore, username: string): DeliveryTarget[];
 /**
  * Followers keyed by the inbox one POST to which reaches them: the instance's
  * shared inbox where it published one, and the follower's own where it did not.

package/dist/federation/delivery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delivery.d.ts","sourceRoot":"","sources":["../../src/federation/delivery.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAkB,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAGnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAUzD,OAAO,KAAK,EAAyB,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAK7E,kEAAkE;AAClE,MAAM,WAAW,cAAc;IAC7B,kCAAkC;IAClC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,sCAAsC;IACtC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B;;;OAGG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,6EAA6E;IAC7E,QAAQ,CAAC,UAAU,EAAE,SAAS,QAAQ,EAAE,CAAC;CAC1C;AAED,gFAAgF;AAChF,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,gDAAgD;AAChD,MAAM,WAAW,4BAA4B;IAC3C,gFAAgF;IAChF,UAAU,EAAE,cAAc,CAAC;IAC3B,sCAAsC;IACtC,KAAK,EAAE,UAAU,CAAC;IAClB,yEAAyE;IACzE,KAAK,EAAE,YAAY,CAAC;IACpB,uDAAuD;IACvD,MAAM,EAAE,cAAc,CAAC;IACvB,0DAA0D;IAC1D,MAAM,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;CACrC;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C;;;;;;;OAOG;IACH,WAAW,IAAI,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAAC;IACnD;;;;;;OAMG;IACH,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAAC;IACnE,4EAA4E;IAC5E,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,4BAA4B,GAAG,eAAe,CAkR5F;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,SAAS,EAAE,SAAS,QAAQ,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAWpF"}
+{"version":3,"file":"delivery.d.ts","sourceRoot":"","sources":["../../src/federation/delivery.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE/C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAkB,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAGnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAWzD,OAAO,KAAK,EAAyB,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAK7E,oEAAoE;AACpE,MAAM,WAAW,cAAc;IAC7B,kCAAkC;IAClC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,sCAAsC;IACtC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B;;;OAGG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B;;;OAGG;IACH,QAAQ,CAAC,UAAU,EAAE,SAAS,QAAQ,EAAE,CAAC;CAC1C;AAED,gFAAgF;AAChF,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,gDAAgD;AAChD,MAAM,WAAW,4BAA4B;IAC3C,gFAAgF;IAChF,UAAU,EAAE,cAAc,CAAC;IAC3B,sCAAsC;IACtC,KAAK,EAAE,UAAU,CAAC;IAClB,yEAAyE;IACzE,KAAK,EAAE,YAAY,CAAC;IACpB,uDAAuD;IACvD,MAAM,EAAE,cAAc,CAAC;IACvB,0DAA0D;IAC1D,MAAM,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;CACrC;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C;;;;;;;;OAQG;IACH,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAAC;IAC7D;;;;;;;;;;;;;;;;;OAiBG;IACH,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAAC;IAC1D,4EAA4E;IAC5E,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,4BAA4B,GAAG,eAAe,CAyT5F;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B,gFAAgF;IAChF,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,2CAA2C;IAC3C,QAAQ,CAAC,UAAU,EAAE,SAAS,EAAE,CAAC;IACjC,4EAA4E;IAC5E,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;CACtC;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,GAAG,cAAc,EAAE,CAuBrF;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,SAAS,EAAE,SAAS,QAAQ,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAWpF"}