*/
private static function addActivityId(string $id)
{
- DBA::delete('processed-activity', ["`received` < ?", DateTimeFormat::utc('now - 5 minutes')]);
- DBA::insert('processed-activity', ['object-id' => $id, 'received' => DateTimeFormat::utcNow()]);
+ DBA::delete('fetched-activity', ["`received` < ?", DateTimeFormat::utc('now - 5 minutes')]);
+ DBA::insert('fetched-activity', ['object-id' => $id, 'received' => DateTimeFormat::utcNow()]);
}
/**
- * Checks if the given object id has just been processed
+ * Checks if the given object id has just been fetched
*
* @param string $id
*
* @return boolean
*/
- private static function isProcessed(string $id): bool
+ private static function isFetched(string $id): bool
{
- return DBA::exists('processed-activity', ['object-id' => $id]);
+ return DBA::exists('fetched-activity', ['object-id' => $id]);
}
/**
* @param string $body
* @return string
*/
- protected static function normalizeMentionLinks(string $body): string
+ public static function normalizeMentionLinks(string $body): string
{
return preg_replace('%\[url=([^\[\]]*)]([#@!])(.*?)\[/url]%ism', '$2[url=$1]$3[/url]', $body);
}
}
/**
- * Stire attachment data
+ * Store attachment data
*
* @param array $activity
* @param array $item
}
/**
- * Store attachment data
+ * Store question data
*
* @param array $activity
* @param array $item
{
$item = Post::selectFirst(['uri', 'uri-id', 'thr-parent', 'gravity', 'post-type', 'private'], ['uri' => $activity['id']]);
if (!DBA::isResult($item)) {
- Logger::warning('No existing item, item will be created', ['uri' => $activity['id']]);
+ Logger::notice('No existing item, item will be created', ['uri' => $activity['id']]);
$item = self::createItem($activity, false);
if (empty($item)) {
Queue::remove($activity);
*/
public static function createItem(array $activity, bool $fetch_parents): array
{
- if (self::isProcessed($activity['id']) && !Post::exists(['uri' => $activity['id']])) {
- Logger::info('Id is already processed', ['id' => $activity['id']]);
- return [];
- }
-
- self::addActivityId($activity['id']);
-
$item = [];
$item['verb'] = Activity::POST;
$item['thr-parent'] = $activity['reply-to-id'];
if ($activity['reply-to-id'] == $activity['id']) {
- $item['gravity'] = GRAVITY_PARENT;
+ $item['gravity'] = Item::GRAVITY_PARENT;
$item['object-type'] = Activity\ObjectType::NOTE;
} else {
- $item['gravity'] = GRAVITY_COMMENT;
+ $item['gravity'] = Item::GRAVITY_COMMENT;
$item['object-type'] = Activity\ObjectType::COMMENT;
}
if (!empty($conversation)) {
Logger::debug('Got conversation', ['conversation' => $item['conversation'], 'parent' => $conversation]);
$item['parent-uri'] = $conversation['uri'];
+ $item['parent-uri-id'] = ItemURI::getIdByURI($item['parent-uri']);
}
} else {
$conversation = [];
return [];
}
- if (!in_array(0, $activity['receiver']) && !DI::config()->get('system', 'fetch_parents')) {
+ if (!in_array(0, $activity['receiver']) || !DI::config()->get('system', 'fetch_parents')) {
$fetch_parents = false;
}
if ($fetch_parents && empty($activity['directmessage']) && ($activity['id'] != $activity['reply-to-id']) && !Post::exists(['uri' => $activity['reply-to-id']])) {
- $result = self::fetchParent($activity);
+ $result = self::fetchParent($activity, !empty($conversation));
if (!empty($result)) {
if (($item['thr-parent'] != $result) && Post::exists(['uri' => $result])) {
$item['thr-parent'] = $result;
$item['diaspora_signed_text'] = $activity['diaspora:comment'] ?? '';
- 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']]);
+ if (empty($conversation) && empty($activity['directmessage']) && ($item['gravity'] != Item::GRAVITY_PARENT) && !Post::exists(['uri' => $item['thr-parent']])) {
+ Logger::notice('Parent not found, message will be discarded.', ['thr-parent' => $item['thr-parent']]);
if (!$fetch_parents) {
Queue::remove($activity);
}
$item['owner-id'] = $item['author-id'];
} else {
$actor = APContact::getByURL($item['owner-link'], false);
- $item['isForum'] = ($actor['type'] == 'Group');
+ $item['isForum'] = ($actor['type'] ?? 'Person') == 'Group';
}
$item['uri'] = $activity['id'];
return [];
}
+ $item['thr-parent-id'] = ItemURI::getIdByURI($item['thr-parent']);
+
$item = self::processContent($activity, $item);
if (empty($item)) {
Logger::info('Message was not processed');
* Fetch and process parent posts for the given activity
*
* @param array $activity
+ * @param bool $in_background
*
* @return string
*/
- private static function fetchParent(array $activity): string
+ private static function fetchParent(array $activity, bool $in_background = false): string
{
+ if (self::isFetched($activity['reply-to-id'])) {
+ Logger::info('Id is already fetched', ['id' => $activity['reply-to-id']]);
+ return '';
+ }
+
+ self::addActivityId($activity['reply-to-id']);
+
+ if (!DI::config()->get('system', 'fetch_by_worker')) {
+ $in_background = false;
+ }
+
$recursion_depth = $activity['recursion-depth'] ?? 0;
- if ($recursion_depth < DI::config()->get('system', 'max_recursion_depth')) {
+ if (!$in_background && ($recursion_depth < DI::config()->get('system', 'max_recursion_depth'))) {
Logger::notice('Parent not found. Try to refetch it.', ['parent' => $activity['reply-to-id'], 'recursion-depth' => $recursion_depth]);
$result = self::fetchMissingActivity($activity['reply-to-id'], $activity, '', Receiver::COMPLETION_AUTO);
if (empty($result) && self::isActivityGone($activity['reply-to-id'])) {
}
} elseif (self::isActivityGone($activity['reply-to-id'])) {
Logger::notice('The activity is gone. We will not spawn a worker. The queue entry will be deleted', ['parent' => $activity['reply-to-id']]);
- if (!empty($activity['entry-id'])) {
+ if ($in_background) {
+ // fetching in background is done for all activities where we have got the conversation
+ // There we only delete the single activity and not the whole thread since we can store the
+ // other posts in the thread even with missing posts.
+ Queue::remove($activity);
+ } elseif (!empty($activity['entry-id'])) {
Queue::deleteById($activity['entry-id']);
}
return '';
+ } elseif ($in_background) {
+ Logger::notice('Fetching is done in the background.', ['parent' => $activity['reply-to-id']]);
} else {
Logger::notice('Recursion level is too high.', ['parent' => $activity['reply-to-id'], 'recursion-depth' => $recursion_depth]);
}
- if (Queue::hasWorker($activity['worker-id'] ?? 0)) {
- Logger::notice('There is already a worker task to fetch the post.', ['id' => $activity['id'], 'parent' => $activity['reply-to-id']]);
- return '';
- }
-
if (!Fetch::hasWorker($activity['reply-to-id'])) {
Logger::notice('Fetching is done by worker.', ['parent' => $activity['reply-to-id'], 'recursion-depth' => $recursion_depth]);
Fetch::add($activity['reply-to-id']);
$activity['recursion-depth'] = 0;
- $wid = Worker::add(PRIORITY_HIGH, 'FetchMissingActivity', $activity['reply-to-id'], $activity, '', Receiver::COMPLETION_AUTO);
+ $wid = Worker::add(Worker::PRIORITY_HIGH, 'FetchMissingActivity', $activity['reply-to-id'], $activity, '', Receiver::COMPLETION_AUTO);
Fetch::setWorkerId($activity['reply-to-id'], $wid);
} else {
Logger::debug('Activity will already be fetched via a worker.', ['url' => $activity['reply-to-id']]);
$activity['reply-to-id'] = $activity['object_id'];
$item = self::createItem($activity, false);
if (empty($item)) {
+ Logger::debug('Activity was not prepared', ['id' => $activity['object_id']]);
return;
}
$item['verb'] = $verb;
$item['thr-parent'] = $activity['object_id'];
- $item['gravity'] = GRAVITY_ACTIVITY;
+ $item['gravity'] = Item::GRAVITY_ACTIVITY;
unset($item['post-type']);
$item['object-type'] = Activity\ObjectType::NOTE;
* Fetch the Uri-Id of a post for the "featured" collection
*
* @param array $activity
- * @return null|int
+ * @return null|array
*/
private static function getUriIdForFeaturedCollection(array $activity)
{
}
}
- $parent = Post::selectFirst(['uri-id'], ['uri' => $activity['object_id']]);
+ $parent = Post::selectFirst(['uri-id', 'author-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']]);
}
if (!empty($parent['uri-id'])) {
- return $parent['uri-id'];
+ $parent;
}
return null;
*/
public static function addToFeaturedCollection(array $activity)
{
- $uriid = self::getUriIdForFeaturedCollection($activity);
- if (empty($uriid)) {
+ $post = self::getUriIdForFeaturedCollection($activity);
+ if (empty($post)) {
return;
}
- Logger::debug('Add post to featured collection', ['uri-id' => $uriid]);
+ Logger::debug('Add post to featured collection', ['post' => $post]);
- Post\Collection::add($uriid, Post\Collection::FEATURED);
+ Post\Collection::add($post['uri-id'], Post\Collection::FEATURED, $post['author-id']);
Queue::remove($activity);
}
*/
public static function removeFromFeaturedCollection(array $activity)
{
- $uriid = self::getUriIdForFeaturedCollection($activity);
- if (empty($uriid)) {
+ $post = self::getUriIdForFeaturedCollection($activity);
+ if (empty($post)) {
return;
}
- Logger::debug('Remove post from featured collection', ['uri-id' => $uriid]);
+ Logger::debug('Remove post from featured collection', ['post' => $post]);
- Post\Collection::remove($uriid, Post\Collection::FEATURED);
+ Post\Collection::remove($post['uri-id'], Post\Collection::FEATURED);
Queue::remove($activity);
}
public static function createEvent(array $activity, array $item): int
{
$event['summary'] = HTML::toBBCode($activity['name'] ?: $activity['summary']);
- $event['desc'] = HTML::toBBCode($activity['content']);
+ $event['desc'] = HTML::toBBCode($activity['content'] ?? '');
if (!empty($activity['start-time'])) {
$event['start'] = DateTimeFormat::utc($activity['start-time']);
}
$content = self::addMentionLinks($content, $activity['tags']);
+ if (!empty($activity['quote-url'])) {
+ $id = Item::fetchByLink($activity['quote-url']);
+ if ($id) {
+ $shared_item = Post::selectFirst(['uri-id'], ['id' => $id]);
+ $item['quote-uri-id'] = $shared_item['uri-id'];
+ } else {
+ Logger::info('Quote was not fetched', ['guid' => $item['guid'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url']]);
+ }
+ }
+
if (!empty($activity['source'])) {
$item['body'] = $activity['source'];
$item['raw-body'] = $content;
- $item['body'] = Item::improveSharedDataInBody($item);
+
+ $quote_uri_id = Item::getQuoteUriId($item['body']);
+ if (empty($item['quote-uri-id']) && !empty($quote_uri_id)) {
+ $item['quote-uri-id'] = $quote_uri_id;
+ }
+
+ $item['body'] = BBCode::removeSharedData($item['body']);
} else {
$parent_uri = $item['parent-uri'] ?? $item['thr-parent'];
- if (empty($activity['directmessage']) && ($parent_uri != $item['uri']) && ($item['gravity'] == GRAVITY_COMMENT)) {
+ if (empty($activity['directmessage']) && ($parent_uri != $item['uri']) && ($item['gravity'] == Item::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' => $parent_uri]);
return true;
}
- if ($item['gravity'] != GRAVITY_PARENT) {
+ if ($item['gravity'] != Item::GRAVITY_PARENT) {
// We cannot reliably check at this point if a comment or activity belongs to an accepted post or needs to be fetched
// This can possibly be improved in the future.
Logger::debug('Message is no parent - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri']]);
}
$tags = array_column(Tag::getByURIId($item['uri-id'], [Tag::HASHTAG]), 'name');
- if (Relay::isSolicitedPost($tags, $item['body'], $item['author-id'], $item['uri'], Protocol::ACTIVITYPUB)) {
+ if (Relay::isSolicitedPost($tags, $item['body'], $item['author-id'], $item['uri'], Protocol::ACTIVITYPUB, $activity['thread-completion'] ?? 0)) {
Logger::debug('Post is accepted because of the relay settings', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri']]);
return true;
} else {
continue;
}
+ if (($receiver != 0) && empty($item['parent-uri-id']) && !empty($item['thr-parent-id'])) {
+ $parent = Post::selectFirst(['parent-uri-id', 'parent-uri'], ['uri-id' => $item['thr-parent-id'], 'uid' => [0, $receiver]]);
+ if (!empty($parent['parent-uri-id'])) {
+ $item['parent-uri-id'] = $parent['parent-uri-id'];
+ $item['parent-uri'] = $parent['parent-uri'];
+ }
+ }
+
$item['uid'] = $receiver;
$type = $activity['reception_type'][$receiver] ?? Receiver::TARGET_UNKNOWN;
} elseif (!empty($activity['push'])) {
$item['post-reason'] = Item::PR_PUSHED;
}
+ } elseif (($item['post-reason'] == Item::PR_FOLLOWER) && !empty($activity['from-relay'])) {
+ // When a post arrives via a relay and we follow the author, we have to override the causer.
+ // Otherwise the system assumes that we follow the relay. (See "addRowInformation")
+ Logger::debug('Relay post for follower', ['receiver' => $receiver, 'guid' => $item['guid'], 'relay' => $activity['from-relay']]);
+ $item['causer-id'] = ($item['gravity'] == Item::GRAVITY_PARENT) ? $item['owner-id'] : $item['author-id'];
}
if ($item['isForum'] ?? false) {
continue;
}
- if (($receiver != 0) && ($item['gravity'] == GRAVITY_PARENT) && !in_array($item['post-reason'], [Item::PR_FOLLOWER, Item::PR_TAG, item::PR_TO, Item::PR_CC])) {
+ if (($receiver != 0) && ($item['gravity'] == Item::GRAVITY_PARENT) && !in_array($item['post-reason'], [Item::PR_FOLLOWER, Item::PR_TAG, item::PR_TO, Item::PR_CC])) {
if (!($item['isForum'] ?? false)) {
if ($item['post-reason'] == Item::PR_BCC) {
Logger::info('Top level post via BCC from a non sharer, ignoring', ['uid' => $receiver, 'contact' => $item['contact-id'], 'url' => $item['uri']]);
Logger::info('Accepting post', ['uid' => $receiver, 'url' => $item['uri']]);
}
- if (($item['gravity'] != GRAVITY_ACTIVITY) && ($activity['object_type'] == 'as:Event')) {
+ if (!self::hasParents($item, $receiver)) {
+ continue;
+ }
+
+ if (($item['gravity'] != Item::GRAVITY_ACTIVITY) && ($activity['object_type'] == 'as:Event')) {
$event_id = self::createEvent($activity, $item);
$item = Event::getItemArrayForImportedId($event_id, $item);
}
// Store send a follow request for every reshare - but only when the item had been stored
- if ($stored && ($item['private'] != Item::PRIVATE) && ($item['gravity'] == GRAVITY_PARENT) && !empty($item['author-link']) && ($item['author-link'] != $item['owner-link'])) {
+ if ($stored && ($item['private'] != Item::PRIVATE) && ($item['gravity'] == Item::GRAVITY_PARENT) && !empty($item['author-link']) && ($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') {
}
}
+ /**
+ * Checks if there are parent posts for the given receiver.
+ * If not, then the system will try to add them.
+ *
+ * @param array $item
+ * @param integer $receiver
+ * @return boolean
+ */
+ private static function hasParents(array $item, int $receiver)
+ {
+ if (($receiver == 0) || ($item['gravity'] == Item::GRAVITY_PARENT)) {
+ return true;
+ }
+
+ $fields = ['causer-id' => $item['causer-id'] ?? $item['author-id'], 'post-reason' => Item::PR_FETCHED];
+
+ $add_parent = true;
+
+ if ($item['verb'] != Activity::ANNOUNCE) {
+ switch (DI::pConfig()->get($receiver, 'system', 'accept_only_sharer')) {
+ case Item::COMPLETION_COMMENT:
+ $add_parent = ($item['gravity'] != Item::GRAVITY_ACTIVITY);
+ break;
+
+ case Item::COMPLETION_NONE:
+ $add_parent = false;
+ break;
+ }
+ }
+
+ if ($add_parent) {
+ $add_parent = Contact::isSharing($fields['causer-id'], $receiver);
+ if (!$add_parent && ($item['author-id'] != $fields['causer-id'])) {
+ $add_parent = Contact::isSharing($item['author-id'], $receiver);
+ }
+ if (!$add_parent && !in_array($item['owner-id'], [$fields['causer-id'], $item['author-id']])) {
+ $add_parent = Contact::isSharing($item['owner-id'], $receiver);
+ }
+ }
+
+ $has_parents = false;
+
+ if (!empty($item['parent-uri-id'])) {
+ if (Post::exists(['uri-id' => $item['parent-uri-id'], 'uid' => $receiver])) {
+ $has_parents = true;
+ } elseif ($add_parent && Post::exists(['uri-id' => $item['parent-uri-id'], 'uid' => 0])) {
+ $stored = Item::storeForUserByUriId($item['parent-uri-id'], $receiver, $fields);
+ $has_parents = (bool)$stored;
+ if ($stored) {
+ Logger::notice('Inserted missing parent post', ['stored' => $stored, 'uid' => $receiver, 'parent' => $item['parent-uri']]);
+ } else {
+ Logger::notice('Parent could not be added.', ['uid' => $receiver, 'uri' => $item['uri'], 'parent' => $item['parent-uri']]);
+ return false;
+ }
+ } elseif ($add_parent) {
+ Logger::debug('Parent does not exist.', ['uid' => $receiver, 'uri' => $item['uri'], 'parent' => $item['parent-uri']]);
+ } else {
+ Logger::debug('Parent should not be added.', ['uid' => $receiver, 'gravity' => $item['gravity'], 'verb' => $item['verb'], 'guid' => $item['guid'], 'uri' => $item['uri'], 'parent' => $item['parent-uri']]);
+ }
+ }
+
+ if (empty($item['parent-uri-id']) || ($item['thr-parent-id'] != $item['parent-uri-id'])) {
+ if (Post::exists(['uri-id' => $item['thr-parent-id'], 'uid' => $receiver])) {
+ $has_parents = true;
+ } elseif (($has_parents || $add_parent) && Post::exists(['uri-id' => $item['thr-parent-id'], 'uid' => 0])) {
+ $stored = Item::storeForUserByUriId($item['thr-parent-id'], $receiver, $fields);
+ $has_parents = $has_parents || (bool)$stored;
+ if ($stored) {
+ Logger::notice('Inserted missing thread parent post', ['stored' => $stored, 'uid' => $receiver, 'thread-parent' => $item['thr-parent']]);
+ } else {
+ Logger::notice('Thread parent could not be added.', ['uid' => $receiver, 'uri' => $item['uri'], 'thread-parent' => $item['thr-parent']]);
+ }
+ } elseif ($add_parent) {
+ Logger::debug('Thread parent does not exist.', ['uid' => $receiver, 'uri' => $item['uri'], 'thread-parent' => $item['thr-parent']]);
+ } else {
+ Logger::debug('Thread parent should not be added.', ['uid' => $receiver, 'gravity' => $item['gravity'], 'verb' => $item['verb'], 'guid' => $item['guid'], 'uri' => $item['uri'], 'thread-parent' => $item['thr-parent']]);
+ }
+ }
+
+ return $has_parents;
+ }
+
/**
* Store tags and mentions into the tag table
*
*/
private static function postMail(array $activity, array $item)
{
- if (($item['gravity'] != GRAVITY_PARENT) && !DBA::exists('mail', ['uri' => $item['thr-parent'], 'uid' => $item['uid']])) {
+ if (($item['gravity'] != Item::GRAVITY_PARENT) && !DBA::exists('mail', ['uri' => $item['thr-parent'], 'uid' => $item['uid']])) {
Logger::info('Parent not found, mail will be discarded.', ['uid' => $item['uid'], 'uri' => $item['thr-parent']]);
return false;
}
$pcid = Contact::getIdForURL($url, 0, false);
if (empty($pcid)) {
- Logger::info('Contact not found', ['contact' => $url]);
+ Logger::notice('Contact not found', ['contact' => $url]);
return;
}
}
$id = Item::fetchByLink($post['id']);
if (!empty($id)) {
- $item = Post::selectFirst(['uri-id', 'featured'], ['id' => $id]);
+ $item = Post::selectFirst(['uri-id', 'featured', 'author-id'], ['id' => $id]);
if (!empty($item['uri-id'])) {
if (!$item['featured']) {
- Post\Collection::add($item['uri-id'], Post\Collection::FEATURED);
+ Post\Collection::add($item['uri-id'], Post\Collection::FEATURED, $item['author-id']);
Logger::debug('Added featured post', ['uri-id' => $item['uri-id'], 'contact' => $url]);
$new++;
} else {
public static function fetchCachedActivity(string $url, int $uid): array
{
- $cachekey = self::CACHEKEY_FETCH_ACTIVITY . $uid . ':' . $url;
+ $cachekey = self::CACHEKEY_FETCH_ACTIVITY . $uid . ':' . hash('sha256', $url);
$object = DI::cache()->get($cachekey);
if (!is_null($object)) {
}
}
- return Relay::isSolicitedPost($messageTags, $body, $authorid, $id, Protocol::ACTIVITYPUB);
+ return Relay::isSolicitedPost($messageTags, $body, $authorid, $id, Protocol::ACTIVITYPUB, $activity['thread-completion'] ?? 0);
}
/**
}
if (DI::config()->get('system', 'bulk_delivery')) {
Post\Delivery::add($post['uri-id'], $uid, $inbox, $post['created'], Delivery::POST, [$cid]);
- Worker::add(PRIORITY_HIGH, 'APDelivery', '', 0, $inbox, 0);
+ Worker::add(Worker::PRIORITY_HIGH, 'APDelivery', '', 0, $inbox, 0);
} else {
- Worker::add(PRIORITY_HIGH, 'APDelivery', Delivery::POST, $post['id'], $inbox, $uid, [$cid], $post['uri-id']);
+ Worker::add(Worker::PRIORITY_HIGH, 'APDelivery', Delivery::POST, $post['id'], $inbox, $uid, [$cid], $post['uri-id']);
}
}
}
return;
}
- Item::markForDeletion(['uri' => $activity['object_id'], 'author-id' => $author_id, 'gravity' => GRAVITY_ACTIVITY]);
+ Item::markForDeletion(['uri' => $activity['object_id'], 'author-id' => $author_id, 'gravity' => Item::GRAVITY_ACTIVITY]);
Queue::remove($activity);
}
$name = $tag['name'];
}
- $body = str_replace($tag['name'], $hash . '[url=' . $tag['href'] . ']' . $name . '[/url]', $body);
+ if (Network::isValidHttpUrl($tag['href'])) {
+ $body = str_replace($tag['name'], $hash . '[url=' . $tag['href'] . ']' . $name . '[/url]', $body);
+ }
}
return $body;
projects / friendica.git / blobdiff