Providing the uri-id to "convert" when possible

diff --git a/src/Object/Api/Mastodon/Status.php b/src/Object/Api/Mastodon/Status.php
index 0985c0002a9fc9a3fbd96be530e13cd1aa6137d8..f476710d4ee051f1daf6f7c7b247b2bc570295cd 100644 (file)
--- a/src/Object/Api/Mastodon/Status.php
+++ b/src/Object/Api/Mastodon/Status.php
@@ -131,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, BBCode::API);
+               $this->content = BBCode::convert($item['raw-body'] ?? $item['body'], false, BBCode::API, false, $item['uri-id']);
                $this->reblog = $reblog;
                $this->application = $application->toArray();
                $this->account = $account->toArray();

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index 0eac87f6a33a2965dd00248558f484837628fc88..652e7652944432ff8c1ea4c8bf25aebd2858d110 100644 (file)
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -1464,7 +1464,7 @@ class Transmitter
        {
                $event = [];
                $event['name'] = $item['event-summary'];
-               $event['content'] = BBCode::convert($item['event-desc'], false, BBCode::ACTIVITYPUB);
+               $event['content'] = BBCode::convert($item['event-desc'], false, BBCode::ACTIVITYPUB, false, $item['uri-id']);
                $event['startTime'] = DateTimeFormat::utc($item['event-start'] . '+00:00', DateTimeFormat::ATOM);
 
                if (!$item['event-nofinish']) {
@@ -1571,7 +1571,7 @@ class Transmitter
                        $regexp = "/[@!]\[url\=([^\[\]]*)\].*?\[\/url\]/ism";
                        $body = preg_replace_callback($regexp, ['self', 'mentionCallback'], $body);
 
-                       $data['content'] = BBCode::convert($body, false, BBCode::ACTIVITYPUB);
+                       $data['content'] = BBCode::convert($body, false, BBCode::ACTIVITYPUB, false, $item['uri-id']);
                }
 
                // The regular "content" field does contain a minimized HTML. This is done since systems like
@@ -1583,7 +1583,7 @@ class Transmitter
                        $richbody = preg_replace_callback($regexp, ['self', 'mentionCallback'], $item['body']);
                        $richbody = BBCode::removeAttachment($richbody);
 
-                       $data['contentMap'][$language] = BBCode::convert($richbody, false, BBCode::EXTERNAL);
+                       $data['contentMap'][$language] = BBCode::convert($richbody, false, BBCode::EXTERNAL, false, $item['uri-id']);
                }
 
                $data['source'] = ['content' => $item['body'], 'mediaType' => "text/bbcode"];

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 797a3973b46e4c9254bc3dc0079b6cc70b7da82a..9ac40c0a2dafb499175b175dba106a6d9f133c1e 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -918,7 +918,7 @@ class DFRN
                                $htmlbody = "[b]" . $item['title'] . "[/b]\n\n" . $htmlbody;
                        }
 
-                       $htmlbody = BBCode::convert($htmlbody, false, BBCode::OSTATUS);
+                       $htmlbody = BBCode::convert($htmlbody, false, BBCode::OSTATUS, false, $item['uri-id']);
                }
 
                $author = self::addEntryAuthor($doc, "author", $item["author-link"], $item);

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index f137bd2349dda50fefd313b31ef23cc1f83c88e8..bed67faacd6b7fa7add9587355d81e6ab201581b 100644 (file)
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -1109,7 +1109,7 @@ class Feed
 
                $body = OStatus::formatPicturePost($item['body'], $item['uri-id']);
 
-               $body = BBCode::convert($body, false, BBCode::OSTATUS);
+               $body = BBCode::convert($body, false, BBCode::OSTATUS, false, $item['uri-id']);
 
                XML::addElement($doc, $entry, "content", $body, ["type" => "html"]);
 
@@ -1186,7 +1186,7 @@ class Feed
        private static function getTitle(array $item)
        {
                if ($item['title'] != '') {
-                       return BBCode::convert($item['title'], false, BBCode::OSTATUS);
+                       return BBCode::convert($item['title'], false, BBCode::OSTATUS, false, $item['uri-id']);
                }
 
                // Fetch information about the post

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 869213ade2d2b68cbc96b20742e1fc14ad26c783..6318f0940a1c4f0724fe5f36da63c22f05d2b3bc 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -1803,7 +1803,7 @@ class OStatus
 
                if (!$toplevel) {
                        if (!empty($item['title'])) {
-                               $title = BBCode::convert($item['title'], false, BBCode::OSTATUS);
+                               $title = BBCode::convert($item['title'], false, BBCode::OSTATUS, false, $item['uri-id']);
                        } else {
                                $title = sprintf("New note by %s", $owner["nick"]);
                        }
@@ -1892,7 +1892,7 @@ class OStatus
                        $body = "[b]".$item['title']."[/b]\n\n".$body;
                }
 
-               $body = BBCode::convert($body, false, BBCode::OSTATUS);
+               $body = BBCode::convert($body, false, BBCode::OSTATUS, false, $item['uri-id']);
 
                XML::addElement($doc, $entry, "content", $body, ["type" => "html"]);