use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\Relay;
use Friendica\Util\DateTimeFormat;
+use Friendica\Util\HTTPSignature;
use Friendica\Util\JsonLD;
+use Friendica\Util\Network;
use Friendica\Util\Strings;
use Friendica\Worker\Delivery;
$item['object-type'] = Activity\ObjectType::COMMENT;
}
+ if (!empty($activity['context'])) {
+ $item['conversation'] = $activity['context'];
+ } elseif (!empty($activity['conversation'])) {
+ $item['conversation'] = $activity['conversation'];
+ }
+
+ if (!empty($item['conversation'])) {
+ $conversation = Post::selectFirstThread(['uri'], ['conversation' => $item['conversation']]);
+ if (!empty($conversation)) {
+ Logger::debug('Got conversation', ['conversation' => $item['conversation'], 'parent' => $conversation]);
+ $item['parent-uri'] = $conversation['uri'];
+ }
+ } else {
+ $conversation = [];
+ }
+
if (empty($activity['directmessage']) && ($activity['id'] != $activity['reply-to-id']) && !Post::exists(['uri' => $activity['reply-to-id']])) {
$recursion_depth = $activity['recursion-depth'] ?? 0;
Logger::notice('Parent not found. Try to refetch it.', ['parent' => $activity['reply-to-id'], 'recursion-depth' => $recursion_depth]);
if ($recursion_depth < 10) {
$result = self::fetchMissingActivity($activity['reply-to-id'], $activity, '', Receiver::COMPLETION_AUTO);
+ if (empty($result) && self::isActivityGone($activity['reply-to-id'])) {
+ // Recursively delete this and all depending entries
+ Queue::deleteById($activity['entry-id']);
+ return [];
+ }
$fetch_by_worker = empty($result);
} else {
Logger::notice('Recursion level is too high.', ['parent' => $activity['reply-to-id'], 'recursion-depth' => $recursion_depth]);
$fetch_by_worker = true;
}
+ if ($fetch_by_worker && Queue::hasWorker($activity)) {
+ Logger::notice('There is already a worker task to fetch the post.', ['id' => $activity['id'], 'parent' => $activity['reply-to-id']]);
+ $fetch_by_worker = false;
+ if (!empty($conversation)) {
+ return [];
+ }
+ }
+
if ($fetch_by_worker) {
Logger::notice('Fetching is done by worker.', ['parent' => $activity['reply-to-id'], 'recursion-depth' => $recursion_depth]);
$activity['recursion-depth'] = 0;
- Worker::add(PRIORITY_HIGH, 'FetchMissingActivity', $activity['reply-to-id'], $activity, '', Receiver::COMPLETION_AUTO);
- return [];
+ $wid = Worker::add(PRIORITY_HIGH, 'FetchMissingActivity', $activity['reply-to-id'], $activity, '', Receiver::COMPLETION_AUTO);
+ Queue::setWorkerId($activity, $wid);
+ if (!empty($conversation)) {
+ return [];
+ }
+ } elseif (!empty($result)) {
+ if (($item['thr-parent'] != $result) && Post::exists(['uri' => $result])) {
+ $item['thr-parent'] = $result;
+ }
}
}
$item['diaspora_signed_text'] = $activity['diaspora:comment'] ?? '';
- /// @todo What to do with $activity['context']?
- if (empty($activity['directmessage']) && ($item['gravity'] != GRAVITY_PARENT) && !Post::exists(['uri' => $item['thr-parent']])) {
+ if (empty($conversation) && empty($activity['directmessage']) && ($item['gravity'] != GRAVITY_PARENT) && !Post::exists(['uri' => $item['thr-parent']])) {
Logger::info('Parent not found, message will be discarded.', ['thr-parent' => $item['thr-parent']]);
return [];
}
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;
return $item;
}
+ /**
+ * Check if a given activity is no longer available
+ *
+ * @param string $url
+ *
+ * @return boolean
+ */
+ public static function isActivityGone(string $url): bool
+ {
+ $curlResult = HTTPSignature::fetchRaw($url, 0);
+
+ if (Network::isUrlBlocked($url)) {
+ return true;
+ }
+
+ // @todo To ensure that the remote system is working correctly, we can check if the "Content-Type" contains JSON
+ if (in_array($curlResult->getReturnCode(), [404])) {
+ return true;
+ }
+
+ $object = json_decode($curlResult->getBody(), true);
+ if (!empty($object)) {
+ $activity = JsonLD::compact($object);
+ if (JsonLD::fetchElement($activity, '@type') == 'as:Tombstone') {
+ return true;
+ }
+ }
+
+ return false;
+ }
/**
* Delete items
*
*/
public static function createActivity(array $activity, string $verb)
{
+ $activity['reply-to-id'] = $activity['object_id'];
$item = self::createItem($activity);
if (empty($item)) {
return;
}
}
- if ($activity['target_id'] != $actor['featured']) {
- return null;
- }
-
- $id = Contact::getIdForURL($activity['actor']);
- if (empty($id)) {
- return null;
+ $parent = Post::selectFirst(['uri-id'], ['uri' => $activity['object_id']]);
+ if (empty($parent['uri-id'])) {
+ if (self::fetchMissingActivity($activity['object_id'], $activity, '', Receiver::COMPLETION_AUTO)) {
+ $parent = Post::selectFirst(['uri-id'], ['uri' => $activity['object_id']]);
+ }
}
- $parent = Post::selectFirst(['uri-id'], ['uri' => $activity['object_id'], 'author-id' => $id]);
if (!empty($parent['uri-id'])) {
return $parent['uri-id'];
}
$item['raw-body'] = $content;
$item['body'] = Item::improveSharedDataInBody($item);
} else {
- if (empty($activity['directmessage']) && ($item['thr-parent'] != $item['uri']) && ($item['gravity'] == GRAVITY_COMMENT)) {
- $parent = Post::selectFirst(['id', 'uri-id', 'private', 'author-link', 'alias'], ['uri' => $item['thr-parent']]);
+ $parent_uri = $item['parent-uri'] ?? $item['thr-parent'];
+ if (empty($activity['directmessage']) && ($parent_uri != $item['uri']) && ($item['gravity'] == GRAVITY_COMMENT)) {
+ $parent = Post::selectFirst(['id', 'uri-id', 'private', 'author-link', 'alias'], ['uri' => $parent_uri]);
if (!DBA::isResult($parent)) {
- Logger::warning('Unknown parent item.', ['uri' => $item['thr-parent']]);
+ Logger::warning('Unknown parent item.', ['uri' => $parent_uri]);
return false;
}
- if (($parent['private'] == Item::PRIVATE) && ($parent['private'] != Item::PRIVATE)) {
+ if (($item['private'] == 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;
}
Logger::info('Item insertion successful', ['user' => $item['uid'], 'item_id' => $item_id]);
$success = true;
} else {
- Logger::notice('Item insertion aborted', ['user' => $item['uid']]);
+ Logger::notice('Item insertion aborted', ['uri' => $item['uri'], 'uid' => $item['uid']]);
+ if (Item::isTooOld($item) || !Item::isValid($item)) {
+ Queue::remove($activity);
+ }
}
if ($item['uid'] == 0) {
if ($success) {
Queue::remove($activity);
- Queue::processReplyByUri($item['uri']);
+
+ if (Queue::hasChildren($item['uri'])) {
+ Worker::add(PRIORITY_HIGH, 'ProcessReplyByUri', $item['uri']);
+ }
}
// Store send a follow request for every reshare - but only when the item had been stored
return '';
}
- if (!empty($object['actor'])) {
- $object_actor = $object['actor'];
- } elseif (!empty($object['attributedTo'])) {
- $object_actor = $object['attributedTo'];
- if (is_array($object_actor)) {
+ $signer = [];
+
+ if (!empty($object['attributedTo'])) {
+ $attributed_to = $object['attributedTo'];
+ if (is_array($attributed_to)) {
$compacted = JsonLD::compact($object);
- $object_actor = JsonLD::fetchElement($compacted, 'as:attributedTo', '@id');
+ $attributed_to = JsonLD::fetchElement($compacted, 'as:attributedTo', '@id');
}
+ $signer[] = $attributed_to;
+ }
+
+ if (!empty($object['actor'])) {
+ $object_actor = $object['actor'];
+ } elseif (!empty($attributed_to)) {
+ $object_actor = $attributed_to;
} else {
// Shouldn't happen
$object_actor = '';
}
- $signer = [$object_actor];
+ $signer[] = $object_actor;
if (!empty($child['author'])) {
$actor = $child['author'];
{
$uid = User::getIdForURL($activity['object_id']);
if (empty($uid)) {
+ Queue::remove($activity);
return;
}
if (empty($contact)) {
Contact::update(['hub-verify' => $activity['id'], 'protocol' => Protocol::ACTIVITYPUB], ['id' => $cid]);
}
-
Logger::notice('Follow user ' . $uid . ' from contact ' . $cid . ' with id ' . $activity['id']);
+ Queue::remove($activity);
}
/**
Contact\User::setIsBlocked($cid, $uid, true);
Logger::info('Contact blocked user', ['contact' => $cid, 'user' => $uid]);
+ Queue::remove($activity);
}
/**
Contact\User::setIsBlocked($cid, $uid, false);
Logger::info('Contact unblocked user', ['contact' => $cid, 'user' => $uid]);
+ Queue::remove($activity);
}
/**
projects / friendica.git / blobdiff