Merge pull request #8191 from MrPetovan/task/7967-mastodon-api-custom_emojis

Add custom emojis Mastodon API endpoint
This commit is contained in:
Philipp 2020-01-28 17:12:00 +01:00 committed by GitHub
commit 977248f510
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 195 additions and 69 deletions

View file

@ -0,0 +1,28 @@
<?php
namespace Friendica\Module\Api\Mastodon;
use Friendica\Content\Smilies;
use Friendica\Core\System;
use Friendica\DI;
use Friendica\Module\BaseApi;
use Friendica\Network\HTTPException;
/**
* @see https://docs.joinmastodon.org/methods/accounts/follow_requests
*/
class CustomEmojis extends BaseApi
{
/**
* @param array $parameters
* @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
* @see https://docs.joinmastodon.org/methods/accounts/follow_requests#pending-follows
*/
public static function rawContent(array $parameters = [])
{
$emojis = DI::mstdnEmoji()->createCollectionFromSmilies(Smilies::getList());
System::jsonExit($emojis->getArrayCopy());
}
}

View file

@ -2,18 +2,15 @@
namespace Friendica\Module\Api\Mastodon;
use Friendica\Api\Entity\Mastodon;
use Friendica\Api\Entity\Mastodon\Relationship;
use Friendica\Core\System;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Module\Base\Api;
use Friendica\Module\BaseApi;
use Friendica\Network\HTTPException;
/**
* @see https://docs.joinmastodon.org/methods/accounts/follow_requests
*/
class FollowRequests extends Api
class FollowRequests extends BaseApi
{
public static function init(array $parameters = [])
{

View file

@ -2,14 +2,14 @@
namespace Friendica\Module\Api\Mastodon;
use Friendica\Api\Entity\Mastodon\Instance as InstanceEntity;
use Friendica\Core\System;
use Friendica\Module\Base\Api;
use Friendica\Module\BaseApi;
use Friendica\Object\Api\Mastodon\Instance as InstanceEntity;
/**
* @see https://docs.joinmastodon.org/api/rest/instances/
*/
class Instance extends Api
class Instance extends BaseApi
{
/**
* @param array $parameters

View file

@ -5,14 +5,14 @@ namespace Friendica\Module\Api\Mastodon\Instance;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Module\Base\Api;
use Friendica\Module\BaseApi;
use Friendica\Network\HTTPException;
use Friendica\Util\Network;
/**
* Undocumented API endpoint that is implemented by both Mastodon and Pleroma
*/
class Peers extends Api
class Peers extends BaseApi
{
/**
* @param array $parameters

View file

@ -1,14 +1,14 @@
<?php
namespace Friendica\Module\Base;
namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\DI;
use Friendica\Network\HTTPException;
require_once __DIR__ . '/../../../include/api.php';
require_once __DIR__ . '/../../include/api.php';
class Api extends BaseModule
class BaseApi extends BaseModule
{
/**
* @var string json|xml|rss|atom