@rmdes/indiekit-endpoint-microsub 1.0.61 → 1.0.64

package/index.js

@@ -12,11 +12,11 @@ import { asyncHandler } from "./lib/utils/async-handler.js";
 import { handleMediaProxy } from "./lib/media/proxy.js";
 import { csrfToken, csrfValidate } from "./lib/utils/csrf.js";
 import { startScheduler, stopScheduler } from "./lib/polling/scheduler.js";
-import { ensureActivityPubChannel } from "./lib/storage/channels.js";
 import { createIndexes } from "./lib/storage/items.js";
 import {
   cleanupAllReadItems,
   cleanupStaleItems,
+  removeActivityPubData,
 } from "./lib/storage/items-retention.js";
 import { webmentionReceiver } from "./lib/webmention/receiver.js";
 import { websubHandler } from "./lib/websub/handler.js";
@@ -133,9 +133,6 @@ export default class MicrosubEndpoint {
     readerRouter.get("/search", asyncHandler(readerController.searchPage));
     readerRouter.post("/search", asyncHandler(readerController.searchFeeds));
     readerRouter.post("/subscribe", asyncHandler(readerController.subscribe));
-    readerRouter.get("/actor", asyncHandler(readerController.actorProfile));
-    readerRouter.post("/actor/follow", asyncHandler(readerController.followActorAction));
-    readerRouter.post("/actor/unfollow", asyncHandler(readerController.unfollowActorAction));
     readerRouter.post("/api/mark-read", asyncHandler(readerController.markAllRead));
     readerRouter.post("/api/mark-view-read", asyncHandler(readerController.markViewRead));
     readerRouter.get("/opml", opmlController.exportOpml);
@@ -214,10 +211,11 @@ export default class MicrosubEndpoint {
           console.info("[Microsub] Starting scheduler and maintenance tasks");
           startScheduler(indiekit);
 
-          // Ensure system channels exist
-          ensureActivityPubChannel(indiekit).catch((error) => {
+          // One-time migration: drop the abandoned "Fediverse" channel and its
+          // items. Idempotent — does nothing once the channel is gone.
+          removeActivityPubData(indiekit).catch((error) => {
             console.warn(
-              "[Microsub] ActivityPub channel creation failed:",
+              "[Microsub] ActivityPub data removal failed:",
               error.message,
             );
           });

package/lib/controllers/reader/channel.js

@@ -10,7 +10,6 @@ import {
   updateChannelSettings,
   deleteChannel,
 } from "../../storage/channels.js";
-import { getFeedsForChannel } from "../../storage/feeds.js";
 import { getTimelineItems } from "../../storage/items.js";
 import { countReadItems } from "../../storage/items-read-state.js";
 import { getUserId } from "../../utils/auth.js";
@@ -18,7 +17,13 @@ import {
   validateChannelName,
   validateExcludeTypes,
   validateExcludeRegex,
+  validateRetentionSetting,
 } from "../../utils/validation.js";
+import {
+  DEFAULT_MAX_ITEMS,
+  DEFAULT_MAX_ITEMS_PER_FEED,
+  DEFAULT_MAX_UNREAD_AGE_DAYS,
+} from "../../storage/items-retention.js";
 import { proxyItemImages } from "../../media/proxy.js";
 
 /**
@@ -212,6 +217,14 @@ export async function channelHtml(request, response) {
  * @param {object} response - Express response
  * @returns {Promise<void>}
  */
+// Defaults exposed to the settings template so placeholders show what the
+// channel falls back to when a field is left blank.
+const RETENTION_DEFAULTS = {
+  maxItems: DEFAULT_MAX_ITEMS,
+  maxItemsPerFeed: DEFAULT_MAX_ITEMS_PER_FEED,
+  maxUnreadAgeDays: DEFAULT_MAX_UNREAD_AGE_DAYS,
+};
+
 export async function settings(request, response) {
   const { application } = request.app.locals;
   const userId = getUserId(request);
@@ -236,6 +249,7 @@ export async function settings(request, response) {
       { text: channelDocument.name, href: `${request.baseUrl}/channels/${uid}` },
       { text: "Settings" },
     ],
+    retentionDefaults: RETENTION_DEFAULTS,
   });
 }
 
@@ -249,7 +263,13 @@ export async function updateSettings(request, response) {
   const { application } = request.app.locals;
   const userId = getUserId(request);
   const { uid } = request.params;
-  const { excludeTypes, excludeRegex } = request.body;
+  const {
+    excludeTypes,
+    excludeRegex,
+    maxItems,
+    maxItemsPerFeed,
+    maxUnreadAgeDays,
+  } = request.body;
 
   const channelDocument = await getChannel(application, uid, userId);
   if (!channelDocument) {
@@ -261,12 +281,30 @@ export async function updateSettings(request, response) {
   );
   const validatedRegex = validateExcludeRegex(excludeRegex);
 
+  // Retention overrides. Empty/invalid input falls back to the global default
+  // (stored as undefined so future global default changes apply automatically).
+  const validatedMaxItems = validateRetentionSetting(maxItems, {
+    min: 10,
+    max: 100_000,
+  });
+  const validatedMaxItemsPerFeed = validateRetentionSetting(maxItemsPerFeed, {
+    min: 1,
+    max: 10_000,
+  });
+  const validatedMaxUnreadAgeDays = validateRetentionSetting(
+    maxUnreadAgeDays,
+    { min: 1, max: 3650 },
+  );
+
   await updateChannelSettings(
     application,
     uid,
     {
       excludeTypes: validatedTypes,
       excludeRegex: validatedRegex,
+      maxItems: validatedMaxItems,
+      maxItemsPerFeed: validatedMaxItemsPerFeed,
+      maxUnreadAgeDays: validatedMaxUnreadAgeDays,
     },
     userId,
   );
@@ -286,7 +324,7 @@ export async function deleteChannelAction(request, response) {
   const { uid } = request.params;
 
   // Don't allow deleting system channels
-  if (uid === "notifications" || uid === "activitypub") {
+  if (uid === "notifications") {
     return response.redirect(`${request.baseUrl}/channels`);
   }
 

package/lib/controllers/reader/index.js

@@ -38,12 +38,6 @@ export { compose, submitCompose } from "./compose.js";
 
 export { searchPage, searchFeeds, subscribe } from "./search.js";
 
-export {
-  actorProfile,
-  followActorAction,
-  unfollowActorAction,
-} from "./actor.js";
-
 export { deck, deckSettings, saveDeckSettings } from "./deck.js";
 
 import {
@@ -81,12 +75,6 @@ import { compose, submitCompose } from "./compose.js";
 
 import { searchPage, searchFeeds, subscribe } from "./search.js";
 
-import {
-  actorProfile,
-  followActorAction,
-  unfollowActorAction,
-} from "./actor.js";
-
 import { deck, deckSettings, saveDeckSettings } from "./deck.js";
 
 export const readerController = {
@@ -115,9 +103,6 @@ export const readerController = {
   searchPage,
   searchFeeds,
   subscribe,
-  actorProfile,
-  followActorAction,
-  unfollowActorAction,
   timeline,
   timelineHtml,
   deck,

package/lib/polling/scheduler.js

@@ -35,7 +35,7 @@ export function startScheduler(indiekit) {
   // Run immediately on start
   runSchedulerCycle();
 
-  console.log("[Microsub] Feed polling scheduler started");
+  console.info("[Microsub] Feed polling scheduler started");
 }
 
 /**
@@ -47,7 +47,7 @@ export function stopScheduler() {
     schedulerInterval = undefined;
   }
   indiekitInstance = undefined;
-  console.log("[Microsub] Feed polling scheduler stopped");
+  console.info("[Microsub] Feed polling scheduler stopped");
 }
 
 /**
@@ -74,13 +74,13 @@ async function runSchedulerCycle() {
       return;
     }
 
-    console.log(`[Microsub] Processing ${feeds.length} feeds due for refresh`);
+    console.info(`[Microsub] Processing ${feeds.length} feeds due for refresh`);
 
     const result = await processFeedBatch(application, feeds, {
       concurrency: BATCH_CONCURRENCY,
     });
 
-    console.log(
+    console.info(
       `[Microsub] Processed ${result.total} feeds: ${result.successful} successful, ` +
         `${result.failed} failed, ${result.itemsAdded} new items`,
     );

package/lib/storage/channels.js

@@ -298,7 +298,7 @@ export async function deleteChannel(application, uid, userId) {
   if (userId) query.userId = userId;
 
   // Don't allow deleting system channels
-  if (uid === "notifications" || uid === "activitypub") {
+  if (uid === "notifications") {
     return false;
   }
 
@@ -396,39 +396,3 @@ export async function ensureNotificationsChannel(application, userId) {
   await collection.insertOne(channel);
   return channel;
 }
-
-/**
- * Ensure ActivityPub channel exists
- * @param {object} application - Indiekit application
- * @param {string} [userId] - User ID
- * @returns {Promise<object>} ActivityPub channel
- */
-export async function ensureActivityPubChannel(application, userId) {
-  const collection = getCollection(application);
-
-  const existing = await collection.findOne({
-    uid: "activitypub",
-    ...(userId && { userId }),
-  });
-
-  if (existing) {
-    return existing;
-  }
-
-  const channel = {
-    uid: "activitypub",
-    name: "Fediverse",
-    userId,
-    source: "activitypub",
-    order: -0.5, // After notifications (-1), before user channels (0+)
-    settings: {
-      excludeTypes: [],
-      excludeRegex: undefined,
-    },
-    createdAt: new Date().toISOString(),
-    updatedAt: new Date().toISOString(),
-  };
-
-  await collection.insertOne(channel);
-  return channel;
-}

package/lib/storage/items-read-state.js

@@ -5,22 +5,17 @@
 
 import { ObjectId } from "mongodb";
 
-import { UNREAD_RETENTION_DAYS } from "../utils/constants.js";
+import {
+  MAX_FULL_READ_ITEMS,
+  UNREAD_RETENTION_DAYS,
+} from "../utils/constants.js";
 import { getCollection } from "./items.js";
 
-// Maximum number of full read items to keep per channel before stripping content.
-// Items beyond this limit are converted to lightweight dedup skeletons (channelId,
-// uid, readBy) so the poller doesn't re-ingest them as new unread entries.
-const MAX_FULL_READ_ITEMS = 200;
-
 /**
  * Cleanup old read items by stripping content but preserving dedup skeletons.
- * This prevents the vicious cycle where deleted read items get re-ingested as
+ * Prevents the vicious cycle where deleted read items get re-ingested as
  * unread by the poller because the dedup record (channelId + uid) was destroyed.
  *
- * AP items (feedId: null) are hard-deleted instead of stripped, since no poller
- * re-ingests them — they arrive via inbox push and don't need dedup skeletons.
- *
  * @param {object} collection - MongoDB collection
  * @param {ObjectId} channelObjectId - Channel ObjectId
  * @param {string} userId - User ID
@@ -32,7 +27,6 @@ async function cleanupOldReadItems(collection, channelObjectId, userId) {
   });
 
   if (readCount > MAX_FULL_READ_ITEMS) {
-    // Find old read items beyond the retention limit
     const itemsToCleanup = await collection
       .find({
         channelId: channelObjectId,
@@ -41,59 +35,36 @@ async function cleanupOldReadItems(collection, channelObjectId, userId) {
       })
       .sort({ published: -1, _id: -1 })
       .skip(MAX_FULL_READ_ITEMS)
-      .project({ _id: 1, feedId: 1 })
+      .project({ _id: 1 })
       .toArray();
 
     if (itemsToCleanup.length === 0) return;
 
-    // Separate AP items (feedId: null) from RSS items (feedId: ObjectId)
-    const apItemIds = [];
-    const rssItemIds = [];
-    for (const item of itemsToCleanup) {
-      if (item.feedId) {
-        rssItemIds.push(item._id);
-      } else {
-        apItemIds.push(item._id);
-      }
-    }
-
-    // Hard-delete AP items — no poller to re-ingest, skeletons are useless
-    if (apItemIds.length > 0) {
-      const deleted = await collection.deleteMany({
-        _id: { $in: apItemIds },
-      });
-      console.info(
-        `[Microsub] Deleted ${deleted.deletedCount} old AP read items`,
-      );
-    }
-
-    // Strip RSS items to dedup skeletons — poller would re-ingest if deleted
-    if (rssItemIds.length > 0) {
-      const stripped = await collection.updateMany(
-        { _id: { $in: rssItemIds } },
-        {
-          $set: { _stripped: true },
-          $unset: {
-            name: "",
-            content: "",
-            summary: "",
-            author: "",
-            category: "",
-            photo: "",
-            video: "",
-            audio: "",
-            likeOf: "",
-            repostOf: "",
-            bookmarkOf: "",
-            inReplyTo: "",
-            source: "",
-          },
+    const ids = itemsToCleanup.map((item) => item._id);
+    const stripped = await collection.updateMany(
+      { _id: { $in: ids } },
+      {
+        $set: { _stripped: true },
+        $unset: {
+          name: "",
+          content: "",
+          summary: "",
+          author: "",
+          category: "",
+          photo: "",
+          video: "",
+          audio: "",
+          likeOf: "",
+          repostOf: "",
+          bookmarkOf: "",
+          inReplyTo: "",
+          source: "",
         },
-      );
-      console.info(
-        `[Microsub] Stripped ${stripped.modifiedCount} old RSS read items (keeping ${MAX_FULL_READ_ITEMS} full)`,
-      );
-    }
+      },
+    );
+    console.info(
+      `[Microsub] Stripped ${stripped.modifiedCount} old read items (keeping ${MAX_FULL_READ_ITEMS} full)`,
+    );
   }
 }