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

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

diff --git a/src/Module/Api/Mastodon/Lists.php b/src/Module/Api/Mastodon/Lists.php
index 2d7fea3dd5ae02fbdc5037454080e28915a0194e..beb1a3b9a62455fd552f6a2022726c8d6eaa145d 100644 (file)
--- a/src/Module/Api/Mastodon/Lists.php
+++ b/src/Module/Api/Mastodon/Lists.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
  *
@@ -24,96 +24,93 @@ namespace Friendica\Module\Api\Mastodon;
 use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Module\BaseApi;
-use Friendica\Model\Group;
+use Friendica\Model\Circle;
 
 /**
  * @see https://docs.joinmastodon.org/methods/timelines/lists/
  */
 class Lists extends BaseApi
 {
-       public static function delete(array $parameters = [])
+       protected function delete(array $request = [])
        {
-               self::login(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
-               if (empty($parameters['id'])) {
-                       DI::mstdnError()->UnprocessableEntity();
+               if (empty($this->parameters['id'])) {
+                       $this->logErrorAndJsonExit(422, $this->errorFactory->UnprocessableEntity());
                }
 
-               if (!Group::exists($parameters['id'], $uid)) {
-                       DI::mstdnError()->RecordNotFound();
+               if (!Circle::exists($this->parameters['id'], $uid)) {
+                       $this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
                }
 
-               if (!Group::remove($parameters['id'])) {
+               if (!Circle::remove($this->parameters['id'])) {
                        DI::mstdnError()->InternalError();
                }
 
-               System::jsonExit([]);
+               $this->jsonExit([]);
        }
 
-       public static function post(array $parameters = [])
+       protected function post(array $request = [])
        {
-               self::login(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
-               $request = self::getRequest([
+               $request = $this->getRequest([
                        'title' => '',
-               ]);
+               ], $request);
 
                if (empty($request['title'])) {
-                       DI::mstdnError()->UnprocessableEntity();
+                       $this->logErrorAndJsonExit(422, $this->errorFactory->UnprocessableEntity());
                }
 
-               Group::create($uid, $request['title']);
+               Circle::create($uid, $request['title']);
 
-               $id = Group::getIdByName($uid, $request['title']);
+               $id = Circle::getIdByName($uid, $request['title']);
                if (!$id) {
                        DI::mstdnError()->InternalError();
                }
 
-               System::jsonExit(DI::mstdnList()->createFromGroupId($id));
+               $this->jsonExit(DI::mstdnList()->createFromCircleId($id));
        }
 
-       public static function put(array $parameters = [])
+       public function put(array $request = [])
        {
-               $request = self::getRequest([
+               $request = $this->getRequest([
                        'title'          => '', // The title of the list to be updated.
                        'replies_policy' => '', // One of: "followed", "list", or "none".
-               ]);
+               ], $request);
 
-               if (empty($request['title']) || empty($parameters['id'])) {
-                       DI::mstdnError()->UnprocessableEntity();
+               if (empty($request['title']) || empty($this->parameters['id'])) {
+                       $this->logErrorAndJsonExit(422, $this->errorFactory->UnprocessableEntity());
                }
 
-               Group::update($parameters['id'], $request['title']);
+               Circle::update($this->parameters['id'], $request['title']);
        }
 
        /**
-        * @param array $parameters
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function rawContent(array $parameters = [])
+       protected function rawContent(array $request = [])
        {
-               self::login(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
-               if (empty($parameters['id'])) {
+               if (empty($this->parameters['id'])) {
                        $lists = [];
 
-                       $groups = Group::getByUserId($uid);
-
-                       foreach ($groups as $group) {
-                               $lists[] = DI::mstdnList()->createFromGroupId($group['id']);
+                       foreach (Circle::getByUserId($uid) as $circle) {
+                               $lists[] = DI::mstdnList()->createFromCircleId($circle['id']);
                        }
                } else {
-                       $id = $parameters['id'];
+                       $id = $this->parameters['id'];
 
-                       if (!Group::exists($id, $uid)) {
-                               DI::mstdnError()->RecordNotFound();
+                       if (!Circle::exists($id, $uid)) {
+                               $this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
                        }
-                       $lists = DI::mstdnList()->createFromGroupId($id);
+                       $lists = DI::mstdnList()->createFromCircleId($id);
                }
 
-               System::jsonExit($lists);
+               $this->jsonExit($lists);
        }
 }