jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add show_all option to Mastodon status context to show ignored and blocked statuses

Browse source
This commit is contained in:
Hank Grabowski 2023-02-22 11:45:42 -05:00
parent 3958739d60
commit b06a3e877e
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
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'];
@ -74,7 +75,7 @@ class Context extends BaseApi
$params['order'] = ['uri-id']; $params['order'] = ['uri-id'];
} }
if (!empty($uid)) { if (!empty($uid) && !$request['show_all']) {
$condition = DBA::mergeConditions( $condition = DBA::mergeConditions(
$condition, $condition,
["NOT `author-id` IN (SELECT `cid` FROM `user-contact` WHERE `uid` = ? AND (`blocked` OR `ignored`))", $uid] ["NOT `author-id` IN (SELECT `cid` FROM `user-contact` WHERE `uid` = ? AND (`blocked` OR `ignored`))", $uid]