@bobfrankston/rmfmail 1.1.69 → 1.1.71

package/client/compose/compose.bundle.js

@@ -3647,12 +3647,12 @@ function setupAutocomplete(input) {
   }
   function getLastToken() {
     const val = input.value;
-    const lastComma = val.lastIndexOf(",");
+    const lastComma = lastUnquotedComma(val);
     return val.substring(lastComma + 1).trim();
   }
   function replaceLastToken(replacement) {
     const val = input.value;
-    const lastComma = val.lastIndexOf(",");
+    const lastComma = lastUnquotedComma(val);
     const prefix = lastComma >= 0 ? val.substring(0, lastComma + 1) + " " : "";
     input.value = prefix + replacement + ", ";
     closeDropdown();
@@ -3729,7 +3729,7 @@ function setupAutocomplete(input) {
             item.addEventListener("mousedown", (e) => {
               e.preventDefault();
               if (e.button !== 0) return;
-              const display = r.name ? `${r.name} <${r.email}>` : r.email;
+              const display = formatRecipient(r.name, r.email);
               replaceLastToken(display);
             });
             item.addEventListener("contextmenu", (e) => {
@@ -3786,14 +3786,48 @@ function setupAutocomplete(input) {
 setupAutocomplete(toInput);
 setupAutocomplete(ccInput);
 setupAutocomplete(bccInput);
+function splitRecipients(s) {
+  const out = [];
+  let cur = "", inQuote = false;
+  for (const c of s) {
+    if (c === '"') {
+      inQuote = !inQuote;
+      cur += c;
+    } else if (c === "," && !inQuote) {
+      out.push(cur);
+      cur = "";
+    } else cur += c;
+  }
+  out.push(cur);
+  return out;
+}
+function lastUnquotedComma(s) {
+  let inQuote = false, last = -1;
+  for (let i = 0; i < s.length; i++) {
+    if (s[i] === '"') inQuote = !inQuote;
+    else if (s[i] === "," && !inQuote) last = i;
+  }
+  return last;
+}
+function formatRecipient(name, address) {
+  if (!name) return address;
+  const quoted = /[,"]/.test(name) ? `"${name.replace(/"/g, "'")}"` : name;
+  return `${quoted} <${address}>`;
+}
 function formatAddrs(addrs) {
-  return addrs.map((a) => a.name ? `${a.name} <${a.address}>` : a.address).join(", ");
+  return addrs.map((a) => formatRecipient(a.name, a.address)).join(", ");
 }
 function parseAddrs(s) {
   if (!s.trim()) return [];
-  return s.split(",").map((p) => p.trim()).filter((p) => p.length > 0).map((part) => {
+  return splitRecipients(s).map((p) => p.trim()).filter((p) => p.length > 0).map((part) => {
     const match = part.match(/^(.+?)\s*<(.+?)>$/);
-    if (match) return { name: match[1].trim(), address: match[2].trim() };
+    if (match) {
+      let name = match[1].trim();
+      if (name.length >= 2 && name.startsWith('"') && name.endsWith('"')) {
+        name = name.slice(1, -1);
+      }
+      return { name, address: match[2].trim() };
+    }
     return { name: "", address: part };
   });
 }