@bobfrankston/rmfmail 1.0.703 → 1.0.705

package/client/app.bundle.js

@@ -2113,6 +2113,26 @@ var init_message_viewer = __esm({
       else
         bodyEl.prepend(banner);
     });
+    onEvent((ev) => {
+      if (!ev || ev.type !== "draftSaved")
+        return;
+      if (!currentMessage || currentAccountId !== ev.accountId)
+        return;
+      if (currentMessage.uid !== ev.previousDraftUid)
+        return;
+      const newBody = String(ev.bodyHtml || "");
+      currentMessage.bodyHtml = newBody;
+      if (ev.subject)
+        currentMessage.subject = ev.subject;
+      const bodyEl = document.getElementById("mv-body");
+      const iframe = bodyEl?.querySelector("iframe");
+      if (iframe) {
+        iframe.srcdoc = wrapHtmlBody(newBody, !!currentMessage.remoteAllowed);
+      }
+      const subjEl = document.querySelector(".mv-subject");
+      if (subjEl && ev.subject)
+        subjEl.textContent = String(ev.subject);
+    });
   }
 });
 
@@ -3151,6 +3171,15 @@ var init_message_list = __esm({
       markBodyCached() {
         this.el.classList.remove("not-downloaded");
       }
+      /** Update the row's date column. Used by the draft-saved listener so
+       *  Ctrl+S in compose bumps the time in the Drafts list immediately
+       *  rather than waiting for the next IMAP APPEND + sync round-trip. */
+      setDate(epochMs) {
+        this.msg.date = epochMs;
+        const el = this.el.querySelector(".ml-date");
+        if (el)
+          el.textContent = formatDate(epochMs);
+      }
       // 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
@@ -3394,6 +3423,27 @@ var init_message_list = __esm({
           },
           { label: "", action: () => {
           }, separator: true },
+          // Drafts get an explicit "Edit draft" entry as the primary action —
+          // double-click already opens the row in compose, but the context
+          // menu had no equivalent (Bob 2026-05-13). Detect via \Draft flag
+          // or the Drafts folder context. Edit triggers the same path as
+          // double-click: dispatching popout-message lets app.ts's draft
+          // detection route through to compose.
+          ...(() => {
+            const isDraftRow = draftOf(msg) || currentSpecialUse.toLowerCase() === "drafts";
+            if (!isDraftRow)
+              return [];
+            return [
+              {
+                label: "Edit draft",
+                action: () => document.dispatchEvent(new CustomEvent("mailx-popout-message", {
+                  detail: { accountId, uid: msg.uid, folderId: msg.folderId, subject: msg.subject }
+                }))
+              },
+              { label: "", action: () => {
+              }, separator: true }
+            ];
+          })(),
           { label: "Reply", action: () => document.dispatchEvent(new CustomEvent("mailx-compose", { detail: { mode: "reply" } })) },
           { label: "Reply All", action: () => document.dispatchEvent(new CustomEvent("mailx-compose", { detail: { mode: "replyAll" } })) },
           { label: "Forward", action: () => document.dispatchEvent(new CustomEvent("mailx-compose", { detail: { mode: "forward" } })) },
@@ -3444,6 +3494,15 @@ var init_message_list = __esm({
         showContextMenu(e.clientX, e.clientY, items);
       }
     };
+    onEvent((ev) => {
+      if (!ev || ev.type !== "draftSaved")
+        return;
+      if (!ev.accountId || ev.previousDraftUid == null)
+        return;
+      const row = rowByKey.get(rowKey(ev.accountId, ev.previousDraftUid));
+      if (row)
+        row.setDate(typeof ev.savedAt === "number" ? ev.savedAt : Date.now());
+    });
   }
 });
 
@@ -4519,23 +4578,43 @@ async function collectDueAlarms(now) {
       if (!Array.isArray(ev.reminderMinutes) || ev.reminderMinutes.length === 0)
         continue;
       const offsets = ev.reminderMinutes.map((m) => m * 6e4);
+      const occBaseKey = occKey(ev.uuid, startMs);
+      let pick = null;
+      const eligibleOffsets = [];
       for (const offsetMs of offsets) {
-        const occBaseKey = occKey(ev.uuid, startMs);
         const key = `${occBaseKey}@${offsetMs}`;
         if (dismissed[key])
           continue;
         const alarm = startMs - offsetMs;
         const effective = snoozed[key] || alarm;
         if (effective <= now && effective > now - LOOKBACK_MS) {
-          items.push({
-            uuid: key,
-            kind: "calendar",
-            title: ev.title || "(no title)",
-            alarmMs: effective,
-            whenMs: startMs,
-            htmlLink: ev.htmlLink
-          });
+          eligibleOffsets.push(offsetMs);
+          if (!pick || effective > pick.effective) {
+            pick = { offsetMs, effective, key };
+          }
+        }
+      }
+      if (pick) {
+        items.push({
+          uuid: pick.key,
+          kind: "calendar",
+          title: ev.title || "(no title)",
+          alarmMs: pick.effective,
+          whenMs: startMs,
+          htmlLink: ev.htmlLink
+        });
+        let touched = false;
+        for (const offsetMs of eligibleOffsets) {
+          if (offsetMs === pick.offsetMs)
+            continue;
+          const k = `${occBaseKey}@${offsetMs}`;
+          if (!dismissed[k]) {
+            dismissed[k] = true;
+            touched = true;
+          }
         }
+        if (touched)
+          saveDismissed(dismissed);
       }
     }
   } catch {
@@ -6411,7 +6490,13 @@ async function openCompose(mode) {
   const account = accounts.find((a) => a.id === accountId);
   const explicitDomains = (account?.identityDomains || []).map((d) => d.toLowerCase());
   const accountDomain = (account?.email || "").split("@")[1]?.toLowerCase();
-  const identityDomains = explicitDomains.length > 0 ? explicitDomains : accountDomain ? [accountDomain] : [];
+  function foldDomains(list) {
+    const unique = Array.from(new Set(list));
+    return unique.filter((d) => !unique.some((p) => p !== d && d.endsWith(`.${p}`)));
+  }
+  const identityDomains = foldDomains(
+    explicitDomains.length > 0 ? explicitDomains : accountDomain ? [accountDomain] : []
+  );
   function detectReplyFrom() {
     if (!msg) return void 0;
     if (msg.deliveredTo) {
@@ -6433,6 +6518,33 @@ async function openCompose(mode) {
     console.log(`[compose] no identity match`);
     return void 0;
   }
+  if (msg) {
+    try {
+      const dump = {
+        mode,
+        accountId,
+        hasMsg: true,
+        from: msg.from || null,
+        toLen: Array.isArray(msg.to) ? msg.to.length : -1,
+        ccLen: Array.isArray(msg.cc) ? msg.cc.length : -1,
+        deliveredTo: msg.deliveredTo || "",
+        identityDomains,
+        subject: msg.subject || ""
+      };
+      const apiClient = window.mailxapi;
+      if (apiClient?.logClientEvent) {
+        apiClient.logClientEvent("reply-init", dump);
+      } else {
+        console.log("[reply-init]", dump);
+      }
+    } catch {
+    }
+  } else {
+    try {
+      window.mailxapi?.logClientEvent?.("reply-init", { mode, accountId, hasMsg: false });
+    } catch {
+    }
+  }
   if (msg && mode === "reply") {
     init.to = msg.from ? [msg.from] : [];
     init.subject = `Re: ${cleanSubject}`;