keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12799 from HankG/fix-mastodon-friend-requests-ids

Browse source 
Change FollowRequest to return the user ID so is compatible with POST endpoint
This commit is contained in:
Hypolite Petovan 2023-02-17 18:09:26 -05:00 committed by GitHub
commit 6d38b44b97
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/DI.php
View file

@ -382,14 +382,6 @@ abstract class DI
return self::$dice->create(Factory\Api\Mastodon\Error::class); 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 * @return Factory\Api\Mastodon\Poll
*/ */

61
src/Factory/Api/Mastodon/FollowRequest.php
View file

@ -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\Contact\Introduction\Entity\Introduction;
use Friendica\Database\DBA;
use Friendica\Model\APContact;
use Friendica\Model\Contact;
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\FollowRequest
* @throws ImagickException|HTTPException\InternalServerErrorException
*/
public function createFromIntroduction(Introduction $introduction): \Friendica\Object\Api\Mastodon\FollowRequest
{
$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\FollowRequest($this->baseUrl, $introduction->id, $account);
}
}

6
src/Module/Api/Mastodon/FollowRequests.php
View file

@ -105,8 +105,10 @@ class FollowRequests extends BaseApi
foreach ($introductions as $key => $introduction) { foreach ($introductions as $key => $introduction) {
try { try {
self::setBoundaries($introduction->id); self::setBoundaries($introduction->id);
$return[] = DI::mstdnFollowRequest()->createFromIntroduction($introduction); $return[] = DI::mstdnAccount()->createFromContactId($introduction->cid, $introduction->uid);
} catch (HTTPException\InternalServerErrorException $exception) { } catch (HTTPException\InternalServerErrorException
| HTTPException\NotFoundException
| \ImagickException $exception) {
DI::intro()->delete($introduction); DI::intro()->delete($introduction);
unset($introductions[$key]); unset($introductions[$key]);
} }

49
src/Object/Api/Mastodon/FollowRequest.php
View file

@ -1,49 +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\Object\Api\Mastodon;
use Friendica\App\BaseURL;
use Friendica\Collection\Api\Mastodon\Fields;
/**
* Virtual entity to separate Accounts from Follow Requests.
* In the Mastodon API they are one and the same.
*/
class FollowRequest extends Account
{
/**
* Creates a follow request entity from an introduction record.
*
* The account ID is set to the Introduction ID to allow for later interaction with follow requests.
*
* @param BaseURL $baseUrl
* @param int $introduction_id Introduction record id
* @param array $account entry of "account-user-view"
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public function __construct(BaseURL $baseUrl, int $introduction_id, array $account)
{
parent::__construct($baseUrl, $account, new Fields());
$this->id = $introduction_id;
}
}