@bobfrankston/rmfmail 1.2.178 → 1.2.180

package/client/compose/compose.bundle.js

@@ -1024,6 +1024,7 @@ __export(api_client_exports, {
   autocomplete: () => autocomplete,
   cancelQueuedOutgoing: () => cancelQueuedOutgoing,
   cancelServerSearch: () => cancelServerSearch,
+  checkDraftNewer: () => checkDraftNewer,
   closeComposePopout: () => closeComposePopout,
   closeWordEdit: () => closeWordEdit,
   connectEvents: () => connectEvents,
@@ -1581,6 +1582,9 @@ function repairAccounts() {
 function deleteDraft(accountId, draftUid2, draftId2) {
   return ipc().deleteDraft?.(accountId, draftUid2, draftId2);
 }
+function checkDraftNewer(accountId, draftId2, sinceUid) {
+  return ipc().checkDraftNewer?.(accountId, draftId2, sinceUid) ?? Promise.resolve(null);
+}
 function addContact(name, email) {
   return ipc().addContact?.(name, email);
 }
@@ -5186,6 +5190,75 @@ function applyInit(init) {
   else if (!subjectInput.value) subjectInput.focus();
   else editor.focus();
   recordContentBaseline();
+  if (init.draftUid && init.draftId) {
+    void checkForNewerDraftVersion(init.accountId, init.draftUid);
+  }
+}
+var draftFreshnessHold = false;
+async function checkForNewerDraftVersion(accountId, openedUid) {
+  draftFreshnessHold = true;
+  const holdTimer = setTimeout(() => {
+    draftFreshnessHold = false;
+  }, 15e3);
+  try {
+    const { checkDraftNewer: checkDraftNewer2, getMessage: getMessage2 } = await Promise.resolve().then(() => (init_api_client(), api_client_exports));
+    const r = await checkDraftNewer2(accountId, draftId || "", openedUid);
+    if (!r?.uid) return;
+    const m = await getMessage2(accountId, r.uid, true, r.folderId);
+    if (!m) return;
+    const adopt = () => {
+      toInput.value = formatAddrs(m.to || []);
+      ccInput.value = formatAddrs(m.cc || []);
+      bccInput.value = formatAddrs(m.bcc || []);
+      subjectInput.value = m.subject || "";
+      editor.setHtml(m.bodyHtml || "");
+      draftUid = r.uid;
+      setComposeTitle(m.subject || "");
+      recordContentBaseline();
+      showDraftStatus("Loaded newer version of this draft (saved on another machine).", false);
+      logClientEvent("draft-newer-adopted", { draftId, from: openedUid, to: r.uid });
+    };
+    if (!composeHasUserChanges()) {
+      adopt();
+      return;
+    }
+    clearTimeout(holdTimer);
+    showNewerDraftBanner(adopt);
+  } catch (e) {
+    logClientEvent("draft-newer-check-failed", { err: e?.message || String(e) });
+  } finally {
+    clearTimeout(holdTimer);
+    if (!document.getElementById("draft-newer-banner")) draftFreshnessHold = false;
+  }
+}
+function showNewerDraftBanner(adopt) {
+  if (document.getElementById("draft-newer-banner")) return;
+  const banner = document.createElement("div");
+  banner.id = "draft-newer-banner";
+  banner.style.cssText = "display:flex;align-items:center;gap:10px;padding:6px 12px;background:var(--color-warning-bg, #fff4d6);color:var(--color-text, #333);border-bottom:1px solid var(--color-border, #d8c27a);font-size:0.9em;";
+  const label = document.createElement("span");
+  label.style.cssText = "flex:1;";
+  label.textContent = "This draft was changed on another machine after the copy shown here.";
+  const loadBtn = document.createElement("button");
+  loadBtn.textContent = "Load newer version";
+  loadBtn.style.cssText = "padding:3px 10px;";
+  const keepBtn = document.createElement("button");
+  keepBtn.textContent = "Keep my edits";
+  keepBtn.style.cssText = "padding:3px 10px;";
+  const done = () => {
+    banner.remove();
+    draftFreshnessHold = false;
+  };
+  loadBtn.addEventListener("click", () => {
+    adopt();
+    done();
+  });
+  keepBtn.addEventListener("click", done);
+  banner.append(label, loadBtn, keepBtn);
+  document.body.insertBefore(banner, document.body.firstChild);
+  setTimeout(() => {
+    draftFreshnessHold = false;
+  }, 12e4);
 }
 var composeDirty = false;
 function setComposeTitle(subject) {
@@ -5239,6 +5312,7 @@ function showDraftStatus(text, isError) {
 }
 async function saveDraft2() {
   if (draftSaving) return;
+  if (draftFreshnessHold) return;
   if (!draftUid && !draftId && !composeHasUserChanges()) return;
   if (!draftUid && !draftId) {
     const hasSubject = subjectInput.value.trim().length > 0;