X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItem.php;h=78275c8356f147350e9be19699e975841077d148;hb=31693c2d1f749d744964eee0b0fe79db589fac2c;hp=05ff10273cb4894aaef3de85c9974df616cd4a8a;hpb=91ff24b0e4cb4b01f0af2a457bdf66945090ffb0;p=friendica.git

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 05ff10273c..78275c8356 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -210,8 +210,6 @@ class Item
 					}
 				}
 
-				Post\Media::insertFromAttachmentData($item['uri-id'], $fields['body']);
-
 				$content_fields = ['raw-body' => trim($fields['raw-body'] ?? $fields['body'])];
 
 				// Remove all media attachments from the body and store them in the post-media table
@@ -220,6 +218,10 @@ class Item
 				$content_fields['raw-body'] = self::setHashtags($content_fields['raw-body']);
 
 				Post\Media::insertFromRelevantUrl($item['uri-id'], $content_fields['raw-body'], $fields['body'], $item['author-network']);
+
+				Post\Media::insertFromAttachmentData($item['uri-id'], $fields['body']);
+				$content_fields['raw-body'] = BBCode::removeAttachment($content_fields['raw-body']);
+
 				Post\Content::update($item['uri-id'], $content_fields);
 			}
 
@@ -408,7 +410,7 @@ class Item
 		if ($notify) {
 			// We have to avoid duplicates. So we create the GUID in form of a hash of the plink or uri.
 			// We add the hash of our own host because our host is the original creator of the post.
-			$prefix_host = DI::baseUrl()->getHostname();
+			$prefix_host = DI::baseUrl()->getHost();
 		} else {
 			$prefix_host = '';
 
@@ -1035,7 +1037,7 @@ class Item
 			}
 		}
 
-		if ($notify) {
+		if ($item['origin']) {
 			if (Photo::setPermissionFromBody($item['body'], $item['uid'], $item['contact-id'], $item['allow_cid'], $item['allow_gid'], $item['deny_cid'], $item['deny_gid'])) {
 				$item['object-type'] = Activity\ObjectType::IMAGE;
 			}
@@ -1143,8 +1145,6 @@ class Item
 			$item['body']     = BBCode::removeSharedData($item['body']);
 		}
 
-		Post\Media::insertFromAttachmentData($item['uri-id'], $item['body']);
-
 		// Remove all media attachments from the body and store them in the post-media table
 		$item['raw-body'] = Post\Media::insertFromBody($item['uri-id'], $item['raw-body']);
 		$item['raw-body'] = self::setHashtags($item['raw-body']);
@@ -1152,6 +1152,10 @@ class Item
 		$author = Contact::getById($item['author-id'], ['network']);
 		Post\Media::insertFromRelevantUrl($item['uri-id'], $item['raw-body'], $item['body'], $author['network'] ?? '');
 
+		Post\Media::insertFromAttachmentData($item['uri-id'], $item['body']);
+		$item['body']     = BBCode::removeAttachment($item['body']);
+		$item['raw-body'] = BBCode::removeAttachment($item['raw-body']);
+
 		// Check for hashtags in the body and repair or add hashtag links
 		$item['body'] = self::setHashtags($item['body']);
 
@@ -1211,7 +1215,8 @@ class Item
 			Post\Thread::insert($item['uri-id'], $item);
 		}
 
