Don't cache local avatars

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

diff --git a/src/Model/Post/UserNotification.php b/src/Model/Post/UserNotification.php
index 065cba44ca706f72f3e034a2b4b6eee64fda54d8..ad7b9c4904b4cb616175e9562b3baedfb9d61d1d 100644 (file)
--- a/src/Model/Post/UserNotification.php
+++ b/src/Model/Post/UserNotification.php
@@ -1,6 +1,6 @@
 <?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
  *
@@ -33,9 +33,9 @@ use Friendica\Model\Contact;
 use Friendica\Model\Post;
 use Friendica\Model\Subscription;
 use Friendica\Model\Tag;
+use Friendica\Navigation\Notifications;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\Activity;
-use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 
 class UserNotification
@@ -257,8 +257,12 @@ class UserNotification
                        }
                }
 
+               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;
                }
 
@@ -280,62 +284,52 @@ class UserNotification
         */
        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(),
-               ];
-
-               if ($item['gravity'] == GRAVITY_ACTIVITY) {
-                       $fields['target-uri-id'] = $item['thr-parent-id'];
-               } else {
-                       $fields['target-uri-id'] = $item['uri-id'];
-               }
+               $notification = (new Notifications\Factory\Notification(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']
+               );
+
+               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 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::logger()))->createForRelationship(
+                       $uid,
+                       $actor,
+                       $verb
+               );
+               try {
+                       $notification = DI::notification()->save($notification);
+                       Subscription::pushByNotification($notification);
+                       return true;
+               } catch (Exception $e) {
+                       return false;
                }
-               return $ret;
        }
 
        /**
@@ -412,21 +406,6 @@ class UserNotification
                        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;
        }