feedkeeper 0.27.1 → 0.28.0

package/server/dist/feeds/inbox.js

@@ -5,8 +5,8 @@ import { hasUserCapability } from "../auth/capabilities.js";
 import { configureFullTextPool, deferFullTextHost } from "./fullTextQueue.js";
 import { extractArticle } from "./extractor.js";
 import { assertPublicHttpUrl, normalizeUrlCandidate } from "./ssrfGuard.js";
-import { articleImageUrls, scheduleArchive } from "./archive.js";
-import { findFeedById, findFeedByUrl, isUserSubscribed, listSubscriptionsForUser, subscribe, bookmarkItem, findItemById, findItemForUser, setItemNote, } from "./repository.js";
+import { articleImageUrls, pruneArchive, scheduleArchive } from "./archive.js";
+import { findFeedById, findFeedByUrl, isUserSubscribed, findSubscriptionForUser, subscribe, bookmarkItem, findItemById, findItemForUser, setItemNote, } from "./repository.js";
 function escapeHtml(str) {
     return str
         .replace(/&/g, "&")
@@ -31,7 +31,7 @@ export function ensureUserInbox(userId) {
     if (!isUserSubscribed(userId, feed.id)) {
         subscribe(userId, feed.id, "Inbox");
     }
-    const sub = listSubscriptionsForUser(userId).find((s) => s.id === feed.id);
+    const sub = findSubscriptionForUser(userId, feed.id);
     if (!sub) {
         throw new Error("Failed to ensure user inbox subscription");
     }
@@ -53,7 +53,7 @@ export async function saveToInbox(userId, input) {
             try {
                 configureFullTextPool();
                 const extracted = await extractArticle(targetUrl, undefined, 5, () => hasUserCapability(userId, "fulltext"));
-                if (extracted.status === "throttled")
+                if (extracted.status === "throttled" && !extracted.deferred)
                     deferFullTextHost(extracted.host, extracted.retryAt);
                 if (extracted.status === "ok" || extracted.status === "partial") {
                     extractionStatus = extracted.status === "ok" ? "ready" : "partial";
@@ -130,6 +130,7 @@ export function deleteInboxItem(userId, itemId) {
         db.prepare("DELETE FROM item_notes WHERE item_id = ?").run(itemId);
         db.prepare("DELETE FROM items WHERE id = ?").run(itemId);
     })();
+    pruneArchive();
     return true;
 }
 //# sourceMappingURL=inbox.js.map

package/server/dist/feeds/lead.js

@@ -1,6 +1,7 @@
 import { createHash } from "node:crypto";
 import { db } from "../db/index.js";
 import { LEAD_VERSION, leadText } from "./contentNoise.js";
+import { isEmptyGallery } from "./galleryContent.js";
 const BACKFILL_BATCH = 50;
 const BACKFILL_PAUSE_MS = 100;
 const COMPUTED_LIMIT = 300;
@@ -10,10 +11,17 @@ export function computeLead(item) {
 }
 /** Derive and store the lead of one item; call after its title, summary or content was written. */
 export function refreshLead(itemId) {
-    const item = db.prepare("SELECT title, content_snippet, content_html, full_content_html FROM items WHERE id = ?").get(itemId);
+    const item = db.prepare("SELECT title, link, content_snippet, content_html, full_content_html FROM items WHERE id = ?").get(itemId);
     if (!item)
         return;
-    db.prepare("UPDATE items SET content_lead = ?, lead_version = ? WHERE id = ?").run(computeLead(item), LEAD_VERSION, itemId);
+    db.prepare("UPDATE items SET content_lead = ?, lead_version = ?, is_empty_gallery = ? WHERE id = ?")
+        .run(computeLead(item), LEAD_VERSION, Number(isEmptyGallery(item)), itemId);
+}
+/** A changed feed summary/link can affect visibility while the lead still belongs to the retained full text. */
+export function refreshGalleryClassification(itemId) {
+    const item = db.prepare("SELECT link, content_snippet, content_html, full_content_html FROM items WHERE id = ?").get(itemId);
+    if (item)
+        db.prepare("UPDATE items SET is_empty_gallery = ? WHERE id = ?").run(Number(isEmptyGallery(item)), itemId);
 }
 /**
  * The lead to serve: the stored one while its rules are current, otherwise derived on the spot, so an article is
@@ -35,10 +43,10 @@ export function leadOf(item) {
 }
 /** Derive leads for items that have none or were derived by older rules; returns how many were handled. */
 export function backfillLeads(limit = BACKFILL_BATCH) {
-    const rows = db.prepare("SELECT id, title, content_snippet, content_html, full_content_html FROM items WHERE lead_version IS NULL OR lead_version <> ? LIMIT ?").all(LEAD_VERSION, limit);
-    const update = db.prepare("UPDATE items SET content_lead = ?, lead_version = ? WHERE id = ?");
+    const rows = db.prepare("SELECT id, title, link, content_snippet, content_html, full_content_html FROM items WHERE lead_version IS NULL OR lead_version <> ? LIMIT ?").all(LEAD_VERSION, limit);
+    const update = db.prepare("UPDATE items SET content_lead = ?, lead_version = ?, is_empty_gallery = ? WHERE id = ?");
     db.transaction(() => { for (const row of rows)
-        update.run(computeLead(row), LEAD_VERSION, row.id); })();
+        update.run(computeLead(row), LEAD_VERSION, Number(isEmptyGallery(row)), row.id); })();
     return rows.length;
 }
 /** Works through the backlog in small steps so polling and requests are never held up for long. */

package/server/dist/feeds/pollQueue.js

@@ -190,8 +190,17 @@ export class PollQueue {
                 continue;
             }
             // A URL may have been changed since enqueue. Do not dispatch under its old host budget.
-            if (sourceHost(feed.url) !== job.host) {
-                db.prepare("UPDATE feed_poll_jobs SET host = ? WHERE feed_id = ?").run(sourceHost(feed.url), feed.id);
+            let currentHost;
+            try {
+                currentHost = sourceHost(feed.url);
+            }
+            catch {
+                db.prepare("DELETE FROM feed_poll_jobs WHERE feed_id = ?").run(job.feed_id);
+                this.resolve(job.feed_id, { newItems: 0, error: "invalid_feed_url" });
+                continue;
+            }
+            if (currentHost !== job.host) {
+                db.prepare("UPDATE feed_poll_jobs SET host = ? WHERE feed_id = ?").run(currentHost, feed.id);
                 continue;
             }
             const waiter = this.waiters.get(feed.id);

package/server/dist/feeds/poller.js

@@ -132,10 +132,10 @@ async function pollAttempt(feed, signal) {
     try {
         signal.throwIfAborted();
         if (iconCheckDue(feed.icon_checked_at)) {
+            updateFeedIcon(feed.id, feed.icon_url);
             const siteUrl = parsed?.link || feed.site_url;
             const urls = siteUrl ? await discoverIconUrls(siteUrl, signal) : [];
             signal.throwIfAborted();
-            updateFeedIcon(feed.id, feed.icon_url);
             await refreshFeedIcon(feed.id, siteUrl, urls, signal);
         }
     }

package/server/dist/feeds/repository.js

@@ -2,7 +2,7 @@ import { db } from "../db/index.js";
 import { articleText } from "./articleContent.js";
 import { LEAD_VERSION } from "./contentNoise.js";
 import { largerHeroImage } from "./heroImage.js";
-import { refreshLead } from "./lead.js";
+import { refreshGalleryClassification, refreshLead } from "./lead.js";
 import { decodeEntities } from "./text.js";
 export function findFeedByUrl(url) {
     return db.prepare("SELECT * FROM feeds WHERE url = ?").get(url);
@@ -43,8 +43,8 @@ export function removeFeedIfUnused(feedId) {
     if (countFeedSubscribers(feedId) > 0)
         return;
     db.prepare(`DELETE FROM items WHERE feed_id = ? AND id NOT IN (SELECT item_id FROM item_bookmarks) AND id NOT IN (SELECT item_id FROM item_notes)
-      AND NOT EXISTS (SELECT 1 FROM editions e, json_each(e.item_ids) selected
-        WHERE selected.value = items.id AND e.source = 'curated' AND e.status <> 'dismissed')`).run(feedId);
+      AND id NOT IN (SELECT CAST(selected.value AS INTEGER) FROM editions e, json_each(e.item_ids) selected
+        WHERE e.source = 'curated' AND e.status <> 'dismissed')`).run(feedId);
     db.prepare("DELETE FROM feeds WHERE id = ? AND is_system_inbox = 0 AND NOT EXISTS (SELECT 1 FROM items WHERE feed_id = ?)").run(feedId, feedId);
 }
 /** Feeds kept only for saved articles or annotated articles whose last bookmark and note are gone. */
@@ -54,8 +54,10 @@ export function removeUnusedFeeds() {
        AND NOT EXISTS (SELECT 1 FROM subscriptions s WHERE s.feed_id = feeds.id)
        AND NOT EXISTS (SELECT 1 FROM items i JOIN item_bookmarks b ON b.item_id = i.id WHERE i.feed_id = feeds.id)
        AND NOT EXISTS (SELECT 1 FROM items i JOIN item_notes n ON n.item_id = i.id WHERE i.feed_id = feeds.id)
-       AND NOT EXISTS (SELECT 1 FROM items i, editions e, json_each(e.item_ids) selected
-         WHERE i.feed_id = feeds.id AND selected.value = i.id AND e.source = 'curated' AND e.status <> 'dismissed')`).run().changes;
+       AND NOT EXISTS (SELECT 1 FROM items i WHERE i.feed_id = feeds.id AND i.id IN (
+         SELECT CAST(selected.value AS INTEGER) FROM editions e, json_each(e.item_ids) selected
+         WHERE e.source = 'curated' AND e.status <> 'dismissed'
+       ))`).run().changes;
 }
 /** Subscribers can open every item of their feeds; anyone can open what they saved or added a note to. */
 export function canAccessItem(userId, itemId) {
@@ -168,7 +170,7 @@ export function upsertItems(feedId, items) {
                 refreshLead(Number(result.lastInsertRowid));
             }
             else {
-                const previous = db.prepare("SELECT id, title, 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, 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 &&
@@ -176,14 +178,30 @@ export function upsertItems(feedId, items) {
                 // The summary belongs to the body it was sent with: keeping the longer body keeps its summary too, or
                 // a feed that alternates between two variants would change the content on every poll.
                 const keptPrevious = retained !== null && next !== retained;
-                update.run(row.title ?? null, row.link ?? null, keptPrevious ? null : row.contentSnippet ?? null, retained, row.publishedAt ?? null, row.imageUrl ?? null, row.author ?? null, feedId, row.guid);
-                // Polling rewrites every item; only a change of what the lead is made from needs it derived again.
+                const nextSnippet = keptPrevious ? null : row.contentSnippet ?? null;
+                const nextImage = largerHeroImage(row.imageUrl, retained, row.link ?? previous?.link ?? null) ?? previous?.image_url ?? row.imageUrl ?? null;
                 if (previous) {
-                    const changed = (retained !== null && retained !== previous.content_html) ||
-                        (row.title !== undefined && row.title !== previous.title) ||
-                        (!keptPrevious && row.contentSnippet !== undefined && row.contentSnippet !== previous.content_snippet);
-                    if (previous.lead_version !== LEAD_VERSION || (changed && !previous.full_content_html))
+                    const changed = (row.title !== undefined && row.title !== previous.title) ||
+                        (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) ||
+                        (nextImage !== previous.image_url) ||
+                        (row.author !== undefined);
+                    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) ||
+                            (row.link !== undefined && row.link !== previous.link) ||
+                            (row.title !== undefined && row.title !== previous.title) ||
+                            (!keptPrevious && row.contentSnippet !== undefined && row.contentSnippet !== previous.content_snippet);
+                        if (previous.lead_version !== LEAD_VERSION || (leadChanged && !previous.full_content_html))
+                            refreshLead(previous.id);
+                        else if (leadChanged)
+                            refreshGalleryClassification(previous.id);
+                    }
+                    else if (previous.lead_version !== LEAD_VERSION && !previous.full_content_html) {
                         refreshLead(previous.id);
+                    }
                 }
             }
         }
@@ -193,8 +211,18 @@ export function upsertItems(feedId, items) {
 }
 export function listItemsForUser(userId, opts = {}) {
     // Saved articles stay visible without a subscription (e.g. after unsubscribing).
-    const conditions = ["(s.id IS NOT NULL OR b.item_id IS NOT NULL)"];
+    const conditions = [];
+    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)");
+    }
     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 = ?))`);
+    params.push(userId);
     if (opts.feedId) {
         conditions.push("i.feed_id = ?");
         params.push(opts.feedId);
@@ -297,6 +325,51 @@ export function findItemForUser(userId, itemId) {
        EXISTS (SELECT 1 FROM editions e, json_each(e.item_ids) selected WHERE e.user_id = ?
          AND selected.value = i.id AND e.source = 'curated' AND e.status <> 'dismissed'))`).get(userId, userId, userId, userId, itemId, userId);
 }
+export function findItemsForUser(userId, itemIds) {
+    if (!itemIds.length)
+        return [];
+    const unique = [...new Set(itemIds)];
+    return db.prepare(`SELECT i.*, COALESCE(NULLIF(TRIM(s.label), ''), NULLIF(TRIM(f.title), ''), f.url) AS feed_title,
+            f.site_url AS feed_site_url, f.url AS feed_url, s.full_text_mode AS feed_full_text_mode, f.icon_url AS feed_icon_url,
+            (r.item_id IS NOT NULL) AS read, (b.item_id IS NOT NULL) AS bookmarked, b.created_at AS bookmarked_at
+     FROM items i
+     JOIN feeds f ON f.id = i.feed_id
+     LEFT JOIN subscriptions s ON s.feed_id = i.feed_id AND s.user_id = ?
+     LEFT JOIN item_reads r ON r.item_id = i.id AND r.user_id = ?
+     LEFT JOIN item_bookmarks b ON b.item_id = i.id AND b.user_id = ?
+     LEFT JOIN item_notes n ON n.item_id = i.id AND n.user_id = ?
+     WHERE i.id IN (SELECT CAST(value AS INTEGER) FROM json_each(?))
+       AND (s.id IS NOT NULL OR b.item_id IS NOT NULL OR n.item_id IS NOT NULL OR
+         EXISTS (SELECT 1 FROM editions e, json_each(e.item_ids) selected WHERE e.user_id = ?
+           AND selected.value = i.id AND e.source = 'curated' AND e.status <> 'dismissed'))`).all(userId, userId, userId, userId, JSON.stringify(unique), userId);
+}
+export function findSubscriptionForUser(userId, feedId) {
+    return db
+        .prepare(`SELECT
+         f.*,
+         fi.hash AS icon_hash,
+         s.id AS subscription_id,
+         NULLIF(TRIM(s.label), '') AS label,
+         s.folder_id AS folder_id,
+         fo.name AS folder_name,
+         s.position AS position,
+         s.full_text_mode AS full_text_mode,
+         s.notify AS notify,
+         s.badge AS badge,
+         (
+           SELECT COUNT(*) FROM items i
+           WHERE i.feed_id = f.id
+             AND NOT EXISTS (
+               SELECT 1 FROM item_reads r WHERE r.item_id = i.id AND r.user_id = ?
+             )
+         ) AS unread_count
+       FROM subscriptions s
+       JOIN feeds f ON f.id = s.feed_id
+       LEFT JOIN feed_icons fi ON fi.feed_id = f.id
+       LEFT JOIN folders fo ON fo.id = s.folder_id
+       WHERE s.user_id = ? AND s.feed_id = ?`)
+        .get(userId, userId, feedId) ?? null;
+}
 export function updateSubscriptionLabel(userId, feedId, label) {
     db.prepare("UPDATE subscriptions SET label = ? WHERE user_id = ? AND feed_id = ?").run(label?.trim() || null, userId, feedId);
 }
@@ -498,6 +571,7 @@ export function repairEncodedText() {
             const snippet = decodeEntities(row.content_snippet);
             if (title !== row.title || snippet !== row.content_snippet) {
                 update.run(title ?? null, snippet ?? null, row.id);
+                refreshLead(row.id);
                 fixed++;
             }
         }
@@ -620,7 +694,8 @@ export function needsSubstringSearch(raw) {
 }
 export function searchItemsForUser(userId, opts) {
     const fts = needsSubstringSearch(opts.query) ? "" : formatFtsQuery(opts.query);
-    const conditions = ["(s.id IS NOT NULL OR b.item_id IS NOT NULL OR n.user_id IS NOT NULL)"];
+    const conditions = ["(s.id IS NOT NULL OR b.item_id IS NOT NULL OR n.user_id IS NOT NULL)",
+        "(i.is_empty_gallery = 0 OR b.item_id IS NOT NULL OR n.user_id IS NOT NULL)"];
     const params = [];
     if (opts.feedId) {
         conditions.push("i.feed_id = ?");
@@ -678,9 +753,24 @@ export function searchItemsForUser(userId, opts) {
     }
     const ranked = opts.sort !== "date" && fts;
     // Materialize once: a virtual-table MATCH in the LEFT JOIN repeats the full ranking scan for each article.
+    // Page IDs before loading HTML to avoid copying large content blobs into temporary B-trees during sorting.
     const querySql = `
-    ${ranked ? "WITH ranked_matches AS MATERIALIZED (SELECT rowid, rank FROM items_fts WHERE items_fts MATCH ?)" : ""}
-    SELECT DISTINCT i.*,
+    ${ranked ? "WITH ranked_matches AS MATERIALIZED (SELECT rowid, rank FROM items_fts WHERE items_fts MATCH ?)," : "WITH"}
+    page AS (
+      SELECT i.id
+      FROM items i
+      JOIN feeds f ON f.id = i.feed_id
+      LEFT JOIN subscriptions s ON s.feed_id = i.feed_id AND s.user_id = ?
+      LEFT JOIN item_reads r ON r.item_id = i.id AND r.user_id = ?
+      LEFT JOIN item_bookmarks b ON b.item_id = i.id AND b.user_id = ?
+      LEFT JOIN item_notes n ON n.item_id = i.id AND n.user_id = ?
+      ${ranked ? "LEFT JOIN ranked_matches fts ON fts.rowid = i.id" : ""}
+      WHERE ${conditions.join(" AND ")}
+      GROUP BY i.id
+      ORDER BY ${orderBy}
+      LIMIT ? OFFSET ?
+    )
+    SELECT i.*,
            COALESCE(NULLIF(TRIM(s.label), ''), NULLIF(TRIM(f.title), ''), f.url) AS feed_title,
            f.site_url AS feed_site_url,
            f.url AS feed_url,
@@ -689,16 +779,15 @@ export function searchItemsForUser(userId, opts) {
            (r.item_id IS NOT NULL) AS read,
            (b.item_id IS NOT NULL) AS bookmarked,
            b.created_at AS bookmarked_at
-    FROM items i
+    FROM page
+    JOIN items i ON i.id = page.id
     JOIN feeds f ON f.id = i.feed_id
     LEFT JOIN subscriptions s ON s.feed_id = i.feed_id AND s.user_id = ?
     LEFT JOIN item_reads r ON r.item_id = i.id AND r.user_id = ?
     LEFT JOIN item_bookmarks b ON b.item_id = i.id AND b.user_id = ?
     LEFT JOIN item_notes n ON n.item_id = i.id AND n.user_id = ?
     ${ranked ? "LEFT JOIN ranked_matches fts ON fts.rowid = i.id" : ""}
-    WHERE ${conditions.join(" AND ")}
     ORDER BY ${orderBy}
-    LIMIT ? OFFSET ?
   `;
     const queryParams = [
         ...(ranked ? [fts] : []),
@@ -709,6 +798,10 @@ export function searchItemsForUser(userId, opts) {
         ...params,
         limit,
         offset,
+        userId,
+        userId,
+        userId,
+        userId,
     ];
     const items = db.prepare(querySql).all(...queryParams);
     return { items, total };

package/server/dist/feeds/service.js

@@ -1,5 +1,5 @@
 import { config } from "../config.js";
-import { createFeed, findFeedByUrl, isUserSubscribed, subscribe, unsubscribe as unsubscribeRepo, listSubscriptionsForUser, updateSubscriptionLabel, updateSubscriptionFolder, updateFeedPollInterval, updateSubscriptionFullTextMode, updateSubscriptionNotify, updateSubscriptionBadge, findFolderById, findFeedById, countFeedSubscribers, replaceFeedUrl, moveSubscription, } from "./repository.js";
+import { createFeed, findFeedByUrl, isUserSubscribed, subscribe, unsubscribe as unsubscribeRepo, findSubscriptionForUser, updateSubscriptionLabel, updateSubscriptionFolder, updateFeedPollInterval, updateSubscriptionFullTextMode, updateSubscriptionNotify, updateSubscriptionBadge, findFolderById, findFeedById, countFeedSubscribers, replaceFeedUrl, moveSubscription, } from "./repository.js";
 import { pollFeed, probeFeed } from "./poller.js";
 import { assertPublicHttpUrl } from "./ssrfGuard.js";
 import { discoverFeeds } from "./discovery.js";
@@ -66,7 +66,7 @@ export async function subscribeToFeed(userId, inputUrl, label = null, folderId =
         unsubscribeRepo(userId, feed.id);
         throw new NoFeedsFoundError();
     }
-    const subscription = listSubscriptionsForUser(userId).find((s) => s.id === feed.id);
+    const subscription = findSubscriptionForUser(userId, feed.id);
     if (!subscription)
         throw new FeedError("subscription_lookup_failed");
     return subscription;
@@ -109,7 +109,7 @@ export function updateFeedSettings(userId, feedId, settings) {
         const minutes = Math.max(settings.pollIntervalMinutes, config.minPollIntervalMinutes);
         updateFeedPollInterval(feedId, minutes);
     }
-    const subscription = listSubscriptionsForUser(userId).find((s) => s.id === feedId);
+    const subscription = findSubscriptionForUser(userId, feedId);
     if (!subscription)
         throw new FeedError("subscription_lookup_failed");
     return subscription;
@@ -127,7 +127,7 @@ export async function changeFeedUrl(userId, feedId, inputUrl) {
     const { url } = await resolveFeedUrl(inputUrl);
     let target = feedId;
     const lookup = () => {
-        const subscription = listSubscriptionsForUser(userId).find((s) => s.id === target);
+        const subscription = findSubscriptionForUser(userId, target);
         if (!subscription)
             throw new FeedError("subscription_lookup_failed");
         return subscription;

package/server/dist/native/editions.js

@@ -108,11 +108,11 @@ export function publishCuratedEdition(userId, input, now = new Date()) {
         for (const id of data.itemIds) {
             if (!canAccessItem(userId, id))
                 throw new NativeError("item_not_found", 404);
-            const item = db.prepare(`SELECT s.folder_id, s.id IS NOT NULL AS subscribed,
+            const item = db.prepare(`SELECT s.folder_id, s.id IS NOT NULL AS subscribed, i.is_empty_gallery,
           EXISTS (SELECT 1 FROM user_muted_keywords m WHERE m.user_id = ? AND
             (instr(lower(coalesce(i.title, '')), lower(m.keyword)) > 0 OR instr(lower(coalesce(i.content_snippet, '')), lower(m.keyword)) > 0)) AS muted
          FROM items i LEFT JOIN subscriptions s ON s.feed_id = i.feed_id AND s.user_id = ? WHERE i.id = ?`).get(userId, userId, id);
-            if (item.muted || (item.subscribed && (item.folder_id === null ? !prefs.showUnfiled : prefs.hiddenFolderIds.includes(item.folder_id)))) {
+            if (item.is_empty_gallery || item.muted || (item.subscribed && (item.folder_id === null ? !prefs.showUnfiled : prefs.hiddenFolderIds.includes(item.folder_id)))) {
                 throw new NativeError("item_excluded");
             }
         }
@@ -214,19 +214,24 @@ export function editionCandidates(userId, now = new Date(), limit = 200) {
     const previousItemIds = db.prepare("SELECT item_ids FROM edition_history WHERE user_id = ? AND created_at >= ?").all(userId, new Date(now.getTime() - 72 * 3_600_000).toISOString()).flatMap((row) => JSON.parse(row.item_ids));
     const previous = new Set(previousItemIds);
     // Fetch bounded candidates per source, so a busy feed cannot hide the others.
-    const rows = db.prepare(`SELECT * FROM (
-      SELECT i.id, i.feed_id, s.folder_id, i.title, i.link, i.content_snippet, i.image_url,
-        coalesce(s.label, f.title) AS source_name, folders.name AS folder_name,
-        strftime('%Y-%m-%dT%H:%M:%fZ', coalesce(julianday(i.published_at), julianday(i.created_at))) AS published,
-        length(coalesce(i.full_content_html, i.content_html, i.content_snippet, '')) AS content_chars,
-        row_number() OVER (PARTITION BY i.feed_id ORDER BY coalesce(julianday(i.published_at), julianday(i.created_at)) DESC, i.id DESC) AS source_rank
-      FROM items i JOIN subscriptions s ON s.feed_id = i.feed_id AND s.user_id = ?
-      JOIN feeds f ON f.id = i.feed_id LEFT JOIN folders ON folders.id = s.folder_id
-      WHERE NOT EXISTS (SELECT 1 FROM item_reads r WHERE r.item_id = i.id AND r.user_id = ?)
-        AND NOT EXISTS (SELECT 1 FROM user_muted_keywords m WHERE m.user_id = ? AND
-          (instr(lower(coalesce(i.title, '')), lower(m.keyword)) > 0 OR instr(lower(coalesce(i.content_snippet, '')), lower(m.keyword)) > 0))
-        AND coalesce(julianday(i.published_at), julianday(i.created_at)) BETWEEN julianday(?) AND julianday(?)
-    ) WHERE source_rank <= 40 ORDER BY source_rank, published DESC, id DESC LIMIT 4000`)
+    const rows = db.prepare(`SELECT r.id, r.feed_id, r.folder_id, r.title, r.link, r.content_snippet, r.image_url,
+        r.source_name, r.folder_name, r.published, r.source_rank,
+        length(coalesce(full_item.full_content_html, full_item.content_html, r.content_snippet, '')) AS content_chars
+      FROM (
+        SELECT i.id, i.feed_id, s.folder_id, i.title, i.link, i.content_snippet, i.image_url,
+          coalesce(s.label, f.title) AS source_name, folders.name AS folder_name,
+          strftime('%Y-%m-%dT%H:%M:%fZ', coalesce(julianday(i.published_at), julianday(i.created_at))) AS published,
+          row_number() OVER (PARTITION BY i.feed_id ORDER BY coalesce(julianday(i.published_at), julianday(i.created_at)) DESC, i.id DESC) AS source_rank
+        FROM items i JOIN subscriptions s ON s.feed_id = i.feed_id AND s.user_id = ?
+        JOIN feeds f ON f.id = i.feed_id LEFT JOIN folders ON folders.id = s.folder_id
+        WHERE i.is_empty_gallery = 0
+          AND NOT EXISTS (SELECT 1 FROM item_reads r WHERE r.item_id = i.id AND r.user_id = ?)
+          AND NOT EXISTS (SELECT 1 FROM user_muted_keywords m WHERE m.user_id = ? AND
+            (instr(lower(coalesce(i.title, '')), lower(m.keyword)) > 0 OR instr(lower(coalesce(i.content_snippet, '')), lower(m.keyword)) > 0))
+          AND coalesce(julianday(i.published_at), julianday(i.created_at)) BETWEEN julianday(?) AND julianday(?)
+      ) r
+      JOIN items full_item ON full_item.id = r.id
+      WHERE r.source_rank <= 40 ORDER BY r.source_rank, r.published DESC, r.id DESC LIMIT 4000`)
         .all(userId, userId, userId, new Date(now.getTime() - 7 * 86_400_000).toISOString(), now.toISOString());
     const scored = rows.filter((row) => row.folder_id === null ? prefs.showUnfiled : !prefs.hiddenFolderIds.includes(row.folder_id))
         .map((row) => ({

package/server/dist/oauth/store.js

@@ -72,13 +72,20 @@ export function rotateGrant(refreshToken, clientId) {
         return { ok: true, scope: grant.scope, tokens: { accessToken, refreshToken: newRefresh, expiresIn: ACCESS_TTL_MS / 1000 } };
     })();
 }
+const grantLastTouch = new Map();
+const GRANT_TOUCH_INTERVAL_MS = 5 * 60 * 1000;
 export function resolveAccessToken(token) {
     const row = db
         .prepare("SELECT * FROM oauth_grants WHERE access_hash = ?")
         .get(hash(token));
     if (!row || row.access_expires_at <= now())
         return null;
-    db.prepare("UPDATE oauth_grants SET last_used_at = ? WHERE id = ?").run(now(), row.id);
+    const nowMs = Date.now();
+    const lastTouch = grantLastTouch.get(row.id) ?? 0;
+    if (!row.last_used_at || nowMs - lastTouch >= GRANT_TOUCH_INTERVAL_MS) {
+        grantLastTouch.set(row.id, nowMs);
+        db.prepare("UPDATE oauth_grants SET last_used_at = ? WHERE id = ?").run(now(), row.id);
+    }
     return { userId: row.user_id, scope: row.scope, grantId: row.id };
 }
 /** Revokes by either token. Returns whether a grant was removed. */
@@ -89,6 +96,7 @@ export function revokeByToken(token, clientId) {
         .get(tokenHash, tokenHash);
     if (!grant || (clientId && grant.client_id !== clientId))
         return false;
+    grantLastTouch.delete(grant.id);
     return db.prepare("DELETE FROM oauth_grants WHERE id = ?").run(grant.id).changes > 0;
 }
 export function listGrantsForUser(userId) {

package/server/dist/push.js

@@ -112,6 +112,8 @@ export function newItemsPushPayload(feed, userId, label, latest) {
     const muted = db.prepare("SELECT keyword FROM user_muted_keywords WHERE user_id = ?")
         .all(userId).map(row => row.keyword.toLowerCase());
     const fresh = latest.filter(item => {
+        if (item.is_empty_gallery)
+            return false;
         const text = `${item.title ?? ""} ${item.content_snippet ?? ""}`.toLowerCase();
         return !muted.some(keyword => text.includes(keyword));
     });

package/server/dist/pushOutbox.js

@@ -111,7 +111,7 @@ export class PushOutbox {
         if (!feed)
             return; // Feed deletion cascades the event.
         const latest = db.prepare(`
-      SELECT id,title,content_snippet FROM items WHERE feed_id = ? AND id <= ? ORDER BY id DESC LIMIT ?`)
+      SELECT id,title,content_snippet,is_empty_gallery FROM items WHERE feed_id = ? AND id <= ? ORDER BY id DESC LIMIT ?`)
             .all(event.feed_id, event.max_item_id, event.item_count);
         const payload = newItemsPushPayload(feed, subscription.user_id, subscription.label, latest);
         if (!payload) {