Improved error messages

diff --git a/src/Module/Api/Mastodon/Accounts.php b/src/Module/Api/Mastodon/Accounts.php
index 0d48744a40afd258a65a8f4488ba762df94ff3f9..a5c9b81045ace82e24f94c1c052d7958b8c57164 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts.php
+++ b/src/Module/Api/Mastodon/Accounts.php
@@ -38,7 +38,7 @@ class Accounts extends BaseApi
        public static function rawContent(array $parameters = [])
        {
                if (empty($parameters['id'])) {
-                       DI::mstdnError()->RecordNotFound();
+                       DI::mstdnError()->UnprocessableEntity();
                }
 
                $id = $parameters['id'];

diff --git a/src/Module/Api/Mastodon/Accounts/Followers.php b/src/Module/Api/Mastodon/Accounts/Followers.php
index ab2ca683917d22bcb97dfeda3a29eb8ed446c356..7e082edbd3e49bae3ceccb075a676c7387c3b928 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Followers.php
+++ b/src/Module/Api/Mastodon/Accounts/Followers.php
@@ -41,7 +41,7 @@ class Followers extends BaseApi
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {
-                       DI::mstdnError()->RecordNotFound();
+                       DI::mstdnError()->UnprocessableEntity();
                }
 
                $id = $parameters['id'];

diff --git a/src/Module/Api/Mastodon/Accounts/Following.php b/src/Module/Api/Mastodon/Accounts/Following.php
index 414213dc44d294d53b014257ef011c5d32c1727d..87e9117ea427dccd86173408dde23596e93e2fd9 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Following.php
+++ b/src/Module/Api/Mastodon/Accounts/Following.php
@@ -41,7 +41,7 @@ class Following extends BaseApi
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {
-                       DI::mstdnError()->RecordNotFound();
+                       DI::mstdnError()->UnprocessableEntity();
                }
 
                $id = $parameters['id'];

diff --git a/src/Module/Api/Mastodon/Accounts/Lists.php b/src/Module/Api/Mastodon/Accounts/Lists.php
index b15124a45c83ff27418ce7a2f5a3ac673b1c9570..6ba7953ab15483c89428f18593bb0d44b939e25e 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Lists.php
+++ b/src/Module/Api/Mastodon/Accounts/Lists.php
@@ -42,7 +42,7 @@ class Lists extends BaseApi
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {
-                       DI::mstdnError()->RecordNotFound();
+                       DI::mstdnError()->UnprocessableEntity();
                }
 
                $id = $parameters['id'];

diff --git a/src/Module/Api/Mastodon/Accounts/Statuses.php b/src/Module/Api/Mastodon/Accounts/Statuses.php
index 14cd19e4261d3e7f004681d144e01f328ce91dc4..b3aec744ecf70eb73d5e2255e4c6d8cd55382538 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Statuses.php
+++ b/src/Module/Api/Mastodon/Accounts/Statuses.php
@@ -43,7 +43,7 @@ class Statuses extends BaseApi
        public static function rawContent(array $parameters = [])
        {
                if (empty($parameters['id'])) {
-                       DI::mstdnError()->RecordNotFound();
+                       DI::mstdnError()->UnprocessableEntity();
                }
 
                $id = $parameters['id'];

diff --git a/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php b/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php
index 94fa32684dd6b699678f94a2a5285c7a51ef680a..facae725930a68e91c366560296a74796b021dfc 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php
+++ b/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php
@@ -43,12 +43,12 @@ class VerifyCredentials extends BaseApi
 
                $self = User::getOwnerDataById($uid);
                if (empty($self)) {
-                       DI::mstdnError()->RecordNotFound();
+                       DI::mstdnError()->InternalError();
                }
 
                $cdata = Contact::getPublicAndUserContacID($self['id'], $uid);
                if (empty($cdata)) {
-                       DI::mstdnError()->RecordNotFound();
+                       DI::mstdnError()->InternalError();
                }
 
                // @todo Support the source property,

diff --git a/src/Module/Api/Mastodon/Blocks.php b/src/Module/Api/Mastodon/Blocks.php
index af8e77f889bb185a5b5d65e9fc6141e7c66ffd0f..e93743ac29405cda1e47e94040c9b49e396c8ac2 100644 (file)
--- a/src/Module/Api/Mastodon/Blocks.php
+++ b/src/Module/Api/Mastodon/Blocks.php
@@ -41,7 +41,7 @@ class Blocks extends BaseApi
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {
-                       DI::mstdnError()->RecordNotFound();
+                       DI::mstdnError()->UnprocessableEntity();
                }
 
                $id = $parameters['id'];

diff --git a/src/Module/Api/Mastodon/Lists/Accounts.php b/src/Module/Api/Mastodon/Lists/Accounts.php
index 513ca21d71c16aa9efb9db7e7bc92ae7f88d09ff..cb2bd208f30f9ce1db610dcd314e032378afb4e0 100644 (file)
--- a/src/Module/Api/Mastodon/Lists/Accounts.php
+++ b/src/Module/Api/Mastodon/Lists/Accounts.php
@@ -53,7 +53,7 @@ class Accounts extends BaseApi
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {
-                       DI::mstdnError()->RecordNotFound();
+                       DI::mstdnError()->UnprocessableEntity();
                }
 
                $id = $parameters['id'];

diff --git a/src/Module/Api/Mastodon/Media.php b/src/Module/Api/Mastodon/Media.php
index bc55610b26bc5821a5ef26d59445c985a2113aee..297d7d7a3f89537a413bb05e4eca53590f4adafb 100644 (file)
--- a/src/Module/Api/Mastodon/Media.php
+++ b/src/Module/Api/Mastodon/Media.php
@@ -46,7 +46,7 @@ class Media extends BaseApi
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {
-                       DI::mstdnError()->RecordNotFound();
+                       DI::mstdnError()->UnprocessableEntity();
                }
 
                $id = $parameters['id'];

diff --git a/src/Module/Api/Mastodon/Mutes.php b/src/Module/Api/Mastodon/Mutes.php
index cb981b33ebf806fe15cec622e34d8d065cc0a7f4..d49bdad68e90e48d4025006a1d06ee6682030ee0 100644 (file)
--- a/src/Module/Api/Mastodon/Mutes.php
+++ b/src/Module/Api/Mastodon/Mutes.php
@@ -41,7 +41,7 @@ class Mutes extends BaseApi
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {
-                       DI::mstdnError()->RecordNotFound();
+                       DI::mstdnError()->UnprocessableEntity();
                }
 
                $id = $parameters['id'];

diff --git a/src/Module/Api/Mastodon/Statuses.php b/src/Module/Api/Mastodon/Statuses.php
index 042d038a258e3178b7f7733f021251ec1dc1d644..900452385cf2f4c8905731ed4731715ce89a564e 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses.php
+++ b/src/Module/Api/Mastodon/Statuses.php
@@ -42,7 +42,7 @@ class Statuses extends BaseApi
        public static function rawContent(array $parameters = [])
        {
                if (empty($parameters['id'])) {
-                       DI::mstdnError()->RecordNotFound();
+                       DI::mstdnError()->UnprocessableEntity();
                }
 
                System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], self::getCurrentUserID()));

