Merge pull request #11847 from annando/storeforuser

Improved checks in "storeForUserByUriId" to reduce recursion depth

src/Model/Item.php

@@ -1492,6 +1492,14 @@ class Item
 			return 0;
 		}
 
+		if (($uid != 0) && ($item['gravity'] == GRAVITY_PARENT)) {
+			$owner = User::getOwnerDataById($uid);
+			if (($owner['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY) && !Tag::isMentioned($uri_id, $owner['url'])) {
+				Logger::info('Target user is a forum but is not mentioned here, thread will not be stored', ['uid' => $uid, 'uri-id' => $uri_id]);
+				return 0;
+			}
+		}
+
 		if (($source_uid == 0) && (($item['private'] == self::PRIVATE) || !in_array($item['network'], Protocol::FEDERATED))) {
 			Logger::notice('Item is private or not from a federated network. It will not be stored for the user.', ['uri-id' => $uri_id, 'uid' => $uid, 'private' => $item['private'], 'network' => $item['network']]);
 			return 0;
@@ -1508,28 +1516,52 @@ class Item
 		if (($uid != 0) && (($item['gravity'] == GRAVITY_PARENT) || $is_reshare) &&
 			DI::pConfig()->get($uid, 'system', 'accept_only_sharer') == self::COMPLETION_NONE &&
 			!in_array($item['post-reason'], [self::PR_FOLLOWER, self::PR_TAG, self::PR_TO, self::PR_CC])) {
-			Logger::info('Contact is not a follower, thread will not be stored', ['author' => $item['author-link'], 'uid' => $uid]);
+			Logger::info('Contact is not a follower, thread will not be stored', ['author' => $item['author-link'], 'uid' => $uid, 'uri-id' => $uri_id]);
 			return 0;
 		}
 
-		if (($uri_id != $item['thr-parent-id']) && (($item['gravity'] == GRAVITY_COMMENT) || $is_reshare) && !Post::exists(['uri-id' => $item['thr-parent-id'], 'uid' => $uid])) {
+		$causer = $item['causer-id'] ?: $item['author-id'];
-			// Fetch the origin user for the post
+
-			$origin_uid = self::GetOriginUidForUriId($item['thr-parent-id'], $uid);
+		if (($uri_id != $item['parent-uri-id']) && ($item['gravity'] == GRAVITY_COMMENT) && !Post::exists(['uri-id' => $item['parent-uri-id'], 'uid' => $uid])) {
-			if (is_null($origin_uid)) {
+			if (!self::fetchParent($item['parent-uri-id'], $uid, $causer)) {
-				Logger::info('Origin item was not found', ['uid' => $uid, 'uri-id' => $item['thr-parent-id']]);
+				Logger::info('Parent post had not been added', ['uri-id' => $item['parent-uri-id'], 'uid' => $uid, 'causer' => $causer]);
 				return 0;
 			}
-
+			Logger::info('Fetched parent post', ['uri-id' => $item['parent-uri-id'], 'uid' => $uid, 'causer' => $causer]);
-			$causer = $item['causer-id'] ?: $item['author-id'];
+		} elseif (($uri_id != $item['thr-parent-id']) && $is_reshare && !Post::exists(['uri-id' => $item['thr-parent-id'], 'uid' => $uid])) {
-			$result = self::storeForUserByUriId($item['thr-parent-id'], $uid, ['causer-id' => $causer, 'post-reason' => self::PR_FETCHED], $origin_uid);
+			if (!self::fetchParent($item['thr-parent-id'], $uid, $causer)) {
-			Logger::info('Fetched thread parent', ['uri-id' => $item['thr-parent-id'], 'uid' => $uid, 'causer' => $causer, 'result' => $result]);
+				Logger::info('Thread parent had not been added', ['uri-id' => $item['thr-parent-id'], 'uid' => $uid, 'causer' => $causer]);
+				return 0;
+			}
+			Logger::info('Fetched thread parent', ['uri-id' => $item['thr-parent-id'], 'uid' => $uid, 'causer' => $causer]);
 		}
 
 		$stored = self::storeForUser($item, $uid);
-		Logger::info('Item stored for user', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'source-uid' => $source_uid, 'stored' => $stored]);
+		Logger::info('Item stored for user', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'causer' => $causer, 'source-uid' => $source_uid, 'stored' => $stored]);
 		return $stored;
 	}
 
+	/**
+	 * Fetch the parent with the given uri-id
+	 *
+	 * @param integer $uri_id
+	 * @param integer $uid
+	 * @param integer $causer
+	 *
+	 * @return integer
+	 */
+	private static function fetchParent(int $uri_id, int $uid, int $causer): int
+	{
+		// Fetch the origin user for the post
+		$origin_uid = self::GetOriginUidForUriId($uri_id, $uid);
+		if (is_null($origin_uid)) {
+			Logger::info('Origin item was not found', ['uid' => $uid, 'uri-id' => $uri_id]);
+			return 0;
+		}
+
+		return self::storeForUserByUriId($uri_id, $uid, ['causer-id' => $causer, 'post-reason' => self::PR_FETCHED], $origin_uid);
+	}
+
 	/**
 	 * Returns the origin uid of a post if the given user is allowed to see it.
 	 *
@@ -1590,7 +1622,8 @@ class Item
 	 */
 	private static function storeForUser(array $item, int $uid): int
 	{
-		if (Post::exists(['uri-id' => $item['uri-id'], 'uid' => $uid])) {
+		$post = Post::selectFirst(['id'], ['uri-id' => $item['uri-id'], 'uid' => $uid]);
+		if (!empty($post['id'])) {
 			if (!empty($item['event-id'])) {
 				$post = Post::selectFirst(['event-id'], ['uri-id' => $item['uri-id'], 'uid' => $uid]);
 				if (!empty($post['event-id'])) {
@@ -1602,8 +1635,8 @@ class Item
 					}
 				}
 			}
-			Logger::info('Item already exists', ['uri-id' => $item['uri-id'], 'uid' => $uid]);
+			Logger::info('Item already exists', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'id' => $post['id']]);
-			return 0;
+			return $post['id'];
 		}
 
 		// Data from the "post-user" table
@@ -2054,15 +2087,9 @@ class Item
 		}
 
 		if ($item['gravity'] == GRAVITY_PARENT) {
-			$tags = Tag::getByURIId($item['uri-id'], [Tag::MENTION, Tag::EXCLUSIVE_MENTION]);
+			if (Tag::isMentioned($item['uri-id'], $owner['url'])) {
-			foreach ($tags as $tag) {
+				Logger::info('Mention found in tag.', ['uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
-				if (Strings::compareLink($owner['url'], $tag['url'])) {
+			} else {
-					$mention = true;
-					Logger::info('Mention found in tag.', ['url' => $tag['url'], 'uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
-				}
-			}
-
-			if (!$mention) {
 				Logger::info('Top-level post without mention is deleted.', ['uri' => $item['uri'], $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
 				Post\User::delete(['uri-id' => $item['uri-id'], 'uid' => $item['uid']]);
 				return true;
@@ -2072,15 +2099,9 @@ class Item
 
 			Hook::callAll('tagged', $arr);
 		} else {
-			$tags = Tag::getByURIId($item['parent-uri-id'], [Tag::MENTION, Tag::EXCLUSIVE_MENTION]);
+			if (Tag::isMentioned($item['parent-uri-id'], $owner['url'])) {
-			foreach ($tags as $tag) {
+				Logger::info('Mention found in parent tag.', ['uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
-				if (Strings::compareLink($owner['url'], $tag['url'])) {
+			} else {
-					$mention = true;
-					Logger::info('Mention found in parent tag.', ['url' => $tag['url'], 'uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
-				}
-			}
-
-			if (!$mention) {
 				Logger::debug('No mentions found in parent, quitting here.', ['id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
 				return false;
 			}

src/Model/Tag.php

@@ -471,6 +471,26 @@ class Tag
 		return DBA::selectToArray('tag-view', ['type', 'name', 'url', 'tag-type'], $condition);
 	}
 
+	/**
+	 * Checks if the given url is mentioned in the post
+	 *
+	 * @param integer $uriId
+	 * @param string $url
+	 * @param array $type
+	 *
+	 * @return boolean
+	 */
+	public static function isMentioned(int $uriId, string $url, array $type = [self::MENTION, self::EXCLUSIVE_MENTION]): bool
+	{
+		$tags = self::getByURIId($uriId, $type);
+		foreach ($tags as $tag) {
+			if (Strings::compareLink($url, $tag['url'])) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * Return a string with all tags and mentions
 	 *

src/Protocol/Diaspora.php

@@ -3992,7 +3992,7 @@ class Diaspora
 				$data['birthday'] = DateTimeFormat::utc($year . '-' . $month . '-' . $day, 'Y-m-d');
 			}
 
-			$data['about'] = BBCode::toMarkdown($profile['about']);
+			$data['about'] = BBCode::toMarkdown($profile['about'] ?? '');
 
 			$data['location'] = $profile['location'];
 			$data['tag_string'] = '';