friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-23 10:44:58 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #12837 from HankG/fix-blocks-ignores-in-full-context-status-request

Browse source 
Incorporate ignore/blocks in Mastodon Status Context Endpoint
This commit is contained in:
Hypolite Petovan 2023-02-22 16:48:25 -05:00 committed by GitHub
parent 6870ccc00e a301f8a82d
commit defbf87d9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Module/Api/Mastodon/Statuses/Context.php
View file

@ -45,10 +45,11 @@ class Context extends BaseApi
} }
$request = $this->getRequest([ $request = $this->getRequest([
'max_id' => 0, // Return results older than this id 'max_id' => 0, // Return results older than this id
'since_id' => 0, // Return results newer than this id 'since_id' => 0, // Return results newer than this id
'min_id' => 0, // Return results immediately newer than this id 'min_id' => 0, // Return results immediately newer than this id
'limit' => 40, // Maximum number of results to return. Defaults to 40. 'limit' => 40, // Maximum number of results to return. Defaults to 40.
'show_all' => false, // shows posts for all users including blocked and ignored users
], $request); ], $request);
$id = $this->parameters['id']; $id = $this->parameters['id'];
@ -73,6 +74,13 @@ class Context extends BaseApi
$condition = DBA::mergeConditions($condition, ["`uri-id` > ?", $request['min_id']]); $condition = DBA::mergeConditions($condition, ["`uri-id` > ?", $request['min_id']]);
$params['order'] = ['uri-id']; $params['order'] = ['uri-id'];
} }
if (!empty($uid) && !$request['show_all']) {
$condition = DBA::mergeConditions(
$condition,
["NOT `author-id` IN (SELECT `cid` FROM `user-contact` WHERE `uid` = ? AND (`blocked` OR `ignored`))", $uid]
);
}
$posts = Post::selectPosts(['uri-id', 'thr-parent-id'], $condition, $params); $posts = Post::selectPosts(['uri-id', 'thr-parent-id'], $condition, $params);
while ($post = Post::fetch($posts)) { while ($post = Post::fetch($posts)) {