X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FProcessor.php;h=4fa2d33f764429e6c73702914e7ef04420712acc;hb=7b7132971a64a92a685a5fd860fe4709dce1765a;hp=f2b277e44ed7fa0dc681d730519392a69b57eaf6;hpb=b34afa990b36348a5a911d06bd4363983e4bf945;p=friendica.git diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php index f2b277e44e..4fa2d33f76 100644 --- a/src/Protocol/ActivityPub/Processor.php +++ b/src/Protocol/ActivityPub/Processor.php @@ -1,18 +1,35 @@ . + * */ + namespace Friendica\Protocol\ActivityPub; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; -use Friendica\Core\Config; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\Core\Protocol; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\APContact; use Friendica\Model\Contact; +use Friendica\Model\Conversation; use Friendica\Model\Event; use Friendica\Model\Item; use Friendica\Model\Mail; @@ -93,22 +110,21 @@ class Processor /** * Add attachment data to the item array * - * @param array $attachments + * @param array $activity * @param array $item - * @param boolean $no_images * * @return array array */ - private static function constructAttachList($attachments, $item, $no_images) + private static function constructAttachList($activity, $item) { - if (empty($attachments)) { + if (empty($activity['attachments'])) { return $item; } - foreach ($attachments as $attach) { + foreach ($activity['attachments'] as $attach) { $filetype = strtolower(substr($attach['mediaType'], 0, strpos($attach['mediaType'], '/'))); if ($filetype == 'image') { - if ($no_images) { + if (!empty($activity['source']) && strpos($activity['source'], $attach['url'])) { continue; } @@ -177,10 +193,13 @@ class Processor } else { $item['gravity'] = GRAVITY_COMMENT; $item['object-type'] = Activity\ObjectType::COMMENT; + + // Ensure that the comment reaches all receivers of the referring post + $activity['receiver'] = self::addReceivers($activity); } if (empty($activity['directmessage']) && ($activity['id'] != $activity['reply-to-id']) && !Item::exists(['uri' => $activity['reply-to-id']])) { - Logger::log('Parent ' . $activity['reply-to-id'] . ' not found. Try to refetch it.'); + Logger::notice('Parent not found. Try to refetch it.', ['parent' => $activity['reply-to-id']]); self::fetchMissingActivity($activity['reply-to-id'], $activity); } @@ -241,6 +260,35 @@ class Processor } } + /** + * Add users to the receiver list of the given public activity. + * This is used to ensure that the activity will be stored in every thread. + * + * @param array $activity Activity array + * @return array Modified receiver list + */ + private static function addReceivers(array $activity) + { + if (!in_array(0, $activity['receiver'])) { + // Private activities will not be modified + return $activity['receiver']; + } + + // Add all owners of the referring item to the receivers + $original = $receivers = $activity['receiver']; + $items = Item::select(['uid'], ['uri' => $activity['object_id']]); + while ($item = DBA::fetch($items)) { + $receivers['uid:' . $item['uid']] = $item['uid']; + } + DBA::close($items); + + if (count($original) != count($receivers)) { + Logger::info('Improved data', ['id' => $activity['id'], 'object' => $activity['object_id'], 'original' => $original, 'improved' => $receivers]); + } + + return $receivers; + } + /** * Prepare the item array for an activity * @@ -259,6 +307,8 @@ class Processor $item['diaspora_signed_text'] = $activity['diaspora:like'] ?? ''; + $activity['receiver'] = self::addReceivers($activity); + self::postItem($activity, $item); } @@ -326,7 +376,7 @@ class Processor Logger::warning('Unknown parent item.', ['uri' => $item['thr-parent']]); return false; } - if ($item_private && !$parent['private']) { + if ($item_private && ($parent['private'] == Item::PRIVATE)) { Logger::warning('Item is private but the parent is not. Dropping.', ['item-uri' => $item['uri'], 'thr-parent' => $item['thr-parent']]); return false; } @@ -356,6 +406,26 @@ class Processor return $item; } + /** + * Generate a GUID out of an URL + * + * @param string $url message URL + * @return string with GUID + */ + private static function getGUIDByURL(string $url) + { + $parsed = parse_url($url); + + $host_hash = hash('crc32', $parsed['host']); + + unset($parsed["scheme"]); + unset($parsed["host"]); + + $path = implode("/", $parsed); + + return $host_hash . '-'. hash('fnv164', $path) . '-'. hash('joaat', $path); + } + /** * Creates an item post * @@ -373,12 +443,30 @@ class Processor } $item['network'] = Protocol::ACTIVITYPUB; - $item['private'] = !in_array(0, $activity['receiver']); $item['author-link'] = $activity['author']; $item['author-id'] = Contact::getIdForURL($activity['author'], 0, true); $item['owner-link'] = $activity['actor']; $item['owner-id'] = Contact::getIdForURL($activity['actor'], 0, true); + if (in_array(0, $activity['receiver']) && !empty($activity['unlisted'])) { + $item['private'] = Item::UNLISTED; + } elseif (in_array(0, $activity['receiver'])) { + $item['private'] = Item::PUBLIC; + } else { + $item['private'] = Item::PRIVATE; + } + + if (!empty($activity['raw'])) { + $item['source'] = $activity['raw']; + $item['protocol'] = Conversation::PARCEL_ACTIVITYPUB; + $item['conversation-href'] = $activity['context'] ?? ''; + $item['conversation-uri'] = $activity['conversation'] ?? ''; + + if (isset($activity['push'])) { + $item['direction'] = $activity['push'] ? Conversation::PUSH : Conversation::PULL; + } + } + $isForum = false; if (!empty($activity['thread-completion'])) { @@ -398,7 +486,7 @@ class Processor $item['created'] = DateTimeFormat::utc($activity['published']); $item['edited'] = DateTimeFormat::utc($activity['updated']); - $item['guid'] = $activity['diaspora:guid']; + $item['guid'] = $activity['diaspora:guid'] ?: self::getGUIDByURL($item['uri']); $item = self::processContent($activity, $item); if (empty($item)) { @@ -407,11 +495,15 @@ class Processor $item['plink'] = $activity['alternate-url'] ?? $item['uri']; - $item = self::constructAttachList($activity['attachments'], $item, !empty($activity['source'])); + $item = self::constructAttachList($activity, $item); $stored = false; foreach ($activity['receiver'] as $receiver) { + if ($receiver == -1) { + continue; + } + $item['uid'] = $receiver; if ($isForum) { @@ -429,7 +521,7 @@ class Processor continue; } - if (PConfig::get($receiver, 'system', 'accept_only_sharer', false) && ($receiver != 0) && ($item['gravity'] == GRAVITY_PARENT)) { + if (DI::pConfig()->get($receiver, 'system', 'accept_only_sharer', false) && ($receiver != 0) && ($item['gravity'] == GRAVITY_PARENT)) { $skip = !Contact::isSharingByURL($activity['author'], $receiver); if ($skip && (($activity['type'] == 'as:Announce') || $isForum)) { @@ -461,7 +553,7 @@ class Processor } // Store send a follow request for every reshare - but only when the item had been stored - if ($stored && !$item['private'] && ($item['gravity'] == GRAVITY_PARENT) && ($item['author-link'] != $item['owner-link'])) { + if ($stored && ($item['private'] != Item::PRIVATE) && ($item['gravity'] == GRAVITY_PARENT) && ($item['author-link'] != $item['owner-link'])) { $author = APContact::getByURL($item['owner-link'], false); // We send automatic follow requests for reshared messages. (We don't need though for forum posts) if ($author['type'] != 'Group') { @@ -539,7 +631,7 @@ class Processor * * @param string $url message URL * @param array $child activity array with the child of this message - * @return boolean success + * @return string fetched message URL * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function fetchMissingActivity($url, $child = []) @@ -553,12 +645,12 @@ class Processor $object = ActivityPub::fetchContent($url, $uid); if (empty($object)) { Logger::log('Activity ' . $url . ' was not fetchable, aborting.'); - return false; + return ''; } if (empty($object['id'])) { Logger::log('Activity ' . $url . ' has got not id, aborting. ' . json_encode($object)); - return false; + return ''; } if (!empty($child['author'])) { @@ -595,10 +687,11 @@ class Processor $ldactivity['thread-completion'] = true; - ActivityPub\Receiver::processActivity($ldactivity); - Logger::log('Activity ' . $url . ' had been fetched and processed.'); + ActivityPub\Receiver::processActivity($ldactivity, json_encode($activity)); + + Logger::notice('Activity had been fetched and processed.', ['url' => $url, 'object' => $activity['id']]); - return true; + return $activity['id']; } /** @@ -824,13 +917,13 @@ class Processor */ private static function switchContact($cid) { - $contact = DBA::selectFirst('contact', ['network'], ['id' => $cid, 'network' => Protocol::NATIVE_SUPPORT]); - if (!DBA::isResult($contact) || in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN])) { + $contact = DBA::selectFirst('contact', ['network', 'url'], ['id' => $cid]); + if (!DBA::isResult($contact) || in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN]) || Contact::isLocal($contact['url'])) { return; } - Logger::log('Change existing contact ' . $cid . ' from ' . $contact['network'] . ' to ActivityPub.'); - Contact::updateFromProbe($cid, Protocol::ACTIVITYPUB); + Logger::info('Change existing contact', ['cid' => $cid, 'previous' => $contact['network']]); + Contact::updateFromProbe($cid); } /** @@ -844,7 +937,7 @@ class Processor */ private static function getImplicitMentionList(array $parent) { - if (Config::get('system', 'disable_implicit_mentions')) { + if (DI::config()->get('system', 'disable_implicit_mentions')) { return []; } @@ -886,7 +979,7 @@ class Processor */ private static function removeImplicitMentionsFromBody($body, array $potential_mentions) { - if (Config::get('system', 'disable_implicit_mentions')) { + if (DI::config()->get('system', 'disable_implicit_mentions')) { return $body; } @@ -909,7 +1002,7 @@ class Processor private static function convertImplicitMentionsInTags($activity_tags, array $potential_mentions) { - if (Config::get('system', 'disable_implicit_mentions')) { + if (DI::config()->get('system', 'disable_implicit_mentions')) { return $activity_tags; }