diff --git a/src/Module/Api/Mastodon/Statuses/Context.php b/src/Module/Api/Mastodon/Statuses/Context.php
index 5615e41cc94d4b7291ac31426afa313d589c36b8..345a473dbe2e3a379751e245c92f60f55652bd11 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Context.php
+++ b/src/Module/Api/Mastodon/Statuses/Context.php
@@ -41,7 +41,7 @@ class Context extends BaseApi
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {
-                       DI::mstdnError()->RecordNotFound();
+                       DI::mstdnError()->UnprocessableEntity();
                }
 
                $id = $parameters['id'];

diff --git a/src/Module/Api/Mastodon/Statuses/FavouritedBy.php b/src/Module/Api/Mastodon/Statuses/FavouritedBy.php
index 7c784c8020597574753f928d998dd669eda6f59c..cecf0336a551cc8576c16f8ef1eab1a838803c5c 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/FavouritedBy.php
+++ b/src/Module/Api/Mastodon/Statuses/FavouritedBy.php
@@ -41,7 +41,7 @@ class FavouritedBy extends BaseApi
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {
-                       DI::mstdnError()->RecordNotFound();
+                       DI::mstdnError()->UnprocessableEntity();
                }
 
                $id = $parameters['id'];

diff --git a/src/Module/Api/Mastodon/Statuses/RebloggedBy.php b/src/Module/Api/Mastodon/Statuses/RebloggedBy.php
index 3701afb0d22af3575e44b2093d56b3a94f6c0195..9faf034ae74c0bed062ebe745dfc3a5bc5145232 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/RebloggedBy.php
+++ b/src/Module/Api/Mastodon/Statuses/RebloggedBy.php
@@ -41,7 +41,7 @@ class RebloggedBy extends BaseApi
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {
-                       DI::mstdnError()->RecordNotFound();
+                       DI::mstdnError()->UnprocessableEntity();
                }
 
                $id = $parameters['id'];

