<?php
/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use Friendica\Model\Post;
use Friendica\Model\Subscription;
use Friendica\Model\Tag;
+use Friendica\Model\User;
+use Friendica\Navigation\Notifications;
use Friendica\Network\HTTPException;
use Friendica\Protocol\Activity;
-use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings;
class UserNotification
return;
}
+ $user = User::getById($uid, ['account-type']);
+ if (in_array($user['account-type'], [User::ACCOUNT_TYPE_COMMUNITY, User::ACCOUNT_TYPE_RELAY])) {
+ 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::TYPE_SHARED;
self::insertNotificationByItem(self::TYPE_SHARED, $uid, $item);
$notified = true;
+ } elseif ($author['contact-type'] == Contact::TYPE_COMMUNITY) {
+ return;
} else {
$notified = false;
}
$profiles = self::getProfileForUser($uid);
// Fetch all contacts for the given profiles
- $contacts = [];
+ $contacts = [];
+ $iscommunity = false;
- $ret = DBA::select('contact', ['id'], ['uid' => 0, 'nurl' => $profiles]);
+ $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);
return;
}
- if (self::checkExplicitMention($item, $profiles)) {
+ if (($item['verb'] != Activity::ANNOUNCE) && self::checkExplicitMention($item, $profiles)) {
$notification_type = $notification_type | self::TYPE_EXPLICIT_TAGGED;
if (!$notified) {
self::insertNotificationByItem(self::TYPE_EXPLICIT_TAGGED, $uid, $item);
}
}
- if (self::checkImplicitMention($item, $profiles)) {
+ if (($item['verb'] != Activity::ANNOUNCE) && self::checkImplicitMention($item, $profiles)) {
$notification_type = $notification_type | self::TYPE_IMPLICIT_TAGGED;
if (!$notified) {
self::insertNotificationByItem(self::TYPE_IMPLICIT_TAGGED, $uid, $item);
}
}
- if (self::checkDirectCommentedThread($item, $contacts)) {
+ if (!$iscommunity && self::checkDirectCommentedThread($item, $contacts)) {
$notification_type = $notification_type | self::TYPE_DIRECT_THREAD_COMMENT;
if (!$notified) {
self::insertNotificationByItem(self::TYPE_DIRECT_THREAD_COMMENT, $uid, $item);
}
}
- if (self::checkCommentedThread($item, $contacts)) {
+ if (($item['verb'] != Activity::ANNOUNCE) && self::checkCommentedThread($item, $contacts)) {
$notification_type = $notification_type | self::TYPE_THREAD_COMMENT;
if (!$notified) {
self::insertNotificationByItem(self::TYPE_THREAD_COMMENT, $uid, $item);
}
}
- if (self::checkCommentedParticipation($item, $contacts)) {
+ if (($item['verb'] != Activity::ANNOUNCE) && self::checkCommentedParticipation($item, $contacts)) {
$notification_type = $notification_type | self::TYPE_COMMENT_PARTICIPATION;
if (!$notified) {
self::insertNotificationByItem(self::TYPE_COMMENT_PARTICIPATION, $uid, $item);
}
}
- if (self::checkActivityParticipation($item, $contacts)) {
+ 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'] == GRAVITY_ACTIVITY) && ($item['verb'] != Activity::ANNOUNCE)) {
return;
}
*/
private static function insertNotificationByItem(int $type, int $uid, array $item): void
{
- if (($item['gravity'] == GRAVITY_ACTIVITY) &&
+ if (($item['verb'] != Activity::ANNOUNCE) && ($item['gravity'] == 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 = (new Notifications\Factory\Notification(DI::baseUrl(), DI::l10n(), DI::localRelationship(), DI::logger()))->createForUser(
+ $uid,
+ $item['vid'],
+ $type,
+ $item['author-id'],
+ $item['gravity'] == 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) {
- if (DBA::insert('notification', $fields, Database::INSERT_IGNORE)) {
- $id = DBA::lastInsertId();
- if (!empty($id)) {
- Subscription::pushByNotificationId($id);
- }
}
}
/**
* 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 insertNotification(int $actor, int $vid, int $uid): bool
+ public static function insertNotification(int $actor, string $verb, int $uid): bool
{
- $fields = [
- 'uid' => $uid,
- 'vid' => $vid,
- 'type' => self::TYPE_NONE,
- 'actor-id' => $actor,
- 'created' => DateTimeFormat::utcNow(),
- ];
-
- $ret = DBA::insert('notification', $fields, Database::INSERT_IGNORE);
- if ($ret) {
- $id = DBA::lastInsertId();
- if (!empty($id)) {
- Subscription::pushByNotificationId($id);
- }
+ $notification = (new Notifications\Factory\Notification(DI::baseUrl(), DI::l10n(), DI::localRelationship(), DI::logger()))->createForRelationship(
+ $uid,
+ $actor,
+ $verb
+ );
+ try {
+ $notification = DI::notification()->save($notification);
+ Subscription::pushByNotification($notification);
+ return true;
+ } catch (Exception $e) {
+ return false;
}
- return $ret;
}
/**
return false;
}
+ // 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['origin'] || ($post['gravity'] != GRAVITY_PARENT)) {
+ 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;
}
- // 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;
}
projects / friendica.git / blobdiff