use Friendica\Database\DBStructure;
use Friendica\DI;
use Friendica\Model\Contact;
+use Friendica\Model\Item;
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\Strings;
const TYPE_ACTIVITY_PARTICIPATION = 32;
const TYPE_DIRECT_THREAD_COMMENT = 64;
const TYPE_SHARED = 128;
+ const TYPE_FOLLOW = 256;
/**
* Insert a new user notification entry
throw new BadMethodCallException('Empty URI_id');
}
- $fields = DBStructure::getFieldsForTable('post-user-notification', $data);
+ $fields = DI::dbaDefinition()->truncateFieldsForTable('post-user-notification', $data);
$fields['uri-id'] = $uri_id;
$fields['uid'] = $uid;
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']);
return;
}
- $user = User::getById($uid, ['account-type']);
+ $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 = $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;
}
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::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::checkFollowParticipation($item, $contacts)) {
+ $notification_type = $notification_type | self::TYPE_FOLLOW;
+ if (!$notified) {
+ 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);
}
// Only create notifications for posts and comments, not for activities
- if (($item['gravity'] == GRAVITY_ACTIVITY) && ($item['verb'] != Activity::ANNOUNCE)) {
+ if (($item['gravity'] == Item::GRAVITY_ACTIVITY) && ($item['verb'] != Activity::ANNOUNCE)) {
return;
}
*/
private static function insertNotificationByItem(int $type, int $uid, array $item): void
{
- if (($item['verb'] != Activity::ANNOUNCE) && ($item['gravity'] == GRAVITY_ACTIVITY) &&
+ 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;
}
- $notification = (new Notifications\Factory\Notification(DI::logger()))->createForUser(
+ $notification = DI::notificationFactory()->createForUser(
$uid,
$item['vid'],
$type,
$item['author-id'],
- $item['gravity'] == GRAVITY_ACTIVITY ? $item['thr-parent-id'] : $item['uri-id'],
+ $item['gravity'] == Item::GRAVITY_ACTIVITY ? $item['thr-parent-id'] : $item['uri-id'],
$item['parent-uri-id']
);
/**
* Add a notification entry
*
- * @param int $actor Contact ID of the actor
+ * @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
*/
public static function insertNotification(int $actor, string $verb, int $uid): bool
{
- $notification = (new Notifications\Factory\Notification(DI::logger()))->createForRelationship(
+ $notification = DI::notificationFactory()->createForRelationship(
$uid,
$actor,
$verb
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;
}
+ // 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'] != Item::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;
*/
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);
}
*/
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);
}
*/
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);
}
*/
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);
}
*/
private static function checkActivityParticipation(array $item, array $contacts): bool
{
- $condition = ['parent' => $item['parent'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => GRAVITY_ACTIVITY];
+ $condition = ['parent' => $item['parent'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => Item::GRAVITY_ACTIVITY];
return Post::exists($condition);
}
}