Merge pull request #8147 from annando/fetch-post

[friendica.git] / src / Model / UserItem.php

diff --git a/src/Model/UserItem.php b/src/Model/UserItem.php
index 03e7f51f644fac3b23d4fdc304ed00327280b3b4..43b0430aca1697417be3895930e2ec8be83aad06 100644 (file)
--- a/src/Model/UserItem.php
+++ b/src/Model/UserItem.php
@@ -22,10 +22,13 @@ class UserItem
        const NOTIF_DIRECT_COMMENT = 8;
        const NOTIF_COMMENT_PARTICIPATION = 16;
        const NOTIF_ACTIVITY_PARTICIPATION = 32;
+       const NOTIF_DIRECT_THREAD_COMMENT = 64;
        const NOTIF_SHARED = 128;
 
        /**
         * Checks an item for notifications and sets the "notification-type" field
+        * @ToDo:
+        * - Check for mentions in posts with "uid=0" where the user hadn't interacted before
         *
         * @param int $iid Item ID
         */
@@ -93,10 +96,14 @@ class UserItem
                        $notification_type = $notification_type | self::NOTIF_THREAD_COMMENT;
                }
 
-               if (self::checkDirectComment($item, $uid, $contacts)) {
+               if (self::checkDirectComment($item, $contacts)) {
                        $notification_type = $notification_type | self::NOTIF_DIRECT_COMMENT;
                }
 
+               if (self::checkDirectCommentedThread($item, $contacts)) {
+                       $notification_type = $notification_type | self::NOTIF_DIRECT_THREAD_COMMENT;
+               }
+
                if (self::checkCommentedParticipation($item, $contacts)) {
                        $notification_type = $notification_type | self::NOTIF_COMMENT_PARTICIPATION;
                }
@@ -148,10 +155,8 @@ class UserItem
 
                // Validate and add profile links
                foreach ($profiles AS $key => $profile) {
-                       // Check for invalid profile urls. 13 should be the shortest possible profile length:
-                       // http://a.bc/d
-                       // Additionally check for invalid urls that would return the normalised value "http:"
-                       if ((strlen($profile) < 13) || (Strings::normaliseLink($profile) == 'http:')) {
+                       // Check for invalid profile urls (without scheme, host or path) and remove them
+                       if (empty(parse_url($profile, PHP_URL_SCHEME)) || empty(parse_url($profile, PHP_URL_HOST)) || empty(parse_url($profile, PHP_URL_PATH))) {
                                unset($profiles[$key]);
                                continue;
                        }
@@ -250,13 +255,24 @@ class UserItem
        /**
         * Check for a direct comment to a post of the given user
         * @param array $item
-        * @param int   $uid  User ID
         * @param array $contacts Array of contact IDs
         * @return bool The item is a direct comment to a user comment
         */
-       private static function checkDirectComment(array $item, int $uid, array $contacts)
+       private static function checkDirectComment(array $item, array $contacts)
+       {
+               $condition = ['uri' => $item['thr-parent'], 'uid' => $item['uid'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => GRAVITY_COMMENT];
+               return Item::exists($condition);
+       }
+
+       /**
+        * Check for a direct comment to the starting post of the given user
+        * @param array $item
+        * @param array $contacts Array of contact IDs
+        * @return bool The user had created this thread
+        */
+       private static function checkDirectCommentedThread(array $item, array $contacts)
        {
-               $condition = ['uri' => $item['thr-parent'], 'uid' => [0, $uid], 'author-id' => $contacts, 'deleted' => false, 'gravity' => GRAVITY_COMMENT];
+               $condition = ['uri' => $item['thr-parent'], 'uid' => $item['uid'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => GRAVITY_PARENT];
                return Item::exists($condition);
        }