X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FTag.php;h=002501aa45f91084a80015cd0315070d6ed8c87f;hb=624e4c192c7f837ac0587a50da6e1409081eb519;hp=b86c5e1cdc162328fe78518f5facbbe88adc1dc1;hpb=060597f6196ce7df4355cce7f1d4c1508ab14200;p=friendica.git

diff --git a/src/Model/Tag.php b/src/Model/Tag.php
index b86c5e1cdc..002501aa45 100644
--- a/src/Model/Tag.php
+++ b/src/Model/Tag.php
@@ -58,8 +58,10 @@ class Tag
 	const BTO = 12;
 	const BCC = 13;
 
-	const ACCOUNT    = 1;
-	const COLLECTION = 2;
+	const ACCOUNT             = 1;
+	const GENERAL_COLLECTION  = 2;
+	const FOLLOWER_COLLECTION = 3;
+	const PUBLIC_COLLECTION   = 4;
 
 	const TAG_CHARACTER = [
 		self::HASHTAG           => '#',
@@ -156,40 +158,50 @@ class Tag
 		Logger::info('Stored tag/mention', ['uri-id' => $uriid, 'tag-id' => $tagid, 'contact-id' => $cid, 'name' => $name, 'type' => $type, 'callstack' => System::callstack(8)]);
 	}
 
