@bobfrankston/rmfmail 1.2.261 → 1.2.268

package/client/app.bundle.js

@@ -1368,6 +1368,35 @@ function _set(msg, flag, state) {
   const next = state ? [...msg.flags || [], flag] : (msg.flags || []).filter((f) => f !== flag);
   msg.flags = next;
 }
+function isJunkPreviewText(s) {
+  const t = (s || "").replace(/\s+/g, " ").trim().toLowerCase();
+  if (!t)
+    return true;
+  return t === "undefined" || t === "null" || t === "nan" || t === "[object object]";
+}
+function displayNameClaimsOtherAddress(name, address) {
+  const n = (name || "").trim();
+  if (!n)
+    return null;
+  const real = (address || "").trim().toLowerCase();
+  const m = n.match(/[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}/g);
+  if (!m)
+    return null;
+  for (const claimed of m) {
+    if (claimed.toLowerCase() !== real)
+      return claimed;
+  }
+  return null;
+}
+function formatSender(addr) {
+  const address = (addr?.address || "").trim();
+  const name = (addr?.name || "").trim();
+  if (!name)
+    return { text: address, claimed: null };
+  if (name.toLowerCase() === address.toLowerCase())
+    return { text: address, claimed: null };
+  return { text: `${name} <${address}>`, claimed: displayNameClaimsOtherAddress(name, address) };
+}
 var _SEEN, _FLAGGED, _DRAFT, seenOf, flaggedOf, draftOf, setSeen, setFlagged;
 var init_mailx_types = __esm({
   "packages/mailx-types/index.js"() {
@@ -2568,16 +2597,7 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
     const fromEl = headerEl.querySelector(".mv-from");
     const toEl = headerEl.querySelector(".mv-to");
     fromEl.textContent = formatAddr(msg.from);
-    let toLine = `To: ${msg.to.map(formatAddr).join(", ")}`;
-    if (msg.cc?.length)
-      toLine += `  Cc: ${msg.cc.map(formatAddr).join(", ")}`;
-    const toAddrs = (msg.to || []).map((a) => a.address.toLowerCase());
-    const ccAddrs = (msg.cc || []).map((a) => a.address.toLowerCase());
-    const dt = (msg.deliveredTo || "").toLowerCase();
-    if (msg.deliveredTo && !toAddrs.includes(dt) && !ccAddrs.includes(dt)) {
-      toLine += `  Delivered-To: ${msg.deliveredTo}`;
-    }
-    toEl.textContent = toLine;
+    setRecipientLine(toEl, msg.to, msg.cc, msg.deliveredTo);
     headerEl.querySelector(".mv-subject").textContent = msg.subject;
     document.dispatchEvent(new CustomEvent("mailx-message-shown", { detail: { accountId } }));
     for (const el of [fromEl, toEl]) {
@@ -2585,7 +2605,9 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
         e.preventDefault();
         const me = e;
         const items = [];
-        const addrs = el === fromEl ? [msg.from] : [...msg.to || [], ...msg.cc || []];
+        const allAddrs = el === fromEl ? [msg.from] : [...msg.to || [], ...msg.cc || []];
+        const addrs = allAddrs.slice(0, CONTEXT_MENU_ADDR_CAP);
+        const omitted = allAddrs.length - addrs.length;
         for (const addr of addrs) {
           if (!addr?.address)
             continue;
@@ -2660,6 +2682,14 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
           items.push({ label: "", action: () => {
           }, separator: true });
         }
+        if (omitted > 0) {
+          items.push({
+            label: `\u2026 ${omitted} more recipients \u2014 copy the whole list`,
+            action: () => navigator.clipboard.writeText(allAddrs.map(formatAddr).join(", "))
+          });
+          items.push({ label: "", action: () => {
+          }, separator: true });
+        }
         items.push({ label: "Reply", action: () => document.dispatchEvent(new CustomEvent("mailx-compose", { detail: { mode: "reply" } })) });
         items.push({ label: "Reply All", action: () => document.dispatchEvent(new CustomEvent("mailx-compose", { detail: { mode: "replyAll" } })) });
         items.push({ label: "Forward", action: () => document.dispatchEvent(new CustomEvent("mailx-compose", { detail: { mode: "forward" } })) });
@@ -3240,9 +3270,44 @@ ${escapeText(reputationBlind)}"` : ""}>${reputationText}</div>` : "") + `<div cl
   }
 }
 function formatAddr(addr) {
-  if (addr.name)
-    return `${addr.name} <${addr.address}>`;
-  return addr.address;
+  const { text, claimed } = formatSender(addr);
+  if (!claimed)
+    return text;
+  return `${text} \u2014 display name claims ${claimed}`;
+}
+function setRecipientLine(toEl, to, cc, deliveredTo) {
+  const toList = to || [];
+  const ccList = cc || [];
+  let line = `To: ${toList.map(formatAddr).join(", ")}`;
+  if (ccList.length)
+    line += `  Cc: ${ccList.map(formatAddr).join(", ")}`;
+  if (deliveredTo) {
+    const dt = deliveredTo.toLowerCase();
+    const covered = [...toList, ...ccList].some((a) => a.address.toLowerCase() === dt);
+    if (!covered)
+      line += `  Delivered-To: ${deliveredTo}`;
+  }
+  toEl.textContent = "";
+  toEl.classList.remove("mv-to-expanded");
+  const text = document.createElement("span");
+  text.className = "mv-to-text";
+  text.textContent = line;
+  toEl.append(text);
+  const count = toList.length + ccList.length;
+  const clamped = text.scrollHeight > text.clientHeight + 1;
+  if (count <= MANY_RECIPIENTS && !clamped)
+    return;
+  const toggle = document.createElement("button");
+  toggle.className = "mv-to-toggle";
+  toggle.type = "button";
+  const label = count === 1 ? "1 recipient" : `${count} recipients`;
+  const paint = (open) => {
+    toggle.textContent = `${open ? "\u25BE" : "\u25B8"} ${label}`;
+    toggle.title = open ? "Collapse the recipient list" : "Show the full recipient list";
+  };
+  paint(false);
+  toggle.addEventListener("click", () => paint(toEl.classList.toggle("mv-to-expanded")));
+  toEl.append(toggle);
 }
 function renderHeaderFromEnvelope(headerEl, env) {
   headerEl.hidden = false;
@@ -3252,12 +3317,8 @@ function renderHeaderFromEnvelope(headerEl, env) {
   const dateEl = headerEl.querySelector(".mv-date");
   if (fromEl)
     fromEl.textContent = formatAddr(env.from);
-  if (toEl) {
-    let toLine = `To: ${(env.to || []).map(formatAddr).join(", ")}`;
-    if (env.cc?.length)
-      toLine += `  Cc: ${env.cc.map(formatAddr).join(", ")}`;
-    toEl.textContent = toLine;
-  }
+  if (toEl)
+    setRecipientLine(toEl, env.to, env.cc);
   if (subjEl)
     subjEl.textContent = env.subject || "";
   if (dateEl) {
@@ -4027,7 +4088,7 @@ function spawnDesktopPopout(msg, accountId) {
 function escapeHtmlLocal(s) {
   return (s || "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
-var pendingImageCopies, imageCopySeq, IMAGE_COPY_TIMEOUT_MS, currentMessage, currentAccountId, dragOutUrls, showMessageGeneration, retryCount, lastEnvelope, PARSED_CACHE_LIMIT, parsedCache, sessionAllowedRemote, recentFetchErrors, WAIT_GIVE_UP_SECS, ZOOM_KEY, ZOOM_MIN, ZOOM_MAX, ZOOM_STEP, previewZoom, HIGHLIGHT_NAME, HIGHLIGHT_MAX, searchHighlightTerms, RENDER_MARK_KEY, RENDER_MARK_MAX_AGE_MS, poisonedMessages, renderKey, PROGRESSIVE_TEXT_THRESHOLD, TEXT_CHUNK_BYTES;
+var pendingImageCopies, imageCopySeq, IMAGE_COPY_TIMEOUT_MS, currentMessage, currentAccountId, dragOutUrls, showMessageGeneration, retryCount, lastEnvelope, PARSED_CACHE_LIMIT, parsedCache, sessionAllowedRemote, recentFetchErrors, WAIT_GIVE_UP_SECS, ZOOM_KEY, ZOOM_MIN, ZOOM_MAX, ZOOM_STEP, previewZoom, HIGHLIGHT_NAME, HIGHLIGHT_MAX, searchHighlightTerms, RENDER_MARK_KEY, RENDER_MARK_MAX_AGE_MS, poisonedMessages, renderKey, MANY_RECIPIENTS, CONTEXT_MENU_ADDR_CAP, PROGRESSIVE_TEXT_THRESHOLD, TEXT_CHUNK_BYTES;
 var init_message_viewer = __esm({
   "client/components/message-viewer.js"() {
     "use strict";
@@ -4111,6 +4172,8 @@ var init_message_viewer = __esm({
       } catch {
       }
     })();
+    MANY_RECIPIENTS = 6;
+    CONTEXT_MENU_ADDR_CAP = 12;
     PROGRESSIVE_TEXT_THRESHOLD = 200 * 1024;
     TEXT_CHUNK_BYTES = 64 * 1024;
     subscribeStore("*", (ev) => {
@@ -5566,7 +5629,13 @@ var init_message_list = __esm({
         if (showToInsteadOfFrom && msg.to?.length) {
           from.textContent = msg.to.map((a) => a.name || a.address).join(", ");
         } else {
-          from.textContent = msg.from.name || msg.from.address;
+          const fromName2 = msg.from.name || msg.from.address;
+          const fromClaim = displayNameClaimsOtherAddress(msg.from.name || "", msg.from.address || "");
+          from.textContent = fromClaim ? `${fromName2} \u2014 actually ${msg.from.address}` : fromName2;
+          if (fromClaim) {
+            from.classList.add("ml-from-spoofed");
+            from.title = `Display name claims ${fromClaim}, but the message is from ${msg.from.address}`;
+          }
         }
         if (showAccountTag && accountId) {
           const tag = document.createElement("span");
@@ -5603,7 +5672,7 @@ var init_message_list = __esm({
           });
           subject.prepend(threadPill);
         }
-        if (msg.preview) {
+        if (msg.preview && !isJunkPreviewText(msg.preview)) {
           const cleaned = msg.preview.replace(/data:image\/[a-z0-9.+-]+;base64,[A-Za-z0-9+/=\s]+/gi, "[image]").replace(/[A-Za-z0-9+/=]{200,}/g, "[image]");
           const preview = document.createElement("span");
           preview.className = "ml-preview";
@@ -9847,6 +9916,9 @@ async function openCompose(mode, overrideMsg, overrideAccountId) {
     }
     frame = showComposeOverlay(composeTitle);
   }
+  handOffComposeInit(frame, init);
+}
+function handOffComposeInit(frame, init) {
   const initJson = JSON.stringify(init);
   try {
     sessionStorage.setItem("composeInit", initJson);
@@ -10578,7 +10650,7 @@ document.getElementById("rail-inbox")?.addEventListener("click", () => {
   inbox?.click();
 });
 document.getElementById("rail-unified")?.addEventListener("click", () => {
-  const unified = document.querySelector(".folder-tree .all-inboxes") || document.getElementById("ft-all-inboxes");
+  const unified = document.querySelector(".folder-tree .all-inboxes");
   unified?.click();
 });
 document.getElementById("rail-contacts")?.addEventListener("click", async () => {
@@ -10774,8 +10846,7 @@ document.addEventListener("mailx-share-intent", ((e) => {
   if (Array.isArray(detail.attachments) && detail.attachments.length) {
     init.attachments = detail.attachments.filter((a) => a?.filename && a?.dataBase64);
   }
-  sessionStorage.setItem("composeInit", JSON.stringify(init));
-  showComposeOverlay(init.subject || "Compose");
+  handOffComposeInit(showComposeOverlay(init.subject || "Compose"), init);
 }));
 var searchTimeout;
 var searchInput = document.getElementById("search-input");
@@ -11065,11 +11136,6 @@ window.addEventListener("message", (e) => {
     }
     return;
   }
-  if (e.data?.type === "openLink" && e.data.url) {
-    const api = window.mailxapi;
-    if (api?.openExternal) api.openExternal(e.data.url);
-    else window.open(e.data.url, "_blank", "noopener,noreferrer");
-  }
   if (e.data?.type === "linkClick" && e.data.url) {
     const url = e.data.url;
     console.log(`[android-link] parent got linkClick \u2192 ${url}`);
@@ -11088,10 +11154,6 @@ window.addEventListener("message", (e) => {
     }
     return;
   }
-  if (e.data?.type === "previewToggleFullscreen") {
-    toggleFullscreenPreview();
-    return;
-  }
   if (e.data?.type === "previewContextMenu") {
     let iframeRect = null;
     for (const f of Array.from(document.querySelectorAll("iframe"))) {
@@ -11113,84 +11175,6 @@ window.addEventListener("message", (e) => {
     );
     return;
   }
-  if (e.data?.type === "linkContextMenu") {
-    let iframeRect = null;
-    for (const f of Array.from(document.querySelectorAll("iframe"))) {
-      if (f.contentWindow === e.source) {
-        iframeRect = f.getBoundingClientRect();
-        break;
-      }
-    }
-    const x = (iframeRect?.left || 0) + (e.data.x || 0);
-    const y = (iframeRect?.top || 0) + (e.data.y || 0);
-    const url = e.data.url || "";
-    const guessName = (() => {
-      try {
-        const u = new URL(url);
-        const last = u.pathname.split("/").pop() || "";
-        return last && last.includes(".") ? last : "";
-      } catch {
-        return "";
-      }
-    })();
-    const items = [
-      { label: "Open in browser", action: () => {
-        window.open(url, "_blank", "noopener,noreferrer");
-      } },
-      { label: guessName ? `Save "${guessName}"\u2026` : "Save link as\u2026", action: () => {
-        const a = document.createElement("a");
-        a.href = url;
-        if (guessName) a.download = guessName;
-        else a.download = "";
-        a.style.display = "none";
-        document.body.appendChild(a);
-        a.click();
-        setTimeout(() => a.remove(), 1e3);
-      } },
-      { label: "Copy URL", action: async () => {
-        try {
-          await navigator.clipboard.writeText(url);
-        } catch {
-          prompt("URL:", url);
-        }
-      } },
-      { label: "Copy link text", action: async () => {
-        try {
-          await navigator.clipboard.writeText(e.data.text || url);
-        } catch {
-          prompt("Text:", e.data.text || url);
-        }
-      } }
-    ];
-    const menu = document.createElement("div");
-    menu.style.cssText = `position:fixed;z-index:2400;background:var(--color-bg);border:1px solid var(--color-border);border-radius:6px;box-shadow:0 4px 16px rgba(0,0,0,0.2);padding:4px 0;font-size:13px;min-width:180px;`;
-    menu.style.left = `${Math.min(x, window.innerWidth - 200)}px`;
-    menu.style.top = `${Math.min(y, window.innerHeight - 200)}px`;
-    menu.addEventListener("mousedown", (ev) => ev.stopPropagation());
-    for (const it of items) {
-      const row = document.createElement("div");
-      row.textContent = it.label;
-      row.style.cssText = `padding:6px 12px;cursor:pointer;`;
-      row.addEventListener("mouseenter", () => row.style.background = "var(--color-bg-hover)");
-      row.addEventListener("mouseleave", () => row.style.background = "");
-      row.addEventListener("click", () => {
-        menu.remove();
-        it.action();
-      });
-      menu.appendChild(row);
-    }
-    document.body.appendChild(menu);
-    const dismiss = () => {
-      menu.remove();
-      document.removeEventListener("mousedown", dismiss);
-      document.removeEventListener("keydown", dismiss);
-    };
-    setTimeout(() => {
-      document.addEventListener("mousedown", dismiss);
-      document.addEventListener("keydown", dismiss);
-    }, 0);
-    return;
-  }
   if (e.data?.type === "mailx-send-error") {
     const statusSync = document.getElementById("status-sync");
     if (statusSync) {
@@ -11697,11 +11681,7 @@ async function openComposeFromMailto(m) {
     references: m.inReplyTo ? [m.inReplyTo] : [],
     accounts: accounts.map((a) => ({ id: a.id, name: a.name, email: a.email, signature: a.signature, sig: a.sig }))
   };
-  sessionStorage.setItem("composeInit", JSON.stringify(init));
-  try {
-    frame?.contentWindow?.postMessage({ type: "compose-init-ready" }, "*");
-  } catch {
-  }
+  handOffComposeInit(frame, init);
 }
 async function openComposeFromShare(s) {
   const accountsP = getAccounts();
@@ -11734,11 +11714,7 @@ async function openComposeFromShare(s) {
     attachments: s.attachments,
     accounts: accounts.map((a) => ({ id: a.id, name: a.name, email: a.email, signature: a.signature, sig: a.sig }))
   };
-  sessionStorage.setItem("composeInit", JSON.stringify(init));
-  try {
-    frame?.contentWindow?.postMessage({ type: "compose-init-ready" }, "*");
-  } catch {
-  }
+  handOffComposeInit(frame, init);
 }
 window.addEventListener("keydown", (e) => {
   if (!e.ctrlKey || e.altKey || e.metaKey) return;
@@ -12218,9 +12194,10 @@ document.addEventListener("keydown", (e) => {
     bd.remove();
     closed = true;
   }
-  const themeSub = document.getElementById("theme-submenu");
+  const themeSub = document.getElementById("theme-submenu-popout");
   if (themeSub && !themeSub.hidden) {
     themeSub.hidden = true;
+    document.getElementById("theme-submenu-toggle")?.setAttribute("aria-expanded", "false");
     closed = true;
   }
   if (closed) {
@@ -13656,8 +13633,7 @@ document.addEventListener("mailx-popout-message", (async (e) => {
       }
       if (loaded.length) init.attachments = loaded;
     }
-    sessionStorage.setItem("composeInit", JSON.stringify(init));
-    showComposeOverlay(msg.subject ? `Edit: ${msg.subject}` : "Edit draft");
+    handOffComposeInit(showComposeOverlay(msg.subject ? `Edit: ${msg.subject}` : "Edit draft"), init);
     return;
   }
   const { spawnDesktopPopout: spawnDesktopPopout2 } = await Promise.resolve().then(() => (init_message_viewer(), message_viewer_exports));