feedkeeper 0.35.4 → 0.35.6

package/server/dist/feeds/redirectLinks.js

@@ -0,0 +1,22 @@
+/**
+ * Some feeds wrap every article address in a redirect through the publisher's tracker. Google Alerts links through
+ * `https://www.google.com/url?...&url=<article>`, which is not the page to read and fails the full-text fetch. The article address
+ * inside the wrapper is what an item should point to.
+ */
+const GOOGLE_HOST = /^(?:www\.)?google\.[a-z]{2,3}(?:\.[a-z]{2})?$/i;
+export function unwrapRedirectLink(link) {
+    if (!link)
+        return link;
+    let url;
+    try {
+        url = new URL(link);
+    }
+    catch {
+        return link;
+    }
+    if (!GOOGLE_HOST.test(url.hostname) || url.pathname !== "/url")
+        return link;
+    const target = url.searchParams.get("url") ?? url.searchParams.get("q");
+    return target && /^https?:\/\//i.test(target) ? target : link;
+}
+//# sourceMappingURL=redirectLinks.js.map

package/server/dist/feeds/repository.js

@@ -3,7 +3,8 @@ import { articleText } from "./articleContent.js";
 import { LEAD_VERSION } from "./contentNoise.js";
 import { largerHeroImage } from "./heroImage.js";
 import { refreshGalleryClassification, refreshLead } from "./lead.js";
-import { decodeEntities } from "./text.js";
+import { decodeEntities, plainTitle } from "./text.js";
+import { unwrapRedirectLink } from "./redirectLinks.js";
 export function findFeedByUrl(url) {
     return db.prepare("SELECT * FROM feeds WHERE url = ?").get(url);
 }
@@ -16,6 +17,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 +179,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 +194,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 +219,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 +421,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) {
@@ -558,19 +571,24 @@ export function moveSubscription(userId, fromFeedId, toFeedId) {
 export function updateFeedIcon(feedId, iconUrl) {
     db.prepare("UPDATE feeds SET icon_url = ?, icon_checked_at = strftime('%Y-%m-%dT%H:%M:%fZ', 'now') WHERE id = ?").run(iconUrl, feedId);
 }
-/** Fix item titles, snippets, feed titles and labels stored before entity decoding existed; cheap once nothing matches. */
+/**
+ * Fix item titles, snippets, links, feed titles and labels stored before entity decoding, title markup removal and redirect unwrapping
+ * existed; cheap once nothing matches.
+ */
 export function repairEncodedText() {
     const rows = db
-        .prepare("SELECT id, title, content_snippet FROM items WHERE title LIKE '%&%;%' OR content_snippet LIKE '%&%;%'")
+        .prepare(`SELECT id, title, content_snippet, link FROM items
+       WHERE title LIKE '%&%;%' OR title LIKE '%<%>%' OR content_snippet LIKE '%&%;%' OR link LIKE 'https://www.google.%/url?%'`)
         .all();
-    const update = db.prepare("UPDATE items SET title = ?, content_snippet = ? WHERE id = ?");
+    const update = db.prepare("UPDATE items SET title = ?, content_snippet = ?, link = ? WHERE id = ?");
     let fixed = 0;
     db.transaction(() => {
         for (const row of rows) {
-            const title = decodeEntities(row.title);
+            const title = row.title === null ? null : (plainTitle(row.title) ?? row.title);
             const snippet = decodeEntities(row.content_snippet);
-            if (title !== row.title || snippet !== row.content_snippet) {
-                update.run(title ?? null, snippet ?? null, row.id);
+            const link = unwrapRedirectLink(row.link);
+            if (title !== row.title || snippet !== row.content_snippet || link !== row.link) {
+                update.run(title, snippet ?? null, link ?? null, row.id);
                 refreshLead(row.id);
                 fixed++;
             }

package/server/dist/feeds/text.js

@@ -15,9 +15,14 @@ function decodeOnce(text) {
         return NAMED_ENTITIES[name] ?? match;
     });
 }
-/** A title as one line of text: entities decoded, line breaks and runs of spaces collapsed to one space, trimmed. */
+/**
+ * Inline formatting that some feeds put into a title, such as the `<b>` Google Alerts wraps around the search term. Only these tags are
+ * removed, so a title that really contains an angle bracket stays as it is.
+ */
+const TITLE_MARKUP = /<\/?(?:b|i|u|em|strong|mark|span|small|sub|sup|font|a|br)\b[^>]*>/gi;
+/** A title as one line of text: entities decoded, inline markup removed, line breaks and runs of spaces collapsed to one space, trimmed. */
 export function plainTitle(text) {
-    const cleaned = decodeEntities(text)?.replace(/\s+/g, " ").trim();
+    const cleaned = decodeEntities(text)?.replace(TITLE_MARKUP, tag => (/^<br/i.test(tag) ? " " : "")).replace(/\s+/g, " ").trim();
     return cleaned || undefined;
 }
 export function decodeEntities(text) {

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.6",
   "private": true,
   "type": "module"
 }