mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Improved error messages

Browse source
This commit is contained in:
Michael 2021-05-12 14:00:15 +00:00
parent 8a5560ec8f
commit 9125d296a1
17 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Module/Api/Mastodon/Accounts.php
View file

@ -38,7 +38,7 @@ class Accounts extends BaseApi
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
if (empty($parameters['id'])) { if (empty($parameters['id'])) {
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->UnprocessableEntity();
} }
$id = $parameters['id']; $id = $parameters['id'];

2
src/Module/Api/Mastodon/Accounts/Followers.php
View file

@ -41,7 +41,7 @@ class Followers extends BaseApi
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->UnprocessableEntity();
} }
$id = $parameters['id']; $id = $parameters['id'];

2
src/Module/Api/Mastodon/Accounts/Following.php
View file

@ -41,7 +41,7 @@ class Following extends BaseApi
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->UnprocessableEntity();
} }
$id = $parameters['id']; $id = $parameters['id'];

2
src/Module/Api/Mastodon/Accounts/Lists.php
View file

@ -42,7 +42,7 @@ class Lists extends BaseApi
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->UnprocessableEntity();
} }
$id = $parameters['id']; $id = $parameters['id'];

2
src/Module/Api/Mastodon/Accounts/Statuses.php
View file

@ -43,7 +43,7 @@ class Statuses extends BaseApi
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
if (empty($parameters['id'])) { if (empty($parameters['id'])) {
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->UnprocessableEntity();
} }
$id = $parameters['id']; $id = $parameters['id'];

4
src/Module/Api/Mastodon/Accounts/VerifyCredentials.php
View file

@ -43,12 +43,12 @@ class VerifyCredentials extends BaseApi
$self = User::getOwnerDataById($uid); $self = User::getOwnerDataById($uid);
if (empty($self)) { if (empty($self)) {
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->InternalError();
} }
$cdata = Contact::getPublicAndUserContacID($self['id'], $uid); $cdata = Contact::getPublicAndUserContacID($self['id'], $uid);
if (empty($cdata)) { if (empty($cdata)) {
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->InternalError();
} }
// @todo Support the source property, // @todo Support the source property,

2
src/Module/Api/Mastodon/Blocks.php
View file

@ -41,7 +41,7 @@ class Blocks extends BaseApi
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->UnprocessableEntity();
} }
$id = $parameters['id']; $id = $parameters['id'];

2
src/Module/Api/Mastodon/Lists/Accounts.php
View file

@ -53,7 +53,7 @@ class Accounts extends BaseApi
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->UnprocessableEntity();
} }
$id = $parameters['id']; $id = $parameters['id'];

2
src/Module/Api/Mastodon/Media.php
View file

@ -46,7 +46,7 @@ class Media extends BaseApi
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->UnprocessableEntity();
} }
$id = $parameters['id']; $id = $parameters['id'];

2
src/Module/Api/Mastodon/Mutes.php
View file

@ -41,7 +41,7 @@ class Mutes extends BaseApi
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->UnprocessableEntity();
} }
$id = $parameters['id']; $id = $parameters['id'];

2
src/Module/Api/Mastodon/Statuses.php
View file

@ -42,7 +42,7 @@ class Statuses extends BaseApi
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
if (empty($parameters['id'])) { if (empty($parameters['id'])) {
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->UnprocessableEntity();
} }
System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], self::getCurrentUserID())); System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], self::getCurrentUserID()));

2
src/Module/Api/Mastodon/Statuses/Context.php
View file

@ -41,7 +41,7 @@ class Context extends BaseApi
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->UnprocessableEntity();
} }
$id = $parameters['id']; $id = $parameters['id'];

2
src/Module/Api/Mastodon/Statuses/FavouritedBy.php
View file

@ -41,7 +41,7 @@ class FavouritedBy extends BaseApi
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->UnprocessableEntity();
} }
$id = $parameters['id']; $id = $parameters['id'];

2
src/Module/Api/Mastodon/Statuses/RebloggedBy.php
View file

@ -41,7 +41,7 @@ class RebloggedBy extends BaseApi
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->UnprocessableEntity();
} }
$id = $parameters['id']; $id = $parameters['id'];

2
src/Module/Api/Mastodon/Timelines/ListTimeline.php
View file

@ -43,7 +43,7 @@ class ListTimeline extends BaseApi
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->UnprocessableEntity();
} }
// Return results older than id // Return results older than id

2
src/Module/Api/Mastodon/Timelines/Tag.php
View file

@ -44,7 +44,7 @@ class Tag extends BaseApi
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['hashtag'])) { if (empty($parameters['hashtag'])) {
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->UnprocessableEntity();
} }
// If true, return only local statuses. Defaults to false. // If true, return only local statuses. Defaults to false.

6
src/Module/OAuth/Authorize.php
View file

@ -39,12 +39,12 @@ class Authorize extends BaseApi
$response_type = $_REQUEST['response_type'] ?? ''; $response_type = $_REQUEST['response_type'] ?? '';
if ($response_type != 'code') { if ($response_type != 'code') {
Logger::warning('Wrong or missing response type', ['response_type' => $response_type]); Logger::warning('Wrong or missing response type', ['response_type' => $response_type]);
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->UnprocessableEntity();
} }
$application = self::getApplication(); $application = self::getApplication();
if (empty($application)) { if (empty($application)) {
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->UnprocessableEntity();
} }
$request = $_REQUEST; $request = $_REQUEST;
@ -68,7 +68,7 @@ class Authorize extends BaseApi
$token = self::createTokenForUser($application, $uid); $token = self::createTokenForUser($application, $uid);
if (!$token) { if (!$token) {
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->UnprocessableEntity();
} }
DI::app()->redirect($application['redirect_uri'] . '?code=' . $token['code']); DI::app()->redirect($application['redirect_uri'] . '?code=' . $token['code']);