-		if (!in_array($item['verb'], self::ACTIVITIES)) {
+		// The content of activities normally doesn't matter - except for likes from Misskey
+		if (!in_array($item['verb'], self::ACTIVITIES) || in_array($item['verb'], [Activity::LIKE, Activity::DISLIKE]) && !empty($item['body']) && (mb_strlen($item['body']) == 1)) {
 			Post\Content::insert($item['uri-id'], $item);
 		}
 
@@ -1714,7 +1719,7 @@ class Item
 			if (!empty($item['event-id'])) {
 				$event_post = Post::selectFirst(['event-id'], ['uri-id' => $item['uri-id'], 'uid' => $uid]);
 				if (!empty($event_post['event-id'])) {
-					$event = DBA::selectFirst('event', ['edited', 'start', 'finish', 'summary', 'desc', 'location', 'nofinish', 'adjust'], ['id' => $item['event-id']]);
+					$event = DBA::selectFirst('event', ['edited', 'start', 'finish', 'summary', 'desc', 'location', 'nofinish'], ['id' => $item['event-id']]);
 					if (!empty($event)) {
 						// We aren't using "Event::store" here, since we don't want to trigger any further action
 						$ret = DBA::update('event', $event, ['id' => $event_post['event-id']]);
@@ -2047,7 +2052,7 @@ class Item
 			$guid = System::createUUID();
 		}
 
-		return DI::baseUrl()->get() . '/objects/' . $guid;
+		return DI::baseUrl() . '/objects/' . $guid;
 	}
 
 	/**
@@ -2287,7 +2292,7 @@ class Item
 		}
 
 		// Prevent to forward already forwarded posts
-		if ($datarray['app'] == DI::baseUrl()->getHostname()) {
+		if ($datarray['app'] == DI::baseUrl()->getHost()) {
 			Logger::info('Already forwarded (second test)');
 			return false;
 		}
@@ -3002,8 +3007,9 @@ class Item
 
 		$fields = ['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network', 'has-media', 'quote-uri-id', 'post-type'];
 
-		$shared_uri_id = 0;
-		$shared_links  = [];
+		$shared_uri_id      = 0;
+		$shared_links       = [];
+		$quote_shared_links = [];
 
 		$shared = DI::contentItem()->getSharedPost($item, $fields);
 		if (!empty($shared['post'])) {
@@ -3022,7 +3028,14 @@ class Item
 					$shared_links[] = strtolower($media[0]['url']);
 				}
 
-				$quote_uri_id = $shared_item['uri-id'] ?? 0;
+				if (!empty($shared_item['uri-id'])) {
+					$data = BBCode::getAttachmentData($shared_item['body']);
+					if (!empty($data['url'])) {
+						$quote_shared_links[] = $data['url'];
+					}
+
+					$quote_uri_id = $shared_item['uri-id'];
+				}
 			}
 		}
 
@@ -3097,7 +3110,7 @@ class Item
 
 		if (!empty($shared_attachments)) {
 			$s = self::addVisualAttachments($shared_attachments, $shared_item, $s, true);
-			$s = self::addLinkAttachment($shared_uri_id ?: $item['uri-id'], $shared_attachments, $body, $s, true, []);
+			$s = self::addLinkAttachment($shared_uri_id ?: $item['uri-id'], $shared_attachments, $body, $s, true, $quote_shared_links);
 			$s = self::addNonVisualAttachments($shared_attachments, $item, $s, true);
 			$body = BBCode::removeSharedData($body);
 		}
@@ -3417,7 +3430,7 @@ class Item
 		DI::profiler()->stopRecording();
 
 		if (isset($data['url']) && !in_array(strtolower($data['url']), $ignore_links)) {
-			if (!empty($data['description']) || !empty($data['image']) || !empty($data['preview'])) {
+			if (!empty($data['description']) || !empty($data['image']) || !empty($data['preview']) || (!empty($data['title']) && !Strings::compareLink($data['title'], $data['url']))) {
 				$parts = parse_url($data['url']);
 				if (!empty($parts['scheme']) && !empty($parts['host'])) {
 					if (empty($data['provider_name'])) {
@@ -3682,7 +3695,7 @@ class Item
 			return is_numeric($hookData['item_id']) ? $hookData['item_id'] : 0;
 		}
 
-		$fetched_uri = ActivityPub\Processor::fetchMissingActivity($uri);
+		$fetched_uri = ActivityPub\Processor::fetchMissingActivity($uri, [], '', ActivityPub\Receiver::COMPLETION_MANUAL, $uid);
 
 		if ($fetched_uri) {
 			$item_id = self::searchByLink($fetched_uri, $uid);