@bobfrankston/rmfmail 1.0.567 → 1.0.570

package/packages/mailx-store/db.ts

@@ -2286,7 +2286,7 @@ export class MailxDB {
     // ── Search ──
 
     /** Full-text search across all messages. Supports qualifiers: from:, to:, subject: */
-    searchMessages(query: string, page = 1, pageSize = 50, accountId?: string, folderId?: number): PagedResult<MessageEnvelope> {
+    searchMessages(query: string, page = 1, pageSize = 50, accountId?: string, folderId?: number, includeTrashSpam = false): PagedResult<MessageEnvelope> {
         query = (query || "").trim();
         // Parse qualifiers (C45: extended set — date:, has:, is:, folder:).
         let ftsQuery = "";
@@ -2386,13 +2386,24 @@ export class MailxDB {
                 scopeWhere = " AND m.account_id = ?";
                 scopeParams.push(accountId);
             }
+            // Global / account-wide search excludes trash + junk unless the
+            // user opted in. A user typing "invoice" in the search box almost
+            // never wants the deleted/spam copy that's already filtered out
+            // of every other view. When the user IS explicitly scoped to
+            // trash/junk via folderId, this guard is skipped.
+            if (!includeTrashSpam && !folderId) {
+                scopeWhere += " AND (f.special_use IS NULL OR f.special_use NOT IN ('trash','junk'))";
+            }
             if (extraWhere.length > 0) {
                 scopeWhere += " AND " + extraWhere.join(" AND ");
                 scopeParams.push(...extraParams);
             }
 
             const countRow = this.db.prepare(
-                `SELECT COUNT(*) as cnt FROM messages m JOIN messages_fts fts ON m.id = fts.rowid WHERE messages_fts MATCH ?${scopeWhere}`
+                `SELECT COUNT(*) as cnt FROM messages m
+                 JOIN messages_fts fts ON m.id = fts.rowid
+                 LEFT JOIN folders f ON f.id = m.folder_id AND f.account_id = m.account_id
+                 WHERE messages_fts MATCH ?${scopeWhere}`
             ).get(ftsQuery, ...scopeParams) as any;
             const total = countRow?.cnt || 0;