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/Controllers | |
| 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/Controllers')
| -rw-r--r-- | app/Controllers/entryController.php | 8 | ||||
| -rw-r--r-- | app/Controllers/indexController.php | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php index 2cbd256bc..5637bd101 100644 --- a/app/Controllers/entryController.php +++ b/app/Controllers/entryController.php @@ -96,6 +96,14 @@ class FreshRSS_entry_Controller extends FreshRSS_ActionController { $entryDAO->markReadEntries($id_max, false, FreshRSS_Feed::PRIORITY_MAIN_STREAM, FreshRSS_Feed::PRIORITY_IMPORTANT, FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read); break; + case 'A': + $entryDAO->markReadEntries($id_max, false, FreshRSS_Feed::PRIORITY_CATEGORY, FreshRSS_Feed::PRIORITY_IMPORTANT, + FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read); + break; + case 'Z': + $entryDAO->markReadEntries($id_max, false, FreshRSS_Feed::PRIORITY_ARCHIVED, FreshRSS_Feed::PRIORITY_IMPORTANT, + FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read); + break; case 'i': $entryDAO->markReadEntries($id_max, false, FreshRSS_Feed::PRIORITY_IMPORTANT, null, FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read); diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php index a977386a3..70bb25a77 100644 --- a/app/Controllers/indexController.php +++ b/app/Controllers/indexController.php @@ -205,7 +205,9 @@ class FreshRSS_index_Controller extends FreshRSS_ActionController { $this->view->excludeMutedFeeds = $type !== 'f'; // Exclude muted feeds except when we focus on a feed switch ($type) { - case 'a': + case 'a': // All PRIORITY_MAIN_STREAM + case 'A': // All except PRIORITY_ARCHIVED + case 'Z': // All including PRIORITY_ARCHIVED $this->view->categories = FreshRSS_Context::categories(); break; case 'c': |