From 6b14a743ccfe5c14e15acac858c0906f4fccdf67 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 15 Dec 2024 12:34:18 +0100 Subject: New state: favorite or unread (#7088) * New state: favorite or unread https://github.com/FreshRSS/FreshRSS/discussions/7078#discussioncomment-11526292 * Experiment using this state by default * Rework state * Allow ANDS for typos * Revert change unrelated to this PR * Revert change of default state * Add option *unread_or_favorite* * Fix hide_read_feeds * i18n: it Co-authored-by: UserRoot-Luca <55756898+UserRoot-Luca@users.noreply.github.com> * Update app/i18n/pl/conf.php Co-authored-by: Zic <55097497+ZicPL@users.noreply.github.com> * Update app/i18n/pl/conf.php Co-authored-by: Zic <55097497+ZicPL@users.noreply.github.com> * Fix i18n * Fix auto_remove_article * Fix mark_unread_enabled --------- Co-authored-by: UserRoot-Luca <55756898+UserRoot-Luca@users.noreply.github.com> Co-authored-by: Zic <55097497+ZicPL@users.noreply.github.com> --- app/Models/Entry.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app/Models/Entry.php') diff --git a/app/Models/Entry.php b/app/Models/Entry.php index 47d244bee..36ed11b40 100644 --- a/app/Models/Entry.php +++ b/app/Models/Entry.php @@ -9,6 +9,10 @@ class FreshRSS_Entry extends Minz_Model { public const STATE_ALL = 3; public const STATE_FAVORITE = 4; public const STATE_NOT_FAVORITE = 8; + public const STATE_ANDS = self::STATE_READ | self::STATE_NOT_READ | self::STATE_FAVORITE | self::STATE_NOT_FAVORITE; + public const STATE_OR_NOT_READ = 32; + public const STATE_OR_FAVORITE = 64; + public const STATE_ORS = self::STATE_OR_NOT_READ | self::STATE_OR_FAVORITE; /** @var numeric-string */ private string $id = '0'; -- cgit v1.2.3