X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FPost%2FUserNotification.php;h=dd0bbbe1ecf0249379cfe585cbe089311e7e0978;hb=5f6503a73fabbd65b9ddb1de430b73f472c53dfe;hp=c8e31cdc03de541d6a9b1669ea8df77d61bdde10;hpb=2b95a7e7cd76c573b82b2dbcc5ad08b1501ee89b;p=friendica.git diff --git a/src/Model/Post/UserNotification.php b/src/Model/Post/UserNotification.php index c8e31cdc03..dd0bbbe1ec 100644 --- a/src/Model/Post/UserNotification.php +++ b/src/Model/Post/UserNotification.php @@ -1,6 +1,6 @@ truncateFieldsForTable('post-user-notification', $data); - // Additionally assign the key fields $fields['uri-id'] = $uri_id; - $fields['uid'] = $uid; + $fields['uid'] = $uid; return DBA::insert('post-user-notification', $fields, Database::INSERT_IGNORE); } @@ -81,15 +84,15 @@ class UserNotification * @param array $data * @param bool $insert_if_missing * @return bool - * @throws \Exception + * @throws Exception */ - public static function update(int $uri_id, int $uid, array $data = [], bool $insert_if_missing = false) + public static function update(int $uri_id, int $uid, array $data = [], bool $insert_if_missing = false): bool { if (empty($uri_id)) { throw new BadMethodCallException('Empty URI_id'); } - $fields = DBStructure::getFieldsForTable('post-user-notification', $data); + $fields = DI::dbaDefinition()->truncateFieldsForTable('post-user-notification', $data); // Remove the key fields unset($fields['uri-id']); @@ -105,36 +108,43 @@ class UserNotification /** * Delete a row from the post-user-notification table * - * @param array $conditions Field condition(s) - * @param array $options - * - cascade: If true we delete records in other tables that depend on the one we're deleting through + * @param array $conditions Field condition(s) + * @param array $options - cascade: If true we delete records in other tables that depend on the one we're deleting through * relations (default: true) * - * @return boolean was the delete successful? - * @throws \Exception + * @return boolean was the deletion successful? + * @throws Exception */ - public static function delete(array $conditions, array $options = []) + public static function delete(array $conditions, array $options = []): bool { return DBA::delete('post-user-notification', $conditions, $options); } /** * 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 $uri_id URI ID * @param int $uid user ID + * @throws Exception */ public static function setNotification(int $uri_id, int $uid) { $fields = ['id', 'uri-id', 'parent-uri-id', 'uid', 'body', 'parent', 'gravity', 'vid', 'gravity', - 'private', 'contact-id', 'thr-parent', 'thr-parent-id', 'parent-uri-id', 'parent-uri', 'author-id', 'verb']; - $item = Post::selectFirst($fields, ['uri-id' => $uri_id, 'uid' => $uid, 'origin' => false]); + 'contact-id', 'author-id', 'owner-id', 'causer-id', + 'private', 'thr-parent', 'thr-parent-id', 'parent-uri-id', 'parent-uri', 'verb']; + $item = Post::selectFirst($fields, ['uri-id' => $uri_id, 'uid' => $uid, 'origin' => false]); if (!DBA::isResult($item)) { return; } + $parent = Post::selectFirstPost(['author-id', 'owner-id', 'causer-id'], ['uri-id' => $item['parent-uri-id']]); + if (!DBA::isResult($parent)) { + return; + } + // "Activity::FOLLOW" is an automated activity, so we ignore it here if ($item['verb'] == Activity::FOLLOW) { return; @@ -157,28 +167,56 @@ class UserNotification DBA::close($users); foreach (array_unique($uids) as $uid) { - self::setNotificationForUser($item, $uid); + self::setNotificationForUser($item, $parent, $uid); } } /** * Checks an item for notifications for the given user and sets the "notification-type" field * - * @param array $item Item array - * @param int $uid User ID + * @param array $item Item array + * @param array $parent Parent item array + * @param int $uid User ID + * @throws HTTPException\InternalServerErrorException */ - private static function setNotificationForUser(array $item, int $uid) + private static function setNotificationForUser(array $item, array $parent, int $uid) { if (Post\ThreadUser::getIgnored($item['parent-uri-id'], $uid)) { return; } - $notification_type = self::NOTIF_NONE; + foreach (array_unique([$parent['author-id'], $parent['owner-id'], $parent['causer-id'], $item['author-id'], $item['owner-id'], $item['causer-id']]) as $author_id) { + if (empty($author_id)) { + continue; + } + if (Contact\User::isBlocked($author_id, $uid) || Contact\User::isIgnored($author_id, $uid) || Contact\User::isCollapsed($author_id, $uid)) { + Logger::debug('Author is blocked/ignored/collapsed by user', ['uid' => $uid, 'author' => $author_id, 'uri-id' => $item['uri-id']]); + return; + } + } + + $user = User::getById($uid, ['account-type', 'account_removed', 'account_expired']); + if (in_array($user['account-type'], [User::ACCOUNT_TYPE_COMMUNITY, User::ACCOUNT_TYPE_RELAY])) { + return; + } + + if ($user['account_removed'] || $user['account_expired']) { + return; + } + + $author = Contact::getById($item['author-id'], ['contact-type']); + if (empty($author)) { + return; + } + + $notification_type = self::TYPE_NONE; if (self::checkShared($item, $uid)) { - $notification_type = $notification_type | self::NOTIF_SHARED; - self::insertNoticationByItem(self::NOTIF_SHARED, $uid, $item); + $notification_type = $notification_type | self::TYPE_SHARED; + self::insertNotificationByItem(self::TYPE_SHARED, $uid, $item); $notified = true; + } elseif ($author['contact-type'] == Contact::TYPE_COMMUNITY) { + return; } else { $notified = false; } @@ -186,10 +224,16 @@ class UserNotification $profiles = self::getProfileForUser($uid); // Fetch all contacts for the given profiles - $contacts = []; - $ret = DBA::select('contact', ['id'], ['uid' => 0, 'nurl' => $profiles]); + $contacts = []; + $iscommunity = false; + + $ret = DBA::select('contact', ['id', 'contact-type'], ['uid' => 0, 'nurl' => $profiles]); while ($contact = DBA::fetch($ret)) { $contacts[] = $contact['id']; + + if ($contact['contact-type'] == Contact::TYPE_COMMUNITY) { + $iscommunity = true; + } } DBA::close($ret); @@ -198,64 +242,83 @@ class UserNotification return; } - if (self::checkExplicitMention($item, $profiles)) { - $notification_type = $notification_type | self::NOTIF_EXPLICIT_TAGGED; + if (($item['verb'] != Activity::ANNOUNCE) && self::checkExplicitMention($item, $profiles)) { + $notification_type = $notification_type | self::TYPE_EXPLICIT_TAGGED; if (!$notified) { - self::insertNoticationByItem( self::NOTIF_EXPLICIT_TAGGED, $uid, $item); + self::insertNotificationByItem(self::TYPE_EXPLICIT_TAGGED, $uid, $item); $notified = true; } } - if (self::checkImplicitMention($item, $profiles)) { - $notification_type = $notification_type | self::NOTIF_IMPLICIT_TAGGED; + if (($item['verb'] != Activity::ANNOUNCE) && self::checkImplicitMention($item, $profiles)) { + $notification_type = $notification_type | self::TYPE_IMPLICIT_TAGGED; if (!$notified) { - self::insertNoticationByItem(self::NOTIF_IMPLICIT_TAGGED, $uid, $item); + self::insertNotificationByItem(self::TYPE_IMPLICIT_TAGGED, $uid, $item); $notified = true; } } if (self::checkDirectComment($item, $contacts)) { - $notification_type = $notification_type | self::NOTIF_DIRECT_COMMENT; + $notification_type = $notification_type | self::TYPE_DIRECT_COMMENT; + if (!$notified) { + self::insertNotificationByItem(self::TYPE_DIRECT_COMMENT, $uid, $item); + $notified = true; + } + } + + if (!$iscommunity && self::checkDirectCommentedThread($item, $contacts)) { + $notification_type = $notification_type | self::TYPE_DIRECT_THREAD_COMMENT; if (!$notified) { - self::insertNoticationByItem(self::NOTIF_DIRECT_COMMENT, $uid, $item); + self::insertNotificationByItem(self::TYPE_DIRECT_THREAD_COMMENT, $uid, $item); $notified = true; } } - if (self::checkDirectCommentedThread($item, $contacts)) { - $notification_type = $notification_type | self::NOTIF_DIRECT_THREAD_COMMENT; + if (($item['verb'] != Activity::ANNOUNCE) && self::checkCommentedThread($item, $contacts)) { + $notification_type = $notification_type | self::TYPE_THREAD_COMMENT; if (!$notified) { - self::insertNoticationByItem(self::NOTIF_DIRECT_THREAD_COMMENT, $uid, $item); + self::insertNotificationByItem(self::TYPE_THREAD_COMMENT, $uid, $item); $notified = true; } } - if (self::checkCommentedThread($item, $contacts)) { - $notification_type = $notification_type | self::NOTIF_THREAD_COMMENT; + if (($item['verb'] != Activity::ANNOUNCE) && self::checkCommentedParticipation($item, $contacts)) { + $notification_type = $notification_type | self::TYPE_COMMENT_PARTICIPATION; if (!$notified) { - self::insertNoticationByItem(self::NOTIF_THREAD_COMMENT, $uid, $item); + self::insertNotificationByItem(self::TYPE_COMMENT_PARTICIPATION, $uid, $item); $notified = true; } } - if (self::checkCommentedParticipation($item, $contacts)) { - $notification_type = $notification_type | self::NOTIF_COMMENT_PARTICIPATION; + if (($item['verb'] != Activity::ANNOUNCE) && self::checkQuoted($item, $contacts)) { + $notification_type = $notification_type | self::TYPE_QUOTED; if (!$notified) { - self::insertNoticationByItem(self::NOTIF_COMMENT_PARTICIPATION, $uid, $item); + self::insertNotificationByItem(self::TYPE_QUOTED, $uid, $item); $notified = true; } } - if (self::checkActivityParticipation($item, $contacts)) { - $notification_type = $notification_type | self::NOTIF_ACTIVITY_PARTICIPATION; + if (($item['verb'] != Activity::ANNOUNCE) && self::checkFollowParticipation($item, $contacts)) { + $notification_type = $notification_type | self::TYPE_FOLLOW; if (!$notified) { - self::insertNoticationByItem(self::NOTIF_ACTIVITY_PARTICIPATION, $uid, $item); + self::insertNotificationByItem(self::TYPE_FOLLOW, $uid, $item); $notified = true; } } + if (($item['verb'] != Activity::ANNOUNCE) && self::checkActivityParticipation($item, $contacts)) { + $notification_type = $notification_type | self::TYPE_ACTIVITY_PARTICIPATION; + if (!$notified) { + self::insertNotificationByItem(self::TYPE_ACTIVITY_PARTICIPATION, $uid, $item); + } + } + + if (empty($notification_type)) { + return; + } + // Only create notifications for posts and comments, not for activities - if (empty($notification_type) || !in_array($item['gravity'], [GRAVITY_PARENT, GRAVITY_COMMENT])) { + if (($item['gravity'] == Item::GRAVITY_ACTIVITY) && ($item['verb'] != Activity::ANNOUNCE)) { return; } @@ -269,65 +332,71 @@ class UserNotification /** * Add a notification entry for a given item array * - * @param int $type User notification type - * @param int $uid User ID + * @param int $type User notification type + * @param int $uid User ID * @param array $item Item array - * @return boolean + * @return void + * @throws Exception */ - private static function insertNoticationByItem(int $type, int $uid, array $item) + private static function insertNotificationByItem(int $type, int $uid, array $item): void { - if (($item['gravity'] == GRAVITY_ACTIVITY) && - !in_array($type, [self::NOTIF_DIRECT_COMMENT, self::NOTIF_DIRECT_THREAD_COMMENT])) { + if (($item['verb'] != Activity::ANNOUNCE) && ($item['gravity'] == Item::GRAVITY_ACTIVITY) && + !in_array($type, [self::TYPE_DIRECT_COMMENT, self::TYPE_DIRECT_THREAD_COMMENT])) { // Activities are only stored when performed on the user's post or comment return; } - $fields = [ - 'uid' => $uid, - 'vid' => $item['vid'], - 'type' => $type, - 'actor-id' => $item['author-id'], - 'parent-uri-id' => $item['parent-uri-id'], - 'created' => DateTimeFormat::utcNow(), - ]; + $notification = DI::notificationFactory()->createForUser( + $uid, + $item['vid'], + $type, + $item['author-id'], + $item['gravity'] == Item::GRAVITY_ACTIVITY ? $item['thr-parent-id'] : $item['uri-id'], + $item['parent-uri-id'] + ); - if ($item['gravity'] == GRAVITY_ACTIVITY) { - $fields['target-uri-id'] = $item['thr-parent-id']; - } else { - $fields['target-uri-id'] = $item['uri-id']; - } + try { + $notification = DI::notification()->save($notification); + Subscription::pushByNotification($notification); + } catch (Exception $e) { - return DBA::insert('notification', $fields); + } } /** * Add a notification entry * - * @param int $actor Contact ID of the actor - * @param int $vid Verb ID - * @param int $uid User ID + * @param int $actor Public contact ID of the actor + * @param string $verb One of the Activity verb constant values + * @param int $uid User ID * @return boolean + * @throws Exception */ - public static function insertNotication(int $actor, int $vid, int $uid) + public static function insertNotification(int $actor, string $verb, int $uid): bool { - $fields = [ - 'uid' => $uid, - 'vid' => $vid, - 'type' => self::NOTIF_NONE, - 'actor-id' => $actor, - 'created' => DateTimeFormat::utcNow(), - ]; - - return DBA::insert('notification', $fields); + $notification = DI::notificationFactory()->createForRelationship( + $uid, + $actor, + $verb + ); + try { + $notification = DI::notification()->save($notification); + Subscription::pushByNotification($notification); + return true; + } catch (Exception $e) { + return false; + } } /** * Fetch all profiles (contact URL) of a given user + * * @param int $uid User ID * * @return array Profile links + * @throws HTTPException\InternalServerErrorException */ - private static function getProfileForUser(int $uid) + private static function getProfileForUser(int $uid): array { $notification_data = ['uid' => $uid, 'profiles' => []]; Hook::callAll('check_item_notification', $notification_data); @@ -350,11 +419,11 @@ class UserNotification // Now the alias $profiles[] = $owner['alias']; - // Notifications from Diaspora are often with an URL in the Diaspora format + // Notifications from Diaspora often have a URL in the Diaspora format $profiles[] = DI::baseUrl() . '/u/' . $user['nickname']; // Validate and add profile links - foreach ($profiles AS $key => $profile) { + 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]); @@ -362,11 +431,11 @@ class UserNotification } // Add the normalized form - $profile = Strings::normaliseLink($profile); + $profile = Strings::normaliseLink($profile); $profiles[] = $profile; // Add the SSL form - $profile = str_replace('http://', 'https://', $profile); + $profile = str_replace('http://', 'https://', $profile); $profiles[] = $profile; } @@ -375,47 +444,50 @@ class UserNotification /** * Check for a "shared" notification for every new post of contacts from the given user + * * @param array $item - * @param int $uid User ID + * @param int $uid User ID * @return bool A contact had shared something + * @throws Exception */ - private static function checkShared(array $item, int $uid) + private static function checkShared(array $item, int $uid): bool { // Only check on original posts and reshare ("announce") activities, otherwise return - if (($item['gravity'] != GRAVITY_PARENT) && ($item['verb'] != Activity::ANNOUNCE)) { + if (($item['gravity'] != Item::GRAVITY_PARENT) && ($item['verb'] != Activity::ANNOUNCE)) { return false; } - // Check if the contact posted or shared something directly - if (DBA::exists('contact', ['id' => $item['contact-id'], 'notify_new_posts' => true])) { - return true; + // Don't notify about reshares by communities of our own posts or each time someone comments + if (($item['verb'] == Activity::ANNOUNCE) && DBA::exists('contact', ['id' => $item['contact-id'], 'contact-type' => Contact::TYPE_COMMUNITY])) { + $post = Post::selectFirst(['origin', 'gravity'], ['uri-id' => $item['thr-parent-id'], 'uid' => $uid]); + if (!$post || $post['origin'] || ($post['gravity'] != Item::GRAVITY_PARENT)) { + return false; + } } - // The following check doesn't make sense on activities, so quit here - if ($item['verb'] == Activity::ANNOUNCE) { + // Only check on posts by the user itself + $cdata = Contact::getPublicAndUserContactID($item['contact-id'], $item['uid']); + if (empty($cdata['user']) || ($item['author-id'] != $cdata['public'])) { 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; - } + // Check if the contact posted or shared something directly + if (DBA::exists('contact', ['id' => $item['contact-id'], 'notify_new_posts' => true])) { + return true; } - DBA::close($tags); return false; } /** - * Check for an implicit mention (only tag, no body) of the given user + * Check for an implicit mention (only in tags, not in body) of the given user + * * @param array $item * @param array $profiles Profile links * @return bool The user is mentioned + * @throws Exception */ - private static function checkImplicitMention(array $item, array $profiles) + private static function checkImplicitMention(array $item, array $profiles): bool { $mentions = Tag::getByURIId($item['uri-id'], [Tag::IMPLICIT_MENTION]); foreach ($mentions as $mention) { @@ -431,11 +503,13 @@ class UserNotification /** * Check for an explicit mention (tag and body) of the given user + * * @param array $item * @param array $profiles Profile links * @return bool The user is mentioned + * @throws Exception */ - private static function checkExplicitMention(array $item, array $profiles) + private static function checkExplicitMention(array $item, array $profiles): bool { $mentions = Tag::getByURIId($item['uri-id'], [Tag::MENTION, Tag::EXCLUSIVE_MENTION]); foreach ($mentions as $mention) { @@ -451,61 +525,104 @@ class UserNotification /** * Check if the given user had created this thread + * * @param array $item * @param array $contacts Array of contact IDs * @return bool The user had created this thread + * @throws Exception */ - private static function checkCommentedThread(array $item, array $contacts) + private static function checkCommentedThread(array $item, array $contacts): bool { - $condition = ['parent' => $item['parent'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => GRAVITY_PARENT]; + $condition = ['parent' => $item['parent'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => Item::GRAVITY_PARENT]; return Post::exists($condition); } /** * Check for a direct comment to a post of the given user + * * @param array $item * @param array $contacts Array of contact IDs * @return bool The item is a direct comment to a user comment + * @throws Exception */ - private static function checkDirectComment(array $item, array $contacts) + private static function checkDirectComment(array $item, array $contacts): bool { - $condition = ['uri' => $item['thr-parent'], 'uid' => $item['uid'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => GRAVITY_COMMENT]; + $condition = ['uri' => $item['thr-parent'], 'uid' => $item['uid'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => Item::GRAVITY_COMMENT]; return Post::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 + * @throws Exception */ - private static function checkDirectCommentedThread(array $item, array $contacts) + private static function checkDirectCommentedThread(array $item, array $contacts): bool { - $condition = ['uri' => $item['thr-parent'], 'uid' => $item['uid'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => GRAVITY_PARENT]; + $condition = ['uri' => $item['thr-parent'], 'uid' => $item['uid'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => Item::GRAVITY_PARENT]; return Post::exists($condition); } /** * Check if the user had commented in this thread + * * @param array $item * @param array $contacts Array of contact IDs * @return bool The user had commented in the thread + * @throws Exception */ - private static function checkCommentedParticipation(array $item, array $contacts) + private static function checkCommentedParticipation(array $item, array $contacts): bool { - $condition = ['parent' => $item['parent'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => GRAVITY_COMMENT]; + $condition = ['parent' => $item['parent'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => Item::GRAVITY_COMMENT]; + return Post::exists($condition); + } + + /** + * Check if the user follows this thread + * + * @param array $item + * @param array $contacts Array of contact IDs + * @return bool The user follows the thread + * @throws Exception + */ + private static function checkFollowParticipation(array $item, array $contacts): bool + { + $condition = ['parent' => $item['parent'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => Item::GRAVITY_ACTIVITY, 'verb' => Activity::FOLLOW]; return Post::exists($condition); } /** * Check if the user had interacted in this thread (Like, Dislike, ...) + * * @param array $item * @param array $contacts Array of contact IDs * @return bool The user had interacted in the thread + * @throws Exception + */ + private static function checkActivityParticipation(array $item, array $contacts): bool + { + $condition = ['parent' => $item['parent'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => Item::GRAVITY_ACTIVITY]; + return Post::exists($condition); + } + + /** + * Check for a quoted post of a post of the given user + * + * @param array $item + * @param array $contacts Array of contact IDs + * @return bool The item is a quoted post of a user's post or comment + * @throws Exception */ - private static function checkActivityParticipation(array $item, array $contacts) + private static function checkQuoted(array $item, array $contacts): bool { - $condition = ['parent' => $item['parent'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => GRAVITY_ACTIVITY]; + if (empty($item['quote-uri-id'])) { + return false; + } + $condition = ['uri-id' => $item['quote-uri-id'], 'uid' => $item['uid'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => [item::GRAVITY_PARENT, Item::GRAVITY_COMMENT]]; return Post::exists($condition); } + + }