@bobfrankston/rmfmail 1.1.250 → 1.1.251

package/client/app.js

@@ -3,7 +3,7 @@
  * Wires together all UI components and WebSocket connection.
  */
 import { initFolderTree, refreshFolderTree, updateFolderCounts, setFolderSynced, getFolderSynced, setOutboxTotal } from "./components/folder-tree.js";
-import { initMessageList, loadMessages, loadUnifiedInbox, loadSearchResults, reloadCurrentFolder, clearSearchMode, setLiveFilter, getSelectedMessages, markBodiesCached, getCurrentFocused, releaseFocus, removeMessagesAndReconcile, setRowFlagged, scrollFocusedIntoView, refreshPriorityIndex } from "./components/message-list.js";
+import { initMessageList, loadMessages, loadUnifiedInbox, loadSearchResults, reloadCurrentFolder, clearSearchMode, getSelectedMessages, markBodiesCached, getCurrentFocused, releaseFocus, removeMessagesAndReconcile, setRowFlagged, scrollFocusedIntoView, refreshPriorityIndex } from "./components/message-list.js";
 import { seenOf, flaggedOf, draftOf, setSeen, setFlagged } from "@bobfrankston/mailx-types";
 import { initTabs, setActiveView as setActiveTabView, openTab } from "./components/tabs.js";
 import { getCurrentMessage, initViewer, popOutCurrentMessage, printCurrentMessage, toggleFullscreenPreview, showPreviewBodyMenu, wrapHtmlBody } from "./components/message-viewer.js";
@@ -2454,18 +2454,16 @@ function doSearch(immediate = false) {
         serverSearchTimer = null;
     }
     cancelServerSearch();
-    // "This folder" scope: instant client-side filter of the visible rows.
-    // Only when the server checkbox is OFF — with it on we want the real
-    // local+server search, not a row filter.
-    if (localScope === "current" && !serverOn && !immediate) {
-        // Register as a live list filter (not a raw DOM toggle) so it survives
-        // background sync reloads and blocks reloadCurrentFolder — otherwise a
-        // sync mid-read wipes the filter, deselects the open message, and pops
-        // back to the full list while the search box still shows the query
-        // (Bob 2026-05-31). setLiveFilter applies the hide to current rows.
-        setLiveFilter(query);
-        return;
-    }
+    // "This folder" scope used to be an instant client-side filter of the
+    // VISIBLE rows. That was doubly wrong (Bob 2026-06-12): it only saw the
+    // loaded page (so a match deeper in a big folder like Trash never showed),
+    // and it did a dumb substring match that didn't understand qualifiers
+    // (`from:amazon` matched the literal text and so found nothing). "This
+    // folder" now runs the REAL DB search below (scope="current"), which the
+    // service scopes to the current folder AND forces includeTrashSpam=true —
+    // so searching inside Trash finds Trash messages, and `from:`/`subject:`
+    // qualifiers work. The DB FTS pass is sub-second, so we don't lose the
+    // instant feel. (Server checkbox still adds the cross-folder IMAP sweep.)
     // ── Phase 1: LOCAL search — always, immediately ──
     // The local SQLite store is fast; results paint as the user types.
     const localScopeEff = localScope === "current" ? "current" : "all";