-	public static function getTargetType(string $url)
+	/**
+	 * Fetch the target type for the given url
+	 *
+	 * @param string $url
+	 * @param bool   $fetch Fetch information via network operations
+	 * @return null|int
+	 */
+	public static function getTargetType(string $url, bool $fetch = true)
 	{
+		$target = null;
+
 		if (empty($url)) {
-			return null;
+			return $target;
 		}
 
 		$tag = DBA::selectFirst('tag', ['url', 'type'], ['url' => $url]);
 		if (!empty($tag['type'])) {
-			Logger::debug('Found existing type', ['type' => $tag['type'], 'url' => $url]);
-			return $tag['type'];
+			$target = $tag['type'];
+			if ($target != self::GENERAL_COLLECTION) {
+				Logger::debug('Found existing type', ['type' => $tag['type'], 'url' => $url]);
+				return $target;
+			}
 		}
 
-		$target = null;
-
 		if ($url == ActivityPub::PUBLIC_COLLECTION) {
-			$target = Tag::COLLECTION;
+			$target = self::PUBLIC_COLLECTION;
 			Logger::debug('Public collection', ['url' => $url]);
 		} else {
 			if (DBA::exists('apcontact', ['followers' => $url])) {
-				$target = Tag::COLLECTION;
+				$target = self::FOLLOWER_COLLECTION;
 				Logger::debug('Found collection via existing apcontact', ['url' => $url]);
-			} elseif (Contact::getIdForURL($url, 0)) {
-				$target = Tag::ACCOUNT;
+			} elseif (Contact::getIdForURL($url, 0, $fetch ? null : false)) {
+				$target = self::ACCOUNT;
 				Logger::debug('URL is an account', ['url' => $url]);
-			} else {
+			} elseif ($fetch && ($target != self::GENERAL_COLLECTION)) {
 				$content = ActivityPub::fetchContent($url);
 				if (!empty($content['type']) && ($content['type'] == 'OrderedCollection')) {
-					$target = Tag::COLLECTION;
+					$target = self::GENERAL_COLLECTION;
 					Logger::debug('URL is an ordered collection', ['url' => $url]);
 				}
 			}
 		}
 
-		if (!empty($target) && !empty($tag['url']) && empty($tag['type'])) {
+		if (!empty($target) && !empty($tag['url']) && ($tag['type'] != $target)) {
 			DBA::update('tag', ['type' => $target], ['url' => $url]);
 		}
 
@@ -212,15 +224,18 @@ class Tag
 	{
 		$fields = ['name' => substr($name, 0, 96), 'url' => $url];
 
-		if (!empty($type)) {
-			$fields['type'] = $type;
-		}
-
-		$tag = DBA::selectFirst('tag', ['id'], $fields);
+		$tag = DBA::selectFirst('tag', ['id', 'type'], $fields);
 		if (DBA::isResult($tag)) {
+			if (empty($tag['type']) && !empty($type)) {
+				DBA::update('tag', ['type' => $type], $fields);
+			}
 			return $tag['id'];
 		}
 
+		if (!empty($type)) {
+			$fields['type'] = $type;
+		}
+
 		DBA::insert('tag', $fields, Database::INSERT_IGNORE);
 		$tid = DBA::lastInsertId();
 		if (!empty($tid)) {
@@ -252,7 +267,7 @@ class Tag
 
 	/**
 	 * Get tags and mentions from the body
-	 * 
+	 *
 	 * @param string  $body    Body of the post
 	 * @param string  $tags    Accepted tags
 	 *
@@ -261,7 +276,7 @@ class Tag
 	public static function getFromBody(string $body, string $tags = null)
 	{
 		if (is_null($tags)) {
-			$tags =  self::TAG_CHARACTER[self::HASHTAG] . self::TAG_CHARACTER[self::MENTION] . self::TAG_CHARACTER[self::EXCLUSIVE_MENTION];
+			$tags = self::TAG_CHARACTER[self::HASHTAG] . self::TAG_CHARACTER[self::MENTION] . self::TAG_CHARACTER[self::EXCLUSIVE_MENTION];
 		}
 
 		if (!preg_match_all("/([" . $tags . "])\[url\=([^\[\]]*)\]([^\[\]]*)\[\/url\]/ism", $body, $result, PREG_SET_ORDER)) {
@@ -273,7 +288,7 @@ class Tag
 
 	/**
 	 * Store tags and mentions from the body
-	 * 
+	 *
 	 * @param integer $uriid   URI-Id
 	 * @param string  $body    Body of the post
 	 * @param string  $tags    Accepted tags
@@ -283,23 +298,36 @@ class Tag
 	{
 		Logger::info('Check for tags', ['uri-id' => $uriid, 'hash' => $tags, 'callstack' => System::callstack()]);
 
-		$result = self::getFromBody($body, $tags);
-		if (empty($result)) {
-			return;
+		if (is_null($tags)) {
+			$tags = self::TAG_CHARACTER[self::HASHTAG] . self::TAG_CHARACTER[self::MENTION] . self::TAG_CHARACTER[self::EXCLUSIVE_MENTION];
 		}
 
-		Logger::info('Found tags', ['uri-id' => $uriid, 'hash' => $tags, 'result' => $result]);
+		// Only remove the shared data from "real" reshares
+		$shared = BBCode::fetchShareAttributes($body);
+		if (!empty($shared['guid'])) {
+			if (preg_match("/\s*\[share .*?\](.*?)\[\/share\]\s*/ism",  $body, $matches)) {
+				$share_body = $matches[1];
+			}
+			$body = preg_replace("/\s*\[share .*?\].*?\[\/share\]\s*/ism", '', $body);
+		}
 
-		foreach ($result as $tag) {
+		foreach (self::getFromBody($body, $tags) as $tag) {
 			self::storeByHash($uriid, $tag[1], $tag[3], $tag[2], $probing);
 		}
+
+		// 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);
+			}
+		}
 	}
 
 	/**
 	 * Store raw tags (not encapsulated in links) from the body
 	 * This function is needed in the intermediate phase.
 	 * Later we can call item::setHashtags in advance to have all tags converted.
-	 * 
+	 *
 	 * @param integer $uriid URI-Id
 	 * @param string  $body   Body of the post
 	 */
@@ -584,7 +612,7 @@ class Tag
 	/**
 	 * Fetch the blocked tags as SQL
 	 *
-	 * @return string 
+	 * @return string
 	 */
 	private static function getBlockedSQL()
 	{