Catch not fetchable posts

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

diff --git a/src/Module/Api/Mastodon/Bookmarks.php b/src/Module/Api/Mastodon/Bookmarks.php
index 6cfa08772223e5f0b2e5eb71f56c6b118b0bc0a6..615bfc501f5031d4d51209474e268ede80bad9e2 100644 (file)
--- a/src/Module/Api/Mastodon/Bookmarks.php
+++ b/src/Module/Api/Mastodon/Bookmarks.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
  *
@@ -21,6 +21,7 @@
 
 namespace Friendica\Module\Api\Mastodon;
 
+use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -36,18 +37,18 @@ class Bookmarks extends BaseApi
        /**
         * @throws HTTPException\InternalServerErrorException
         */
-       public static function rawContent()
+       protected function rawContent(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
-               $request = self::getRequest([
+               $request = $this->getRequest([
                        'limit'      => 20,    // Maximum number of results to return. Defaults to 20.
                        'max_id'     => 0,     // Return results older than id
                        'since_id'   => 0,     // Return results newer than id
                        'min_id'     => 0,     // Return results immediately newer than id
                        'with_muted' => false, // Pleroma extension: return activities by muted (not by blocked!) users.
-               ]);
+               ], $request);
 
                $params = ['order' => ['uri-id' => true], 'limit' => $request['limit']];
 
@@ -69,15 +70,21 @@ class Bookmarks extends BaseApi
 
                $items = Post::selectThreadForUser($uid, ['uri-id'], $condition, $params);
 
+               $display_quotes = self::appSupportsQuotes();
+
                $statuses = [];
                while ($item = Post::fetch($items)) {
                        self::setBoundaries($item['uri-id']);
-                       $statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid);
+                       try {
+                               $statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid, $display_quotes);
+                       } catch (\Throwable $th) {
+                               Logger::info('Post not fetchable', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'error' => $th]);
+                       }
                }
                DBA::close($items);
 
                if (!empty($request['min_id'])) {
-                       array_reverse($statuses);
+                       $statuses = array_reverse($statuses);
                }
 
                self::setLinkHeader();