@bobfrankston/rmfmail 1.2.248 → 1.2.250

package/client/app.bundle.js

@@ -52,6 +52,7 @@ __export(api_client_exports, {
   drainStoreSync: () => drainStoreSync,
   emptyFolder: () => emptyFolder,
   fetchImageAsDataUri: () => fetchImageAsDataUri,
+  fetchRemoteImage: () => fetchRemoteImage,
   flagSenderOrDomain: () => flagSenderOrDomain,
   formatJsonc: () => formatJsonc,
   getAccounts: () => getAccounts,
@@ -614,6 +615,16 @@ function readConfigHelp(name) {
 function unsubscribeOneClick(url) {
   return ipc().unsubscribeOneClick?.(url);
 }
+async function fetchRemoteImage(url) {
+  const fn = ipc().fetchRemoteImage;
+  if (!fn)
+    return { error: "this host can't fetch remote images" };
+  try {
+    return await fn(url);
+  } catch (e) {
+    return { error: e?.message || String(e) };
+  }
+}
 function openInWord(editId, html, popoutId = "") {
   return ipc().openInWord?.(editId, html, popoutId) ?? Promise.resolve({ ok: false, path: "", opener: "none" });
 }
@@ -1163,6 +1174,16 @@ var init_context_menu = __esm({
   }
 });
 
+// client/lib/fold-text.js
+function foldText(s) {
+  return (s || "").normalize("NFD").replace(/\p{Diacritic}/gu, "").toLowerCase();
+}
+var init_fold_text = __esm({
+  "client/lib/fold-text.js"() {
+    "use strict";
+  }
+});
+
 // client/lib/message-state.js
 var message_state_exports = {};
 __export(message_state_exports, {
@@ -1639,6 +1660,28 @@ __export(message_viewer_exports, {
   toggleFullscreenPreview: () => toggleFullscreenPreview,
   wrapHtmlBody: () => wrapHtmlBody
 });
+function requestImageFromPreview(sourceWindow, src) {
+  if (!sourceWindow)
+    return Promise.resolve({ error: "preview window is gone" });
+  const reqId = ++imageCopySeq;
+  return new Promise((resolve) => {
+    const done = (r) => {
+      clearTimeout(timer);
+      resolve(r);
+    };
+    const timer = setTimeout(() => {
+      pendingImageCopies.delete(reqId);
+      resolve({ error: "the preview did not answer in time" });
+    }, IMAGE_COPY_TIMEOUT_MS);
+    pendingImageCopies.set(reqId, done);
+    try {
+      sourceWindow.postMessage({ type: "previewCommand", cmd: "copyImage", reqId, src }, "*");
+    } catch (err) {
+      pendingImageCopies.delete(reqId);
+      done({ error: err?.message || String(err) });
+    }
+  });
+}
 function parsedCacheGet(accountId, folderId, uid) {
   if (folderId == null)
     return null;
@@ -1760,19 +1803,56 @@ function showPreviewBodyMenu(absX, absY, selectedText, sourceWindow, linkUrl, li
       }
     })();
     items.push({ label: "Copy image", action: async () => {
-      try {
-        const resp = await fetch(imgSrc);
-        const blob = await resp.blob();
+      const attempts = [];
+      const writePng = async (png) => {
+        await navigator.clipboard.write([new ClipboardItem({ "image/png": png })]);
+      };
+      const toPng = async (blob) => {
+        if (blob.type === "image/png")
+          return blob;
         const bmp = await createImageBitmap(blob);
         const canvas = document.createElement("canvas");
         canvas.width = bmp.width;
         canvas.height = bmp.height;
         canvas.getContext("2d").drawImage(bmp, 0, 0);
-        const png = await new Promise((res, rej) => canvas.toBlob((b) => b ? res(b) : rej(new Error("toBlob failed")), "image/png"));
-        await navigator.clipboard.write([new ClipboardItem({ "image/png": png })]);
+        return await new Promise((res, rej) => canvas.toBlob((b) => b ? res(b) : rej(new Error("toBlob failed")), "image/png"));
+      };
+      const fromPreview = await requestImageFromPreview(sourceWindow, imgSrc);
+      if (fromPreview.blob) {
+        try {
+          await writePng(fromPreview.blob);
+          return;
+        } catch (e) {
+          attempts.push(`clipboard write: ${e?.message || e}`);
+        }
+      } else {
+        attempts.push(`preview: ${fromPreview.error}`);
+      }
+      try {
+        const resp = await fetch(imgSrc);
+        if (!resp.ok)
+          throw new Error(`HTTP ${resp.status}`);
+        await writePng(await toPng(await resp.blob()));
+        return;
       } catch (e) {
-        alert(`Couldn't copy image: ${e?.message || e}${imgSrc.startsWith("cid:") ? " (inline cid: image \u2014 try Save instead, or right-click \u2192 save in the message)" : ""}`);
+        attempts.push(`direct fetch: ${e?.message || e}`);
+      }
+      if (/^https?:/i.test(imgSrc)) {
+        try {
+          const { fetchRemoteImage: fetchRemoteImage2 } = await Promise.resolve().then(() => (init_api_client(), api_client_exports));
+          const r = await fetchRemoteImage2(imgSrc);
+          if (!r?.base64)
+            throw new Error(r?.error || "no data returned");
+          const bytes = Uint8Array.from(atob(r.base64), (c) => c.charCodeAt(0));
+          await writePng(await toPng(new Blob([bytes], { type: r.contentType || "image/png" })));
+          return;
+        } catch (e) {
+          attempts.push(`via rmfmail: ${e?.message || e}`);
+        }
       }
+      alert(`Couldn't copy that image.
+
+${attempts.map((a) => `\u2022 ${a}`).join("\n")}`);
     } }, { label: `Save image as "${guessImgName}"\u2026`, action: () => {
       const a = document.createElement("a");
       a.href = imgSrc;
@@ -3305,6 +3385,9 @@ ${csp}
     // dismissers it sees. The parent's debounced 500 ms show-timer still
     // suppresses flicker.
     var lastHoveredHref = "";
+    // The <img> under the most recent right-click, kept so a later
+    // "copyImage" command can encode that exact element (see below).
+    var lastContextImg = null;
     function postLinkHover(href, rect, mouse) {
         // Only post on transitions to avoid spamming the parent on every
         // mousemove inside a link.
@@ -3380,6 +3463,45 @@ ${csp}
                     s.addRange(r);
                 }
             } catch (_) {}
+        } else if (d.cmd === "copyImage") {
+            // Encode the right-clicked image HERE and hand the parent the
+            // bytes. The parent can't fetch it itself: an inline image is a
+            // multi-megabyte data: URI it would have to re-download through
+            // the message channel, and a remote one is cross-origin with no
+            // CORS headers, so a parent-side fetch rejects. This img is
+            // already decoded here, so a canvas draw needs no network at all.
+            // (A remote image DOES taint the canvas \u2014 toBlob then throws and
+            // the parent falls back to fetching it through the daemon.)
+            var target = lastContextImg;
+            if (!target && d.src) {
+                var all = document.getElementsByTagName("img");
+                for (var i = 0; i < all.length; i++) {
+                    if (all[i].currentSrc === d.src || all[i].src === d.src) { target = all[i]; break; }
+                }
+            }
+            if (!target) {
+                window.parent.postMessage({ type: "previewImageBytes", reqId: d.reqId, error: "image element not found" }, "*");
+                return;
+            }
+            try {
+                var cv = document.createElement("canvas");
+                cv.width = target.naturalWidth || target.width;
+                cv.height = target.naturalHeight || target.height;
+                if (!cv.width || !cv.height) throw new Error("image has no decoded size yet");
+                cv.getContext("2d").drawImage(target, 0, 0);
+                cv.toBlob(function (b) {
+                    if (!b) {
+                        window.parent.postMessage({ type: "previewImageBytes", reqId: d.reqId, error: "encode failed" }, "*");
+                        return;
+                    }
+                    window.parent.postMessage({ type: "previewImageBytes", reqId: d.reqId, blob: b }, "*");
+                }, "image/png");
+            } catch (err) {
+                window.parent.postMessage({
+                    type: "previewImageBytes", reqId: d.reqId,
+                    error: (err && err.message) ? err.message : String(err)
+                }, "*");
+            }
         }
     });
 
@@ -3398,6 +3520,10 @@ ${csp}
         try { rect = e.target.getBoundingClientRect ? e.target.getBoundingClientRect() : rect; } catch (_) {}
         var a = e.target && e.target.closest ? e.target.closest("a[href]") : null;
         var img = e.target && e.target.closest ? e.target.closest("img") : null;
+        // Remember the element itself, not just its src \u2014 "Copy image" encodes
+        // this exact <img>, and matching by src would pick the wrong one when
+        // a letter repeats the same image (spacers, logos, tracking pixels).
+        lastContextImg = img;
         var sel = (window.getSelection && window.getSelection()) ? window.getSelection().toString() : "";
         window.parent.postMessage({
             type: "previewContextMenu",
@@ -3723,7 +3849,7 @@ function spawnDesktopPopout(msg, accountId) {
 function escapeHtmlLocal(s) {
   return (s || "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
-var 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, 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, RENDER_MARK_KEY, RENDER_MARK_MAX_AGE_MS, poisonedMessages, renderKey, PROGRESSIVE_TEXT_THRESHOLD, TEXT_CHUNK_BYTES;
 var init_message_viewer = __esm({
   "client/components/message-viewer.js"() {
     "use strict";
@@ -3732,6 +3858,19 @@ var init_message_viewer = __esm({
     init_message_state();
     init_message_list();
     init_mailx_types();
+    pendingImageCopies = /* @__PURE__ */ new Map();
+    imageCopySeq = 0;
+    IMAGE_COPY_TIMEOUT_MS = 8e3;
+    window.addEventListener("message", (e) => {
+      const d = e.data;
+      if (!d || d.type !== "previewImageBytes")
+        return;
+      const resolve = pendingImageCopies.get(d.reqId);
+      if (!resolve)
+        return;
+      pendingImageCopies.delete(d.reqId);
+      resolve({ blob: d.blob, error: d.error });
+    });
     currentMessage = null;
     currentAccountId = "";
     dragOutUrls = [];
@@ -3909,7 +4048,7 @@ function pickFolder(accountId, opts) {
     const targets = folders.filter((f) => !excluded.has(f.id)).filter((f) => f.specialUse !== "outbox").sort((a, b) => a.path.localeCompare(b.path));
     function render2(filter) {
       listEl.innerHTML = "";
-      const lc = filter.toLowerCase().trim();
+      const lc = foldText(filter.trim());
       let firstMatchSet = false;
       for (const f of targets) {
         const row = document.createElement("div");
@@ -3922,7 +4061,7 @@ function pickFolder(accountId, opts) {
         tag.textContent = f.specialUse || "";
         row.appendChild(name);
         row.appendChild(tag);
-        const matches = !lc || f.path.toLowerCase().includes(lc);
+        const matches = !lc || foldText(f.path).includes(lc) || foldText(f.name).includes(lc);
         if (matches) {
           row.classList.add("match");
           if (!firstMatchSet) {
@@ -3949,6 +4088,7 @@ var init_folder_picker = __esm({
   "client/components/folder-picker.js"() {
     "use strict";
     init_api_client();
+    init_fold_text();
   }
 });
 
@@ -3980,7 +4120,7 @@ __export(message_list_exports, {
   showThreadPopup: () => showThreadPopup
 });
 function setLiveFilter(query) {
-  liveFilterText = (query || "").trim().toLowerCase();
+  liveFilterText = foldText((query || "").trim());
   const body = document.getElementById("ml-body");
   if (body)
     applyLiveFilter(body);
@@ -3993,7 +4133,7 @@ function applyLiveFilter(body) {
     return;
   }
   for (const row of body.querySelectorAll(".ml-row")) {
-    const text = row.textContent?.toLowerCase() || "";
+    const text = foldText(row.textContent);
     row.classList.toggle("filter-hidden", !text.includes(liveFilterText));
   }
 }
@@ -5130,6 +5270,7 @@ var init_message_list = __esm({
     init_message_viewer();
     init_context_menu();
     init_folder_picker();
+    init_fold_text();
     init_mailx_types();
     currentSpecialUse = "";
     lastClickedRow = null;
@@ -7287,7 +7428,7 @@ decides which operators work.</p>
   <tr><td><code>after:1w</code> / <code>before:1m</code></td><td>Newer / older than \u2014 <code>d</code>, <code>w</code>, <code>m</code>, <code>y</code>, a date, <code>today</code>, <code>yesterday</code></td></tr>
   <tr><td><code>has:attachment</code></td><td>Only messages that carry a file attachment</td></tr>
   <tr><td><code>is:unread</code></td><td>Also <code>is:flagged</code>, <code>is:read</code>, <code>is:answered</code>, <code>is:draft</code></td></tr>
-  <tr><td><code>folder:sent</code></td><td>Restrict to folders whose name contains the term</td></tr>
+  <tr><td><code>folder:sent</code></td><td>Restrict to folders whose <em>name or path</em> contains the term \u2014 so <code>folder:rmf</code> and <code>folder:lists/rmf</code> both work</td></tr>
   <tr><td><code>/regex/</code></td><td>Client-side regex over the currently-visible rows. Local only \u2014 never sent to the server.</td></tr>
 </table>
 <p>Any remaining unqualified text is the free-text term.</p>
@@ -7327,6 +7468,11 @@ results only.</p>
 <p>All three modes \u2014 local FTS5, IMAP server SEARCH, and <code>/regex/</code> \u2014
 are <strong>case-insensitive</strong>. <code>Lunch</code>, <code>lunch</code>, and
 <code>LUNCH</code> match the same messages. There is no case-sensitive mode.</p>
+<p>The sidebar <strong>Find folder</strong> box and the <strong>Move to folder</strong>
+picker go further: they also ignore accents, so <code>archiv</code> finds
+<code>\xC4rchiv</code>. Find folder searches every account's whole folder list \u2014
+collapsed folders and collapsed accounts included \u2014 and opens the tree to
+whatever it finds.</p>
 
 <h3>Limitations</h3>
 <ul>
@@ -7475,6 +7621,7 @@ function setActiveView(view, title) {
 }
 
 // client/components/folder-tree.js
+init_fold_text();
 var onFolderSelect;
 var onUnifiedInbox = null;
 var selectedElement;
@@ -7494,6 +7641,29 @@ function collapseDragExpanded() {
   dragAutoExpanded.clear();
   return true;
 }
+var folderFilter = "";
+function setFolderFilter(query) {
+  const next = foldText(query.trim());
+  if (next === folderFilter)
+    return;
+  folderFilter = next;
+  const container = document.getElementById("folder-tree");
+  if (container)
+    loadFolderTree(container);
+}
+function pruneToMatches(nodes, q, forceExpand) {
+  const kept = [];
+  for (const n of nodes) {
+    const selfMatch = foldText(n.name).includes(q) || foldText(n.path).includes(q);
+    const keptChildren = pruneToMatches(n.children, q, forceExpand);
+    if (!selfMatch && keptChildren.length === 0)
+      continue;
+    kept.push({ ...n, children: selfMatch ? n.children : keptChildren });
+    if (keptChildren.length > 0)
+      forceExpand.add(`${n.accountId}:${n.path}`);
+  }
+  return kept;
+}
 var expandState = JSON.parse(localStorage.getItem("mailx-folders-expanded") || "{}");
 function saveExpandState() {
   localStorage.setItem("mailx-folders-expanded", JSON.stringify(expandState));
@@ -7630,10 +7800,10 @@ function sortFolders(nodes) {
       sortFolders(n.children);
   }
 }
-function renderNode(node, container, depth) {
+function renderNode(node, container, depth, forceExpand) {
   const hasChildren = node.children.length > 0;
   const expandKey = `${node.accountId}:${node.path}`;
-  const isExpanded = expandState[expandKey] === true;
+  const isExpanded = forceExpand?.has(expandKey) ? expandState[expandKey] !== false : expandState[expandKey] === true;
   const folderEl = document.createElement("div");
   folderEl.className = "ft-folder";
   folderEl.dataset.accountId = node.accountId;
@@ -7987,7 +8157,7 @@ function renderNode(node, container, depth) {
   container.appendChild(folderEl);
   if (hasChildren && isExpanded) {
     for (const child of node.children) {
-      renderNode(child, container, depth + 1);
+      renderNode(child, container, depth + 1, forceExpand);
     }
   }
 }
@@ -8317,12 +8487,12 @@ async function loadFolderTree(container) {
     const accountFolderData = await Promise.all(accounts.map(async (account) => {
       const accountKey = `account:${account.id}`;
       const accountExpanded = expandState[accountKey] !== false;
-      const folders = accountExpanded ? await getFolders(account.id) : [];
+      const folders = accountExpanded || folderFilter ? await getFolders(account.id) : [];
       return { account, folders };
     }));
     const savedScroll = container.scrollTop;
     const fragment = document.createDocumentFragment();
-    if (accounts.length >= 1) {
+    if (accounts.length >= 1 && (!folderFilter || foldText("All Inboxes").includes(folderFilter))) {
       const unifiedEl = document.createElement("div");
       unifiedEl.className = "ft-folder ft-unified";
       unifiedEl.title = accounts.length > 1 ? "Merged inbox view of all accounts \u2014 click to see messages from every account's INBOX sorted by date" : "Inbox view across all your accounts";
@@ -8339,7 +8509,7 @@ async function loadFolderTree(container) {
       });
       fragment.appendChild(unifiedEl);
     }
-    if (lastOutboxTotal > 0) {
+    if (lastOutboxTotal > 0 && (!folderFilter || foldText("Send-pending").includes(folderFilter))) {
       const pendingEl = document.createElement("div");
       pendingEl.className = "ft-folder ft-unified ft-send-pending";
       pendingEl.id = "ft-send-pending";
@@ -8364,7 +8534,7 @@ async function loadFolderTree(container) {
       const accountEl = document.createElement("div");
       accountEl.className = "ft-account";
       const accountKey = `account:${account.id}`;
-      const accountExpanded = expandState[accountKey] !== false;
+      const accountExpanded = folderFilter ? true : expandState[accountKey] !== false;
       const header = document.createElement("div");
       header.className = "ft-account-header";
       const baseLabel = labelOf(account);
@@ -8372,7 +8542,7 @@ async function loadFolderTree(container) {
       const disambiguator = isDup ? ` (${account.email || account.id})` : "";
       header.textContent = `${accountExpanded ? "\u25BE" : "\u25B8"} ${baseLabel}${disambiguator}`;
       header.addEventListener("click", () => {
-        expandState[accountKey] = !accountExpanded;
+        expandState[accountKey] = expandState[accountKey] === false;
         saveExpandState();
         const treeContainer = document.getElementById("folder-tree");
         if (treeContainer)
@@ -8429,10 +8599,17 @@ async function loadFolderTree(container) {
         showContextMenu(e.clientX, e.clientY, items, { editTarget: e.target });
       });
       accountEl.appendChild(header);
+      let filteredOut = false;
       if (accountExpanded && folders.length > 0) {
         const delimiter = folders[0]?.delimiter || ".";
-        const tree = buildTree(folders, delimiter, account.id);
+        let tree = buildTree(folders, delimiter, account.id);
         sortFolders(tree);
+        const forceExpand = /* @__PURE__ */ new Set();
+        if (folderFilter && !foldText(`${baseLabel} ${account.email || ""} ${account.id}`).includes(folderFilter)) {
+          tree = pruneToMatches(tree, folderFilter, forceExpand);
+          if (tree.length === 0)
+            filteredOut = true;
+        }
         const lowerCounts = /* @__PURE__ */ new Map();
         for (const f of folders) {
           const key = (f.path || "").toLowerCase();
@@ -8443,7 +8620,7 @@ async function loadFolderTree(container) {
           if (c > 1)
             duplicatePaths.add(k);
         for (const node of tree) {
-          renderNode(node, accountEl, 1);
+          renderNode(node, accountEl, 1, forceExpand);
         }
         if (duplicatePaths.size > 0) {
           accountEl.querySelectorAll(".ft-folder").forEach((el) => {
@@ -8454,8 +8631,17 @@ async function loadFolderTree(container) {
             }
           });
         }
+      } else if (folderFilter) {
+        filteredOut = true;
       }
-      fragment.appendChild(accountEl);
+      if (!filteredOut)
+        fragment.appendChild(accountEl);
+    }
+    if (folderFilter && !fragment.querySelector(".ft-folder")) {
+      const empty = document.createElement("div");
+      empty.className = "ft-filter-empty";
+      empty.textContent = `No folder matches "${document.getElementById("ft-filter-input")?.value || folderFilter}"`;
+      fragment.appendChild(empty);
     }
     container.replaceChildren(fragment);
     container.scrollTop = savedScroll;
@@ -10617,36 +10803,22 @@ document.getElementById("search-server-too")?.addEventListener("change", rerunAc
 document.getElementById("search-include-trash")?.addEventListener("change", rerunActiveSearch);
 var ftFilterInput = document.getElementById("ft-filter-input");
 if (ftFilterInput) {
-  ftFilterInput.addEventListener("input", () => {
-    const query = ftFilterInput.value.toLowerCase();
-    const tree = document.getElementById("folder-tree");
-    if (!tree) return;
-    if (!query) {
-      tree.querySelectorAll(".ft-filter-hidden").forEach((el) => el.classList.remove("ft-filter-hidden"));
-      return;
-    }
-    const folders = tree.querySelectorAll(".ft-folder");
-    const accounts = tree.querySelectorAll(".ft-account");
-    for (const acct of accounts) acct.classList.add("ft-filter-hidden");
-    for (const f of folders) f.classList.add("ft-filter-hidden");
-    for (const f of folders) {
-      const name = f.querySelector(".ft-folder-name")?.textContent?.toLowerCase() || "";
-      if (name.includes(query)) {
-        f.classList.remove("ft-filter-hidden");
-        const acct = f.closest(".ft-account");
-        if (acct) acct.classList.remove("ft-filter-hidden");
-      }
-    }
-    const unified = tree.querySelector(".ft-unified");
-    if (unified) {
-      const text = unified.textContent?.toLowerCase() || "";
-      unified.classList.toggle("ft-filter-hidden", !text.includes(query));
-    }
-  });
+  let ftFilterTimer = null;
+  const FT_FILTER_DEBOUNCE_MS = 120;
+  const applyFolderFilter = (immediate) => {
+    if (ftFilterTimer) {
+      clearTimeout(ftFilterTimer);
+      ftFilterTimer = null;
+    }
+    const run = () => setFolderFilter(ftFilterInput.value);
+    if (immediate) run();
+    else ftFilterTimer = setTimeout(run, FT_FILTER_DEBOUNCE_MS);
+  };
+  ftFilterInput.addEventListener("input", () => applyFolderFilter(false));
   ftFilterInput.addEventListener("keydown", (e) => {
     if (e.key === "Escape") {
       ftFilterInput.value = "";
-      ftFilterInput.dispatchEvent(new Event("input"));
+      applyFolderFilter(true);
     }
   });
 }