From f8310a587c26b0965bab71abfeb2d018e414f572 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 15 Sep 2025 23:43:46 +0200
Subject: Clarify: Visibility hidden vs. archived (#7970)

fix https://github.com/FreshRSS/FreshRSS/issues/7887
We have two concepts: how much a feed is shown or not (controlled by priority), and how often a feed is refreshed (or not, in which case it is archived).
This PR removes the wording *Archived* from the *visibility* parameter, since this is not what it does.
---
 app/Models/Context.php   | 4 ++--
 app/Models/EntryDAO.php  | 8 ++++----
 app/Models/Feed.php      | 2 ++
 app/Models/UserQuery.php | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'app/Models')

diff --git a/app/Models/Context.php b/app/Models/Context.php
index 76a51c7ef..efe36f0e2 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -416,12 +416,12 @@ final class FreshRSS_Context {
 				self::$description = FreshRSS_Context::systemConf()->meta_description;
 				self::$get_unread = self::$total_unread;
 				break;
-			case 'A':	// All except PRIORITY_ARCHIVED
+			case 'A':	// All except PRIORITY_HIDDEN
 				self::$current_get['A'] = true;
 				self::$description = FreshRSS_Context::systemConf()->meta_description;
 				self::$get_unread = self::$total_unread;
 				break;
-			case 'Z':	// All including PRIORITY_ARCHIVED
+			case 'Z':	// All including PRIORITY_HIDDEN
 				self::$current_get['Z'] = true;
 				self::$name = _t('index.feed.title');
 				self::$description = FreshRSS_Context::systemConf()->meta_description;
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index cd7bcd2ff..ec3bde412 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -1339,17 +1339,17 @@ SQL;
 			case 'a':	// All PRIORITY_MAIN_STREAM
 				$where .= 'f.priority >= ' . FreshRSS_Feed::PRIORITY_MAIN_STREAM . ' ';
 				break;
-			case 'A':	// All except PRIORITY_ARCHIVED
+			case 'A':	// All except PRIORITY_HIDDEN
 				$where .= 'f.priority >= ' . FreshRSS_Feed::PRIORITY_CATEGORY . ' ';
 				break;
-			case 'Z':	// All including PRIORITY_ARCHIVED
-				$where .= 'f.priority >= ' . FreshRSS_Feed::PRIORITY_ARCHIVED . ' ';
+			case 'Z':	// All including PRIORITY_HIDDEN
+				$where .= 'f.priority >= ' . FreshRSS_Feed::PRIORITY_HIDDEN . ' ';
 				break;
 			case 'i':	// Priority important feeds
 				$where .= 'f.priority >= ' . FreshRSS_Feed::PRIORITY_IMPORTANT . ' ';
 				break;
 			case 's':	//Starred. Deprecated: use $state instead
-				$where .= 'f.priority > ' . FreshRSS_Feed::PRIORITY_ARCHIVED . ' ';
+				$where .= 'f.priority > ' . FreshRSS_Feed::PRIORITY_HIDDEN . ' ';
 				$where .= 'AND e.is_favorite=1 ';
 				break;
 			case 'S':	//Starred
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index f85db0f2f..e368a6807 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -38,6 +38,8 @@ class FreshRSS_Feed extends Minz_Model {
 	public const PRIORITY_IMPORTANT = 20;
 	public const PRIORITY_MAIN_STREAM = 10;
 	public const PRIORITY_CATEGORY = 0;
+	public const PRIORITY_HIDDEN = -10;
+	/** @deprecated use PRIORITY_HIDDEN instead */
 	public const PRIORITY_ARCHIVED = -10;
 
 	public const TTL_DEFAULT = 0;
diff --git a/app/Models/UserQuery.php b/app/Models/UserQuery.php
index c78eeccd3..077ae0b90 100644
--- a/app/Models/UserQuery.php
+++ b/app/Models/UserQuery.php
@@ -140,10 +140,10 @@ class FreshRSS_UserQuery {
 				case 'a':	// All PRIORITY_MAIN_STREAM
 					$this->get_type = 'all';
 					break;
-				case 'A':	// All except PRIORITY_ARCHIVED
+				case 'A':	// All except PRIORITY_HIDDEN
 					$this->get_type = 'A';
 					break;
-				case 'Z':	// All including PRIORITY_ARCHIVED
+				case 'Z':	// All including PRIORITY_HIDDEN
 					$this->get_type = 'Z';
 					break;
 				case 'c':
-- 
cgit v1.2.3