X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FProcessor.php;h=aba285c1800e941029d0deaaa2449e610e7477d7;hb=a3c323b366e58c154e5a43f56d85412762e0ac83;hp=171cf0ea4059981c2c74f242ffa59c547dd0adfe;hpb=e9280635298ef675eea4d222d8f5740de645dc3b;p=friendica.git

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 171cf0ea40..aba285c180 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -21,7 +21,6 @@
 
 namespace Friendica\Protocol\ActivityPub;
 
-use Friendica\Content\PageInfo;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Content\Text\Markdown;
@@ -123,21 +122,7 @@ class Processor
 		}
 
 		$data = ['uri-id' => $uriid];
-
-		$filetype = strtolower(substr($attachment['mediaType'], 0, strpos($attachment['mediaType'], '/')));
-		if ($filetype == 'image') {
-			$data['type'] = Post\Media::IMAGE;
-		} elseif ($filetype == 'video') {
-			$data['type'] = Post\Media::VIDEO;
-		} elseif ($filetype == 'audio') {
-			$data['type'] = Post\Media::AUDIO;
-		} elseif (in_array($attachment['mediaType'], ['application/x-bittorrent', 'application/x-bittorrent;x-scheme-handler/magnet'])) {
-			$data['type'] = Post\Media::TORRENT;
-		} else {
-			Logger::info('Unknown type', ['attachment' => $attachment]);
-			return;
-		}
-
+		$data['type'] = Post\Media::UNKNOWN;
 		$data['url'] = $attachment['url'];
 		$data['mimetype'] = $attachment['mediaType'];
 		$data['height'] = $attachment['height'] ?? null;
@@ -149,97 +134,20 @@ class Processor
 	}
 
 	/**
-	 * Add attachment data to the item array
+	 * Stire attachment data
 	 *
 	 * @param array   $activity
 	 * @param array   $item
-	 *
-	 * @return array array
 	 */
