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

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

diff --git a/src/Module/Api/Mastodon/Accounts.php b/src/Module/Api/Mastodon/Accounts.php
index 72dac3749fe14e4656d462bb9bd1a86e2440ae3f..6b88b84ef3fac571fc365743abdfbd1e8888cda8 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts.php
+++ b/src/Module/Api/Mastodon/Accounts.php
@@ -40,24 +40,24 @@ class Accounts extends BaseApi
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id']) && empty($this->parameters['name'])) {
-                       DI::mstdnError()->UnprocessableEntity();
+                       $this->logErrorAndJsonExit(422, $this->errorFactory->UnprocessableEntity());
                }
 
                if (!empty($this->parameters['id'])) {
                        $id = $this->parameters['id'];
                        if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) {
-                               DI::mstdnError()->RecordNotFound();
+                               $this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
                        }
                } else {
                        $contact = Contact::selectFirst(['id'], ['nick' => $this->parameters['name'], 'uid' => 0]);
                        if (!empty($contact['id'])) {
                                $id = $contact['id'];
                        } elseif (!($id = Contact::getIdForURL($this->parameters['name'], 0, false))) {
-                               DI::mstdnError()->RecordNotFound();
+                               $this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
                        }
                }
 
                $account = DI::mstdnAccount()->createFromContactId($id, $uid);
-               System::jsonExit($account);
+               $this->jsonExit($account);
        }
 }