@bobfrankston/rmfmail 1.2.216 → 1.2.217

package/client/app.ts

@@ -1799,17 +1799,22 @@ async function performUndo(): Promise<void> {
                 return;
             }
         } else if (op.kind === "move") {
-            const { messages } = op.payload;
+            const { messages, targetFolderId } = op.payload;
             const byDest = new Map<string, { accountId: string; folderId: number; uids: number[] }>();
             for (const m of messages) {
                 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, moveMessage } = await import("./lib/api-client.js");
+            const { moveMessages } = await import("./lib/api-client.js");
             for (const group of byDest.values()) {
-                if (group.uids.length === 1) await moveMessage(group.accountId, group.uids[0], group.folderId);
-                else await moveMessages(group.accountId, group.uids, group.folderId);
+                // The messages are sitting in targetFolderId right now, so that
+                // is their SOURCE for the reverse move — pass it explicitly.
+                // Without it the service resolves each row by (account, uid)
+                // alone and a same-numbered uid in another folder can be moved
+                // instead (the flag-clear / spam-move wrong-folder class).
+                const currentFolderIds = targetFolderId ? group.uids.map(() => targetFolderId) : undefined;
+                await moveMessages(group.accountId, group.uids, group.folderId, currentFolderIds);
             }
             if (statusSync) statusSync.textContent = `Undid move of ${messages.length} message${messages.length !== 1 ? "s" : ""}${remaining}`;
             // Same positioning rule as undo-delete: show the message back in
@@ -2130,20 +2135,21 @@ async function spamSelectedMessages(): Promise<void> {
     // performUndo restores each message to its own sourceFolderId, so a
     // selection spanning folders comes back correctly; targetFolderId is only
     // known once the service answers and the undo doesn't need it.
-    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: MovedBatch = {
+        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 — 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}`);
+                // Now we know where they landed. The undo op is still on the
+                // stack (same object) — record it so the reverse move names the
+                // messages' current folder instead of guessing by uid alone.
+                if (result?.targetFolderId) spamUndo.targetFolderId = result.targetFolderId;
             })
             .catch(e => {
                 console.error(`[spam] ${accountId} failed:`, e);

package/client/compose/compose.bundle.js

@@ -1357,8 +1357,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) {