Move jsonError out of Factory\Api\Mastodon\Error->UnprocessableEntity

[friendica.git] / src / Module / Api / Mastodon / Mutes.php

diff --git a/src/Module/Api/Mastodon/Mutes.php b/src/Module/Api/Mastodon/Mutes.php
index 3c24071f0773d9e8ab9b8a7681eef4d5758e6b6e..6557b770b8470e87c10e1d309d522398ed445b35 100644 (file)
--- a/src/Module/Api/Mastodon/Mutes.php
+++ b/src/Module/Api/Mastodon/Mutes.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -34,25 +34,26 @@ class Mutes extends BaseApi
        /**
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {
-                       DI::mstdnError()->UnprocessableEntity();
+                       $this->logErrorAndJsonExit(422, $this->errorFactory->UnprocessableEntity());
                }
 
                $id = $this->parameters['id'];
                if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) {
-                       DI::mstdnError()->RecordNotFound();
+                       $this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
                }
 
-               $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']];
 
@@ -66,24 +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, $this->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);
                }
 
                self::setLinkHeader();
-               System::jsonExit($accounts);
+               $this->jsonExit($accounts);
        }
 }