@bobfrankston/rmfmail 1.0.701 → 1.0.702

package/client/app.bundle.js

@@ -634,6 +634,48 @@ var init_message_state = __esm({
   }
 });
 
+// packages/mailx-types/contact-rules.js
+var init_contact_rules = __esm({
+  "packages/mailx-types/contact-rules.js"() {
+    "use strict";
+  }
+});
+
+// packages/mailx-types/groups.js
+var init_groups = __esm({
+  "packages/mailx-types/groups.js"() {
+    "use strict";
+  }
+});
+
+// packages/mailx-types/index.js
+function _has(msg, flag) {
+  return !!msg.flags && msg.flags.includes(flag);
+}
+function _set(msg, flag, state) {
+  const present = (msg.flags || []).includes(flag);
+  if (state === present)
+    return;
+  const next = state ? [...msg.flags || [], flag] : (msg.flags || []).filter((f) => f !== flag);
+  msg.flags = next;
+}
+var _SEEN, _FLAGGED, _DRAFT, seenOf, flaggedOf, draftOf, setSeen, setFlagged;
+var init_mailx_types = __esm({
+  "packages/mailx-types/index.js"() {
+    "use strict";
+    init_contact_rules();
+    init_groups();
+    _SEEN = "\\Seen";
+    _FLAGGED = "\\Flagged";
+    _DRAFT = "\\Draft";
+    seenOf = (m) => _has(m, _SEEN);
+    flaggedOf = (m) => _has(m, _FLAGGED);
+    draftOf = (m) => _has(m, _DRAFT);
+    setSeen = (m, state) => _set(m, _SEEN, state);
+    setFlagged = (m, state) => _set(m, _FLAGGED, state);
+  }
+});
+
 // client/components/message-viewer.js
 function parsedCacheGet(accountId, uid) {
   const key = `${accountId}:${uid}`;
@@ -1047,7 +1089,7 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
       parsedCachePut(accountId, uid, msg);
     currentMessage = msg;
     currentAccountId = accountId;
-    if (!msg.flags.includes("\\Seen")) {
+    if (!seenOf(msg)) {
       let enabled = true;
       let delaySec = 2;
       try {
@@ -1059,21 +1101,24 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
       }
       if (enabled) {
         const captureGen = gen;
-        const newFlags = [...msg.flags, "\\Seen"];
-        if (delaySec === 0) {
-          updateFlags(accountId, uid, newFlags);
-        } else {
-          setTimeout(() => {
-            if (captureGen !== showMessageGeneration)
-              return;
-            updateFlags(accountId, uid, newFlags);
-            msg.flags = newFlags;
-            try {
-              updateMessageFlags(accountId, uid, newFlags);
-            } catch {
-            }
-          }, delaySec * 1e3);
-        }
+        const apply = () => {
+          if (captureGen !== showMessageGeneration)
+            return;
+          setSeen(msg, true);
+          updateFlags(accountId, uid, msg.flags);
+          try {
+            updateMessageFlags(accountId, uid, msg.flags);
+          } catch {
+          }
+          try {
+            setRowSeen(accountId, uid, true);
+          } catch {
+          }
+        };
+        if (delaySec === 0)
+          apply();
+        else
+          setTimeout(apply, delaySec * 1e3);
       }
     }
     headerEl.hidden = false;
@@ -2021,6 +2066,8 @@ var init_message_viewer = __esm({
     init_api_client();
     init_context_menu();
     init_message_state();
+    init_message_list();
+    init_mailx_types();
     currentMessage = null;
     currentAccountId = "";
     lastAutoOpenedDraftUid = -1;
@@ -2175,69 +2222,6 @@ var init_folder_picker = __esm({
   }
 });
 
-// packages/mailx-types/contact-rules.js
-var init_contact_rules = __esm({
-  "packages/mailx-types/contact-rules.js"() {
-    "use strict";
-  }
-});
-
-// packages/mailx-types/groups.js
-var init_groups = __esm({
-  "packages/mailx-types/groups.js"() {
-    "use strict";
-  }
-});
-
-// packages/mailx-types/index.js
-var FLAG, flagOps;
-var init_mailx_types = __esm({
-  "packages/mailx-types/index.js"() {
-    "use strict";
-    init_contact_rules();
-    init_groups();
-    FLAG = {
-      SEEN: "\\Seen",
-      FLAGGED: "\\Flagged",
-      DELETED: "\\Deleted",
-      DRAFT: "\\Draft",
-      ANSWERED: "\\Answered",
-      RECENT: "\\Recent"
-    };
-    flagOps = {
-      has(flags, f) {
-        return !!flags && flags.includes(f);
-      },
-      isSeen(flags) {
-        return flagOps.has(flags, FLAG.SEEN);
-      },
-      isFlagged(flags) {
-        return flagOps.has(flags, FLAG.FLAGGED);
-      },
-      isAnswered(flags) {
-        return flagOps.has(flags, FLAG.ANSWERED);
-      },
-      isDraft(flags) {
-        return flagOps.has(flags, FLAG.DRAFT);
-      },
-      /** Return flags with `f` added (dedup). */
-      add(flags, f) {
-        const set = new Set(flags || []);
-        set.add(f);
-        return Array.from(set);
-      },
-      /** Return flags with `f` removed. */
-      remove(flags, f) {
-        return (flags || []).filter((x) => x !== f);
-      },
-      /** Return flags with `f` toggled to `state` (true=present, false=absent). */
-      set(flags, f, state) {
-        return state ? flagOps.add(flags, f) : flagOps.remove(flags, f);
-      }
-    };
-  }
-});
-
 // client/components/message-list.js
 var message_list_exports = {};
 __export(message_list_exports, {
@@ -2255,6 +2239,7 @@ __export(message_list_exports, {
   removeMessagesAndReconcile: () => removeMessagesAndReconcile,
   scrollFocusedIntoView: () => scrollFocusedIntoView,
   setRowFlagged: () => setRowFlagged,
+  setRowSeen: () => setRowSeen,
   showThreadPopup: () => showThreadPopup
 });
 function cacheKey(mode, a, f, flagged, q) {
@@ -2376,6 +2361,11 @@ function setRowFlagged(accountId, uid, yes) {
   if (row)
     row.setFlaggedClass(yes);
 }
+function setRowSeen(accountId, uid, yes) {
+  const row = rowByKey.get(rowKey(accountId, uid));
+  if (row)
+    row.setUnreadClass(!yes);
+}
 function scrollFocusedIntoView() {
   if (focusedRow)
     focusedRow.el.scrollIntoView({ block: "center" });
@@ -2866,7 +2856,7 @@ async function showThreadPopup(pillEl, headMsg) {
   for (const msg of thread) {
     const item = document.createElement("div");
     item.className = "ml-thread-popup-item";
-    if (!flagOps.isSeen(msg.flags))
+    if (!seenOf(msg))
       item.classList.add("unread");
     const from = document.createElement("span");
     from.className = "ml-thread-popup-from";
@@ -3034,9 +3024,9 @@ var init_message_list = __esm({
         this.el = row;
         row.className = "ml-row";
         row.draggable = true;
-        if (!flagOps.isSeen(msg.flags))
+        if (!seenOf(msg))
           row.classList.add("unread");
-        if (flagOps.isFlagged(msg.flags))
+        if (flaggedOf(msg))
           row.classList.add("flagged");
         if (!msg.bodyPath)
           row.classList.add("not-downloaded");
@@ -3065,7 +3055,7 @@ var init_message_list = __esm({
         avatar.addEventListener("contextmenu", (e) => this.onAvatarContextMenu(e));
         const flag = document.createElement("span");
         flag.className = "ml-flag";
-        flag.textContent = flagOps.isFlagged(msg.flags) ? "\u2605" : "\u2606";
+        flag.textContent = flaggedOf(msg) ? "\u2605" : "\u2606";
         flag.title = "Toggle flag";
         flag.addEventListener("click", (e) => this.onFlagClick(e));
         this.flagEl = flag;
@@ -3174,14 +3164,14 @@ var init_message_list = __esm({
       }
       set isSeen(yes) {
         this.setUnreadClass(!yes);
-        this.msg.flags = flagOps.set(this.msg.flags, FLAG.SEEN, yes);
+        setSeen(this.msg, yes);
       }
       get isFlagged() {
         return this.el.classList.contains("flagged");
       }
       set isFlagged(yes) {
         this.setFlaggedClass(yes);
-        this.msg.flags = flagOps.set(this.msg.flags, FLAG.FLAGGED, yes);
+        setFlagged(this.msg, yes);
       }
       onAvatarClick(e) {
         e.stopPropagation();
@@ -3241,13 +3231,13 @@ var init_message_list = __esm({
       }
       async onFlagClick(e) {
         e.stopPropagation();
-        const isFlagged = this.el.classList.contains("flagged");
-        const currentFlags = this.msg.flags || [];
-        const newFlags = isFlagged ? flagOps.remove(currentFlags, FLAG.FLAGGED) : flagOps.add(currentFlags, FLAG.FLAGGED);
+        const newFlaggedState = !this.el.classList.contains("flagged");
+        const probe = { flags: [...this.msg.flags || []] };
+        setFlagged(probe, newFlaggedState);
         try {
-          await updateFlags(this.accountId, this.msg.uid, newFlags);
-          this.msg.flags = newFlags;
-          this.setFlaggedClass(!isFlagged);
+          await updateFlags(this.accountId, this.msg.uid, probe.flags);
+          this.msg.flags = probe.flags;
+          this.setFlaggedClass(newFlaggedState);
         } catch {
         }
       }
@@ -3261,10 +3251,8 @@ var init_message_list = __esm({
           const willBeSelected = !this.isSelected;
           this.setSelected(willBeSelected);
           lastClickedRow = this.el;
-          if (willBeSelected) {
+          if (willBeSelected)
             focusRow(this);
-            this.setUnreadClass(false);
-          }
           updateBulkBar();
           return;
         }
@@ -3274,13 +3262,11 @@ var init_message_list = __esm({
             clearSelection();
             selectRange(anchor, this.el);
             lastClickedRow = this.el;
-            this.setUnreadClass(false);
             focusRow(this);
           } else {
             clearSelection();
             focusRow(this);
             lastClickedRow = this.el;
-            this.setUnreadClass(false);
           }
         } else if (e.ctrlKey || e.metaKey) {
           this.setSelected(!this.isSelected);
@@ -3289,7 +3275,6 @@ var init_message_list = __esm({
           clearSelection();
           focusRow(this);
           lastClickedRow = this.el;
-          this.setUnreadClass(false);
         }
         updateBulkBar();
       }
@@ -3375,7 +3360,7 @@ var init_message_list = __esm({
           }
         }
         const isSeen = !this.el.classList.contains("unread");
-        const isFlagged = flagOps.isFlagged(this.msg.flags);
+        const isFlagged = this.el.classList.contains("flagged");
         const accountId = this.accountId;
         const msg = this.msg;
         const self = this;
@@ -3383,12 +3368,13 @@ var init_message_list = __esm({
           {
             label: isSeen ? "Mark unread" : "Mark read",
             action: async () => {
-              const newFlags = flagOps.set(msg.flags, FLAG.SEEN, !isSeen);
+              const probe = { flags: [...msg.flags || []] };
+              setSeen(probe, !isSeen);
               try {
-                await updateFlags(accountId, msg.uid, newFlags);
-                msg.flags = newFlags;
-                updateMessageFlags(accountId, msg.uid, newFlags);
-                self.setUnreadClass(!flagOps.isSeen(newFlags));
+                await updateFlags(accountId, msg.uid, probe.flags);
+                msg.flags = probe.flags;
+                updateMessageFlags(accountId, msg.uid, probe.flags);
+                self.setUnreadClass(isSeen);
               } catch {
               }
             }
@@ -3396,11 +3382,12 @@ var init_message_list = __esm({
           {
             label: isFlagged ? "Unflag" : "Flag",
             action: async () => {
-              const newFlags = flagOps.set(msg.flags, FLAG.FLAGGED, !isFlagged);
+              const probe = { flags: [...msg.flags || []] };
+              setFlagged(probe, !isFlagged);
               try {
-                await updateFlags(accountId, msg.uid, newFlags);
-                msg.flags = newFlags;
-                self.setFlaggedClass(flagOps.isFlagged(newFlags));
+                await updateFlags(accountId, msg.uid, probe.flags);
+                msg.flags = probe.flags;
+                self.setFlaggedClass(!isFlagged);
               } catch {
               }
             }
@@ -6793,14 +6780,14 @@ document.getElementById("btn-tb-spam")?.addEventListener("click", spamSelectedMe
 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;
-    updateMessageFlags(sel.accountId, sel.uid, newFlags);
-    setRowFlagged(sel.accountId, sel.uid, flagOps.isFlagged(newFlags));
+    await updateFlags(sel.accountId, sel.uid, sel.flags);
+    updateMessageFlags(sel.accountId, sel.uid, sel.flags);
+    setRowFlagged(sel.accountId, sel.uid, !wasFlagged);
   } catch (e) {
+    setFlagged(sel, wasFlagged);
     console.error(`Flag toggle failed: ${e.message}`);
   }
 });
@@ -6889,14 +6876,14 @@ document.getElementById("btn-compose")?.addEventListener("click", () => openComp
 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;
-    updateMessageFlags(sel.accountId, sel.uid, newFlags);
+  const wasSeen = seenOf(sel);
+  setSeen(sel, !wasSeen);
+  updateFlags(sel.accountId, sel.uid, sel.flags).then(() => {
+    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));
+    if (row) row.classList.toggle("unread", wasSeen);
   }).catch(() => {
+    setSeen(sel, wasSeen);
   });
 });
 document.getElementById("btn-reply")?.addEventListener("click", () => openCompose("reply"));
@@ -7910,14 +7897,14 @@ document.addEventListener("keydown", (e) => {
     const sel = getCurrentFocused();
     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;
-      updateMessageFlags(sel.accountId, sel.uid, newFlags);
+    const wasSeen = seenOf(sel);
+    setSeen(sel, !wasSeen);
+    updateFlags(sel.accountId, sel.uid, sel.flags).then(() => {
+      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));
+      if (row) row.classList.toggle("unread", wasSeen);
     }).catch(() => {
+      setSeen(sel, wasSeen);
     });
   }
   if (e.key.toLowerCase() === "z" && !e.ctrlKey && !e.metaKey && !e.altKey) {
@@ -9255,7 +9242,7 @@ document.addEventListener("mailx-popout-message", (async (e) => {
     alert(`Couldn't load message: ${err?.message || err}`);
     return;
   }
-  const isDraft = Array.isArray(msg?.flags) && flagOps.isDraft(msg.flags);
+  const isDraft = !!msg && draftOf(msg);
   if (isDraft) {
     const accts = await getAccounts();
     const init = {