@bobfrankston/rmfmail 1.2.224 → 1.2.226

package/client/android-bootstrap.bundle.js

@@ -2418,6 +2418,8 @@ __export(mailx_types_exports, {
   answeredOf: () => answeredOf,
   deletedOf: () => deletedOf,
   draftOf: () => draftOf,
+  encodeAddressHeader: () => encodeAddressHeader,
+  encodeHeaderWord: () => encodeHeaderWord,
   encodeQuotedPrintable: () => encodeQuotedPrintable,
   expandRecipients: () => expandRecipients,
   extractAddress: () => extractAddress,
@@ -2476,6 +2478,71 @@ function sanitizeHtml(html) {
   clean = clean.replace(/<iframe\b[^>]*>[\s\S]*?<\/iframe>/gi, "");
   return { html: clean, hasRemoteContent };
 }
+function encodeHeaderWord(text) {
+  if (!text)
+    return "";
+  if (!/[^\x00-\x7F]/.test(text))
+    return text;
+  const encoder = new TextEncoder();
+  const MAX_BYTES_PER_WORD = 45;
+  const words = [];
+  let chunk = [];
+  for (const ch of text) {
+    const bytes = Array.from(encoder.encode(ch));
+    if (chunk.length + bytes.length > MAX_BYTES_PER_WORD) {
+      words.push(chunk);
+      chunk = [];
+    }
+    chunk.push(...bytes);
+  }
+  if (chunk.length)
+    words.push(chunk);
+  return words.map((b) => `=?UTF-8?B?${bytesToBase64(Uint8Array.from(b))}?=`).join("\r\n ");
+}
+function bytesToBase64(bytes) {
+  let bin = "";
+  for (const b of bytes)
+    bin += String.fromCharCode(b);
+  return btoa(bin);
+}
+function encodeAddressHeader(value) {
+  if (!value)
+    return "";
+  if (!/[^\x00-\x7F]/.test(value))
+    return value;
+  const parts = [];
+  let cur = "";
+  let inAngle = false;
+  let inQuote = false;
+  for (const ch of value) {
+    if (ch === '"')
+      inQuote = !inQuote;
+    else if (ch === "<" && !inQuote)
+      inAngle = true;
+    else if (ch === ">" && !inQuote)
+      inAngle = false;
+    if (ch === "," && !inAngle && !inQuote) {
+      parts.push(cur);
+      cur = "";
+      continue;
+    }
+    cur += ch;
+  }
+  if (cur.trim())
+    parts.push(cur);
+  return parts.map((part) => {
+    const p = part.trim();
+    const m = /^(.*?)\s*(<[^>]*>)\s*$/.exec(p);
+    if (!m)
+      return p;
+    const display = m[1].replace(/^"(.*)"$/s, "$1");
+    if (!display)
+      return m[2];
+    if (!/[^\x00-\x7F]/.test(display))
+      return p;
+    return `${encodeHeaderWord(display)} ${m[2]}`;
+  }).join(", ");
+}
 function encodeQuotedPrintable(text) {
   const encoder = new TextEncoder();
   const bytes = encoder.encode(text);
@@ -6246,7 +6313,7 @@ var WebMailxService = class _WebMailxService {
       `To: ${to}`,
       cc ? `Cc: ${cc}` : null,
       bcc ? `Bcc: ${bcc}` : null,
-      `Subject: ${msg.subject}`,
+      `Subject: ${encodeHeaderWord(msg.subject)}`,
       `Date: ${(/* @__PURE__ */ new Date()).toUTCString()}`,
       `Message-ID: ${messageId}`,
       msg.inReplyTo ? `In-Reply-To: ${msg.inReplyTo}` : null,
@@ -6400,7 +6467,7 @@ ${inner.body}`;
       to ? `To: ${to}` : null,
       cc ? `Cc: ${cc}` : null,
       bcc ? `Bcc: ${bcc}` : null,
-      `Subject: ${subject || "(no subject)"}`,
+      `Subject: ${encodeHeaderWord(subject || "(no subject)")}`,
       `Date: ${(/* @__PURE__ */ new Date()).toUTCString()}`,
       `X-Mailx-Draft-ID: ${id}`,
       `MIME-Version: 1.0`,
@@ -6649,8 +6716,21 @@ ${bodyEncoded}`;
     return this.notImpl("openAttachment");
   }
   // Spam / abuse
-  async markAsSpamMessages(_accountId, _uids) {
-    return this.notImpl("markAsSpamMessages");
+  /** Mark as spam = move to the account's \Junk folder, exactly as desktop's
+   *  MailxService.markAsSpamMessages does. This was a notImpl() stub, which
+   *  is worse than it sounds: the client optimistically removes the rows
+   *  from the list BEFORE calling this, then only writes the rejection to
+   *  the status bar. So on Android the spam button looked like it worked,
+   *  nothing moved on the server, and the next sync brought every message
+   *  straight back (Bob 2026-08-07: "attempts to delete spam but they keep
+   *  coming back"). moveMessages was implemented all along — spam just never
+   *  got wired to it. */
+  async markAsSpamMessages(accountId, uids) {
+    const target = this.db.getFolders(accountId).find((f) => f.specialUse === "junk");
+    if (!target)
+      throw new Error(`No \\Junk/\\Spam folder found for ${accountId}`);
+    await this.moveMessages(accountId, uids, target.id);
+    return { targetFolderId: target.id, moved: uids.length };
   }
   async recordSpamReport(_accountId, _uid, _folderId) {
     return this.notImpl("recordSpamReport");