--- /dev/null
+<?php
+
+
+namespace Friendica\Collection\Api\Mastodon;
+
+use Friendica\BaseCollection;
+use Friendica\Object\Api\Mastodon\Mention;
+
+class Mentions extends BaseCollection
+{
+ /**
+ * @return Mention
+ */
+ public function current()
+ {
+ return parent::current();
+ }
+}
return self::$dice->create(Factory\Api\Mastodon\Error::class);
}
- /**
- * @return Factory\Api\Mastodon\Field
- */
- public static function mstdnField()
- {
- return self::$dice->create(Factory\Api\Mastodon\Field::class);
- }
-
/**
* @return Factory\Api\Mastodon\FollowRequest
*/
return self::$dice->create(Factory\Api\Mastodon\ListEntity::class);
}
- /**
- * @return Factory\Api\Mastodon\Mention
- */
- public static function mstdnMention()
- {
- return self::$dice->create(Factory\Api\Mastodon\Mention::class);
- }
-
/**
* @return Factory\Api\Mastodon\Notification
*/
return self::$dice->create(Factory\Api\Mastodon\Notification::class);
}
- /**
- * @return Factory\Api\Mastodon\Tag
- */
- public static function mstdnTag()
- {
- return self::$dice->create(Factory\Api\Mastodon\Tag::class);
- }
-
/**
* @return Factory\Api\Twitter\User
*/
class Account extends BaseFactory
{
/** @var BaseURL */
- protected $baseUrl;
+ private $baseUrl;
/** @var ProfileField */
- protected $profileField;
+ private $profileFieldRepo;
/** @var Field */
- protected $mstdnField;
+ private $mstdnFieldFactory;
- public function __construct(LoggerInterface $logger, BaseURL $baseURL, ProfileField $profileField, Field $mstdnField)
+ public function __construct(LoggerInterface $logger, BaseURL $baseURL, ProfileField $profileFieldRepo, Field $mstdnFieldFactory)
{
parent::__construct($logger);
- $this->baseUrl = $baseURL;
- $this->profileField = $profileField;
- $this->mstdnField = $mstdnField;
+ $this->baseUrl = $baseURL;
+ $this->profileFieldRepo = $profileFieldRepo;
+ $this->mstdnFieldFactory = $mstdnFieldFactory;
}
/**
$self_contact = Contact::selectFirst(['uid'], ['nurl' => $publicContact['nurl'], 'self' => true]);
if (!empty($self_contact['uid'])) {
- $profileFields = $this->profileField->select(['uid' => $self_contact['uid'], 'psid' => PermissionSet::PUBLIC]);
- $fields = $this->mstdnField->createFromProfileFields($profileFields);
+ $profileFields = $this->profileFieldRepo->select(['uid' => $self_contact['uid'], 'psid' => PermissionSet::PUBLIC]);
+ $fields = $this->mstdnFieldFactory->createFromProfileFields($profileFields);
} else {
$fields = new Fields();
}
{
$publicContact = Contact::selectFirst([], ['uid' => $userId, 'self' => true]);
- $profileFields = $this->profileField->select(['uid' => $userId, 'psid' => PermissionSet::PUBLIC]);
- $fields = $this->mstdnField->createFromProfileFields($profileFields);
+ $profileFields = $this->profileFieldRepo->select(['uid' => $userId, 'psid' => PermissionSet::PUBLIC]);
+ $fields = $this->mstdnFieldFactory->createFromProfileFields($profileFields);
$apcontact = APContact::getByURL($publicContact['url'], false);
namespace Friendica\Factory\Api\Mastodon;
use Friendica\BaseFactory;
-use Friendica\Database\DBA;
+use Friendica\Database\Database;
+use Friendica\Network\HTTPException\InternalServerErrorException;
+use Psr\Log\LoggerInterface;
class Application extends BaseFactory
{
+ /** @var Database */
+ private $dba;
+
+ public function __construct(LoggerInterface $logger, Database $dba)
+ {
+ parent::__construct($logger);
+ $this->dba = $dba;
+ }
+
/**
* @param int $id Application ID
+ *
+ * @return \Friendica\Object\Api\Mastodon\Application
+ *
+ * @throws InternalServerErrorException
*/
public function createFromApplicationId(int $id)
{
- $application = DBA::selectFirst('application', ['client_id', 'client_secret', 'id', 'name', 'redirect_uri', 'website'], ['id' => $id]);
- if (!DBA::isResult($application)) {
+ $application = $this->dba->selectFirst('application', ['client_id', 'client_secret', 'id', 'name', 'redirect_uri', 'website'], ['id' => $id]);
+ if (!$this->dba->isResult($application)) {
return [];
}
- $object = new \Friendica\Object\Api\Mastodon\Application(
+ return new \Friendica\Object\Api\Mastodon\Application(
$application['name'],
$application['client_id'],
$application['client_secret'],
$application['id'],
$application['redirect_uri'],
$application['website']);
-
- return $object->toArray();
}
}
use Friendica\App\BaseURL;
use Friendica\BaseFactory;
-use Friendica\DI;
use Friendica\Model\Photo;
use Friendica\Network\HTTPException;
use Friendica\Model\Post;
-use Friendica\Repository\ProfileField;
use Friendica\Util\Images;
use Friendica\Util\Proxy;
use Psr\Log\LoggerInterface;
class Attachment extends BaseFactory
{
/** @var BaseURL */
- protected $baseUrl;
- /** @var ProfileField */
- protected $profileField;
- /** @var Field */
- protected $mstdnField;
+ private $baseUrl;
- public function __construct(LoggerInterface $logger, BaseURL $baseURL, ProfileField $profileField, Field $mstdnField)
+ public function __construct(LoggerInterface $logger, BaseURL $baseURL)
{
parent::__construct($logger);
$this->baseUrl = $baseURL;
- $this->profileField = $profileField;
- $this->mstdnField = $mstdnField;
}
/**
$phototypes = Images::supportedTypes();
$ext = $phototypes[$photo['type']];
- $url = DI::baseUrl() . '/photo/' . $photo['resource-id'] . '-0.' . $ext;
+ $url = $this->baseUrl . '/photo/' . $photo['resource-id'] . '-0.' . $ext;
$preview = Photo::selectFirst(['scale'], ["`resource-id` = ? AND `uid` = ? AND `scale` > ?", $photo['resource-id'], $photo['uid'], 0], ['order' => ['scale']]);
if (empty($scale)) {
- $preview_url = DI::baseUrl() . '/photo/' . $photo['resource-id'] . '-' . $preview['scale'] . '.' . $ext;
+ $preview_url = $this->baseUrl . '/photo/' . $photo['resource-id'] . '-' . $preview['scale'] . '.' . $ext;
} else {
$preview_url = '';
}
namespace Friendica\Factory\Api\Mastodon;
use Friendica\BaseFactory;
-use Friendica\Database\DBA;
-use Friendica\DI;
+use Friendica\Database\Database;
use Friendica\Model\Contact;
+use Psr\Log\LoggerInterface;
class Conversation extends BaseFactory
{
+ /** @var Database */
+ private $dba;
+ /** @var Status */
+ private $mstdnStatusFactory;
+ /** @var Account */
+ private $mstdnAccountFactory;
+
+ public function __construct(LoggerInterface $logger, Database $dba, Status $mstdnStatusFactory, Account $mstdnAccountFactoryFactory)
+ {
+ parent::__construct($logger);
+ $this->dba = $dba;
+ $this->mstdnStatusFactory = $mstdnStatusFactory;
+ $this->mstdnAccountFactory = $mstdnAccountFactoryFactory;
+ }
+
public function CreateFromConvId(int $id)
{
$accounts = [];
$ids = [];
- $mails = DBA::select('mail', ['id', 'from-url', 'uid', 'seen'], ['convid' => $id], ['order' => ['id' => true]]);
- while ($mail = DBA::fetch($mails)) {
+ $mails = $this->dba->select('mail', ['id', 'from-url', 'uid', 'seen'], ['convid' => $id], ['order' => ['id' => true]]);
+ while ($mail = $this->dba->fetch($mails)) {
if (!$mail['seen']) {
$unread = true;
}
$ids[] = $id;
if (empty($last_status)) {
- $last_status = DI::mstdnStatus()->createFromMailId($mail['id']);
+ $last_status = $this->mstdnStatusFactory->createFromMailId($mail['id']);
}
- $accounts[] = DI::mstdnAccount()->createFromContactId($id, 0);
+ $accounts[] = $this->mstdnAccountFactory->createFromContactId($id, 0);
}
return new \Friendica\Object\Api\Mastodon\Conversation($id, $accounts, $unread, $last_status);
namespace Friendica\Factory\Api\Mastodon;
+use Friendica\App\Arguments;
use Friendica\BaseFactory;
-use Friendica\Core\Logger;
+use Friendica\Core\L10n;
use Friendica\Core\System;
-use Friendica\DI;
+use Psr\Log\LoggerInterface;
+/** @todo A Factory shouldn't return something to the frontpage, it's for creating content, not showing it */
class Error extends BaseFactory
{
+ /** @var Arguments */
+ private $args;
+ /** @var string[] The $_SERVER array */
+ private $server;
+ /** @var L10n */
+ private $l10n;
+
+ public function __construct(LoggerInterface $logger, Arguments $args, L10n $l10n, array $server)
+ {
+ parent::__construct($logger);
+ $this->args = $args;
+ $this->server = $server;
+ $this->l10n = $l10n;
+ }
+
private function logError(int $errorno, string $error)
{
- Logger::info('API Error', ['no' => $errorno, 'error' => $error, 'method' => $_SERVER['REQUEST_METHOD'] ?? '', 'command' => DI::args()->getQueryString(), 'user-agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']);
+ $this->logger->info('API Error', ['no' => $errorno, 'error' => $error, 'method' => $this->server['REQUEST_METHOD'] ?? '', 'command' => $this->args->getQueryString(), 'user-agent' => $this->server['HTTP_USER_AGENT'] ?? '']);
}
public function RecordNotFound()
{
- $error = DI::l10n()->t('Record not found');
+ $error = $this->l10n->t('Record not found');
$error_description = '';
$errorobj = New \Friendica\Object\Api\Mastodon\Error($error, $error_description);
public function UnprocessableEntity(string $error = '')
{
- $error = $error ?: DI::l10n()->t('Unprocessable Entity');
+ $error = $error ?: $this->l10n->t('Unprocessable Entity');
$error_description = '';
$errorobj = New \Friendica\Object\Api\Mastodon\Error($error, $error_description);
public function Unauthorized(string $error = '')
{
- $error = $error ?: DI::l10n()->t('Unauthorized');
+ $error = $error ?: $this->l10n->t('Unauthorized');
$error_description = '';
$errorobj = New \Friendica\Object\Api\Mastodon\Error($error, $error_description);
public function Forbidden(string $error = '')
{
- $error = $error ?: DI::l10n()->t('Token is not authorized with a valid user or is missing a required scope');
+ $error = $error ?: $this->l10n->t('Token is not authorized with a valid user or is missing a required scope');
$error_description = '';
$errorobj = New \Friendica\Object\Api\Mastodon\Error($error, $error_description);
public function InternalError(string $error = '')
{
- $error = $error ?: DI::l10n()->t('Internal Server Error');
+ $error = $error ?: $this->l10n->t('Internal Server Error');
$error_description = '';
$errorobj = New \Friendica\Object\Api\Mastodon\Error($error, $error_description);
{
/**
* @param ProfileField $profileField
- * @return \Friendica\Api\Entity\Mastodon\Field
+ * @return \Friendica\Object\Api\Mastodon\Field
* @throws HTTPException\InternalServerErrorException
*/
public function createFromProfileField(ProfileField $profileField)
class FollowRequest extends BaseFactory
{
/** @var BaseURL */
- protected $baseUrl;
+ private $baseUrl;
public function __construct(LoggerInterface $logger, BaseURL $baseURL)
{
namespace Friendica\Factory\Api\Mastodon;
use Friendica\BaseFactory;
-use Friendica\Database\DBA;
+use Friendica\Database\Database;
+use Psr\Log\LoggerInterface;
class ListEntity extends BaseFactory
{
+ /** @var Database */
+ private $dba;
+
+ public function __construct(LoggerInterface $logger, Database $dba)
+ {
+ parent::__construct($logger);
+ $this->dba = $dba;
+ }
+
public function createFromGroupId(int $id)
{
- $group = DBA::selectFirst('group', ['name'], ['id' => $id, 'deleted' => false]);
+ $group = $this->dba->selectFirst('group', ['name'], ['id' => $id, 'deleted' => false]);
return new \Friendica\Object\Api\Mastodon\ListEntity($id, $group['name'] ?? '', 'list');
}
}
use Friendica\App\BaseURL;
use Friendica\BaseFactory;
+use Friendica\Collection\Api\Mastodon\Mentions;
use Friendica\Model\Contact;
use Friendica\Model\Tag;
use Friendica\Network\HTTPException;
-use Friendica\Repository\ProfileField;
use Psr\Log\LoggerInterface;
class Mention extends BaseFactory
{
/** @var BaseURL */
- protected $baseUrl;
- /** @var ProfileField */
- protected $profileField;
- /** @var Field */
- protected $mstdnField;
+ private $baseUrl;
- public function __construct(LoggerInterface $logger, BaseURL $baseURL, ProfileField $profileField, Field $mstdnField)
+ public function __construct(LoggerInterface $logger, BaseURL $baseURL)
{
parent::__construct($logger);
$this->baseUrl = $baseURL;
- $this->profileField = $profileField;
- $this->mstdnField = $mstdnField;
}
/**
* @param int $uriId Uri-ID of the item
- * @return array
+ * @return Mentions
* @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public function createFromUriId(int $uriId)
{
- $mentions = [];
+ $mentions = new Mentions();
$tags = Tag::getByURIId($uriId, [Tag::MENTION, Tag::EXCLUSIVE_MENTION, Tag::IMPLICIT_MENTION]);
foreach ($tags as $tag) {
$contact = Contact::getByURL($tag['url'], false);
- $mention = new \Friendica\Object\Api\Mastodon\Mention($this->baseUrl, $tag, $contact);
- $mentions[] = $mention->toArray();
+ $mentions->append(new \Friendica\Object\Api\Mastodon\Mention($this->baseUrl, $tag, $contact));
}
return $mentions;
}
namespace Friendica\Factory\Api\Mastodon;
use Friendica\BaseFactory;
-use Friendica\Database\DBA;
-use Friendica\DI;
+use Friendica\Database\Database;
use Friendica\Model\Contact;
use Friendica\Model\Post;
use Friendica\Model\Verb;
use Friendica\Protocol\Activity;
+use Psr\Log\LoggerInterface;
class Notification extends BaseFactory
{
+ /** @var Database */
+ private $dba;
+ /** @var Account */
+ private $mstdnAccountFactory;
+ /** @var Status */
+ private $mstdnStatusFactory;
+
+ public function __construct(LoggerInterface $logger, Database $dba, Account $mstdnAccountFactory, Status $mstdnStatusFactoryFactory)
+ {
+ parent::__construct($logger);
+ $this->dba = $dba;
+ $this->mstdnAccountFactory = $mstdnAccountFactory;
+ $this->mstdnStatusFactory = $mstdnStatusFactoryFactory;
+ }
+
public function createFromNotificationId(int $id)
{
- $notification = DBA::selectFirst('notification', [], ['id' => $id]);
- if (!DBA::isResult($notification)) {
+ $notification = $this->dba->selectFirst('notification', [], ['id' => $id]);
+ if (!$this->dba->isResult($notification)) {
return null;
}
/*
return null;
}
- $account = DI::mstdnAccount()->createFromContactId($notification['actor-id'], $notification['uid']);
+ $account = $this->mstdnAccountFactory->createFromContactId($notification['actor-id'], $notification['uid']);
if (!empty($notification['target-uri-id'])) {
try {
- $status = DI::mstdnStatus()->createFromUriId($notification['target-uri-id'], $notification['uid']);
+ $status = $this->mstdnStatusFactory->createFromUriId($notification['target-uri-id'], $notification['uid']);
} catch (\Throwable $th) {
$status = null;
}
namespace Friendica\Factory\Api\Mastodon;
-use Friendica\App\BaseURL;
use Friendica\BaseFactory;
use Friendica\Content\ContactSelector;
use Friendica\Content\Text\BBCode;
-use Friendica\Database\DBA;
-use Friendica\DI;
+use Friendica\Database\Database;
use Friendica\Model\Post;
use Friendica\Model\Verb;
use Friendica\Network\HTTPException;
use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityPub;
-use Friendica\Repository\ProfileField;
+use ImagickException;
use Psr\Log\LoggerInterface;
class Status extends BaseFactory
{
- /** @var BaseURL */
- protected $baseUrl;
- /** @var ProfileField */
- protected $profileField;
- /** @var Field */
- protected $mstdnField;
-
- public function __construct(LoggerInterface $logger, BaseURL $baseURL, ProfileField $profileField, Field $mstdnField)
+ /** @var Database */
+ private $dba;
+ /** @var Account */
+ private $mstdnAccountFactory;
+ /** @var Mention */
+ private $mstdnMentionFactory;
+ /** @var Tag */
+ private $mstdnTagFactory;
+ /** @var Card */
+ private $mstdnCardFactory;
+ /** @var Attachment */
+ private $mstdnAttachementFactory;
+ /** @var Error */
+ private $mstdnErrorFactory;
+
+ public function __construct(LoggerInterface $logger, Database $dba,
+ Account $mstdnAccountFactory, Mention $mstdnMentionFactory,
+ Tag $mstdnTagFactory, Card $mstdnCardFactory,
+ Attachment $mstdnAttachementFactory, Error $mstdnErrorFactory)
{
parent::__construct($logger);
-
- $this->baseUrl = $baseURL;
- $this->profileField = $profileField;
- $this->mstdnField = $mstdnField;
+ $this->dba = $dba;
+ $this->mstdnAccountFactory = $mstdnAccountFactory;
+ $this->mstdnMentionFactory = $mstdnMentionFactory;
+ $this->mstdnTagFactory = $mstdnTagFactory;
+ $this->mstdnCardFactory = $mstdnCardFactory;
+ $this->mstdnAttachementFactory = $mstdnAttachementFactory;
+ $this->mstdnErrorFactory = $mstdnErrorFactory;
}
/**
* @param int $uriId Uri-ID of the item
* @param int $uid Item user
+ *
* @return \Friendica\Object\Api\Mastodon\Status
* @throws HTTPException\InternalServerErrorException
- * @throws \ImagickException
+ * @throws ImagickException|HTTPException\NotFoundException
*/
public function createFromUriId(int $uriId, $uid = 0)
{
throw new HTTPException\NotFoundException('Item with URI ID ' . $uriId . 'not found' . ($uid ? ' for user ' . $uid : '.'));
}
- $account = DI::mstdnAccount()->createFromContactId($item['author-id']);
+ $account = $this->mstdnAccountFactory->createFromContactId($item['author-id']);
$counts = new \Friendica\Object\Api\Mastodon\Status\Counts(
Post::countPosts(['thr-parent-id' => $uriId, 'gravity' => GRAVITY_COMMENT, 'deleted' => false], []),
- Post::countPosts(['thr-parent-id' => $uriId, 'gravity' => GRAVITY_ACTIVITY, 'vid' => Verb::getID(Activity::ANNOUNCE), 'deleted' => false], []),
- Post::countPosts(['thr-parent-id' => $uriId, 'gravity' => GRAVITY_ACTIVITY, 'vid' => Verb::getID(Activity::LIKE), 'deleted' => false], [])
+ Post::countPosts([
+ 'thr-parent-id' => $uriId,
+ 'gravity' => GRAVITY_ACTIVITY,
+ 'vid' => Verb::getID(Activity::ANNOUNCE),
+ 'deleted' => false
+ ], []),
+ Post::countPosts([
+ 'thr-parent-id' => $uriId,
+ 'gravity' => GRAVITY_ACTIVITY,
+ 'vid' => Verb::getID(Activity::LIKE),
+ 'deleted' => false
+ ], [])
);
$userAttributes = new \Friendica\Object\Api\Mastodon\Status\UserAttributes(
- Post::exists(['thr-parent-id' => $uriId, 'uid' => $uid, 'origin' => true, 'gravity' => GRAVITY_ACTIVITY, 'vid' => Verb::getID(Activity::LIKE), 'deleted' => false]),
- Post::exists(['thr-parent-id' => $uriId, 'uid' => $uid, 'origin' => true, 'gravity' => GRAVITY_ACTIVITY, 'vid' => Verb::getID(Activity::ANNOUNCE), 'deleted' => false]),
+ Post::exists([
+ 'thr-parent-id' => $uriId,
+ 'uid' => $uid,
+ 'origin' => true,
+ 'gravity' => GRAVITY_ACTIVITY,
+ 'vid' => Verb::getID(Activity::LIKE)
+ , 'deleted' => false
+ ]),
+ Post::exists([
+ 'thr-parent-id' => $uriId,
+ 'uid' => $uid,
+ 'origin' => true,
+ 'gravity' => GRAVITY_ACTIVITY,
+ 'vid' => Verb::getID(Activity::ANNOUNCE),
+ 'deleted' => false
+ ]),
Post\ThreadUser::getIgnored($uriId, $uid),
(bool)($item['starred'] && ($item['gravity'] == GRAVITY_PARENT)),
Post\ThreadUser::getPinned($uriId, $uid)
);
- $sensitive = DBA::exists('tag-view', ['uri-id' => $uriId, 'name' => 'nsfw']);
+ $sensitive = $this->dba->exists('tag-view', ['uri-id' => $uriId, 'name' => 'nsfw']);
$application = new \Friendica\Object\Api\Mastodon\Application($item['app'] ?: ContactSelector::networkToName($item['network'], $item['author-link']));
- $mentions = DI::mstdnMention()->createFromUriId($uriId);
- $tags = DI::mstdnTag()->createFromUriId($uriId);
- $card = DI::mstdnCard()->createFromUriId($uriId);
- $attachments = DI::mstdnAttachment()->createFromUriId($uriId);
+ $mentions = $this->mstdnMentionFactory->createFromUriId($uriId)->getArrayCopy();
+ $tags = $this->mstdnTagFactory->createFromUriId($uriId);
+ $card = $this->mstdnCardFactory->createFromUriId($uriId);
+ $attachments = $this->mstdnAttachementFactory->createFromUriId($uriId);
$shared = BBCode::fetchShareAttributes($item['body']);
if (!empty($shared['guid'])) {
$shared_uri_id = $shared_item['uri-id'] ?? 0;
- $mentions = array_merge($mentions, DI::mstdnMention()->createFromUriId($shared_uri_id));
- $tags = array_merge($tags, DI::mstdnTag()->createFromUriId($shared_uri_id));
- $attachments = array_merge($attachments, DI::mstdnAttachment()->createFromUriId($shared_uri_id));
+ $mentions = array_merge($mentions, $this->mstdnMentionFactory->createFromUriId($shared_uri_id)->getArrayCopy());
+ $tags = array_merge($tags, $this->mstdnTagFactory->createFromUriId($shared_uri_id));
+ $attachments = array_merge($attachments, $this->mstdnAttachementFactory->createFromUriId($shared_uri_id));
if (empty($card->toArray())) {
- $card = DI::mstdnCard()->createFromUriId($shared_uri_id);
+ $card = $this->mstdnCardFactory->createFromUriId($shared_uri_id);
}
}
if ($item['vid'] == Verb::getID(Activity::ANNOUNCE)) {
- $reshare = $this->createFromUriId($item['thr-parent-id'], $uid)->toArray();
- $reshared_item = Post::selectFirst(['title', 'body'], ['uri-id' => $item['thr-parent-id'], 'uid' => [0, $uid]]);
+ $reshare = $this->createFromUriId($item['thr-parent-id'], $uid)->toArray();
+ $reshared_item = Post::selectFirst(['title', 'body'], ['uri-id' => $item['thr-parent-id'],'uid' => [0, $uid]]);
$item['title'] = $reshared_item['title'] ?? $item['title'];
- $item['body'] = $reshared_item['body'] ?? $item['body'];
+ $item['body'] = $reshared_item['body'] ?? $item['body'];
} else {
$reshare = [];
}
/**
* @param int $uriId id of the mail
+ *
* @return \Friendica\Object\Api\Mastodon\Status
* @throws HTTPException\InternalServerErrorException
- * @throws \ImagickException
+ * @throws ImagickException
*/
public function createFromMailId(int $id)
{
$item = ActivityPub\Transmitter::ItemArrayFromMail($id, true);
if (empty($item)) {
- DI::mstdnError()->RecordNotFound();
+ $this->mstdnErrorFactory->RecordNotFound();
}
- $account = DI::mstdnAccount()->createFromContactId($item['author-id']);
+ $account = $this->mstdnAccountFactory->createFromContactId($item['author-id']);
- $replies = DBA::count('mail', ['thr-parent-id' => $item['uri-id'], 'reply' => true]);
+ $replies = $this->dba->count('mail', ['thr-parent-id' => $item['uri-id'], 'reply' => true]);
$counts = new \Friendica\Object\Api\Mastodon\Status\Counts($replies, 0, 0);
use Friendica\BaseFactory;
use Friendica\Model\Tag as TagModel;
use Friendica\Network\HTTPException;
-use Friendica\Repository\ProfileField;
use Psr\Log\LoggerInterface;
class Tag extends BaseFactory
{
/** @var BaseURL */
- protected $baseUrl;
- /** @var ProfileField */
- protected $profileField;
- /** @var Field */
- protected $mstdnField;
+ private $baseUrl;
- public function __construct(LoggerInterface $logger, BaseURL $baseURL, ProfileField $profileField, Field $mstdnField)
+ public function __construct(LoggerInterface $logger, BaseURL $baseURL)
{
parent::__construct($logger);
$this->baseUrl = $baseURL;
- $this->profileField = $profileField;
- $this->mstdnField = $mstdnField;
}
/**
DI::mstdnError()->InternalError();
}
- System::jsonExit(DI::mstdnApplication()->createFromApplicationId(DBA::lastInsertId()));
+ System::jsonExit(DI::mstdnApplication()->createFromApplicationId(DBA::lastInsertId())->toArray());
}
}
],
Network\IHTTPRequest::class => [
'instanceOf' => Network\HTTPRequest::class,
- ]
+ ],
+ Factory\Api\Mastodon\Error::class => [
+ 'constructParams' => [
+ $_SERVER
+ ],
+ ],
];
projects / friendica.git / commitdiff