X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FProtocol%2FActivityPub%2FReceiver.php;h=88c23f2be63623989f6b782caae210faed72c5d8;hb=f09d9bc9cccd4d3875d8e66fe75cb7b948b5741f;hp=21aba50944f7448bcc9b9411bf86e150526582e2;hpb=7b7132971a64a92a685a5fd860fe4709dce1765a;p=friendica.git diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php index 21aba50944..88c23f2be6 100644 --- a/src/Protocol/ActivityPub/Receiver.php +++ b/src/Protocol/ActivityPub/Receiver.php @@ -21,6 +21,7 @@ namespace Friendica\Protocol\ActivityPub; +use Friendica\Content\Text\BBCode; use Friendica\Database\DBA; use Friendica\Content\Text\HTML; use Friendica\Content\Text\Markdown; @@ -55,7 +56,7 @@ class Receiver { const PUBLIC_COLLECTION = 'as:Public'; const ACCOUNT_TYPES = ['as:Person', 'as:Organization', 'as:Service', 'as:Group', 'as:Application']; - const CONTENT_TYPES = ['as:Note', 'as:Article', 'as:Video', 'as:Image', 'as:Event']; + const CONTENT_TYPES = ['as:Note', 'as:Article', 'as:Video', 'as:Image', 'as:Event', 'as:Audio']; const ACTIVITY_TYPES = ['as:Like', 'as:Dislike', 'as:Accept', 'as:Reject', 'as:TentativeAccept']; /** @@ -183,7 +184,7 @@ class Receiver * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - private static function prepareObjectData($activity, $uid, $push, &$trust_source) + public static function prepareObjectData($activity, $uid, $push, &$trust_source) { $actor = JsonLD::fetchElement($activity, 'as:actor', '@id'); if (empty($actor)) { @@ -226,6 +227,7 @@ class Receiver if ($type == 'as:Announce') { $trust_source = false; } + $object_data = self::fetchObject($object_id, $activity['as:object'], $trust_source, $uid); if (empty($object_data)) { Logger::log("Object data couldn't be processed", Logger::DEBUG); @@ -273,7 +275,7 @@ class Receiver $object_data['object_type'] = JsonLD::fetchElement($activity['as:object'], '@type'); // An Undo is done on the object of an object, so we need that type as well - if ($type == 'as:Undo') { + if (($type == 'as:Undo') && !empty($object_data['object_object'])) { $object_data['object_object_type'] = self::fetchObjectType([], $object_data['object_object'], $uid); } } @@ -336,7 +338,6 @@ class Receiver if (!JsonLD::fetchElement($activity, 'as:actor', '@id')) { Logger::log('Empty actor', Logger::DEBUG); return; - } // Don't trust the source if "actor" differs from "attributedTo". The content could be forged. @@ -373,7 +374,8 @@ class Receiver switch ($type) { case 'as:Create': if (in_array($object_data['object_type'], self::CONTENT_TYPES)) { - ActivityPub\Processor::createItem($object_data); + $item = ActivityPub\Processor::createItem($object_data); + ActivityPub\Processor::postItem($object_data, $item); } break; @@ -390,7 +392,8 @@ class Receiver // If this isn't set, then a single reshare appears on top. This is used for groups. $object_data['thread-completion'] = ($profile['type'] != 'Group'); - ActivityPub\Processor::createItem($object_data); + $item = ActivityPub\Processor::createItem($object_data); + ActivityPub\Processor::postItem($object_data, $item); // Add the bottom reshare information only for persons if ($profile['type'] != 'Group') { @@ -676,7 +679,7 @@ class Receiver return; } - if (Contact::updateFromProbe($cid, '', true)) { + if (Contact::updateFromProbe($cid)) { Logger::info('Update was successful', ['id' => $cid, 'uid' => $uid, 'url' => $url]); } @@ -820,14 +823,10 @@ class Receiver * * @return array with tags in a simplified format */ - private static function processTags($tags) + private static function processTags(array $tags) { $taglist = []; - if (empty($tags)) { - return []; - } - foreach ($tags as $tag) { if (empty($tag)) { continue; @@ -841,6 +840,10 @@ class Receiver continue; } + if (empty($element['href'])) { + $element['href'] = $element['name']; + } + $taglist[] = $element; } return $taglist; @@ -849,17 +852,13 @@ class Receiver /** * Convert emojis from JSON-LD format into a simplified format * - * @param $emojis + * @param array $emojis * @return array with emojis in a simplified format */ - private static function processEmojis($emojis) + private static function processEmojis(array $emojis) { $emojilist = []; - if (empty($emojis)) { - return []; - } - foreach ($emojis as $emoji) { if (empty($emoji) || (JsonLD::fetchElement($emoji, '@type') != 'toot:Emoji') || empty($emoji['as:icon'])) { continue; @@ -871,6 +870,7 @@ class Receiver $emojilist[] = $element; } + return $emojilist; } @@ -879,26 +879,120 @@ class Receiver * * @param array $attachments Attachments in JSON-LD format * - * @return array with attachmants in a simplified format + * @return array Attachments in a simplified format */ - private static function processAttachments($attachments) + private static function processAttachments(array $attachments) { $attachlist = []; - if (empty($attachments)) { - return []; - } + // Removes empty values + $attachments = array_filter($attachments); foreach ($attachments as $attachment) { - if (empty($attachment)) { - continue; - } + switch (JsonLD::fetchElement($attachment, '@type')) { + case 'as:Page': + $pageUrl = null; + $pageImage = null; + + $urls = JsonLD::fetchElementArray($attachment, 'as:url'); + foreach ($urls as $url) { + // Single scalar URL case + if (is_string($url)) { + $pageUrl = $url; + continue; + } - $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')]; + $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; + case 'as:Image': + $mediaType = JsonLD::fetchElement($attachment, 'as:mediaType', '@value'); + $imageFullUrl = JsonLD::fetchElement($attachment, 'as:url', '@id'); + $imagePreviewUrl = null; + // Multiple URLs? + if (!$imageFullUrl && ($urls = JsonLD::fetchElementArray($attachment, 'as:url'))) { + $imageVariants = []; + $previewVariants = []; + foreach ($urls as $url) { + // Scalar URL, no discrimination possible + if (is_string($url)) { + $imageFullUrl = $url; + continue; + } + + // Not sure what to do with a different Link media type than the base Image, we skip + if ($mediaType != JsonLD::fetchElement($url, 'as:mediaType', '@value')) { + continue; + } + + $href = JsonLD::fetchElement($url, 'as:href', '@id'); + + // Default URL choice if no discriminating width is provided + $imageFullUrl = $href ?? $imageFullUrl; + + $width = intval(JsonLD::fetchElement($url, 'as:width', '@value') ?? 1); + + if ($href && $width) { + $imageVariants[$width] = $href; + // 632 is the ideal width for full screen frio posts, we compute the absolute distance to it + $previewVariants[abs(632 - $width)] = $href; + } + } + + if ($imageVariants) { + // Taking the maximum size image + ksort($imageVariants); + $imageFullUrl = array_pop($imageVariants); + + // Taking the minimum number distance to the target distance + ksort($previewVariants); + $imagePreviewUrl = array_shift($previewVariants); + } + + unset($imageVariants); + unset($previewVariants); + } + + $attachlist[] = [ + 'type' => str_replace('as:', '', JsonLD::fetchElement($attachment, '@type')), + 'mediaType' => $mediaType, + 'name' => JsonLD::fetchElement($attachment, 'as:name', '@value'), + 'url' => $imageFullUrl, + 'image' => $imagePreviewUrl !== $imageFullUrl ? $imagePreviewUrl : null, + ]; + 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; } @@ -936,6 +1030,75 @@ class Receiver return $object_data; } + /** + * Check if the "as:url" element is an array with multiple links + * This is the case with audio and video posts. + * Then the links are added as attachments + * + * @param array $object The raw object + * @param array $object_data The parsed object data for later processing + * @return array the object data + */ + private static function processAttachmentUrls(array $object, array $object_data) { + // Check if this is some url with multiple links + if (empty($object['as:url'])) { + return $object_data; + } + + $urls = $object['as:url']; + $keys = array_keys($urls); + if (!is_numeric(array_pop($keys))) { + return $object_data; + } + + $attachments = []; + + foreach ($urls as $url) { + if (empty($url['@type']) || ($url['@type'] != 'as:Link')) { + continue; + } + + $href = JsonLD::fetchElement($url, 'as:href', '@id'); + if (empty($href)) { + continue; + } + + $mediatype = JsonLD::fetchElement($url, 'as:mediaType'); + if (empty($mediatype)) { + continue; + } + + if ($mediatype == 'text/html') { + $object_data['alternate-url'] = $href; + } + + $filetype = strtolower(substr($mediatype, 0, strpos($mediatype, '/'))); + + if ($filetype == 'audio') { + $attachments[$filetype] = ['type' => $mediatype, 'url' => $href]; + } elseif ($filetype == 'video') { + $height = (int)JsonLD::fetchElement($url, 'as:height', '@value'); + + // We save bandwidth by using a moderate height + // Peertube normally uses these heights: 240, 360, 480, 720, 1080 + if (!empty($attachments[$filetype]['height']) && + (($height > 480) || $height < $attachments[$filetype]['height'])) { + continue; + } + + $attachments[$filetype] = ['type' => $mediatype, 'url' => $href, 'height' => $height]; + } + } + + foreach ($attachments as $type => $attachment) { + $object_data['attachments'][] = ['type' => $type, + 'mediaType' => $attachment['type'], + 'name' => '', + 'url' => $attachment['url']]; + } + return $object_data; + } + /** * Fetches data from the object part of an activity * @@ -983,6 +1146,17 @@ class Receiver $actor = JsonLD::fetchElement($object, 'as:actor', '@id'); } + $location = JsonLD::fetchElement($object, 'as:location', 'as:name', '@type', 'as:Place'); + $location = JsonLD::fetchElement($location, 'location', '@value'); + if ($location) { + // Some AP software allow formatted text in post location, so we run all the text converters we have to boil + // down to HTML and then finally format to plaintext. + $location = Markdown::convert($location); + $location = BBCode::convert($location); + $location = HTML::toPlaintext($location); + } + + $object_data['sc:identifier'] = JsonLD::fetchElement($object, 'sc:identifier', '@value'); $object_data['diaspora:guid'] = JsonLD::fetchElement($object, 'diaspora:guid', '@value'); $object_data['diaspora:comment'] = JsonLD::fetchElement($object, 'diaspora:comment', '@value'); $object_data['diaspora:like'] = JsonLD::fetchElement($object, 'diaspora:like', '@value'); @@ -996,15 +1170,14 @@ class Receiver $object_data = self::getSource($object, $object_data); $object_data['start-time'] = JsonLD::fetchElement($object, 'as:startTime', '@value'); $object_data['end-time'] = JsonLD::fetchElement($object, 'as:endTime', '@value'); - $object_data['location'] = JsonLD::fetchElement($object, 'as:location', 'as:name', '@type', 'as:Place'); - $object_data['location'] = JsonLD::fetchElement($object_data, 'location', '@value'); + $object_data['location'] = $location; $object_data['latitude'] = JsonLD::fetchElement($object, 'as:location', 'as:latitude', '@type', 'as:Place'); $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_data, 'longitude', '@value'); - $object_data['attachments'] = self::processAttachments(JsonLD::fetchElementArray($object, 'as:attachment')); - $object_data['tags'] = self::processTags(JsonLD::fetchElementArray($object, 'as:tag')); - $object_data['emojis'] = self::processEmojis(JsonLD::fetchElementArray($object, 'as:tag', 'toot:Emoji')); + $object_data['attachments'] = self::processAttachments(JsonLD::fetchElementArray($object, 'as:attachment') ?? []); + $object_data['tags'] = self::processTags(JsonLD::fetchElementArray($object, 'as:tag') ?? []); + $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_data, 'generator', '@value'); $object_data['alternate-url'] = JsonLD::fetchElement($object, 'as:url', '@id'); @@ -1018,6 +1191,10 @@ class Receiver } } + if (in_array($object_data['object_type'], ['as:Audio', 'as:Video'])) { + $object_data = self::processAttachmentUrls($object, $object_data); + } + $object_data['receiver'] = self::getReceivers($object, $object_data['actor'], $object_data['tags'], true); $object_data['unlisted'] = in_array(-1, $object_data['receiver']); unset($object_data['receiver']['uid:-1']);