From 5a1abb8c7dd467f835937739819f32fb397f6314 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 5 Jan 2020 17:29:54 -0500
Subject: [PATCH] Introduce Mastodon entity factories and API\Entity

---
 src/Api/BaseEntity.php                     |  18 ++++
 src/Api/Entity/Mastodon/Account.php        | 108 ++++++++++++++++++++
 src/Api/Entity/Mastodon/Emoji.php          |  22 ++++
 src/Api/{ => Entity}/Mastodon/Field.php    |  12 ++-
 src/Api/Entity/Mastodon/FollowRequest.php  |  32 ++++++
 src/Api/{ => Entity}/Mastodon/Instance.php |  43 ++++----
 src/Api/Entity/Mastodon/Relationship.php   |  60 +++++++++++
 src/Api/{ => Entity}/Mastodon/Stats.php    |  11 +-
 src/Api/Mastodon/Account.php               | 111 ---------------------
 src/Api/Mastodon/Emoji.php                 |  20 ----
 src/Api/Mastodon/Relationship.php          |  59 -----------
 src/DI.php                                 |   6 ++
 src/Factory/Mastodon/Account.php           |  46 +++++++++
 src/Factory/Mastodon/FollowRequest.php     |  47 +++++++++
 src/Factory/Mastodon/Relationship.php      |  38 +++++++
 src/Module/Api/Mastodon/Instance.php       |   2 +-
 16 files changed, 411 insertions(+), 224 deletions(-)
 create mode 100644 src/Api/BaseEntity.php
 create mode 100644 src/Api/Entity/Mastodon/Account.php
 create mode 100644 src/Api/Entity/Mastodon/Emoji.php
 rename src/Api/{ => Entity}/Mastodon/Field.php (51%)
 create mode 100644 src/Api/Entity/Mastodon/FollowRequest.php
 rename src/Api/{ => Entity}/Mastodon/Instance.php (73%)
 create mode 100644 src/Api/Entity/Mastodon/Relationship.php
 rename src/Api/{ => Entity}/Mastodon/Stats.php (81%)
 delete mode 100644 src/Api/Mastodon/Account.php
 delete mode 100644 src/Api/Mastodon/Emoji.php
 delete mode 100644 src/Api/Mastodon/Relationship.php
 create mode 100644 src/Factory/Mastodon/Account.php
 create mode 100644 src/Factory/Mastodon/FollowRequest.php
 create mode 100644 src/Factory/Mastodon/Relationship.php

