X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItem.php;h=b12624aa49a248e5b25a5d8981d17840e3c2cacb;hb=4b5c6994b26a8b6bcb3e92afb4a46a537b796aa7;hp=ced18fc8a68f74aed8557da4522580aa8eb2c73d;hpb=c65fff6f93e4e33901510343faef69654fd1a97b;p=friendica.git

diff --git a/src/Model/Item.php b/src/Model/Item.php
index ced18fc8a6..b12624aa49 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -141,6 +141,7 @@ class Item
 		Activity::FOLLOW,
 		Activity::ANNOUNCE];
 
+	// Privacy levels
 	const PUBLIC = 0;
 	const PRIVATE = 1;
 	const UNLISTED = 2;
@@ -196,12 +197,20 @@ class Item
 
 		Logger::info('Updating per single row method', ['fields' => $fields, 'condition' => $condition]);
 
-		$items = Post::select(['id', 'origin', 'uri-id', 'uid', 'author-network'], $condition);
+		$items = Post::select(['id', 'origin', 'uri-id', 'uid', 'author-network', 'quote-uri-id'], $condition);
 
 		$notify_items = [];
 
 		while ($item = DBA::fetch($items)) {
 			if (!empty($fields['body'])) {
+				if (!empty($item['quote-uri-id'])) {
+					$fields['body'] = BBCode::removeSharedData($fields['body']);
+
+					if (!empty($fields['raw-body'])) {
+						$fields['raw-body'] = BBCode::removeSharedData($fields['raw-body']);
+					}
+				}
+		
 				Post\Media::insertFromAttachmentData($item['uri-id'], $fields['body']);
 
 				$content_fields = ['raw-body' => trim($fields['raw-body'] ?? $fields['body'])];
@@ -211,10 +220,7 @@ class Item
 				$content_fields['raw-body'] = Post\Media::insertFromBody($item['uri-id'], $content_fields['raw-body']);
 				$content_fields['raw-body'] = self::setHashtags($content_fields['raw-body']);
 
-				if ($item['author-network'] != Protocol::DFRN) {
-					Post\Media::insertFromRelevantUrl($item['uri-id'], $content_fields['raw-body']);
-				}
-
+				Post\Media::insertFromRelevantUrl($item['uri-id'], $content_fields['raw-body']);
 				Post\Content::update($item['uri-id'], $content_fields);
 			}
 
@@ -577,7 +583,7 @@ class Item
 	public static function isValid(array $item): bool
 	{
 		// When there is no content then we don't post it
-		if (($item['body'] . $item['title'] == '') && (empty($item['uri-id']) || !Post\Media::existsByURIId($item['uri-id']))) {
+		if (($item['body'] . $item['title'] == '') && empty($item['quote-uri-id']) && (empty($item['uri-id']) || !Post\Media::existsByURIId($item['uri-id']))) {
 			Logger::notice('No body, no title.');
 			return false;
 		}
@@ -1118,22 +1124,28 @@ class Item
 			unset($item['attachments']);
 		}
 
+		if (empty($item['quote-uri-id'])) {
+			$quote_id = self::getQuoteUriId($item['body']);
+			if (!empty($quote_id)) {
+				// This is one of these "should not happen" situations.
+				// The protocol implementations should already have done this job.
+				Logger::notice('Quote-uri-id detected in post', ['id' => $quote_id, 'guid' => $item['guid'], 'uri-id' => $item['uri-id'], 'callstack' => System::callstack(20)]);
+				$item['quote-uri-id'] = $quote_id;
+			}
+		}
+
+		if (!empty($item['quote-uri-id'])) {
+			$item['raw-body'] = BBCode::removeSharedData($item['raw-body']);
+			$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']);
 
-		$quote_id = self::getQuoteUriId($item['body']);
-
-		if (!empty($quote_id) && Post::exists(['uri-id' => $quote_id, 'network' => Protocol::FEDERATED])) {
-			$item['quote-uri-id'] = $quote_id;
-			$item['raw-body'] = BBCode::removeSharedData($item['raw-body']);
-		}
-
-		if (!DBA::exists('contact', ['id' => $item['author-id'], 'network' => Protocol::DFRN])) {
-			Post\Media::insertFromRelevantUrl($item['uri-id'], $item['raw-body']);
-		}
+		Post\Media::insertFromRelevantUrl($item['uri-id'], $item['raw-body']);
 
 		// Check for hashtags in the body and repair or add hashtag links
 		$item['body'] = self::setHashtags($item['body']);
@@ -3082,11 +3094,20 @@ class Item
 	{
 		// Make sure that for example site parameters aren't used when testing if the link is contained in the body
 		$urlparts = parse_url($url);
-		if (!empty($urlparts)) {
-			unset($urlparts['query']);
-			unset($urlparts['fragment']);
+		if (empty($urlparts)) {
+			return false;
+		}
+
+		unset($urlparts['query']);
+		unset($urlparts['fragment']);
+
+		try {
 			$url = (string)Uri::fromParts($urlparts);
-		} else {
+		} catch (\InvalidArgumentException $e) {
+			DI::logger()->notice('Invalid URL', ['$url' => $url, '$urlparts' => $urlparts]);
+			/* See https://github.com/friendica/friendica/issues/12113
+			 * Malformed URLs will result in a Fatal Error
+			 */
 			return false;
 		}
 
@@ -3099,12 +3120,14 @@ class Item
 		if (strpos($body, $url)) {
 			return true;
 		}
+
 		foreach ([0, 1, 2] as $size) {
 			if (preg_match('#/photo/.*-' . $size . '\.#ism', $url) &&
 				strpos(preg_replace('#(/photo/.*)-[012]\.#ism', '$1-' . $size . '.', $body), $url)) {
 				return true;
 			}
 		}
+
 		return false;
 	}
 
@@ -3401,7 +3424,7 @@ class Item
 					$percent = $option['replies'] / $question['voters'] * 100;
 					$options[$key]['vote'] = DI::l10n()->tt('%2$s (%3$d%%, %1$d vote)', '%2$s (%3$d%%, %1$d votes)', $option['replies'], $option['name'], round($percent, 1));
 				} else {
-					$options[$key]['vote'] = DI::l10n()->tt('%2$s (%1$d vote)', '%2$s (%1$d votes)', $option['replies'], $option['name'], );
+					$options[$key]['vote'] = DI::l10n()->tt('%2$s (%1$d vote)', '%2$s (%1$d votes)', $option['replies'], $option['name']);
 				}
 			}
 
@@ -3624,47 +3647,61 @@ class Item
 	}
 
 	/**
-	 * Improve the data in shared posts
+	 * Fetch the uri-id of a quote
 	 *
-	 * @param array $item
-	 * @param bool  $add_media
-	 * @return string body
+	 * @param string $body
+	 * @return integer
 	 */
-	public static function improveSharedDataInBody(array $item, bool $add_media = false): string
+	public static function getQuoteUriId(string $body, int $uid = 0): int
 	{
-		$shared = BBCode::fetchShareAttributes($item['body']);
+		$shared = BBCode::fetchShareAttributes($body);
 		if (empty($shared['guid']) && empty($shared['message_id'])) {
-			return $item['body'];
+			return 0;
 		}
 
-		$link = $shared['link'] ?: $shared['message_id'];
-
-		if (empty($shared_content)) {
-			$shared_content = DI::contentItem()->createSharedPostByUrl($link, $item['uid'] ?? 0, $add_media);
+		if (empty($shared['link']) && empty($shared['message_id'])) {
+			Logger::notice('Invalid share block.', ['share' => $shared]);
+			return 0;
 		}
 
-		if (empty($shared_content)) {
-			return $item['body'];
+		if (!empty($shared['guid'])) {
+			$shared_item = Post::selectFirst(['uri-id'], ['guid' => $shared['guid'], 'uid' => [0, $uid]]);
+			if (!empty($shared_item['uri-id'])) {
+				Logger::debug('Found post by guid', ['guid' => $shared['guid'], 'uid' => $uid]);
+				return $shared_item['uri-id'];
+			}
 		}
 
-		$item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $shared_content, $item['body']);
+		if (!empty($shared['message_id'])) {
+			$shared_item = Post::selectFirst(['uri-id'], ['uri' => $shared['message_id'], 'uid' => [0, $uid]]);
+			if (!empty($shared_item['uri-id'])) {
+				Logger::debug('Found post by message_id', ['message_id' => $shared['message_id'], 'uid' => $uid]);
+				return $shared_item['uri-id'];
+			}
+		}
 
-		Logger::debug('New shared data', ['uri-id' => $item['uri-id'], 'link' => $link, 'guid' => $item['guid']]);
-		return $item['body'];
-	}
+		if (!empty($shared['link'])) {
+			$shared_item = Post::selectFirst(['uri-id'], ['plink' => $shared['link'], 'uid' => [0, $uid]]);
+			if (!empty($shared_item['uri-id'])) {
+				Logger::debug('Found post by link', ['link' => $shared['link'], 'uid' => $uid]);
+				return $shared_item['uri-id'];
+			}
+		}
 
-	/**
-	 * Fetch the uri-id of a quote
-	 *
-	 * @param string $body
-	 * @return integer
-	 */
-	private static function getQuoteUriId(string $body): int
-	{
-		$shared = BBCode::fetchShareAttributes($body);
-		if (empty($shared['message_id'])) {
+		$url = $shared['message_id'] ?: $shared['link'];
+		$id = self::fetchByLink($url);
+		if (!$id) {
+			Logger::notice('Post could not be fetched.', ['url' => $url, 'uid' => $uid]);
 			return 0;
 		}
-		return ItemURI::getIdByURI($shared['message_id']);
+
+		$shared_item = Post::selectFirst(['uri-id'], ['id' => $id]);
+		if (!empty($shared_item['uri-id'])) {
+			Logger::debug('Fetched shared post', ['id' => $id, 'url' => $url, 'uid' => $uid]);
+			return $shared_item['uri-id'];
+		}
+
+		Logger::warning('Post does not exist although it was supposed to had been fetched.', ['id' => $id, 'url' => $url, 'uid' => $uid]);
+		return 0;
 	}
 }