-	private static function constructAttachList($activity, $item)
+	private static function storeAttachments($activity, $item)
 	{
 		if (empty($activity['attachments'])) {
-			return $item;
+			return;
 		}
 
-		$leading = '';
-		$trailing = '';
-
 		foreach ($activity['attachments'] as $attach) {
-			switch ($attach['type']) {
-				case 'link':
-					$data = [
-						'url'      => $attach['url'],
-						'type'     => $attach['type'],
-						'title'    => $attach['title'] ?? '',
-						'text'     => $attach['desc']  ?? '',
-						'image'    => $attach['image'] ?? '',
-						'images'   => [],
-						'keywords' => [],
-					];
-					$item['body'] = PageInfo::appendDataToBody($item['body'], $data);
-					break;
-				default:
-					self::storeAttachmentAsMedia($item['uri-id'], $attach);
-
-					$filetype = strtolower(substr($attach['mediaType'], 0, strpos($attach['mediaType'], '/')));
-					if ($filetype == 'image') {
-						if (!empty($activity['source'])) {
-							foreach ([0, 1, 2] as $size) {
-								if (preg_match('#/photo/.*-' . $size . '\.#ism', $attach['url']) && 
-									strpos(preg_replace('#(/photo/.*)-[012]\.#ism', '$1-' . $size . '.', $activity['source']), $attach['url'])) {
-									continue 3;
-								}
-							}
-							if (strpos($activity['source'], $attach['url'])) {
-								continue 2;
-							}
-						}
-
-						// image is the preview/thumbnail URL
-						if (!empty($attach['image'])) {
-							$trailing .= '[url=' . $attach['url'] . ']';
-							$attach['url'] = $attach['image'];
-						}
-
-						if (empty($attach['name'])) {
-							$trailing .= '[img]' . $attach['url'] . '[/img]';
-						} else {
-							$trailing .= '[img=' . $attach['url'] . ']' . $attach['name'] . '[/img]';
-						}
-
-						if (!empty($attach['image'])) {
-							$trailing .= '[/url]';
-						}
-					} elseif ($filetype == 'audio') {
-						if (!empty($activity['source']) && strpos($activity['source'], $attach['url'])) {
-							continue 2;
-						}
-
-						$leading .= '[audio]' . $attach['url'] . "[/audio]\n";
-					} elseif ($filetype == 'video') {
-						if (!empty($activity['source']) && strpos($activity['source'], $attach['url'])) {
-							continue 2;
-						}
-
-						$leading .= '[video]' . $attach['url'] . "[/video]\n";
-					}
-			}
+			self::storeAttachmentAsMedia($item['uri-id'], $attach);
 		}
-
-		if (!empty($leading) && !empty(trim($item['body']))) {
-			$item['body'] = $leading . "[hr]\n" . $item['body'];
-		} elseif (!empty($leading)) {
-			$item['body'] = $leading;
-		}
-
-		if (!empty($trailing) && !empty(trim($item['body']))) {
-			$item['body'] = $item['body'] . "\n[hr]" . $trailing;
-		} elseif (!empty($trailing)) {
-			$item['body'] = $trailing;
-		}
-
-		return $item;
 	}
 
 	/**
@@ -250,7 +158,7 @@ class Processor
 	 */
 	public static function updateItem($activity)
 	{
-		$item = Post::selectFirst(['uri', 'uri-id', 'thr-parent', 'gravity'], ['uri' => $activity['id']]);
+		$item = Post::selectFirst(['uri', 'uri-id', 'thr-parent', 'gravity', 'post-type'], ['uri' => $activity['id']]);
 		if (!DBA::isResult($item)) {
 			Logger::warning('No existing item, item will be created', ['uri' => $activity['id']]);
 			$item = self::createItem($activity);
@@ -263,7 +171,7 @@ class Processor
 
 		$item = self::processContent($activity, $item);
 
-		$item = self::constructAttachList($activity, $item);
+		self::storeAttachments($activity, $item);
 
 		if (empty($item)) {
 			return;
@@ -336,6 +244,24 @@ class Processor
 			$item['direction'] = Conversation::RELAY;
 		}
 
+		if ($activity['object_type'] == 'as:Article') {
+			$item['post-type'] = Item::PT_ARTICLE;
+		} elseif ($activity['object_type'] == 'as:Audio') {
+			$item['post-type'] = Item::PT_AUDIO;
+		} elseif ($activity['object_type'] == 'as:Document') {
+			$item['post-type'] = Item::PT_DOCUMENT;
+		} elseif ($activity['object_type'] == 'as:Event') {
+			$item['post-type'] = Item::PT_EVENT;
+		} elseif ($activity['object_type'] == 'as:Image') {
+			$item['post-type'] = Item::PT_IMAGE;
+		} elseif ($activity['object_type'] == 'as:Page') {
+			$item['post-type'] = Item::PT_PAGE;
+		} elseif ($activity['object_type'] == 'as:Video') {
+			$item['post-type'] = Item::PT_VIDEO;
+		} else {
+			$item['post-type'] = Item::PT_NOTE;
+		}
+
 		$item['isForum'] = false;
 
 		if (!empty($activity['thread-completion'])) {
@@ -379,7 +305,7 @@ class Processor
 
 		$item['plink'] = $activity['alternate-url'] ?? $item['uri'];
 
-		$item = self::constructAttachList($activity, $item);
+		self::storeAttachments($activity, $item);
 
 		// We received the post via AP, so we set the protocol of the server to AP
 		$contact = Contact::getById($item['author-id'], ['gsid']);
@@ -456,6 +382,7 @@ class Processor
 		$item['verb'] = $verb;
 		$item['thr-parent'] = $activity['object_id'];
 		$item['gravity'] = GRAVITY_ACTIVITY;
+		unset($item['post-type']);
 		$item['object-type'] = Activity\ObjectType::NOTE;
 
 		$item['diaspora_signed_text'] = $activity['diaspora:like'] ?? '';
@@ -478,7 +405,7 @@ class Processor
 		$event['finish']    = $activity['end-time'];
 		$event['nofinish']  = empty($event['finish']);
 		$event['location']  = $activity['location'];
-		$event['adjust']    = true;
+		$event['adjust']    = $activity['adjust'] ?? true;
 		$event['cid']       = $item['contact-id'];
 		$event['uid']       = $item['uid'];
 		$event['uri']       = $item['uri'];
@@ -536,6 +463,7 @@ class Processor
 		if (!empty($activity['source'])) {
 			$item['body'] = $activity['source'];
 			$item['raw-body'] = $content;
+			$item['body'] = Item::improveSharedDataInBody($item);
 		} else {
 			if (empty($activity['directmessage']) && ($item['thr-parent'] != $item['uri']) && ($item['gravity'] == GRAVITY_COMMENT)) {
 				$item_private = !in_array(0, $activity['item_receiver']);
@@ -629,34 +557,34 @@ class Processor
 			$type = $activity['reception_type'][$receiver] ?? Receiver::TARGET_UNKNOWN;
 			switch($type) {
 				case Receiver::TARGET_TO:
-					$item['post-type'] = Item::PT_TO;
+					$item['post-reason'] = Item::PR_TO;
 					break;
 				case Receiver::TARGET_CC:
-					$item['post-type'] = Item::PT_CC;
+					$item['post-reason'] = Item::PR_CC;
 					break;
 				case Receiver::TARGET_BTO:
-					$item['post-type'] = Item::PT_BTO;
+					$item['post-reason'] = Item::PR_BTO;
 					break;
 				case Receiver::TARGET_BCC:
-					$item['post-type'] = Item::PT_BCC;
+					$item['post-reason'] = Item::PR_BCC;
 					break;
 				case Receiver::TARGET_FOLLOWER:
-					$item['post-type'] = Item::PT_FOLLOWER;
+					$item['post-reason'] = Item::PR_FOLLOWER;
 					break;
 				case Receiver::TARGET_ANSWER:
-					$item['post-type'] = Item::PT_COMMENT;
+					$item['post-reason'] = Item::PR_COMMENT;
 					break;
 				case Receiver::TARGET_GLOBAL:
-					$item['post-type'] = Item::PT_GLOBAL;
+					$item['post-reason'] = Item::PR_GLOBAL;
 					break;
 				default:
-					$item['post-type'] = Item::PT_ARTICLE;
+					$item['post-reason'] = Item::PR_NONE;
 			}
 
 			if (!empty($activity['from-relay'])) {
-				$item['post-type'] = Item::PT_RELAY;
+				$item['post-reason'] = Item::PR_RELAY;
 			} elseif (!empty($activity['thread-completion'])) {
-				$item['post-type'] = Item::PT_FETCHED;
+				$item['post-reason'] = Item::PR_FETCHED;
 			}
 
 			if ($item['isForum'] ?? false) {
@@ -674,6 +602,12 @@ class Processor
 				continue;
 			}
 
+			if (!$item['isForum'] && ($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 follower, ignoring', ['uid' => $receiver, 'contact' => $item['contact-id']]);
+				continue;
+			}
+
 			if (DI::pConfig()->get($receiver, 'system', 'accept_only_sharer', false) && ($receiver != 0) && ($item['gravity'] == GRAVITY_PARENT)) {
 				$skip = !Contact::isSharingByURL($activity['author'], $receiver);
 
@@ -842,12 +776,12 @@ class Processor
 
 		$object = ActivityPub::fetchContent($url, $uid);
 		if (empty($object)) {
-			Logger::log('Activity ' . $url . ' was not fetchable, aborting.');
+			Logger::notice('Activity was not fetchable, aborting.', ['url' => $url]);
 			return '';
 		}
 
 		if (empty($object['id'])) {
-			Logger::log('Activity ' . $url . ' has got not id, aborting. ' . json_encode($object));
+			Logger::notice('Activity has got not id, aborting. ', ['url' => $url, 'object' => $object]);
 			return '';
 		}
 
@@ -998,7 +932,7 @@ class Processor
 			DBA::update('contact', ['hub-verify' => $activity['id'], 'protocol' => Protocol::ACTIVITYPUB], ['id' => $cid]);
 		}
 
-		Logger::log('Follow user ' . $uid . ' from contact ' . $cid . ' with id ' . $activity['id']);
+		Logger::notice('Follow user ' . $uid . ' from contact ' . $cid . ' with id ' . $activity['id']);
 	}
 
 	/**