@bobfrankston/rmfmail 1.1.222 → 1.1.228

package/client/app.bundle.js

@@ -190,9 +190,9 @@ function getMessages(accountId, folderId, page = 1, pageSize = 50, flaggedOnly =
   abortMessageListRequests();
   return ipc().getMessages(accountId, folderId, page, pageSize, sort, sortDir, void 0, flaggedOnly);
 }
-function getUnifiedInbox(page = 1, pageSize = 50) {
+function getUnifiedInbox(page = 1, pageSize = 50, flaggedOnly = false) {
   abortMessageListRequests();
-  return ipc().getUnifiedInbox(page, pageSize);
+  return ipc().getUnifiedInbox(page, pageSize, flaggedOnly);
 }
 function searchMessages(query, page = 1, pageSize = 50, scope = "all", accountId = "", folderId = 0, includeTrashSpam = false) {
   return ipc().searchMessages(query, page, pageSize, scope, accountId, folderId, includeTrashSpam);
@@ -1934,6 +1934,13 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
   } catch (e) {
     const err = e.message || "Unknown error";
     console.error("showMessage error:", e);
+    const failEnv = cached || lastEnvelope || envelope;
+    if (failEnv) {
+      try {
+        renderHeaderFromEnvelope(headerEl, failEnv);
+      } catch {
+      }
+    }
     const isNotFound = /deleted from the server|isNotFound|not found|Not Found|404/.test(err);
     if (isNotFound) {
       document.dispatchEvent(new CustomEvent("mailx-remove-stale", {
@@ -3186,9 +3193,11 @@ async function loadUnifiedInbox(autoSelect = true) {
   const fromHeader = document.querySelector(".ml-col-from");
   if (fromHeader)
     fromHeader.textContent = "From";
+  const flaggedOnly = body.classList.contains("flagged-only");
+  const unifiedCacheKey = flaggedOnly ? CACHE_KEY_UNIFIED + ":flagged" : CACHE_KEY_UNIFIED;
   const remembered = positionMemory.get(CACHE_KEY_UNIFIED);
   const savedScroll = remembered?.scroll ?? (!autoSelect ? body.scrollTop : 0);
-  const cached = listCache.get(CACHE_KEY_UNIFIED);
+  const cached = listCache.get(unifiedCacheKey);
   if (cached) {
     totalMessages = cached.total;
     setMessages(cached.items);
@@ -3204,16 +3213,16 @@ async function loadUnifiedInbox(autoSelect = true) {
     body.innerHTML = `<div class="ml-empty">Loading...</div>`;
   }
   try {
-    const result = await getUnifiedInbox(1);
+    const result = await getUnifiedInbox(1, 50, flaggedOnly);
     if (myGen !== loadGen)
       return;
     totalMessages = result.total;
-    listCache.set(CACHE_KEY_UNIFIED, { items: result.items, total: result.total, timestamp: Date.now() });
+    listCache.set(unifiedCacheKey, { items: result.items, total: result.total, timestamp: Date.now() });
     if (cached && listResultsEqual(cached.items, result.items))
       return;
     if (result.items.length === 0) {
       setMessages([]);
-      body.innerHTML = `<div class="ml-empty">${result.total > 0 ? `${result.total} messages syncing...` : "Syncing \u2014 messages will appear shortly"}</div>`;
+      body.innerHTML = flaggedOnly ? `<div class="ml-empty">No flagged messages</div>` : `<div class="ml-empty">${result.total > 0 ? `${result.total} messages syncing...` : "Syncing \u2014 messages will appear shortly"}</div>`;
       return;
     }
     setMessages(result.items);
@@ -3403,7 +3412,7 @@ async function loadMoreMessages() {
   currentPage++;
   try {
     const flaggedOnly = body.classList.contains("flagged-only");
-    const result = searchMode ? await searchMessages(currentSearchQuery, currentPage) : unifiedMode ? await getUnifiedInbox(currentPage) : await getMessages(currentAccountId2, currentFolderId, currentPage, 50, flaggedOnly);
+    const result = searchMode ? await searchMessages(currentSearchQuery, currentPage) : unifiedMode ? await getUnifiedInbox(currentPage, 50, flaggedOnly) : await getMessages(currentAccountId2, currentFolderId, currentPage, 50, flaggedOnly);
     const current = getMessages2();
     setMessages([...current, ...result.items]);
     appendMessages(body, unifiedMode ? "" : currentAccountId2, result.items);
@@ -9382,6 +9391,7 @@ document.addEventListener("keydown", (e) => {
 document.getElementById("message-viewer")?.addEventListener("dblclick", (e) => {
   const target = e.target;
   if (target?.closest("a, button, input, select, textarea, [contenteditable]")) return;
+  if (target?.closest(".mv-header")) return;
   toggleFullscreenPreview();
 });
 function focusPaneById(id) {