clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Hypolite Petovan 2023-11-27 16:10:15 -05:00
parent de807e6378
commit cbe4b60a90
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Module/Api/Mastodon/Markers.php
View File

@ -21,9 +21,7 @@
namespace Friendica\Module\Api\Mastodon; namespace Friendica\Module\Api\Mastodon;
use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Module\BaseApi; use Friendica\Module\BaseApi;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
@ -76,12 +74,12 @@ class Markers extends BaseApi
$this->jsonExit($this->fetchTimelines($application['id'], $uid)); $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]); $markers = DBA::select('application-marker', [], ['application-id' => $application_id, 'uid' => $uid]);
while ($marker = DBA::fetch($markers)) { while ($marker = DBA::fetch($markers)) {
$values[$marker['timeline']] = [ $values->{$marker['timeline']} = [
'last_read_id' => $marker['last_read_id'], 'last_read_id' => $marker['last_read_id'],
'version' => $marker['version'], 'version' => $marker['version'],
'updated_at' => $marker['updated_at'] 'updated_at' => $marker['updated_at']