X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FProcessor.php;h=d57842c2b226362eae4c16cccc9fa3e4eaf842c2;hb=24c32cff0dcd38d5aa509208f5f17abb05a8b140;hp=d098ddb691343f957f9ea1f525807158995099cf;hpb=2722ef82cf6fe35e5cf0c583a1232a58fce5e824;p=friendica.git

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index d098ddb691..d57842c2b2 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -44,13 +44,13 @@ use Friendica\Model\User;
 use Friendica\Model\Post;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
+use Friendica\Protocol\Delivery;
 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;
 
 /**
  * ActivityPub Processor Protocol class
@@ -1530,6 +1530,12 @@ class Processor
 
 		$ldactivity['recursion-depth'] = !empty($child['recursion-depth']) ? $child['recursion-depth'] + 1 : 0;
 
+		if ($object_actor != $actor) {
+			Contact::updateByUrlIfNeeded($object_actor);
+		}
+
+		Contact::updateByUrlIfNeeded($actor);
+
 		if (!empty($relay_actor)) {
 			$ldactivity['thread-completion'] = $ldactivity['from-relay'] = Contact::getIdForURL($relay_actor);
 			$ldactivity['completion-mode']   = Receiver::COMPLETION_RELAY;
@@ -1715,11 +1721,13 @@ class Processor
 	{
 		if (empty($activity['object_id']) || empty($activity['actor'])) {
 			Logger::info('Empty object id or actor.');
+			Queue::remove($activity);
 			return;
 		}
 
 		if ($activity['object_id'] != $activity['actor']) {
 			Logger::info('Object id does not match actor.');
+			Queue::remove($activity);
 			return;
 		}
 
@@ -1733,6 +1741,42 @@ class Processor
 		Queue::remove($activity);
 	}
 
+	/**
+	 * Add moved contacts as followers for all subscribers of the old contact
+	 *
+	 * @param array $activity
+	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 */
+	public static function movePerson(array $activity)
+	{
+		if (empty($activity['target_id']) || empty($activity['object_id'])) {
+			Queue::remove($activity);
+			return;
+		}
+
+		if ($activity['object_id'] != $activity['actor']) {
+			Logger::notice('Object is not the actor', ['activity' => $activity]);
+			Queue::remove($activity);
+			return;
+		}
+
+		$from = Contact::getByURL($activity['object_id'], false, ['uri-id']);
+		if (empty($from['uri-id'])) {
+			Logger::info('Object not found', ['activity' => $activity]);
+			Queue::remove($activity);
+			return;
+		}
+
+		$contacts = DBA::select('contact', ['uid', 'url'], ["`uri-id` = ? AND `uid` != ? AND `rel` IN (?, ?)", $from['uri-id'], 0, Contact::FRIEND, Contact::SHARING]);
+		while ($from_contact = DBA::fetch($contacts)) {
+			$result = Contact::createFromProbeForUser($from_contact['uid'], $activity['target_id']);
+			Logger::debug('Follower added', ['from' => $from_contact, 'result' => $result]);
+		}
+		DBA::close($contacts);
+		Queue::remove($activity);
+	}
+
 	/**
 	 * Blocks the user by the contact
 	 *
@@ -1783,6 +1827,43 @@ class Processor
 		Queue::remove($activity);
 	}
 
+	/**
+	 * Report a user
+	 *
+	 * @param array $activity
+	 * @return void
+	 * @throws \Exception
+	 */
+	public static function ReportAccount(array $activity)
+	{
+		$account_id = Contact::getIdForURL($activity['object_id']);
+		if (empty($account_id)) {
+			Logger::info('Unknown account', ['activity' => $activity]);
+			Queue::remove($activity);
+			return;
+		}
+
+		$reporter_id = Contact::getIdForURL($activity['actor']);
+		if (empty($reporter_id)) {
+			Logger::info('Unknown actor', ['activity' => $activity]);
+			Queue::remove($activity);
+			return;
+		}
+
+		$uri_ids = [];
+		foreach ($activity['object_ids'] as $status_id) {
+			$post = Post::selectFirst(['uri-id'], ['uri' => $status_id]);
+			if (!empty($post['uri-id'])) {
+				$uri_ids[] = $post['uri-id'];
+			}
+		}
+
+		$report = DI::reportFactory()->createFromReportsRequest($reporter_id, $account_id, $activity['content'], null, '', false, $uri_ids);
+		DI::report()->save($report);
+
+		Logger::info('Stored report', ['reporter' => $reporter_id, 'account_id' => $account_id, 'comment' => $activity['content'], 'object_ids' => $activity['object_ids']]);
+	}
+
 	/**
 	 * Accept a follow request
 	 *
@@ -1792,17 +1873,38 @@ class Processor
 	 */
 	public static function acceptFollowUser(array $activity)
 	{
-		$uid = User::getIdForURL($activity['object_actor']);
+		if (!empty($activity['object_actor'])) {
+			$uid      = User::getIdForURL($activity['object_actor']);
+			$check_id = false;
+		} elseif (!empty($activity['receiver']) && (count($activity['receiver']) == 1)) {
+			$uid      = array_shift($activity['receiver']);
+			$check_id = true;
+		}
+
 		if (empty($uid)) {
+			Logger::notice('User could not be detected', ['activity' => $activity]);
+			Queue::remove($activity);
 			return;
 		}
 
 		$cid = Contact::getIdForURL($activity['actor'], $uid);
 		if (empty($cid)) {
-			Logger::info('No contact found', ['actor' => $activity['actor']]);
+			Logger::notice('No contact found', ['actor' => $activity['actor']]);
+			Queue::remove($activity);
 			return;
 		}
 
+		$id = Transmitter::activityIDFromContact($cid);
+		if ($id == $activity['object_id']) {
+			Logger::info('Successful id check', ['uid' => $uid, 'cid' => $cid]);
+		} else {
+			Logger::info('Unsuccessful id check', ['uid' => $uid, 'cid' => $cid, 'id' => $id, 'object_id' => $activity['object_id']]);
+			if ($check_id) {
+				Queue::remove($activity);
+				return;
+			}
+		}
+
 		self::switchContact($cid);
 
 		$fields = ['pending' => false];