From 4b091fb90b37445bdb0fd4b822416b354909b36c Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Fri, 30 Oct 2026 21:08:27 +0100
Subject: [PATCH] fix "Mark all as read" ignoring active search filter (#2354)

---
 commafeed-client/src/app/entries/thunks.ts                  | 6 +++---
 .../src/components/MarkAllAsReadConfirmationDialog.tsx      | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/commafeed-client/src/app/entries/thunks.ts b/commafeed-client/src/app/entries/thunks.ts
index 8fe8f0da..14b57830 100644
--- a/commafeed-client/src/app/entries/thunks.ts
+++ b/commafeed-client/src/app/entries/thunks.ts
@@ -40,9 +40,7 @@ export const loadMoreEntries = createAppAsyncThunk("entries/loadMore", async (_,
     const state = thunkApi.getState()
     const { source } = state.entries
     const offset =
-        state.user.settings?.readingMode === "all" ||
-        state.entries.search ||
-        (source.type === "category" && source.id === "starred")
+        state.user.settings?.readingMode === "all" || state.entries.search || (source.type === "category" && source.id === "starred")
             ? state.entries.entries.length
             : state.entries.entries.filter(e => !e.read).length
     const endpoint = getEndpoint(state.entries.source.type)
@@ -139,6 +137,7 @@ export const markAllAsReadWithConfirmationIfRequired = createAppAsyncThunk(
         const state = thunkApi.getState()
         const source = state.entries.source
         const entriesTimestamp = state.entries.timestamp ?? Date.now()
+        const search = state.entries.search
         const markAllAsReadConfirmation = state.user.settings?.markAllAsReadConfirmation
         const markAllAsReadNavigateToNextUnread = state.user.settings?.markAllAsReadNavigateToNextUnread
 
@@ -153,6 +152,7 @@ export const markAllAsReadWithConfirmationIfRequired = createAppAsyncThunk(
                         read: true,
                         olderThan: Date.now(),
                         insertedBefore: entriesTimestamp,
+                        keywords: search,
                     },
                 })
             )
diff --git a/commafeed-client/src/components/MarkAllAsReadConfirmationDialog.tsx b/commafeed-client/src/components/MarkAllAsReadConfirmationDialog.tsx
index 57668d2f..bed3d46b 100644
--- a/commafeed-client/src/components/MarkAllAsReadConfirmationDialog.tsx
+++ b/commafeed-client/src/components/MarkAllAsReadConfirmationDialog.tsx
@@ -13,6 +13,7 @@ export function MarkAllAsReadConfirmationDialog() {
     const source = useAppSelector(state => state.entries.source)
     const sourceLabel = useAppSelector(state => state.entries.sourceLabel)
     const entriesTimestamp = useAppSelector(state => state.entries.timestamp) ?? Date.now()
+    const search = useAppSelector(state => state.entries.search)
     const markAllAsReadNavigateToNextUnread = useAppSelector(state => state.user.settings?.markAllAsReadNavigateToNextUnread)
     const dispatch = useAppDispatch()
 
@@ -26,6 +27,7 @@ export function MarkAllAsReadConfirmationDialog() {
                     read: true,
                     olderThan: Date.now() - threshold * 24 * 60 * 60 * 1000,
                     insertedBefore: entriesTimestamp,
+                    keywords: search,
                 },
             })
         )