From cbe4b60a90f88e0714351380a21d45e4f86e56b1 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 27 Nov 2023 16:10:15 -0500 Subject: [PATCH] Change return value to stdClass of Module\Api\Mastodon\Markers->fetchTimelines - This ensures the JSON serialization of timeline markers is an object even when no markers are set --- src/Module/Api/Mastodon/Markers.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Module/Api/Mastodon/Markers.php b/src/Module/Api/Mastodon/Markers.php index 4bd714c117..6a4422bffa 100644 --- a/src/Module/Api/Mastodon/Markers.php +++ b/src/Module/Api/Mastodon/Markers.php @@ -21,9 +21,7 @@ namespace Friendica\Module\Api\Mastodon; -use Friendica\Core\System; use Friendica\Database\DBA; -use Friendica\DI; use Friendica\Module\BaseApi; use Friendica\Util\DateTimeFormat; @@ -76,12 +74,12 @@ class Markers extends BaseApi $this->jsonExit($this->fetchTimelines($application['id'], $uid)); } - private function fetchTimelines(int $application_id, int $uid) + private function fetchTimelines(int $application_id, int $uid): \stdClass { - $values = []; + $values = new \stdClass(); $markers = DBA::select('application-marker', [], ['application-id' => $application_id, 'uid' => $uid]); while ($marker = DBA::fetch($markers)) { - $values[$marker['timeline']] = [ + $values->{$marker['timeline']} = [ 'last_read_id' => $marker['last_read_id'], 'version' => $marker['version'], 'updated_at' => $marker['updated_at'] -- 2.39.5