From 39cc1c11ec596176e842cc98e6a54337e3c04d7e Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Mon, 26 Feb 2024 09:01:03 +0100 Subject: New feature: shareable user query (#6052) * New feature: shareable user query Share the output of a user query by RSS / HTML / OPML with other people through unique URLs. Replaces the global admin token, which was the only option (but unsafe) to share RSS outputs with other people. Also add a new HTML output for people without an RSS reader. fix https://github.com/FreshRSS/FreshRSS/issues/3066#issuecomment-648977890 fix https://github.com/FreshRSS/FreshRSS/issues/3178#issuecomment-769435504 * Remove unused method * Fix token saving * Implement HTML view * Update i18n for master token * Revert i18n get_favorite * Fix missing i18n for user queries from before this PR * Remove irrelevant tests * Add link to RSS version * Fix getGet * Fix getState * Fix getSearch * Alternative getSearch * Default getOrder * Explicit default state * Fix test * Add OPML sharing * Remove many redundant SQL queries from original implementation of user queries * Fix article tags * Use default user settings * Prepare public search * Fixes * Allow user search on article tags * Implement user search * Revert filter bug * Revert wrong SQL left outer join change * Implement checkboxes * Safe check of OPML * Fix label * Remove RSS button to favour new sharing method That sharing button was using a global admin token * First version of HTTP 304 * Disallow some recusrivity fix https://github.com/FreshRSS/FreshRSS/issues/6086 * Draft of nav * Minor httpConditional * Add support for offset for pagination * Fix offset pagination * Fix explicit order ASC * Add documentation * Help links i18n * Note about deprecated master token * Typo * Doc about format --- app/Models/View.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'app/Models/View.php') diff --git a/app/Models/View.php b/app/Models/View.php index 4dd0be36a..2595cd1fa 100644 --- a/app/Models/View.php +++ b/app/Models/View.php @@ -10,7 +10,7 @@ class FreshRSS_View extends Minz_View { public $callbackBeforeFeeds; /** @var callable */ public $callbackBeforePagination; - /** @var array */ + /** @var array */ public array $categories; public ?FreshRSS_Category $category; public ?FreshRSS_Tag $tag; @@ -18,11 +18,11 @@ class FreshRSS_View extends Minz_View { /** @var iterable */ public $entries; public FreshRSS_Entry $entry; - public ?FreshRSS_Feed $feed; - /** @var array */ + public FreshRSS_Feed $feed; + /** @var array */ public array $feeds; public int $nbUnreadTags; - /** @var array */ + /** @var array */ public array $tags; /** @var array */ public array $tagsForEntry; @@ -100,6 +100,8 @@ class FreshRSS_View extends Minz_View { public int $nbPage; // RSS view + public FreshRSS_UserQuery $userQuery; + public string $html_url = ''; public string $rss_title = ''; public string $rss_url = ''; public string $rss_base = ''; -- cgit v1.2.3