@bobfrankston/rmfmail 1.2.224 → 1.2.225

package/client/app.js

@@ -1894,8 +1894,8 @@ async function performUndo() {
                     ? [flag] // simplest restore — full set is unknown here
                     : [];
                 await updateFlags(entry.accountId, entry.uid, flagsAfter, entry.folderId);
-                setRowFlagged(entry.accountId, entry.uid, entry.prevFlagged);
-                messageState.updateMessageFlags(entry.accountId, entry.uid, flagsAfter);
+                setRowFlagged(entry.accountId, entry.uid, entry.prevFlagged, entry.folderId);
+                messageState.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}`;
@@ -2131,8 +2131,8 @@ async function bulkFlagSelected() {
         if (flaggedOf(r) === targetFlagged)
             continue;
         setFlagged(r, targetFlagged);
-        setRowFlagged(r.accountId, r.uid, targetFlagged);
-        messageState.updateMessageFlags(r.accountId, r.uid, r.flags);
+        setRowFlagged(r.accountId, r.uid, targetFlagged, r.folderId);
+        messageState.updateMessageFlags(r.accountId, r.uid, r.flags, r.folderId);
         try {
             await updateFlags(r.accountId, r.uid, r.flags, r.folderId);
         }
@@ -2157,10 +2157,10 @@ document.getElementById("btn-flag")?.addEventListener("click", async () => {
     updateFlagButton();
     try {
         await updateFlags(sel.accountId, sel.uid, sel.flags, sel.folderId);
-        messageState.updateMessageFlags(sel.accountId, sel.uid, sel.flags);
+        messageState.updateMessageFlags(sel.accountId, sel.uid, sel.flags, sel.folderId);
         // Row owns its own DOM \u2014 go through the row object so class + star
         // update atomically and the list/preview stay in sync.
-        setRowFlagged(sel.accountId, sel.uid, !wasFlagged);
+        setRowFlagged(sel.accountId, sel.uid, !wasFlagged, sel.folderId);
     }
     catch (e) {
         // Revert local state on failure so visual + data stay consistent.
@@ -2234,10 +2234,24 @@ async function spamSelectedMessages() {
             if (result?.targetFolderId)
                 spamUndo.targetFolderId = result.targetFolderId;
         })
-            .catch(e => {
+            .catch(async (e) => {
             console.error(`[spam] ${accountId} failed:`, e);
+            // The optimistic remove above already took these rows off the
+            // list. If the move genuinely failed, leaving them gone is a
+            // LIE — the message is still in the inbox and reappears at the
+            // next sync looking like it "came back" (Bob 2026-08-07, where
+            // the Android markAsSpamMessages stub threw on every click and
+            // only a status-bar line said so). Put the list back and say it
+            // loudly enough to be seen on a phone.
             if (statusSync)
-                statusSync.textContent = `Spam sync issue (${accountId}): ${e?.message || e}`;
+                statusSync.textContent = `Spam FAILED (${accountId}): ${e?.message || e}`;
+            try {
+                await reloadCurrentFolder();
+            }
+            catch { /* list rebuilds on next sync */ }
+            window.dispatchEvent(new CustomEvent("mailx-alert", {
+                detail: { message: `Couldn't move ${uids.length} message(s) to spam: ${e?.message || e}`, key: "spam-move" },
+            }));
         });
     }
 }
@@ -2305,7 +2319,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(() => {
-        messageState.updateMessageFlags(sel.accountId, sel.uid, sel.flags);
+        messageState.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);
@@ -6428,7 +6442,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) => {