@bobfrankston/rmfmail 1.2.84 → 1.2.86

package/client/app.js

@@ -1847,7 +1847,7 @@ document.addEventListener("mailx-flagged-batch", (e) => {
             }));
             for (const [src, g] of byAccount) {
                 const targetAcct = src === targetAccount ? undefined : targetAccount;
-                api.moveMessages(src, g.uids, targetFolderId, targetAcct)?.catch?.((err) => {
+                api.moveMessages(src, g.uids, targetFolderId, g.folderIds, targetAcct)?.catch?.((err) => {
                     if (status)
                         status.textContent = `Move failed: ${err?.message || err}`;
                 });
@@ -1993,16 +1993,22 @@ async function spamSelectedMessages() {
     // simpleParser blocking the event loop). The local commit and server
     // sync still happen. Surfacing it as a failure with an alert lies to
     // the user; the next folder reload reconciles either way.
+    // Collect per-message source folderId alongside the uid. IMAP UIDs are
+    // per-folder, so the service must be told which folder each uid lives in —
+    // a bare (account, uid) lookup can resolve to a same-numbered uid in
+    // another folder, move the wrong message (or no-op), and leave the real
+    // one in INBOX so it reappears on the next list refresh.
     const byAccount = new Map();
     for (const msg of snapshot) {
-        const uids = byAccount.get(msg.accountId) || [];
-        uids.push(msg.uid);
-        byAccount.set(msg.accountId, uids);
+        const g = byAccount.get(msg.accountId) || { uids: [], folderIds: [] };
+        g.uids.push(msg.uid);
+        g.folderIds.push(msg.folderId);
+        byAccount.set(msg.accountId, g);
     }
     if (statusSync)
         statusSync.textContent = `Spam: ${snapshot.length} queued — pending server sync`;
-    for (const [accountId, uids] of byAccount) {
-        markAsSpamMessages(accountId, uids)
+    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}`);
         })