From 49766ab01f24d1be5743c353b9a6d4d09f55f5b8 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 27 Mar 2025 22:10:16 +0300
Subject: filter test dialog improvements:

 - properly return results for filter rules matching specific feeds or
   categories
 - fix test results never returned for Uncategorized
 - show tooltip with specific word match and matched rule on resulting
   item hover
---
 classes/Pref_Filters.php | 32 +++++++++++++++++++++++++++++---
 js/CommonFilters.js      |  7 +++++--
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/classes/Pref_Filters.php b/classes/Pref_Filters.php
index cfad881a4..1ca542285 100644
--- a/classes/Pref_Filters.php
+++ b/classes/Pref_Filters.php
@@ -70,6 +70,7 @@ class Pref_Filters extends Handler_Protected {
 		$offset = (int) clean($_REQUEST["offset"]);
 		$limit = (int) clean($_REQUEST["limit"]);
 
+		// catchall fake filter which includes all rules
 		$filter = [
 			'enabled' => true,
 			'match_any_rule' => checkbox_to_sql_bool($_REQUEST['match_any_rule'] ?? false),
@@ -103,7 +104,10 @@ class Pref_Filters extends Handler_Protected {
 				foreach ($rule["feed_id"] as $feed_id) {
 					if (str_starts_with("$feed_id", "CAT:")) {
 						$cat_id = (int) substr("$feed_id", 4);
-						array_push($scope_inner_qparts, "cat_id = " . $cat_id);
+						if ($cat_id > 0)
+							array_push($scope_inner_qparts, "cat_id = " . $cat_id);
+						else
+							array_push($scope_inner_qparts, "cat_id IS NULL");
 					} else if (is_numeric($feed_id) && $feed_id > 0) {
 						array_push($scope_inner_qparts, "feed_id = " . (int)$feed_id);
 					}
@@ -137,8 +141,29 @@ class Pref_Filters extends Handler_Protected {
 		];
 
 		foreach ($entries as $entry) {
-			$rc = RSSUtils::get_article_filters(array($filter), $entry['title'], $entry['content'], $entry['link'],
-				$entry['author'], explode(",", $entry['tag_cache']));
+
+			// temporary filter which will be used to compare against returned article
+			$feed_filter = $filter;
+			$feed_filter['rules'] = [];
+
+			// only add rules which match result from specific feed or category ID or rules matching all feeds
+			// @phpstan-ignore foreach.emptyArray
+			foreach ($filter['rules'] as $rule) {
+				foreach ($rule['feed_id'] as $rule_feed) {
+					if (($rule_feed === 'CAT:0' && $entry['cat_id'] === null) || 			// rule matches Uncategorized
+							$rule_feed === 'CAT:' . $entry['cat_id'] ||                    // rule matches category
+							$rule_feed === $entry['feed_id'] ||                            // rule matches feed
+							$rule_feed === '0') {                                          // rule matches all feeds
+
+						$feed_filter['rules'][] = $rule;
+					}
+				}
+			}
+
+			$matched_rules = [];
+
+			$rc = RSSUtils::get_article_filters([$feed_filter], $entry['title'], $entry['content'], $entry['link'],
+				$entry['author'], explode(",", $entry['tag_cache']), $matched_rules);
 
 			if (count($rc) > 0) {
 				$entry["content_preview"] = truncate_string(strip_tags($entry["content"]), 200, '&hellip;');
@@ -156,6 +181,7 @@ class Pref_Filters extends Handler_Protected {
 					'feed_title' => $entry['feed_title'],
 					'date' => mb_substr($entry['date_entered'], 0, 16),
 					'content_preview' => $entry['content_preview'],
+					'matched_rules' => $matched_rules,
 				];
 			}
 		}
diff --git a/js/CommonFilters.js b/js/CommonFilters.js
index b7bb69a15..83bc4cae9 100644
--- a/js/CommonFilters.js
+++ b/js/CommonFilters.js
@@ -19,6 +19,9 @@ const	Filters = {
 			ACTION_REMOVE_TAG: 10,
 			PARAM_ACTIONS: [4, 6, 7, 9, 10],
 			filter_info: {},
+			formatMatchedRules: function(rules) {
+				return rules.map((r) => r.regexp_matches[0] + ' - ' + r.reg_exp).join('\n');
+			},
 			test: function() {
 				const test_dialog = new fox.SingleUseDialog({
 					title: "Test Filter",
@@ -43,8 +46,8 @@ const	Filters = {
 												.replace("%f", test_dialog.results)
 												.replace("%d", offset);
 
-										results_list.innerHTML += result.items.reduce((current, item) => current + `<li><span class='title'>${item.title}</span><br>
-												<span class='feed'>${item.feed_title}</span>, <span class='date'>${item.date}</span>
+										results_list.innerHTML += result.items.reduce((current, item) => current + `<li title="${App.escapeHtml(dialog.formatMatchedRules(item.matched_rules))}"><span class='title'>${item.title}</span>
+												&mdash; <span class='feed'>${item.feed_title}</span>, <span class='date'>${item.date}</span>
 												<div class='preview text-muted'>${item.content_preview}</div></li>`, '');
 
 										// get the next batch if there may be more available and testing limits haven't been reached
-- 
cgit v1.2.3-54-g00ecf