Issue 14495: Rich HTML content with embedded pictures

diff --git a/src/Factory/Api/Mastodon/Status.php b/src/Factory/Api/Mastodon/Status.php
index 005ab68085cc1cff7199945d12ec5eefc0d7b011..cd02890f2d44abfc066f936d405c71e704998dae 100644 (file)
--- a/src/Factory/Api/Mastodon/Status.php
+++ b/src/Factory/Api/Mastodon/Status.php
@@ -328,7 +328,7 @@ class Status extends BaseFactory
 
                $delivery_data   = $uid != $item['uid'] ? null : new FriendicaDeliveryData($item['delivery_queue_count'], $item['delivery_queue_done'], $item['delivery_queue_failed']);
                $visibility_data = $uid != $item['uid'] ? null : new FriendicaVisibility($this->aclFormatter->expand($item['allow_cid']), $this->aclFormatter->expand($item['deny_cid']), $this->aclFormatter->expand($item['allow_gid']), $this->aclFormatter->expand($item['deny_gid']));
-               $friendica       = new FriendicaExtension($item['title'] ?? '', $item['changed'], $item['commented'], $item['received'], $counts->dislikes, $origin_dislike, $network, $platform, $version, $sitename, $delivery_data, $visibility_data);
+               $friendica       = new FriendicaExtension($item['title'] ?? '', $item['changed'], $item['commented'], $item['received'], $counts->dislikes, $origin_dislike, $network, $platform, $version, $sitename, $delivery_data, $visibility_data, BBCode::convertForUriId($item['uri-id'], $item['body'], BBCode::EXTERNAL));
 
                return new \Friendica\Object\Api\Mastodon\Status($item, $account, $counts, $userAttributes, $sensitive, $application, $mentions, $tags, $card, $attachments, $in_reply, $reshare, $friendica, $quote, $poll, $emojis);
        }
@@ -399,7 +399,7 @@ class Status extends BaseFactory
                $attachments = [];
                $in_reply    = [];
                $reshare     = [];
-               $friendica   = new FriendicaExtension('', null, null, null, 0, false, null, null, null, null, null, null);
+               $friendica   = new FriendicaExtension('', null, null, null, 0, false, null, null, null, null, null, null, BBCode::convertForUriId($item['uri-id'], $item['body'], BBCode::EXTERNAL));
 
                return new \Friendica\Object\Api\Mastodon\Status($item, $account, $counts, $userAttributes, $sensitive, $application, $mentions, $tags, $card, $attachments, $in_reply, $reshare, $friendica);
        }

diff --git a/src/Object/Api/Mastodon/Status/FriendicaExtension.php b/src/Object/Api/Mastodon/Status/FriendicaExtension.php
index cca002c7a1f3c544da4dc8800d3b7976a877ca30..4564be254b990a28d7374c40fa598be56df4a4cf 100644 (file)
--- a/src/Object/Api/Mastodon/Status/FriendicaExtension.php
+++ b/src/Object/Api/Mastodon/Status/FriendicaExtension.php
@@ -57,6 +57,9 @@ class FriendicaExtension extends BaseDataTransferObject
         */
        protected $visibility;
 
+       /** @var string|null */
+       protected $content;
+
        /**
         * Creates a FriendicaExtension object
         *
@@ -86,7 +89,8 @@ class FriendicaExtension extends BaseDataTransferObject
                ?string $version,
                ?string $sitename,
                ?FriendicaDeliveryData $delivery_data,
-               ?FriendicaVisibility $visibility
+               ?FriendicaVisibility $visibility,
+               ?string $content
        ) {
                $this->title          = $title;
                $this->changed_at     = $changed_at ? DateTimeFormat::utc($changed_at, DateTimeFormat::JSON) : null;
@@ -100,6 +104,7 @@ class FriendicaExtension extends BaseDataTransferObject
                $this->version        = $version;
                $this->sitename       = $sitename;
                $this->visibility     = $visibility;
+               $this->content        = $content;
        }
 
        /**