X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FProcessor.php;h=c1ab6bc1af58cdd5381f0e1584d33ebf57493951;hb=15535811752e5b3cb548dcbe1abe5d9c98c276b0;hp=61f6389cad04b1e80d4aa74257de0f5990369f97;hpb=dc3bbb749ba3e905212345443002672be09922ea;p=friendica.git

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 61f6389cad..c1ab6bc1af 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -8,6 +8,7 @@ use Friendica\Database\DBA;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Model\Contact;
@@ -370,14 +371,22 @@ class Processor
 		$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 (empty($activity['thread-completion'])) {
-			$item['owner-link'] = $activity['actor'];
-			$item['owner-id'] = Contact::getIdForURL($activity['actor'], 0, true);
-		} else {
-			Logger::info('Ignoring actor because of thread completion.');
+		$isForum = false;
+
+		if (!empty($activity['thread-completion'])) {
+			// Store the original actor in the "causer" fields to enable the check for ignored or blocked contacts
+			$item['causer-link'] = $item['owner-link'];
+			$item['causer-id'] = $item['owner-id'];
+
+			Logger::info('Ignoring actor because of thread completion.', ['actor' => $item['owner-link']]);
 			$item['owner-link'] = $item['author-link'];
 			$item['owner-id'] = $item['author-id'];
+		} else {
+			$actor = APContact::getByURL($item['owner-link'], false);
+			$isForum = ($actor['type'] == 'Group');
 		}
 
 		$item['uri'] = $activity['id'];
@@ -399,7 +408,14 @@ class Processor
 
 		foreach ($activity['receiver'] as $receiver) {
 			$item['uid'] = $receiver;
-			$item['contact-id'] = Contact::getIdForURL($activity['author'], $receiver, true);
+
+			if ($isForum) {
+				$item['contact-id'] = Contact::getIdForURL($activity['actor'], $receiver, true);
+			}
+
+			if (empty($item['contact-id'])) {
+				$item['contact-id'] = Contact::getIdForURL($activity['author'], $receiver, true);
+			}
 
 			if (($receiver != 0) && empty($item['contact-id'])) {
 				$item['contact-id'] = Contact::getIdForURL($activity['author'], 0, true);
@@ -410,6 +426,21 @@ class Processor
 				continue;
 			}
 
+			if (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)) {
+					$skip = !Contact::isSharingByURL($activity['actor'], $receiver);
+				}
+
+				if ($skip) {
+					Logger::info('Skipping post', ['uid' => $receiver, 'url' => $item['uri']]);
+					continue;
+				}
+
+				Logger::info('Accepting post', ['uid' => $receiver, 'url' => $item['uri']]);
+			}
+
 			if ($activity['object_type'] == 'as:Event') {
 				self::createEvent($activity, $item);
 			}
@@ -507,14 +538,14 @@ class Processor
 	 * @param $child
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	private static function fetchMissingActivity($url, $child)
+	public static function fetchMissingActivity($url, $child = [])
 	{
-		if (Config::get('system', 'ostatus_full_threads')) {
-			return;
+		if (!empty($child['receiver'])) {
+			$uid = ActivityPub\Receiver::getFirstUserFromReceivers($child['receiver']);
+		} else {
+			$uid = 0;
 		}
 
-		$uid = ActivityPub\Receiver::getFirstUserFromReceivers($child['receiver']);
-
 		$object = ActivityPub::fetchContent($url, $uid);
 		if (empty($object)) {
 			Logger::log('Activity ' . $url . ' was not fetchable, aborting.');
@@ -526,15 +557,34 @@ class Processor
 			return;
 		}
 
+		if (!empty($child['author'])) {
+			$actor = $child['author'];
+		} elseif (!empty($object['actor'])) {
+			$actor = $object['actor'];
+		} elseif (!empty($object['attributedTo'])) {
+			$actor = $object['attributedTo'];
+		} else {
+			// Shouldn't happen
+			$actor = '';
+		}
+
+		if (!empty($object['published'])) {
+			$published = $object['published'];
+		} elseif (!empty($child['published'])) {
+			$published = $child['published'];
+		} else {
+			$published = DateTimeFormat::utcNow();
+		}
+
 		$activity = [];
 		$activity['@context'] = $object['@context'];
 		unset($object['@context']);
 		$activity['id'] = $object['id'];
 		$activity['to'] = defaults($object, 'to', []);
 		$activity['cc'] = defaults($object, 'cc', []);
-		$activity['actor'] = $child['author'];
+		$activity['actor'] = $actor;
 		$activity['object'] = $object;
-		$activity['published'] = defaults($object, 'published', $child['published']);
+		$activity['published'] = $published;
 		$activity['type'] = 'Create';
 
 		$ldactivity = JsonLD::compact($activity);
@@ -608,7 +658,7 @@ class Processor
 		}
 
 		Logger::log('Updating profile for ' . $activity['object_id'], Logger::DEBUG);
-		APContact::getByURL($activity['object_id'], true);
+		Contact::updateFromProbeByURL($activity['object_id'], true);
 	}
 
 	/**