hn-bits 0.5.0 → 0.6.0

package/dist/api/algolia.js

@@ -50,19 +50,32 @@ export async function searchStories(query, page = 0) {
         totalHits: res.nbHits,
     };
 }
+const DEFAULT_HITS_PER_PAGE = 50;
 /**
  * Recency-ordered search (subscription matching + watcher window rescans),
  * as opposed to searchStories' relevance ordering.
+ *
+ * Both thresholds are always pushed server-side. With one active it's a flat AND'd
+ * numericFilters string, same as before minComments existed. With both active, Algolia's
+ * nested-array numericFilters OR syntax (`[a, [b, c]]` = a AND (b OR c)) — verified live against
+ * hn.algolia.com — expresses `created_at_i>X AND (points>=N OR num_comments>=M)` in one request.
  */
 export async function searchRecent(query, options) {
-    const numericFilters = [`created_at_i>${options.createdAfter}`];
-    if (options.minPoints)
-        numericFilters.push(`points>=${options.minPoints}`);
+    const minPoints = options.minPoints ?? 0;
+    const minComments = options.minComments ?? 0;
+    const createdAfterFilter = `created_at_i>${options.createdAfter}`;
+    const numericFilters = minPoints > 0 && minComments > 0
+        ? JSON.stringify([createdAfterFilter, [`points>=${minPoints}`, `num_comments>=${minComments}`]])
+        : [
+            createdAfterFilter,
+            ...(minPoints ? [`points>=${minPoints}`] : []),
+            ...(minComments ? [`num_comments>=${minComments}`] : []),
+        ].join(',');
     const params = new URLSearchParams({
         query,
         tags: 'story',
-        numericFilters: numericFilters.join(','),
-        hitsPerPage: String(options.hitsPerPage ?? 50),
+        numericFilters,
+        hitsPerPage: String(options.hitsPerPage ?? DEFAULT_HITS_PER_PAGE),
         typoTolerance: 'false',
         queryType: 'prefixNone',
     });

package/dist/db/db.js

@@ -31,6 +31,7 @@ const MIGRATIONS = [
     bookmarked_at INTEGER NOT NULL
   );
   `,
+    `ALTER TABLE subscriptions ADD COLUMN min_comments INTEGER NOT NULL DEFAULT 0;`,
 ];
 export function dbPath() {
     return process.env.HN_BITS_DB || join(homedir(), '.local', 'share', 'hn-bits', 'hn-bits.db');

package/dist/db/subscriptions.js

@@ -5,6 +5,7 @@ function fromRow(row) {
         name: row.name,
         query: row.query,
         minPoints: row.min_points,
+        minComments: row.min_comments,
         createdAt: row.created_at,
         lastRunAt: row.last_run_at,
     };
@@ -17,13 +18,13 @@ function assertNameFree(name, excludeId) {
     if (conflict)
         throw new Error(`subscription '${name}' already exists`);
 }
-export function addSubscription(name, query, minPoints) {
+export function addSubscription(name, query, minPoints, minComments = 0) {
     assertNameFree(name);
     const createdAt = Math.floor(Date.now() / 1000);
     const info = openDb()
-        .prepare('INSERT INTO subscriptions (name, query, min_points, created_at) VALUES (?, ?, ?, ?)')
-        .run(name, query, minPoints, createdAt);
-    return { id: Number(info.lastInsertRowid), name, query, minPoints, createdAt, lastRunAt: null };
+        .prepare('INSERT INTO subscriptions (name, query, min_points, min_comments, created_at) VALUES (?, ?, ?, ?, ?)')
+        .run(name, query, minPoints, minComments, createdAt);
+    return { id: Number(info.lastInsertRowid), name, query, minPoints, minComments, createdAt, lastRunAt: null };
 }
 export function listSubscriptions() {
     const rows = openDb().prepare('SELECT * FROM subscriptions ORDER BY created_at ASC').all();
@@ -36,7 +37,7 @@ export function removeSubscription(name) {
 export function updateSubscription(id, fields) {
     assertNameFree(fields.name, id);
     const db = openDb();
-    db.prepare('UPDATE subscriptions SET name = ?, query = ?, min_points = ? WHERE id = ?').run(fields.name, fields.query, fields.minPoints, id);
+    db.prepare('UPDATE subscriptions SET name = ?, query = ?, min_points = ?, min_comments = ? WHERE id = ?').run(fields.name, fields.query, fields.minPoints, fields.minComments ?? 0, id);
     return fromRow(db.prepare('SELECT * FROM subscriptions WHERE id = ?').get(id));
 }
 export function touchLastRun(id, at) {

package/dist/index.js

@@ -112,6 +112,14 @@ config
     }
 });
 const sub = program.command('sub').description('Manage topic subscriptions');
+function parseNonNegativeInt(value, flag) {
+    const parsed = Number(value);
+    if (!Number.isInteger(parsed) || parsed < 0) {
+        console.error(`${flag} must be a non-negative integer, got '${value}'`);
+        process.exit(1);
+    }
+    return parsed;
+}
 async function promptInstallSchedule() {
     const readline = await import('node:readline/promises');
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
@@ -134,15 +142,13 @@ sub
     .command('add <name> <query...>')
     .description('Add a subscription')
     .option('--min-points <n>', 'minimum points threshold', '0')
+    .option('--min-comments <n>', 'minimum comments threshold', '0')
     .action(async (name, queryParts, options) => {
-    const minPoints = Number(options.minPoints);
-    if (!Number.isInteger(minPoints) || minPoints < 0) {
-        console.error(`--min-points must be a non-negative integer, got '${options.minPoints}'`);
-        process.exit(1);
-    }
+    const minPoints = parseNonNegativeInt(options.minPoints, '--min-points');
+    const minComments = parseNonNegativeInt(options.minComments, '--min-comments');
     const { addSubscription, listSubscriptions } = await import('./db/subscriptions.js');
     try {
-        addSubscription(name, queryParts.join(' '), minPoints);
+        addSubscription(name, queryParts.join(' '), minPoints, minComments);
         console.log(`added '${name}'`);
     }
     catch (err) {
@@ -160,6 +166,7 @@ sub
     .action(async () => {
     const { listSubscriptions } = await import('./db/subscriptions.js');
     const { formatAge } = await import('./lib/format.js');
+    const { thresholdLabel } = await import('./lib/subscriptionLabel.js');
     const subs = listSubscriptions();
     if (subs.length === 0) {
         console.log('no subscriptions yet');
@@ -167,9 +174,9 @@ sub
     }
     const nameWidth = Math.max(...subs.map((s) => s.name.length));
     for (const s of subs) {
-        const points = s.minPoints === 0 ? 'any' : `>=${s.minPoints}`;
+        const threshold = thresholdLabel(s.minPoints, s.minComments);
         const lastRun = s.lastRunAt == null ? 'never' : `${formatAge(s.lastRunAt)} ago`;
-        console.log(`${s.name.padEnd(nameWidth)}  "${s.query}"  ${points}  ${lastRun}`);
+        console.log(`${s.name.padEnd(nameWidth)}  "${s.query}"  ${threshold}  ${lastRun}`);
     }
 });
 sub

package/dist/lib/subscriptionLabel.js

@@ -0,0 +1,9 @@
+/** "any" / "≥20 pts" / "≥5 cmts" / "≥20 pts or ≥5 cmts" — shared by CLI and TUI. */
+export function thresholdLabel(minPoints, minComments) {
+    const parts = [];
+    if (minPoints > 0)
+        parts.push(`≥${minPoints} pts`);
+    if (minComments > 0)
+        parts.push(`≥${minComments} cmts`);
+    return parts.length === 0 ? 'any' : parts.join(' or ');
+}

package/dist/ui/SubscriptionForm.js

@@ -5,11 +5,12 @@ import { searchRecent } from '../api/algolia.js';
 import { addSubscription, listSubscriptions, updateSubscription } from '../db/subscriptions.js';
 import { truncateTitle } from '../lib/format.js';
 import { hasScheduledJob, installScheduledJob } from '../lib/schedule.js';
+import { thresholdLabel } from '../lib/subscriptionLabel.js';
 import { useTheme } from './theme.js';
 const PREVIEW_DEBOUNCE_MS = 300;
 const PREVIEW_WINDOW_DAYS = 7;
 const PREVIEW_LIMIT = 5;
-const FIELD_ORDER = ['name', 'query', 'minPoints'];
+const FIELD_ORDER = ['name', 'query', 'minPoints', 'minComments'];
 function windowStart() {
     return Math.floor(Date.now() / 1000) - PREVIEW_WINDOW_DAYS * 24 * 60 * 60;
 }
@@ -19,6 +20,7 @@ export function SubscriptionForm({ mode, subscription, prefillQuery, onSave, onC
     const [name, setName] = useState(subscription?.name ?? '');
     const [query, setQuery] = useState(subscription?.query ?? prefillQuery ?? '');
     const [minPoints, setMinPoints] = useState(String(subscription?.minPoints ?? 0));
+    const [minComments, setMinComments] = useState(String(subscription?.minComments ?? 0));
     const [field, setField] = useState('name');
     const [error, setError] = useState('');
     const [preview, setPreview] = useState([]);
@@ -38,12 +40,18 @@ export function SubscriptionForm({ mode, subscription, prefillQuery, onSave, onC
                 clearTimeout(debounceRef.current);
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [query, minPoints]);
+    }, [query, minPoints, minComments]);
     async function loadPreview() {
         const myToken = ++previewToken.current;
         const points = Number(minPoints) || 0;
+        const comments = Number(minComments) || 0;
         try {
-            const results = await searchRecent(query, { createdAfter: windowStart(), minPoints: points, hitsPerPage: PREVIEW_LIMIT });
+            const results = await searchRecent(query, {
+                createdAfter: windowStart(),
+                minPoints: points,
+                minComments: comments,
+                hitsPerPage: PREVIEW_LIMIT,
+            });
             if (myToken === previewToken.current)
                 setPreview(results);
         }
@@ -60,11 +68,17 @@ export function SubscriptionForm({ mode, subscription, prefillQuery, onSave, onC
         if (!trimmedQuery)
             return setError('query is required');
         const points = Number(minPoints) || 0;
+        const comments = Number(minComments) || 0;
         try {
             if (mode === 'add')
-                addSubscription(trimmedName, trimmedQuery, points);
+                addSubscription(trimmedName, trimmedQuery, points, comments);
             else
-                updateSubscription(subscription.id, { name: trimmedName, query: trimmedQuery, minPoints: points });
+                updateSubscription(subscription.id, {
+                    name: trimmedName,
+                    query: trimmedQuery,
+                    minPoints: points,
+                    minComments: comments,
+                });
             if (mode === 'add' && listSubscriptions().length === 1 && !hasScheduledJob()) {
                 setScheduleConfirm(true);
                 return;
@@ -110,6 +124,8 @@ export function SubscriptionForm({ mode, subscription, prefillQuery, onSave, onC
                 setQuery((v) => v.slice(0, -1));
             if (field === 'minPoints')
                 setMinPoints((v) => v.slice(0, -1));
+            if (field === 'minComments')
+                setMinComments((v) => v.slice(0, -1));
             return;
         }
         if (input && !key.ctrl && !key.meta) {
@@ -120,10 +136,13 @@ export function SubscriptionForm({ mode, subscription, prefillQuery, onSave, onC
             if (field === 'minPoints' && /^\d+$/.test(input)) {
                 setMinPoints((v) => (v === '0' ? input : v + input));
             }
+            if (field === 'minComments' && /^\d+$/.test(input)) {
+                setMinComments((v) => (v === '0' ? input : v + input));
+            }
         }
     }
     useInput(handleInput);
     const cursor = (f) => (field === f ? '▏' : '');
-    const previewLabel = Number(minPoints) > 0 ? `≥${minPoints} pts` : 'any points';
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: theme.colors.title, children: mode === 'add' ? 'New subscription' : 'Edit subscription' }), _jsx(Text, { children: " " }), _jsxs(Text, { children: ["name:        ", name, cursor('name')] }), _jsxs(Text, { children: ["query:       ", query, cursor('query')] }), _jsxs(Text, { children: ["min points:  ", minPoints, cursor('minPoints')] }), _jsx(Text, { children: " " }), query.trim() && (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: ["preview (last 7 days, ", previewLabel, "):"] }), preview.length === 0 && _jsx(Text, { dimColor: true, children: " no matches" }), preview.map((story, i) => (_jsxs(Text, { children: [' ', i + 1, ". ", truncateTitle(story.title, Math.max(1, columns - 24)), "  ", story.score, " pts"] }, story.id)))] })), error && _jsx(Text, { color: theme.colors.error, children: error }), _jsx(Text, { children: " " }), scheduleConfirm ? (_jsx(Text, { dimColor: true, children: "no watch schedule installed yet - install one now (every 30 min)? y/n" })) : (_jsx(Text, { dimColor: true, children: "tab next field \u00B7 enter save \u00B7 esc cancel" }))] }));
+    const previewLabel = thresholdLabel(Number(minPoints) || 0, Number(minComments) || 0);
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: theme.colors.title, children: mode === 'add' ? 'New subscription' : 'Edit subscription' }), _jsx(Text, { children: " " }), _jsxs(Text, { children: ["name:        ", name, cursor('name')] }), _jsxs(Text, { children: ["query:       ", query, cursor('query')] }), _jsxs(Text, { children: ["min points:  ", minPoints, cursor('minPoints')] }), _jsxs(Text, { children: ["min comments:  ", minComments, cursor('minComments')] }), _jsx(Text, { children: " " }), query.trim() && (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: ["preview (last 7 days, ", previewLabel, "):"] }), preview.length === 0 && _jsx(Text, { dimColor: true, children: " no matches" }), preview.map((story, i) => (_jsxs(Text, { children: [' ', i + 1, ". ", truncateTitle(story.title, Math.max(1, columns - 24)), "  ", story.score, " pts"] }, story.id)))] })), error && _jsx(Text, { color: theme.colors.error, children: error }), _jsx(Text, { children: " " }), scheduleConfirm ? (_jsx(Text, { dimColor: true, children: "no watch schedule installed yet - install one now (every 30 min)? y/n" })) : (_jsx(Text, { dimColor: true, children: "tab next field \u00B7 enter save \u00B7 esc cancel" }))] }));
 }

package/dist/ui/SubscriptionMatches.js

@@ -44,6 +44,7 @@ export function SubscriptionMatches({ subscription, config, onSelectStory, onBac
             const results = await searchRecent(subscription.query, {
                 createdAfter: windowStart(),
                 minPoints: subscription.minPoints,
+                minComments: subscription.minComments,
             });
             setStories(results);
             setStatus('ready');

package/dist/ui/SubscriptionsView.js

@@ -5,14 +5,12 @@ import { listSubscriptions, removeSubscription } from '../db/subscriptions.js';
 import { formatAge } from '../lib/format.js';
 import { clampSelection, mapFeedKey } from '../lib/listNavigation.js';
 import { hasScheduledJob, installScheduledJob, removeScheduledJob } from '../lib/schedule.js';
+import { thresholdLabel } from '../lib/subscriptionLabel.js';
 import { ensureVisibleLines, sliceByLines } from '../lib/viewport.js';
 import { footerRows, SUBS_KEYS } from './keymap.js';
 import { HEADER_ROWS } from './Layout.js';
 import { useTheme } from './theme.js';
 import { useFlash } from './useFlash.js';
-function pointsLabel(minPoints) {
-    return minPoints === 0 ? 'any' : `≥${minPoints} pts`;
-}
 export function SubscriptionsView({ onSelectMatches, onAdd, onEdit, onFeedChange, onTabChange, }) {
     const theme = useTheme();
     const { columns, rows } = useWindowSize();
@@ -103,6 +101,6 @@ export function SubscriptionsView({ onSelectMatches, onAdd, onEdit, onFeedChange
                 const isSelected = index === selected;
                 const marker = isSelected ? theme.glyphs.selection : ' ';
                 const background = isSelected ? theme.colors.selectionBackground : undefined;
-                return (_jsxs(Text, { backgroundColor: background, children: [marker, " ", sub.name.padEnd(nameWidth), "  \"", sub.query, "\"  ", pointsLabel(sub.minPoints).padEnd(9), "  added", ' ', formatAge(sub.createdAt), " ago"] }, sub.id));
+                return (_jsxs(Text, { backgroundColor: background, children: [marker, " ", sub.name.padEnd(nameWidth), "  \"", sub.query, "\"  ", thresholdLabel(sub.minPoints, sub.minComments).padEnd(19), "  added", ' ', formatAge(sub.createdAt), " ago"] }, sub.id));
             }), deleteConfirm && _jsxs(Text, { dimColor: true, children: ["delete '", deleteConfirm, "'? y/n"] }), _jsx(Text, { dimColor: true, children: scheduleStatusText }), scheduleFlash && _jsx(Text, { dimColor: true, children: scheduleFlash })] }));
 }

package/dist/watch.js

@@ -35,7 +35,11 @@ async function notifyStory(sub, story, notifiers) {
 async function processSubscription(sub, notifiers, now, dryRun) {
     let stories;
     try {
-        stories = await searchRecent(sub.query, { createdAfter: windowStart(sub.lastRunAt, now), minPoints: sub.minPoints });
+        stories = await searchRecent(sub.query, {
+            createdAfter: windowStart(sub.lastRunAt, now),
+            minPoints: sub.minPoints,
+            minComments: sub.minComments,
+        });
     }
     catch (err) {
         log(`${sub.name}: query failed - ${err.message}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hn-bits",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Terminal-first Hacker News client",
   "type": "module",
   "repository": {