@bobfrankston/rmfmail 1.2.223 → 1.2.225

package/client/app.bundle.js

@@ -306,8 +306,8 @@ function hasBccHistoryTo(email) {
 function listContacts(query, page = 1, pageSize = 100) {
   return ipc().listContacts(query, page, pageSize);
 }
-function upsertContact(name, email) {
-  return ipc().upsertContact(name, email);
+function upsertContact(name, email, fields) {
+  return ipc().upsertContact(name, email, fields);
 }
 function deleteContact(email) {
   return ipc().deleteContact(email);
@@ -970,10 +970,15 @@ function removeMessages(uids, currentlyFocused) {
     nextSurvivor: nextSurvivor ? { accountId: nextSurvivor.accountId, uid: nextSurvivor.uid, folderId: nextSurvivor.folderId } : null
   };
 }
-function updateMessageFlags(accountId, uid, flags) {
-  const msg = messages.find((m) => m.uid === uid && m.accountId === accountId);
-  if (msg)
-    msg.flags = flags;
+function updateMessageFlags(accountId, uid, flags, folderId) {
+  const candidates = messages.filter((m) => m.uid === uid && m.accountId === accountId && (folderId === void 0 || m.folderId === folderId));
+  if (candidates.length === 1) {
+    candidates[0].flags = flags;
+    return;
+  }
+  if (candidates.length > 1) {
+    console.warn(`[message-state] ambiguous flag update ${accountId}/uid=${uid} \u2014 ${candidates.length} folders match; caller must pass folderId`);
+  }
 }
 var messages, listeners;
 var init_message_state = __esm({
@@ -1127,13 +1132,13 @@ async function openAddressBook(prefillSearch) {
                 <span class="ab-actions"></span>
             </div>` + items.map((c) => `
             <div class="ab-row" data-email="${escapeAttr(c.email)}">
-                <span class="ab-name">${escapeHtml(c.name || "")}</span>
+                <span class="ab-name" title="${escapeAttr(cardSummary(c))}">${escapeHtml(c.name || "")}${cardSummary(c) ? ' <span class="ab-hascard" aria-hidden="true">\u2022</span>' : ""}</span>
                 <span class="ab-email">${escapeHtml(c.email)}</span>
                 <span class="ab-source">${escapeHtml(c.source)}</span>
                 <span class="ab-count-cell">${c.useCount || 0}</span>
                 <span class="ab-last">${fmtDate(c.lastUsed)}</span>
                 <span class="ab-actions">
-                    <button type="button" class="ab-edit" title="Edit name">\u270E</button>
+                    <button type="button" class="ab-edit" title="Edit contact">\u270E</button>
                     <button type="button" class="ab-del" title="Delete">\u{1F5D1}</button>
                     <button type="button" class="ab-mail" title="Compose to">\u2709</button>
                 </span>
@@ -1146,38 +1151,76 @@ async function openAddressBook(prefillSearch) {
       row.querySelector(".ab-mail")?.addEventListener("click", () => composeTo(c));
     });
   };
-  const beginEdit = (row, c) => {
+  const beginEdit = (_row, c) => {
     if (editingEmail === c.email)
       return;
     editingEmail = c.email;
-    const nameSpan = row.querySelector(".ab-name");
-    const original = c.name || "";
-    nameSpan.innerHTML = `<input type="text" value="${escapeAttr(original)}" class="ab-name-input">`;
-    const inp = nameSpan.querySelector("input");
-    inp.focus();
-    inp.select();
-    const commit = async () => {
-      const newName = inp.value.trim();
-      if (newName !== original) {
-        try {
-          await upsertContact(newName, c.email);
-          c.name = newName;
-        } catch (e) {
-          alert(`Update failed: ${e?.message || e}`);
-        }
-      }
-      nameSpan.textContent = c.name || "";
+    const back = document.createElement("div");
+    back.className = "mailx-modal-backdrop";
+    const card = document.createElement("div");
+    card.className = "mailx-modal";
+    card.innerHTML = `
+            <div class="mailx-modal-title">
+                <span class="mailx-modal-title-text">Edit contact</span>
+                <button type="button" class="mailx-modal-close" data-role="x" title="Close (Esc)" aria-label="Close">&times;</button>
+            </div>
+            <div class="ab-card">
+                <label class="ab-field"><span>Name</span>
+                    <input type="text" class="mailx-modal-input" data-field="name" value="${escapeAttr(c.name || "")}"></label>
+                <label class="ab-field"><span>Email</span>
+                    <input type="email" class="mailx-modal-input" value="${escapeAttr(c.email)}" disabled
+                           title="The address identifies the contact \u2014 delete and re-add to change it"></label>
+                ${CONTACT_FIELDS.map((f) => `
+                <label class="ab-field"><span>${escapeHtml(f.label)}</span>
+                    ${f.multiline ? `<textarea class="mailx-modal-input" rows="2" data-field="${f.key}">${escapeHtml(c[f.key] || "")}</textarea>` : `<input type="${f.type || "text"}" class="mailx-modal-input" data-field="${f.key}"
+                                  value="${escapeAttr(c[f.key] || "")}"
+                                  ${f.placeholder ? `placeholder="${escapeAttr(f.placeholder)}"` : ""}>`}
+                </label>`).join("")}
+            </div>
+            <div class="mailx-modal-buttons">
+                <span class="mailx-modal-spacer"></span>
+                <button type="button" class="mailx-modal-btn" data-role="cancel">Cancel</button>
+                <button type="button" class="mailx-modal-btn mailx-modal-btn-primary" data-role="save">Save</button>
+            </div>`;
+    back.appendChild(card);
+    document.body.appendChild(back);
+    card.querySelector('[data-field="name"]')?.focus();
+    const shut = () => {
+      back.remove();
+      document.removeEventListener("keydown", onCardKey, true);
       editingEmail = null;
     };
-    inp.addEventListener("blur", commit);
-    inp.addEventListener("keydown", (e) => {
-      if (e.key === "Enter") {
-        e.preventDefault();
-        inp.blur();
-      } else if (e.key === "Escape") {
+    const onCardKey = (e) => {
+      if (e.key === "Escape") {
+        e.stopPropagation();
         e.preventDefault();
-        inp.value = original;
-        inp.blur();
+        shut();
+      }
+    };
+    document.addEventListener("keydown", onCardKey, true);
+    card.querySelector('[data-role="x"]')?.addEventListener("click", shut);
+    card.querySelector('[data-role="cancel"]')?.addEventListener("click", shut);
+    back.addEventListener("mousedown", (e) => {
+      if (e.target === back)
+        shut();
+    });
+    card.querySelector('[data-role="save"]')?.addEventListener("click", async () => {
+      const val = (k) => card.querySelector(`[data-field="${k}"]`)?.value.trim() ?? "";
+      const fields = {};
+      for (const f of CONTACT_FIELDS)
+        fields[f.key] = val(f.key);
+      const newName = val("name");
+      const bd = fields.birthday;
+      if (bd && !/^(\d{4}|-)-\d{2}-\d{2}$/.test(bd)) {
+        alert(`Birthday must be YYYY-MM-DD, or --MM-DD when the year is unknown. Got "${bd}".`);
+        return;
+      }
+      try {
+        await upsertContact(newName, c.email, fields);
+        shut();
+        await reload();
+      } catch (e) {
+        alert(`Update failed: ${e?.message || e}`);
       }
     });
   };
@@ -1262,17 +1305,29 @@ async function openAddressBook(prefillSearch) {
   });
   await reload();
 }
+function cardSummary(c) {
+  return CONTACT_FIELDS.map((f) => ({ label: f.label, value: (c[f.key] || "").trim() })).filter((x) => x.value).map((x) => `${x.label}: ${x.value.replace(/\s+/g, " ")}`).join("\n");
+}
 function escapeHtml(s) {
   return s.replace(/[&<>"']/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[c]);
 }
 function escapeAttr(s) {
   return escapeHtml(s);
 }
-var isOpen;
+var CONTACT_FIELDS, isOpen;
 var init_address_book = __esm({
   "client/components/address-book.js"() {
     "use strict";
     init_api_client();
+    CONTACT_FIELDS = [
+      { key: "organization", label: "Company" },
+      { key: "title", label: "Job title" },
+      { key: "phone", label: "Phone", type: "tel" },
+      { key: "website", label: "Website", type: "url", placeholder: "https://" },
+      { key: "birthday", label: "Birthday", placeholder: "YYYY-MM-DD or --MM-DD" },
+      { key: "address", label: "Address", multiline: true },
+      { key: "notes", label: "Notes", multiline: true }
+    ];
     isOpen = false;
   }
 });
@@ -1889,11 +1944,11 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
           setSeen(msg, true);
           updateFlags(accountId, uid, msg.flags, msg.folderId);
           try {
-            updateMessageFlags(accountId, uid, msg.flags);
+            updateMessageFlags(accountId, uid, msg.flags, msg.folderId);
           } catch {
           }
           try {
-            setRowSeen(accountId, uid, true);
+            setRowSeen(accountId, uid, true, msg.folderId);
           } catch {
           }
         };
@@ -3635,8 +3690,26 @@ async function refreshPriorityIndex() {
   } catch {
   }
 }
-function rowKey(accountId, uid) {
-  return `${accountId}:${uid}`;
+function rowKey(accountId, uid, folderId) {
+  return `${accountId}:${folderId ?? ""}:${uid}`;
+}
+function findRow(accountId, uid, folderId) {
+  if (folderId !== void 0 && folderId !== null) {
+    const exact = rowByKey.get(rowKey(accountId, uid, folderId));
+    if (exact)
+      return exact;
+  }
+  const hits = [];
+  for (const row of rowByKey.values()) {
+    if (row.accountId === accountId && row.msg.uid === uid)
+      hits.push(row);
+  }
+  if (hits.length === 1)
+    return hits[0];
+  if (hits.length > 1) {
+    console.warn(`[message-list] ambiguous row lookup ${accountId}/uid=${uid} \u2014 ${hits.length} folders match; caller must pass folderId`);
+  }
+  return void 0;
 }
 function focusRow(row, opts = {}) {
   const body = row.el.parentElement;
@@ -3670,26 +3743,26 @@ function getCurrentFocused() {
   return focusedRow ? focusedRow.msg : null;
 }
 function focusByIdentity(accountId, uid, opts = {}) {
-  const row = rowByKey.get(rowKey(accountId, uid));
+  const row = findRow(accountId, uid, opts.folderId);
   if (!row)
     return false;
   focusRow(row, opts);
   return true;
 }
-function setRowFlagged(accountId, uid, yes) {
-  const row = rowByKey.get(rowKey(accountId, uid));
+function setRowFlagged(accountId, uid, yes, folderId) {
+  const row = findRow(accountId, uid, folderId);
   if (row)
     row.setFlaggedClass(yes);
 }
-function setRowSeen(accountId, uid, yes) {
-  const row = rowByKey.get(rowKey(accountId, uid));
+function setRowSeen(accountId, uid, yes, folderId) {
+  const row = findRow(accountId, uid, folderId);
   if (row)
     row.setUnreadClass(!yes);
 }
 function selectedRows() {
   const out = [];
   for (const s of getSelectedMessages()) {
-    const row = rowByKey.get(rowKey(s.accountId, s.uid));
+    const row = findRow(s.accountId, s.uid, s.folderId);
     if (row)
       out.push(row);
   }
@@ -3699,7 +3772,7 @@ function visibleRowObjs() {
   const body = document.getElementById("ml-body");
   if (!body)
     return [];
-  return Array.from(body.querySelectorAll(".ml-row:not(.filter-hidden)")).map((el) => rowByKey.get(rowKey(el.dataset.accountId || "", Number(el.dataset.uid)))).filter((r) => !!r);
+  return Array.from(body.querySelectorAll(".ml-row:not(.filter-hidden)")).map((el) => rowByKey.get(rowKey(el.dataset.accountId || "", Number(el.dataset.uid), el.dataset.folderId))).filter((r) => !!r);
 }
 function bulkTargets() {
   const sel = selectedRows();
@@ -3865,6 +3938,9 @@ function releaseFocus() {
   const body = document.getElementById("ml-body");
   body?.querySelectorAll(".ml-row.selected").forEach((r) => r.classList.remove("selected"));
   clearViewer();
+  document.body.classList.remove("viewer-fullscreen");
+  document.getElementById("message-viewer")?.classList.remove("narrow-active");
+  document.getElementById("message-list")?.classList.remove("narrow-hidden");
   document.dispatchEvent(new CustomEvent("mailx-focus-changed", { detail: null }));
 }
 function markBodiesCached(items) {
@@ -4092,7 +4168,7 @@ function removeMessagesAndReconcile(uids) {
       const el = row;
       const key = `${el.dataset.accountId}:${el.dataset.folderId}:${el.dataset.uid}`;
       if (!stateUids.has(key)) {
-        const dead = rowByKey.get(rowKey(el.dataset.accountId || "", Number(el.dataset.uid)));
+        const dead = rowByKey.get(rowKey(el.dataset.accountId || "", Number(el.dataset.uid), el.dataset.folderId));
         if (dead && dead.el === el)
           dead.detach();
         else
@@ -4105,12 +4181,12 @@ function removeMessagesAndReconcile(uids) {
   }
   if (outcome.focusedWasRemoved) {
     const survivor = outcome.nextSurvivor;
-    if (survivor && focusByIdentity(survivor.accountId, survivor.uid)) {
+    if (survivor && focusByIdentity(survivor.accountId, survivor.uid, { folderId: survivor.folderId })) {
       return;
     }
     const remaining = getMessages2();
     for (const m of remaining) {
-      if (focusByIdentity(m.accountId, m.uid))
+      if (focusByIdentity(m.accountId, m.uid, { folderId: m.folderId }))
         return;
     }
     releaseFocus();
@@ -4860,7 +4936,7 @@ var init_message_list = __esm({
       /** Insert this row into a list body and register it in the lookup map. */
       attach(body) {
         body.appendChild(this.el);
-        rowByKey.set(rowKey(this.accountId, this.msg.uid), this);
+        rowByKey.set(rowKey(this.accountId, this.msg.uid, this.msg.folderId), this);
       }
       /** Remove this row from the DOM and the lookup map. If it was the
        *  focused row, the controller is responsible for releasing focus
@@ -4868,7 +4944,7 @@ var init_message_list = __esm({
        *  may want to hand focus to a sibling instead). */
       detach() {
         this.el.remove();
-        rowByKey.delete(rowKey(this.accountId, this.msg.uid));
+        rowByKey.delete(rowKey(this.accountId, this.msg.uid, this.msg.folderId));
       }
       setSelected(yes) {
         this.el.classList.toggle("selected", yes);
@@ -5239,7 +5315,7 @@ var init_message_list = __esm({
         return;
       if (!ev.accountId || ev.previousDraftUid == null)
         return;
-      const row = rowByKey.get(rowKey(ev.accountId, ev.previousDraftUid));
+      const row = findRow(ev.accountId, Number(ev.previousDraftUid), ev.folderId);
       if (row)
         row.setDate(typeof ev.savedAt === "number" ? ev.savedAt : Date.now());
     });
@@ -9408,8 +9484,8 @@ async function performUndo() {
         const flag = "\\Flagged";
         const flagsAfter = entry.prevFlagged ? [flag] : [];
         await updateFlags2(entry.accountId, entry.uid, flagsAfter, entry.folderId);
-        setRowFlagged(entry.accountId, entry.uid, entry.prevFlagged);
-        updateMessageFlags(entry.accountId, entry.uid, flagsAfter);
+        setRowFlagged(entry.accountId, entry.uid, entry.prevFlagged, entry.folderId);
+        updateMessageFlags(entry.accountId, entry.uid, flagsAfter, entry.folderId);
       }
       if (statusSync) statusSync.textContent = `Undid flag change on ${op.payload.length} message${op.payload.length !== 1 ? "s" : ""}${remaining}`;
     }
@@ -9587,8 +9663,8 @@ async function bulkFlagSelected() {
   for (const r of rows) {
     if (flaggedOf(r) === targetFlagged) continue;
     setFlagged(r, targetFlagged);
-    setRowFlagged(r.accountId, r.uid, targetFlagged);
-    updateMessageFlags(r.accountId, r.uid, r.flags);
+    setRowFlagged(r.accountId, r.uid, targetFlagged, r.folderId);
+    updateMessageFlags(r.accountId, r.uid, r.flags, r.folderId);
     try {
       await updateFlags2(r.accountId, r.uid, r.flags, r.folderId);
     } catch (e) {
@@ -9611,8 +9687,8 @@ document.getElementById("btn-flag")?.addEventListener("click", async () => {
   updateFlagButton();
   try {
     await updateFlags(sel.accountId, sel.uid, sel.flags, sel.folderId);
-    updateMessageFlags(sel.accountId, sel.uid, sel.flags);
-    setRowFlagged(sel.accountId, sel.uid, !wasFlagged);
+    updateMessageFlags(sel.accountId, sel.uid, sel.flags, sel.folderId);
+    setRowFlagged(sel.accountId, sel.uid, !wasFlagged, sel.folderId);
   } catch (e) {
     setFlagged(sel, wasFlagged);
     updateFlagButton();
@@ -9654,9 +9730,16 @@ async function spamSelectedMessages() {
     markAsSpamMessages(accountId, uids, folderIds).then((result) => {
       console.log(`[spam] ${accountId}: moved ${result?.moved ?? uids.length} to folderId=${result?.targetFolderId}`);
       if (result?.targetFolderId) spamUndo.targetFolderId = result.targetFolderId;
-    }).catch((e) => {
+    }).catch(async (e) => {
       console.error(`[spam] ${accountId} failed:`, e);
-      if (statusSync) statusSync.textContent = `Spam sync issue (${accountId}): ${e?.message || e}`;
+      if (statusSync) statusSync.textContent = `Spam FAILED (${accountId}): ${e?.message || e}`;
+      try {
+        await reloadCurrentFolder();
+      } catch {
+      }
+      window.dispatchEvent(new CustomEvent("mailx-alert", {
+        detail: { message: `Couldn't move ${uids.length} message(s) to spam: ${e?.message || e}`, key: "spam-move" }
+      }));
     });
   }
 }
@@ -9716,7 +9799,7 @@ document.getElementById("btn-mark-unread")?.addEventListener("click", () => {
   const wasSeen = seenOf(sel);
   setSeen(sel, !wasSeen);
   updateFlags(sel.accountId, sel.uid, sel.flags, sel.folderId).then(() => {
-    updateMessageFlags(sel.accountId, sel.uid, sel.flags);
+    updateMessageFlags(sel.accountId, sel.uid, sel.flags, sel.folderId);
     const row = document.querySelector(`.ml-row[data-uid="${sel.uid}"][data-account-id="${sel.accountId}"]`);
     if (row) row.classList.toggle("unread", wasSeen);
   }).catch(() => {
@@ -12758,7 +12841,7 @@ document.addEventListener("mailx-popout-action", ((e) => {
     const wasFlagged = flaggedOf(msg);
     setFlagged(msg, !wasFlagged);
     updateFlags(accountId, msg.uid, msg.flags, msg.folderId).catch((err) => console.error(`[popout] flag failed: ${err?.message || err}`));
-    setRowFlagged(accountId, msg.uid, !wasFlagged);
+    setRowFlagged(accountId, msg.uid, !wasFlagged, msg.folderId);
   }
 }));
 document.addEventListener("mailx-popout-message", (async (e) => {