@bobfrankston/rmfmail 1.2.333 → 1.2.337

package/client/app.bundle.js

@@ -4663,7 +4663,8 @@ var init_message_viewer = __esm({
         return;
       if (!currentMessage || currentAccountId !== ev.accountId)
         return;
-      if (currentMessage.uid !== ev.previousDraftUid)
+      const sameDraft = !!ev.draftId && currentMessage.mailxDraftId === ev.draftId;
+      if (!sameDraft && currentMessage.uid !== ev.previousDraftUid)
         return;
       const newBody = String(ev.bodyHtml || "");
       currentMessage.bodyHtml = newBody;
@@ -4808,6 +4809,7 @@ __export(message_list_exports, {
   removeMessagesAndReconcile: () => removeMessagesAndReconcile,
   revealMessage: () => revealMessage,
   scrollFocusedIntoView: () => scrollFocusedIntoView,
+  selectAllMessages: () => selectAllMessages,
   selectAllVisible: () => selectAllVisible,
   setDateBasis: () => setDateBasis,
   setLiveFilter: () => setLiveFilter,
@@ -4833,6 +4835,11 @@ function applyLiveFilter(body) {
     row.classList.toggle("filter-hidden", !text.includes(liveFilterText));
   }
 }
+function currentSearchPagingScope() {
+  if (currentSearchScope !== "server")
+    return currentSearchScope;
+  return currentSearchFolderId ? "current" : "all";
+}
 function emptyListMessage() {
   if (searchMode && currentSearchQuery) {
     return `No messages found by "${escapeHtmlText(currentSearchQuery)}"`;
@@ -5244,6 +5251,29 @@ function selectAllVisible() {
   body.querySelectorAll(".ml-row:not(.filter-hidden)").forEach((r) => r.classList.add("selected"));
   updateBulkBar();
 }
+async function selectAllMessages() {
+  const body = document.getElementById("ml-body");
+  if (!body)
+    return;
+  const status = document.getElementById("status-sync");
+  let guard = 0;
+  while (currentPage * 50 < totalMessages && guard++ < 1e4) {
+    if (loading) {
+      await new Promise((r) => setTimeout(r, 50));
+      continue;
+    }
+    const before = body.querySelectorAll(".ml-row").length;
+    if (status)
+      status.textContent = `Loading all ${totalMessages} messages to select them\u2026 ${before} so far`;
+    await loadMoreMessages();
+    if (body.querySelectorAll(".ml-row").length === before)
+      break;
+  }
+  selectAllVisible();
+  const n = body.querySelectorAll(".ml-row.selected").length;
+  if (status)
+    status.textContent = `Selected ${n} message${n === 1 ? "" : "s"}`;
+}
 function selectRange(from, to) {
   const body = document.getElementById("ml-body");
   if (!body)
@@ -5494,6 +5524,10 @@ async function loadSearchResults(query, scope = "all", accountId = "", folderId
   liveFilterText = "";
   unifiedMode = false;
   currentSearchQuery = query;
+  currentSearchScope = scope;
+  currentSearchAccountId = accountId;
+  currentSearchFolderId = folderId;
+  currentSearchIncludeTrash = includeTrashSpam;
   currentPage = 1;
   totalMessages = 0;
   const body = document.getElementById("ml-body");
@@ -5718,7 +5752,7 @@ async function loadMoreMessages() {
   const rowsBefore = body.querySelectorAll(".ml-row").length;
   try {
     const flaggedOnly = body.classList.contains("flagged-only");
-    const result = searchMode ? await searchMessages(currentSearchQuery, currentPage) : unifiedMode ? await getUnifiedInbox(currentPage, 50, flaggedOnly, dateBasis) : await getMessages(currentAccountId2, currentFolderId, currentPage, 50, flaggedOnly, currentSort, currentSortDir, dateBasis);
+    const result = searchMode ? await searchMessages(currentSearchQuery, currentPage, 50, currentSearchPagingScope(), currentSearchAccountId, currentSearchFolderId, currentSearchIncludeTrash) : unifiedMode ? await getUnifiedInbox(currentPage, 50, flaggedOnly, dateBasis) : await getMessages(currentAccountId2, currentFolderId, currentPage, 50, flaggedOnly, currentSort, currentSortDir, dateBasis);
     const current = getMessages2();
     setMessages([...current, ...result.items]);
     appendMessages(body, unifiedMode ? "" : currentAccountId2, result.items);
@@ -5957,7 +5991,7 @@ function escapeHtml4(s) {
   div.textContent = s;
   return div.innerHTML;
 }
-var onMessageSelect, currentAccountId2, currentFolderId, currentSpecialUse, lastClickedRow, currentPage, totalMessages, loading, MAX_REFRESH_PAGES, unifiedMode, searchMode, liveFilterText, currentSearchQuery, wasUnifiedBeforeSearch, showToInsteadOfFrom, touchWasScroll, lastPointerWasTouch, currentSort, currentSortDir, dateBasis, loadGen, listCache, CACHE_KEY_UNIFIED, positionMemory, POSITION_STORAGE_KEY, focusedRow, rowByKey, prioritySenders, priorityDomains, timeFmt, dateFmt, dateFmtSameYear, MessageRow;
+var onMessageSelect, currentAccountId2, currentFolderId, currentSpecialUse, lastClickedRow, currentPage, totalMessages, loading, MAX_REFRESH_PAGES, unifiedMode, searchMode, liveFilterText, currentSearchQuery, currentSearchScope, currentSearchAccountId, currentSearchFolderId, currentSearchIncludeTrash, wasUnifiedBeforeSearch, showToInsteadOfFrom, touchWasScroll, lastPointerWasTouch, currentSort, currentSortDir, dateBasis, loadGen, listCache, CACHE_KEY_UNIFIED, positionMemory, POSITION_STORAGE_KEY, focusedRow, rowByKey, prioritySenders, priorityDomains, timeFmt, dateFmt, dateFmtSameYear, MessageRow;
 var init_message_list = __esm({
   "client/components/message-list.js"() {
     "use strict";
@@ -5977,6 +6011,10 @@ var init_message_list = __esm({
     searchMode = false;
     liveFilterText = "";
     currentSearchQuery = "";
+    currentSearchScope = "all";
+    currentSearchAccountId = "";
+    currentSearchFolderId = 0;
+    currentSearchIncludeTrash = false;
     wasUnifiedBeforeSearch = false;
     showToInsteadOfFrom = false;
     touchWasScroll = false;
@@ -6261,15 +6299,10 @@ var init_message_list = __esm({
         const selectedCount = body ? body.querySelectorAll(".ml-row.selected").length : 0;
         showMenu(e.clientX, e.clientY, [
           {
-            label: `Select all (${visibleRows.length})`,
+            // Total in the view, not rows loaded so far (2026-09-16).
+            label: `Select all (${Math.max(totalMessages || 0, visibleRows.length)})`,
             action: () => {
-              if (!body)
-                return;
-              body.classList.add("multi-select-on");
-              for (const r of visibleRows)
-                r.classList.add("selected");
-              lastClickedRow = visibleRows[visibleRows.length - 1] || null;
-              updateBulkBar();
+              void selectAllMessages();
             },
             disabled: visibleRows.length === 0
           },
@@ -8899,8 +8932,11 @@ function renderNode(node, container, depth, forceExpand) {
           const treeContainer = document.getElementById("folder-tree");
           if (treeContainer)
             loadFolderTree(treeContainer);
+          const status = document.getElementById("status-sync");
+          if (status)
+            status.textContent = `Emptied ${node.name} locally \u2014 deleting on the server in the background`;
         } catch (err) {
-          alert(`Failed: ${err.message}`);
+          alert(`Failed to empty ${node.name}: ${err.message}`);
         }
       } });
     }
@@ -11620,7 +11656,8 @@ function doSearch(immediate = false) {
   if (serverOn) {
     serverSearchTimer = setTimeout(() => {
       serverSearchTimer = null;
-      loadSearchResults(query, "server", currentAccountId3, currentFolderId2, includeTrash);
+      const serverFolderId = localScopeEff === "current" ? currentFolderId2 : 0;
+      loadSearchResults(query, "server", currentAccountId3, serverFolderId, includeTrash);
     }, SERVER_SEARCH_DALLY_MS);
   }
 }
@@ -12435,7 +12472,7 @@ document.addEventListener("keydown", (e) => {
     const mlBody = document.getElementById("ml-body");
     if (mlBody) {
       e.preventDefault();
-      selectAllVisible();
+      void selectAllMessages();
     }
   }
   if (e.ctrlKey && e.key === "d" || e.key === "Delete") {