Improved checks in "storeForUserByUriId" to reduce recursion depth

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 57e5b97bcd80f749839c58877f6130edae04890f..d506caaf6808501a6f4e11a8b34489eddefe0349 100644 (file)
--- a/src/Model/Item.php
+++ b/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,54 @@ 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])) {
-                       // Fetch the origin user for the post
-                       $origin_uid = self::GetOriginUidForUriId($item['thr-parent-id'], $uid);
-                       if (is_null($origin_uid)) {
-                               Logger::info('Origin item was not found', ['uid' => $uid, 'uri-id' => $item['thr-parent-id']]);
+               $causer = $item['causer-id'] ?: $item['author-id'];
+
+               if (($uri_id != $item['parent-uri-id']) && (($item['gravity'] == GRAVITY_COMMENT) || $is_reshare) && !Post::exists(['uri-id' => $item['parent-uri-id'], 'uid' => $uid])) {
+                       if (!self::fetchParent($item['parent-uri-id'], $uid, $causer)) {
+                               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'];
-                       $result = self::storeForUserByUriId($item['thr-parent-id'], $uid, ['causer-id' => $causer, 'post-reason' => self::PR_FETCHED], $origin_uid);
-                       Logger::info('Fetched thread parent', ['uri-id' => $item['thr-parent-id'], 'uid' => $uid, 'causer' => $causer, 'result' => $result]);
+               if (($item['thr-parent-id'] != $item['parent-uri-id']) && ($uri_id != $item['thr-parent-id']) && (($item['gravity'] == GRAVITY_COMMENT) || $is_reshare) && !Post::exists(['uri-id' => $item['thr-parent-id'], 'uid' => $uid])) {
+                       if (!self::fetchParent($item['parent-uri-id'], $uid, $causer)) {
+                               Logger::info('Thread parent had not been added', ['uri-id' => $item['parent-uri-id'], 'uid' => $uid, 'causer' => $causer]);
+                               return 0;
+                       }
+                       Logger::info('Fetched thread parent', ['uri-id' => $item['parent-uri-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 +1624,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 +1637,8 @@ class Item
                                        }
                                }
                        }
-                       Logger::info('Item already exists', ['uri-id' => $item['uri-id'], 'uid' => $uid]);
-                       return 0;
+                       Logger::info('Item already exists', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'id' => $post['id']]);
+                       return $post['id'];
                }
 
                // Data from the "post-user" table
@@ -2054,15 +2089,9 @@ class Item
                }
 
                if ($item['gravity'] == GRAVITY_PARENT) {
-                       $tags = Tag::getByURIId($item['uri-id'], [Tag::MENTION, Tag::EXCLUSIVE_MENTION]);
-                       foreach ($tags as $tag) {
-                               if (Strings::compareLink($owner['url'], $tag['url'])) {
-                                       $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) {
+                       if (Tag::isMentioned($item['uri-id'], $owner['url'])) {
+                               Logger::info('Mention found in tag.', ['uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
+                       } else {
                                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 +2101,9 @@ class Item
 
                        Hook::callAll('tagged', $arr);
                } else {
-                       $tags = Tag::getByURIId($item['parent-uri-id'], [Tag::MENTION, Tag::EXCLUSIVE_MENTION]);
-                       foreach ($tags as $tag) {
-                               if (Strings::compareLink($owner['url'], $tag['url'])) {
-                                       $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) {
+                       if (Tag::isMentioned($item['parent-uri-id'], $owner['url'])) {
+                               Logger::info('Mention found in parent tag.', ['uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
+                       } else {
                                Logger::debug('No mentions found in parent, quitting here.', ['id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
                                return false;
                        }

diff --git a/src/Model/Tag.php b/src/Model/Tag.php
index 2371d6af824d696563b49e1adf111acda198ae2f..9204dea2df3910e3c7356a3c1e43fba89afecabf 100644 (file)
--- a/src/Model/Tag.php
+++ b/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
         *