Don't create notifications for activities

[friendica.git] / src / Model / UserItem.php

diff --git a/src/Model/UserItem.php b/src/Model/UserItem.php
index 89dbafed82ecb54df5f7b39851c814cf9d534f39..1680dd2727219e52b0141561f26e10a9b11ff973 100644 (file)
--- a/src/Model/UserItem.php
+++ b/src/Model/UserItem.php
@@ -27,6 +27,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Util\Strings;
 use Friendica\Model\Tag;
+use Friendica\Protocol\Activity;
 
 class UserItem
 {
@@ -50,12 +51,18 @@ class UserItem
         */
        public static function setNotification(int $iid)
        {
-               $fields = ['id', 'uri-id', 'uid', 'body', 'parent', 'gravity', 'tag', 'contact-id', 'thr-parent', 'parent-uri', 'author-id'];
+               $fields = ['id', 'uri-id', 'uid', 'body', 'parent', 'gravity', 'tag',
+                       'contact-id', 'thr-parent', 'parent-uri', 'author-id', 'verb'];
                $item = Item::selectFirst($fields, ['id' => $iid, 'origin' => false]);
                if (!DBA::isResult($item)) {
                        return;
                }
 
+               // "Activity::FOLLOW" is an automated activity, so we ignore it here
+               if ($item['verb'] == Activity::FOLLOW) {
+                       return;
+               }
+
                // fetch all users in the thread
                $users = DBA::p("SELECT DISTINCT(`contact`.`uid`) FROM `item`
                        INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` != 0
@@ -75,7 +82,7 @@ class UserItem
        private static function setNotificationForUser(array $item, int $uid)
        {
                $thread = Item::selectFirstThreadForUser($uid, ['ignored'], ['iid' => $item['parent'], 'deleted' => false]);
-               if ($thread['ignored']) {
+               if (!empty($thread['ignored'])) {
                        return;
                }
 
@@ -100,32 +107,35 @@ class UserItem
                        return;
                }
 
-               if (self::checkImplicitMention($item, $profiles)) {
-                       $notification_type = $notification_type | self::NOTIF_IMPLICIT_TAGGED;
-               }
+               // Only create notifications for posts and comments, not for activities
+               if (in_array($item['gravity'], [GRAVITY_PARENT, GRAVITY_COMMENT])) {
+                       if (self::checkImplicitMention($item, $profiles)) {
+                               $notification_type = $notification_type | self::NOTIF_IMPLICIT_TAGGED;
+                       }
 
-               if (self::checkExplicitMention($item, $profiles)) {
-                       $notification_type = $notification_type | self::NOTIF_EXPLICIT_TAGGED;
-               }
+                       if (self::checkExplicitMention($item, $profiles)) {
+                               $notification_type = $notification_type | self::NOTIF_EXPLICIT_TAGGED;
+                       }
 
-               if (self::checkCommentedThread($item, $contacts)) {
-                       $notification_type = $notification_type | self::NOTIF_THREAD_COMMENT;
-               }
+                       if (self::checkCommentedThread($item, $contacts)) {
+                               $notification_type = $notification_type | self::NOTIF_THREAD_COMMENT;
+                       }
 
-               if (self::checkDirectComment($item, $contacts)) {
-                       $notification_type = $notification_type | self::NOTIF_DIRECT_COMMENT;
-               }
+                       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::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;
-               }
+                       if (self::checkCommentedParticipation($item, $contacts)) {
+                               $notification_type = $notification_type | self::NOTIF_COMMENT_PARTICIPATION;
+                       }
 
-               if (self::checkActivityParticipation($item, $contacts)) {
-                       $notification_type = $notification_type | self::NOTIF_ACTIVITY_PARTICIPATION;
+                       if (self::checkActivityParticipation($item, $contacts)) {
+                               $notification_type = $notification_type | self::NOTIF_ACTIVITY_PARTICIPATION;
+                       }
                }
 
                if (empty($notification_type)) {
@@ -197,7 +207,7 @@ class UserItem
         */
        private static function checkShared(array $item, int $uid)
        {
-               if ($item['gravity'] != GRAVITY_PARENT) {
+               if (($item['gravity'] != GRAVITY_PARENT) && ($item['verb'] != Activity::ANNOUNCE)) {
                        return false;
                }
 
@@ -206,6 +216,10 @@ class UserItem
                        return true;
                }
 
+               if ($item['gravity'] != GRAVITY_PARENT) {
+                       return false;
+               }
+
                // Or 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)) {