@geekity/plugin-wordpress 0.5.0 → 0.6.1

package/README.md

@@ -26,7 +26,7 @@ pnpm add @geekity/plugin-wordpress
 ```
 
 ```ts
-import { defineConfig } from '@geekity/cms';
+import { defineConfig } from '@geekity/cms/config';
 import wordpress from '@geekity/plugin-wordpress';
 
 export default defineConfig({
@@ -105,6 +105,7 @@ reason.
 | ----------- | -------------------------------------------------------------------------------------------------------- |
 | `written`   | The file is new, was changed on WordPress since the last run, or was removed here and is written again.  |
 | `unchanged` | The file already holds what WordPress has.                                                               |
+| `removed`   | A comment the import wrote is no longer on WordPress, or is spam or trash there. It is removed here.     |
 | `kept`      | The file was edited on this site and WordPress has not changed it since. The edit stays.                 |
 | `conflict`  | The file was edited on this site and changed on WordPress too. The edit stays. The row gives both dates. |
 | `clash`     | A file the import never wrote is at the path. It is left alone.                                          |
@@ -115,7 +116,8 @@ reason.
 content directory byte for byte the same as one run. A run over a newer export
 picks up what was added or edited on WordPress since. The import never
 overwrites a file it did not write, and never deletes a file, so you can edit
-imported files and keep the edits. To take WordPress's side of a conflict,
+imported files and keep the edits. The one thing a rerun removes is an imported
+comment that WordPress no longer has, as described under comments below. To take WordPress's side of a conflict,
 remove the file and run the import again.
 
 ### Posts and pages
@@ -269,6 +271,17 @@ imported comment that a moderator approved, filed as spam, edited or deleted.
 It still marks such a comment migrated and gives it its origin, its user and
 its actor.
 
+A rerun also removes an imported comment that has left WordPress since the
+last run: one that was deleted there, or moved to spam or the trash. The
+WordPress ActivityPub plugin deletes a like or boost when its sender undoes
+it, so this keeps reaction counts the same on both sites. The import removes a
+comment only when it is still exactly as the import wrote it, compared with
+the hash in `import.json`. Each removal is a `removed` row naming the post and
+the WordPress comment id. A comment that was edited or moderated on this site
+stays and is reported as `kept`. A comment this site received itself is never
+removed. Comments recorded by an earlier version of the import have no
+WordPress id in `import.json`, so their rows name the comment's key instead.
+
 **Upgrading from 0.2.0.** Version 0.2.0 used each comment's WordPress URL as
 its id. The site replaces every such id with the key of that URL when it next
 boots, or when it next runs a plugin command. A rerun of the import then moves
@@ -337,7 +350,11 @@ The command:
    plugin's `actors.json`
 3. fetches the WordPress plugin's public followers collection into
    `content/_data/federation/ada/followers.json`. It dereferences each follower
-   for its inbox, shared inbox, handle, name, avatar and profile URL.
+   for its inbox, shared inbox, handle, name, avatar and profile URL. Each of
+   those requests is signed with the imported RSA key under
+   `<actor id>#main-key`, so servers that run Mastodon's authorized fetch
+   answer it. The report lists a follower whose server refuses the signed
+   request, and running the command again does not change that.
 
 | Option                                        | What it is                                                                                                                                            |
 | --------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |

package/dist/bundle/index.js

@@ -34662,45 +34662,45 @@ var require_jsonld_esm = __commonJS({
                   if (isCallable(C2) && (!setPrototypeOf || isPrototypeOf(TypedArray, C2))) return C2;
                   throw new TypeError2(tryToString(C2) + " is not a typed array constructor");
                 };
-                var exportTypedArrayMethod = function(KEY, property, forced, options) {
+                var exportTypedArrayMethod = function(KEY2, property, forced, options) {
                   if (!DESCRIPTORS) return;
                   if (forced) for (var ARRAY in TypedArrayConstructorsList) {
                     var TypedArrayConstructor = globalThis2[ARRAY];
-                    if (TypedArrayConstructor && hasOwn(TypedArrayConstructor.prototype, KEY)) try {
-                      delete TypedArrayConstructor.prototype[KEY];
+                    if (TypedArrayConstructor && hasOwn(TypedArrayConstructor.prototype, KEY2)) try {
+                      delete TypedArrayConstructor.prototype[KEY2];
                     } catch (error) {
                       try {
-                        TypedArrayConstructor.prototype[KEY] = property;
+                        TypedArrayConstructor.prototype[KEY2] = property;
                       } catch (error2) {
                       }
                     }
                   }
-                  if (!TypedArrayPrototype[KEY] || forced) {
-                    defineBuiltIn(TypedArrayPrototype, KEY, forced ? property : NATIVE_ARRAY_BUFFER_VIEWS && Int8ArrayPrototype[KEY] || property, options);
+                  if (!TypedArrayPrototype[KEY2] || forced) {
+                    defineBuiltIn(TypedArrayPrototype, KEY2, forced ? property : NATIVE_ARRAY_BUFFER_VIEWS && Int8ArrayPrototype[KEY2] || property, options);
                   }
                 };
-                var exportTypedArrayStaticMethod = function(KEY, property, forced) {
+                var exportTypedArrayStaticMethod = function(KEY2, property, forced) {
                   var ARRAY, TypedArrayConstructor;
                   if (!DESCRIPTORS) return;
                   if (setPrototypeOf) {
                     if (forced) for (ARRAY in TypedArrayConstructorsList) {
                       TypedArrayConstructor = globalThis2[ARRAY];
-                      if (TypedArrayConstructor && hasOwn(TypedArrayConstructor, KEY)) try {
-                        delete TypedArrayConstructor[KEY];
+                      if (TypedArrayConstructor && hasOwn(TypedArrayConstructor, KEY2)) try {
+                        delete TypedArrayConstructor[KEY2];
                       } catch (error) {
                       }
                     }
-                    if (!TypedArray[KEY] || forced) {
+                    if (!TypedArray[KEY2] || forced) {
                       try {
-                        return defineBuiltIn(TypedArray, KEY, forced ? property : NATIVE_ARRAY_BUFFER_VIEWS && TypedArray[KEY] || property);
+                        return defineBuiltIn(TypedArray, KEY2, forced ? property : NATIVE_ARRAY_BUFFER_VIEWS && TypedArray[KEY2] || property);
                       } catch (error) {
                       }
                     } else return;
                   }
                   for (ARRAY in TypedArrayConstructorsList) {
                     TypedArrayConstructor = globalThis2[ARRAY];
-                    if (TypedArrayConstructor && (!TypedArrayConstructor[KEY] || forced)) {
-                      defineBuiltIn(TypedArrayConstructor, KEY, property);
+                    if (TypedArrayConstructor && (!TypedArrayConstructor[KEY2] || forced)) {
+                      defineBuiltIn(TypedArrayConstructor, KEY2, property);
                     }
                   }
                 };
@@ -70064,9 +70064,13 @@ function withTrailingSlash(value) {
 function repliesKey(guid) {
   return createHash("sha256").update(guid).digest("hex").slice(0, 16);
 }
+var KEY = /^[0-9a-f]{16}$/;
 function webmentionKey(source, permalink) {
   return source === null || source === "" ? void 0 : repliesKey(`${source} ${permalink}`);
 }
+function isKey(value) {
+  return KEY.test(value);
+}
 
 // ../cms/dist/content/slug.js
 var TRANSLITERATIONS = [
@@ -71665,12 +71669,12 @@ function generateNextLine(state, level) {
   return `
 ${" ".repeat(state.indent * level)}`;
 }
-function scalarLayout(state, node, parent, level, isKey, flowOnly) {
+function scalarLayout(state, node, parent, level, isKey2, flowOnly) {
   return {
     node,
     parent,
     level,
-    isKey,
+    isKey: isKey2,
     flowOnly,
     shiftOfParent: level === 0 ? -1 : state.indent * (level - 1),
     shiftOfContent: state.indent * Math.max(1, level),
@@ -181950,10 +181954,14 @@ async function importFollowers(options) {
   const unchanged = [];
   const refreshed = [];
   const failed = [];
+  const signer = {
+    privateKey: await signingKeyOf(privateKeyFrom(options.privateKeyPem)),
+    keyId: new URL(`${options.actorId}#main-key`)
+  };
   for (const item of await collectionItems(source)) {
     const actor = uriOf(item) ?? String(item);
     try {
-      const document2 = isRecord(item) && uriOf(item["inbox"]) !== null ? item : await fetchAs(actor);
+      const document2 = isRecord(item) && uriOf(item["inbox"]) !== null ? item : await fetchAs(actor, signer);
       const follower = followerFrom(document2);
       const held = site.followers(username).find((entry) => entry.actorId === follower.actorId);
       await site.addFollower(username, follower);
@@ -181961,7 +181969,11 @@ async function importFollowers(options) {
       else if (sameFollower(held, follower)) unchanged.push(follower.actorId);
       else refreshed.push(follower.actorId);
     } catch (error) {
-      failed.push({ actor, reason: messageOf(error) });
+      failed.push({
+        actor,
+        reason: messageOf(error),
+        refused: error instanceof RefusedSignedFetchError
+      });
     }
   }
   return { source, added, unchanged, refreshed, failed };
@@ -182010,15 +182022,25 @@ function isUrl(source) {
   return protocol === "http:" || protocol === "https:";
 }
 var ACTIVITY_STREAMS_ACCEPT = 'application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"';
-async function fetchAs(url) {
+var RefusedSignedFetchError = class extends Error {
+  name = "RefusedSignedFetchError";
+};
+async function fetchAs(url, signer) {
   let response;
   try {
-    response = await fetch(url, { headers: { accept: ACTIVITY_STREAMS_ACCEPT } });
+    const request = new Request(url, { headers: { accept: ACTIVITY_STREAMS_ACCEPT } });
+    response = await fetch(
+      signer === void 0 ? request : await signRequest(request, signer.privateKey, signer.keyId)
+    );
   } catch (error) {
     throw new Error(`${url} could not be fetched: ${messageOf(error)}`, { cause: error });
   }
+  const status = `${String(response.status)} ${response.statusText}`.trim();
+  if (signer !== void 0 && (response.status === 401 || response.status === 403)) {
+    throw new RefusedSignedFetchError(`${url} refused a signed fetch: ${status}`);
+  }
   if (!response.ok) {
-    throw new Error(`${url} answered ${String(response.status)} ${response.statusText}`.trim());
+    throw new Error(`${url} answered ${status}`);
   }
   try {
     return await response.json();
@@ -182138,11 +182160,13 @@ function assertPairMatches(privateKey, publicKeyPem) {
   }
 }
 async function privateJwkOf(privateKey) {
+  return await exportJwk(await signingKeyOf(privateKey));
+}
+async function signingKeyOf(privateKey) {
   const pkcs8 = privateKey.export({ type: "pkcs8", format: "der" });
-  const key = await crypto.subtle.importKey("pkcs8", pkcs8, { name: RSA, hash: "SHA-256" }, true, [
+  return await crypto.subtle.importKey("pkcs8", pkcs8, { name: RSA, hash: "SHA-256" }, true, [
     "sign"
   ]);
-  return await exportJwk(key);
 }
 function sameKeyFile(held, incoming) {
   try {
@@ -182297,9 +182321,14 @@ function importSummary(report) {
     for (const failure of followers.failed) {
       lines.push(`    skipped   ${failure.actor}: ${failure.reason}`);
     }
-    if (followers.failed.length > 0) {
+    if (followers.failed.some((failure) => !failure.refused)) {
+      lines.push(
+        "  Followers whose servers did not answer were left out. Run this again once their servers answer; nothing already imported is touched twice."
+      );
+    }
+    if (followers.failed.some((failure) => failure.refused)) {
       lines.push(
-        "  Those followers were left out. Run this again once their servers answer; nothing already imported is touched twice."
+        "  Followers whose servers refused a fetch signed with the imported key were left out, and running this again will not bring them across. A --followers file that holds their actor documents will."
       );
     }
   }
@@ -182359,12 +182388,14 @@ async function importWordPressContent(options) {
   const files = [];
   const entries = [];
   const comments = [];
+  const posts = [];
   for (const importer of importers) {
     const output = await importer.import(exported, context2);
     files.push(...output.files);
     rows.push(...output.notes);
     entries.push(...output.entries ?? []);
     comments.push(...output.comments ?? []);
+    posts.push(...output.posts ?? []);
   }
   const record = readRecord(data);
   const seen = /* @__PURE__ */ new Set();
@@ -182391,8 +182422,10 @@ async function importWordPressContent(options) {
   for (const [permalink, onPost] of byPost) {
     rows.push(...await writeComments(context2.site, permalink, onPost, record, data));
   }
+  rows.push(...await pruneComments(context2.site, byPost, posts, record, data));
   const order = new Map(exported.items.map((item, index) => [item, index]));
-  rows.sort((a4, b2) => (order.get(a4.item) ?? 0) - (order.get(b2.item) ?? 0));
+  const at = (row) => row.item === void 0 ? exported.items.length : order.get(row.item) ?? 0;
+  rows.sort((a4, b2) => at(a4) - at(b2));
   return { rows };
 }
 function readRecord(data) {
@@ -182404,7 +182437,9 @@ function readRecord(data) {
   return {
     files: new Map(Object.entries(parsed.files ?? {})),
     entries: nested(parsed.entries),
-    comments: nested(parsed.comments)
+    comments: nested(parsed.comments),
+    commentPosts: new Map(Object.entries(parsed.commentPosts ?? {})),
+    commentWordPressIds: nested(parsed.commentWordPressIds)
   };
 }
 async function saveRecord(data, record) {
@@ -182415,6 +182450,10 @@ async function saveRecord(data, record) {
   const saved = { files: sorted(record.files) };
   if (record.entries.size > 0) saved.entries = nested(record.entries);
   if (record.comments.size > 0) saved.comments = nested(record.comments);
+  if (record.commentPosts.size > 0) saved.commentPosts = sorted(record.commentPosts);
+  if (record.commentWordPressIds.size > 0) {
+    saved.commentWordPressIds = nested(record.commentWordPressIds);
+  }
   await data.update(IMPORT_RECORD_FILE, () => `${JSON.stringify(saved, null, 2)}
 `);
 }
@@ -182512,7 +182551,8 @@ async function writeComments(site, permalink, comments, record, data) {
   const { recorded, carried } = carryOver(record.comments.get(held.file), comments, byId);
   const rows = [];
   const writes = [];
-  for (const { item, comment, label } of comments) {
+  const wordPressIds = record.commentWordPressIds.get(held.file) ?? /* @__PURE__ */ new Map();
+  for (const { item, comment, wordPressId, label } of comments) {
     const here = byId.get(comment.id);
     const now = here === void 0 ? void 0 : sha256(canonical(here));
     const before = recorded.get(comment.id);
@@ -182534,13 +182574,91 @@ async function writeComments(site, permalink, comments, record, data) {
       why = `${why}; marked migrated, with its origin${comment.user === void 0 ? "" : " and its user"}${comment.actor === void 0 ? "" : " and its actor"}`;
     }
     if (decision.action !== "leave") recorded.set(comment.id, next);
+    if (recorded.has(comment.id)) wordPressIds.set(comment.id, wordPressId);
     rows.push({ outcome: decision.outcome, item, path: held.file, why: `${label}: ${why}` });
   }
   await site.putComments(permalink, writes);
-  if (recorded.size > 0) record.comments.set(held.file, recorded);
+  if (recorded.size > 0) {
+    record.comments.set(held.file, recorded);
+    record.commentPosts.set(held.file, permalink);
+    record.commentWordPressIds.set(held.file, wordPressIds);
+  }
   await saveRecord(data, record);
   return rows;
 }
+async function pruneComments(site, imported, posts, record, data) {
+  const items = new Map(posts.map(({ item, permalink }) => [permalink, item]));
+  const formerIds = new Map(
+    [...imported.values()].flat().map(({ comment, formerId }) => [comment.id, formerId])
+  );
+  let legacyPostsByFile;
+  const rows = [];
+  let changed = false;
+  for (const [file, recorded] of [...record.comments]) {
+    let permalink = record.commentPosts.get(file);
+    if (permalink === void 0) {
+      legacyPostsByFile ??= new Map(
+        posts.map((post) => [site.comments(post.permalink).file, post.permalink])
+      );
+      permalink = legacyPostsByFile.get(file);
+    }
+    if (permalink === void 0) continue;
+    const item = items.get(permalink);
+    const kept = new Set((imported.get(permalink) ?? []).map(({ comment }) => comment.id));
+    const held = new Map(site.comments(permalink).comments.map((comment) => [comment.id, comment]));
+    const wordPressIds = record.commentWordPressIds.get(file);
+    const former = new Map(
+      [...recorded.keys()].filter((entry) => !isKey(entry)).map((entry) => [repliesKey(entry), entry])
+    );
+    for (const [entry, before] of [...recorded]) {
+      const id = keyOfRecorded(entry);
+      if (kept.has(id)) continue;
+      const forget = () => {
+        recorded.delete(entry);
+        wordPressIds?.delete(entry);
+        changed = true;
+      };
+      const here = held.get(id);
+      if (here === void 0) {
+        forget();
+        continue;
+      }
+      const asWritten = isKey(entry) ? here : {
+        ...here,
+        id: entry,
+        inReplyTo: here.inReplyTo === null ? null : former.get(here.inReplyTo) ?? formerIds.get(here.inReplyTo) ?? here.inReplyTo
+      };
+      const wordPressId = wordPressIds?.get(entry) ?? /#comment-(\d+)$/.exec(entry)?.[1];
+      const label = `${wordPressId === void 0 ? `comment with key ${id}` : `comment ${String(wordPressId)}`}, a ${here.kind} by ${here.author.name}`;
+      const where = item === void 0 ? `on ${permalink}, which this export no longer imports; ` : "";
+      const gone = "no longer on WordPress, or spam or trash there";
+      if (sha256(canonical(asWritten)) === before) {
+        await site.removeComment(id);
+        forget();
+        rows.push({
+          outcome: "removed",
+          item,
+          path: file,
+          why: `${label}: ${where}${gone}; removed`
+        });
+      } else {
+        rows.push({
+          outcome: "kept",
+          item,
+          path: file,
+          why: `${label}: ${where}${gone}, but edited on this site; left alone`
+        });
+      }
+    }
+    if (recorded.size === 0) {
+      record.comments.delete(file);
+      record.commentPosts.delete(file);
+      record.commentWordPressIds.delete(file);
+    }
+  }
+  if (changed) await saveRecord(data, record);
+  return rows;
+}
 function carryOver(saved, comments, held) {
   const recorded = new Map(saved);
   const carried = /* @__PURE__ */ new Set();
@@ -182587,6 +182705,9 @@ async function readIfPresent(file) {
 function sha256(contents) {
   return createHash2("sha256").update(contents).digest("hex");
 }
+function keyOfRecorded(entry) {
+  return isKey(entry) ? entry : repliesKey(entry);
+}
 
 // src/media.ts
 var WORDPRESS_UPLOADS = "/wp-content/uploads/";
@@ -182681,6 +182802,11 @@ function decoded(text3) {
 var import_turndown = __toESM(require_turndown_cjs(), 1);
 function convertBody(content) {
   let html = content.replace(/\r\n?/g, "\n");
+  let contact = false;
+  html = html.replace(JETPACK_CONTACT_FORM, () => {
+    contact = true;
+    return "";
+  });
   let inReplyTo;
   html = html.replace(
     /<!--\s+wp:activitypub\/reply\s+(\{[\s\S]*?\})\s+\/-->/g,
@@ -182705,8 +182831,9 @@ function convertBody(content) {
 `);
   if (!blocks) html = wpautop(html);
   const markdown = tidy(turndown.turndown(html));
-  return { markdown, ...inReplyTo === void 0 ? {} : { inReplyTo } };
+  return { markdown, contact, ...inReplyTo === void 0 ? {} : { inReplyTo } };
 }
+var JETPACK_CONTACT_FORM = /\[contact-form(?=[\s/\]])[^\]]*?(?:\/\]|\][\s\S]*?\[\/contact-form\])/g;
 function tidy(markdown) {
   const lines = [];
   let fence;
@@ -183075,11 +183202,19 @@ function importPostsAndPages(exported, context2) {
       });
     }
     const body = convertBody(item.content);
+    if (body.contact && item.type !== "page") {
+      notes.push({
+        item,
+        outcome: "warned",
+        why: "had a Jetpack contact form, which was dropped, since only pages offer the contact form"
+      });
+    }
     const document2 = documentOf(item, disposition, {
       permalink,
       formerly: formerPermalinks(item, permalink),
       author,
       inReplyTo: body.inReplyTo,
+      contact: body.contact,
       home,
       body: media.rewrite(body.markdown)
     });
@@ -183238,6 +183373,7 @@ function documentOf(item, disposition, derived) {
   const extra = {};
   if (guid !== void 0) extra["guid"] = guid;
   if (disposition.migrated) extra["migrated"] = true;
+  if (derived.contact && item.type === "page") extra["contact"] = true;
   return {
     title,
     ...date === void 0 ? {} : { date },
@@ -183290,6 +183426,7 @@ function importComments(exported, context2) {
   for (const placement of placements(exported)) {
     if ("permalink" in placement) permalinks.set(placement.item, placement.permalink);
   }
+  const posts = [...permalinks].map(([item, permalink]) => ({ item, permalink }));
   const usernames = new Set(context2.site.users().map((user) => user.username));
   const users = new Map(
     exported.authors.filter((author) => usernames.has(author.login)).map((author) => [author.id, author.login])
@@ -183311,7 +183448,7 @@ function importComments(exported, context2) {
     notes.push(...mapped.notes);
     comments.push(...mapped.comments);
   }
-  return { files: [], notes, comments };
+  return { files: [], notes, comments, posts };
 }
 function mapComments(item, permalink, markdownOf, users, actors) {
   const notes = [];
@@ -183364,7 +183501,7 @@ function mapComments(item, permalink, markdownOf, users, actors) {
     kept.filter(({ comment }) => comment.kind === "reply").map(({ wordPress, comment }) => [wordPress.id, comment.id])
   );
   const comments = kept.map(({ wordPress, comment, formerId, label }) => {
-    const imported = { item, permalink, formerId, label };
+    const imported = { item, permalink, formerId, wordPressId: wordPress.id, label };
     const { parent } = wordPress;
     if (parent === 0) return { ...imported, comment };
     const inReplyTo = replies.get(parent);
@@ -184273,6 +184410,7 @@ async function readExport(given, file) {
 var OUTCOMES = [
   "written",
   "unchanged",
+  "removed",
   "kept",
   "conflict",
   "clash",
@@ -184287,7 +184425,7 @@ function formatReport(given, contentDir, report) {
   };
   const outcomes = count(report.rows.map((row) => row.outcome));
   const skippedTypes = count(
-    report.rows.filter((row) => row.outcome === "skipped").map((row) => row.item.type)
+    report.rows.filter((row) => row.outcome === "skipped").map((row) => row.item?.type ?? "")
   );
   const lines = [
     `Imported ${given} into ${contentDir}`,
@@ -184308,9 +184446,9 @@ function formatReport(given, contentDir, report) {
     lines.push(
       [
         row.outcome,
-        row.item.type,
-        String(row.item.id),
-        row.item.title.replace(/\s+/g, " "),
+        row.item?.type ?? "",
+        row.item === void 0 ? "" : String(row.item.id),
+        row.item?.title.replace(/\s+/g, " ") ?? "",
         row.path ?? "",
         row.why
       ].join("	")
@@ -184519,7 +184657,7 @@ function wordPressScreen(records) {
 }
 
 // src/version.ts
-var VERSION2 = "0.5.0";
+var VERSION2 = "0.6.1";
 
 // src/index.ts
 var index_default = definePlugin({

package/dist/bundle/plugin.json

@@ -1,8 +1,8 @@
 {
   "name": "@geekity/plugin-wordpress",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "hostApi": 2,
   "peerDependencies": {
-    "@geekity/cms": ">=0.32.0 <1.0.0"
+    "@geekity/cms": ">=0.34.0 <1.0.0"
   }
 }

package/dist/command.d.ts

@@ -1,4 +1,5 @@
 import type { PluginCommand } from '@geekity/cms/plugin';
+import type { ImportWordPressActorReport } from './import.ts';
 import type { WordPressRecords } from './records.ts';
 /**
  * `geekity import wordpress-actor <username>`: the cutover, for one person.
@@ -14,4 +15,6 @@ import type { WordPressRecords } from './records.ts';
  * comes first.
  */
 export declare function importCommand(records: WordPressRecords): PluginCommand;
+/** What the run did, as the operator reads it. */
+export declare function importSummary(report: ImportWordPressActorReport): string;
 //# sourceMappingURL=command.d.ts.map

package/dist/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../src/command.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAwB,MAAM,qBAAqB,CAAC;AAK/E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD;;;;;;;;;;;;GAYG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,gBAAgB,GAAG,aAAa,CAkDtE"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../src/command.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAwB,MAAM,qBAAqB,CAAC;AAG/E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAE9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD;;;;;;;;;;;;GAYG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,gBAAgB,GAAG,aAAa,CAkDtE;AAqHD,kDAAkD;AAClD,wBAAgB,aAAa,CAAC,MAAM,EAAE,0BAA0B,GAAG,MAAM,CA4CxE"}

package/dist/command.js

@@ -152,7 +152,7 @@ function followersSource(context) {
     return isAbsoluteHttpUrl(given) ? given : path.resolve(context.cwd, given);
 }
 /** What the run did, as the operator reads it. */
-function importSummary(report) {
+export function importSummary(report) {
     const lines = [];
     const { followers } = report;
     lines.push(report.changed
@@ -174,9 +174,14 @@ function importSummary(report) {
         for (const failure of followers.failed) {
             lines.push(`    skipped   ${failure.actor}: ${failure.reason}`);
         }
-        if (followers.failed.length > 0) {
-            lines.push('  Those followers were left out. Run this again once their servers answer; ' +
-                'nothing already imported is touched twice.');
+        if (followers.failed.some((failure) => !failure.refused)) {
+            lines.push('  Followers whose servers did not answer were left out. Run this again once their ' +
+                'servers answer; nothing already imported is touched twice.');
+        }
+        if (followers.failed.some((failure) => failure.refused)) {
+            lines.push('  Followers whose servers refused a fetch signed with the imported key were left out, ' +
+                'and running this again will not bring them across. A --followers file that holds ' +
+                'their actor documents will.');
         }
     }
     return `${lines.join('\n')}\n`;

package/dist/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../src/command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../src/command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAI7B,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAG1D;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,aAAa,CAAC,OAAyB;IACrD,OAAO;QACL,KAAK,EAAE,CAAC,QAAQ,EAAE,iBAAiB,CAAC;QACpC,KAAK,EACH,wJAAwJ;QAC1J,OAAO,EACL,uKAAuK;QACzK,OAAO,EAAE;YACP;gBACE,IAAI,EAAE,UAAU;gBAChB,KAAK,EAAE,OAAO;gBACd,WAAW,EACT,mGAAmG;aACtG;YACD;gBACE,IAAI,EAAE,cAAc;gBACpB,KAAK,EAAE,KAAK;gBACZ,WAAW,EAAE,qEAAqE,0BAA0B,qBAAqB;aAClI;YACD;gBACE,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,QAAQ;gBACf,WAAW,EACT,qHAAqH;aACxH;YACD;gBACE,IAAI,EAAE,aAAa;gBACnB,KAAK,EAAE,QAAQ;gBACf,WAAW,EAAE,+CAA+C;aAC7D;YACD;gBACE,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,QAAQ;gBACf,WAAW,EACT,0GAA0G;aAC7G;YACD;gBACE,IAAI,EAAE,WAAW;gBACjB,KAAK,EAAE,iBAAiB;gBACxB,WAAW,EACT,iHAAiH;aACpH;YACD;gBACE,IAAI,EAAE,OAAO;gBACb,WAAW,EACT,kMAAkM;aACrM;SACF;QACD,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC;KACxC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,GAAG,CAAC,OAA6B,EAAE,OAAyB;IACzE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAElC,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACzB,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CACb,+EAA+E;YAC7E,yBAAyB,CAC5B,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAC1C,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CACb,oFAAoF;YAClF,gFAAgF;YAChF,8EAA8E,CACjF,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,6CAA6C,OAAO,eAAe,CAAC,CAAC;IACvF,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAC7C,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CACb,mFAAmF;YACjF,wCAAwC,0BAA0B,kBAAkB,CACvF,CAAC;IACJ,CAAC;IAED,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;IAEnE,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC;QACxC,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,OAAO;QACP,QAAQ;QACR,OAAO;QACP,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC;QAChC,aAAa;QACb,YAAY;QACZ,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC;QACnC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,IAAI;KACjC,CAAC,CAAC;IAEH,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;IACrC,OAAO,CAAC,CAAC;AACX,CAAC;AAED;;;;;;;GAOG;AACH,KAAK,UAAU,WAAW,CACxB,OAA6B;IAE7B,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IACjC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACzC,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAChD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAE9C,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACvE,CAAC;QACD,IAAI,MAAe,CAAC;QACpB,IAAI,CAAC;YACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;QAC1E,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACb,GAAG,OAAO,yEAAyE;gBACjF,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAC7D,EAAE,KAAK,EAAE,KAAK,EAAE,CACjB,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,GAAG,MAAgE,CAAC;QAC9E,IAAI,OAAO,IAAI,EAAE,WAAW,KAAK,QAAQ,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,qDAAqD,CAAC,CAAC;QACnF,CAAC;QACD,OAAO;YACL,aAAa,EAAE,IAAI,CAAC,WAAW;YAC/B,YAAY,EAAE,OAAO,IAAI,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;SAChF,CAAC;IACJ,CAAC;IAED,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CACb,6EAA6E;YAC3E,kFAAkF;YAClF,gEAAgE,CACnE,CAAC;IACJ,CAAC;IAED,OAAO;QACL,aAAa,EAAE,MAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC;QACpE,YAAY,EACV,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,MAAM,CAAC;KAC7F,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAS,eAAe,CAAC,OAA6B;IACpD,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACjD,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,IAAI,KAAK,KAAK,MAAM;QAAE,OAAO,KAAK,CAAC;IACnC,OAAO,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAC7E,CAAC;AAED,kDAAkD;AAClD,MAAM,UAAU,aAAa,CAAC,MAAkC;IAC9D,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IAE7B,KAAK,CAAC,IAAI,CACR,MAAM,CAAC,OAAO;QACZ,CAAC,CAAC,YAAY,MAAM,CAAC,QAAQ,SAAS,MAAM,CAAC,OAAO,EAAE;QACtD,CAAC,CAAC,sBAAsB,MAAM,CAAC,QAAQ,eAAe,MAAM,CAAC,OAAO,EAAE,CACzE,CAAC;IACF,KAAK,CAAC,IAAI,CACR,iBAAiB,MAAM,CAAC,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,GAAG;QACzE,iEAAiE,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,CACtG,CAAC;IACF,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI;QAAE,KAAK,CAAC,IAAI,CAAC,iBAAiB,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IAEpF,IAAI,SAAS,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACnC,KAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IACtC,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,IAAI,CACR,iBAAiB,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU;YACvD,GAAG,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc;YACnD,GAAG,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc;YACnD,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,wBAAwB;YAC1D,IAAI,SAAS,CAAC,MAAM,GAAG,CAC1B,CAAC;QACF,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACvC,KAAK,CAAC,IAAI,CAAC,iBAAiB,OAAO,CAAC,KAAK,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAClE,CAAC;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACzD,KAAK,CAAC,IAAI,CACR,oFAAoF;gBAClF,4DAA4D,CAC/D,CAAC;QACJ,CAAC;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACxD,KAAK,CAAC,IAAI,CACR,wFAAwF;gBACtF,mFAAmF;gBACnF,6BAA6B,CAChC,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;AACjC,CAAC;AAED,+EAA+E;AAC/E,SAAS,IAAI,CAAC,OAAgD,EAAE,IAAY;IAC1E,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AACvD,CAAC;AAED,mDAAmD;AACnD,SAAS,iBAAiB,CAAC,KAAa;IACtC,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC;IAC5C,OAAO,QAAQ,KAAK,OAAO,IAAI,QAAQ,KAAK,QAAQ,CAAC;AACvD,CAAC"}

package/dist/comments-import.js

@@ -35,6 +35,7 @@ function importComments(exported, context) {
         if ('permalink' in placement)
             permalinks.set(placement.item, placement.permalink);
     }
+    const posts = [...permalinks].map(([item, permalink]) => ({ item, permalink }));
     // Who wrote it signed in: the WordPress user's login, when this site has a
     // user by that name, the rule a post's author is mapped by.
     const usernames = new Set(context.site.users().map((user) => user.username));
@@ -61,7 +62,7 @@ function importComments(exported, context) {
         notes.push(...mapped.notes);
         comments.push(...mapped.comments);
     }
-    return { files: [], notes, comments };
+    return { files: [], notes, comments, posts };
 }
 function mapComments(item, permalink, markdownOf, users, actors) {
     const notes = [];
@@ -118,7 +119,7 @@ function mapComments(item, permalink, markdownOf, users, actors) {
         .filter(({ comment }) => comment.kind === 'reply')
         .map(({ wordPress, comment }) => [wordPress.id, comment.id]));
     const comments = kept.map(({ wordPress, comment, formerId, label }) => {
-        const imported = { item, permalink, formerId, label };
+        const imported = { item, permalink, formerId, wordPressId: wordPress.id, label };
         const { parent } = wordPress;
         if (parent === 0)
             return { ...imported, comment };