@bobfrankston/rmfmail 1.2.215 → 1.2.217

package/client/app.bundle.js

@@ -360,8 +360,9 @@ function deleteMessages(accountId, uids, folderIds) {
   return ipc().deleteMessages?.(accountId, uids, folderIds);
 }
 function moveMessages(accountId, uids, targetFolderId, folderIds, targetAccountId) {
-  if (uids.length === 1)
+  if (uids.length === 1 && (targetAccountId || !folderIds?.length)) {
     return moveMessage(accountId, uids[0], targetFolderId, targetAccountId);
+  }
   return ipc().moveMessages?.(accountId, uids, targetFolderId, folderIds);
 }
 function markAsSpamMessages(accountId, uids, folderIds) {
@@ -9280,17 +9281,23 @@ This cannot be undone.`)) {
     });
   }
 }
+var undoChain = Promise.resolve();
+function queueUndo() {
+  undoChain = undoChain.then(() => performUndo()).catch(() => {
+  });
+}
 async function performUndo() {
   const op = popUndo();
   if (!op) return;
   const statusSync = document.getElementById("status-sync");
+  const remaining = undoStack.length ? ` \u2014 ${undoStack.length} more to undo` : "";
   try {
     if (op.kind === "delete") {
       const msgs = Array.isArray(op.payload) ? op.payload : [op.payload];
       for (const m of msgs) {
         await undeleteMessage(m.accountId, m.uid, m.folderId);
       }
-      if (statusSync) statusSync.textContent = msgs.length === 1 ? "Message restored" : `Restored ${msgs.length} messages`;
+      if (statusSync) statusSync.textContent = (msgs.length === 1 ? "Message restored" : `Restored ${msgs.length} messages`) + remaining;
       const first = msgs[0];
       if (first?.folderId) {
         await revealMessage(first.accountId, first.folderId, first.uid);
@@ -9298,19 +9305,19 @@ async function performUndo() {
         return;
       }
     } else if (op.kind === "move") {
-      const { messages: messages2 } = op.payload;
+      const { messages: messages2, targetFolderId } = 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));
+      const { moveMessages: moveMessages2 } = 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);
+        const currentFolderIds = targetFolderId ? group.uids.map(() => targetFolderId) : void 0;
+        await moveMessages2(group.accountId, group.uids, group.folderId, currentFolderIds);
       }
-      if (statusSync) statusSync.textContent = `Undid move of ${messages2.length} message${messages2.length !== 1 ? "s" : ""}`;
+      if (statusSync) statusSync.textContent = `Undid move of ${messages2.length} message${messages2.length !== 1 ? "s" : ""}${remaining}`;
       const firstMoved = messages2[0];
       if (firstMoved?.sourceFolderId) {
         await revealMessage(firstMoved.accountId, firstMoved.sourceFolderId, firstMoved.uid);
@@ -9326,7 +9333,7 @@ async function performUndo() {
         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" : ""}`;
+      if (statusSync) statusSync.textContent = `Undid flag change on ${op.payload.length} message${op.payload.length !== 1 ? "s" : ""}${remaining}`;
     }
     reloadCurrentFolder();
   } catch (e) {
@@ -9557,10 +9564,18 @@ async function spamSelectedMessages() {
     g.folderIds.push(msg.folderId);
     byAccount.set(msg.accountId, g);
   }
-  if (statusSync) statusSync.textContent = `Spam: ${snapshot.length} queued \u2014 pending server sync`;
+  const spamUndo = {
+    messages: snapshot.map((m) => ({ accountId: m.accountId, uid: m.uid, sourceFolderId: m.folderId })),
+    targetAccountId: snapshot[0].accountId,
+    targetFolderId: 0
+    // filled in below — only the service knows which folder is \Junk
+  };
+  pushUndo({ kind: "move", at: Date.now(), payload: spamUndo });
+  if (statusSync) statusSync.textContent = `Spam: ${snapshot.length} queued \u2014 Ctrl+Z to undo`;
   for (const [accountId, { uids, folderIds }] of byAccount) {
     markAsSpamMessages(accountId, uids, folderIds).then((result) => {
       console.log(`[spam] ${accountId}: moved ${result?.moved ?? uids.length} to folderId=${result?.targetFolderId}`);
+      if (result?.targetFolderId) spamUndo.targetFolderId = result.targetFolderId;
     }).catch((e) => {
       console.error(`[spam] ${accountId} failed:`, e);
       if (statusSync) statusSync.textContent = `Spam sync issue (${accountId}): ${e?.message || e}`;
@@ -10903,7 +10918,7 @@ document.addEventListener("keydown", (e) => {
     const composeOpen = !!document.querySelector(".compose-overlay");
     if (!inEditable && !composeOpen && undoStack.length > 0) {
       e.preventDefault();
-      performUndo();
+      queueUndo();
     }
   }
   if (e.key === "F5") {
@@ -11060,7 +11075,7 @@ function openShortcutsDialog() {
         ["Forward", "Ctrl+F"],
         ["Sync", "F5"],
         ["Delete selected", "Del or Ctrl+D"],
-        ["Undo last delete/move", "Ctrl+Z"],
+        ["Undo delete / move / spam / flag (repeat to go back further)", "Ctrl+Z"],
         ["Toggle read/unread", "R"],
         ["Toggle flag (\u2605)", "(\u2691 button in viewer)"],
         ["Select all visible", "Ctrl+A"],