@bobfrankston/rmfmail 1.0.695 → 1.0.697

package/client/app.bundle.js

@@ -998,10 +998,11 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
     } catch {
     }
     if (!cachedMsg) {
-      bodyEl.innerHTML = `<div class="mv-preview-placeholder">${escapeHtml(cached.preview || "")}</div>`;
+      const previewText = (cached.preview || "").trim();
+      bodyEl.innerHTML = previewText ? `<div class="mv-preview-placeholder">${escapeHtml(previewText)}</div>` : `<div class="mv-empty">Loading body\u2026</div>`;
     }
   } else if (!cachedMsg) {
-    bodyEl.innerHTML = "";
+    bodyEl.innerHTML = `<div class="mv-empty">Loading body\u2026</div>`;
     headerEl.hidden = true;
   }
   attEl.hidden = true;
@@ -1024,7 +1025,8 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
         headerEl.hidden = false;
       } catch {
       }
-      bodyEl.innerHTML = `<div class="mv-preview-placeholder">${escapeHtml(msg.preview || cached?.preview || "")}</div>`;
+      const previewText = (msg.preview || cached?.preview || "").trim();
+      bodyEl.innerHTML = previewText ? `<div class="mv-preview-placeholder">${escapeHtml(previewText)}</div>` : `<div class="mv-empty">Fetching body from server\u2026</div>`;
       const captureGen = gen;
       const off = onEvent((ev) => {
         if (!ev || ev.type !== "bodyAvailable")
@@ -3157,8 +3159,13 @@ var init_message_list = __esm({
         }
         const body = this.el.parentElement;
         if (body?.classList.contains("multi-select-on")) {
-          this.setSelected(!this.isSelected);
+          const willBeSelected = !this.isSelected;
+          this.setSelected(willBeSelected);
           lastClickedRow = this.el;
+          if (willBeSelected) {
+            focusRow(this);
+            this.setUnreadClass(false);
+          }
           updateBulkBar();
           return;
         }
@@ -4423,7 +4430,9 @@ async function collectDueAlarms(now) {
       const startMs = ev.startMs || 0;
       if (!startMs)
         continue;
-      const offsets = Array.isArray(ev.reminderMinutes) && ev.reminderMinutes.length > 0 ? ev.reminderMinutes.map((m) => m * 6e4) : [CAL_LEAD_MS];
+      if (!Array.isArray(ev.reminderMinutes) || ev.reminderMinutes.length === 0)
+        continue;
+      const offsets = ev.reminderMinutes.map((m) => m * 6e4);
       for (const offsetMs of offsets) {
         const occBaseKey = occKey(ev.uuid, startMs);
         const key = `${occBaseKey}@${offsetMs}`;
@@ -4738,14 +4747,13 @@ function startAlarmPoller() {
       });
   });
 }
-var DISMISSED_KEY, SNOOZED_KEY, CAL_LEAD_MS, LOOKBACK_MS, LOOKAHEAD_MS, POLL_INTERVAL_MS, firedThisSession, openPopups;
+var DISMISSED_KEY, SNOOZED_KEY, LOOKBACK_MS, LOOKAHEAD_MS, POLL_INTERVAL_MS, firedThisSession, openPopups;
 var init_alarms = __esm({
   "client/components/alarms.js"() {
     "use strict";
     init_api_client();
     DISMISSED_KEY = "mailx-alarm-dismissed";
     SNOOZED_KEY = "mailx-alarm-snoozed";
-    CAL_LEAD_MS = 10 * 60 * 1e3;
     LOOKBACK_MS = 60 * 60 * 1e3;
     LOOKAHEAD_MS = 2 * 60 * 60 * 1e3;
     POLL_INTERVAL_MS = 3e4;
@@ -5130,36 +5138,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);
       }
     });
   }
@@ -6620,19 +6627,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() {