@bobfrankston/rmfmail 1.1.225 → 1.1.230

package/client/app.ts

@@ -577,6 +577,29 @@ function refreshSyncTooltip(): void {
 // no new sync events.
 setInterval(refreshSyncTooltip, 30_000);
 
+// Honest "Synced" indicator. "Synced HH:MM" must mean sync is IDLE, not fire
+// on every tick — folderCountsChanged/syncProgress fire repeatedly during a
+// catch-up backfill (e.g. after the daemon was offline) while messages are
+// STILL arriving, so stamping "Synced" each time misled (Bob 2026-06-06: "it
+// says synced but I don't see this afternoon's mail" — they were mid-backfill).
+// Any sync activity (re)arms this settle timer; only when activity goes quiet
+// for SYNC_SETTLE_MS do we stamp the time. While the storm runs, the handlers
+// keep the bar on "Syncing…".
+let syncSettleTimer: ReturnType<typeof setTimeout> | null = null;
+const SYNC_SETTLE_MS = 4000;
+function scheduleSyncedStamp(): void {
+    if (syncSettleTimer) clearTimeout(syncSettleTimer);
+    syncSettleTimer = setTimeout(() => {
+        syncSettleTimer = null;
+        const el = document.getElementById("status-sync");
+        // Only flip a "Syncing…" display to "Synced" — never clobber an error
+        // ("Sync error: …") or a transient action message ("Trashed 1 …").
+        if (el && (el.textContent || "").startsWith("Syncing")) {
+            el.textContent = `Synced ${new Date().toLocaleTimeString(undefined, { hour: "2-digit", minute: "2-digit", hour12: false })}`;
+        }
+    }, SYNC_SETTLE_MS);
+}
+
 // ── Auto two-line when message list is narrow ──
 const messageList = document.getElementById("message-list");
 if (messageList) {
@@ -1471,14 +1494,19 @@ async function deleteSelectedMessages(): Promise<void> {
     // An IPC 120s timeout doesn't mean the trash failed — surfacing it
     // as a status-bar error would only mislead. Real errors are still
     // reported by next sync's diagnostics.
-    const byAccount = new Map<string, number[]>();
+    // Carry folderId per message so the daemon trashes the exact (folder, uid),
+    // not whatever folder a bare (account, uid) lookup happens to resolve to
+    // (Bob 2026-06-06: Del trashed the wrong message). uids/folderIds stay
+    // index-aligned per account.
+    const byAccount = new Map<string, { uids: number[]; folderIds: number[] }>();
     for (const msg of snapshot) {
-        const uids = byAccount.get(msg.accountId) || [];
-        uids.push(msg.uid);
-        byAccount.set(msg.accountId, uids);
+        const g = byAccount.get(msg.accountId) || { uids: [], folderIds: [] };
+        g.uids.push(msg.uid);
+        g.folderIds.push(msg.folderId);
+        byAccount.set(msg.accountId, g);
     }
-    for (const [accountId, uids] of byAccount) {
-        deleteMessages(accountId, uids).catch((e: any) => {
+    for (const [accountId, g] of byAccount) {
+        deleteMessages(accountId, g.uids, g.folderIds).catch((e: any) => {
             console.error(`Delete failed for ${accountId}: ${e?.message || e}`);
             if (statusSync) statusSync.textContent = `Delete sync issue (${accountId}): ${e?.message || e}`;
         });
@@ -2646,6 +2674,7 @@ onWsEvent((event) => {
             }
             if (statusSync) statusSync.textContent = `Syncing ${event.accountId}: ${label}`;
             if (startupStatus) startupStatus.textContent = `Syncing ${event.accountId}: ${label}`;
+            scheduleSyncedStamp();   // re-arm the settle timer; stamp "Synced" when this quiets
             // Mark syncing folder in tree — bubble up to visible parent if collapsed
             const syncPath = event.phase?.startsWith("sync:") ? event.phase.slice(5) : null;
             // Clear previous syncing markers for this account
@@ -2672,6 +2701,7 @@ onWsEvent((event) => {
             refreshFolderTree();
             // Q53: track per-account last-sync timestamp for the status-bar hover.
             recordAccountSync(event.accountId);
+            scheduleSyncedStamp();   // settle → "Synced HH:MM" once activity stops
             // Earlier I added reloadCurrentFolder() here to fix the
             // "phone INBOX stays on placeholder" report. That broke desktop
             // because syncComplete fires repeatedly on the desktop sync
@@ -2712,7 +2742,13 @@ onWsEvent((event) => {
             hideAlert();
             const syncBtn = document.getElementById("btn-sync") as HTMLButtonElement;
             if (syncBtn) { syncBtn.disabled = false; syncBtn.classList.remove("syncing"); }
-            if (statusSync) statusSync.textContent = `Synced ${new Date().toLocaleTimeString(undefined, { hour: "2-digit", minute: "2-digit", hour12: false })}`;
+            // Honest indicator: a count change means activity, not necessarily
+            // "done". Show "Syncing…" and let the settle timer stamp the time
+            // once the backfill goes quiet (see scheduleSyncedStamp).
+            if (statusSync && !(statusSync.textContent || "").startsWith("Sync error")) {
+                statusSync.textContent = "Syncing…";
+            }
+            scheduleSyncedStamp();
             break;
         }
         case "updateAvailable": {

package/client/compose/compose.bundle.js

@@ -1322,13 +1322,13 @@ function removeUserDictWord(word) {
 function flagSenderOrDomain(type, value) {
   return ipc().flagSenderOrDomain?.(type, value) ?? Promise.resolve({ flagged: false });
 }
-function deleteMessage(accountId, uid) {
-  return ipc().deleteMessage?.(accountId, uid);
+function deleteMessage(accountId, uid, folderId) {
+  return ipc().deleteMessage?.(accountId, uid, folderId);
 }
-function deleteMessages(accountId, uids) {
+function deleteMessages(accountId, uids, folderIds) {
   if (uids.length === 1)
-    return deleteMessage(accountId, uids[0]);
-  return ipc().deleteMessages?.(accountId, uids);
+    return deleteMessage(accountId, uids[0], folderIds?.[0]);
+  return ipc().deleteMessages?.(accountId, uids, folderIds);
 }
 function moveMessages(accountId, uids, targetFolderId, targetAccountId) {
   if (uids.length === 1)
@@ -2084,17 +2084,17 @@ async function createTinyMceEditor(container2, opts = {}) {
         };
         const BORDER_STYLES = { "border": "1px solid #888", "border-radius": "4px", "padding": "10px" };
         const openCodeDialog = () => {
-          const cs = ed.plugins.codesample;
           const preEl = ed.dom.getParent(ed.selection.getNode(), "pre");
           let curLang = "text";
           let curBorder = false;
+          let curCode = "";
           if (preEl) {
             const m = (preEl.className || "").match(/language-([\w-]+)/);
             if (m)
               curLang = m[1];
             curBorder = !!(preEl.style && preEl.style.border && preEl.style.border !== "none");
+            curCode = preEl.textContent || "";
           }
-          const curCode = cs && cs.getCurrentCode ? cs.getCurrentCode(ed) || "" : "";
           ed.windowManager.open({
             title: "Insert code",
             size: "large",
@@ -2113,15 +2113,16 @@ async function createTinyMceEditor(container2, opts = {}) {
             ],
             onSubmit: (api) => {
               const data = api.getData();
-              if (cs && cs.insertCodeSample)
-                cs.insertCodeSample(data.language, data.code);
-              const pre = ed.dom.getParent(ed.selection.getNode(), "pre");
-              if (pre) {
-                if (data.border)
-                  ed.dom.setStyles(pre, BORDER_STYLES);
-                else
-                  ed.dom.setStyles(pre, { "border": "", "border-radius": "", "padding": "" });
+              const lang = data.language || "text";
+              const esc = (s) => String(s).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+              const borderStyle = data.border ? ` style="${Object.entries(BORDER_STYLES).map(([k, v]) => `${k}:${v}`).join(";")}"` : "";
+              const html = `<pre class="language-${lang}"${borderStyle}><code>${esc(data.code || "")}</code></pre>`;
+              if (preEl && preEl.parentNode) {
+                ed.dom.setOuterHTML(preEl, html);
+              } else {
+                ed.insertContent(html);
               }
+              ed.undoManager.add();
               api.close();
             }
           });
@@ -2260,6 +2261,17 @@ async function createTinyMceEditor(container2, opts = {}) {
     getText() {
       return editor2.getContent({ format: "text" });
     },
+    /** Subscribe to content changes. compose.ts calls this to drive draft
+     *  auto-save; it was MISSING from the facade, so the call threw
+     *  "editor.onContentChange is not a function" during compose init —
+     *  aborting the rest of init and leaving change-tracking unwired, so
+     *  edits made via dialogs (Insert code, Source code) were never
+     *  captured into the draft and looked "ignored" (Bob 2026-06-06).
+     *  `SetContent`/`ExecCommand` are the load-bearing events here: they're
+     *  what the codesample + code (source) dialogs fire on apply. */
+    onContentChange(handler) {
+      editor2.on("input change undo redo keyup SetContent ExecCommand AddUndo", () => handler());
+    },
     focus() {
       editor2.focus();
     },