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

post/thread views are renamed, search bugs fixed

Browse source
This commit is contained in:
Michael 2021-02-22 19:47:08 +00:00
parent 574f778411
commit 1792046a4f
20 changed files with 83 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -62,11 +62,11 @@ class PublicTimeline extends BaseApi
'uid' => 0, 'network' => Protocol::FEDERATED];
if ($local) {
$condition = DBA::mergeConditions($condition, ["`uri-id` IN (SELECT `uri-id` FROM `post-view` WHERE `origin`)"]);
$condition = DBA::mergeConditions($condition, ["`uri-id` IN (SELECT `uri-id` FROM `post-user` WHERE `origin`)"]);
}
if ($remote) {
$condition = DBA::mergeConditions($condition, ["NOT `uri-id` IN (SELECT `uri-id` FROM `post-view` WHERE `origin`)"]);
$condition = DBA::mergeConditions($condition, ["NOT `uri-id` IN (SELECT `uri-id` FROM `post-user` WHERE `origin`)"]);
}
if (!empty($max_id)) {