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

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

diff --git a/src/Module/Api/Mastodon/Conversations.php b/src/Module/Api/Mastodon/Conversations.php
index abffff9ede5299dfa6101c43c64c62b877ca94dc..c45144c98d31f2f66766befdd54c2b121c3dad53 100644 (file)
--- a/src/Module/Api/Mastodon/Conversations.php
+++ b/src/Module/Api/Mastodon/Conversations.php
@@ -25,6 +25,7 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Module\BaseApi;
+use Friendica\Network\HTTPException\NotFoundException;
 
 /**
  * @see https://docs.joinmastodon.org/methods/timelines/conversations/
@@ -33,7 +34,7 @@ class Conversations extends BaseApi
 {
        protected function delete(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (!empty($this->parameters['id'])) {
@@ -51,7 +52,7 @@ class Conversations extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([
@@ -83,9 +84,13 @@ class Conversations extends BaseApi
 
                $conversations = [];
 
-               while ($conv = DBA::fetch($convs)) {
-                       self::setBoundaries($conv['id']);
-                       $conversations[] = DI::mstdnConversation()->createFromConvId($conv['id']);
+               try {
+                       while ($conv = DBA::fetch($convs)) {
+                               self::setBoundaries($conv['id']);
+                               $conversations[] = DI::mstdnConversation()->createFromConvId($conv['id']);
+                       }
+               } catch (NotFoundException $e) {
+                       $this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
                }
 
                DBA::close($convs);