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

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 5f2f518345..b12624aa49 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -220,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);
 			}
 
@@ -1148,9 +1145,7 @@ class Item
 		$item['raw-body'] = Post\Media::insertFromBody($item['uri-id'], $item['raw-body']);
 		$item['raw-body'] = self::setHashtags($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']);
@@ -3099,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;
 		}
 
@@ -3116,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;
 	}
 
@@ -3418,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']);
 				}
 			}
 
@@ -3662,40 +3668,40 @@ class Item
 			$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'];
 			}
 		}
 
-		if (empty($shared_item['uri-id']) && !empty($shared['message_id'])) {
+		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'];
 			}
 		}
 
-		if (empty($shared_item['uri-id']) && !empty($shared['link'])) {
+		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'];
 			}
 		}
 
-		if (empty($shared_item['uri-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;
-			}
+		$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;
+		}
 
+		$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]);
-
-			$shared_item = Post::selectFirst(['uri-id'], ['id' => $id]);
-			if (!DBA::isResult($shared_item)) {
-				Logger::warning('Post does not exist.', ['id' => $id, 'url' => $url, 'uid' => $uid]);
-				return 0;
-			}
+			return $shared_item['uri-id'];
 		}
 
-		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;
 	}
 }