friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #8727 from MrPetovan/task/8676-ap-attachments 

[ActivityPub] Add support for more attachments structures
This commit is contained in:
Michael Vogel 2020-06-08 22:11:40 +02:00 committed by GitHub
parent 59bd6fd908 4d3dd28c44
commit 6665eb76f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 98 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/Protocol/ActivityPub/Processor.php
View File

@ -94,39 +94,51 @@ class Processor
} }
foreach ($activity['attachments'] as $attach) { foreach ($activity['attachments'] as $attach) {
$filetype = strtolower(substr($attach['mediaType'], 0, strpos($attach['mediaType'], '/'))); switch ($attach['type']) {
if ($filetype == 'image') { case 'link':
if (!empty($activity['source']) && strpos($activity['source'], $attach['url'])) { // Only one [attachment] tag is allowed
continue; $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'], '/')));
if ($filetype == 'image') {
if (!empty($activity['source']) && strpos($activity['source'], $attach['url'])) {
continue;
}
if (empty($attach['name'])) { if (empty($attach['name'])) {
$item['body'] .= "\n[img]" . $attach['url'] . '[/img]'; $item['body'] .= "\n[img]" . $attach['url'] . '[/img]';
} else { } else {
$item['body'] .= "\n[img=" . $attach['url'] . ']' . $attach['name'] . '[/img]'; $item['body'] .= "\n[img=" . $attach['url'] . ']' . $attach['name'] . '[/img]';
} }
} elseif ($filetype == 'audio') { } elseif ($filetype == 'audio') {
if (!empty($activity['source']) && strpos($activity['source'], $attach['url'])) { if (!empty($activity['source']) && strpos($activity['source'], $attach['url'])) {
continue; continue;
} }
$item['body'] .= "\n[audio]" . $attach['url'] . '[/audio]'; $item['body'] .= "\n[audio]" . $attach['url'] . '[/audio]';
} elseif ($filetype == 'video') { } elseif ($filetype == 'video') {
if (!empty($activity['source']) && strpos($activity['source'], $attach['url'])) { if (!empty($activity['source']) && strpos($activity['source'], $attach['url'])) {
continue; continue;
} }
$item['body'] .= "\n[video]" . $attach['url'] . '[/video]'; $item['body'] .= "\n[video]" . $attach['url'] . '[/video]';
} else { } else {
if (!empty($item["attach"])) { if (!empty($item["attach"])) {
$item["attach"] .= ','; $item["attach"] .= ',';
} else { } else {
$item["attach"] = ''; $item["attach"] = '';
} }
if (!isset($attach['length'])) {
$attach['length'] = "0"; $item["attach"] .= '[attach]href="' . $attach['url'] . '" length="' . ($attach['length'] ?? '0') . '" type="' . $attach['mediaType'] . '" title="' . ($attach['name'] ?? '') . '"[/attach]';
} }
$item["attach"] .= '[attach]href="'.$attach['url'].'" length="'.$attach['length'].'" type="'.$attach['mediaType'].'" title="'.($attach['name'] ?? '') .'"[/attach]';
} }
} }

81
src/Protocol/ActivityPub/Receiver.php
View File

@ -821,14 +821,10 @@ class Receiver
* *
* @return array with tags in a simplified format * @return array with tags in a simplified format
*/ */
private static function processTags($tags) private static function processTags(array $tags)
{ {
$taglist = []; $taglist = [];
if (empty($tags)) {
return [];
}
foreach ($tags as $tag) { foreach ($tags as $tag) {
if (empty($tag)) { if (empty($tag)) {
continue; continue;
@ -854,17 +850,13 @@ class Receiver
/** /**
* Convert emojis from JSON-LD format into a simplified format * Convert emojis from JSON-LD format into a simplified format
* *
* @param $emojis * @param array $emojis
* @return array with emojis in a simplified format * @return array with emojis in a simplified format
*/ */
private static function processEmojis($emojis) private static function processEmojis(array $emojis)
{ {
$emojilist = []; $emojilist = [];
if (empty($emojis)) {
return [];
}
foreach ($emojis as $emoji) { foreach ($emojis as $emoji) {
if (empty($emoji) || (JsonLD::fetchElement($emoji, '@type') != 'toot:Emoji') || empty($emoji['as:icon'])) { if (empty($emoji) || (JsonLD::fetchElement($emoji, '@type') != 'toot:Emoji') || empty($emoji['as:icon'])) {
continue; continue;
@ -876,6 +868,7 @@ class Receiver
$emojilist[] = $element; $emojilist[] = $element;
} }
return $emojilist; return $emojilist;
} }
@ -886,24 +879,62 @@ class Receiver
* *
* @return array with attachmants in a simplified format * @return array with attachmants in a simplified format
*/ */
private static function processAttachments($attachments) private static function processAttachments(array $attachments)
{ {
$attachlist = []; $attachlist = [];
if (empty($attachments)) { // Removes empty values
return []; $attachments = array_filter($attachments);
}
foreach ($attachments as $attachment) { foreach ($attachments as $attachment) {
if (empty($attachment)) { switch (JsonLD::fetchElement($attachment, '@type')) {
continue; case 'as:Page':
} $pageUrl = null;
$pageImage = null;
$attachlist[] = ['type' => str_replace('as:', '', JsonLD::fetchElement($attachment, '@type')), $urls = JsonLD::fetchElementArray($attachment, 'as:url');
'mediaType' => JsonLD::fetchElement($attachment, 'as:mediaType', '@value'), foreach ($urls as $url) {
'name' => JsonLD::fetchElement($attachment, 'as:name', '@value'), // Single scalar URL case
'url' => JsonLD::fetchElement($attachment, 'as:url', '@id')]; if (is_string($url)) {
$pageUrl = $url;
continue;
}
$href = JsonLD::fetchElement($url, 'as:href', '@id');
$mediaType = JsonLD::fetchElement($url, 'as:mediaType', '@value');
if (Strings::startsWith($mediaType, 'image')) {
$pageImage = $href;
} else {
$pageUrl = $href;
}
}
$attachlist[] = [
'type' => 'link',
'title' => JsonLD::fetchElement($attachment, 'as:name', '@value'),
'desc' => JsonLD::fetchElement($attachment, 'as:summary', '@value'),
'url' => $pageUrl,
'image' => $pageImage,
];
break;
case 'as:Link':
$attachlist[] = [
'type' => str_replace('as:', '', JsonLD::fetchElement($attachment, '@type')),
'mediaType' => JsonLD::fetchElement($attachment, 'as:mediaType', '@value'),
'name' => JsonLD::fetchElement($attachment, 'as:name', '@value'),
'url' => JsonLD::fetchElement($attachment, 'as:href', '@id')
];
break;
default:
$attachlist[] = [
'type' => str_replace('as:', '', JsonLD::fetchElement($attachment, '@type')),
'mediaType' => JsonLD::fetchElement($attachment, 'as:mediaType', '@value'),
'name' => JsonLD::fetchElement($attachment, 'as:name', '@value'),
'url' => JsonLD::fetchElement($attachment, 'as:url', '@id')
];
}
} }
return $attachlist; return $attachlist;
} }
@ -1086,9 +1117,9 @@ class Receiver
$object_data['latitude'] = JsonLD::fetchElement($object_data, 'latitude', '@value'); $object_data['latitude'] = JsonLD::fetchElement($object_data, 'latitude', '@value');
$object_data['longitude'] = JsonLD::fetchElement($object, 'as:location', 'as:longitude', '@type', 'as:Place'); $object_data['longitude'] = JsonLD::fetchElement($object, 'as:location', 'as:longitude', '@type', 'as:Place');
$object_data['longitude'] = JsonLD::fetchElement($object_data, 'longitude', '@value'); $object_data['longitude'] = JsonLD::fetchElement($object_data, 'longitude', '@value');
$object_data['attachments'] = self::processAttachments(JsonLD::fetchElementArray($object, 'as:attachment')); $object_data['attachments'] = self::processAttachments(JsonLD::fetchElementArray($object, 'as:attachment') ?? []);
$object_data['tags'] = self::processTags(JsonLD::fetchElementArray($object, 'as:tag')); $object_data['tags'] = self::processTags(JsonLD::fetchElementArray($object, 'as:tag') ?? []);
$object_data['emojis'] = self::processEmojis(JsonLD::fetchElementArray($object, 'as:tag', 'toot:Emoji')); $object_data['emojis'] = self::processEmojis(JsonLD::fetchElementArray($object, 'as:tag', 'toot:Emoji') ?? []);
$object_data['generator'] = JsonLD::fetchElement($object, 'as:generator', 'as:name', '@type', 'as:Application'); $object_data['generator'] = JsonLD::fetchElement($object, 'as:generator', 'as:name', '@type', 'as:Application');
$object_data['generator'] = JsonLD::fetchElement($object_data, 'generator', '@value'); $object_data['generator'] = JsonLD::fetchElement($object_data, 'generator', '@value');
$object_data['alternate-url'] = JsonLD::fetchElement($object, 'as:url', '@id'); $object_data['alternate-url'] = JsonLD::fetchElement($object, 'as:url', '@id');

4
src/Util/JsonLD.php
View File

@ -175,10 +175,6 @@ class JsonLD
*/ */
public static function fetchElementArray($array, $element, $key = null) public static function fetchElementArray($array, $element, $key = null)
{ {
if (empty($array)) {
return null;
}
if (!isset($array[$element])) { if (!isset($array[$element])) {
return null; return null;
} }