<?php
-
/**
- * @file src/Model/UserItem.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
*/
namespace Friendica\Model;
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', 'author-id'];
+ $fields = ['id', 'uid', 'body', 'parent', 'gravity', 'tag', 'contact-id', 'thr-parent', 'parent-uri', 'author-id'];
$item = Item::selectFirst($fields, ['id' => $iid, 'origin' => false]);
if (!DBA::isResult($item)) {
return;
$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;
}
* 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);
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 [];
}
// This is our regular URL format
$profiles[] = $owner['url'];
+ // Now the alias
+ $profiles[] = $owner['alias'];
+
// Notifications from Diaspora are often with an URL in the Diaspora format
- $profiles[] = DI::baseUrl().'/u/'.$user['nickname'];
+ $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;
+ }
- $profiles2 = [];
+ // Add the normalized form
+ $profile = Strings::normaliseLink($profile);
+ $profiles[] = $profile;
- 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;
-
- $profile = Strings::normaliseLink($profile);
- if (!in_array($profile, $profiles2))
- $profiles2[] = $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);
}
/**
* @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) {
return false;
/**
* Check for an implicit mention (only tag, no body) of the given user
* @param array $item
+ * @param array $profiles Profile links
* @return bool The user is mentioned
*/
- private static function checkImplicitMention($item, $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['tag'], '=' . $profile.']') || strpos($item['body'], '=' . $profile . ']')) {
if (strpos($item['body'], $profile) === false) {
return true;
}
/**
* 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
*/
- private static function checkExplicitMention($item, $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['tag'], '=' . $profile.']') || strpos($item['body'], '=' . $profile . ']')) {
if (!(strpos($item['body'], $profile) === false)) {
return true;
}
/**
* 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
*/
- private static function checkCommentedThread($item, $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);
/**
* 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);
/**
* 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);
projects / friendica.git / blobdiff