X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FApi%2FMastodon%2FMutes.php;h=b87da7f7b1036f564e8608579370f643ab7bc196;hb=1b9ec3a2147fc10e4037ff1b2a7aac506cdf3b13;hp=f0c225f1889649289806f91893f2f279ef5c0ca3;hpb=315dddbcb9232fea105d2da53ad2ba0e143bd7e4;p=friendica.git diff --git a/src/Module/Api/Mastodon/Mutes.php b/src/Module/Api/Mastodon/Mutes.php index f0c225f188..b87da7f7b1 100644 --- a/src/Module/Api/Mastodon/Mutes.php +++ b/src/Module/Api/Mastodon/Mutes.php @@ -1,6 +1,6 @@ checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { - DI::mstdnError()->UnprocessableEntity(); + if (empty($this->parameters['id'])) { + $this->logAndJsonError(422, $this->errorFactory->UnprocessableEntity()); } - $id = $parameters['id']; + $id = $this->parameters['id']; if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) { - DI::mstdnError()->RecordNotFound(); + $this->logAndJsonError(404, $this->errorFactory->RecordNotFound()); } - // @todo provide HTTP link header - - $request = self::getRequest([ + $request = $this->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. - ]); + ], $request); $params = ['order' => ['cid' => true], 'limit' => $request['limit']]; @@ -69,22 +67,24 @@ class Mutes 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)) { - array_reverse($accounts); + if (!empty($request['min_id'])) { + $accounts = array_reverse($accounts); } - System::jsonExit($accounts); + self::setLinkHeader(); + $this->jsonExit($accounts); } }