diff --git a/src/Module/Api/Mastodon/Timelines/ListTimeline.php b/src/Module/Api/Mastodon/Timelines/ListTimeline.php
index df5c211220ce69104b5396e03d15bb922f0329a6..7da16d137542b97d4ff2882f532d06880690e9b1 100644 (file)
--- a/src/Module/Api/Mastodon/Timelines/ListTimeline.php
+++ b/src/Module/Api/Mastodon/Timelines/ListTimeline.php
@@ -43,7 +43,7 @@ class ListTimeline extends BaseApi
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {
-                       DI::mstdnError()->RecordNotFound();
+                       DI::mstdnError()->UnprocessableEntity();
                }
 
                // Return results older than id

diff --git a/src/Module/Api/Mastodon/Timelines/Tag.php b/src/Module/Api/Mastodon/Timelines/Tag.php
index f61e3c3f7445cc73bb8cc3a667065764a0b3b953..7218f40cb8585ed6971648eca416370ad7e768fd 100644 (file)
--- a/src/Module/Api/Mastodon/Timelines/Tag.php
+++ b/src/Module/Api/Mastodon/Timelines/Tag.php
@@ -44,7 +44,7 @@ class Tag extends BaseApi
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['hashtag'])) {
-                       DI::mstdnError()->RecordNotFound();
+                       DI::mstdnError()->UnprocessableEntity();
                }
 
                // If true, return only local statuses. Defaults to false.

diff --git a/src/Module/OAuth/Authorize.php b/src/Module/OAuth/Authorize.php
index c9bf7b687ef36278932aaa04f4a4de9ddd823c87..7d9f67ad356a7693d6151858d3d00be6250b0495 100644 (file)
--- a/src/Module/OAuth/Authorize.php
+++ b/src/Module/OAuth/Authorize.php
@@ -39,12 +39,12 @@ class Authorize extends BaseApi
                $response_type = $_REQUEST['response_type'] ?? '';
                if ($response_type != 'code') {
                        Logger::warning('Wrong or missing response type', ['response_type' => $response_type]);
-                       DI::mstdnError()->RecordNotFound();
+                       DI::mstdnError()->UnprocessableEntity();
                }
 
                $application = self::getApplication();
                if (empty($application)) {
-                       DI::mstdnError()->RecordNotFound();
+                       DI::mstdnError()->UnprocessableEntity();
                }
 
                $request = $_REQUEST;
@@ -68,7 +68,7 @@ class Authorize extends BaseApi
 
                $token = self::createTokenForUser($application, $uid);
                if (!$token) {
-                       DI::mstdnError()->RecordNotFound();
+                       DI::mstdnError()->UnprocessableEntity();
                }
 
                DI::app()->redirect($application['redirect_uri'] . '?code=' . $token['code']);