Create notifications for shared posts

diff --git a/include/enotify.php b/include/enotify.php
index 6b3171dda6d6cd2102ae9035cbd746201602a79a..732c1d7b43c18e401f5cb31c494b3689780ec2a6 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -597,7 +597,7 @@ function check_item_notification($itemid, $uid, $notification_type) {
        $fields = ['id', 'uri-id', 'mention', 'parent', 'parent-uri-id', 'title', 'body',
                'author-link', 'author-name', 'author-avatar', 'author-id',
                'guid', 'parent-uri', 'uri', 'contact-id', 'network'];
-       $condition = ['id' => $itemid, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], 'deleted' => false];
+       $condition = ['id' => $itemid, 'deleted' => false];
        $item = Item::selectFirstForUser($uid, $fields, $condition);
        if (!DBA::isResult($item)) {
                return false;

diff --git a/src/Model/UserItem.php b/src/Model/UserItem.php
index afb13829df9bc18cd1a5ff2defe0705a93f99aec..0b542dee9f3196a7bfdc37517384227771802309 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,7 +51,8 @@ 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;
@@ -197,7 +199,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 +208,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)) {