X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FApi%2FMastodon%2FConversations.php;h=c45144c98d31f2f66766befdd54c2b121c3dad53;hb=7f846f153d6abf8ed4c0f9a5b81bd45a6ac8e4a2;hp=125e13e609b5e58dedd7f5f5f38062b4a0715fce;hpb=f580d8e5c022f42f7dbe8465dff668d240c1da09;p=friendica.git

diff --git a/src/Module/Api/Mastodon/Conversations.php b/src/Module/Api/Mastodon/Conversations.php
index 125e13e609..c45144c98d 100644
--- a/src/Module/Api/Mastodon/Conversations.php
+++ b/src/Module/Api/Mastodon/Conversations.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -25,15 +25,16 @@ 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/
  */
 class Conversations extends BaseApi
 {
-	protected function delete()
+	protected function delete(array $request = [])
 	{
-		self::checkAllowedScope(self::SCOPE_WRITE);
+		$this->checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
 		if (!empty($this->parameters['id'])) {
@@ -43,7 +44,7 @@ class Conversations extends BaseApi
 		DBA::delete('conv', ['id' => $this->parameters['id'], 'uid' => $uid]);
 		DBA::delete('mail', ['convid' => $this->parameters['id'], 'uid' => $uid]);
 
-		System::jsonExit([]);
+		$this->jsonExit([]);
 	}
 
 	/**
@@ -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,18 +84,22 @@ 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);
 
 		if (!empty($request['min_id'])) {
-			array_reverse($conversations);
+			$conversations = array_reverse($conversations);
 		}
 
 		self::setLinkHeader();
-		System::jsonExit($conversations);
+		$this->jsonExit($conversations);
 	}
 }