@bobfrankston/rmfmail 1.2.216 → 1.2.219

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) {
@@ -9304,17 +9305,17 @@ 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" : ""}${remaining}`;
       const firstMoved = messages2[0];
@@ -9563,19 +9564,18 @@ async function spamSelectedMessages() {
     g.folderIds.push(msg.folderId);
     byAccount.set(msg.accountId, g);
   }
-  pushUndo({
-    kind: "move",
-    at: Date.now(),
-    payload: {
-      messages: snapshot.map((m) => ({ accountId: m.accountId, uid: m.uid, sourceFolderId: m.folderId })),
-      targetAccountId: snapshot[0].accountId,
-      targetFolderId: 0
-    }
-  });
+  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}`;