Set "convertForItem" at more places

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index a00b0c702f03b9d581c5578c5fb9f726216d0334..461002017959927d55af44787b6bb564053f4b27 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -650,11 +650,11 @@ class Contact extends BaseModule
                                '$profileurllabel'=> DI::l10n()->t('Profile URL'),
                                '$profileurl'     => $contact['url'],
                                '$account_type'   => Model\Contact::getAccountType($contact),
-                               '$location'       => BBCode::convert($contact['location']),
+                               '$location'       => BBCode::convertForItem($contact['uri-id'] ?? 0, $contact['location']),
                                '$location_label' => DI::l10n()->t('Location:'),
-                               '$xmpp'           => BBCode::convert($contact['xmpp']),
+                               '$xmpp'           => BBCode::convertForItem($contact['uri-id'] ?? 0, $contact['xmpp']),
                                '$xmpp_label'     => DI::l10n()->t('XMPP:'),
-                               '$about'          => BBCode::convert($contact['about'], false),
+                               '$about'          => BBCode::convertForItem($contact['uri-id'] ?? 0, $contact['about'], BBCode::EXTERNAL),
                                '$about_label'    => DI::l10n()->t('About:'),
                                '$keywords'       => $contact['keywords'],
                                '$keywords_label' => DI::l10n()->t('Tags:'),

diff --git a/src/Object/Api/Mastodon/Account.php b/src/Object/Api/Mastodon/Account.php
index 9307375752cdad581031ee5707fb7d2db0495a28..39c58e099ec47fc8171b6b7a3d8cf87d1dba76e5 100644 (file)
--- a/src/Object/Api/Mastodon/Account.php
+++ b/src/Object/Api/Mastodon/Account.php
@@ -111,7 +111,7 @@ class Account extends BaseDataTransferObject
                $created = $userContactCreated < $publicContactCreated && ($userContactCreated != DBA::NULL_DATETIME) ? $userContactCreated : $publicContactCreated;
                $this->created_at      = DateTimeFormat::utc($created, DateTimeFormat::JSON);
 
-               $this->note            = BBCode::convertForItem($publicContact['uri-id'] ?? 0, $publicContact['about'], BBCode::API);
+               $this->note            = BBCode::convertForItem($publicContact['uri-id'] ?? 0, $publicContact['about'], BBCode::EXTERNAL);
                $this->url             = $publicContact['url'];
                $this->avatar          = Contact::getAvatarUrlForId($userContact['id'] ?? 0 ?: $publicContact['id'], Proxy::SIZE_SMALL, $userContact['updated'] ?? '' ?: $publicContact['updated']);
                $this->avatar_static   = $this->avatar;

diff --git a/src/Object/Api/Mastodon/Status.php b/src/Object/Api/Mastodon/Status.php
index 2c60d4ee36f220ce614c832688c09d46363d4a8d..62b44e33704b4e70f1b9404dcfa892c736a80ed8 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::convertForItem($item['uri-id'], ($item['raw-body'] ?? $item['body']), BBCode::API);
+               $this->content = BBCode::convertForItem($item['uri-id'], ($item['raw-body'] ?? $item['body']), BBCode::EXTERNAL);
                $this->reblog = $reblog;
                $this->application = $application->toArray();
                $this->account = $account->toArray();