From 085a3cbb50e7fa54334fa18504cddb41331a6b7e Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Mon, 21 Jul 2025 16:17:53 +0200
Subject: [PATCH] unwanted entries are already filtered at the dao level

---
 .../com/commafeed/backend/feed/FeedUtils.java | 25 -------------------
 .../frontend/resource/CategoryREST.java       |  2 --
 .../commafeed/frontend/resource/FeedREST.java |  2 --
 3 files changed, 29 deletions(-)

diff --git a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedUtils.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedUtils.java
index 1ecdf067..566f116b 100644
--- a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedUtils.java
+++ b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedUtils.java
@@ -1,17 +1,13 @@
 package com.commafeed.backend.feed;
 
-import java.util.List;
-
 import org.apache.commons.lang3.StringUtils;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
-import com.commafeed.backend.feed.FeedEntryKeyword.Mode;
 import com.commafeed.backend.feed.parser.TextDirectionDetector;
 import com.commafeed.backend.model.FeedSubscription;
-import com.commafeed.frontend.model.Entry;
 
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
@@ -72,25 +68,4 @@ public class FeedUtils {
 		return "rest/server/proxy?u=" + ImageProxyUrl.encode(url);
 	}
 
-	public static void removeUnwantedFromSearch(List<Entry> entries, List<FeedEntryKeyword> keywords) {
-		if (keywords.isEmpty()) {
-			return;
-		}
-
-		entries.removeIf(e -> {
-			String title = e.getTitle() == null ? null : Jsoup.parse(e.getTitle()).text();
-			String content = e.getContent() == null ? null : Jsoup.parse(e.getContent()).text();
-			for (FeedEntryKeyword keyword : keywords) {
-				boolean condition = !StringUtils.containsIgnoreCase(content, keyword.getKeyword())
-						&& !StringUtils.containsIgnoreCase(title, keyword.getKeyword());
-				if (keyword.getMode() == Mode.EXCLUDE) {
-					condition = !condition;
-				}
-				if (condition) {
-					return true;
-				}
-			}
-			return false;
-		});
-	}
 }
diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/CategoryREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/CategoryREST.java
index f8a4dc99..a914eb6a 100644
--- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/CategoryREST.java
+++ b/commafeed-server/src/main/java/com/commafeed/frontend/resource/CategoryREST.java
@@ -34,7 +34,6 @@ import com.commafeed.backend.dao.FeedCategoryDAO;
 import com.commafeed.backend.dao.FeedEntryStatusDAO;
 import com.commafeed.backend.dao.FeedSubscriptionDAO;
 import com.commafeed.backend.feed.FeedEntryKeyword;
-import com.commafeed.backend.feed.FeedUtils;
 import com.commafeed.backend.model.FeedCategory;
 import com.commafeed.backend.model.FeedEntryStatus;
 import com.commafeed.backend.model.FeedSubscription;
@@ -184,7 +183,6 @@ public class CategoryREST {
 
 		entries.setTimestamp(System.currentTimeMillis());
 		entries.setIgnoredReadStatus(STARRED.equals(id) || keywords != null || tag != null);
-		FeedUtils.removeUnwantedFromSearch(entries.getEntries(), entryKeywords);
 		return Response.ok(entries).build();
 	}
 
diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java
index 355bfbd8..9f8113b3 100644
--- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java
+++ b/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java
@@ -42,7 +42,6 @@ import com.commafeed.backend.feed.FeedEntryKeyword;
 import com.commafeed.backend.feed.FeedFetcher;
 import com.commafeed.backend.feed.FeedFetcher.FeedFetcherResult;
 import com.commafeed.backend.feed.FeedRefreshEngine;
-import com.commafeed.backend.feed.FeedUtils;
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedCategory;
 import com.commafeed.backend.model.FeedEntry;
@@ -190,7 +189,6 @@ public class FeedREST {
 
 		entries.setTimestamp(System.currentTimeMillis());
 		entries.setIgnoredReadStatus(keywords != null);
-		FeedUtils.removeUnwantedFromSearch(entries.getEntries(), entryKeywords);
 		return Response.ok(entries).build();
 	}