diff --git a/src/Api/BaseEntity.php b/src/Api/BaseEntity.php
new file mode 100644
index 0000000000..4bc15943df
--- /dev/null
+++ b/src/Api/BaseEntity.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Friendica\Api;
+
+/**
+ * The API entity classes are meant as data transfer objects. As such, their member should be protected.
+ * Then the JsonSerializable interface ensures the protected members will be included in a JSON encode situation.
+ *
+ * Constructors are supposed to take as arguments the Friendica dependencies/model/collection/data it needs to
+ * populate the class members.
+ */
+abstract class BaseEntity implements \JsonSerializable
+{
+	public function jsonSerialize()
+	{
+		return get_object_vars($this);
+	}
+}
diff --git a/src/Api/Entity/Mastodon/Account.php b/src/Api/Entity/Mastodon/Account.php
new file mode 100644
index 0000000000..8123cf595c
--- /dev/null
+++ b/src/Api/Entity/Mastodon/Account.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace Friendica\Api\Entity\Mastodon;
+
+use Friendica\Api\BaseEntity;
+use Friendica\App\BaseURL;
+use Friendica\Content\Text\BBCode;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
+use Friendica\Util\DateTimeFormat;
+
+/**
+ * Class Account
+ *
+ * @see https://docs.joinmastodon.org/entities/account
+ */
+class Account extends BaseEntity
+{
+	/** @var string */
+	protected $id;
+	/** @var string */
+	protected $username;
+	/** @var string */
+	protected $acct;
+	/** @var string */
+	protected $display_name;
+	/** @var bool */
+	protected $locked;
+	/** @var string (Datetime) */
+	protected $created_at;
+	/** @var int */
+	protected $followers_count;
+	/** @var int */
+	protected $following_count;
+	/** @var int */
+	protected $statuses_count;
+	/** @var string */
+	protected $note;
+	/** @var string (URL)*/
+	protected $url;
+	/** @var string (URL) */
+	protected $avatar;
+	/** @var string (URL) */
+	protected $avatar_static;
+	/** @var string (URL) */
+	protected $header;
+	/** @var string (URL) */
+	protected $header_static;
+	/** @var Emoji[] */
+	protected $emojis;
+	/** @var Account|null */
+	protected $moved = null;
+	/** @var Field[]|null */
+	protected $fields = null;
+	/** @var bool|null */
+	protected $bot = null;
+	/** @var bool */
+	protected $group;
+	/** @var bool */
+	protected $discoverable;
+	/** @var string|null (Datetime) */
+	protected $last_status_at = null;
+
+	/**
+	 * Creates an account record from a public contact record. Expects all contact table fields to be set.
+	 *
+	 * @param BaseURL $baseUrl
+	 * @param array   $publicContact Full contact table record with uid = 0
+	 * @param array   $apcontact     Optional full apcontact table record
+	 * @param array   $userContact   Optional full contact table record with uid != 0
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 */
+	public function __construct(BaseURL $baseUrl, array $publicContact, array $apcontact = [], array $userContact = [])
+	{
+		$this->id              = $publicContact['id'];
+		$this->username        = $publicContact['nick'];
+		$this->acct            =
+			strpos($publicContact['url'], $baseUrl->get() . '/') === 0 ?
+				$publicContact['nick'] :
+				$publicContact['addr'];
+		$this->display_name    = $publicContact['name'];
+		$this->locked          = !empty($apcontact['manually-approve']);
+		$this->created_at      = DateTimeFormat::utc($publicContact['created'], DateTimeFormat::ATOM);
+		$this->followers_count = $apcontact['followers_count'] ?? 0;
+		$this->following_count = $apcontact['following_count'] ?? 0;
+		$this->statuses_count  = $apcontact['statuses_count'] ?? 0;
+		$this->note            = BBCode::convert($publicContact['about'], false);
+		$this->url             = $publicContact['url'];
+		$this->avatar          = $userContact['avatar'] ?? $publicContact['avatar'];
+		$this->avatar_static   = $userContact['avatar'] ?? $publicContact['avatar'];
+		// No header picture in Friendica
+		$this->header          = '';
+		$this->header_static   = '';
+		// No custom emojis per account in Friendica
+		$this->emojis          = [];
+		// No metadata fields in Friendica
+		$this->fields          = [];
+		$this->bot             = ($publicContact['contact-type'] == Contact::TYPE_NEWS);
+		$this->group           = ($publicContact['contact-type'] == Contact::TYPE_COMMUNITY);
+		$this->discoverable    = !$publicContact['unsearchable'];
+
+		$publicContactLastItem = $publicContact['last-item'] ?: DBA::NULL_DATETIME;
+		$userContactLastItem = $userContact['last-item'] ?? DBA::NULL_DATETIME;
+
+		$lastItem = $userContactLastItem > $publicContactLastItem ? $userContactLastItem : $publicContactLastItem;
+		$this->last_status_at  = $lastItem != DBA::NULL_DATETIME ? DateTimeFormat::utc($lastItem, DateTimeFormat::ATOM) : null;
+	}
+}
diff --git a/src/Api/Entity/Mastodon/Emoji.php b/src/Api/Entity/Mastodon/Emoji.php
new file mode 100644
index 0000000000..f3dbfa5e7d
--- /dev/null
+++ b/src/Api/Entity/Mastodon/Emoji.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Friendica\Api\Entity\Mastodon;
+
+use Friendica\Api\BaseEntity;
+
+/**
+ * Class Emoji
+ *
+ * @see https://docs.joinmastodon.org/api/entities/#emoji
+ */
+class Emoji extends BaseEntity
+{
+	/** @var string */
+	protected $shortcode;
+	/** @var string (URL)*/
+	protected $static_url;
+	/** @var string (URL)*/
+	protected $url;
+	/** @var bool */
+	protected $visible_in_picker;
+}
diff --git a/src/Api/Mastodon/Field.php b/src/Api/Entity/Mastodon/Field.php
similarity index 51%
rename from src/Api/Mastodon/Field.php
rename to src/Api/Entity/Mastodon/Field.php
index 92a3d4e239..f01128ad41 100644
--- a/src/Api/Mastodon/Field.php
+++ b/src/Api/Entity/Mastodon/Field.php
@@ -1,18 +1,20 @@
 <?php
 
