feedkeeper 0.35.4 → 0.35.5

package/server/dist/feeds/repository.js

@@ -16,6 +16,14 @@ export function createFeed(url, pollIntervalMinutes) {
         .run(url, pollIntervalMinutes);
     return findFeedById(Number(result.lastInsertRowid));
 }
+export function seedFeedMetadata(feedId, data) {
+    if (!data.title && !data.siteUrl)
+        return;
+    db.prepare(`UPDATE feeds SET
+       title = COALESCE(NULLIF(TRIM(title), ''), ?),
+       site_url = COALESCE(NULLIF(TRIM(site_url), ''), ?)
+     WHERE id = ?`).run(data.title?.trim() || null, data.siteUrl?.trim() || null, feedId);
+}
 export function subscribe(userId, feedId, label, folderId) {
     const maxPosRow = db
         .prepare("SELECT MAX(position) AS max_pos FROM subscriptions WHERE user_id = ?")
@@ -170,7 +178,7 @@ export function upsertItems(feedId, items) {
                 refreshLead(Number(result.lastInsertRowid));
             }
             else {
-                const previous = db.prepare("SELECT id, title, link, image_url, content_snippet, content_html, full_content_html, lead_version FROM items WHERE feed_id = ? AND guid = ?").get(feedId, row.guid);
+                const previous = db.prepare("SELECT id, title, link, image_url, content_snippet, content_html, full_content_html, published_at, author, lead_version FROM items WHERE feed_id = ? AND guid = ?").get(feedId, row.guid);
                 const next = row.contentHtml;
                 // Some publishers replace complete feed bodies with short teasers on a later poll.
                 const retained = previous?.content_html && next && next.length < previous.content_html.length * 0.9 &&
@@ -185,9 +193,9 @@ export function upsertItems(feedId, items) {
                         (row.link !== undefined && row.link !== previous.link) ||
                         (!keptPrevious && row.contentSnippet !== undefined && row.contentSnippet !== previous.content_snippet) ||
                         (retained !== null && retained !== previous.content_html) ||
-                        (row.publishedAt !== undefined && row.publishedAt !== null) ||
+                        (row.publishedAt !== undefined && row.publishedAt !== null && row.publishedAt !== previous.published_at) ||
                         (nextImage !== previous.image_url) ||
-                        (row.author !== undefined);
+                        (row.author !== undefined && row.author !== null && row.author !== previous.author);
                     if (changed) {
                         update.run(row.title ?? null, row.link ?? null, nextSnippet, retained, row.publishedAt ?? null, nextImage, row.author ?? null, feedId, row.guid);
                         const leadChanged = (retained !== null && retained !== previous.content_html) ||
@@ -210,15 +218,17 @@ export function upsertItems(feedId, items) {
     return insertMany(items);
 }
 export function listItemsForUser(userId, opts = {}) {
-    // Saved articles stay visible without a subscription (e.g. after unsubscribing).
+    // Saved and annotated articles stay visible after unsubscribing.
     const conditions = [];
+    const params = [];
     if (opts.bookmarkedOnly) {
         conditions.push("b.item_id IS NOT NULL");
     }
     else {
-        conditions.push("(s.id IS NOT NULL OR b.item_id IS NOT NULL)");
+        conditions.push(`(s.id IS NOT NULL OR b.item_id IS NOT NULL OR
+      EXISTS (SELECT 1 FROM item_notes access_note WHERE access_note.item_id = i.id AND access_note.user_id = ?))`);
+        params.push(userId);
     }
-    const params = [];
     // Keep the stored item available to direct reads and sync; deliberate saves/notes override stream filtering.
     conditions.push(`(i.is_empty_gallery = 0 OR b.item_id IS NOT NULL OR
     EXISTS (SELECT 1 FROM item_notes gallery_note WHERE gallery_note.item_id = i.id AND gallery_note.user_id = ?))`);
@@ -410,7 +420,9 @@ export function findFolderById(userId, id) {
 }
 export function createFolder(userId, name, iconSymbol) {
     const trimmed = name.trim();
-    db.prepare("INSERT INTO folders (user_id, name, icon_symbol) VALUES (?, ?, ?) ON CONFLICT (user_id, name) DO NOTHING").run(userId, trimmed, iconSymbol ?? null);
+    db.prepare(`INSERT INTO folders (user_id, name, icon_symbol) VALUES (?, ?, ?)
+    ON CONFLICT (user_id, name) DO UPDATE SET icon_symbol = excluded.icon_symbol
+    WHERE ? AND folders.icon_symbol IS NOT excluded.icon_symbol`).run(userId, trimmed, iconSymbol ?? null, Number(iconSymbol !== undefined));
     return findFolderByName(userId, trimmed);
 }
 export function updateFolder(userId, id, updates) {

package/server/dist/mcp/server.js

@@ -68,6 +68,8 @@ export function createMcpServerForUser(userId, scope) {
                 folderId: z.number().int().positive().optional().describe("Optional folder/category ID"),
             },
         }, async ({ url, label, folderId }) => {
+            if (!hasUserCapability(userId, "sync"))
+                return { ...textResult(capabilityDenial(userId, "sync")), isError: true };
             try {
                 const subscription = await subscribeToFeed(userId, url, label ?? null, folderId ?? null);
                 return textResult(subscription);
@@ -94,6 +96,8 @@ export function createMcpServerForUser(userId, scope) {
             url: mcpUrlSchema.describe("The website URL to discover feeds from"),
         },
     }, async ({ url }) => {
+        if (!hasUserCapability(userId, "sync"))
+            return { ...textResult(capabilityDenial(userId, "sync")), isError: true };
         try {
             const feeds = await discoverFeeds(url);
             return textResult({ feeds });
@@ -193,6 +197,8 @@ export function createMcpServerForUser(userId, scope) {
                 badge: z.boolean().optional().describe("Count this feed's unread articles in the number on the app icon"),
             },
         }, async ({ feedId, url, label, pollIntervalMinutes, fullText, notify, badge }) => {
+            if (url && !hasUserCapability(userId, "sync"))
+                return { ...textResult(capabilityDenial(userId, "sync")), isError: true };
             try {
                 let targetFeedId = feedId;
                 let previousItemsKept;
@@ -429,6 +435,8 @@ export function createMcpServerForUser(userId, scope) {
                 opml: z.string().min(1).describe("The OPML XML content to import"),
             },
         }, async ({ opml }) => {
+            if (!hasUserCapability(userId, "sync"))
+                return { ...textResult(capabilityDenial(userId, "sync")), isError: true };
             try {
                 const result = await importOpmlFeeds(userId, opml);
                 return textResult(result);
@@ -445,6 +453,8 @@ export function createMcpServerForUser(userId, scope) {
                 feedId: z.number().int().positive().describe("The ID of the feed to refresh"),
             },
         }, async ({ feedId }) => {
+            if (!hasUserCapability(userId, "sync"))
+                return { ...textResult(capabilityDenial(userId, "sync")), isError: true };
             const feed = findFeedById(feedId);
             if (!feed || !isUserSubscribed(userId, feedId)) {
                 return errorResult("Feed not found or not subscribed");

package/server/dist/server.js

@@ -62,7 +62,7 @@ app.use(cors({
     credentials: true,
 }));
 app.use(express.json({ limit: "1mb" }));
-app.use(express.text({ type: ["application/xml", "text/xml", "text/plain"], limit: "5mb" }));
+app.use(express.text({ type: ["application/xml", "text/xml", "text/x-opml", "application/opml+xml", "text/plain"], limit: "5mb" }));
 app.use(cookieSession({
     name: "feedkeeper.sid",
     secret: config.sessionSecret,

package/server/dist/sync/changeLog.js

@@ -20,6 +20,7 @@ export function serializeSubscription(subscription) {
         notify: Boolean(subscription.notify),
         badge: Boolean(subscription.badge),
         isInbox: Boolean(subscription.is_system_inbox),
+        lastError: subscription.last_error,
         iconHash: subscription.icon_hash ?? null,
         iconUrl: subscription.icon_hash
             ? `/api/v1/subscriptions/${subscription.id}/icon?v=${subscription.icon_hash}`

package/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feedkeeper/server",
-  "version": "0.35.4",
+  "version": "0.35.5",
   "private": true,
   "type": "module"
 }