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

Merge remote-tracking branch 'upstream/2021.06-rc' into http-input-data

Browse source
This commit is contained in:
Michael 2021-05-23 20:17:50 +00:00
commit a69e128fe4
18 changed files with 101 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,6 +41,8 @@ class PublicTimeline extends BaseApi
*/
public static function rawContent(array $parameters = [])
{
$uid = self::getCurrentUserID();
$request = self::getRequest([
'local' => false, // Show only local statuses? Defaults to false.
'remote' => false, // Show only remote statuses? Defaults to false.
@ -88,7 +90,12 @@ class PublicTimeline extends BaseApi
$condition = DBA::mergeConditions($condition, ['gravity' => GRAVITY_PARENT]);
}
$items = Post::selectForUser(0, ['uri-id', 'uid'], $condition, $params);
if (!empty($uid)) {
$condition = DBA::mergeConditions($condition,
["NOT EXISTS (SELECT `cid` FROM `user-contact` WHERE `uid` = ? AND `cid` = `parent-author-id` AND (`blocked` OR `ignored`))", $uid]);
}
$items = Post::selectForUser($uid, ['uri-id', 'uid'], $condition, $params);
$statuses = [];
while ($item = Post::fetch($items)) {

2
src/Module/Attach.php
View file

@ -43,7 +43,7 @@ class Attach extends BaseModule
// @TODO: Replace with parameter from router
$item_id = intval($a->argv[1]);
// Check for existence
$item = MAttach::exists(['id' => $item_id]);
if ($item === false) {