-namespace Friendica\Api\Mastodon;
+namespace Friendica\Api\Entity\Mastodon;
+
+use Friendica\Api\BaseEntity;
 
 /**
  * Class Field
  *
  * @see https://docs.joinmastodon.org/api/entities/#field
  */
-class Field
+class Field extends BaseEntity
 {
 	/** @var string */
-	var $name;
+	protected $name;
 	/** @var string (HTML) */
-	var $value;
+	protected $value;
 	/** @var string (Datetime)*/
-	var $verified_at;
+	protected $verified_at;
 }
diff --git a/src/Api/Entity/Mastodon/FollowRequest.php b/src/Api/Entity/Mastodon/FollowRequest.php
new file mode 100644
index 0000000000..a677a69626
--- /dev/null
+++ b/src/Api/Entity/Mastodon/FollowRequest.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Friendica\Api\Entity\Mastodon;
+
+use Friendica\App\BaseURL;
+use Friendica\Model\Introduction;
+
+/**
+ * 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   $publicContact   Full contact table record with uid = 0
+	 * @param array   $apcontact       Optional full apcontact table record
+	 * @param array   $userContact     Optional full contact table record with uid != 0
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 */
+	public function __construct(BaseURL $baseUrl, int $introduction_id, array $publicContact, array $apcontact = [], array $userContact = [])
+	{
+		parent::__construct($baseUrl, $publicContact, $apcontact, $userContact);
+
+		$this->id = $introduction_id;
+	}
+}
diff --git a/src/Api/Mastodon/Instance.php b/src/Api/Entity/Mastodon/Instance.php
similarity index 73%
rename from src/Api/Mastodon/Instance.php
rename to src/Api/Entity/Mastodon/Instance.php
index 6652641b49..c3828e2b87 100644
--- a/src/Api/Mastodon/Instance.php
+++ b/src/Api/Entity/Mastodon/Instance.php
@@ -1,12 +1,11 @@
 <?php
 
-namespace Friendica\Api\Mastodon;
+namespace Friendica\Api\Entity\Mastodon;
 
-use Friendica\App;
+use Friendica\Api\BaseEntity;
 use Friendica\Core\Config;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\APContact;
 use Friendica\Model\User;
 use Friendica\Module\Register;
 
@@ -15,42 +14,41 @@ use Friendica\Module\Register;
  *
  * @see https://docs.joinmastodon.org/api/entities/#instance
  */
