X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FProcessor.php;h=b7ddc09f61b0856e5e5b760c39a81ff715a790d5;hb=7dadc7f6dc0b1e68bfa5937b3a3fa3fd9cdcacd1;hp=04d05def8e93444cb0615cb549c9805f65e45f51;hpb=b4c1fb0d9c30ce9de46ed1f89b79138cc9a812cf;p=friendica.git

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 04d05def8e..b7ddc09f61 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -125,7 +125,7 @@ class Processor
 		$data = ['uri-id' => $uriid];
 		$data['type'] = Post\Media::UNKNOWN;
 		$data['url'] = $attachment['url'];
-		$data['mimetype'] = $attachment['mediaType'];
+		$data['mimetype'] = $attachment['mediaType'] ?? null;
 		$data['height'] = $attachment['height'] ?? null;
 		$data['width'] = $attachment['width'] ?? null;
 		$data['size'] = $attachment['size'] ?? null;
@@ -180,6 +180,35 @@ class Processor
 		}
 
 		Item::update($item, ['uri' => $activity['id']]);
+
+		if ($activity['object_type'] == 'as:Event') {
+			$posts = Post::select(['event-id', 'uid'], ["`uri` = ? AND `event-id` > ?", $activity['id'], 0]);
+			while ($post = DBA::fetch($posts)) {
+				self::updateEvent($post['event-id'], $activity);
+			}
+		}
+	}
+
+	/**
+	 * Update an existing event
+	 *
+	 * @param int $event_id 
+	 * @param array $activity 
+	 */
+	private static function updateEvent(int $event_id, array $activity)
+	{
+		$event = DBA::selectFirst('event', [], ['id' => $event_id]);
+
+		$event['edited']   = DateTimeFormat::utc($activity['updated']);
+		$event['summary']  = HTML::toBBCode($activity['name']);
+		$event['desc']     = HTML::toBBCode($activity['content']);
+		$event['start']    = $activity['start-time'];
+		$event['finish']   = $activity['end-time'];
+		$event['nofinish'] = empty($event['finish']);
+		$event['location'] = $activity['location'];
+
+		Logger::info('Updating event', ['uri' => $activity['id'], 'id' => $event_id]);
+		Event::store($event);
 	}
 
 	/**
@@ -258,6 +287,8 @@ class Processor
 			$item['post-type'] = Item::PT_IMAGE;
 		} elseif ($activity['object_type'] == 'as:Page') {
 			$item['post-type'] = Item::PT_PAGE;
+		} elseif ($activity['object_type'] == 'as:Question') {
+			$item['post-type'] = Item::PT_POLL;
 		} elseif ($activity['object_type'] == 'as:Video') {
 			$item['post-type'] = Item::PT_VIDEO;
 		} else {
@@ -275,7 +306,7 @@ class Processor
 			} else {
 				// 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'];
+				$item['causer-id']   = $item['owner-id'];
 				Logger::info('Use actor as causer.', ['id' => $item['owner-id'], 'actor' => $item['owner-link']]);
 			}
 
@@ -611,13 +642,28 @@ class Processor
 				continue;
 			}
 
-			if (!($item['isForum'] ?? false) && ($receiver != 0) && ($item['gravity'] == GRAVITY_PARENT) &&
-				($item['post-reason'] == Item::PR_BCC) && !Contact::isSharingByURL($activity['author'], $receiver)) {
-				Logger::info('Top level post via BCC from a non sharer, ignoring', ['uid' => $receiver, 'contact' => $item['contact-id']]);
-				continue;
+			if (!($item['isForum'] ?? false) && ($receiver != 0) && ($item['gravity'] == GRAVITY_PARENT) && !Contact::isSharingByURL($activity['author'], $receiver)) {
+				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']]);
+					continue;
+				}
+				if (!empty($activity['thread-children-type']) && in_array($activity['thread-children-type'], Receiver::ACTIVITY_TYPES)) {
+					Logger::info('Top level post from thread completion from a non sharer had been initiated via an activity, ignoring',
+						['type' => $activity['thread-children-type'], 'user' => $item['uid'], 'causer' => $item['causer-link'], 'author' => $activity['author'], 'url' => $item['uri']]);
+					continue;
+				}
+			}
+
+			$is_forum = false;
+
+			if ($receiver != 0) {
+				$user = User::getById($receiver, ['account-type']);
+				if (!empty($user['account-type'])) {
+					$is_forum = ($user['account-type'] == User::ACCOUNT_TYPE_COMMUNITY);
+				}
 			}
 
-			if (DI::pConfig()->get($receiver, 'system', 'accept_only_sharer', false) && ($receiver != 0) && ($item['gravity'] == GRAVITY_PARENT)) {
+			if (!$is_forum && DI::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') || ($item['isForum'] ?? false))) {
@@ -847,6 +893,10 @@ class Processor
 			$ldactivity['thread-completion'] = Contact::getIdForURL($actor);
 		}
 
+		if (!empty($child['type'])) {
+			$ldactivity['thread-children-type'] = $child['type'];
+		}
+
 		if (!empty($relay_actor) && !self::acceptIncomingMessage($ldactivity, $object['id'])) {
 			return '';
 		}