Rework encoding of search filters (#8324)

Rework:
* https://github.com/FreshRSS/FreshRSS/pull/8222

now that we have:
* https://github.com/FreshRSS/FreshRSS/pull/8293

Follow-up of:
* https://github.com/FreshRSS/FreshRSS/pull/8311

* More simplification

* Deprecate getRawInput

1 files changed, 11 insertions, 6 deletions

diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php
index ad9b05787..02942583f 100644
--- a/app/Controllers/subscriptionController.php
+++ b/app/Controllers/subscriptionController.php
@@ -247,7 +247,7 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController {
 				]);
 			}
 
-			$feed->_filtersAction('read', Minz_Request::paramTextToArray('filteractions_read'));	// Keep as HTML
+			$feed->_filtersAction('read', Minz_Request::paramTextToArray('filteractions_read', plaintext: true));
 
 			$feed->_kind(Minz_Request::paramInt('feed_kind') ?: FreshRSS_Feed::KIND_RSS);
 			if ($feed->kind() === FreshRSS_Feed::KIND_HTML_XPATH || $feed->kind() === FreshRSS_Feed::KIND_XML_XPATH) {
@@ -418,17 +418,22 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController {
 		$filteractions = Minz_Request::paramTextToArray('filteractions_read', plaintext: true);
 		$filteractions = array_map(fn(string $action): string => trim($action), $filteractions);
 		$filteractions = array_filter($filteractions, fn(string $action): bool => $action !== '');
-		$search = "f:$id (";
+		$actionsSearch = new FreshRSS_BooleanSearch('', operator: 'AND');
 		foreach ($filteractions as $action) {
-			$search .= "($action) OR ";
+			$actionSearch = new FreshRSS_BooleanSearch($action, operator: 'OR');
+			if ($actionSearch->__toString() === '') {
+				continue;
+			}
+			$actionsSearch->add($actionSearch);
 		}
-		$search = preg_replace('/ OR $/', '', $search);
-		$search .= ')';
+		$search = new FreshRSS_BooleanSearch('');
+		$search->add(new FreshRSS_Search("f:$id"));
+		$search->add($actionsSearch);
 		Minz_Request::forward([
 			'c' => 'index',
 			'a' => 'index',
 			'params' => [
-				'search' => $search,
+				'search' => $search->__toString(),
 			],
 		], redirect: true);
 	}