@bobfrankston/rmfmail 1.2.85 → 1.2.86

package/client/app.bundle.js

@@ -344,13 +344,13 @@ function deleteMessages(accountId, uids, folderIds) {
     return deleteMessage(accountId, uids[0], folderIds?.[0]);
   return ipc().deleteMessages?.(accountId, uids, folderIds);
 }
-function moveMessages(accountId, uids, targetFolderId, targetAccountId) {
+function moveMessages(accountId, uids, targetFolderId, folderIds, targetAccountId) {
   if (uids.length === 1)
     return moveMessage(accountId, uids[0], targetFolderId, targetAccountId);
-  return ipc().moveMessages?.(accountId, uids, targetFolderId, targetAccountId);
+  return ipc().moveMessages?.(accountId, uids, targetFolderId, folderIds);
 }
-function markAsSpamMessages(accountId, uids) {
-  return ipc().markAsSpamMessages?.(accountId, uids);
+function markAsSpamMessages(accountId, uids, folderIds) {
+  return ipc().markAsSpamMessages?.(accountId, uids, folderIds);
 }
 function copyMessages(accountId, uids, folderIds, targetFolderId) {
   return ipc().copyMessages?.(accountId, uids, folderIds, targetFolderId);
@@ -6827,7 +6827,8 @@ function renderNode(node, container, depth) {
       } else {
         const accountId = toMove[0].accountId;
         const uids = toMove.map((m) => m.uid);
-        moveMessages(accountId, uids, node.id).catch(onErr);
+        const folderIds = toMove.map((m) => m.folderId);
+        moveMessages(accountId, uids, node.id, folderIds).catch(onErr);
       }
     });
   }
@@ -8677,7 +8678,7 @@ document.addEventListener("mailx-flagged-batch", (e) => {
       }));
       for (const [src, g] of byAccount) {
         const targetAcct = src === targetAccount ? void 0 : 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}`;
         });
       }
@@ -8784,13 +8785,14 @@ async function spamSelectedMessages() {
   removeMessagesAndReconcile(selected);
   const byAccount = /* @__PURE__ */ 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 \u2014 pending server sync`;
-  for (const [accountId, uids] of byAccount) {
-    markAsSpamMessages(accountId, uids).then((result) => {
+  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}`);
     }).catch((e) => {
       console.error(`[spam] ${accountId} failed:`, e);