@bobfrankston/rmfmail 1.0.694 → 1.0.696

package/client/app.bundle.js

@@ -3314,12 +3314,18 @@ var init_message_list = __esm({
               const pick = await pickFolder(accountId, { excludeFolderIds: [msg.folderId] });
               if (!pick)
                 return;
-              try {
-                await moveMessages(accountId, uids, pick.folderId);
-                removeMessagesAndReconcile(uids.map((u) => ({ accountId, uid: u })));
-              } catch (err) {
-                alert(`Move failed: ${err.message}`);
-              }
+              removeMessagesAndReconcile(uids.map((u) => ({ accountId, uid: u })));
+              const statusSync = document.getElementById("status-sync");
+              if (statusSync)
+                statusSync.textContent = `Moving ${uids.length} message${uids.length !== 1 ? "s" : ""} to ${pick.folderName}\u2026`;
+              moveMessages(accountId, uids, pick.folderId).then(() => {
+                if (statusSync)
+                  statusSync.textContent = `Moved ${uids.length} to ${pick.folderName}`;
+              }).catch((err) => {
+                console.error(`Move failed: ${err?.message || err}`);
+                if (statusSync)
+                  statusSync.textContent = `Move sync issue: ${err?.message || err}`;
+              });
             }
           },
           { label: "Delete", action: () => document.dispatchEvent(new CustomEvent("mailx-delete")) },
@@ -5124,36 +5130,35 @@ function renderNode(node, container, depth) {
         return;
       const statusEl = document.getElementById("status-sync");
       const crossAccount = toMove.some((m) => m.accountId !== node.accountId);
-      try {
-        if (crossAccount) {
-          for (const msg of toMove) {
-            const targetAccountId = msg.accountId !== node.accountId ? node.accountId : void 0;
-            await moveMessage(msg.accountId, msg.uid, node.id, targetAccountId);
-          }
-        } else {
-          const accountId = toMove[0].accountId;
-          const uids = toMove.map((m) => m.uid);
-          await moveMessages(accountId, uids, node.id);
+      const moved = toMove.length;
+      if (statusEl)
+        statusEl.textContent = `Moved ${moved} message${moved > 1 ? "s" : ""} to ${node.name} \u2014 Ctrl+Z to undo`;
+      const { removeMessagesAndReconcile: removeMessagesAndReconcile2 } = await Promise.resolve().then(() => (init_message_list(), message_list_exports));
+      removeMessagesAndReconcile2(toMove);
+      const treeContainer = document.getElementById("folder-tree");
+      if (treeContainer)
+        loadFolderTree(treeContainer);
+      document.dispatchEvent(new CustomEvent("mailx-moved", {
+        detail: {
+          messages: toMove.map((m) => ({ accountId: m.accountId, uid: m.uid, sourceFolderId: m.folderId })),
+          targetAccountId: node.accountId,
+          targetFolderId: node.id
         }
-        const moved = toMove.length;
-        if (statusEl)
-          statusEl.textContent = `Moved ${moved} message${moved > 1 ? "s" : ""} to ${node.name} \u2014 Ctrl+Z to undo`;
-        const { removeMessagesAndReconcile: removeMessagesAndReconcile2 } = await Promise.resolve().then(() => (init_message_list(), message_list_exports));
-        removeMessagesAndReconcile2(toMove);
-        const treeContainer = document.getElementById("folder-tree");
-        if (treeContainer)
-          loadFolderTree(treeContainer);
-        document.dispatchEvent(new CustomEvent("mailx-moved", {
-          detail: {
-            messages: toMove.map((m) => ({ accountId: m.accountId, uid: m.uid, sourceFolderId: m.folderId })),
-            targetAccountId: node.accountId,
-            targetFolderId: node.id
-          }
-        }));
-      } catch (err) {
-        console.error(`Move failed: ${err.message}`);
+      }));
+      const onErr = (err) => {
+        console.error(`Move failed: ${err?.message || err}`);
         if (statusEl)
-          statusEl.textContent = `Move failed: ${err.message}`;
+          statusEl.textContent = `Move sync issue: ${err?.message || err}`;
+      };
+      if (crossAccount) {
+        for (const msg of toMove) {
+          const targetAccountId = msg.accountId !== node.accountId ? node.accountId : void 0;
+          moveMessage(msg.accountId, msg.uid, node.id, targetAccountId).catch(onErr);
+        }
+      } else {
+        const accountId = toMove[0].accountId;
+        const uids = toMove.map((m) => m.uid);
+        moveMessages(accountId, uids, node.id).catch(onErr);
       }
     });
   }
@@ -6614,19 +6619,17 @@ async function deleteSelectedMessages() {
     lastDeleted = null;
     if (statusSync?.textContent?.includes("undo")) statusSync.textContent = "";
   }, 3e4);
-  try {
-    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);
-    }
-    for (const [accountId, uids] of byAccount) {
-      await deleteMessages(accountId, uids);
-    }
-  } catch (e) {
-    console.error(`Delete failed: ${e.message}`);
-    if (statusSync) statusSync.textContent = `Delete failed: ${e?.message || e}`;
+  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);
+  }
+  for (const [accountId, uids] of byAccount) {
+    deleteMessages(accountId, uids).catch((e) => {
+      console.error(`Delete failed for ${accountId}: ${e?.message || e}`);
+      if (statusSync) statusSync.textContent = `Delete sync issue (${accountId}): ${e?.message || e}`;
+    });
   }
 }
 async function undoDelete() {
@@ -6709,24 +6712,20 @@ async function spamSelectedMessages() {
   const statusSync = document.getElementById("status-sync");
   const snapshot = [...selected];
   removeMessagesAndReconcile(selected);
-  try {
-    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);
-    }
-    for (const [accountId, uids] of byAccount) {
-      const result = await markAsSpamMessages(accountId, uids);
+  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);
+  }
+  if (statusSync) statusSync.textContent = `Spam: ${snapshot.length} queued \u2014 pending server sync`;
+  for (const [accountId, uids] of byAccount) {
+    markAsSpamMessages(accountId, uids).then((result) => {
       console.log(`[spam] ${accountId}: moved ${result?.moved ?? uids.length} to folderId=${result?.targetFolderId}`);
-    }
-    if (statusSync) statusSync.textContent = `Spam: ${snapshot.length} queued \u2014 pending server sync`;
-  } catch (e) {
-    console.error(`[spam] failed:`, e);
-    if (statusSync) statusSync.textContent = `Spam failed: ${e?.message || e}`;
-    alert(`Mark-as-spam failed: ${e?.message || e}
-
-${selected.length} message(s) stayed in the list; check Settings \u2192 account spam folder and accounts.jsonc.`);
+    }).catch((e) => {
+      console.error(`[spam] ${accountId} failed:`, e);
+      if (statusSync) statusSync.textContent = `Spam sync issue (${accountId}): ${e?.message || e}`;
+    });
   }
 }
 document.getElementById("btn-spam")?.addEventListener("click", spamSelectedMessages);