* @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)) {
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);
$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);
}
}
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.
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;
// 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') {
return;
}
- if (Contact::updateFromProbe($cid, '', true)) {
+ if (Contact::updateFromProbe($cid)) {
Logger::info('Update was successful', ['id' => $cid, 'uid' => $uid, 'url' => $url]);
}
*
* @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;
/**
* 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;
$emojilist[] = $element;
}
+
return $emojilist;
}
*
* @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;
}
$location = JsonLD::fetchElement($object, 'as:location', 'as:name', '@type', 'as:Place');
$location = JsonLD::fetchElement($location, 'location', '@value');
-
- // 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);
+ 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['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');
projects / friendica.git / blobdiff