@bobfrankston/rmfmail 1.1.131 → 1.1.132

package/.commitmsg

@@ -1,7 +1,19 @@
-fix: -repair uses node:sqlite, not better-sqlite3
+feat: multi-level undo, viewer fate-sharing, ★ filter + ★ bulk-flag
 
-better-sqlite3 is not a project dependency — the daemon uses node:sqlite
-(built-in) via mailx-store. -repair was crashing with ERR_MODULE_NOT_FOUND
-on first run. Swap the dynamic import to node:sqlite's DatabaseSync, and
-move the WAL setting from .pragma() (better-sqlite3-specific) to
-.exec("PRAGMA …") (works on both).
+- Multi-level undo (Ctrl+Z). Replaces single-slot lastDeleted / lastMoved
+  with a LIFO undoStack. Each user-driven destructive action (delete,
+  move, bulk-flag) pushes a typed UndoOp; Ctrl+Z pops and reverses via
+  existing service IPC. Bounded at 50 entries, 10 min per-entry TTL,
+  checked at pop time. No redo (undoing an undo isn't itself undoable).
+- Viewer/list fate-sharing: when loadMessages produces an empty result OR
+  the focused row's message isn't in the freshly-loaded set (filter
+  toggle, sync drop, navigation), clearViewer() runs so the preview pane
+  doesn't keep showing a stale message that the list says doesn't exist.
+- Search-bar ★ filter button (id=btn-filter-flagged). Mirrors the
+  buried-in-View-menu opt-flagged checkbox so the flagged-only filter is
+  reachable in one click. Pressed/active state via .active CSS marker.
+- Toolbar ★ bulk-flag button (id=btn-tb-flag) next to trash/spam.
+  Operates on the message-list selection (falls back to viewer focus when
+  empty). Smart toggle: if any selected row is unflagged → flag all;
+  if all flagged → unflag all. Pushes a single undo entry capturing each
+  row's prior state so Ctrl+Z restores the exact mix.

package/client/app.bundle.js

@@ -3057,10 +3057,19 @@ async function loadMessages(accountId, folderId, page = 1, specialUse = "", auto
     if (result.items.length === 0) {
       setMessages([]);
       body.innerHTML = `<div class="ml-empty">${flaggedOnly ? "No flagged messages" : "No messages"}</div>`;
+      clearViewer();
+      focusedRow = null;
       return;
     }
     setMessages(result.items);
     renderMessages(body, accountId, result.items);
+    if (focusedRow) {
+      const stillThere = result.items.some((m) => m.accountId === focusedRow.accountId && m.uid === focusedRow.msg.uid);
+      if (!stillThere) {
+        clearViewer();
+        focusedRow = null;
+      }
+    }
     const targetUuid = remembered ? pickRestoreUid(result.items, remembered) : null;
     if (targetUuid) {
       requestAnimationFrame(() => {
@@ -7487,9 +7496,21 @@ function forwardBody(msg) {
   const body = sanitizeQuotedBody(msg);
   return `<p></p><br><br><div class="reply"><p>---------- Forwarded message ----------<br>From: ${from}<br>Date: ${date}<br>Subject: ${msg.subject}<br>To: ${to}</p>${body}</div>`;
 }
-var lastDeleted = null;
-var lastMoved = null;
-var undoTimeout = null;
+var undoStack = [];
+var UNDO_MAX = 50;
+var UNDO_TTL_MS = 10 * 6e4;
+function pushUndo(op) {
+  undoStack.push(op);
+  if (undoStack.length > UNDO_MAX) undoStack.shift();
+}
+function popUndo() {
+  const now = Date.now();
+  while (undoStack.length > 0) {
+    const op = undoStack.pop();
+    if (now - op.at < UNDO_TTL_MS) return op;
+  }
+  return null;
+}
 async function deleteSelection() {
   try {
     const sidebar = await Promise.resolve().then(() => (init_calendar_sidebar(), calendar_sidebar_exports));
@@ -7512,17 +7533,11 @@ async function deleteSelectedMessages() {
   const snapshot = [...selected];
   removeMessagesAndReconcile(selected);
   if (snapshot.length === 1) {
-    lastDeleted = { ...snapshot[0], subject: "" };
+    pushUndo({ kind: "delete", at: Date.now(), payload: { ...snapshot[0], subject: "" } });
     if (statusSync) statusSync.textContent = `Trashed 1 message (syncing) \u2014 Ctrl+Z to undo`;
   } else {
-    lastDeleted = null;
     if (statusSync) statusSync.textContent = `Trashed ${snapshot.length} messages (syncing)`;
   }
-  if (undoTimeout) clearTimeout(undoTimeout);
-  undoTimeout = setTimeout(() => {
-    lastDeleted = null;
-    if (statusSync?.textContent?.includes("undo")) statusSync.textContent = "";
-  }, 3e4);
   const byAccount = /* @__PURE__ */ new Map();
   for (const msg of snapshot) {
     const uids = byAccount.get(msg.accountId) || [];
@@ -7536,52 +7551,48 @@ async function deleteSelectedMessages() {
     });
   }
 }
-async function undoDelete() {
-  if (!lastDeleted) return;
-  const { accountId, uid, folderId } = lastDeleted;
-  try {
-    await undeleteMessage(accountId, uid, folderId);
-    const statusSync = document.getElementById("status-sync");
-    if (statusSync) statusSync.textContent = "Message restored";
-    lastDeleted = null;
-    if (undoTimeout) clearTimeout(undoTimeout);
-    reloadCurrentFolder();
-  } catch (e) {
-    console.error(`Undo failed: ${e.message}`);
-  }
-}
-async function undoMove() {
-  if (!lastMoved) return;
-  const { messages: messages2 } = lastMoved;
+async function performUndo() {
+  const op = popUndo();
+  if (!op) return;
   const statusSync = document.getElementById("status-sync");
   try {
-    const byDest = /* @__PURE__ */ new Map();
-    for (const m of messages2) {
-      const key = `${m.accountId}:${m.sourceFolderId}`;
-      if (!byDest.has(key)) byDest.set(key, { accountId: m.accountId, folderId: m.sourceFolderId, uids: [] });
-      byDest.get(key).uids.push(m.uid);
-    }
-    const { moveMessages: moveMessages2, moveMessage: moveMessage2 } = await Promise.resolve().then(() => (init_api_client(), api_client_exports));
-    for (const group of byDest.values()) {
-      if (group.uids.length === 1) await moveMessage2(group.accountId, group.uids[0], group.folderId);
-      else await moveMessages2(group.accountId, group.uids, group.folderId);
-    }
-    if (statusSync) statusSync.textContent = `Undid move of ${messages2.length} message${messages2.length !== 1 ? "s" : ""}`;
-    lastMoved = null;
-    if (undoTimeout) clearTimeout(undoTimeout);
+    if (op.kind === "delete") {
+      const { accountId, uid, folderId } = op.payload;
+      await undeleteMessage(accountId, uid, folderId);
+      if (statusSync) statusSync.textContent = "Message restored";
+    } else if (op.kind === "move") {
+      const { messages: messages2 } = op.payload;
+      const byDest = /* @__PURE__ */ new Map();
+      for (const m of messages2) {
+        const key = `${m.accountId}:${m.sourceFolderId}`;
+        if (!byDest.has(key)) byDest.set(key, { accountId: m.accountId, folderId: m.sourceFolderId, uids: [] });
+        byDest.get(key).uids.push(m.uid);
+      }
+      const { moveMessages: moveMessages2, moveMessage: moveMessage2 } = await Promise.resolve().then(() => (init_api_client(), api_client_exports));
+      for (const group of byDest.values()) {
+        if (group.uids.length === 1) await moveMessage2(group.accountId, group.uids[0], group.folderId);
+        else await moveMessages2(group.accountId, group.uids, group.folderId);
+      }
+      if (statusSync) statusSync.textContent = `Undid move of ${messages2.length} message${messages2.length !== 1 ? "s" : ""}`;
+    } else if (op.kind === "flag") {
+      const { updateFlags: updateFlags2 } = await Promise.resolve().then(() => (init_api_client(), api_client_exports));
+      for (const entry of op.payload) {
+        const flag = "\\Flagged";
+        const flagsAfter = entry.prevFlagged ? [flag] : [];
+        await updateFlags2(entry.accountId, entry.uid, flagsAfter);
+        setRowFlagged(entry.accountId, entry.uid, entry.prevFlagged);
+        updateMessageFlags(entry.accountId, entry.uid, flagsAfter);
+      }
+      if (statusSync) statusSync.textContent = `Undid flag change on ${op.payload.length} message${op.payload.length !== 1 ? "s" : ""}`;
+    }
     reloadCurrentFolder();
   } catch (e) {
-    console.error(`Undo move failed: ${e.message}`);
-    if (statusSync) statusSync.textContent = `Undo move failed: ${e.message}`;
+    console.error(`Undo failed: ${e.message}`);
+    if (statusSync) statusSync.textContent = `Undo failed: ${e.message}`;
   }
 }
 document.addEventListener("mailx-moved", (e) => {
-  lastMoved = e.detail;
-  lastDeleted = null;
-  if (undoTimeout) clearTimeout(undoTimeout);
-  undoTimeout = setTimeout(() => {
-    lastMoved = null;
-  }, 6e4);
+  pushUndo({ kind: "move", at: Date.now(), payload: e.detail });
 });
 document.getElementById("btn-delete")?.addEventListener("click", deleteSelection);
 document.getElementById("btn-tb-delete")?.addEventListener("click", deleteSelection);
@@ -7595,6 +7606,46 @@ function updateFlagButton() {
   btn.textContent = yes ? "\u2605" : "\u2606";
 }
 document.addEventListener("mailx-message-shown", updateFlagButton);
+async function bulkFlagSelected() {
+  const selected = getSelectedMessages();
+  if (selected.length === 0) {
+    const cur = getCurrentMessage();
+    if (!cur) return;
+    selected.push({ accountId: cur.accountId, uid: cur.message.uid, folderId: cur.message.folderId });
+  }
+  const statusSync = document.getElementById("status-sync");
+  const messages2 = getMessages2();
+  const byKey = /* @__PURE__ */ new Map();
+  for (const m of messages2) byKey.set(`${m.accountId}:${m.uid}`, m);
+  const rows = selected.map((s) => byKey.get(`${s.accountId}:${s.uid}`)).filter(Boolean);
+  if (rows.length === 0) return;
+  const anyUnflagged = rows.some((r) => !flaggedOf(r));
+  const targetFlagged = anyUnflagged;
+  const undoPayload = rows.map((r) => ({
+    accountId: r.accountId,
+    uid: r.uid,
+    prevFlagged: flaggedOf(r)
+  }));
+  const { updateFlags: updateFlags2 } = await Promise.resolve().then(() => (init_api_client(), api_client_exports));
+  for (const r of rows) {
+    if (flaggedOf(r) === targetFlagged) continue;
+    setFlagged(r, targetFlagged);
+    setRowFlagged(r.accountId, r.uid, targetFlagged);
+    updateMessageFlags(r.accountId, r.uid, r.flags);
+    try {
+      await updateFlags2(r.accountId, r.uid, r.flags);
+    } catch (e) {
+      console.error(`Bulk flag failed for ${r.accountId}/${r.uid}: ${e?.message || e}`);
+    }
+  }
+  pushUndo({ kind: "flag", at: Date.now(), payload: undoPayload });
+  updateFlagButton();
+  if (statusSync) {
+    const verb = targetFlagged ? "Flagged" : "Unflagged";
+    statusSync.textContent = `${verb} ${rows.length} message${rows.length !== 1 ? "s" : ""} \u2014 Ctrl+Z to undo`;
+  }
+}
+document.getElementById("btn-tb-flag")?.addEventListener("click", bulkFlagSelected);
 document.getElementById("btn-flag")?.addEventListener("click", async () => {
   const sel = getCurrentFocused();
   if (!sel) return;
@@ -8814,12 +8865,9 @@ document.addEventListener("keydown", (e) => {
     deleteSelection();
   }
   if (e.ctrlKey && e.key === "z") {
-    if (lastMoved) {
-      e.preventDefault();
-      undoMove();
-    } else if (lastDeleted) {
+    if (undoStack.length > 0) {
       e.preventDefault();
-      undoDelete();
+      performUndo();
     }
   }
   if (e.key === "F5") {
@@ -9885,13 +9933,28 @@ optThreaded?.addEventListener("change", () => {
   localStorage.setItem("mailx-threaded", String(optThreaded.checked));
   reloadCurrentFolder();
 });
-optFlagged?.addEventListener("change", () => {
+function syncFilterFlaggedButton() {
+  const btn = document.getElementById("btn-filter-flagged");
+  if (!btn) return;
+  btn.classList.toggle("active", !!optFlagged?.checked);
+  btn.setAttribute("aria-pressed", optFlagged?.checked ? "true" : "false");
+}
+function applyFlaggedFilter(on) {
+  if (optFlagged) optFlagged.checked = on;
   const body = document.getElementById("ml-body");
-  if (optFlagged.checked) body?.classList.add("flagged-only");
+  if (on) body?.classList.add("flagged-only");
   else body?.classList.remove("flagged-only");
-  localStorage.setItem("mailx-flagged", String(optFlagged.checked));
+  localStorage.setItem("mailx-flagged", String(on));
+  syncFilterFlaggedButton();
   reloadCurrentFolder();
+}
+optFlagged?.addEventListener("change", () => {
+  applyFlaggedFilter(!!optFlagged.checked);
+});
+document.getElementById("btn-filter-flagged")?.addEventListener("click", () => {
+  applyFlaggedFilter(!optFlagged?.checked);
 });
+syncFilterFlaggedButton();
 var optPriorityOnly = document.getElementById("opt-priority-only");
 if (optPriorityOnly) {
   optPriorityOnly.checked = localStorage.getItem("mailx-priority-only") === "true";