@bobfrankston/rmfmail 1.0.681 → 1.0.688

package/bin/lean-accounts.js

@@ -98,7 +98,6 @@ function denormalizeAccount(acct, globalName) {
     if (acct.defaultSend) out.defaultSend = true;
     if (acct.enabled === false) out.enabled = false;
     if (acct.relayDomains?.length > 0) out.relayDomains = acct.relayDomains;
-    if (acct.deliveredToPrefix?.length > 0) out.deliveredToPrefix = acct.deliveredToPrefix;
     if (acct.identityDomains?.length > 0) out.identityDomains = acct.identityDomains;
 
     const syncContactsDefault = provider?.imap.auth === "oauth2";

package/client/app.bundle.js

@@ -62,6 +62,7 @@ __export(api_client_exports, {
   logClientEvent: () => logClientEvent,
   markAsSpamMessages: () => markAsSpamMessages,
   markFolderRead: () => markFolderRead,
+  moveFolderToTrash: () => moveFolderToTrash,
   moveMessage: () => moveMessage,
   moveMessages: () => moveMessages,
   onEvent: () => onEvent,
@@ -334,6 +335,9 @@ function renameFolder(accountId, folderId, newName) {
 function deleteFolder(accountId, folderId) {
   return ipc().deleteFolder?.(accountId, folderId);
 }
+function moveFolderToTrash(accountId, folderId) {
+  return ipc().moveFolderToTrash?.(accountId, folderId);
+}
 function emptyFolder(accountId, folderId) {
   return ipc().emptyFolder?.(accountId, folderId);
 }
@@ -489,6 +493,8 @@ function showContextMenu(x, y, items) {
     const el = document.createElement("div");
     el.className = "ctx-item" + (item.disabled ? " ctx-disabled" : "");
     el.textContent = item.label;
+    if (item.tooltip)
+      el.title = item.tooltip;
     if (!item.disabled) {
       el.addEventListener("click", () => {
         closeContextMenu();
@@ -2164,6 +2170,57 @@ function cacheKey(mode, a, f, flagged, q) {
     return `folder:${a}:${f}:${flagged ? "flag" : ""}`;
   return `search:${q}`;
 }
+function persistPositions() {
+  try {
+    const obj = {};
+    for (const [k, v] of positionMemory)
+      obj[k] = v;
+    sessionStorage.setItem(POSITION_STORAGE_KEY, JSON.stringify(obj));
+  } catch {
+  }
+}
+function currentViewKey() {
+  if (searchMode)
+    return cacheKey("search", void 0, void 0, void 0, currentSearchQuery);
+  if (unifiedMode)
+    return CACHE_KEY_UNIFIED;
+  if (!currentAccountId2 || currentFolderId == null)
+    return null;
+  const flaggedOnly = document.getElementById("ml-body")?.classList.contains("flagged-only") || false;
+  return cacheKey("folder", currentAccountId2, currentFolderId, flaggedOnly);
+}
+function rememberPosition() {
+  const key = currentViewKey();
+  if (!key)
+    return;
+  const body = document.getElementById("ml-body");
+  if (!body)
+    return;
+  const sel = body.querySelector(".ml-row.selected");
+  if (!sel)
+    return;
+  const uid = Number(sel.dataset.uid);
+  if (!Number.isFinite(uid))
+    return;
+  positionMemory.set(key, { uid, scroll: body.scrollTop });
+  persistPositions();
+}
+function pickRestoreUid(items, saved) {
+  if (!items.length)
+    return null;
+  if (items.some((m) => m.uid === saved))
+    return saved;
+  let best = -1;
+  for (const m of items) {
+    if (typeof m.uid !== "number")
+      continue;
+    if (m.uid < saved && m.uid > best)
+      best = m.uid;
+  }
+  if (best >= 0)
+    return best;
+  return typeof items[0]?.uid === "number" ? items[0].uid : null;
+}
 function listResultsEqual(a, b) {
   if (!a || a.length !== b.length)
     return false;
@@ -2210,6 +2267,7 @@ function focusRow(row) {
   showMessage(row.accountId, row.msg.uid, row.msg.folderId, void 0, false, row.msg);
   onMessageSelect(row.accountId, row.msg.uid, row.msg.folderId);
   document.dispatchEvent(new CustomEvent("mailx-focus-changed", { detail: row.msg }));
+  rememberPosition();
 }
 function getCurrentFocused() {
   return focusedRow ? focusedRow.msg : null;
@@ -2467,19 +2525,19 @@ async function loadUnifiedInbox(autoSelect = true) {
   const fromHeader = document.querySelector(".ml-col-from");
   if (fromHeader)
     fromHeader.textContent = "From";
-  const savedScroll = !autoSelect ? body.scrollTop : 0;
-  const currentSelectedUid = () => !autoSelect ? body.querySelector(".ml-row.selected")?.getAttribute("data-uid") || null : null;
+  const remembered = positionMemory.get(CACHE_KEY_UNIFIED);
+  const savedScroll = remembered?.scroll ?? (!autoSelect ? body.scrollTop : 0);
   const cached = listCache.get(CACHE_KEY_UNIFIED);
   if (cached) {
-    const preCacheUid = currentSelectedUid();
     totalMessages = cached.total;
     setMessages(cached.items);
     renderMessages(body, "", cached.items);
-    if (autoSelect)
-      selectFirst(body);
-    else {
+    const targetUid = remembered ? pickRestoreUid(cached.items, remembered.uid) : null;
+    if (targetUid != null) {
       body.scrollTop = savedScroll;
-      restoreSelection(body, preCacheUid);
+      restoreSelection(body, String(targetUid));
+    } else if (autoSelect) {
+      selectFirst(body);
     }
   } else if (autoSelect) {
     body.innerHTML = `<div class="ml-empty">Loading...</div>`;
@@ -2497,14 +2555,14 @@ async function loadUnifiedInbox(autoSelect = true) {
       body.innerHTML = `<div class="ml-empty">${result.total > 0 ? `${result.total} messages syncing...` : "Syncing \u2014 messages will appear shortly"}</div>`;
       return;
     }
-    const preRenderUid = currentSelectedUid();
     setMessages(result.items);
     renderMessages(body, "", result.items);
-    if (autoSelect) {
-      selectFirst(body);
-    } else {
+    const targetUid = remembered ? pickRestoreUid(result.items, remembered.uid) : null;
+    if (targetUid != null) {
       body.scrollTop = savedScroll;
-      restoreSelection(body, preRenderUid);
+      restoreSelection(body, String(targetUid));
+    } else if (autoSelect) {
+      selectFirst(body);
     }
   } catch (e) {
     if (e.name === "AbortError")
@@ -2604,23 +2662,23 @@ async function loadMessages(accountId, folderId, page = 1, specialUse = "", auto
   const fromHeader = document.querySelector(".ml-col-from");
   if (fromHeader)
     fromHeader.textContent = showToInsteadOfFrom ? "To" : "From";
-  const savedScroll = !autoSelect ? body.scrollTop : 0;
-  const currentSelectedUid = () => !autoSelect ? body.querySelector(".ml-row.selected")?.getAttribute("data-uid") || null : null;
   const flaggedOnly = document.getElementById("ml-body")?.classList.contains("flagged-only") || false;
   const cKey = cacheKey("folder", accountId, folderId, flaggedOnly);
+  const remembered = positionMemory.get(cKey);
+  const savedScroll = remembered?.scroll ?? (!autoSelect ? body.scrollTop : 0);
   const cached = listCache.get(cKey);
   if (cached) {
-    const preCacheUid = currentSelectedUid();
     totalMessages = cached.total;
     setMessages(cached.items);
     renderMessages(body, accountId, cached.items);
-    if (autoSelect)
-      selectFirst(body);
-    else {
+    const targetUid = remembered ? pickRestoreUid(cached.items, remembered.uid) : null;
+    if (targetUid != null) {
       requestAnimationFrame(() => {
         body.scrollTop = savedScroll;
-        restoreSelection(body, preCacheUid);
+        restoreSelection(body, String(targetUid));
       });
+    } else if (autoSelect) {
+      selectFirst(body);
     }
   } else if (autoSelect) {
     body.innerHTML = `<div class="ml-empty">Loading...</div>`;
@@ -2639,18 +2697,18 @@ async function loadMessages(accountId, folderId, page = 1, specialUse = "", auto
       body.innerHTML = `<div class="ml-empty">${flaggedOnly ? "No flagged messages" : "No messages"}</div>`;
       return;
     }
-    const preRenderUid = currentSelectedUid();
     setMessages(result.items);
     renderMessages(body, accountId, result.items);
-    if (autoSelect) {
-      selectFirst(body);
-    } else {
+    const targetUid = remembered ? pickRestoreUid(result.items, remembered.uid) : null;
+    if (targetUid != null) {
       requestAnimationFrame(() => {
         if (myGen !== loadGen)
           return;
         body.scrollTop = savedScroll;
-        restoreSelection(body, preRenderUid);
+        restoreSelection(body, String(targetUid));
       });
+    } else if (autoSelect) {
+      selectFirst(body);
     }
   } catch (e) {
     if (e.name === "AbortError")
@@ -2812,7 +2870,7 @@ function escapeHtml2(s) {
   div.textContent = s;
   return div.innerHTML;
 }
-var onMessageSelect, currentAccountId2, currentFolderId, currentSpecialUse, lastClickedRow, currentPage, totalMessages, loading, unifiedMode, searchMode, currentSearchQuery, wasUnifiedBeforeSearch, showToInsteadOfFrom, touchWasScroll, currentSort, currentSortDir, loadGen, listCache, CACHE_KEY_UNIFIED, focusedRow, rowByKey, prioritySenders, priorityDomains, timeFmt, dateFmt, dateFmtSameYear, MessageRow;
+var onMessageSelect, currentAccountId2, currentFolderId, currentSpecialUse, lastClickedRow, currentPage, totalMessages, loading, unifiedMode, searchMode, currentSearchQuery, wasUnifiedBeforeSearch, showToInsteadOfFrom, touchWasScroll, currentSort, currentSortDir, 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";
@@ -2835,6 +2893,19 @@ var init_message_list = __esm({
     loadGen = 0;
     listCache = /* @__PURE__ */ new Map();
     CACHE_KEY_UNIFIED = "unified";
+    positionMemory = /* @__PURE__ */ new Map();
+    POSITION_STORAGE_KEY = "mailx-list-positions";
+    try {
+      const raw = sessionStorage.getItem(POSITION_STORAGE_KEY);
+      if (raw) {
+        const parsed = JSON.parse(raw);
+        for (const [k, v] of Object.entries(parsed || {})) {
+          if (typeof v?.uid === "number")
+            positionMemory.set(k, v);
+        }
+      }
+    } catch {
+    }
     focusedRow = null;
     rowByKey = /* @__PURE__ */ new Map();
     prioritySenders = /* @__PURE__ */ new Set();
@@ -4918,18 +4989,47 @@ function renderNode(node, container, depth) {
           alert(`Failed: ${err.message}`);
         }
       }, disabled: !!node.specialUse },
-      { label: "Delete folder", action: async () => {
-        if (!confirm(`Delete folder "${node.name}"? Messages will be moved to Trash.`))
-          return;
-        try {
-          await deleteFolder(node.accountId, node.id);
-          const treeContainer = document.getElementById("folder-tree");
-          if (treeContainer)
-            loadFolderTree(treeContainer);
-        } catch (err) {
-          alert(`Failed: ${err.message}`);
-        }
-      }, disabled: !!node.specialUse },
+      // Two delete entries. Move-to-Trash is the default; permanent
+      // delete is a second, separated item with a tooltip so it's
+      // visible from the menu rather than requiring a discovery
+      // shortcut. The IMAP RENAME under Trash brings messages +
+      // subfolders along; the server-side fallback (when Trash is
+      // \Noinferiors) moves messages to Trash root and then deletes
+      // the empty folder. Permanent skips Trash entirely.
+      {
+        label: "Move folder to Trash",
+        action: async () => {
+          if (!confirm(`Move folder "${node.name}" to Trash? It can be restored by dragging back out of Trash.`))
+            return;
+          try {
+            await moveFolderToTrash(node.accountId, node.id);
+            const treeContainer = document.getElementById("folder-tree");
+            if (treeContainer)
+              loadFolderTree(treeContainer);
+          } catch (err) {
+            alert(`Failed: ${err.message}`);
+          }
+        },
+        disabled: !!node.specialUse,
+        tooltip: "Renames the folder into Trash (date-suffixed if needed); use Delete permanently below to skip Trash."
+      },
+      {
+        label: "Delete folder permanently",
+        action: async () => {
+          if (!confirm(`Permanently delete folder "${node.name}" and ALL its messages? This cannot be undone.`))
+            return;
+          try {
+            await deleteFolder(node.accountId, node.id);
+            const treeContainer = document.getElementById("folder-tree");
+            if (treeContainer)
+              loadFolderTree(treeContainer);
+          } catch (err) {
+            alert(`Failed: ${err.message}`);
+          }
+        },
+        disabled: !!node.specialUse,
+        tooltip: "Skips Trash. Same as Shift+Delete on a regular file. No undo."
+      },
       { label: "", action: () => {
       }, separator: true },
       // Q57: copy IMAP path so user can paste into accounts.jsonc as
@@ -6435,7 +6535,7 @@ function addComposeResizeHandles(wrapper, frame) {
 function sanitizeQuotedBody(msg) {
   const isPlainText = !msg.bodyHtml;
   if (isPlainText) {
-    const escaped = String(msg.bodyText || "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+    const escaped = String(msg.bodyText || "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\r\n?/g, "\n").replace(/\n/g, "<br>");
     return `<div style="white-space:pre-wrap;font-family:inherit;margin:0">${escaped}</div>`;
   }
   let body = msg.bodyHtml;