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/EntryDAO.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/EntryDAO.php')
| -rw-r--r-- | app/Models/EntryDAO.php | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php index f9bf57220..525687c90 100644 --- a/app/Models/EntryDAO.php +++ b/app/Models/EntryDAO.php @@ -1170,7 +1170,7 @@ SQL; } /** - * @phpstan-param 'a'|'A'|'i'|'s'|'S'|'c'|'f'|'t'|'T'|'ST' $type + * @phpstan-param 'a'|'A'|'i'|'s'|'S'|'c'|'f'|'t'|'T'|'ST'|'Z' $type * @param int $id category/feed/tag ID * @param 'ASC'|'DESC' $order * @return array{0:array<int|string>,1:string} @@ -1185,13 +1185,16 @@ SQL; $where = ''; $values = []; switch ($type) { - case 'a': //All PRIORITY_MAIN_STREAM + case 'a': // All PRIORITY_MAIN_STREAM $where .= 'f.priority >= ' . FreshRSS_Feed::PRIORITY_MAIN_STREAM . ' '; break; - case 'A': //All except PRIORITY_ARCHIVED - $where .= 'f.priority > ' . FreshRSS_Feed::PRIORITY_ARCHIVED . ' '; + case 'A': // All except PRIORITY_ARCHIVED + $where .= 'f.priority >= ' . FreshRSS_Feed::PRIORITY_CATEGORY . ' '; + break; + case 'Z': // All including PRIORITY_ARCHIVED + $where .= 'f.priority >= ' . FreshRSS_Feed::PRIORITY_ARCHIVED . ' '; break; - case 'i': //Priority important feeds + case 'i': // Priority important feeds $where .= 'f.priority >= ' . FreshRSS_Feed::PRIORITY_IMPORTANT . ' '; break; case 's': //Starred. Deprecated: use $state instead @@ -1240,7 +1243,7 @@ SQL; } /** - * @phpstan-param 'a'|'A'|'s'|'S'|'i'|'c'|'f'|'t'|'T'|'ST' $type + * @phpstan-param 'a'|'A'|'s'|'S'|'i'|'c'|'f'|'t'|'T'|'ST'|'Z' $type * @param 'ASC'|'DESC' $order * @param int $id category/feed/tag ID * @throws FreshRSS_EntriesGetter_Exception @@ -1275,7 +1278,7 @@ SQL; } /** - * @phpstan-param 'a'|'A'|'s'|'S'|'i'|'c'|'f'|'t'|'T'|'ST' $type + * @phpstan-param 'a'|'A'|'s'|'S'|'i'|'c'|'f'|'t'|'T'|'ST'|'Z' $type * @param int $id category/feed/tag ID * @param 'ASC'|'DESC' $order * @return Traversable<FreshRSS_Entry> @@ -1341,7 +1344,7 @@ SQL; } /** - * @phpstan-param 'a'|'A'|'s'|'S'|'c'|'f'|'t'|'T'|'ST' $type + * @phpstan-param 'a'|'A'|'s'|'S'|'c'|'f'|'t'|'T'|'ST'|'Z' $type * @param int $id category/feed/tag ID * @param 'ASC'|'DESC' $order * @return array<numeric-string>|null |