From 4b6127ee04229ac64d74076933e800601df884c0 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 13 Dec 2025 11:38:33 +0100 Subject: New links in transitions and jump to next transition (#8294) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Easier to explain graphically: image The jump to next section ⏭ works when the sorting criterion is a date. Need https://github.com/FreshRSS/FreshRSS/pull/8293 --- app/Controllers/indexController.php | 37 ++++++++++++++++++++++++++++++++++--- app/views/index/normal.phtml | 7 +++++-- lib/Minz/Request.php | 1 + p/themes/base-theme/frss.css | 9 +++++++++ p/themes/base-theme/frss.rtl.css | 9 +++++++++ 5 files changed, 58 insertions(+), 5 deletions(-) diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php index 3961a3fcd..c51dd6662 100644 --- a/app/Controllers/indexController.php +++ b/app/Controllers/indexController.php @@ -52,10 +52,9 @@ class FreshRSS_index_Controller extends FreshRSS_ActionController { /** * Content for displaying a transition between entries when sorting by specific criteria. - * @param 'id'|'c.name'|'date'|'f.name'|'link'|'title'|'rand'|'lastUserModified'|'length' $sort */ - public static function transition(FreshRSS_Entry $entry, string $sort): string { - return match ($sort) { + public static function transition(FreshRSS_Entry $entry): string { + return match (FreshRSS_Context::$sort) { 'id' => _t('index.feed.received' . self::dayRelative($entry->dateAdded(raw: true), mayBeFuture: false)) . ' — ' . timestamptodate($entry->dateAdded(raw: true), hour: false), 'date' => _t('index.feed.published' . self::dayRelative($entry->date(raw: true), mayBeFuture: true)) . @@ -68,6 +67,38 @@ class FreshRSS_index_Controller extends FreshRSS_ActionController { }; } + /** + * Produce a hyperlink to the next transition of entries. + */ + public static function transitionLink(FreshRSS_Entry $entry, int $offset = 0): string { + if (in_array(FreshRSS_Context::$sort, ['c.name', 'f.name'], true)) { + return Minz_Url::display(Minz_Request::modifiedCurrentRequest([ + 'get' => match (FreshRSS_Context::$sort) { + 'c.name' => 'c_' . ($entry->feed()?->category()?->id() ?? '0'), + 'f.name' => 'f_' . ($entry->feed()?->id() ?? '0'), + }, + ])); + } + $operator = match (FreshRSS_Context::$sort) { + 'id' => 'date', + 'date' => 'pubdate', + 'lastUserModified' => 'userdate', + default => throw new InvalidArgumentException('Unsupported sort criterion for transition: ' . FreshRSS_Context::$sort), + }; + $offset = FreshRSS_Context::$order === 'ASC' ? $offset : -$offset; + $timestamp = match (FreshRSS_Context::$sort) { + 'id' => $entry->dateAdded(raw: true), + 'date' => $entry->date(raw: true), + 'lastUserModified' => $entry->lastUserModified(), + default => throw new InvalidArgumentException('Unsupported sort criterion for transition: ' . FreshRSS_Context::$sort), + }; + $searchString = $operator . ':' . ($offset < 0 ? '/' : '') . date('Y-m-d', $timestamp + ($offset * 86400)) . ($offset > 0 ? '/' : ''); + return Minz_Url::display(Minz_Request::modifiedCurrentRequest([ + 'search' => FreshRSS_Context::$search->getRawInput() === '' ? $searchString : + FreshRSS_Context::$search->enforce(new FreshRSS_Search($searchString))->__toString(), + ])); + } + /** * This action displays the normal view of FreshRSS. */ diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml index 2eb512f2e..dd15f9b0e 100644 --- a/app/views/index/normal.phtml +++ b/app/views/index/normal.phtml @@ -59,14 +59,17 @@ $today = @strtotime('today'); $this->entry->feed() ?? FreshRSS_Feed::default(); $this->entry->_feed($this->feed); - if ($last_transition !== ($transition = FreshRSS_index_Controller::transition($this->entry, FreshRSS_Context::$sort))) { + if ($last_transition !== ($transition = FreshRSS_index_Controller::transition($this->entry))) { $last_transition = $transition; ?>
show_favicons): ?> ✇ - + + + ⏭ +