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

Merge remote-tracking branch 'upstream/2021.06-rc' into public-timeline

Browse Source
This commit is contained in:
Michael
2021-06-16 21:01:20 +00:00
parent 11d2440425 7b91bd1d80
commit ebd4f59d02
34 changed files with 273 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Module/Api/Mastodon/Timelines/Direct.php
View File

@@ -71,6 +71,7 @@ class Direct extends BaseApi
$statuses = [];
while ($mail = DBA::fetch($mails)) {
self::setBoundaries($mail['uri-id']);
$statuses[] = DI::mstdnStatus()->createFromMailId($mail['id']);
}
@@ -78,6 +79,7 @@ class Direct extends BaseApi
array_reverse($statuses);
}
self::setLinkHeader();
System::jsonExit($statuses);
}
}

2
src/Module/Api/Mastodon/Timelines/Home.php
View File

@@ -93,6 +93,7 @@ class Home extends BaseApi
$statuses = [];
while ($item = Post::fetch($items)) {
self::setBoundaries($item['uri-id']);
$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid);
}
DBA::close($items);
@@ -101,6 +102,7 @@ class Home extends BaseApi
array_reverse($statuses);
}
self::setLinkHeader();
System::jsonExit($statuses);
}
}

2
src/Module/Api/Mastodon/Timelines/ListTimeline.php
View File

@@ -98,6 +98,7 @@ class ListTimeline extends BaseApi
$statuses = [];
while ($item = Post::fetch($items)) {
self::setBoundaries($item['uri-id']);
$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid);
}
DBA::close($items);
@@ -106,6 +107,7 @@ class ListTimeline extends BaseApi
array_reverse($statuses);
}
self::setLinkHeader();
System::jsonExit($statuses);
}
}

2
src/Module/Api/Mastodon/Timelines/PublicTimeline.php
View File

@@ -99,6 +99,7 @@ class PublicTimeline extends BaseApi
$statuses = [];
while ($item = Post::fetch($items)) {
self::setBoundaries($item['uri-id']);
$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid);
}
DBA::close($items);
@@ -107,6 +108,7 @@ class PublicTimeline extends BaseApi
array_reverse($statuses);
}
self::setLinkHeader();
System::jsonExit($statuses);
}
}

2
src/Module/Api/Mastodon/Timelines/Tag.php
View File

@@ -107,6 +107,7 @@ class Tag extends BaseApi
$statuses = [];
while ($item = Post::fetch($items)) {
self::setBoundaries($item['uri-id']);
$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid);
}
DBA::close($items);
@@ -115,6 +116,7 @@ class Tag extends BaseApi
array_reverse($statuses);
}
self::setLinkHeader();
System::jsonExit($statuses);
}
}