X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FUserItem.php;h=b7dfec4b1228afaa4dfe722f36b0a28ad1fe8183;hb=93380b8471164a8ed5d1d46e94d53bf37fe87cee;hp=029e7afb629f77e9de118d0c8185d7a6ca867d87;hpb=fe1a702e8c3cb1003927e2d7a3d1683fb8eca762;p=friendica.git diff --git a/src/Model/UserItem.php b/src/Model/UserItem.php index 029e7afb62..b7dfec4b12 100644 --- a/src/Model/UserItem.php +++ b/src/Model/UserItem.php @@ -1,7 +1,22 @@ . + * */ namespace Friendica\Model; @@ -11,6 +26,8 @@ use Friendica\Core\Hook; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Util\Strings; +use Friendica\Model\Tag; +use Friendica\Protocol\Activity; class UserItem { @@ -22,30 +39,50 @@ 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 */ public static function setNotification(int $iid) { - $fields = ['id', 'uid', 'body', 'parent', 'gravity', 'tag', 'contact-id', - 'thr-parent', 'parent-uri', 'mention']; + $fields = ['id', 'uri-id', 'parent-uri-id', 'uid', 'body', 'parent', 'gravity', 'tag', + 'private', 'contact-id', 'thr-parent', 'parent-uri', 'author-id', 'verb']; $item = Item::selectFirst($fields, ['id' => $iid, 'origin' => false]); if (!DBA::isResult($item)) { return; } - // fetch all users in the thread + // "Activity::FOLLOW" is an automated activity, so we ignore it here + if ($item['verb'] == Activity::FOLLOW) { + return; + } + + if ($item['uid'] == 0) { + $uids = []; + } else { + // Always include the item user + $uids = [$item['uid']]; + } + + // Add every user who participated so far in this thread + // This can only happen with participations on global items. (means: uid = 0) $users = DBA::p("SELECT DISTINCT(`contact`.`uid`) FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` != 0 WHERE `parent` IN (SELECT `parent` FROM `item` WHERE `id`=?)", $iid); while ($user = DBA::fetch($users)) { - self::setNotificationForUser($item, $user['uid']); + $uids[] = $user['uid']; } DBA::close($users); + + foreach (array_unique($uids) as $uid) { + self::setNotificationForUser($item, $uid); + } } /** @@ -56,9 +93,8 @@ class UserItem */ private static function setNotificationForUser(array $item, int $uid) { - $fields = ['ignored', 'mention']; - $thread = Item::selectFirstThreadForUser($uid, $fields, ['iid' => $item['parent'], 'deleted' => false]); - if ($thread['ignored']) { + $thread = Item::selectFirstThreadForUser($uid, ['ignored'], ['iid' => $item['parent'], 'deleted' => false]); + if (!empty($thread['ignored'])) { return; } @@ -70,14 +106,6 @@ class UserItem $profiles = self::getProfileForUser($uid); - if (self::checkImplicitMention($item, $uid, $profiles)) { - $notification_type = $notification_type | self::NOTIF_IMPLICIT_TAGGED; - } - - if (self::checkExplicitMention($item, $uid, $profiles)) { - $notification_type = $notification_type | self::NOTIF_EXPLICIT_TAGGED; - } - // Fetch all contacts for the given profiles $contacts = []; $ret = DBA::select('contact', ['id'], ['uid' => 0, 'nurl' => $profiles]); @@ -86,20 +114,40 @@ class UserItem } DBA::close($ret); - if (self::checkCommentedThread($item, $uid, $contacts)) { - $notification_type = $notification_type | self::NOTIF_THREAD_COMMENT; + // Don't create notifications for user's posts + if (in_array($item['author-id'], $contacts)) { + return; } - if (self::checkDirectComment($item, $uid, $contacts, $thread)) { - $notification_type = $notification_type | self::NOTIF_DIRECT_COMMENT; - } + // Only create notifications for posts and comments, not for activities + if (in_array($item['gravity'], [GRAVITY_PARENT, GRAVITY_COMMENT])) { + if (self::checkImplicitMention($item, $profiles)) { + $notification_type = $notification_type | self::NOTIF_IMPLICIT_TAGGED; + } - if (self::checkCommentedParticipation($item, $contacts)) { - $notification_type = $notification_type | self::NOTIF_COMMENT_PARTICIPATION; - } + if (self::checkExplicitMention($item, $profiles)) { + $notification_type = $notification_type | self::NOTIF_EXPLICIT_TAGGED; + } + + if (self::checkCommentedThread($item, $contacts)) { + $notification_type = $notification_type | self::NOTIF_THREAD_COMMENT; + } + + 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::checkActivityParticipation($item, $contacts)) { - $notification_type = $notification_type | self::NOTIF_ACTIVITY_PARTICIPATION; + if (self::checkCommentedParticipation($item, $contacts)) { + $notification_type = $notification_type | self::NOTIF_COMMENT_PARTICIPATION; + } + + if (self::checkActivityParticipation($item, $contacts)) { + $notification_type = $notification_type | self::NOTIF_ACTIVITY_PARTICIPATION; + } } if (empty($notification_type)) { @@ -115,9 +163,9 @@ class UserItem * Fetch all profiles (contact URL) of a given user * @param int $uid User ID * - * @return array Profiles + * @return array Profile links */ - private static function getProfileForUser($uid) + private static function getProfileForUser(int $uid) { $notification_data = ['uid' => $uid, 'profiles' => []]; Hook::callAll('check_item_notification', $notification_data); @@ -129,7 +177,7 @@ class UserItem return []; } - $owner = DBA::selectFirst('contact', ['url'], ['self' => true, 'uid' => $uid]); + $owner = DBA::selectFirst('contact', ['url', 'alias'], ['self' => true, 'uid' => $uid]); if (!DBA::isResult($owner)) { return []; } @@ -137,30 +185,30 @@ class UserItem // This is our regular URL format $profiles[] = $owner['url']; - // Notifications from Diaspora are often with an URL in the Diaspora format - $profiles[] = DI::baseUrl().'/u/'.$user['nickname']; - - $profiles2 = []; + // Now the alias + $profiles[] = $owner['alias']; - foreach ($profiles AS $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:')) { - if (!in_array($profile, $profiles2)) - $profiles2[] = $profile; + // Notifications from Diaspora are often with an URL in the Diaspora format + $profiles[] = DI::baseUrl() . '/u/' . $user['nickname']; + + // Validate and add profile links + foreach ($profiles AS $key => $profile) { + // 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; + } - $profile = Strings::normaliseLink($profile); - if (!in_array($profile, $profiles2)) - $profiles2[] = $profile; + // Add the normalized form + $profile = Strings::normaliseLink($profile); + $profiles[] = $profile; - $profile = str_replace('http://', 'https://', $profile); - if (!in_array($profile, $profiles2)) - $profiles2[] = $profile; - } + // Add the SSL form + $profile = str_replace('http://', 'https://', $profile); + $profiles[] = $profile; } - return $profiles2; + return array_unique($profiles); } /** @@ -169,25 +217,32 @@ class UserItem * @param int $uid User ID * @return bool A contact had shared something */ - private static function checkShared($item, $uid) + private static function checkShared(array $item, int $uid) { - if ($item['gravity'] != GRAVITY_PARENT) { + // Only check on original posts and reshare ("announce") activities, otherwise return + if (($item['gravity'] != GRAVITY_PARENT) && ($item['verb'] != Activity::ANNOUNCE)) { return false; } - // Either the contact had posted something directly + // Check if the contact posted or shared something directly if (DBA::exists('contact', ['id' => $item['contact-id'], 'notify_new_posts' => true])) { return true; } - // Or the contact is a mentioned forum - $tags = DBA::select('term', ['url'], ['otype' => TERM_OBJ_POST, 'oid' => $item['id'], 'type' => TERM_MENTION, 'uid' => $uid]); + // The following check doesn't make sense on activities, so quit here + if ($item['verb'] == Activity::ANNOUNCE) { + return false; + } + + // Check if the contact is a mentioned forum + $tags = DBA::select('tag-view', ['url'], ['uri-id' => $item['uri-id'], 'type' => [Tag::MENTION, Tag::EXCLUSIVE_MENTION]]); while ($tag = DBA::fetch($tags)) { $condition = ['nurl' => Strings::normaliseLink($tag['url']), 'uid' => $uid, 'notify_new_posts' => true, 'contact-type' => Contact::TYPE_COMMUNITY]; if (DBA::exists('contact', $condition)) { return true; } } + DBA::close($tags); return false; } @@ -195,14 +250,15 @@ class UserItem /** * Check for an implicit mention (only tag, no body) of the given user * @param array $item - * @param int $uid User ID + * @param array $profiles Profile links * @return bool The user is mentioned */ - private static function checkImplicitMention($item, $uid, $profiles) + private static function checkImplicitMention(array $item, array $profiles) { - foreach ($profiles AS $profile) { - if (strpos($item['tag'], '='.$profile.']') || strpos($item['body'], '='.$profile.']')) { - if (strpos($item['body'], $profile) === false) { + $mentions = Tag::getByURIId($item['uri-id'], [Tag::IMPLICIT_MENTION]); + foreach ($mentions as $mention) { + foreach ($profiles as $profile) { + if (Strings::compareLink($profile, $mention['url'])) { return true; } } @@ -214,14 +270,15 @@ class UserItem /** * Check for an explicit mention (tag and body) of the given user * @param array $item - * @param int $uid User ID + * @param array $profiles Profile links * @return bool The user is mentioned */ - private static function checkExplicitMention($item, $uid, $profiles) + private static function checkExplicitMention(array $item, array $profiles) { - foreach ($profiles AS $profile) { - if (strpos($item['tag'], '='.$profile.']') || strpos($item['body'], '='.$profile.']')) { - if (!(strpos($item['body'], $profile) === false)) { + $mentions = Tag::getByURIId($item['uri-id'], [Tag::MENTION, Tag::EXCLUSIVE_MENTION]); + foreach ($mentions as $mention) { + foreach ($profiles as $profile) { + if (Strings::compareLink($profile, $mention['url'])) { return true; } } @@ -233,10 +290,10 @@ class UserItem /** * Check if the given user had created this thread * @param array $item - * @param int $uid User ID + * @param array $contacts Array of contact IDs * @return bool The user had created this thread */ - private static function checkCommentedThread($item, $uid, $contacts) + private static function checkCommentedThread(array $item, array $contacts) { $condition = ['parent' => $item['parent'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => GRAVITY_PARENT]; return Item::exists($condition); @@ -245,23 +302,34 @@ 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 contacts + * @param array $contacts Array of contact IDs * @return bool The item is a direct comment to a user comment */ - private static function checkDirectComment($item, $uid, $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); } /** * Check if the user had commented in this thread * @param array $item - * @param array $contacts Array of contacts + * @param array $contacts Array of contact IDs * @return bool The user had commented in the thread */ - private static function checkCommentedParticipation($item, $contacts) + private static function checkCommentedParticipation(array $item, array $contacts) { $condition = ['parent' => $item['parent'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => GRAVITY_COMMENT]; return Item::exists($condition); @@ -270,10 +338,10 @@ class UserItem /** * Check if the user had interacted in this thread (Like, Dislike, ...) * @param array $item - * @param array $contacts Array of contacts + * @param array $contacts Array of contact IDs * @return bool The user had interacted in the thread */ - private static function checkActivityParticipation($item, $contacts) + private static function checkActivityParticipation(array $item, array $contacts) { $condition = ['parent' => $item['parent'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => GRAVITY_ACTIVITY]; return Item::exists($condition);