Rename Repository\Notify->NotifyOnDesktop to shouldShowOnDesktop

[friendica.git] / src / Navigation / Notifications / Repository / Notification.php

diff --git a/src/Navigation/Notifications/Repository/Notification.php b/src/Navigation/Notifications/Repository/Notification.php
index 60ac82ae31817c1faa5fc050ceace9b750134b04..a9630464aa576113a64d987a749f4386baf417e2 100644 (file)
--- a/src/Navigation/Notifications/Repository/Notification.php
+++ b/src/Navigation/Notifications/Repository/Notification.php
@@ -24,8 +24,10 @@ namespace Friendica\Navigation\Notifications\Repository;
 use Exception;
 use Friendica\BaseCollection;
 use Friendica\BaseRepository;
+use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
+use Friendica\Model\Post\UserNotification;
 use Friendica\Model\Verb;
 use Friendica\Navigation\Notifications\Collection;
 use Friendica\Navigation\Notifications\Entity;
@@ -41,9 +43,14 @@ class Notification extends BaseRepository
 
        protected static $table_name = 'notification';
 
-       public function __construct(Database $database, LoggerInterface $logger, Factory\Notification $factory)
+       /** @var IManagePersonalConfigValues */
+       private $pconfig;
+
+       public function __construct(IManagePersonalConfigValues $pconfig, Database $database, LoggerInterface $logger, Factory\Notification $factory)
        {
                parent::__construct($database, $logger, $factory);
+
+               $this->pconfig = $pconfig;
        }
 
        /**
@@ -100,28 +107,82 @@ class Notification extends BaseRepository
                return $this->select($condition, $params);
        }
 
+
+       /**
+        * Returns only the most recent notifications for the same conversation or contact
+        *
+        * @param int $uid
+        *
+        * @return Collection\Notifications
+        * @throws Exception
+        */
+       public function selectDetailedForUser(int $uid): Collection\Notifications
+       {
+               $notify_type = $this->pconfig->get($uid, 'system', 'notify_type');
+               if (!is_null($notify_type)) {
+                       $condition = ["`type` & ? != 0", $notify_type | UserNotification::TYPE_SHARED | UserNotification::TYPE_FOLLOW];
+               } else {
+                       $condition = [];
+               }
+
+               if (!$this->pconfig->get($uid, 'system', 'notify_like')) {
+                       $condition = DBA::mergeConditions($condition, ['NOT `vid` IN (?, ?)', Verb::getID(\Friendica\Protocol\Activity::LIKE), Verb::getID(\Friendica\Protocol\Activity::DISLIKE)]);
+               }
+
+               if (!$this->pconfig->get($uid, 'system', 'notify_announce')) {
+                       $condition = DBA::mergeConditions($condition, ['`vid` != ?', Verb::getID(\Friendica\Protocol\Activity::ANNOUNCE)]);
+               }
+
+               return $this->selectForUser($uid, $condition, ['limit' => 50, 'order' => ['id' => true]]);
+       }
+
        /**
         * Returns only the most recent notifications for the same conversation or contact
         *
         * @param int $uid
+        *
         * @return Collection\Notifications
         * @throws Exception
         */
        public function selectDigestForUser(int $uid): Collection\Notifications
        {
+               $values = [$uid];
+
+               $type_condition = '';
+               $notify_type = $this->pconfig->get($uid, 'system', 'notify_type');
+               if (!is_null($notify_type)) {
+                       $type_condition = 'AND `type` & ? != 0';
+                       $values[] = $notify_type | UserNotification::TYPE_SHARED | UserNotification::TYPE_FOLLOW;
+               }
+
+               $like_condition = '';
+               if (!$this->pconfig->get($uid, 'system', 'notify_like')) {
+                       $like_condition = 'AND NOT `vid` IN (?, ?)';
+                       $values[] = Verb::getID(\Friendica\Protocol\Activity::LIKE);
+                       $values[] = Verb::getID(\Friendica\Protocol\Activity::DISLIKE);
+               }
+
+               $announce_condition = '';
+               if (!$this->pconfig->get($uid, 'system', 'notify_announce')) {
+                       $announce_condition = 'AND vid != ?';
+                       $values[] = Verb::getID(\Friendica\Protocol\Activity::ANNOUNCE);
+               }
+
                $rows = $this->db->p("
                SELECT notification.*
                FROM notification
-               WHERE id IN (
+               WHERE `id` IN (
                    SELECT MAX(`id`)
-                   FROM notification
-                   WHERE uid = ?
-                   AND vid != ?
+                   FROM `notification`
+                   WHERE `uid` = ?
+                       $type_condition
+                   $like_condition
+                   $announce_condition
                    GROUP BY IFNULL(`parent-uri-id`, `actor-id`)
                )
                ORDER BY `seen`, `id` DESC
                LIMIT 50
-               ", $uid, Verb::getID(\Friendica\Protocol\Activity::LIKE));
+               ", ...$values);
 
                $Entities = new Collection\Notifications();
                foreach ($rows as $fields) {
@@ -142,6 +203,7 @@ class Notification extends BaseRepository
         * @param int|null $min_id Retrieve models with an id no fewer than this, as close to it as possible
         * @param int|null $max_id Retrieve models with an id no greater than this, as close to it as possible
         * @param int      $limit
+        *
         * @return BaseCollection
         * @throws Exception
         * @see _selectByBoundaries
@@ -189,7 +251,7 @@ class Notification extends BaseRepository
                        $this->db->update(self::$table_name, $fields, ['id' => $Notification->id]);
                } else {
                        $fields['created'] = DateTimeFormat::utcNow();
-                       $this->db->insert(self::$table_name, $fields);
+                       $this->db->insert(self::$table_name, $fields, Database::INSERT_IGNORE);
 
                        $Notification = $this->selectOneById($this->db->lastInsertId());
                }