X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModule%2FApi%2FMastodon%2FBlocks.php;h=1f8b7ae6abd52db188eda7691e501d87c6db51dd;hb=87084a3e854b72290fcc49e66fd0ccdf737672ee;hp=37ab61af5251c0ebb349301208c396db91594f12;hpb=ebd4f59d02a503defef22202bbc3a9d0b1be4655;p=friendica.git diff --git a/src/Module/Api/Mastodon/Blocks.php b/src/Module/Api/Mastodon/Blocks.php index 37ab61af52..1f8b7ae6ab 100644 --- a/src/Module/Api/Mastodon/Blocks.php +++ b/src/Module/Api/Mastodon/Blocks.php @@ -32,28 +32,26 @@ use Friendica\Module\BaseApi; class Blocks extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty($this->parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $id = $parameters['id']; + $id = $this->parameters['id']; if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) { DI::mstdnError()->RecordNotFound(); } - // @todo provide HTTP link header - $request = self::getRequest([ 'max_id' => 0, // Return results older than this id 'since_id' => 0, // Return results newer than this id + 'min_id' => 0, // Return results immediately newer than id 'limit' => 40, // Maximum number of results. Defaults to 40. ]); @@ -69,20 +67,20 @@ class Blocks extends BaseApi $condition = DBA::mergeConditions($condition, ["`cid` > ?", $request['since_id']]); } - if (!empty($min_id)) { - $condition = DBA::mergeConditions($condition, ["`cid` > ?", $min_id]); + if (!empty($request['min_id'])) { + $condition = DBA::mergeConditions($condition, ["`cid` > ?", $request['min_id']]); $params['order'] = ['cid']; } - $followers = DBA::select('user-contact', ['cid'], $condition, $parameters); + $followers = DBA::select('user-contact', ['cid'], $condition, $params); while ($follower = DBA::fetch($followers)) { self::setBoundaries($follower['cid']); $accounts[] = DI::mstdnAccount()->createFromContactId($follower['cid'], $uid); } DBA::close($followers); - if (!empty($min_id)) { + if (!empty($request['min_id'])) { array_reverse($accounts); }