@rmdes/indiekit-endpoint-activitypub 0.1.9 → 0.2.0

package/lib/jf2-to-as2.js

@@ -1,18 +1,39 @@
 /**
  * Convert Indiekit JF2 post properties to ActivityStreams 2.0 objects.
  *
- * JF2 is the simplified Microformats2 JSON format used by Indiekit internally.
- * ActivityStreams 2.0 (AS2) is the JSON-LD format used by ActivityPub for federation.
+ * Two export flavors:
+ * - jf2ToActivityStreams() — returns plain JSON-LD objects (for content negotiation)
+ * - jf2ToAS2Activity()    — returns Fedify vocab instances (for outbox + syndicator)
+ */
+
+import { Temporal } from "@js-temporal/polyfill";
+import {
+  Announce,
+  Article,
+  Audio,
+  Create,
+  Hashtag,
+  Image,
+  Like,
+  Note,
+  Video,
+} from "@fedify/fedify";
+
+// ---------------------------------------------------------------------------
+// Plain JSON-LD (content negotiation on individual post URLs)
+// ---------------------------------------------------------------------------
+
+/**
+ * Convert JF2 properties to a plain ActivityStreams JSON-LD object.
  *
- * @param {object} properties - JF2 post properties from Indiekit's posts collection
- * @param {string} actorUrl - This actor's URL (e.g. "https://rmendes.net/")
+ * @param {object} properties - JF2 post properties
+ * @param {string} actorUrl - Actor URL (e.g. "https://example.com/activitypub/users/rick")
  * @param {string} publicationUrl - Publication base URL with trailing slash
  * @returns {object} ActivityStreams activity (Create, Like, or Announce)
  */
 export function jf2ToActivityStreams(properties, actorUrl, publicationUrl) {
   const postType = properties["post-type"];
 
-  // Like — not wrapped in Create, stands alone
   if (postType === "like") {
     return {
       "@context": "https://www.w3.org/ns/activitystreams",
@@ -22,7 +43,6 @@ export function jf2ToActivityStreams(properties, actorUrl, publicationUrl) {
     };
   }
 
-  // Repost/boost — Announce activity
   if (postType === "repost") {
     return {
       "@context": "https://www.w3.org/ns/activitystreams",
@@ -32,7 +52,6 @@ export function jf2ToActivityStreams(properties, actorUrl, publicationUrl) {
     };
   }
 
-  // Everything else is wrapped in a Create activity
   const isArticle = postType === "article" && properties.name;
   const postUrl = resolvePostUrl(properties.url, publicationUrl);
 
@@ -43,10 +62,9 @@ export function jf2ToActivityStreams(properties, actorUrl, publicationUrl) {
     published: properties.published,
     url: postUrl,
     to: ["https://www.w3.org/ns/activitystreams#Public"],
-    cc: [`${actorUrl.replace(/\/$/, "")}/activitypub/followers`],
+    cc: [`${actorUrl.replace(/\/$/, "")}/followers`],
   };
 
-  // Content — bookmarks get special treatment
   if (postType === "bookmark") {
     const bookmarkUrl = properties["bookmark-of"];
     const commentary = properties.content?.html || properties.content || "";
@@ -71,19 +89,163 @@ export function jf2ToActivityStreams(properties, actorUrl, publicationUrl) {
     }
   }
 
-  // Reply
   if (properties["in-reply-to"]) {
     object.inReplyTo = properties["in-reply-to"];
   }
 
-  // Media attachments
+  const attachments = buildPlainAttachments(properties, publicationUrl);
+  if (attachments.length > 0) {
+    object.attachment = attachments;
+  }
+
+  const tags = buildPlainTags(properties, publicationUrl, object.tag);
+  if (tags.length > 0) {
+    object.tag = tags;
+  }
+
+  return {
+    "@context": "https://www.w3.org/ns/activitystreams",
+    type: "Create",
+    actor: actorUrl,
+    object,
+  };
+}
+
+// ---------------------------------------------------------------------------
+// Fedify vocab objects (outbox dispatcher + syndicator delivery)
+// ---------------------------------------------------------------------------
+
+/**
+ * Convert JF2 properties to a Fedify Activity object.
+ *
+ * @param {object} properties - JF2 post properties
+ * @param {string} actorUrl - Actor URL (e.g. "https://example.com/activitypub/users/rick")
+ * @param {string} publicationUrl - Publication base URL with trailing slash
+ * @returns {import("@fedify/fedify").Activity | null}
+ */
+export function jf2ToAS2Activity(properties, actorUrl, publicationUrl) {
+  const postType = properties["post-type"];
+  const actorUri = new URL(actorUrl);
+
+  if (postType === "like") {
+    const likeOf = properties["like-of"];
+    if (!likeOf) return null;
+    return new Like({
+      actor: actorUri,
+      object: new URL(likeOf),
+    });
+  }
+
+  if (postType === "repost") {
+    const repostOf = properties["repost-of"];
+    if (!repostOf) return null;
+    return new Announce({
+      actor: actorUri,
+      object: new URL(repostOf),
+      to: new URL("https://www.w3.org/ns/activitystreams#Public"),
+    });
+  }
+
+  const isArticle = postType === "article" && properties.name;
+  const postUrl = resolvePostUrl(properties.url, publicationUrl);
+  const followersUrl = `${actorUrl.replace(/\/$/, "")}/followers`;
+
+  const noteOptions = {
+    attributedTo: actorUri,
+    to: new URL("https://www.w3.org/ns/activitystreams#Public"),
+    cc: new URL(followersUrl),
+  };
+
+  if (postUrl) {
+    noteOptions.id = new URL(postUrl);
+    noteOptions.url = new URL(postUrl);
+  }
+
+  if (properties.published) {
+    try {
+      noteOptions.published = Temporal.Instant.from(properties.published);
+    } catch {
+      // Invalid date format — skip
+    }
+  }
+
+  // Content
+  if (postType === "bookmark") {
+    const bookmarkUrl = properties["bookmark-of"];
+    const commentary = properties.content?.html || properties.content || "";
+    noteOptions.content = commentary
+      ? `${commentary}<br><br>\u{1F516} <a href="${bookmarkUrl}">${bookmarkUrl}</a>`
+      : `\u{1F516} <a href="${bookmarkUrl}">${bookmarkUrl}</a>`;
+  } else {
+    noteOptions.content = properties.content?.html || properties.content || "";
+  }
+
+  if (isArticle) {
+    noteOptions.name = properties.name;
+    if (properties.summary) {
+      noteOptions.summary = properties.summary;
+    }
+  }
+
+  if (properties["in-reply-to"]) {
+    noteOptions.inReplyTo = new URL(properties["in-reply-to"]);
+  }
+
+  // Attachments
+  const fedifyAttachments = buildFedifyAttachments(properties, publicationUrl);
+  if (fedifyAttachments.length > 0) {
+    noteOptions.attachments = fedifyAttachments;
+  }
+
+  // Hashtags
+  const fedifyTags = buildFedifyTags(properties, publicationUrl, postType);
+  if (fedifyTags.length > 0) {
+    noteOptions.tags = fedifyTags;
+  }
+
+  const object = isArticle
+    ? new Article(noteOptions)
+    : new Note(noteOptions);
+
+  return new Create({
+    actor: actorUri,
+    object,
+  });
+}
+
+// ---------------------------------------------------------------------------
+// URL resolution helpers
+// ---------------------------------------------------------------------------
+
+/**
+ * Resolve a post URL, ensuring it's absolute.
+ * @param {string} url - Post URL (may be relative or absolute)
+ * @param {string} publicationUrl - Base publication URL
+ * @returns {string} Absolute URL
+ */
+export function resolvePostUrl(url, publicationUrl) {
+  if (!url) return "";
+  if (url.startsWith("http")) return url;
+  const base = publicationUrl.replace(/\/$/, "");
+  return `${base}/${url.replace(/^\//, "")}`;
+}
+
+function resolveMediaUrl(url, publicationUrl) {
+  if (!url) return "";
+  if (url.startsWith("http")) return url;
+  const base = publicationUrl.replace(/\/$/, "");
+  return `${base}/${url.replace(/^\//, "")}`;
+}
+
+// ---------------------------------------------------------------------------
+// Attachment builders
+// ---------------------------------------------------------------------------
+
+function buildPlainAttachments(properties, publicationUrl) {
   const attachments = [];
 
   if (properties.photo) {
-    const photos = Array.isArray(properties.photo)
-      ? properties.photo
-      : [properties.photo];
-    for (const photo of photos) {
+    for (const photo of asArray(properties.photo)) {
       const url = typeof photo === "string" ? photo : photo.url;
       const alt = typeof photo === "string" ? "" : photo.alt || "";
       attachments.push({
@@ -96,10 +258,7 @@ export function jf2ToActivityStreams(properties, actorUrl, publicationUrl) {
   }
 
   if (properties.video) {
-    const videos = Array.isArray(properties.video)
-      ? properties.video
-      : [properties.video];
-    for (const video of videos) {
+    for (const video of asArray(properties.video)) {
       const url = typeof video === "string" ? video : video.url;
       attachments.push({
         type: "Video",
@@ -110,10 +269,7 @@ export function jf2ToActivityStreams(properties, actorUrl, publicationUrl) {
   }
 
   if (properties.audio) {
-    const audios = Array.isArray(properties.audio)
-      ? properties.audio
-      : [properties.audio];
-    for (const audio of audios) {
+    for (const audio of asArray(properties.audio)) {
       const url = typeof audio === "string" ? audio : audio.url;
       attachments.push({
         type: "Audio",
@@ -123,59 +279,102 @@ export function jf2ToActivityStreams(properties, actorUrl, publicationUrl) {
     }
   }
 
-  if (attachments.length > 0) {
-    object.attachment = attachments;
+  return attachments;
+}
+
+function buildFedifyAttachments(properties, publicationUrl) {
+  const attachments = [];
+
+  if (properties.photo) {
+    for (const photo of asArray(properties.photo)) {
+      const url = typeof photo === "string" ? photo : photo.url;
+      const alt = typeof photo === "string" ? "" : photo.alt || "";
+      attachments.push(
+        new Image({
+          url: new URL(resolveMediaUrl(url, publicationUrl)),
+          mediaType: guessMediaType(url),
+          name: alt,
+        }),
+      );
+    }
+  }
+
+  if (properties.video) {
+    for (const video of asArray(properties.video)) {
+      const url = typeof video === "string" ? video : video.url;
+      attachments.push(
+        new Video({
+          url: new URL(resolveMediaUrl(url, publicationUrl)),
+        }),
+      );
+    }
   }
 
-  // Categories → hashtags
+  if (properties.audio) {
+    for (const audio of asArray(properties.audio)) {
+      const url = typeof audio === "string" ? audio : audio.url;
+      attachments.push(
+        new Audio({
+          url: new URL(resolveMediaUrl(url, publicationUrl)),
+        }),
+      );
+    }
+  }
+
+  return attachments;
+}
+
+// ---------------------------------------------------------------------------
+// Tag builders
+// ---------------------------------------------------------------------------
+
+function buildPlainTags(properties, publicationUrl, existing) {
+  const tags = [...(existing || [])];
   if (properties.category) {
-    const categories = Array.isArray(properties.category)
-      ? properties.category
-      : [properties.category];
-    object.tag = [
-      ...(object.tag || []),
-      ...categories.map((cat) => ({
+    for (const cat of asArray(properties.category)) {
+      tags.push({
         type: "Hashtag",
         name: `#${cat.replace(/\s+/g, "")}`,
         href: `${publicationUrl}categories/${encodeURIComponent(cat)}`,
-      })),
-    ];
+      });
+    }
   }
-
-  return {
-    "@context": "https://www.w3.org/ns/activitystreams",
-    type: "Create",
-    actor: actorUrl,
-    object,
-  };
+  return tags;
 }
 
-/**
- * Resolve a post URL, ensuring it's absolute.
- * @param {string} url - Post URL (may be relative or absolute)
- * @param {string} publicationUrl - Base publication URL
- * @returns {string} Absolute URL
- */
-export function resolvePostUrl(url, publicationUrl) {
-  if (!url) return "";
-  if (url.startsWith("http")) return url;
-  const base = publicationUrl.replace(/\/$/, "");
-  return `${base}/${url.replace(/^\//, "")}`;
+function buildFedifyTags(properties, publicationUrl, postType) {
+  const tags = [];
+  if (postType === "bookmark") {
+    tags.push(
+      new Hashtag({
+        name: "#bookmark",
+        href: new URL(`${publicationUrl}categories/bookmark`),
+      }),
+    );
+  }
+  if (properties.category) {
+    for (const cat of asArray(properties.category)) {
+      tags.push(
+        new Hashtag({
+          name: `#${cat.replace(/\s+/g, "")}`,
+          href: new URL(
+            `${publicationUrl}categories/${encodeURIComponent(cat)}`,
+          ),
+        }),
+      );
+    }
+  }
+  return tags;
 }
 
-/**
- * Resolve a media URL, ensuring it's absolute.
- */
-function resolveMediaUrl(url, publicationUrl) {
-  if (!url) return "";
-  if (url.startsWith("http")) return url;
-  const base = publicationUrl.replace(/\/$/, "");
-  return `${base}/${url.replace(/^\//, "")}`;
+// ---------------------------------------------------------------------------
+// Utilities
+// ---------------------------------------------------------------------------
+
+function asArray(value) {
+  return Array.isArray(value) ? value : [value];
 }
 
-/**
- * Guess MIME type from file extension.
- */
 function guessMediaType(url) {
   const ext = url.split(".").pop()?.toLowerCase();
   const types = {

package/lib/kv-store.js

@@ -0,0 +1,55 @@
+/**
+ * MongoDB-backed KvStore adapter for Fedify.
+ *
+ * Implements Fedify's KvStore interface using a MongoDB collection.
+ * Keys are string arrays (e.g. ["keypair", "rsa", "rick"]) — we serialize
+ * them as a joined path string for MongoDB's _id field.
+ */
+
+/**
+ * @implements {import("@fedify/fedify").KvStore}
+ */
+export class MongoKvStore {
+  /** @param {import("mongodb").Collection} collection */
+  constructor(collection) {
+    this.collection = collection;
+  }
+
+  /**
+   * Serialize a Fedify key (string[]) to a MongoDB document _id.
+   * @param {string[]} key
+   * @returns {string}
+   */
+  _serializeKey(key) {
+    return key.join("/");
+  }
+
+  /**
+   * @param {string[]} key
+   * @returns {Promise<unknown>}
+   */
+  async get(key) {
+    const doc = await this.collection.findOne({ _id: this._serializeKey(key) });
+    return doc ? doc.value : undefined;
+  }
+
+  /**
+   * @param {string[]} key
+   * @param {unknown} value
+   */
+  async set(key, value) {
+    const id = this._serializeKey(key);
+    await this.collection.updateOne(
+      { _id: id },
+      { $set: { _id: id, value, updatedAt: new Date().toISOString() } },
+      { upsert: true },
+    );
+  }
+
+  /**
+   * @param {string[]} key
+   */
+  async delete(key) {
+    await this.collection.deleteOne({ _id: this._serializeKey(key) });
+  }
+}

package/locales/en.json

@@ -19,6 +19,24 @@
     "direction": "Direction",
     "directionInbound": "Received",
     "directionOutbound": "Sent",
+    "profile": {
+      "title": "Profile",
+      "intro": "Edit how your actor appears to other fediverse users. Changes take effect immediately.",
+      "nameLabel": "Display name",
+      "nameHint": "Your name as shown on your fediverse profile",
+      "summaryLabel": "Bio",
+      "summaryHint": "A short description of yourself. HTML is allowed.",
+      "urlLabel": "Website URL",
+      "urlHint": "Your website address, shown as a link on your profile",
+      "iconLabel": "Avatar URL",
+      "iconHint": "URL to your profile picture (square, at least 400x400px recommended)",
+      "imageLabel": "Header image URL",
+      "imageHint": "URL to a banner image shown at the top of your profile",
+      "manualApprovalLabel": "Manually approve followers",
+      "manualApprovalHint": "When enabled, follow requests require your approval before they take effect",
+      "save": "Save profile",
+      "saved": "Profile saved. Changes are now visible to the fediverse."
+    },
     "migrate": {
       "title": "Mastodon migration",
       "intro": "This guide walks you through moving your Mastodon identity to your IndieWeb site. Complete each step in order — your existing followers will be notified and can re-follow you automatically.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-activitypub",
-  "version": "0.1.9",
+  "version": "0.2.0",
   "description": "ActivityPub federation endpoint for Indiekit via Fedify. Adds full fediverse support: actor, inbox, outbox, followers, following, syndication, and Mastodon migration.",
   "keywords": [
     "indiekit",
@@ -39,6 +39,7 @@
   "dependencies": {
     "@fedify/fedify": "^1.10.0",
     "@fedify/express": "^1.9.0",
+    "@js-temporal/polyfill": "^0.5.0",
     "express": "^5.0.0"
   },
   "peerDependencies": {

package/views/activitypub-dashboard.njk

@@ -22,6 +22,10 @@
       title: __("activitypub.activities"),
       url: mountPath + "/admin/activities"
     },
+    {
+      title: __("activitypub.profile.title"),
+      url: mountPath + "/admin/profile"
+    },
     {
       title: __("activitypub.migrate.title"),
       url: mountPath + "/admin/migrate"

package/views/activitypub-migrate.njk

@@ -76,7 +76,7 @@
              @change="readFile($event)">
       <template x-if="fileName">
         <p class="hint" style="margin-top: 0.5em">
-          <strong x-text="fileName"></strong> — <span x-text="lineCount + ' lines'"></span>
+          <strong x-text="fileName"></strong> — <span x-text="handles.length + ' accounts found'"></span>
         </p>
       </template>
       <template x-if="fileError">
@@ -85,7 +85,7 @@
     </div>
 
     <button class="button" type="button"
-            :disabled="importing || !csvContent"
+            :disabled="importing || handles.length === 0"
             @click="startImport()">
       <span x-show="!importing">{{ __("activitypub.migrate.importButton") }}</span>
       <span x-show="importing" x-text="statusText"></span>
@@ -119,7 +119,7 @@
   <script>
   function csvImport(mountPath) {
     return {
-      csvContent: '',
+      handles: [],
       fileName: '',
       lineCount: 0,
       fileError: '',
@@ -129,9 +129,14 @@
       resultText: '',
       resultErrors: [],
 
+      /**
+       * Parse CSV client-side — extract handles (first column) only.
+       * This keeps the JSON payload small (handles only, no raw CSV),
+       * avoiding Express's default 100KB body parser limit.
+       */
       readFile(event) {
         var self = this;
-        self.csvContent = '';
+        self.handles = [];
         self.fileName = '';
         self.lineCount = 0;
         self.fileError = '';
@@ -151,9 +156,19 @@
         var reader = new FileReader();
         reader.onload = function(e) {
           var text = e.target.result;
-          self.csvContent = text;
+          var lines = text.split('\n').filter(function(l) { return l.trim(); });
           self.fileName = file.name;
-          self.lineCount = text.split('\n').filter(function(l) { return l.trim(); }).length;
+          self.lineCount = lines.length;
+
+          // Extract handles: skip header, take first CSV column, keep only valid handles
+          var parsed = [];
+          for (var i = 1; i < lines.length; i++) {
+            var handle = lines[i].split(',')[0].trim();
+            if (handle && handle.indexOf('@') !== -1) {
+              parsed.push(handle);
+            }
+          }
+          self.handles = parsed;
         };
         reader.onerror = function() {
           self.fileError = 'Could not read file';
@@ -183,12 +198,19 @@
           return;
         }
 
+        if (self.handles.length === 0) {
+          self.importing = false;
+          self.resultType = 'error';
+          self.resultText = 'No valid handles found in the CSV file.';
+          return;
+        }
+
         try {
           var res = await fetch(mountPath + '/admin/migrate/import', {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify({
-              csvContent: self.csvContent,
+              handles: self.handles,
               importTypes: importTypes
             })
           });

package/views/activitypub-profile.njk

@@ -0,0 +1,74 @@
+{% extends "document.njk" %}
+
+{% from "heading/macro.njk" import heading with context %}
+{% from "input/macro.njk" import input with context %}
+{% from "textarea/macro.njk" import textarea with context %}
+{% from "checkboxes/macro.njk" import checkboxes with context %}
+{% from "button/macro.njk" import button with context %}
+{% from "notification-banner/macro.njk" import notificationBanner with context %}
+{% from "prose/macro.njk" import prose with context %}
+
+{% block content %}
+  {{ heading({ text: title, level: 1, parent: { text: __("activitypub.title"), href: mountPath } }) }}
+
+  {% if result %}
+    {{ notificationBanner({ type: result.type, text: result.text }) }}
+  {% endif %}
+
+  {{ prose({ text: __("activitypub.profile.intro") }) }}
+
+  <form method="post" novalidate>
+    {{ input({
+      name: "name",
+      label: __("activitypub.profile.nameLabel"),
+      hint: __("activitypub.profile.nameHint"),
+      value: profile.name
+    }) }}
+
+    {{ textarea({
+      name: "summary",
+      label: __("activitypub.profile.summaryLabel"),
+      hint: __("activitypub.profile.summaryHint"),
+      value: profile.summary,
+      rows: 4
+    }) }}
+
+    {{ input({
+      name: "url",
+      label: __("activitypub.profile.urlLabel"),
+      hint: __("activitypub.profile.urlHint"),
+      value: profile.url,
+      type: "url"
+    }) }}
+
+    {{ input({
+      name: "icon",
+      label: __("activitypub.profile.iconLabel"),
+      hint: __("activitypub.profile.iconHint"),
+      value: profile.icon,
+      type: "url"
+    }) }}
+
+    {{ input({
+      name: "image",
+      label: __("activitypub.profile.imageLabel"),
+      hint: __("activitypub.profile.imageHint"),
+      value: profile.image,
+      type: "url"
+    }) }}
+
+    {{ checkboxes({
+      name: "manuallyApprovesFollowers",
+      items: [
+        {
+          label: __("activitypub.profile.manualApprovalLabel"),
+          value: "true",
+          hint: __("activitypub.profile.manualApprovalHint")
+        }
+      ],
+      values: ["true"] if profile.manuallyApprovesFollowers else []
+    }) }}
+
+    {{ button({ text: __("activitypub.profile.save") }) }}
+  </form>
+{% endblock %}