Merge pull request #10116 from mexon/mat/addon-console-command

[friendica.git] / src / Object / Api / Mastodon / Status.php

diff --git a/src/Object/Api/Mastodon/Status.php b/src/Object/Api/Mastodon/Status.php
index 1b09a4f01a8652755be78e4eb52540e99a0ab723..c4b7e397dcbdff2d5570dd72bf75a3261d6c56f7 100644 (file)
--- a/src/Object/Api/Mastodon/Status.php
+++ b/src/Object/Api/Mastodon/Status.php
@@ -21,7 +21,7 @@
 
 namespace Friendica\Object\Api\Mastodon;
 
-use Friendica\BaseEntity;
+use Friendica\BaseDataTransferObject;
 use Friendica\Content\Text\BBCode;
 use Friendica\Object\Api\Mastodon\Status\Counts;
 use Friendica\Object\Api\Mastodon\Status\UserAttributes;
@@ -32,7 +32,7 @@ use Friendica\Util\DateTimeFormat;
  *
  * @see https://docs.joinmastodon.org/entities/status
  */
-class Status extends BaseEntity
+class Status extends BaseDataTransferObject
 {
        /** @var string */
        protected $id;
@@ -97,7 +97,7 @@ class Status extends BaseEntity
         * @param array   $item
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public function __construct(array $item, Account $account, Counts $counts, UserAttributes $userAttributes, bool $sensitive, Application $application, array $mentions, array $tags, Card $card, array $attachments)
+       public function __construct(array $item, Account $account, Counts $counts, UserAttributes $userAttributes, bool $sensitive, Application $application, array $mentions, array $tags, Card $card, array $attachments, array $reblog)
        {
                $this->id         = (string)$item['uri-id'];
                $this->created_at = DateTimeFormat::utc($item['created'], DateTimeFormat::ATOM);
@@ -127,7 +127,7 @@ class Status extends BaseEntity
                $this->bookmarked = $userAttributes->bookmarked;
                $this->pinned = $userAttributes->pinned;
                $this->content = BBCode::convert($item['raw-body'] ?? $item['body'], false);
-               $this->reblog = null; /// @todo
+               $this->reblog = $reblog;
                $this->application = $application->toArray();
                $this->account = $account->toArray();
                $this->media_attachments = $attachments;
@@ -143,7 +143,7 @@ class Status extends BaseEntity
         *
         * @return array
         */
-       public function toArray()
+       public function toArray(): array
        {
                $status = parent::toArray();
 
@@ -155,6 +155,10 @@ class Status extends BaseEntity
                        unset($status['application']);
                }
 
+               if (empty($status['reblog'])) {
+                       $status['reblog'] = null;
+               }
+
                return $status;
        }
 }