From 897e4a3f4a273d50c28157edb67612b2d7fa2e6f Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Fri, 27 Dec 2024 12:03:59 +0100 Subject: Search in all feeds (#7144) * Search in all feeds Search in PRIORITY_ARCHIVED with `&get=A` fix https://github.com/FreshRSS/FreshRSS/discussions/7143 * Fix type * Search in PRIORITY_ARCHIVED with `&get=Z` * More * Fixes * One more fix * Extra features in user queries * Move i18n key * Fix overview * Enlarge query boxes * Revert i18n spelling * i18n: it Thanks @UserRoot-Luca Co-authored-by: UserRoot-Luca <55756898+UserRoot-Luca@users.noreply.github.com> --------- Co-authored-by: UserRoot-Luca <55756898+UserRoot-Luca@users.noreply.github.com> --- app/Models/UserQuery.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'app/Models/UserQuery.php') diff --git a/app/Models/UserQuery.php b/app/Models/UserQuery.php index d3a56bb6a..6933deb1f 100644 --- a/app/Models/UserQuery.php +++ b/app/Models/UserQuery.php @@ -126,12 +126,18 @@ class FreshRSS_UserQuery { $this->get = $get; if ($this->get === '') { $this->get_type = 'all'; - } elseif (preg_match('/(?P[acfistT])(_(?P\d+))?/', $get, $matches)) { + } elseif (preg_match('/(?P[aAcfistTZ])(_(?P\d+))?/', $get, $matches)) { $id = intval($matches['id'] ?? '0'); switch ($matches['type']) { - case 'a': + case 'a': // All PRIORITY_MAIN_STREAM $this->get_type = 'all'; break; + case 'A': // All except PRIORITY_ARCHIVED + $this->get_type = 'A'; + break; + case 'Z': // All including PRIORITY_ARCHIVED + $this->get_type = 'Z'; + break; case 'c': $this->get_type = 'category'; $c = $this->categories[$id] ?? null; -- cgit v1.2.3