diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2024-12-27 12:03:59 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2024-12-27 12:03:59 +0100 |
| commit | 897e4a3f4a273d50c28157edb67612b2d7fa2e6f (patch) | |
| tree | 5ea452b4edb58e272522a2932f42128d581ce1d9 /app/Models/UserQuery.php | |
| parent | 1d10b3697d5fa04415d36059d5e04ad71aae0b78 (diff) | |
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>
Diffstat (limited to 'app/Models/UserQuery.php')
| -rw-r--r-- | app/Models/UserQuery.php | 10 |
1 files changed, 8 insertions, 2 deletions
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<type>[acfistT])(_(?P<id>\d+))?/', $get, $matches)) { + } elseif (preg_match('/(?P<type>[aAcfistTZ])(_(?P<id>\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; |