A free, self-hostable news aggregator…
Fix adaptive reading state after marking articles read (#9290)
Moraxcc45db5ef83d
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 51b23df7d..e8174d425 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -4,6 +4,9 @@ See also [the FreshRSS releases](https://github.com/FreshRSS/FreshRSS/releases).## 2026-XX-XX FreshRSS 1.30.1-dev+* Bug fixes+ * Restore the automatic reading view after marking articles as read, while preserving explicit filters [#9288](https://github.com/FreshRSS/FreshRSS/issues/9288)+## 2026-09-09 FreshRSS 1.30.0diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.phpindex 33f526781..37382a2db 100644--- a/app/Controllers/entryController.php+++ b/app/Controllers/entryController.php@@ -207,7 +207,7 @@ class FreshRSS_entry_Controller extends FreshRSS_ActionController {if ($search !== '') {$params['search'] = $search;}- $stateParam = Minz_Request::paramInt('state');+ $stateParam = FreshRSS_Context::getStateForRedirect();if ($stateParam !== 0) {$params['state'] = $stateParam;}diff --git a/app/Models/Context.php b/app/Models/Context.phpindex 2eec03f21..29a1688a7 100644--- a/app/Models/Context.php+++ b/app/Models/Context.php@@ -317,6 +317,11 @@ final class FreshRSS_Context {self::$sinceHours = Minz_Request::paramInt('hours');}+ /** Return the requested navigation state, or 0 to reapply the reading preference after the action. */+ public static function getStateForRedirect(): int {+ return Minz_Request::paramIntNull('stateForRedirect') ?? Minz_Request::paramInt('state');+ }+/*** Checks whether the $state parameter is consequential, i.e. has any effect* (not zero, and not just including opposite states).diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtmlindex e41ccb0bc..8ed94f768 100644--- a/app/layout/nav_menu.phtml+++ b/app/layout/nav_menu.phtml@@ -128,6 +128,7 @@'idMax' => FreshRSS_Context::$id_max,'search' => FreshRSS_Context::$search->toString(),'state' => FreshRSS_Context::$state,+ 'stateForRedirect' => FreshRSS_Context::getStateForRedirect(),'sort' => FreshRSS_Context::$sort,'order' => FreshRSS_Context::$order,'from' => Minz_Request::actionName(),diff --git a/app/views/helpers/stream-footer.phtml b/app/views/helpers/stream-footer.phtmlindex 2b6995196..44bbbd01e 100644--- a/app/views/helpers/stream-footer.phtml+++ b/app/views/helpers/stream-footer.phtml@@ -9,6 +9,7 @@$url_next['params']['idMax'] = FreshRSS_Context::$id_max;}$url_next['params']['state'] = (string)FreshRSS_Context::$state;+ $url_next['params']['stateForRedirect'] = FreshRSS_Context::getStateForRedirect();$url_next['params']['ajax'] = '1';$url_mark_read = [@@ -20,6 +21,7 @@'idMax' => FreshRSS_Context::$id_max,'search' => FreshRSS_Context::$search->toString(),'state' => FreshRSS_Context::$state,+ 'stateForRedirect' => FreshRSS_Context::getStateForRedirect(),'sort' => FreshRSS_Context::$sort,'order' => FreshRSS_Context::$order,'from' => Minz_Request::paramStringNull('from') ?? Minz_Request::actionName(),diff --git a/tests/app/Models/ContextTest.php b/tests/app/Models/ContextTest.phpnew file mode 100644index 000000000..f8e8afe8f--- /dev/null+++ b/tests/app/Models/ContextTest.php@@ -0,0 +1,41 @@+<?php+declare(strict_types=1);++use PHPUnit\Framework\Attributes\DataProvider;++final class ContextTest extends \PHPUnit\Framework\TestCase {++ /** @return Traversable<string,array{array<string,mixed>,int}> */+ public static function provideRedirectStates(): Traversable {+ yield 'default preference' => [[], 0];+ yield 'legacy unread filter' => [['state' => '2'], 2];+ yield 'legacy favourite filter' => [['state' => '4'], 4];+ yield 'legacy all articles' => [['state' => '3'], 3];+ yield 'automatic unread view' => [['state' => '2', 'stateForRedirect' => '0'], 0];+ yield 'automatic all view' => [['state' => '3', 'stateForRedirect' => '0'], 0];+ yield 'explicit unread view' => [['state' => '2', 'stateForRedirect' => '2'], 2];+ yield 'explicit favourite view' => [['state' => '4', 'stateForRedirect' => '4'], 4];+ yield 'original filter takes precedence' => [['state' => '2', 'stateForRedirect' => '4'], 4];+ yield 'integer zero remains automatic' => [['state' => 2, 'stateForRedirect' => 0], 0];+ yield 'invalid origin falls back' => [['state' => '2', 'stateForRedirect' => 'invalid'], 2];+ yield 'array origin falls back' => [['state' => '4', 'stateForRedirect' => ['0']], 4];+ }++ /** @param array<string,mixed> $params */+ #[DataProvider('provideRedirectStates')]+ public static function testStateForRedirect(array $params, int $expected): void {+ $original = Minz_Request::params();+ try {+ Minz_Request::_params($params);+ self::assertSame($expected, FreshRSS_Context::getStateForRedirect());+ self::assertSame($params, Minz_Request::params());+ } finally {+ Minz_Request::_params($original);+ }+ }++ public static function testAutomaticStateSurvivesUrlEncoding(): void {+ $url = Minz_Url::display(['params' => ['state' => 2, 'stateForRedirect' => 0]], 'ascii');+ self::assertStringContainsString('state=2&stateForRedirect=0', $url);+ }+}diff --git a/tests/app/Views/streamFooterTest.php b/tests/app/Views/streamFooterTest.phpnew file mode 100644index 000000000..7a76da5cb--- /dev/null+++ b/tests/app/Views/streamFooterTest.php@@ -0,0 +1,47 @@+<?php+declare(strict_types=1);++use PHPUnit\Framework\Attributes\DataProvider;+use PHPUnit\Framework\Attributes\PreserveGlobalState;+use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;++#[RunTestsInSeparateProcesses]+#[PreserveGlobalState(false)]+final class streamFooterTest extends \PHPUnit\Framework\TestCase {++ /** @return Traversable<string,array{array<string,string>,int,string}> */+ public static function providePaginationStates(): Traversable {+ yield 'automatic first page' => [[], 2, '0'];+ yield 'explicit unread first page' => [['state' => '2'], 2, '2'];+ yield 'explicit favourite first page' => [['state' => '4'], 4, '4'];+ yield 'automatic unread next page' => [['state' => '2', 'stateForRedirect' => '0'], 2, '0'];+ yield 'automatic all next page' => [['state' => '3', 'stateForRedirect' => '0'], 3, '0'];+ yield 'explicit favourite next page' => [['state' => '4', 'stateForRedirect' => '4'], 4, '4'];+ }++ /** @param array<string,string> $request */+ #[DataProvider('providePaginationStates')]+ public function testPaginationKeepsTheRequestedState(array $request, int $resolvedState, string $requestedState): void {+ FreshRSS_Context::initSystem();+ Minz_Translate::init('en');+ FreshRSS_Context::$state = $resolvedState;+ FreshRSS_Context::$continuation_id = '123';+ FreshRSS_Context::$search = new FreshRSS_BooleanSearch('needle');+ Minz_Request::_params($request + ['search' => 'needle']);++ $view = new FreshRSS_View();+ $view->_path('helpers/stream-footer.phtml');+ $html = new DOMDocument();+ self::assertTrue($html->loadHTML($view->renderToString(), LIBXML_NONET));+ $button = $html->getElementById('load_more');+ self::assertInstanceOf(DOMElement::class, $button);+ $query = parse_url($button->getAttribute('formaction'), PHP_URL_QUERY);+ self::assertIsString($query);+ parse_str($query, $params);+ self::assertSame((string)$resolvedState, $params['state'] ?? null);+ self::assertSame($requestedState, $params['stateForRedirect'] ?? null);+ self::assertSame('needle', $params['search'] ?? null);+ self::assertSame('123', $params['cid'] ?? null);+ self::assertSame('1', $params['ajax'] ?? null);+ }+}