@bobfrankston/rmfmail 1.2.12 → 1.2.14

package/client/app.js

@@ -1495,23 +1495,18 @@ async function deleteSelectedMessages() {
     // the prompt and the undo promise must change: permanent delete always
     // confirms (even a single message) and can't be undone (Bob 2026-06-12).
     const inTrash = currentFolderSpecialUse === "trash";
-    // SAFETY GATE.
-    //  - In Trash: any delete is permanent → always confirm, warn it's final.
-    //  - Elsewhere: a single delete is instant (quick triage); a BULK delete
-    //    confirms, because `Ctrl+A` selects every visible row and in All
-    //    Inboxes that's a scattered screenful — exactly what silently trashed
-    //    114 of Bob's messages on 2026-06-12.
+    // SAFETY GATE — only for the IRREVERSIBLE action.
+    //  - In Trash: delete is permanent → confirm (Bob explicitly wanted this).
+    //  - Elsewhere: move to Trash with NO prompt, single or bulk. It's
+    //    undoable (Ctrl+Z restores the whole batch) and matches Outlook /
+    //    Thunderbird, which don't nag on a move-to-trash. Bob 2026-06-15:
+    //    "stop giving me the trash warning message. It is annoying."
     const n = selected.length;
     if (inTrash) {
         if (!confirm(`Permanently delete ${n} message${n === 1 ? "" : "s"} from Trash?\n\nThis cannot be undone.`)) {
             return;
         }
     }
-    else if (n > 1) {
-        if (!confirm(`Move ${n} messages to Trash?\n\n(Ctrl+Z restores them if this was a mistake.)`)) {
-            return;
-        }
-    }
     const statusSync = document.getElementById("status-sync");
     // Optimistic UI: remove from list IMMEDIATELY, then queue the IPC.
     // Old order awaited the daemon round-trip (IPC + DB updates) before
@@ -3609,18 +3604,36 @@ document.addEventListener("keydown", (e) => {
         // from the search box or compose draft list.
         if (!e.ctrlKey && inText)
             return;
+        e.preventDefault();
+        const applySeen = (m, seen) => {
+            setSeen(m, seen);
+            updateFlags(m.accountId, m.uid, m.flags).then(() => {
+                messageState.updateMessageFlags(m.accountId, m.uid, m.flags);
+                const row = document.querySelector(`.ml-row[data-uid="${m.uid}"][data-account-id="${CSS.escape(m.accountId)}"]`);
+                if (row)
+                    row.classList.toggle("unread", !seen);
+            }).catch(() => { setSeen(m, !seen); });
+        };
+        // getSelectedMessages returns only id tuples — resolve to the full
+        // message objects (with flags) from the list state.
+        const selectedIds = getSelectedMessages();
+        if (selectedIds.length > 1) {
+            // Multi-select → mark every selected message READ (not a toggle):
+            // a triage sweep is "I've dealt with these," not "flip each one"
+            // (Bob 2026-06-15). Skip those already read.
+            const all = messageState.getMessages();
+            for (const id of selectedIds) {
+                const m = all.find(x => x.accountId === id.accountId && x.uid === id.uid && x.folderId === id.folderId);
+                if (m && !seenOf(m))
+                    applySeen(m, true);
+            }
+            return;
+        }
+        // Single → toggle read/unread.
         const sel = getCurrentFocused();
         if (!sel)
             return;
-        e.preventDefault();
-        const wasSeen = seenOf(sel);
-        setSeen(sel, !wasSeen);
-        updateFlags(sel.accountId, sel.uid, sel.flags).then(() => {
-            messageState.updateMessageFlags(sel.accountId, sel.uid, sel.flags);
-            const row = document.querySelector(`.ml-row[data-uid="${sel.uid}"][data-account-id="${sel.accountId}"]`);
-            if (row)
-                row.classList.toggle("unread", wasSeen);
-        }).catch(() => { setSeen(sel, wasSeen); });
+        applySeen(sel, !seenOf(sel));
     }
     // Z = locate the focused row in the list (scroll-to-selected). After
     // scrolling the list out of sync with the preview, this snaps back.