@bobfrankston/rmfmail 1.2.67 → 1.2.69

package/client/app.bundle.js

@@ -210,8 +210,8 @@ function cancelServerSearch() {
 function getMessage(accountId, uid, allowRemote = false, folderId) {
   return ipc().getMessage(accountId, uid, allowRemote, folderId);
 }
-function updateFlags(accountId, uid, flags) {
-  return ipc().updateFlags(accountId, uid, flags);
+function updateFlags(accountId, uid, flags, folderId) {
+  return ipc().updateFlags(accountId, uid, flags, folderId);
 }
 function triggerSync() {
   return ipc().syncAll();
@@ -1400,7 +1400,7 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
           if (captureGen !== showMessageGeneration)
             return;
           setSeen(msg, true);
-          updateFlags(accountId, uid, msg.flags);
+          updateFlags(accountId, uid, msg.flags, msg.folderId);
           try {
             updateMessageFlags(accountId, uid, msg.flags);
           } catch {
@@ -2762,6 +2762,7 @@ __export(message_list_exports, {
   removeMessagesAndReconcile: () => removeMessagesAndReconcile,
   revealMessage: () => revealMessage,
   scrollFocusedIntoView: () => scrollFocusedIntoView,
+  selectAllVisible: () => selectAllVisible,
   setLiveFilter: () => setLiveFilter,
   setRowFlagged: () => setRowFlagged,
   setRowSeen: () => setRowSeen,
@@ -2997,9 +2998,9 @@ async function bulkSetFlagged(rows, flagged) {
     const prevFlags = [...row.msg.flags || []];
     row.isFlagged = flagged;
     try {
-      await updateFlags(row.accountId, row.msg.uid, row.msg.flags);
+      await updateFlags(row.accountId, row.msg.uid, row.msg.flags, row.msg.folderId);
       updateMessageFlags(row.accountId, row.msg.uid, row.msg.flags);
-      undo.push({ accountId: row.accountId, uid: row.msg.uid, prevFlagged: prev });
+      undo.push({ accountId: row.accountId, uid: row.msg.uid, prevFlagged: prev, folderId: row.msg.folderId });
     } catch {
       row.msg.flags = prevFlags;
       row.setFlaggedClass(prev);
@@ -3016,7 +3017,7 @@ async function bulkSetSeen(rows, seen) {
     const prevFlags = [...row.msg.flags || []];
     row.isSeen = seen;
     try {
-      await updateFlags(row.accountId, row.msg.uid, row.msg.flags);
+      await updateFlags(row.accountId, row.msg.uid, row.msg.flags, row.msg.folderId);
       updateMessageFlags(row.accountId, row.msg.uid, row.msg.flags);
     } catch {
       row.msg.flags = prevFlags;
@@ -3224,6 +3225,14 @@ function exitMultiSelect() {
 }
 function updateBulkBar() {
 }
+function selectAllVisible() {
+  const body = document.getElementById("ml-body");
+  if (!body)
+    return;
+  body.classList.add("multi-select-on");
+  body.querySelectorAll(".ml-row:not(.filter-hidden)").forEach((r) => r.classList.add("selected"));
+  updateBulkBar();
+}
 function selectRange(from, to) {
   const body = document.getElementById("ml-body");
   if (!body)
@@ -4208,7 +4217,7 @@ var init_message_list = __esm({
         const newFlaggedState = !this.el.classList.contains("flagged");
         const prevFlags = [...this.msg.flags || []];
         this.isFlagged = newFlaggedState;
-        updateFlags(this.accountId, this.msg.uid, this.msg.flags).catch(() => {
+        updateFlags(this.accountId, this.msg.uid, this.msg.flags, this.msg.folderId).catch(() => {
           this.msg.flags = prevFlags;
           this.setFlaggedClass(!newFlaggedState);
         });
@@ -6231,7 +6240,12 @@ function initTabs(strip, apply) {
     if (raw) {
       const parsed = JSON.parse(raw);
       if (Array.isArray(parsed?.tabs) && parsed.tabs.length) {
-        tabs = parsed.tabs;
+        tabs = parsed.tabs.map((t) => {
+          if (t.view?.kind !== "search")
+            return t;
+          const v = t.view;
+          return v.folderId ? { id: t.id, title: "Mail", view: { kind: "folder", accountId: v.accountId, folderId: v.folderId, specialUse: "" } } : { id: t.id, title: "All Inboxes", view: { kind: "unified" } };
+        });
         activeId = parsed.activeId || tabs[0].id;
         for (const t of tabs) {
           const n = Number(String(t.id).replace(/^t/, ""));
@@ -8490,7 +8504,7 @@ async function performUndo() {
       for (const entry of op.payload) {
         const flag = "\\Flagged";
         const flagsAfter = entry.prevFlagged ? [flag] : [];
-        await updateFlags2(entry.accountId, entry.uid, flagsAfter);
+        await updateFlags2(entry.accountId, entry.uid, flagsAfter, entry.folderId);
         setRowFlagged(entry.accountId, entry.uid, entry.prevFlagged);
         updateMessageFlags(entry.accountId, entry.uid, flagsAfter);
       }
@@ -8663,7 +8677,8 @@ async function bulkFlagSelected() {
   const undoPayload = rows.map((r) => ({
     accountId: r.accountId,
     uid: r.uid,
-    prevFlagged: flaggedOf(r)
+    prevFlagged: flaggedOf(r),
+    folderId: r.folderId
   }));
   const { updateFlags: updateFlags2 } = await Promise.resolve().then(() => (init_api_client(), api_client_exports));
   for (const r of rows) {
@@ -8672,7 +8687,7 @@ async function bulkFlagSelected() {
     setRowFlagged(r.accountId, r.uid, targetFlagged);
     updateMessageFlags(r.accountId, r.uid, r.flags);
     try {
-      await updateFlags2(r.accountId, r.uid, r.flags);
+      await updateFlags2(r.accountId, r.uid, r.flags, r.folderId);
     } catch (e) {
       console.error(`Bulk flag failed for ${r.accountId}/${r.uid}: ${e?.message || e}`);
     }
@@ -8692,7 +8707,7 @@ document.getElementById("btn-flag")?.addEventListener("click", async () => {
   setFlagged(sel, !wasFlagged);
   updateFlagButton();
   try {
-    await updateFlags(sel.accountId, sel.uid, sel.flags);
+    await updateFlags(sel.accountId, sel.uid, sel.flags, sel.folderId);
     updateMessageFlags(sel.accountId, sel.uid, sel.flags);
     setRowFlagged(sel.accountId, sel.uid, !wasFlagged);
   } catch (e) {
@@ -8793,7 +8808,7 @@ document.getElementById("btn-mark-unread")?.addEventListener("click", () => {
   if (!sel) return;
   const wasSeen = seenOf(sel);
   setSeen(sel, !wasSeen);
-  updateFlags(sel.accountId, sel.uid, sel.flags).then(() => {
+  updateFlags(sel.accountId, sel.uid, sel.flags, sel.folderId).then(() => {
     updateMessageFlags(sel.accountId, sel.uid, sel.flags);
     const row = document.querySelector(`.ml-row[data-uid="${sel.uid}"][data-account-id="${sel.accountId}"]`);
     if (row) row.classList.toggle("unread", wasSeen);
@@ -9922,7 +9937,7 @@ document.addEventListener("keydown", (e) => {
     const mlBody = document.getElementById("ml-body");
     if (mlBody) {
       e.preventDefault();
-      mlBody.querySelectorAll(".ml-row").forEach((r) => r.classList.add("selected"));
+      selectAllVisible();
     }
   }
   if (e.ctrlKey && e.key === "d" || e.key === "Delete") {
@@ -9956,7 +9971,7 @@ document.addEventListener("keydown", (e) => {
     e.preventDefault();
     const applySeen = (m, seen) => {
       setSeen(m, seen);
-      updateFlags(m.accountId, m.uid, m.flags).then(() => {
+      updateFlags(m.accountId, m.uid, m.flags, m.folderId).then(() => {
         updateMessageFlags(m.accountId, m.uid, m.flags);
         const row = document.querySelector(`.ml-row[data-uid="${m.uid}"][data-account-id="${CSS.escape(m.accountId)}"]`);
         if (row) row.classList.toggle("unread", !seen);
@@ -11684,12 +11699,13 @@ function saveBootSnapshot() {
     const messageList2 = document.getElementById("ml-body");
     const folderTitle = document.getElementById("ml-folder-title");
     const ftHtml = folderTree2?.innerHTML?.trim() || "";
-    const mlHtml = messageList2?.innerHTML?.trim() || "";
+    const searching = (searchInput?.value.trim() || "") !== "";
+    const mlHtml = searching ? "" : messageList2?.innerHTML?.trim() || "";
     if (!ftHtml && !mlHtml) return;
     const snap = {
       folderTree: ftHtml,
       messageList: mlHtml,
-      folderTitle: folderTitle?.innerHTML?.trim() || "",
+      folderTitle: searching ? "" : folderTitle?.innerHTML?.trim() || "",
       savedAt: Date.now()
     };
     localStorage.setItem("mailx-boot-snapshot", JSON.stringify(snap));