Funkwhale context file moved

[friendica.git] / src / Model / Post / UserNotification.php

diff --git a/src/Model/Post/UserNotification.php b/src/Model/Post/UserNotification.php
index 0873646a41bd59c385f82a145199d64d9b85f252..4a57ff6ff56f35e84eafea95877dde01a5ffd4f5 100644 (file)
--- a/src/Model/Post/UserNotification.php
+++ b/src/Model/Post/UserNotification.php
@@ -34,7 +34,6 @@ 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;
@@ -51,6 +50,7 @@ class UserNotification
        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
@@ -67,7 +67,7 @@ class UserNotification
                        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;
@@ -91,7 +91,7 @@ class UserNotification
                        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']);
@@ -220,7 +220,7 @@ class UserNotification
                        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);
@@ -228,7 +228,7 @@ class UserNotification
                        }
                }
 
-               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);
@@ -252,7 +252,7 @@ class UserNotification
                        }
                }
 
-               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);
@@ -260,7 +260,7 @@ class UserNotification
                        }
                }
 
-               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);
@@ -268,7 +268,15 @@ class UserNotification
                        }
                }
 
-               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);
@@ -308,7 +316,7 @@ class UserNotification
                        return;
                }
 
-               $notification = (new Notifications\Factory\Notification(DI::baseUrl(), DI::l10n(), DI::localRelationship(), DI::logger()))->createForUser(
+               $notification = DI::notificationFactory()->createForUser(
                        $uid,
                        $item['vid'],
                        $type,
@@ -336,7 +344,7 @@ class UserNotification
         */
        public static function insertNotification(int $actor, string $verb, int $uid): bool
        {
-               $notification = (new Notifications\Factory\Notification(DI::baseUrl(), DI::l10n(), DI::localRelationship(), DI::logger()))->createForRelationship(
+               $notification = DI::notificationFactory()->createForRelationship(
                        $uid,
                        $actor,
                        $verb
@@ -535,6 +543,20 @@ class UserNotification
                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' => GRAVITY_ACTIVITY, 'verb' => Activity::FOLLOW];
+               return Post::exists($condition);
+       }
+
        /**
         * Check if the user had interacted in this thread (Like, Dislike, ...)
         *