X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FUserItem.php;h=0b0a4d2033273054d23a8dd8fc0324b4910a9faa;hb=33eda87bc45fe2b7cd9c001bd76cb0821bd9303e;hp=18409ff7c3727428ab8f0c4272691e27d681862d;hpb=6d7608fbc7c1f4cfce1752cdd04c1220ba77912f;p=friendica.git diff --git a/src/Model/UserItem.php b/src/Model/UserItem.php index 18409ff7c3..0b0a4d2033 100644 --- a/src/Model/UserItem.php +++ b/src/Model/UserItem.php @@ -1,7 +1,22 @@ . + * */ namespace Friendica\Model; @@ -22,6 +37,7 @@ 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; /** @@ -99,6 +115,10 @@ class UserItem $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; } @@ -259,6 +279,18 @@ class UserItem 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' => $item['uid'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => GRAVITY_PARENT]; + return Item::exists($condition); + } + /** * Check if the user had commented in this thread * @param array $item