Merge pull request #11785 from annando/processing

Decoupling of relay posts / endless loop removed

src/Protocol/ActivityPub/Processor.php

@@ -24,6 +24,7 @@ namespace Friendica\Protocol\ActivityPub;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Content\Text\Markdown;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
@@ -56,6 +57,7 @@ use Friendica\Worker\Delivery;
  */
 class Processor
 {
+	const CACHEKEY_FETCH_ACTIVITY = 'processor:fetchMissingActivity:';
 	/**
 	 * Extracts the tag character (#, @, !) from mention links
 	 *
@@ -1218,6 +1220,10 @@ class Processor
 			$uid = 0;
 		}
 
+		$cachekey = self::CACHEKEY_FETCH_ACTIVITY . $url;
+		$object = DI::cache()->get($cachekey);
+
+		if (is_null($object)) {
 			$object = ActivityPub::fetchContent($url, $uid);
 			if (empty($object)) {
 				Logger::notice('Activity was not fetchable, aborting.', ['url' => $url, 'uid' => $uid]);
@@ -1228,6 +1234,10 @@ class Processor
 				Logger::notice('Activity has got not id, aborting. ', ['url' => $url, 'object' => $object]);
 				return '';
 			}
+			DI::cache()->set($cachekey, $object, Duration::FIVE_MINUTES);
+		} else {
+			Logger::debug('Fetch from cache', ['url' => $url]);
+		}
 
 		$signer = [];
 

src/Protocol/ActivityPub/Queue.php

@@ -126,14 +126,6 @@ class Queue
 			return;
 		}
 
-		$children = DBA::select('inbox-entry', ['id'], ['in-reply-to-id' => $entry['object-id']]);
-		while ($child = DBA::fetch($children)) {
-			if ($id == $child['id']) {
-				continue;
-			}
-			self::deleteById($child['id']);
-		}
-		DBA::close($children);
 		DBA::delete('inbox-entry', ['id' => $entry['id']]);
 	}
 

src/Protocol/ActivityPub/Receiver.php

@@ -208,13 +208,6 @@ class Receiver
 			Logger::notice('Relayed message had not been fetched', ['id' => $object_id, 'actor' => $actor]);
 			return;
 		}
-
-		$item_id = Item::searchByLink($object_id);
-		if ($item_id) {
-			Logger::info('Relayed message had been fetched and stored', ['id' => $object_id, 'item' => $item_id, 'actor' => $actor]);
-		} else {
-			Logger::notice('Relayed message had not been stored', ['id' => $object_id, 'actor' => $actor]);
-		}
 	}
 
 	/**
@@ -599,9 +592,10 @@ class Receiver
 			return;
 		}
 
-		if ($push) {
+		if (!empty($object_data['entry-id']) && ($push || ($activity['completion-mode'] == self::COMPLETION_RELAY))) {
 			// We delay by 5 seconds to allow to accumulate all receivers
 			$delayed = date(DateTimeFormat::MYSQL, time() + 5);
+			Logger::debug('Initiate processing', ['id' => $object_data['entry-id'], 'uri' => $object_data['object_id']]);
 			Worker::add(['priority' => PRIORITY_HIGH, 'delayed' => $delayed], 'ProcessQueue', $object_data['entry-id']);
 			return;
 		}

src/Protocol/ActivityPub/Transmitter.php

@@ -31,7 +31,6 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\Contact;
-use Friendica\Model\Conversation;
 use Friendica\Model\GServer;
 use Friendica\Model\Item;
 use Friendica\Model\Photo;