@bobfrankston/rmfmail 1.2.331 → 1.2.335

package/client/compose/compose.bundle.js

@@ -3022,14 +3022,34 @@ async function createTinyMceEditor(container2, opts = {}) {
           };
           reader.readAsDataURL(file);
         });
+        const restoreBlobSrcs = (html) => html.replace(/src="(blob:[^"]+)"/g, (m, uri) => {
+          const info = ed.editorUpload?.blobCache?.getByUri?.(uri);
+          return info ? `src="data:${info.blob().type};base64,${info.base64()}"` : m;
+        });
         ed.on("GetContent", (e) => {
           if (!e?.content || typeof e.content !== "string" || !e.content.includes("blob:"))
             return;
-          e.content = e.content.replace(/src="(blob:[^"]+)"/g, (m, uri) => {
-            const info = ed.editorUpload?.blobCache?.getByUri?.(uri);
-            return info ? `src="data:${info.blob().type};base64,${info.base64()}"` : m;
-          });
+          e.content = restoreBlobSrcs(e.content);
         });
+        const copyWithImageData = (e) => {
+          if (!e?.clipboardData)
+            return;
+          let html = "";
+          try {
+            html = ed.selection.getContent({ format: "html" }) || "";
+          } catch {
+            return;
+          }
+          if (!html.includes("blob:"))
+            return;
+          e.preventDefault();
+          e.clipboardData.setData("text/html", restoreBlobSrcs(html));
+          e.clipboardData.setData("text/plain", ed.selection.getContent({ format: "text" }) || "");
+          if (e.type === "cut")
+            ed.execCommand("Delete");
+        };
+        ed.on("copy", copyWithImageData);
+        ed.on("cut", copyWithImageData);
         ed.on("OpenWindow", () => {
           requestAnimationFrame(() => requestAnimationFrame(() => {
             const ta = document.querySelector(".tox-dialog textarea");
@@ -5367,6 +5387,43 @@ function keepTypingOutsideLinks(native) {
 // client/compose/compose.ts
 init_api_client();
 init_edit_commands();
+
+// packages/mailx-types/log-changes.js
+var RESTATE_AFTER_MS = 60 * 60 * 1e3;
+
+// packages/mailx-types/reminder-state.js
+var DISMISSED_RETENTION_MS = 30 * 864e5;
+var SNOOZED_RETENTION_MS = 7 * 864e5;
+
+// packages/mailx-types/index.js
+function htmlToPlainText(html) {
+  if (!html)
+    return "";
+  let s = html;
+  s = s.replace(/<style\b[^>]*>[\s\S]*?<\/style>/gi, "");
+  s = s.replace(/<script\b[^>]*>[\s\S]*?<\/script>/gi, "");
+  s = s.replace(/<br\s*\/?\s*>/gi, "\n");
+  s = s.replace(/<\/(p|div|li|tr|h[1-6]|blockquote|pre|section|article)\s*>/gi, "\n");
+  s = s.replace(/<li\b[^>]*>/gi, "  \u2022 ");
+  s = s.replace(/<a\b[^>]*href\s*=\s*(['"])([^'"]*)\1[^>]*>([\s\S]*?)<\/a>/gi, (_m, _q, href, text) => {
+    const t = text.replace(/<[^>]+>/g, "").trim();
+    return t && t !== href ? `${t} (${href})` : href;
+  });
+  s = s.replace(/<img\b[^>]*>/gi, (tag) => {
+    const src = (tag.match(/\bsrc\s*=\s*(['"])([^'"]*)\1/i) || [])[2]?.trim() || "";
+    const alt = (tag.match(/\balt\s*=\s*(['"])([^'"]*)\1/i) || [])[2]?.trim() || "";
+    const remote = /^https?:\/\//i.test(src);
+    if (remote)
+      return alt ? `[image: ${alt}] (${src})` : `(${src})`;
+    return alt ? `[image: ${alt}]` : "[image]";
+  });
+  s = s.replace(/<[^>]+>/g, "");
+  s = s.replace(/&nbsp;/gi, " ").replace(/&amp;/gi, "&").replace(/&lt;/gi, "<").replace(/&gt;/gi, ">").replace(/&quot;/gi, '"').replace(/&#39;/gi, "'").replace(/&apos;/gi, "'").replace(/&mdash;/gi, "\u2014").replace(/&ndash;/gi, "\u2013").replace(/&hellip;/gi, "\u2026").replace(/&#(\d+);/g, (_m, n) => String.fromCodePoint(parseInt(n, 10))).replace(/&#x([0-9a-f]+);/gi, (_m, h) => String.fromCodePoint(parseInt(h, 16)));
+  s = s.replace(/[ \t]+/g, " ").split("\n").map((l) => l.replace(/^[ \t]+|[ \t]+$/g, "")).join("\n").replace(/\n{3,}/g, "\n\n").trim();
+  return s;
+}
+
+// client/compose/compose.ts
 init_context_menu();
 installConsoleCapture();
 connectEvents();
@@ -5560,6 +5617,7 @@ async function tryEditor(type) {
       }
     } catch {
     }
+    if (ed) wirePasteImageInlining(ed, type);
     return ed;
   } catch (e) {
     logClientEvent("compose-editor-create-failed", { type, error: String(e?.message || e) });
@@ -5943,7 +6001,7 @@ function setupAutocomplete(input) {
     before = before.replace(/[ \t,]+$/, "");
     if (contact) {
       const haystack = `${contact.name} ${contact.email}`.toLowerCase();
-      const stripStranded = (s) => splitRecipients(s).map((p) => p.trim()).filter((p) => p.length > 0 && (p.includes("@") || !haystack.includes(p.toLowerCase()))).join(", ");
+      const stripStranded = (s) => splitRecipients2(s).map((p) => p.trim()).filter((p) => p.length > 0 && (p.includes("@") || !haystack.includes(p.toLowerCase()))).join(", ");
       if (before) before = stripStranded(before);
       const afterCore = after.replace(/^[\s,]+/, "").replace(/[\s,]+$/, "");
       if (afterCore) {
@@ -6097,7 +6155,7 @@ for (const field of [toInput, ccInput, bccInput, subjectInput]) {
     smartTab(field);
   });
 }
-function splitRecipients(s) {
+function splitRecipients2(s) {
   const raw = [];
   let cur = "", inQuote = false;
   for (const c of s) {
@@ -6145,7 +6203,7 @@ function formatAddrs(addrs) {
 }
 function parseAddrs(s) {
   if (!s.trim()) return [];
-  return splitRecipients(s).map((p) => p.trim()).filter((p) => p.length > 0).map((part) => {
+  return splitRecipients2(s).map((p) => p.trim()).filter((p) => p.length > 0).map((part) => {
     const match = part.match(/^(.+?)\s*<(.+?)>$/);
     if (match) {
       let name = match[1].trim();
@@ -6457,7 +6515,7 @@ async function saveDraft2() {
       from: getFromAddress(),
       subject: subjectInput.value,
       bodyHtml: editor.getHtml(),
-      bodyText: editor.getText(),
+      bodyText: htmlToPlainText(editor.getHtml()),
       to: toInput.value,
       cc: ccInput.value,
       bcc: bccInput.value,
@@ -6495,6 +6553,29 @@ function editorBodyEl() {
   return document.querySelector(".ql-editor") || document.querySelector(".tt-content .tiptap");
 }
 var INLINE_CHECKED_ATTR = "data-mailx-inline-checked";
+function wirePasteImageInlining(ed, type) {
+  const onPaste = () => {
+    const body2 = editorBodyEl();
+    if (!body2) return;
+    for (const img of Array.from(body2.querySelectorAll(`img:not([${INLINE_CHECKED_ATTR}])`))) {
+      img.setAttribute(INLINE_CHECKED_ATTR, "1");
+    }
+    setTimeout(() => {
+      void inlinePastedRemoteImages();
+    }, 50);
+    setTimeout(() => {
+      void inlinePastedRemoteImages();
+    }, 800);
+  };
+  const native = ed?.nativeEditor;
+  if (type === "tinymce" && native?.on) {
+    native.on("paste", onPaste);
+    return;
+  }
+  const body = editorBodyEl();
+  if (body) body.addEventListener("paste", onPaste);
+  else console.error("[compose] paste-image inlining not wired: no editor body");
+}
 async function inlinePastedRemoteImages() {
   const body = editorBodyEl();
   if (!body) return;
@@ -6516,7 +6597,6 @@ async function inlinePastedRemoteImages() {
 }
 function scheduleDraftSave() {
   markComposeDirty();
-  void inlinePastedRemoteImages();
   if (draftDebounceTimer) clearTimeout(draftDebounceTimer);
   draftDebounceTimer = setTimeout(() => {
     draftDebounceTimer = null;
@@ -6706,7 +6786,7 @@ document.getElementById("btn-send")?.addEventListener("click", async () => {
     bcc: parseAddrs(bccExpanded),
     subject: subjectInput.value,
     bodyHtml: editor.getHtml(),
-    bodyText: editor.getText(),
+    bodyText: htmlToPlainText(editor.getHtml()),
     attachments: attachments.map((a) => ({ filename: a.filename, mimeType: a.mimeType, dataBase64: a.dataBase64 })),
     // Threading headers — daemon writes In-Reply-To and References into
     // the outgoing MIME from these. Without them every reply lands as a