@bobfrankston/rmfmail 1.2.224 → 1.2.225

package/client/app.bundle.js

@@ -970,10 +970,15 @@ function removeMessages(uids, currentlyFocused) {
     nextSurvivor: nextSurvivor ? { accountId: nextSurvivor.accountId, uid: nextSurvivor.uid, folderId: nextSurvivor.folderId } : null
   };
 }
-function updateMessageFlags(accountId, uid, flags) {
-  const msg = messages.find((m) => m.uid === uid && m.accountId === accountId);
-  if (msg)
-    msg.flags = flags;
+function updateMessageFlags(accountId, uid, flags, folderId) {
+  const candidates = messages.filter((m) => m.uid === uid && m.accountId === accountId && (folderId === void 0 || m.folderId === folderId));
+  if (candidates.length === 1) {
+    candidates[0].flags = flags;
+    return;
+  }
+  if (candidates.length > 1) {
+    console.warn(`[message-state] ambiguous flag update ${accountId}/uid=${uid} \u2014 ${candidates.length} folders match; caller must pass folderId`);
+  }
 }
 var messages, listeners;
 var init_message_state = __esm({
@@ -1939,11 +1944,11 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
           setSeen(msg, true);
           updateFlags(accountId, uid, msg.flags, msg.folderId);
           try {
-            updateMessageFlags(accountId, uid, msg.flags);
+            updateMessageFlags(accountId, uid, msg.flags, msg.folderId);
           } catch {
           }
           try {
-            setRowSeen(accountId, uid, true);
+            setRowSeen(accountId, uid, true, msg.folderId);
           } catch {
           }
         };
@@ -3685,8 +3690,26 @@ async function refreshPriorityIndex() {
   } catch {
   }
 }
-function rowKey(accountId, uid) {
-  return `${accountId}:${uid}`;
+function rowKey(accountId, uid, folderId) {
+  return `${accountId}:${folderId ?? ""}:${uid}`;
+}
+function findRow(accountId, uid, folderId) {
+  if (folderId !== void 0 && folderId !== null) {
+    const exact = rowByKey.get(rowKey(accountId, uid, folderId));
+    if (exact)
+      return exact;
+  }
+  const hits = [];
+  for (const row of rowByKey.values()) {
+    if (row.accountId === accountId && row.msg.uid === uid)
+      hits.push(row);
+  }
+  if (hits.length === 1)
+    return hits[0];
+  if (hits.length > 1) {
+    console.warn(`[message-list] ambiguous row lookup ${accountId}/uid=${uid} \u2014 ${hits.length} folders match; caller must pass folderId`);
+  }
+  return void 0;
 }
 function focusRow(row, opts = {}) {
   const body = row.el.parentElement;
@@ -3720,26 +3743,26 @@ function getCurrentFocused() {
   return focusedRow ? focusedRow.msg : null;
 }
 function focusByIdentity(accountId, uid, opts = {}) {
-  const row = rowByKey.get(rowKey(accountId, uid));
+  const row = findRow(accountId, uid, opts.folderId);
   if (!row)
     return false;
   focusRow(row, opts);
   return true;
 }
-function setRowFlagged(accountId, uid, yes) {
-  const row = rowByKey.get(rowKey(accountId, uid));
+function setRowFlagged(accountId, uid, yes, folderId) {
+  const row = findRow(accountId, uid, folderId);
   if (row)
     row.setFlaggedClass(yes);
 }
-function setRowSeen(accountId, uid, yes) {
-  const row = rowByKey.get(rowKey(accountId, uid));
+function setRowSeen(accountId, uid, yes, folderId) {
+  const row = findRow(accountId, uid, folderId);
   if (row)
     row.setUnreadClass(!yes);
 }
 function selectedRows() {
   const out = [];
   for (const s of getSelectedMessages()) {
-    const row = rowByKey.get(rowKey(s.accountId, s.uid));
+    const row = findRow(s.accountId, s.uid, s.folderId);
     if (row)
       out.push(row);
   }
@@ -3749,7 +3772,7 @@ function visibleRowObjs() {
   const body = document.getElementById("ml-body");
   if (!body)
     return [];
-  return Array.from(body.querySelectorAll(".ml-row:not(.filter-hidden)")).map((el) => rowByKey.get(rowKey(el.dataset.accountId || "", Number(el.dataset.uid)))).filter((r) => !!r);
+  return Array.from(body.querySelectorAll(".ml-row:not(.filter-hidden)")).map((el) => rowByKey.get(rowKey(el.dataset.accountId || "", Number(el.dataset.uid), el.dataset.folderId))).filter((r) => !!r);
 }
 function bulkTargets() {
   const sel = selectedRows();
@@ -3915,6 +3938,9 @@ function releaseFocus() {
   const body = document.getElementById("ml-body");
   body?.querySelectorAll(".ml-row.selected").forEach((r) => r.classList.remove("selected"));
   clearViewer();
+  document.body.classList.remove("viewer-fullscreen");
+  document.getElementById("message-viewer")?.classList.remove("narrow-active");
+  document.getElementById("message-list")?.classList.remove("narrow-hidden");
   document.dispatchEvent(new CustomEvent("mailx-focus-changed", { detail: null }));
 }
 function markBodiesCached(items) {
@@ -4142,7 +4168,7 @@ function removeMessagesAndReconcile(uids) {
       const el = row;
       const key = `${el.dataset.accountId}:${el.dataset.folderId}:${el.dataset.uid}`;
       if (!stateUids.has(key)) {
-        const dead = rowByKey.get(rowKey(el.dataset.accountId || "", Number(el.dataset.uid)));
+        const dead = rowByKey.get(rowKey(el.dataset.accountId || "", Number(el.dataset.uid), el.dataset.folderId));
         if (dead && dead.el === el)
           dead.detach();
         else
@@ -4155,12 +4181,12 @@ function removeMessagesAndReconcile(uids) {
   }
   if (outcome.focusedWasRemoved) {
     const survivor = outcome.nextSurvivor;
-    if (survivor && focusByIdentity(survivor.accountId, survivor.uid)) {
+    if (survivor && focusByIdentity(survivor.accountId, survivor.uid, { folderId: survivor.folderId })) {
       return;
     }
     const remaining = getMessages2();
     for (const m of remaining) {
-      if (focusByIdentity(m.accountId, m.uid))
+      if (focusByIdentity(m.accountId, m.uid, { folderId: m.folderId }))
         return;
     }
     releaseFocus();
@@ -4910,7 +4936,7 @@ var init_message_list = __esm({
       /** Insert this row into a list body and register it in the lookup map. */
       attach(body) {
         body.appendChild(this.el);
-        rowByKey.set(rowKey(this.accountId, this.msg.uid), this);
+        rowByKey.set(rowKey(this.accountId, this.msg.uid, this.msg.folderId), this);
       }
       /** Remove this row from the DOM and the lookup map. If it was the
        *  focused row, the controller is responsible for releasing focus
@@ -4918,7 +4944,7 @@ var init_message_list = __esm({
        *  may want to hand focus to a sibling instead). */
       detach() {
         this.el.remove();
-        rowByKey.delete(rowKey(this.accountId, this.msg.uid));
+        rowByKey.delete(rowKey(this.accountId, this.msg.uid, this.msg.folderId));
       }
       setSelected(yes) {
         this.el.classList.toggle("selected", yes);
@@ -5289,7 +5315,7 @@ var init_message_list = __esm({
         return;
       if (!ev.accountId || ev.previousDraftUid == null)
         return;
-      const row = rowByKey.get(rowKey(ev.accountId, ev.previousDraftUid));
+      const row = findRow(ev.accountId, Number(ev.previousDraftUid), ev.folderId);
       if (row)
         row.setDate(typeof ev.savedAt === "number" ? ev.savedAt : Date.now());
     });
@@ -9458,8 +9484,8 @@ async function performUndo() {
         const flag = "\\Flagged";
         const flagsAfter = entry.prevFlagged ? [flag] : [];
         await updateFlags2(entry.accountId, entry.uid, flagsAfter, entry.folderId);
-        setRowFlagged(entry.accountId, entry.uid, entry.prevFlagged);
-        updateMessageFlags(entry.accountId, entry.uid, flagsAfter);
+        setRowFlagged(entry.accountId, entry.uid, entry.prevFlagged, entry.folderId);
+        updateMessageFlags(entry.accountId, entry.uid, flagsAfter, entry.folderId);
       }
       if (statusSync) statusSync.textContent = `Undid flag change on ${op.payload.length} message${op.payload.length !== 1 ? "s" : ""}${remaining}`;
     }
@@ -9637,8 +9663,8 @@ async function bulkFlagSelected() {
   for (const r of rows) {
     if (flaggedOf(r) === targetFlagged) continue;
     setFlagged(r, targetFlagged);
-    setRowFlagged(r.accountId, r.uid, targetFlagged);
-    updateMessageFlags(r.accountId, r.uid, r.flags);
+    setRowFlagged(r.accountId, r.uid, targetFlagged, r.folderId);
+    updateMessageFlags(r.accountId, r.uid, r.flags, r.folderId);
     try {
       await updateFlags2(r.accountId, r.uid, r.flags, r.folderId);
     } catch (e) {
@@ -9661,8 +9687,8 @@ document.getElementById("btn-flag")?.addEventListener("click", async () => {
   updateFlagButton();
   try {
     await updateFlags(sel.accountId, sel.uid, sel.flags, sel.folderId);
-    updateMessageFlags(sel.accountId, sel.uid, sel.flags);
-    setRowFlagged(sel.accountId, sel.uid, !wasFlagged);
+    updateMessageFlags(sel.accountId, sel.uid, sel.flags, sel.folderId);
+    setRowFlagged(sel.accountId, sel.uid, !wasFlagged, sel.folderId);
   } catch (e) {
     setFlagged(sel, wasFlagged);
     updateFlagButton();
@@ -9704,9 +9730,16 @@ async function spamSelectedMessages() {
     markAsSpamMessages(accountId, uids, folderIds).then((result) => {
       console.log(`[spam] ${accountId}: moved ${result?.moved ?? uids.length} to folderId=${result?.targetFolderId}`);
       if (result?.targetFolderId) spamUndo.targetFolderId = result.targetFolderId;
-    }).catch((e) => {
+    }).catch(async (e) => {
       console.error(`[spam] ${accountId} failed:`, e);
-      if (statusSync) statusSync.textContent = `Spam sync issue (${accountId}): ${e?.message || e}`;
+      if (statusSync) statusSync.textContent = `Spam FAILED (${accountId}): ${e?.message || e}`;
+      try {
+        await reloadCurrentFolder();
+      } catch {
+      }
+      window.dispatchEvent(new CustomEvent("mailx-alert", {
+        detail: { message: `Couldn't move ${uids.length} message(s) to spam: ${e?.message || e}`, key: "spam-move" }
+      }));
     });
   }
 }
@@ -9766,7 +9799,7 @@ document.getElementById("btn-mark-unread")?.addEventListener("click", () => {
   const wasSeen = seenOf(sel);
   setSeen(sel, !wasSeen);
   updateFlags(sel.accountId, sel.uid, sel.flags, sel.folderId).then(() => {
-    updateMessageFlags(sel.accountId, sel.uid, sel.flags);
+    updateMessageFlags(sel.accountId, sel.uid, sel.flags, sel.folderId);
     const row = document.querySelector(`.ml-row[data-uid="${sel.uid}"][data-account-id="${sel.accountId}"]`);
     if (row) row.classList.toggle("unread", wasSeen);
   }).catch(() => {
@@ -12808,7 +12841,7 @@ document.addEventListener("mailx-popout-action", ((e) => {
     const wasFlagged = flaggedOf(msg);
     setFlagged(msg, !wasFlagged);
     updateFlags(accountId, msg.uid, msg.flags, msg.folderId).catch((err) => console.error(`[popout] flag failed: ${err?.message || err}`));
-    setRowFlagged(accountId, msg.uid, !wasFlagged);
+    setRowFlagged(accountId, msg.uid, !wasFlagged, msg.folderId);
   }
 }));
 document.addEventListener("mailx-popout-message", (async (e) => {