Merge pull request #10359 from annando/milliseconds

[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 c7c9247b350f6500fd2a155102e28f7e65894956..0985c0002a9fc9a3fbd96be530e13cd1aa6137d8 100644 (file)
--- a/src/Object/Api/Mastodon/Status.php
+++ b/src/Object/Api/Mastodon/Status.php
@@ -100,7 +100,7 @@ class Status extends BaseDataTransferObject
        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);
+               $this->created_at = DateTimeFormat::utc($item['created'], DateTimeFormat::JSON);
 
                if ($item['gravity'] == GRAVITY_COMMENT) {
                        $this->in_reply_to_id         = (string)$item['thr-parent-id'];
@@ -114,7 +114,12 @@ class Status extends BaseDataTransferObject
                $this->visibility = $visibility[$item['private']];
 
                $languages = json_decode($item['language'], true);
-               $this->language = is_array($languages) ? array_key_first($languages) : null;
+               if (is_array($languages)) {
+                       reset($languages);
+                       $this->language = key($languages);
+               } else {
+                       $this->language = null;
+               }
 
                $this->uri = $item['uri'];
                $this->url = $item['plink'] ?? null;
@@ -126,7 +131,7 @@ 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);
+               $this->content = BBCode::convert($item['raw-body'] ?? $item['body'], false, BBCode::API);
                $this->reblog = $reblog;
                $this->application = $application->toArray();
                $this->account = $account->toArray();
@@ -134,7 +139,7 @@ class Status extends BaseDataTransferObject
                $this->mentions = $mentions;
                $this->tags = $tags;
                $this->emojis = [];
-               $this->card = $card->toArray();
+               $this->card = $card->toArray() ?: null;
                $this->poll = null;
        }