Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 19:50:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

API: Counts added, local query improved

Browse source
This commit is contained in:
Michael 2020-09-06 07:12:04 +00:00
parent c3ed31bb8f
commit db6282b5e2
5 changed files with 117 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Module/Api/Mastodon/Timelines/PublicTimeline.php
View file

@ -57,11 +57,11 @@ class PublicTimeline extends BaseApi
$params = ['order' => ['uri-id' => true], 'limit' => $limit];
$condition = ['gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], 'private' => Item::PUBLIC, 'network' => Protocol::FEDERATED];
$condition = ['gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], 'private' => Item::PUBLIC,
'uid' => 0, 'network' => Protocol::FEDERATED];
if ($local) {
$condition['origin'] = true;
} else {
$condition['uid'] = 0;
$condition = DBA::mergeConditions($condition, ["`uri-id` IN (SELECT `uri-id` FROM `item` WHERE `origin`)"]);
}
if ($remote) {