@bobfrankston/rmfmail 1.1.106 → 1.1.108

package/client/app.bundle.js

@@ -21,6 +21,7 @@ __export(api_client_exports, {
   allowRemoteContent: () => allowRemoteContent,
   autocomplete: () => autocomplete,
   cancelQueuedOutgoing: () => cancelQueuedOutgoing,
+  cancelServerSearch: () => cancelServerSearch,
   closeWordEdit: () => closeWordEdit,
   connectEvents: () => connectEvents,
   connectWebSocket: () => connectWebSocket,
@@ -194,6 +195,9 @@ function getUnifiedInbox(page = 1, pageSize = 50) {
 function searchMessages(query, page = 1, pageSize = 50, scope = "all", accountId = "", folderId = 0, includeTrashSpam = false) {
   return ipc().searchMessages(query, page, pageSize, scope, accountId, folderId, includeTrashSpam);
 }
+function cancelServerSearch() {
+  return ipc().cancelServerSearch?.();
+}
 function getMessage(accountId, uid, allowRemote = false, folderId) {
   return ipc().getMessage(accountId, uid, allowRemote, folderId);
 }
@@ -7418,14 +7422,14 @@ function quoteBody(msg) {
   const date = new Date(msg.date).toLocaleString();
   const from = msg.from.name ? `${msg.from.name} <${msg.from.address}>` : msg.from.address;
   const body = sanitizeQuotedBody(msg);
-  return `<br><br><div class="reply"><p>On ${date}, ${from} wrote:</p><blockquote>${body}</blockquote></div>`;
+  return `<p></p><br><br><div class="reply"><p>On ${date}, ${from} wrote:</p><blockquote>${body}</blockquote></div>`;
 }
 function forwardBody(msg) {
   const date = new Date(msg.date).toLocaleString();
   const from = msg.from.name ? `${msg.from.name} &lt;${msg.from.address}&gt;` : msg.from.address;
   const to = msg.to.map((a) => a.name ? `${a.name} &lt;${a.address}&gt;` : a.address).join(", ");
   const body = sanitizeQuotedBody(msg);
-  return `<br><br><div class="reply"><p>---------- Forwarded message ----------<br>From: ${from}<br>Date: ${date}<br>Subject: ${msg.subject}<br>To: ${to}</p>${body}</div>`;
+  return `<p></p><br><br><div class="reply"><p>---------- Forwarded message ----------<br>From: ${from}<br>Date: ${date}<br>Subject: ${msg.subject}<br>To: ${to}</p>${body}</div>`;
 }
 var lastDeleted = null;
 var lastMoved = null;
@@ -7944,6 +7948,8 @@ searchInput?.addEventListener("scroll", () => {
 });
 searchInput?.addEventListener("change", () => updateSearchHighlight());
 updateSearchHighlight();
+var SERVER_SEARCH_DALLY_MS = 700;
+var serverSearchTimer = null;
 function doSearch(immediate = false) {
   const query = searchInput.value.trim();
   if (query.length === 0) {
@@ -7954,9 +7960,14 @@ function doSearch(immediate = false) {
   const serverCheck = document.getElementById("search-server-too");
   const trashCheck = document.getElementById("search-include-trash");
   const localScope = searchScope?.value || "all";
-  const effectiveScope = serverCheck?.checked ? "server" : localScope;
   const includeTrash = !!trashCheck?.checked;
-  if (effectiveScope === "current" && !immediate) {
+  const serverOn = !!serverCheck?.checked;
+  if (serverSearchTimer) {
+    clearTimeout(serverSearchTimer);
+    serverSearchTimer = null;
+  }
+  cancelServerSearch();
+  if (localScope === "current" && !serverOn && !immediate) {
     const body = document.getElementById("ml-body");
     if (body) {
       const lower = query.toLowerCase();
@@ -7967,19 +7978,31 @@ function doSearch(immediate = false) {
     }
     return;
   }
-  loadSearchResults(query, effectiveScope, currentAccountId3, currentFolderId2, includeTrash);
+  const localScopeEff = localScope === "current" ? "current" : "all";
+  loadSearchResults(query, localScopeEff, currentAccountId3, currentFolderId2, includeTrash);
   setTitle(`${APP_NAME} - Search: ${query}`);
   setActiveView(
-    { kind: "search", query, scope: effectiveScope, accountId: currentAccountId3, folderId: currentFolderId2, includeTrash },
+    { kind: "search", query, scope: serverOn ? "server" : localScopeEff, accountId: currentAccountId3, folderId: currentFolderId2, includeTrash },
     `Search: ${query}`
   );
   recordSearchHistory(query);
+  if (serverOn) {
+    serverSearchTimer = setTimeout(() => {
+      serverSearchTimer = null;
+      loadSearchResults(query, "server", currentAccountId3, currentFolderId2, includeTrash);
+    }, SERVER_SEARCH_DALLY_MS);
+  }
 }
 var currentAccountId3 = "";
 var currentFolderId2 = 0;
 var reloadDebounceTimer = null;
 searchInput?.addEventListener("input", () => {
   clearTimeout(searchTimeout);
+  if (serverSearchTimer) {
+    clearTimeout(serverSearchTimer);
+    serverSearchTimer = null;
+    cancelServerSearch();
+  }
   updateSearchHighlight();
   if (searchInput.value.trim() === "") {
     clearSearchMode();
@@ -7988,7 +8011,7 @@ searchInput?.addEventListener("input", () => {
     reloadCurrentFolder();
     setTitle(APP_NAME);
   } else {
-    searchTimeout = setTimeout(() => doSearch(false), 300);
+    searchTimeout = setTimeout(() => doSearch(false), 180);
   }
 });
 searchInput?.addEventListener("keydown", (e) => {
@@ -7998,6 +8021,11 @@ searchInput?.addEventListener("keydown", (e) => {
   }
   if (e.key === "Escape") {
     searchInput.value = "";
+    if (serverSearchTimer) {
+      clearTimeout(serverSearchTimer);
+      serverSearchTimer = null;
+    }
+    cancelServerSearch();
     updateSearchHighlight();
     clearSearchMode();
     const body = document.getElementById("ml-body");
@@ -9848,6 +9876,10 @@ getSettings().then((s) => {
 }).catch(() => {
 });
 function saveEditorSetting(editor) {
+  try {
+    localStorage.setItem("mailx-editor-type", editor);
+  } catch {
+  }
   getSettings().then((settings) => {
     settings.ui = { ...settings.ui, editor };
     saveSettings(settings);