mirror of
https://github.com/friendica/friendica
synced 2024-12-23 03:20:15 +00:00
Merge remote-tracking branch 'upstream/2023.09-rc' into site-settings
This commit is contained in:
commit
62f3598c25
1 changed files with 3 additions and 5 deletions
|
@ -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']
|
||||
|
|
Loading…
Reference in a new issue