@bobfrankston/rmfmail 1.2.193 → 1.2.195

package/client/compose/compose.bundle.js

@@ -3568,6 +3568,23 @@ function markdownToEmailHtml(md) {
   }
   return out.join("\n");
 }
+function looksLikeHtml(text) {
+  if (!text || text.length > 5e5)
+    return false;
+  const t = text.trim();
+  if (!t.startsWith("<"))
+    return false;
+  if (!/^<(!doctype|html|head|body|div|p|table|ul|ol|li|h[1-6]|blockquote|section|article|header|footer|span|b|i|strong|em|a|img|br|hr|pre|code|font|center)\b/i.test(t))
+    return false;
+  return /<\/[a-z][a-z0-9]*\s*>/i.test(t) || /^<(img|br|hr|!doctype)\b/i.test(t);
+}
+function sanitizeHtmlSource(html) {
+  let t = html;
+  const bm = t.match(/<body[^>]*>([\s\S]*?)<\/body>/i);
+  if (bm)
+    t = bm[1];
+  return t.replace(/<script\b[\s\S]*?<\/script\s*>/gi, "").replace(/<style\b[\s\S]*?<\/style\s*>/gi, "").replace(/\son[a-z]+\s*=\s*("[^"]*"|'[^']*'|[^\s>]+)/gi, "").replace(/\s(href|src)\s*=\s*(["']?)\s*javascript:[^"'\s>]*\2/gi, "");
+}
 function wireMarkdownPaste(target, insertHtml) {
   target.addEventListener("paste", (e) => {
     try {
@@ -3579,11 +3596,18 @@ function wireMarkdownPaste(target, insertHtml) {
       if (Array.from(cb.items).some((it) => it.kind === "file"))
         return;
       const plain = cb.getData("text/plain");
-      if (!plain || !looksLikeMarkdown(plain))
+      if (!plain)
+        return;
+      let converted = null;
+      if (looksLikeHtml(plain))
+        converted = sanitizeHtmlSource(plain);
+      else if (looksLikeMarkdown(plain))
+        converted = markdownToEmailHtml(plain);
+      if (converted === null)
         return;
       e.preventDefault();
       e.stopImmediatePropagation();
-      insertHtml(markdownToEmailHtml(plain));
+      insertHtml(converted);
     } catch {
     }
   }, true);
@@ -4035,6 +4059,14 @@ function createQuillEditor(container2) {
       }
       return;
     }
+    if (plain && looksLikeHtml(plain)) {
+      consume();
+      const range = q.getSelection(true) || { index: q.getLength(), length: 0 };
+      if (range.length > 0)
+        q.deleteText(range.index, range.length);
+      q.clipboard.dangerouslyPasteHTML(range.index, sanitizeHtmlSource(plain));
+      return;
+    }
     if (plain && looksLikeMarkdown(plain)) {
       consume();
       const range = q.getSelection(true) || { index: q.getLength(), length: 0 };
@@ -6150,8 +6182,9 @@ document.getElementById("btn-edit-in-word")?.addEventListener("click", async ()
       return;
     }
     const label = result.opener === "word" ? "Word" : result.opener === "libreoffice" ? "LibreOffice" : "your default editor";
-    showDraftStatus(`Editing in ${label} \u2014 saves there will reload here.`, false);
-    showExternalEditHint(label);
+    const isDocx = /\.docx$/i.test(result.path || "");
+    showDraftStatus(`Editing in ${label} \u2014 Ctrl+S there and the message updates here automatically.`, false);
+    if (!isDocx) showExternalEditHint(label);
   } catch (e) {
     showDraftStatus(`Edit-in-Word failed: ${e?.message || e}`, true);
   }
@@ -6257,7 +6290,7 @@ function showExternalEditHint(editorLabel) {
         <div style="font-weight:600;font-size:16px;margin-bottom:10px;">Editing in ${escapeHtml(editorLabel)}</div>
         <ol style="margin:0 0 12px 18px;padding:0;">
             <li>Edit your message in <b>${escapeHtml(editorLabel)}</b>.</li>
-            <li>Save (<b>Ctrl+S</b>). Today, choose <b>"Web Page, Filtered (.htm)"</b> if Word asks for a format \u2014 keep the same filename.</li>
+            <li>Save (<b>Ctrl+S</b>). Choose <b>"Web Page, Filtered (.htm)"</b> if asked for a format \u2014 keep the same filename.</li>
             <li>Switch back to this window (<b>Alt+Tab</b>). The body will reload here.</li>
             <li>Click <b>Send</b> in this window when ready.</li>
         </ol>