"edited_at" must only be displayed when the entry had been updated

[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 f236d2231d043f48302a8698c6c06198973ac57a..8430601f9830a313b0e21c8299b0e031f0616d0d 100644 (file)
--- a/src/Object/Api/Mastodon/Status.php
+++ b/src/Object/Api/Mastodon/Status.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,7 +23,9 @@ namespace Friendica\Object\Api\Mastodon;
 
 use Friendica\BaseDataTransferObject;
 use Friendica\Content\Text\BBCode;
+use Friendica\Model\Item;
 use Friendica\Object\Api\Mastodon\Status\Counts;
+use Friendica\Object\Api\Mastodon\Status\FriendicaExtension;
 use Friendica\Object\Api\Mastodon\Status\UserAttributes;
 use Friendica\Util\DateTimeFormat;
 
@@ -36,10 +38,14 @@ class Status extends BaseDataTransferObject
 {
        /** @var string */
        protected $id;
-       /** @var string (Datetime) */
+       /** @var string|null (Datetime) */
        protected $created_at;
+       /** @var string|null (Datetime) */
+       protected $edited_at;
        /** @var string|null */
        protected $in_reply_to_id = null;
+       /** @var Status|null - Fedilab extension, see issue https://github.com/friendica/friendica/issues/12672 */
+       protected $in_reply_to_status = null;
        /** @var string|null */
        protected $in_reply_to_account_id = null;
        /** @var bool */
@@ -74,6 +80,8 @@ class Status extends BaseDataTransferObject
        protected $content;
        /** @var Status|null */
        protected $reblog = null;
+       /** @var Status|null - Akkoma extension, see issue https://github.com/friendica/friendica/issues/12603 */
+       protected $quote = null;
        /** @var Application */
        protected $application = null;
        /** @var Account */
@@ -90,6 +98,8 @@ class Status extends BaseDataTransferObject
        protected $card = null;
        /** @var Poll|null */
        protected $poll = null;
+       /** @var FriendicaExtension */
+       protected $friendica;
 
        /**
         * Creates a status record from an item record.
@@ -97,23 +107,25 @@ class Status extends BaseDataTransferObject
         * @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, array $reblog)
+       public function __construct(array $item, Account $account, Counts $counts, UserAttributes $userAttributes, bool $sensitive, Application $application, array $mentions, array $tags, Card $card, array $attachments, array $in_reply, array $reblog, FriendicaExtension $friendica, array $quote = null, array $poll = null)
        {
-               $this->id         = (string)$item['uri-id'];
-               $this->created_at = DateTimeFormat::utc($item['created'], DateTimeFormat::API);
+               $this->id           = (string)$item['uri-id'];
+               $this->created_at   = DateTimeFormat::utc($item['created'], DateTimeFormat::JSON);
+               $this->edited_at    = DateTimeFormat::utc($item['edited'], DateTimeFormat::JSON);
 
-               if ($item['gravity'] == GRAVITY_COMMENT) {
+               if ($item['gravity'] == Item::GRAVITY_COMMENT) {
                        $this->in_reply_to_id         = (string)$item['thr-parent-id'];
+                       $this->in_reply_to_status     = $in_reply;
                        $this->in_reply_to_account_id = (string)$item['parent-author-id'];
                }
 
-               $this->sensitive = $sensitive;
-               $this->spoiler_text = $item['title'];
+               $this->sensitive    = $sensitive;
+               $this->spoiler_text = $item['title'] ?: $item['content-warning'] ?: '';
 
                $visibility = ['public', 'private', 'unlisted'];
                $this->visibility = $visibility[$item['private']];
 
-               $languages = json_decode($item['language'], true);
+               $languages = json_decode($item['language'] ?? '', true);
                if (is_array($languages)) {
                        reset($languages);
                        $this->language = key($languages);
@@ -131,8 +143,9 @@ class Status extends BaseDataTransferObject
                $this->muted = $userAttributes->muted;
                $this->bookmarked = $userAttributes->bookmarked;
                $this->pinned = $userAttributes->pinned;
-               $this->content = BBCode::convert($item['raw-body'] ?? $item['body'], false, BBCode::API);
+               $this->content = BBCode::convertForUriId($item['uri-id'], BBCode::setMentionsToNicknames($item['raw-body'] ?? $item['body']), BBCode::MASTODON_API);
                $this->reblog = $reblog;
+               $this->quote = $quote;
                $this->application = $application->toArray();
                $this->account = $account->toArray();
                $this->media_attachments = $attachments;
@@ -140,7 +153,35 @@ class Status extends BaseDataTransferObject
                $this->tags = $tags;
                $this->emojis = [];
                $this->card = $card->toArray() ?: null;
-               $this->poll = null;
+               $this->poll = $poll;
+               $this->friendica = $friendica;
+       }
+
+       /**
+        * Returns the current created_at string or null if not set
+        * @return \DateTime|null
+        */
+       public function createdAt(): ?string
+       {
+               return $this->created_at;
+       }
+
+       /**
+        * Returns the current edited_at string or null if not set
+        * @return ?string
+        */
+       public function editedAt(): ?string
+       {
+               return $this->edited_at;
+       }
+
+       /**
+        * Returns the Friendica Extension properties
+        * @return FriendicaExtension
+        */
+       public function friendicaExtension(): FriendicaExtension
+       {
+               return $this->friendica;
        }
 
        /**
@@ -164,6 +205,18 @@ class Status extends BaseDataTransferObject
                        $status['reblog'] = null;
                }
 
+               if (empty($status['quote'])) {
+                       $status['quote'] = null;
+               }
+
+               if (empty($status['in_reply_to_status'])) {
+                       $status['in_reply_to_status'] = null;
+               }
+
+               if ($status['created_at'] == $status['edited_at']) {
+                       unset($status['edited_at']);
+               }
+
                return $status;
        }
 }