<?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
*/
$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;
}
$notification_data = ['uid' => $uid, 'profiles' => []];
Hook::callAll('check_item_notification', $notification_data);
- $raw_profiles = $notification_data['profiles'];
+ $profiles = $notification_data['profiles'];
$user = DBA::selectFirst('user', ['nickname'], ['uid' => $uid]);
if (!DBA::isResult($user)) {
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
- $raw_profiles[] = $owner['url'];
+ $profiles[] = $owner['url'];
- // Notifications from Diaspora are often with an URL in the Diaspora format
- $raw_profiles[] = DI::baseUrl() . '/u/' . $user['nickname'];
+ // Now the alias
+ $profiles[] = $owner['alias'];
- $profiles = [];
+ // Notifications from Diaspora are often with an URL in the Diaspora format
+ $profiles[] = DI::baseUrl() . '/u/' . $user['nickname'];
// Validate and add profile links
- foreach ($raw_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:')) {
+ 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;
}
- // Add the profile
- $profiles[] = $profile;
-
// Add the normalized form
$profile = Strings::normaliseLink($profile);
$profiles[] = $profile;
/**
* 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);
}