cli-whatsapp 0.1.8 → 0.1.14

package/dist/cli/commands/filepicker.js

@@ -210,7 +210,7 @@ export function pickFromList(title, allItems, initialFilter = '') {
             return void ((index = Math.min(items.length - 1, index + 1)), render());
         if (key.name === 'return') {
             const it = items[index];
-            return done(it ? it.value : null);
+            return done(it ? (it.id ?? it.value) : null);
         }
         if (key.name === 'backspace') {
             if (!filter)

package/dist/cli/commands/shell.js

@@ -1,7 +1,7 @@
 import readline, { createInterface } from 'node:readline';
 import { readdirSync, statSync, existsSync } from 'node:fs';
 import { homedir } from 'node:os';
-import { join } from 'node:path';
+import { join, basename } from 'node:path';
 import { chats, contacts, search, history } from "./read.js";
 import { reply, buildMediaContent, sendContent } from "./send.js";
 import { media, downloadWithSocket } from "./media.js";
@@ -11,10 +11,10 @@ import { recent, pin, unpin, archive, unarchive } from "./manage.js";
 import { status } from "./auth.js";
 import { connect, hasSession } from "../../whatsapp/client.js";
 import { registerPersistence, extractText, isGroupJid, messageType } from "../../whatsapp/events.js";
-import { listChats, listContacts, findChat, upsertChat, getMessages, getMessageById, localIdForWaMessage, countMessages, } from "../../db/sqlite.js";
+import { listChats, listContacts, listMedia, findChat, upsertChat, getMessages, getMessageById, localIdForWaMessage, countMessages, } from "../../db/sqlite.js";
 import { resolveTarget } from "../../utils/jid.js";
 import { loadConfig, saveConfig } from "../../config/index.js";
-import { c, displayName, chatNumber, formatTime, truncate, renderMessages } from "../../utils/format.js";
+import { c, displayName, chatNumber, cleanSender, formatTime, truncate, renderMessages } from "../../utils/format.js";
 import { print, warn, printError } from "../../utils/ui.js";
 import { notify } from "../../utils/notify.js";
 // ---- tab completion --------------------------------------------------------
@@ -29,7 +29,9 @@ const SLASH_ITEMS = [
     { value: '/send', desc: 'send a message to a chat', args: true },
     { value: '/sendfile', desc: 'send a file (media)', args: true },
     { value: '/reply', desc: 'reply to a message by #id', args: true },
-    { value: '/media', desc: 'list cached media' },
+    { value: '/media', desc: 'list cached media (this chat, or all)' },
+    { value: '/dl', desc: 'pick un-downloaded media to download & open' },
+    { value: '/saved', desc: 'pick already-downloaded media to open' },
     { value: '/pin', desc: 'pin a chat to the top', args: true },
     { value: '/unpin', desc: 'unpin a chat', args: true },
     { value: '/archive', desc: 'archive (hide) a chat', args: true },
@@ -263,7 +265,20 @@ async function sendTo(state, jid, name, content, meta, replaceInput = false) {
         return;
     try {
         await sendContent(conn.sock, jid, content, meta);
-        const echo = meta.type === 'text' ? meta.previewText : `[${meta.type}] ${meta.previewText}`;
+        // Build the echo: text → the message; media → "[type] filename" plus any
+        // caption (never "[image] [image]"). The filename tells you which file.
+        let echo;
+        if (meta.type === 'text') {
+            echo = meta.previewText;
+        }
+        else {
+            const fname = meta.mediaPath ? basename(meta.mediaPath) : '';
+            const caption = meta.previewText.startsWith('[') ? '' : meta.previewText;
+            echo =
+                `${c.dim(`[${meta.type}]`)}` +
+                    (fname ? ` ${fname}` : '') +
+                    (caption ? ` ${c.dim('—')} ${caption}` : '');
+        }
         // Replace the just-typed input with the bubble so it shows once — but only
         // when we were already live (no "connecting…" lines were printed in between).
         if (replaceInput && wasLive)
@@ -301,6 +316,61 @@ async function downloadAndOpen(state, idRaw) {
         warn(`Download failed: ${err.message}`);
     }
 }
+/** Build picker items from media rows (label + who/time, returns the id). */
+function mediaItems(rows) {
+    const time24h = loadConfig().preferences.time24h;
+    return rows.map((m) => {
+        const label = m.text
+            ? truncate(m.text.replace(/\s+/g, ' '), 32)
+            : m.mediaPath
+                ? basename(m.mediaPath)
+                : '';
+        return {
+            value: `[${m.type}]${label ? ' ' + label : ''}`,
+            desc: `${m.fromMe ? 'you' : cleanSender(m.sender)} · ${formatTime(m.timestamp, time24h)}`,
+            id: String(m.id),
+        };
+    });
+}
+/** `/dl` with no id: pick from recent, not-yet-downloaded media (this chat if
+ *  open, else all), newest first — arrow-select, no id to type. */
+async function pickMediaToDownload(state) {
+    const rows = listMedia(null, 100, state.active?.jid, 'undownloaded');
+    if (!rows.length) {
+        warn(state.active ? 'No new media in this chat to download.' : 'No new media to download.');
+        return;
+    }
+    const title = state.active
+        ? `Download media with ${displayName(state.active)} — ⏎ to save & open`
+        : 'Download media — ⏎ to save & open';
+    const picked = await pickFromList(title, mediaItems(rows), '');
+    if (picked)
+        await downloadAndOpen(state, picked);
+}
+/** `/saved`: pick from already-downloaded media (this chat if open, else all)
+ *  and open it — no re-download. */
+async function pickMediaToOpen(state) {
+    const rows = listMedia(null, 100, state.active?.jid, 'downloaded');
+    if (!rows.length) {
+        warn((state.active ? 'No downloaded media in this chat yet. ' : 'No downloaded media yet. ') +
+            'Use /dl to download some first.');
+        return;
+    }
+    const title = state.active
+        ? `Open saved media with ${displayName(state.active)} — ⏎ to open`
+        : 'Open saved media — ⏎ to open';
+    const picked = await pickFromList(title, mediaItems(rows), '');
+    if (!picked)
+        return;
+    const m = getMessageById(parseInt(picked, 10));
+    if (m?.mediaPath && existsSync(m.mediaPath)) {
+        openFile(m.mediaPath);
+        printAbove(state, `${c.green('✓')} Opened ${c.dim(m.mediaPath)}`);
+    }
+    else {
+        warn('That file is missing — re-download it with /dl.');
+    }
+}
 // ---- chat context ----------------------------------------------------------
 function openChat(state, target) {
     // Resolve against chats, contacts, or a raw number/jid.
@@ -476,9 +546,15 @@ async function handle(state, raw) {
             return;
         case 'download':
         case 'dl':
-        case 'open-media':
-            if (need(args[0], 'id'))
+            if (args[0])
                 await downloadAndOpen(state, args[0]);
+            else
+                await pickMediaToDownload(state); // no id → pick un-downloaded media
+            return;
+        case 'saved':
+        case 'downloads':
+        case 'opened':
+            await pickMediaToOpen(state); // pick already-downloaded media to open
             return;
         case 'status':
             status();

package/dist/db/schema.js

@@ -4,7 +4,7 @@
  *
  * `schema_version` in the `settings` table lets us evolve this safely later.
  */
-export const SCHEMA_VERSION = 3;
+export const SCHEMA_VERSION = 4;
 export const SCHEMA_SQL = /* sql */ `
 PRAGMA journal_mode = WAL;      -- concurrent read while writing (watch + reads)
 PRAGMA synchronous = NORMAL;    -- fast, safe enough for a local cache
@@ -39,6 +39,7 @@ CREATE TABLE IF NOT EXISTS messages (
   type       TEXT,
   fromMe     INTEGER NOT NULL DEFAULT 0,
   mediaPath  TEXT,
+  downloadedAt INTEGER,   -- when the media file was saved locally (for "recently saved" sort)
   raw        TEXT,   -- JSON of the message content, kept for media so it can be downloaded later
   UNIQUE (chatJid, messageId)
 );

package/dist/db/sqlite.js

@@ -18,6 +18,7 @@ export function getDb() {
 /** Additive, idempotent migrations for databases created by older versions. */
 function migrate(dbc) {
     ensureColumn(dbc, 'messages', 'raw', 'TEXT');
+    ensureColumn(dbc, 'messages', 'downloadedAt', 'INTEGER');
 }
 function ensureColumn(dbc, table, column, type) {
     const cols = dbc.prepare(`PRAGMA table_info(${table})`).all();
@@ -105,9 +106,11 @@ export function insertMessage(m) {
         raw: m.raw ?? null,
     });
 }
-/** Update the local media file path once a media message is downloaded. */
+/** Update the local media file path (and save time) once a media message is downloaded. */
 export function setMediaPath(id, path) {
-    getDb().prepare('UPDATE messages SET mediaPath = ? WHERE id = ?').run(path, id);
+    getDb()
+        .prepare('UPDATE messages SET mediaPath = ?, downloadedAt = ? WHERE id = ?')
+        .run(path, Date.now(), id);
 }
 // ---- queries ---------------------------------------------------------------
 // Chat rows with the display name resolved. Preference order:
@@ -249,7 +252,7 @@ export function importLidMappings() {
     return n;
 }
 /** Media messages, optionally filtered by type (image/video/audio/document/sticker). */
-export function listMedia(types, limit = 50, chatJid) {
+export function listMedia(types, limit = 50, chatJid, saved) {
     const kinds = types && types.length ? types : ['image', 'video', 'audio', 'document', 'sticker'];
     const placeholders = kinds.map(() => '?').join(',');
     const params = [...kinds];
@@ -258,9 +261,15 @@ export function listMedia(types, limit = 50, chatJid) {
         where += ' AND chatJid = ?';
         params.push(chatJid);
     }
+    if (saved === 'undownloaded')
+        where += " AND (mediaPath IS NULL OR mediaPath = '')";
+    else if (saved === 'downloaded')
+        where += " AND mediaPath IS NOT NULL AND mediaPath <> ''";
+    // Downloaded → newest *saved* first; otherwise newest *shared* first.
+    const orderBy = saved === 'downloaded' ? 'COALESCE(downloadedAt, timestamp) DESC' : 'timestamp DESC';
     params.push(limit);
     return getDb()
-        .prepare(`SELECT * FROM messages WHERE ${where} ORDER BY timestamp DESC LIMIT ?`)
+        .prepare(`SELECT * FROM messages WHERE ${where} ORDER BY ${orderBy} LIMIT ?`)
         .all(...params);
 }
 /** Recent chats by activity, ignoring pin priority. */

package/dist/utils/format.js

@@ -79,13 +79,23 @@ export function renderChatList(chats, time24h = true) {
 export function renderMessages(messages, time24h = true) {
     if (messages.length === 0)
         return c.dim('No messages.');
+    const MEDIA = ['image', 'video', 'audio', 'document', 'sticker'];
     return messages
         .map((m) => {
         const time = c.gray(formatTime(m.timestamp, time24h));
         const who = m.fromMe ? c.green('me') : c.cyan(cleanSender(m.sender));
+        const isMedia = m.type ? MEDIA.includes(m.type) : false;
+        const downloaded = isMedia && !!m.mediaPath;
         const body = m.text ?? (m.type ? c.dim(`[${m.type}]`) : c.dim('[no text]'));
-        const id = c.dim(`#${m.id}`);
-        return `${time} ${who}: ${body} ${id}`;
+        // Media: "✓ saved" (downloaded) or "/dl <id>" (not yet); text: dim #id.
+        let tail;
+        if (downloaded)
+            tail = c.green('✓ saved') + ' ' + c.dim(`#${m.id}`);
+        else if (isMedia && !m.fromMe)
+            tail = c.green(`/dl ${m.id}`);
+        else
+            tail = c.dim(`#${m.id}`);
+        return `${time} ${who}: ${body} ${tail}`;
     })
         .join('\n');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cli-whatsapp",
-  "version": "0.1.8",
+  "version": "0.1.14",
   "description": "A lightweight, fast, terminal-first WhatsApp client. Read, search, send, media, groups, and live notifications — from your terminal.",
   "type": "module",
   "bin": {