@rmdes/indiekit-endpoint-microsub 1.0.0-beta.10 → 1.0.0-beta.12

package/index.js

@@ -78,6 +78,10 @@ export default class MicrosubEndpoint {
       "/channels/:uid/settings",
       readerController.updateSettings,
     );
+    readerRouter.post(
+      "/channels/:uid/delete",
+      readerController.deleteChannel,
+    );
     readerRouter.get("/channels/:uid/feeds", readerController.feeds);
     readerRouter.post("/channels/:uid/feeds", readerController.addFeed);
     readerRouter.post(

package/lib/controllers/reader.js

@@ -10,6 +10,7 @@ import {
   getChannel,
   createChannel,
   updateChannelSettings,
+  deleteChannel,
 } from "../storage/channels.js";
 import {
   getFeedsForChannel,
@@ -171,6 +172,32 @@ export async function updateSettings(request, response) {
   response.redirect(`${request.baseUrl}/channels/${uid}`);
 }
 
+/**
+ * Delete channel
+ * @param {object} request - Express request
+ * @param {object} response - Express response
+ * @returns {Promise<void>}
+ */
+export async function deleteChannelAction(request, response) {
+  const { application } = request.app.locals;
+  const userId = request.session?.userId;
+  const { uid } = request.params;
+
+  // Don't allow deleting notifications channel
+  if (uid === "notifications") {
+    return response.redirect(`${request.baseUrl}/channels`);
+  }
+
+  const channelDocument = await getChannel(application, uid, userId);
+  if (!channelDocument) {
+    return response.status(404).render("404");
+  }
+
+  await deleteChannel(application, uid, userId);
+
+  response.redirect(`${request.baseUrl}/channels`);
+}
+
 /**
  * View feeds for a channel
  * @param {object} request - Express request
@@ -394,6 +421,7 @@ export const readerController = {
   channel,
   settings,
   updateSettings,
+  deleteChannel: deleteChannelAction,
   feeds,
   addFeed,
   removeFeed,

package/lib/storage/channels.js

@@ -5,6 +5,8 @@
 
 import { ObjectId } from "mongodb";
 
+import { deleteFeedsForChannel } from "./feeds.js";
+import { deleteItemsForChannel } from "./items.js";
 import { generateChannelUid } from "../utils/jf2.js";
 
 /**
@@ -184,7 +186,7 @@ export async function updateChannel(application, uid, updates, userId) {
 }
 
 /**
- * Delete a channel
+ * Delete a channel and all its feeds and items
  * @param {object} application - Indiekit application
  * @param {string} uid - Channel UID
  * @param {string} [userId] - User ID
@@ -200,7 +202,20 @@ export async function deleteChannel(application, uid, userId) {
     return false;
   }
 
-  const result = await collection.deleteOne(query);
+  // Find the channel first to get its ObjectId
+  const channel = await collection.findOne(query);
+  if (!channel) {
+    return false;
+  }
+
+  // Cascade delete: items first, then feeds, then channel
+  const itemsDeleted = await deleteItemsForChannel(application, channel._id);
+  const feedsDeleted = await deleteFeedsForChannel(application, channel._id);
+  console.info(
+    `[Microsub] Deleted channel ${uid}: ${feedsDeleted} feeds, ${itemsDeleted} items`,
+  );
+
+  const result = await collection.deleteOne({ _id: channel._id });
   return result.deletedCount > 0;
 }
 

package/lib/storage/feeds.js

@@ -5,6 +5,8 @@
 
 import { ObjectId } from "mongodb";
 
+import { deleteItemsForFeed } from "./items.js";
+
 /**
  * Get feeds collection from application
  * @param {object} application - Indiekit application
@@ -122,7 +124,7 @@ export async function updateFeed(application, id, updates) {
 }
 
 /**
- * Delete a feed subscription
+ * Delete a feed subscription and all its items
  * @param {object} application - Indiekit application
  * @param {ObjectId|string} channelId - Channel ObjectId
  * @param {string} url - Feed URL
@@ -133,7 +135,18 @@ export async function deleteFeed(application, channelId, url) {
   const objectId =
     typeof channelId === "string" ? new ObjectId(channelId) : channelId;
 
-  const result = await collection.deleteOne({ channelId: objectId, url });
+  // Find the feed first to get its ID for cascade delete
+  const feed = await collection.findOne({ channelId: objectId, url });
+  if (!feed) {
+    return false;
+  }
+
+  // Delete all items from this feed
+  const itemsDeleted = await deleteItemsForFeed(application, feed._id);
+  console.info(`[Microsub] Deleted ${itemsDeleted} items from feed ${url}`);
+
+  // Delete the feed itself
+  const result = await collection.deleteOne({ _id: feed._id });
   return result.deletedCount > 0;
 }
 

package/locales/en.json

@@ -55,6 +55,10 @@
       "excludeRegex": "Exclude pattern",
       "excludeRegexHelp": "Regular expression to filter out matching content",
       "save": "Save settings",
+      "dangerZone": "Danger zone",
+      "deleteWarning": "Deleting this channel will permanently remove all feeds and items. This action cannot be undone.",
+      "deleteConfirm": "Are you sure you want to delete this channel and all its content?",
+      "delete": "Delete channel",
       "types": {
         "like": "Likes",
         "repost": "Reposts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-microsub",
-  "version": "1.0.0-beta.10",
+  "version": "1.0.0-beta.12",
   "description": "Microsub endpoint for Indiekit. Enables subscribing to feeds and reading content using the Microsub protocol.",
   "keywords": [
     "indiekit",

package/views/settings.njk

@@ -55,5 +55,19 @@
         </a>
       </div>
     </form>
+
+    {% if channel.uid !== "notifications" %}
+    <hr class="divider">
+    <div class="danger-zone">
+      <h3>{{ __("microsub.settings.dangerZone") }}</h3>
+      <p class="hint">{{ __("microsub.settings.deleteWarning") }}</p>
+      <form method="post" action="{{ baseUrl }}/channels/{{ channel.uid }}/delete" onsubmit="return confirm('{{ __("microsub.settings.deleteConfirm") }}');">
+        {{ button({
+          text: __("microsub.settings.delete"),
+          classes: "button--danger"
+        }) }}
+      </form>
+    </div>
+    {% endif %}
   </div>
 {% endblock %}