@bobfrankston/rmfmail 1.0.701 → 1.0.703

package/client/app.js

@@ -4,7 +4,7 @@
  */
 import { initFolderTree, refreshFolderTree, updateFolderCounts, setFolderSynced, getFolderSynced, setOutboxTotal } from "./components/folder-tree.js";
 import { initMessageList, loadMessages, loadUnifiedInbox, loadSearchResults, reloadCurrentFolder, clearSearchMode, getSelectedMessages, markBodiesCached, getCurrentFocused, releaseFocus, removeMessagesAndReconcile, setRowFlagged, scrollFocusedIntoView, refreshPriorityIndex } from "./components/message-list.js";
-import { FLAG, flagOps } from "@bobfrankston/mailx-types";
+import { seenOf, flaggedOf, draftOf, setSeen, setFlagged } from "@bobfrankston/mailx-types";
 import { getCurrentMessage, initViewer, popOutCurrentMessage, toggleFullscreenPreview, showPreviewBodyMenu, wrapHtmlBody } from "./components/message-viewer.js";
 import { connectWebSocket, onWsEvent, triggerSync, syncAccount, reauthenticate, getAccounts, getFolders, deleteMessages, undeleteMessage, restartServer, getSyncPending, getVersion, getSettings, saveSettings, getAutocompleteSettings, saveAutocompleteSettings, repairAccounts, updateFlags, markAsSpamMessages, logClientEvent, sendMessage as apiSendMessage } from "./lib/api-client.js";
 import * as messageState from "./lib/message-state.js";
@@ -1325,19 +1325,18 @@ document.getElementById("btn-flag")?.addEventListener("click", async () => {
     const sel = getCurrentFocused();
     if (!sel)
         return;
-    const isFlagged = flagOps.isFlagged(sel.flags);
-    const newFlags = isFlagged
-        ? flagOps.remove(sel.flags, FLAG.FLAGGED)
-        : flagOps.add(sel.flags, FLAG.FLAGGED);
+    const wasFlagged = flaggedOf(sel);
+    setFlagged(sel, !wasFlagged);
     try {
-        await updateFlags(sel.accountId, sel.uid, newFlags);
-        sel.flags = newFlags;
-        messageState.updateMessageFlags(sel.accountId, sel.uid, newFlags);
+        await updateFlags(sel.accountId, sel.uid, sel.flags);
+        messageState.updateMessageFlags(sel.accountId, sel.uid, sel.flags);
         // 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, flagOps.isFlagged(newFlags));
+        setRowFlagged(sel.accountId, sel.uid, !wasFlagged);
     }
     catch (e) {
+        // Revert local state on failure so visual + data stay consistent.
+        setFlagged(sel, wasFlagged);
         console.error(`Flag toggle failed: ${e.message}`);
     }
 });
@@ -1448,15 +1447,14 @@ document.getElementById("btn-mark-unread")?.addEventListener("click", () => {
     const sel = getCurrentFocused();
     if (!sel)
         return;
-    const isSeen = flagOps.isSeen(sel.flags);
-    const newFlags = flagOps.set(sel.flags, FLAG.SEEN, !isSeen);
-    updateFlags(sel.accountId, sel.uid, newFlags).then(() => {
-        sel.flags = newFlags;
-        messageState.updateMessageFlags(sel.accountId, sel.uid, newFlags);
+    const wasSeen = seenOf(sel);
+    setSeen(sel, !wasSeen);
+    updateFlags(sel.accountId, sel.uid, sel.flags).then(() => {
+        messageState.updateMessageFlags(sel.accountId, sel.uid, sel.flags);
         const row = document.querySelector(`.ml-row[data-uid="${sel.uid}"][data-account-id="${sel.accountId}"]`);
         if (row)
-            row.classList.toggle("unread", !flagOps.isSeen(newFlags));
-    }).catch(() => { });
+            row.classList.toggle("unread", wasSeen);
+    }).catch(() => { setSeen(sel, wasSeen); });
 });
 document.getElementById("btn-reply")?.addEventListener("click", () => openCompose("reply"));
 document.getElementById("btn-reply-all")?.addEventListener("click", () => openCompose("replyAll"));
@@ -2844,15 +2842,14 @@ document.addEventListener("keydown", (e) => {
         if (!sel)
             return;
         e.preventDefault();
-        const isSeen = flagOps.isSeen(sel.flags);
-        const newFlags = flagOps.set(sel.flags, FLAG.SEEN, !isSeen);
-        updateFlags(sel.accountId, sel.uid, newFlags).then(() => {
-            sel.flags = newFlags;
-            messageState.updateMessageFlags(sel.accountId, sel.uid, newFlags);
+        const wasSeen = seenOf(sel);
+        setSeen(sel, !wasSeen);
+        updateFlags(sel.accountId, sel.uid, sel.flags).then(() => {
+            messageState.updateMessageFlags(sel.accountId, sel.uid, sel.flags);
             const row = document.querySelector(`.ml-row[data-uid="${sel.uid}"][data-account-id="${sel.accountId}"]`);
             if (row)
-                row.classList.toggle("unread", !flagOps.isSeen(newFlags));
-        }).catch(() => { });
+                row.classList.toggle("unread", wasSeen);
+        }).catch(() => { setSeen(sel, wasSeen); });
     }
     // Z = locate the focused row in the list (scroll-to-selected). After
     // scrolling the list out of sync with the preview, this snaps back.
@@ -4512,7 +4509,7 @@ document.addEventListener("mailx-popout-message", (async (e) => {
     // currently sitting in the user's Drafts folder. The read-only popout
     // surface is missing every action button (Reply, Forward, Edit Draft,
     // …) so dumping a draft into it is a worst-case dead-end.
-    const isDraft = Array.isArray(msg?.flags) && flagOps.isDraft(msg.flags);
+    const isDraft = !!msg && draftOf(msg);
     if (isDraft) {
         const accts = await getAccounts();
         const init = {