Move jsonError out of Factory\Api\Mastodon\Error->InternalError
This commit is contained in:
parent
696c56b6be
commit
0a91484fa0
|
@ -77,13 +77,10 @@ class Error extends BaseFactory
|
||||||
return new \Friendica\Object\Api\Mastodon\Error($error, $error_description);
|
return new \Friendica\Object\Api\Mastodon\Error($error, $error_description);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function InternalError(string $error = '')
|
public function InternalError(string $error = ''): \Friendica\Object\Api\Mastodon\Error
|
||||||
{
|
{
|
||||||
$error = $error ?: $this->l10n->t('Internal Server Error');
|
$error = $error ?: $this->l10n->t('Internal Server Error');
|
||||||
$error_description = '';
|
$error_description = '';
|
||||||
$errorObj = new \Friendica\Object\Api\Mastodon\Error($error, $error_description);
|
return new \Friendica\Object\Api\Mastodon\Error($error, $error_description);
|
||||||
|
|
||||||
$this->logError(500, $error);
|
|
||||||
$this->jsonError(500, $errorObj->toArray());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -92,7 +92,7 @@ class Apps extends BaseApi
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!DBA::insert('application', $fields)) {
|
if (!DBA::insert('application', $fields)) {
|
||||||
DI::mstdnError()->InternalError();
|
$this->logErrorAndJsonExit(500, $this->errorFactory->InternalError());
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->jsonExit(DI::mstdnApplication()->createFromApplicationId(DBA::lastInsertId())->toArray());
|
$this->jsonExit(DI::mstdnApplication()->createFromApplicationId(DBA::lastInsertId())->toArray());
|
||||||
|
|
|
@ -45,7 +45,7 @@ class Lists extends BaseApi
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!Circle::remove($this->parameters['id'])) {
|
if (!Circle::remove($this->parameters['id'])) {
|
||||||
DI::mstdnError()->InternalError();
|
$this->logErrorAndJsonExit(500, $this->errorFactory->InternalError());
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->jsonExit([]);
|
$this->jsonExit([]);
|
||||||
|
@ -68,7 +68,7 @@ class Lists extends BaseApi
|
||||||
|
|
||||||
$id = Circle::getIdByName($uid, $request['title']);
|
$id = Circle::getIdByName($uid, $request['title']);
|
||||||
if (!$id) {
|
if (!$id) {
|
||||||
DI::mstdnError()->InternalError();
|
$this->logErrorAndJsonExit(500, $this->errorFactory->InternalError());
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->jsonExit(DI::mstdnList()->createFromCircleId($id));
|
$this->jsonExit(DI::mstdnList()->createFromCircleId($id));
|
||||||
|
|
|
@ -297,7 +297,7 @@ class Statuses extends BaseApi
|
||||||
$item['uri'] = Item::newURI($item['guid']);
|
$item['uri'] = Item::newURI($item['guid']);
|
||||||
$id = Post\Delayed::add($item['uri'], $item, Worker::PRIORITY_HIGH, Post\Delayed::PREPARED, DateTimeFormat::utc($request['scheduled_at']));
|
$id = Post\Delayed::add($item['uri'], $item, Worker::PRIORITY_HIGH, Post\Delayed::PREPARED, DateTimeFormat::utc($request['scheduled_at']));
|
||||||
if (empty($id)) {
|
if (empty($id)) {
|
||||||
DI::mstdnError()->InternalError();
|
$this->logErrorAndJsonExit(500, $this->errorFactory->InternalError());
|
||||||
}
|
}
|
||||||
$this->jsonExit(DI::mstdnScheduledStatus()->createFromDelayedPostId($id, $uid)->toArray());
|
$this->jsonExit(DI::mstdnScheduledStatus()->createFromDelayedPostId($id, $uid)->toArray());
|
||||||
}
|
}
|
||||||
|
@ -310,7 +310,7 @@ class Statuses extends BaseApi
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
DI::mstdnError()->InternalError();
|
$this->logErrorAndJsonExit(500, $this->errorFactory->InternalError());
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function delete(array $request = [])
|
protected function delete(array $request = [])
|
||||||
|
|
Loading…
Reference in New Issue
Block a user