<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
}
$http_signer = HTTPSignature::getSigner($body, $header);
- if (empty($http_signer)) {
+ if ($http_signer === false) {
Logger::warning('Invalid HTTP signature, message will be discarded.');
return;
+ } elseif (empty($http_signer)) {
+ Logger::info('Signer is a tombstone. The message will be discarded, the signer account is deleted.');
+ return;
} else {
Logger::info('Valid HTTP signature', ['signer' => $http_signer]);
}
$object_type = self::fetchObjectType($activity, $object_id, $uid);
// Fetch the content only on activities where this matters
- if (in_array($type, ['as:Create', 'as:Update', 'as:Announce'])) {
+ // We can receive "#emojiReaction" when fetching content from Hubzilla systems
+ if (in_array($type, ['as:Create', 'as:Update', 'as:Announce']) || strpos($type, '#emojiReaction')) {
// Always fetch on "Announce"
$object_data = self::fetchObject($object_id, $activity['as:object'], $trust_source && ($type != 'as:Announce'), $uid);
if (empty($object_data)) {
if (!empty($activity['from-relay'])) {
$object_data['from-relay'] = $activity['from-relay'];
}
-
+
switch ($type) {
case 'as:Create':
if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
return;
}
- $item['post-type'] = Item::PT_ANNOUNCEMENT;
+ $item['post-reason'] = Item::PR_ANNOUNCEMENT;
ActivityPub\Processor::postItem($object_data, $item);
$announce_object_data = self::processObject($activity);
* @param array $activity
* @param string $actor
* @param array $tags
- * @param boolean $fetch_unlisted
+ * @param boolean $fetch_unlisted
*
* @return array with receivers (user id)
* @throws \Exception
}
if (!empty($actor)) {
- $profile = APContact::getByURL($actor);
+ $profile = APContact::getByURL($actor);
$followers = $profile['followers'] ?? '';
-
- Logger::log('Actor: ' . $actor . ' - Followers: ' . $followers, Logger::DEBUG);
+ $is_forum = ($actor['type'] ?? '') == 'Group';
+ Logger::info('Got actor and followers', ['actor' => $actor, 'followers' => $followers]);
} else {
Logger::info('Empty actor', ['activity' => $activity]);
$followers = '';
+ $is_forum = false;
}
// We have to prevent false follower assumptions upon thread completions
$receivers[0] = ['uid' => 0, 'type' => self::TARGET_GLOBAL];
}
- // Add receiver "-1" for unlisted posts
+ // Add receiver "-1" for unlisted posts
if ($fetch_unlisted && ($receiver == self::PUBLIC_COLLECTION) && ($element == 'as:cc')) {
$receivers[-1] = ['uid' => -1, 'type' => self::TARGET_GLOBAL];
}
// Fetch the receivers for the public and the followers collection
- if (in_array($receiver, [$followers, self::PUBLIC_COLLECTION]) && !empty($actor)) {
+ if ((($receiver == $followers) || (($receiver == self::PUBLIC_COLLECTION) && !$is_forum)) && !empty($actor)) {
$receivers = self::getReceiverForActor($actor, $tags, $receivers, $follower_target);
continue;
}
Logger::info('Empty id');
return false;
}
-
+
if ($id != $object_id) {
Logger::info('Fetched id differs from provided id', ['provided' => $object_id, 'fetched' => $id]);
return false;
'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');
'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')
+ 'url' => JsonLD::fetchElement($attachment, 'as:url', '@id'),
+ 'height' => JsonLD::fetchElement($attachment, 'as:height', '@value'),
+ 'width' => JsonLD::fetchElement($attachment, 'as:width', '@value'),
+ 'image' => JsonLD::fetchElement($attachment, 'as:image', '@id')
];
}
}
return $object_data;
}
+ /**
+ * Extracts a potential alternate URL from a list of additional URL elements
+ *
+ * @param array $urls
+ * @return string
+ */
+ private static function extractAlternateUrl(array $urls): string
+ {
+ $alternateUrl = '';
+ foreach ($urls as $key => $url) {
+ // Not a list but a single URL element
+ if (!is_numeric($key)) {
+ continue;
+ }
+
+ 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') {
+ $alternateUrl = $href;
+ }
+ }
+
+ return $alternateUrl;
+ }
+
/**
* 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
+ * @param array $urls The object URL list
+ * @return array an array of attachments
*/
- 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;
- }
-
+ private static function processAttachmentUrls(array $urls): array
+ {
$attachments = [];
+ foreach ($urls as $key => $url) {
+ // Not a list but a single URL element
+ if (!is_numeric($key)) {
+ continue;
+ }
- foreach ($urls as $url) {
if (empty($url['@type']) || ($url['@type'] != 'as:Link')) {
continue;
}
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, 'height' => null, 'size' => null];
+ $attachments[] = ['type' => $filetype, 'mediaType' => $mediatype, 'url' => $href, 'height' => null, 'size' => null, 'name' => ''];
} elseif ($filetype == 'video') {
$height = (int)JsonLD::fetchElement($url, 'as:height', '@value');
- $size = (int)JsonLD::fetchElement($url, 'pt:size', '@value');
-
- // We save bandwidth by using a moderate height (alt least 480 pixel height)
- // Peertube normally uses these heights: 240, 360, 480, 720, 1080
- if (!empty($attachments[$filetype]['height']) &&
- ($height > $attachments[$filetype]['height']) && ($attachments[$filetype]['height'] >= 480)) {
+ // PeerTube audio-only track
+ if ($height === 0) {
continue;
}
- $attachments[$filetype] = ['type' => $mediatype, 'url' => $href, 'height' => $height, 'size' => $size];
+ $size = (int)JsonLD::fetchElement($url, 'pt:size', '@value');
+ $attachments[] = ['type' => $filetype, 'mediaType' => $mediatype, 'url' => $href, 'height' => $height, 'size' => $size, 'name' => ''];
} elseif (in_array($mediatype, ['application/x-bittorrent', 'application/x-bittorrent;x-scheme-handler/magnet'])) {
$height = (int)JsonLD::fetchElement($url, 'as:height', '@value');
continue;
}
- $attachments[$mediatype] = ['type' => $mediatype, 'url' => $href, 'height' => $height, 'size' => null];
+ $attachments[$mediatype] = ['type' => $mediatype, 'mediaType' => $mediatype, 'url' => $href, 'height' => $height, 'size' => null, 'name' => ''];
+ } elseif ($mediatype == 'application/x-mpegURL') {
+ // PeerTube exception, actual video link is in the tags of this URL element
+ $attachments = array_merge($attachments, self::processAttachmentUrls($url['as:tag']));
}
}
- foreach ($attachments as $type => $attachment) {
- $object_data['attachments'][] = ['type' => $type,
- 'mediaType' => $attachment['type'],
- 'height' => $attachment['height'],
- 'size' => $attachment['size'],
- 'name' => '',
- 'url' => $attachment['url']];
- }
- return $object_data;
+ return array_values($attachments);
}
/**
// 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);
+ $location = BBCode::toPlaintext($location);
}
$object_data['sc:identifier'] = JsonLD::fetchElement($object, 'sc:identifier', '@value');
}
if (in_array($object_data['object_type'], ['as:Audio', 'as:Video'])) {
- $object_data = self::processAttachmentUrls($object, $object_data);
+ $object_data['alternate-url'] = self::extractAlternateUrl($object['as:url'] ?? []) ?: $object_data['alternate-url'];
+ $object_data['attachments'] = array_merge($object_data['attachments'], self::processAttachmentUrls($object['as:url'] ?? []));
}
$receiverdata = self::getReceivers($object, $object_data['actor'], $object_data['tags'], true);
projects / friendica.git / blobdiff