-class Instance
+class Instance extends BaseEntity
 {
 	/** @var string (URL) */
-	var $uri;
+	protected $uri;
 	/** @var string */
-	var $title;
+	protected $title;
 	/** @var string */
-	var $description;
+	protected $description;
 	/** @var string */
-	var $email;
+	protected $email;
 	/** @var string */
-	var $version;
+	protected $version;
 	/** @var array */
-	var $urls;
+	protected $urls;
 	/** @var Stats */
-	var $stats;
-	/** @var string */
-	var $thumbnail;
+	protected $stats;
+	/** @var string|null */
+	protected $thumbnail = null;
 	/** @var array */
-	var $languages;
+	protected $languages;
 	/** @var int */
-	var $max_toot_chars;
+	protected $max_toot_chars;
 	/** @var bool */
-	var $registrations;
+	protected $registrations;
 	/** @var bool */
-	var $approval_required;
+	protected $approval_required;
 	/** @var Account|null */
-	var $contact_account;
+	protected $contact_account = null;
 
 	/**
 	 * Creates an instance record
 	 *
-	 * @param App $app
-	 *
 	 * @return Instance
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function get()
 	{
@@ -77,9 +75,8 @@ class Instance
 			$adminList = explode(',', str_replace(' ', '', Config::get('config', 'admin_email')));
 			$administrator = User::getByEmail($adminList[0], ['nickname']);
 			if (!empty($administrator)) {
-				$adminContact = DBA::selectFirst('contact', [], ['nick' => $administrator['nickname'], 'self' => true]);
-				$apcontact = APContact::getByURL($adminContact['url'], false);
-				$instance->contact_account = Account::create($baseUrl, $adminContact, $apcontact);
+				$adminContact = DBA::selectFirst('contact', ['id'], ['nick' => $administrator['nickname'], 'self' => true]);
+				$instance->contact_account = DI::mstdnAccount()->createFromContactId($adminContact['id']);
 			}
 		}
 
diff --git a/src/Api/Entity/Mastodon/Relationship.php b/src/Api/Entity/Mastodon/Relationship.php
new file mode 100644
index 0000000000..44a7d70c40
--- /dev/null
+++ b/src/Api/Entity/Mastodon/Relationship.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Friendica\Api\Entity\Mastodon;
+
+use Friendica\Api\BaseEntity;
+use Friendica\Model\Contact;
+use Friendica\Util\Network;
+
+/**
+ * Class Relationship
+ *
+ * @see https://docs.joinmastodon.org/api/entities/#relationship
+ */
+class Relationship extends BaseEntity
+{
+	/** @var int */
+	protected $id;
+	/** @var bool */
+	protected $following = false;
+	/** @var bool */
+	protected $followed_by = false;
+	/** @var bool */
+	protected $blocking = false;
+	/** @var bool */
+	protected $muting = false;
+	/** @var bool */
+	protected $muting_notifications = false;
+	/** @var bool */
+	protected $requested = false;
+	/** @var bool */
+	protected $domain_blocking = false;
+	/**
+	 * Unsupported
+	 * @var bool
+	 */
+	protected $showing_reblogs = true;
+	/**
+	 * Unsupported
+	 * @var bool
+	 */
+	protected $endorsed = false;
+
+	/**
+	 * @param int   $userContactId Contact row Id with uid != 0
+	 * @param array $userContact   Full Contact table record with uid != 0
+	 */
+	public function __construct(int $userContactId, array $userContact = [])
+	{
+		$this->id                   = $userContactId;
+		$this->following            = in_array($userContact['rel'] ?? 0, [Contact::SHARING, Contact::FRIEND]);
+		$this->followed_by          = in_array($userContact['rel'] ?? 0, [Contact::FOLLOWER, Contact::FRIEND]);
+		$this->blocking             = (bool)$userContact['blocked'] ?? false;
+		$this->muting               = (bool)$userContact['readonly'] ?? false;
+		$this->muting_notifications = (bool)$userContact['readonly'] ?? false;
+		$this->requested            = (bool)$userContact['pending'] ?? false;
+		$this->domain_blocking      = Network::isUrlBlocked($userContact['url'] ?? '');
+
+		return $this;
+	}
+}
diff --git a/src/Api/Mastodon/Stats.php b/src/Api/Entity/Mastodon/Stats.php
similarity index 81%
rename from src/Api/Mastodon/Stats.php
rename to src/Api/Entity/Mastodon/Stats.php
index 895a58e060..219587830a 100644
--- a/src/Api/Mastodon/Stats.php
+++ b/src/Api/Entity/Mastodon/Stats.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace Friendica\Api\Mastodon;
+namespace Friendica\Api\Entity\Mastodon;
 
+use Friendica\Api\BaseEntity;
 use Friendica\Core\Config;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
@@ -11,14 +12,14 @@ use Friendica\Database\DBA;
  *
  * @see https://docs.joinmastodon.org/api/entities/#stats
  */
-class Stats
+class Stats extends BaseEntity
 {
 	/** @var int */
-	var $user_count;
+	protected $user_count = 0;
 	/** @var int */
-	var $status_count;
+	protected $status_count = 0;
 	/** @var int */
-	var $domain_count;
+	protected $domain_count = 0;
 
 	/**
 	 * Creates a stats record
diff --git a/src/Api/Mastodon/Account.php b/src/Api/Mastodon/Account.php
deleted file mode 100644
index ade6fc03dc..0000000000
--- a/src/Api/Mastodon/Account.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-namespace Friendica\Api\Mastodon;
-
-use Friendica\App\BaseURL;
-use Friendica\Content\Text\BBCode;
-use Friendica\Database\DBA;
-use Friendica\Model\Contact;
-use Friendica\Util\DateTimeFormat;
-
-/**
- * Class Account
- *
- * @see https://docs.joinmastodon.org/entities/account
- */
-class Account
-{
-	/** @var string */
-	var $id;
-	/** @var string */
-	var $username;
-	/** @var string */
-	var $acct;
-	/** @var string */
-	var $display_name;
-	/** @var bool */
-	var $locked;
-	/** @var string (Datetime) */
-	var $created_at;
-	/** @var int */
-	var $followers_count;
-	/** @var int */
-	var $following_count;
-	/** @var int */
-	var $statuses_count;
-	/** @var string */
-	var $note;
-	/** @var string (URL)*/
-	var $url;
-	/** @var string (URL) */
-	var $avatar;
-	/** @var string (URL) */
-	var $avatar_static;
-	/** @var string (URL) */
-	var $header;
-	/** @var string (URL) */
-	var $header_static;
-	/** @var Emoji[] */
-	var $emojis;
-	/** @var Account|null */
-	var $moved = null;
-	/** @var Field[]|null */
-	var $fields = null;
-	/** @var bool|null */
-	var $bot = null;
-	/** @var bool */
-	var $group;
-	/** @var bool */
-	var $discoverable;
-	/** @var string|null (Datetime) */
-	var $last_status_at = null;
-
-	/**
-	 * Creates an account record from a public contact record. Expects all contact table fields to be set.
-	 *
-	 * @param BaseURL $baseUrl
-	 * @param array   $publicContact Full contact table record with uid = 0
-	 * @param array   $apcontact     Optional full apcontact table record
-	 * @param array   $userContact   Optional full contact table record with uid = local_user()
-	 * @return Account
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-	 */
-	public static function create(BaseURL $baseUrl, array $publicContact, array $apcontact = [], array $userContact = [])
-	{
-		$account = new Account();
-		$account->id              = $publicContact['id'];
-		$account->username        = $publicContact['nick'];
-		$account->acct            =
-			strpos($publicContact['url'], $baseUrl->get() . '/') === 0 ?
-			$publicContact['nick'] :
-			$publicContact['addr'];
-		$account->display_name    = $publicContact['name'];
-		$account->locked          = !empty($apcontact['manually-approve']);
-		$account->created_at      = DateTimeFormat::utc($publicContact['created'], DateTimeFormat::ATOM);
-		$account->followers_count = $apcontact['followers_count'] ?? 0;
-		$account->following_count = $apcontact['following_count'] ?? 0;
-		$account->statuses_count  = $apcontact['statuses_count'] ?? 0;
-		$account->note            = BBCode::convert($publicContact['about'], false);
-		$account->url             = $publicContact['url'];
-		$account->avatar          = $userContact['avatar'] ?? $publicContact['avatar'];
-		$account->avatar_static   = $userContact['avatar'] ?? $publicContact['avatar'];
-		// No header picture in Friendica
-		$account->header          = '';
-		$account->header_static   = '';
-		// No custom emojis per account in Friendica
-		$account->emojis          = [];
-		// No metadata fields in Friendica
-		$account->fields          = [];
-		$account->bot             = ($publicContact['contact-type'] == Contact::TYPE_NEWS);
-		$account->group           = ($publicContact['contact-type'] == Contact::TYPE_COMMUNITY);
-		$account->discoverable    = !$publicContact['unsearchable'];
-
-		$publicContactLastItem = $publicContact['last-item'] ?: DBA::NULL_DATETIME;
-		$userContactLastItem = $userContact['last-item'] ?? DBA::NULL_DATETIME;
-
-		$lastItem = $userContactLastItem > $publicContactLastItem ? $userContactLastItem : $publicContactLastItem;
-		$account->last_status_at  = $lastItem != DBA::NULL_DATETIME ? DateTimeFormat::utc($lastItem, DateTimeFormat::ATOM) : null;
-
-		return $account;
-	}
-}
diff --git a/src/Api/Mastodon/Emoji.php b/src/Api/Mastodon/Emoji.php
deleted file mode 100644
index 0fda2d12cb..0000000000
--- a/src/Api/Mastodon/Emoji.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace Friendica\Api\Mastodon;
-
-/**
- * Class Emoji
- *
- * @see https://docs.joinmastodon.org/api/entities/#emoji
- */
-class Emoji
-{
-	/** @var string */
-	var $shortcode;
-	/** @var string (URL)*/
-	var $static_url;
-	/** @var string (URL)*/
-	var $url;
-	/** @var bool */
-	var $visible_in_picker;
-}
diff --git a/src/Api/Mastodon/Relationship.php b/src/Api/Mastodon/Relationship.php
deleted file mode 100644
index 18e249ba3e..0000000000
--- a/src/Api/Mastodon/Relationship.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace Friendica\Api\Mastodon;
-
-use Friendica\Model\Contact;
-use Friendica\Util\Network;
-
-/**
- * Class Relationship
- *
- * @see https://docs.joinmastodon.org/api/entities/#relationship
- */
-class Relationship
-{
-	/** @var int */
-	var $id;
-	/** @var bool */
-	var $following = false;
-	/** @var bool */
-	var $followed_by = false;
-	/** @var bool */
-	var $blocking = false;
-	/** @var bool */
-	var $muting = false;
-	/** @var bool */
-	var $muting_notifications = false;
-	/** @var bool */
-	var $requested = false;
-	/** @var bool */
-	var $domain_blocking = false;
-	/** @var bool */
-	var $showing_reblogs = false;
-	/** @var bool */
-	var $endorsed = false;
-
-	/**
-	 * @param array $contact Full Contact table record
-	 * @return Relationship
-	 */
-	public static function createFromContact(array $contact)
-	{
-		$relationship = new self();
-
-		$relationship->id                   = $contact['id'];
-		$relationship->following            = in_array($contact['rel'], [Contact::SHARING, Contact::FRIEND]);
-		$relationship->followed_by          = in_array($contact['rel'], [Contact::FOLLOWER, Contact::FRIEND]);
-		$relationship->blocking             = (bool)$contact['blocked'];
-		$relationship->muting               = (bool)$contact['readonly'];
-		$relationship->muting_notifications = (bool)$contact['readonly'];
-		$relationship->requested            = (bool)$contact['pending'];
-		$relationship->domain_blocking      = Network::isUrlBlocked($contact['url']);
-		// Unsupported
-		$relationship->showing_reblogs      = true;
-		// Unsupported
-		$relationship->endorsed             = false;
-
-		return $relationship;
-	}
-}
diff --git a/src/DI.php b/src/DI.php
index 485b1b799d..d82b801e92 100644
--- a/src/DI.php
+++ b/src/DI.php
@@ -28,6 +28,9 @@ use Psr\Log\LoggerInterface;
  * @method static Core\Process process()
  * @method static Core\Session\ISession session()
  * @method static Database\Database dba()
+ * @method static Factory\Mastodon\Account mstdnAccount()
+ * @method static Factory\Mastodon\FollowRequest mstdnFollowRequest()
+ * @method static Factory\Mastodon\Relationship mstdnRelationship()
  * @method static Model\User\Cookie cookie()
  * @method static Model\Notify notify()
  * @method static Model\Introduction intro()
@@ -62,6 +65,9 @@ abstract class DI
 		'process'      => Core\Process::class,
 		'session'      => Core\Session\ISession::class,
 		'dba'          => Database\Database::class,
+		'mstdnAccount' => Factory\Mastodon\Account::class,
+		'mstdnFollowRequest' => Factory\Mastodon\FollowRequest::class,
+		'mstdnRelationship'  => Factory\Mastodon\Relationship::class,
 		'cookie'       => Model\User\Cookie::class,
 		'notify'       => Model\Notify::class,
 		'intro'        => Model\Introduction::class,
diff --git a/src/Factory/Mastodon/Account.php b/src/Factory/Mastodon/Account.php
new file mode 100644
index 0000000000..e38654b295
--- /dev/null
+++ b/src/Factory/Mastodon/Account.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Friendica\Factory\Mastodon;
+
+use Friendica\App\BaseURL;
+use Friendica\Model\APContact;
+use Friendica\Model\Contact;
+use Friendica\Network\HTTPException;
+use Friendica\BaseFactory;
+use Psr\Log\LoggerInterface;
+
+class Account extends BaseFactory
+{
+	/** @var BaseURL */
+	protected $baseUrl;
+
+	public function __construct(LoggerInterface $logger, BaseURL $baseURL)
+	{
+		parent::__construct($logger);
+
+		$this->baseUrl = $baseURL;
+	}
+
+	/**
+	 * @param int $contactId
+	 * @param int $uid        User Id
+	 * @return \Friendica\Api\Entity\Mastodon\Account
+	 * @throws HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 */
+	public function createFromContactId(int $contactId, $uid = 0)
+	{
+		$cdata = Contact::getPublicAndUserContacID($contactId, $uid);
+		if (!empty($cdata)) {
+			$publicContact = Contact::getById($cdata['public']);
+			$userContact = Contact::getById($cdata['user']);
+		} else {
+			$publicContact = Contact::getById($contactId);
+			$userContact = [];
+		}
+
+		$apcontact = APContact::getByURL($publicContact['url'], false);
+
+		return new \Friendica\Api\Entity\Mastodon\Account($this->baseUrl, $publicContact, $apcontact, $userContact);
+	}
+}
diff --git a/src/Factory/Mastodon/FollowRequest.php b/src/Factory/Mastodon/FollowRequest.php
new file mode 100644
index 0000000000..b59bfb8ae8
--- /dev/null
+++ b/src/Factory/Mastodon/FollowRequest.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Friendica\Factory\Mastodon;
+
+use Friendica\App\BaseURL;
+use Friendica\Model\APContact;
+use Friendica\Model\Contact;
+use Friendica\Model\Introduction;
+use Friendica\Network\HTTPException;
+use Friendica\BaseFactory;
+use Psr\Log\LoggerInterface;
+
+class FollowRequest extends BaseFactory
+{
+	/** @var BaseURL */
+	protected $baseUrl;
+
+	public function __construct(LoggerInterface $logger, BaseURL $baseURL)
+	{
+		parent::__construct($logger);
+
+		$this->baseUrl = $baseURL;
+	}
+
+	/**
+	 * @param Introduction $Introduction
+	 * @return \Friendica\Api\Entity\Mastodon\FollowRequest
+	 * @throws HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 */
+	public function createFromIntroduction(Introduction $Introduction)
+	{
+		$cdata = Contact::getPublicAndUserContacID($Introduction->{'contact-id'}, $Introduction->uid);
+
+		if (empty($cdata)) {
+			$this->logger->warning('Wrong introduction data', ['Introduction' => $Introduction]);
+			throw new HTTPException\InternalServerErrorException('Wrong introduction data');
+		}
+
+		$publicContact = Contact::getById($cdata['public']);
+		$userContact = Contact::getById($cdata['user']);
+
+		$apcontact = APContact::getByURL($publicContact['url'], false);
+
+		return new \Friendica\Api\Entity\Mastodon\FollowRequest($this->baseUrl, $Introduction->id, $publicContact, $apcontact, $userContact);
+	}
+}
diff --git a/src/Factory/Mastodon/Relationship.php b/src/Factory/Mastodon/Relationship.php
new file mode 100644
index 0000000000..25c9d4c8ce
--- /dev/null
+++ b/src/Factory/Mastodon/Relationship.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Friendica\Factory\Mastodon;
+
+use Friendica\Api\Entity\Mastodon\Relationship as RelationshipEntity;
+use Friendica\BaseFactory;
+use Friendica\Model\Contact;
+
+class Relationship extends BaseFactory
+{
+	/**
+	 * @param int $userContactId Contact row id with uid != 0
+	 * @return RelationshipEntity
+	 * @throws \Exception
+	 */
+	public function createFromContactId(int $userContactId)
+	{
+		return $this->createFromContact(Contact::getById($userContactId));
+	}
+
+	/**
+	 * @param array $userContact Full contact row record with uid != 0
+	 * @return RelationshipEntity
+	 */
+	public function createFromContact(array $userContact)
+	{
+		return new RelationshipEntity($userContact['id'], $userContact);
+	}
+
+	/**
+	 * @param int $userContactId Contact row id with uid != 0
+	 * @return RelationshipEntity
+	 */
+	public function createDefaultFromContactId(int $userContactId)
+	{
+		return new RelationshipEntity($userContactId);
+	}
+}
diff --git a/src/Module/Api/Mastodon/Instance.php b/src/Module/Api/Mastodon/Instance.php
index 96d4db3302..cc7639f460 100644
--- a/src/Module/Api/Mastodon/Instance.php
+++ b/src/Module/Api/Mastodon/Instance.php
@@ -2,7 +2,7 @@
 
 namespace Friendica\Module\Api\Mastodon;
 
-use Friendica\Api\Mastodon\Instance as InstanceEntity;
+use Friendica\Api\Entity\Mastodon\Instance as InstanceEntity;
 use Friendica\Core\System;
 use Friendica\Module\Base\Api;