@rmdes/indiekit-endpoint-activitypub 1.0.16 → 1.0.18

package/index.js

@@ -166,6 +166,8 @@ export default class ActivityPubEndpoint {
     router.use((req, res, next) => {
       if (!self._fedifyMiddleware) return next();
       if (req.method !== "GET" && req.method !== "HEAD") return next();
+      // Skip Fedify for admin routes — handled by authenticated router
+      if (req.path.startsWith("/admin")) return next();
       return self._fedifyMiddleware(req, res, next);
     });
 

package/lib/inbox-listeners.js

@@ -332,16 +332,54 @@ async function logActivity(collections, storeRaw, record) {
 let _apChannelId = null;
 
 /**
- * Look up the ActivityPub channel's ObjectId (cached after first call).
+ * Look up (or auto-create) the ActivityPub channel's ObjectId.
+ * Cached after first successful call.
+ *
+ * The channel is created with `userId: "default"` so it appears in the
+ * Microsub reader UI alongside user-created channels.
+ *
  * @param {object} collections - MongoDB collections
  * @returns {Promise<import("mongodb").ObjectId|null>}
  */
 async function getApChannelId(collections) {
   if (_apChannelId) return _apChannelId;
-  const channel = await collections.microsub_channels?.findOne({
+  if (!collections.microsub_channels) return null;
+
+  let channel = await collections.microsub_channels.findOne({
     uid: "activitypub",
   });
-  _apChannelId = channel?._id || null;
+
+  if (!channel) {
+    // Auto-create the channel with the same fields the Microsub plugin uses
+    const maxOrderDoc = await collections.microsub_channels
+      .find({ userId: "default" })
+      .sort({ order: -1 })
+      .limit(1)
+      .toArray();
+    const order = maxOrderDoc.length > 0 ? maxOrderDoc[0].order + 1 : 0;
+
+    const doc = {
+      uid: "activitypub",
+      name: "Fediverse",
+      userId: "default",
+      order,
+      settings: { excludeTypes: [], excludeRegex: null },
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+    };
+    await collections.microsub_channels.insertOne(doc);
+    channel = doc;
+    console.info("[ActivityPub] Auto-created Microsub channel 'Fediverse'");
+  } else if (!channel.userId) {
+    // Fix existing channel missing userId (created by earlier version)
+    await collections.microsub_channels.updateOne(
+      { _id: channel._id },
+      { $set: { userId: "default" } },
+    );
+    console.info("[ActivityPub] Fixed Microsub channel: set userId to 'default'");
+  }
+
+  _apChannelId = channel._id;
   return _apChannelId;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-activitypub",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "ActivityPub federation endpoint for Indiekit via Fedify. Adds full fediverse support: actor, inbox, outbox, followers, following, syndication, and Mastodon migration.",
   "keywords": [
     "indiekit",

package/views/activitypub-dashboard.njk

@@ -39,8 +39,8 @@
     {# Progress bar #}
     <div style="background: var(--color-offset); border-radius: 4px; height: 1.5rem; margin-block-end: var(--space-m); overflow: hidden;">
       <div
-        x-bind:style="'width:' + progress + '%; background: var(--color-accent); height: 100%; transition: width 0.5s ease;'"
-        style="width: {{ refollowStatus.progressPercent }}%; background: var(--color-accent); height: 100%; transition: width 0.5s ease;">
+        x-bind:style="'width:' + progress + '%; height: 100%; transition: width 0.5s ease; background: var(--color-primary);'"
+        style="width: {{ refollowStatus.progressPercent }}%; height: 100%; transition: width 0.5s ease; background: var(--color-primary);">
       </div>
     </div>
 
@@ -48,39 +48,42 @@
     <div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(10rem, 1fr)); gap: var(--space-s); margin-block-end: var(--space-m);">
       <div style="padding: var(--space-s); background: var(--color-offset); border-radius: 4px; text-align: center;">
         <div style="font-size: var(--font-size-xl);" x-text="remaining">{{ refollowStatus.remaining }}</div>
-        <div style="font-size: var(--font-size-s); color: var(--color-text-offset);">{{ __("activitypub.refollow.remaining") }}</div>
+        <div style="font-size: var(--font-size-s); color: var(--color-outline);">{{ __("activitypub.refollow.remaining") }}</div>
       </div>
       <div style="padding: var(--space-s); background: var(--color-offset); border-radius: 4px; text-align: center;">
         <div style="font-size: var(--font-size-xl);" x-text="sent">{{ refollowStatus.sent }}</div>
-        <div style="font-size: var(--font-size-s); color: var(--color-text-offset);">{{ __("activitypub.refollow.awaitingAccept") }}</div>
+        <div style="font-size: var(--font-size-s); color: var(--color-outline);">{{ __("activitypub.refollow.awaitingAccept") }}</div>
       </div>
       <div style="padding: var(--space-s); background: var(--color-offset); border-radius: 4px; text-align: center;">
         <div style="font-size: var(--font-size-xl);" x-text="federated">{{ refollowStatus.federated }}</div>
-        <div style="font-size: var(--font-size-s); color: var(--color-text-offset);">{{ __("activitypub.refollow.accepted") }}</div>
+        <div style="font-size: var(--font-size-s); color: var(--color-outline);">{{ __("activitypub.refollow.accepted") }}</div>
       </div>
       <div style="padding: var(--space-s); background: var(--color-offset); border-radius: 4px; text-align: center;">
         <div style="font-size: var(--font-size-xl);" x-text="failed">{{ refollowStatus.failed }}</div>
-        <div style="font-size: var(--font-size-s); color: var(--color-text-offset);">{{ __("activitypub.refollow.failed") }}</div>
+        <div style="font-size: var(--font-size-s); color: var(--color-outline);">{{ __("activitypub.refollow.failed") }}</div>
       </div>
     </div>
 
     {# Status + controls #}
     <div style="display: flex; align-items: center; gap: var(--space-s);">
-      {{ badge({ text: __("activitypub.refollow.status." + refollowStatus.status) }) }}
-      {% if refollowStatus.status === "running" %}
-        <form method="post" action="{{ mountPath }}/admin/refollow/pause" x-on:submit.prevent="pause">
-          <button type="submit" class="button" style="font-size: var(--font-size-s);">{{ __("activitypub.refollow.pause") }}</button>
-        </form>
-      {% elif refollowStatus.status === "paused" %}
-        <form method="post" action="{{ mountPath }}/admin/refollow/resume" x-on:submit.prevent="resume">
-          <button type="submit" class="button" style="font-size: var(--font-size-s);">{{ __("activitypub.refollow.resume") }}</button>
-        </form>
-      {% endif %}
+      <span class="badge" x-text="statusLabel">{{ __("activitypub.refollow.status." + refollowStatus.status) }}</span>
+      <form x-show="status === 'running'" method="post" action="{{ mountPath }}/admin/refollow/pause" x-on:submit.prevent="pause" style="display: none;">
+        <button type="submit" class="button" style="font-size: var(--font-size-s);">{{ __("activitypub.refollow.pause") }}</button>
+      </form>
+      <form x-show="status === 'paused'" method="post" action="{{ mountPath }}/admin/refollow/resume" x-on:submit.prevent="resume" style="display: none;">
+        <button type="submit" class="button" style="font-size: var(--font-size-s);">{{ __("activitypub.refollow.resume") }}</button>
+      </form>
     </div>
   </section>
 
   <script>
     function refollowProgress(mountPath) {
+      const statusLabels = {
+        idle: '{{ __("activitypub.refollow.status.idle") }}',
+        running: '{{ __("activitypub.refollow.status.running") }}',
+        paused: '{{ __("activitypub.refollow.status.paused") }}',
+        completed: '{{ __("activitypub.refollow.status.completed") }}'
+      };
       return {
         progress: {{ refollowStatus.progressPercent }},
         remaining: {{ refollowStatus.remaining }},
@@ -89,6 +92,9 @@
         failed: {{ refollowStatus.failed }},
         status: '{{ refollowStatus.status }}',
         interval: null,
+        get statusLabel() {
+          return statusLabels[this.status] || this.status;
+        },
         init() {
           if (this.status === 'running' || this.status === 'paused') {
             this.interval = setInterval(() => this.poll(), 10000);
@@ -100,6 +106,7 @@
         async poll() {
           try {
             const res = await fetch(mountPath + '/admin/refollow/status');
+            if (!res.ok) return;
             const data = await res.json();
             this.progress = data.progressPercent;
             this.remaining = data.remaining;
@@ -113,14 +120,16 @@
           } catch {}
         },
         async pause() {
-          await fetch(mountPath + '/admin/refollow/pause', { method: 'POST' });
-          this.status = 'paused';
+          const res = await fetch(mountPath + '/admin/refollow/pause', { method: 'POST' });
+          if (res.ok) this.status = 'paused';
         },
         async resume() {
-          await fetch(mountPath + '/admin/refollow/resume', { method: 'POST' });
-          this.status = 'running';
-          if (!this.interval) {
-            this.interval = setInterval(() => this.poll(), 10000);
+          const res = await fetch(mountPath + '/admin/refollow/resume', { method: 'POST' });
+          if (res.ok) {
+            this.status = 'running';
+            if (!this.interval) {
+              this.interval = setInterval(() => this.poll(), 10000);
+            }
           }
         }
       };