Use PageInfo::appendDataToBody in ActivityPub\Processor::constructAttachList

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 745a56c2a50f9c35828896eadf02dbf70ad41786..e4cef17045a81378fac75ef7b1176236721afe30 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -21,6 +21,7 @@
 
 namespace Friendica\Protocol\ActivityPub;
 
+use Friendica\Content\PageInfo;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Logger;
@@ -96,18 +97,16 @@ class Processor
                foreach ($activity['attachments'] as $attach) {
                        switch ($attach['type']) {
                                case 'link':
-                                       // Only one [attachment] tag is allowed
-                                       $existingAttachmentPos = strpos($item['body'], '[attachment');
-                                       if ($existingAttachmentPos !== false) {
-                                               $linkTitle = $attach['title'] ?: $attach['url'];
-                                               // Additional link attachments are prepended before the existing [attachment] tag
-                                               $item['body'] = substr_replace($item['body'], "\n[bookmark=" . $attach['url'] . ']' . $linkTitle . "[/bookmark]\n", $existingAttachmentPos, 0);
-                                       } else {
-                                               // Strip the link preview URL from the end of the body if any
-                                               $quotedUrl = preg_quote($attach['url'], '#');
-                                               $item['body'] = preg_replace("#\s*(?:\[bookmark={$quotedUrl}].+?\[/bookmark]|\[url={$quotedUrl}].+?\[/url]|\[url]{$quotedUrl}\[/url]|{$quotedUrl})\s*$#", '', $item['body']);
-                                               $item['body'] .= "\n[attachment type='link' url='" . $attach['url'] . "' title='" . htmlspecialchars($attach['title'] ?? '', ENT_QUOTES) . "' image='" . ($attach['image'] ?? '') . "']" . ($attach['desc'] ?? '') . '[/attachment]';
-                                       }
+                                       $data = [
+                                               'url'      => $attach['url'],
+                                               'type'     => $attach['type'],
+                                               'title'    => $attach['title'] ?? '',
+                                               'text'     => $attach['desc']  ?? '',
+                                               'image'    => $attach['image'] ?? '',
+                                               'images'   => [],
+                                               'keywords' => [],
+                                       ];
+                                       $item['body'] = PageInfo::appendDataToBody($item['body'], $data);
                                        break;
                                default:
                                        $filetype = strtolower(substr($attach['mediaType'], 0, strpos($attach['mediaType'], '/')));