X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FTag.php;h=799296dfbf6a4755b0ff3659a391ddff95f44789;hb=e0e2e45b91f793c58b8fb06240cca0e6c7f85ea4;hp=6611245a0c69ff3268ddb2740ceeef39eb2b58e8;hpb=1a0b63659b0bbab0c09e579ef89f2e5eb25fbb3c;p=friendica.git

diff --git a/src/Model/Tag.php b/src/Model/Tag.php
index 6611245a0c..799296dfbf 100644
--- a/src/Model/Tag.php
+++ b/src/Model/Tag.php
@@ -257,17 +257,16 @@ class Tag
 	 * @param string $hash
 	 * @param string $name
 	 * @param string $url
-	 * @param boolean $probing Whether probing is active
 	 * @return void
 	 */
-	public static function storeByHash(int $uriId, string $hash, string $name, string $url = '', bool $probing = true)
+	public static function storeByHash(int $uriId, string $hash, string $name, string $url = '')
 	{
 		$type = self::getTypeForHash($hash);
 		if ($type == self::UNKNOWN) {
 			return;
 		}
 
-		self::store($uriId, $type, $name, $url, $probing);
+		self::store($uriId, $type, $name, $url);
 	}
 
 	/**
@@ -297,32 +296,39 @@ class Tag
 	 * @param integer $uriId   URI-Id
 	 * @param string  $body    Body of the post
 	 * @param string  $tags    Accepted tags
-	 * @param boolean $probing Perform a probing for contacts, adding them if needed
 	 * @return void
 	 */
-	public static function storeFromBody(int $uriId, string $body, string $tags = null, bool $probing = true)
+	public static function storeFromBody(int $uriId, string $body, string $tags = null)
 	{
-		Logger::info('Check for tags', ['uri-id' => $uriId, 'hash' => $tags, 'callstack' => System::callstack()]);
+		$item = ['uri-id' => $uriId, 'body' => $body, 'quote-uri-id' => null];
+		self::storeFromArray($item, $tags);
+	}
+
+	/**
+	 * Store tags and mentions from the item array
+	 *
+	 * @param array   $item    Item array
+	 * @param string  $tags    Accepted tags
+	 * @return void
+	 */
+	public static function storeFromArray(array $item, string $tags = null)
+	{
+		Logger::info('Check for tags', ['uri-id' => $item['uri-id'], 'hash' => $tags, 'callstack' => System::callstack()]);
 
 		if (is_null($tags)) {
 			$tags = self::TAG_CHARACTER[self::HASHTAG] . self::TAG_CHARACTER[self::MENTION] . self::TAG_CHARACTER[self::EXCLUSIVE_MENTION];
 		}
 
-		// Only remove the shared data from "real" reshares
-		$shared = BBCode::fetchShareAttributes($body);
-		if (!empty($shared['guid'])) {
-			$share_body = $shared['shared'];
-			$body = BBCode::removeSharedData($body);
+		foreach (self::getFromBody($item['body'], $tags) as $tag) {
+			self::storeByHash($item['uri-id'], $tag[1], $tag[3], $tag[2]);
 		}
 
-		foreach (self::getFromBody($body, $tags) as $tag) {
-			self::storeByHash($uriId, $tag[1], $tag[3], $tag[2], $probing);
-		}
+		$shared = DI::contentItem()->getSharedPost($item, ['uri-id']);
 
 		// Search for hashtags in the shared body (but only if hashtags are wanted)
-		if (!empty($share_body) && (strpos($tags, self::TAG_CHARACTER[self::HASHTAG]) !== false)) {
-			foreach (self::getFromBody($share_body, self::TAG_CHARACTER[self::HASHTAG]) as $tag) {
-				self::storeByHash($uriId, $tag[1], $tag[3], $tag[2], $probing);
+		if (!empty($shared) && (strpos($tags, self::TAG_CHARACTER[self::HASHTAG]) !== false)) {
+			foreach (self::getByURIId($shared['post']['uri-id'], [self::HASHTAG]) as $tag) {
+				self::store($item['uri-id'], $tag['type'], $tag['name'], $tag['url']);
 			}
 		}
 	}