X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FApi%2FMastodon%2FBlocks.php;h=1f8b7ae6abd52db188eda7691e501d87c6db51dd;hb=87084a3e854b72290fcc49e66fd0ccdf737672ee;hp=fbcaf2ded371fb97c7fa0dc5ab2a02bde3fdf969;hpb=714f0febc4918f5569eb09f8800b6739cff36347;p=friendica.git diff --git a/src/Module/Api/Mastodon/Blocks.php b/src/Module/Api/Mastodon/Blocks.php index fbcaf2ded3..1f8b7ae6ab 100644 --- a/src/Module/Api/Mastodon/Blocks.php +++ b/src/Module/Api/Mastodon/Blocks.php @@ -34,16 +34,16 @@ class Blocks extends BaseApi /** * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent() + public function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); - if (empty(static::$parameters['id'])) { + if (empty($this->parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $id = static::$parameters['id']; + $id = $this->parameters['id']; if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) { DI::mstdnError()->RecordNotFound(); } @@ -51,6 +51,7 @@ class Blocks extends BaseApi $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. ]); @@ -66,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, static::$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); }