@bobfrankston/rmfmail 1.0.699 → 1.0.701

package/client/app.bundle.js

@@ -2175,6 +2175,69 @@ 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, {
@@ -2803,7 +2866,7 @@ async function showThreadPopup(pillEl, headMsg) {
   for (const msg of thread) {
     const item = document.createElement("div");
     item.className = "ml-thread-popup-item";
-    if (!msg.flags.includes("\\Seen"))
+    if (!flagOps.isSeen(msg.flags))
       item.classList.add("unread");
     const from = document.createElement("span");
     from.className = "ml-thread-popup-from";
@@ -2908,6 +2971,7 @@ var init_message_list = __esm({
     init_message_viewer();
     init_context_menu();
     init_folder_picker();
+    init_mailx_types();
     currentSpecialUse = "";
     lastClickedRow = null;
     loading = false;
@@ -2970,9 +3034,9 @@ var init_message_list = __esm({
         this.el = row;
         row.className = "ml-row";
         row.draggable = true;
-        if (!msg.flags.includes("\\Seen"))
+        if (!flagOps.isSeen(msg.flags))
           row.classList.add("unread");
-        if (msg.flags.includes("\\Flagged"))
+        if (flagOps.isFlagged(msg.flags))
           row.classList.add("flagged");
         if (!msg.bodyPath)
           row.classList.add("not-downloaded");
@@ -3001,7 +3065,7 @@ var init_message_list = __esm({
         avatar.addEventListener("contextmenu", (e) => this.onAvatarContextMenu(e));
         const flag = document.createElement("span");
         flag.className = "ml-flag";
-        flag.textContent = msg.flags.includes("\\Flagged") ? "\u2605" : "\u2606";
+        flag.textContent = flagOps.isFlagged(msg.flags) ? "\u2605" : "\u2606";
         flag.title = "Toggle flag";
         flag.addEventListener("click", (e) => this.onFlagClick(e));
         this.flagEl = flag;
@@ -3097,6 +3161,28 @@ var init_message_list = __esm({
       markBodyCached() {
         this.el.classList.remove("not-downloaded");
       }
+      // Visual-state accessors for flag toggles. Read the *visual* state
+      // (CSS class), not `this.msg.flags`, because the flag array can lag
+      // the rendered class — auto-mark-as-read removes the `unread` class
+      // immediately on click but `\Seen` doesn't land in `msg.flags` until
+      // the auto-mark timer fires (default 2 s). Right-click menus and
+      // keyboard shortcuts ask "what does the user see?" — that's what
+      // these getters answer. Setters keep both visual + flag-array in
+      // sync so the next read by either side agrees.
+      get isSeen() {
+        return !this.el.classList.contains("unread");
+      }
+      set isSeen(yes) {
+        this.setUnreadClass(!yes);
+        this.msg.flags = flagOps.set(this.msg.flags, FLAG.SEEN, 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);
+      }
       onAvatarClick(e) {
         e.stopPropagation();
         const body = document.getElementById("ml-body");
@@ -3157,7 +3243,7 @@ var init_message_list = __esm({
         e.stopPropagation();
         const isFlagged = this.el.classList.contains("flagged");
         const currentFlags = this.msg.flags || [];
-        const newFlags = isFlagged ? currentFlags.filter((f) => f !== "\\Flagged") : [...currentFlags, "\\Flagged"];
+        const newFlags = isFlagged ? flagOps.remove(currentFlags, FLAG.FLAGGED) : flagOps.add(currentFlags, FLAG.FLAGGED);
         try {
           await updateFlags(this.accountId, this.msg.uid, newFlags);
           this.msg.flags = newFlags;
@@ -3288,8 +3374,8 @@ var init_message_list = __esm({
             focusRow(this);
           }
         }
-        const isSeen = this.msg.flags.includes("\\Seen");
-        const isFlagged = this.msg.flags.includes("\\Flagged");
+        const isSeen = !this.el.classList.contains("unread");
+        const isFlagged = flagOps.isFlagged(this.msg.flags);
         const accountId = this.accountId;
         const msg = this.msg;
         const self = this;
@@ -3297,12 +3383,12 @@ var init_message_list = __esm({
           {
             label: isSeen ? "Mark unread" : "Mark read",
             action: async () => {
-              const newFlags = isSeen ? msg.flags.filter((f) => f !== "\\Seen") : [...msg.flags, "\\Seen"];
+              const newFlags = flagOps.set(msg.flags, FLAG.SEEN, !isSeen);
               try {
                 await updateFlags(accountId, msg.uid, newFlags);
                 msg.flags = newFlags;
                 updateMessageFlags(accountId, msg.uid, newFlags);
-                self.setUnreadClass(!newFlags.includes("\\Seen"));
+                self.setUnreadClass(!flagOps.isSeen(newFlags));
               } catch {
               }
             }
@@ -3310,11 +3396,11 @@ var init_message_list = __esm({
           {
             label: isFlagged ? "Unflag" : "Flag",
             action: async () => {
-              const newFlags = isFlagged ? msg.flags.filter((f) => f !== "\\Flagged") : [...msg.flags, "\\Flagged"];
+              const newFlags = flagOps.set(msg.flags, FLAG.FLAGGED, !isFlagged);
               try {
                 await updateFlags(accountId, msg.uid, newFlags);
                 msg.flags = newFlags;
-                self.setFlaggedClass(newFlags.includes("\\Flagged"));
+                self.setFlaggedClass(flagOps.isFlagged(newFlags));
               } catch {
               }
             }
@@ -5800,6 +5886,7 @@ async function updateFolderCounts() {
 
 // client/app.ts
 init_message_list();
+init_mailx_types();
 init_message_viewer();
 init_api_client();
 init_message_state();
@@ -6706,13 +6793,13 @@ document.getElementById("btn-tb-spam")?.addEventListener("click", spamSelectedMe
 document.getElementById("btn-flag")?.addEventListener("click", async () => {
   const sel = getCurrentFocused();
   if (!sel) return;
-  const isFlagged = sel.flags.includes("\\Flagged");
-  const newFlags = isFlagged ? sel.flags.filter((f) => f !== "\\Flagged") : [...sel.flags, "\\Flagged"];
+  const isFlagged = flagOps.isFlagged(sel.flags);
+  const newFlags = isFlagged ? flagOps.remove(sel.flags, FLAG.FLAGGED) : flagOps.add(sel.flags, FLAG.FLAGGED);
   try {
     await updateFlags(sel.accountId, sel.uid, newFlags);
     sel.flags = newFlags;
     updateMessageFlags(sel.accountId, sel.uid, newFlags);
-    setRowFlagged(sel.accountId, sel.uid, newFlags.includes("\\Flagged"));
+    setRowFlagged(sel.accountId, sel.uid, flagOps.isFlagged(newFlags));
   } catch (e) {
     console.error(`Flag toggle failed: ${e.message}`);
   }
@@ -6802,13 +6889,13 @@ document.getElementById("btn-compose")?.addEventListener("click", () => openComp
 document.getElementById("btn-mark-unread")?.addEventListener("click", () => {
   const sel = getCurrentFocused();
   if (!sel) return;
-  const isSeen = sel.flags.includes("\\Seen");
-  const newFlags = isSeen ? sel.flags.filter((f) => f !== "\\Seen") : [...sel.flags, "\\Seen"];
+  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 row = document.querySelector(`.ml-row[data-uid="${sel.uid}"][data-account-id="${sel.accountId}"]`);
-    if (row) row.classList.toggle("unread", !newFlags.includes("\\Seen"));
+    if (row) row.classList.toggle("unread", !flagOps.isSeen(newFlags));
   }).catch(() => {
   });
 });
@@ -7823,13 +7910,13 @@ document.addEventListener("keydown", (e) => {
     const sel = getCurrentFocused();
     if (!sel) return;
     e.preventDefault();
-    const isSeen = sel.flags.includes("\\Seen");
-    const newFlags = isSeen ? sel.flags.filter((f) => f !== "\\Seen") : [...sel.flags, "\\Seen"];
+    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 row = document.querySelector(`.ml-row[data-uid="${sel.uid}"][data-account-id="${sel.accountId}"]`);
-      if (row) row.classList.toggle("unread", !newFlags.includes("\\Seen"));
+      if (row) row.classList.toggle("unread", !flagOps.isSeen(newFlags));
     }).catch(() => {
     });
   }
@@ -9168,7 +9255,7 @@ document.addEventListener("mailx-popout-message", (async (e) => {
     alert(`Couldn't load message: ${err?.message || err}`);
     return;
   }
-  const isDraft = Array.isArray(msg?.flags) && msg.flags.includes("\\Draft");
+  const isDraft = Array.isArray(msg?.flags) && flagOps.isDraft(msg.flags);
   if (isDraft) {
     const accts = await getAccounts();
     const init = {