Remove FollowRequest type and use mstdnAccount->createFromContactId instead

diff --git a/src/DI.php b/src/DI.php
index 24f06d2793eed7f5bd97de534434159c1233b42d..78eb5bee4c9ed7491dfbb38962bd98df51af98ff 100644 (file)
--- a/src/DI.php
+++ b/src/DI.php
@@ -382,14 +382,6 @@ abstract class DI
                return self::$dice->create(Factory\Api\Mastodon\Error::class);
        }
 
-       /**
-        * @return Factory\Api\Mastodon\FollowRequest
-        */
-       public static function mstdnFollowRequest()
-       {
-               return self::$dice->create(Factory\Api\Mastodon\FollowRequest::class);
-       }
-
        /**
         * @return Factory\Api\Mastodon\Poll
         */

diff --git a/src/Factory/Api/Mastodon/FollowRequest.php b/src/Factory/Api/Mastodon/FollowRequest.php
deleted file mode 100644 (file)
index 5674196..0000000
--- a/src/Factory/Api/Mastodon/FollowRequest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2010-2023, the Friendica project
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-namespace Friendica\Factory\Api\Mastodon;
-
-use Friendica\App\BaseURL;
-use Friendica\BaseFactory;
-use Friendica\Collection\Api\Mastodon\Fields;
-use Friendica\Contact\Introduction\Entity\Introduction;
-use Friendica\Database\DBA;
-use Friendica\Network\HTTPException;
-use ImagickException;
-use Psr\Log\LoggerInterface;
-
-class FollowRequest extends BaseFactory
-{
-       /** @var BaseURL */
-       private $baseUrl;
-
-       public function __construct(LoggerInterface $logger, BaseURL $baseURL)
-       {
-               parent::__construct($logger);
-
-               $this->baseUrl = $baseURL;
-       }
-
-       /**
-        * @param Introduction $introduction
-        * @return \Friendica\Object\Api\Mastodon\Account
-        * @throws ImagickException|HTTPException\InternalServerErrorException
-        */
-       public function createFromIntroduction(Introduction $introduction): \Friendica\Object\Api\Mastodon\Account
-       {
-               $account = DBA::selectFirst('account-user-view', [], ['id' => $introduction->cid,
-                       'uid' => [0, $introduction->uid]]);
-               if (empty($account)) {
-                       $this->logger->warning('Wrong introduction data', ['Introduction' => $introduction]);
-                       throw new HTTPException\InternalServerErrorException('Wrong introduction data');
-               }
-
-               return new \Friendica\Object\Api\Mastodon\Account($this->baseUrl, $account, new Fields());
-       }
-}

diff --git a/src/Module/Api/Mastodon/FollowRequests.php b/src/Module/Api/Mastodon/FollowRequests.php
index 723a98bcdd0e8583fac8d39e3b536974d4fda39c..dfe3aadf336ac8af79bf5d972bb9b4bba903ecdd 100644 (file)
--- a/src/Module/Api/Mastodon/FollowRequests.php
+++ b/src/Module/Api/Mastodon/FollowRequests.php
@@ -105,8 +105,10 @@ class FollowRequests extends BaseApi
                foreach ($introductions as $key => $introduction) {
                        try {
                                self::setBoundaries($introduction->id);
-                               $return[] = DI::mstdnFollowRequest()->createFromIntroduction($introduction);
-                       } catch (HTTPException\InternalServerErrorException $exception) {
+                               $return[] = DI::mstdnAccount()->createFromContactId($introduction->cid, $introduction->uid);
+                       } catch (HTTPException\InternalServerErrorException
+                               | HTTPException\NotFoundException
+                               | \ImagickException $exception) {
                                DI::intro()->delete($introduction);
                                unset($introductions[$key]);
                        }