bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Add check for existing attachment in ActivityPub\Processor::constructAttachList

Browse source
This commit is contained in:
Hypolite Petovan 2020-06-07 16:23:57 -04:00
parent 01e9beffc2
commit 4d3dd28c44
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Protocol/ActivityPub/Processor.php
View file

@ -96,7 +96,15 @@ class Processor
foreach ($activity['attachments'] as $attach) {
switch ($attach['type']) {
case 'link':
$item['body'] .= "\n[attachment type='link' url='" . $attach['url'] . "' title='" . ($attach['title'] ?? '') . "' image='" . ($attach['image'] ?? '') . "']" . ($attach['desc'] ?? '') . '[/attachment]';
// 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 {
$item['body'] .= "\n[attachment type='link' url='" . $attach['url'] . "' title='" . ($attach['title'] ?? '') . "' image='" . ($attach['image'] ?? '') . "']" . ($attach['desc'] ?? '') . '[/attachment]';
}
break;
default:
$filetype = strtolower(substr($attach['mediaType'], 0, strpos($attach['mediaType'], '/')));