Issue 13221: Diaspora posts are now stored correctly

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

diff --git a/src/Model/Subscription.php b/src/Model/Subscription.php
index aaaa7db7afb7406d5b7fc864daa0b762160729b5..10a2d9b4d10d1af6b9b0e051b2c5a4db7c6b4e06 100644 (file)
--- a/src/Model/Subscription.php
+++ b/src/Model/Subscription.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -19,17 +19,16 @@
  *
  */
 
- /**
-  * @see https://github.com/web-push-libs/web-push-php
-  * Possibly we should simply use this.
-  */
-
 namespace Friendica\Model;
 
 use Friendica\Core\Logger;
+use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Util\Crypto;
+use Friendica\Factory\Api\Mastodon\Notification as NotificationFactory;
+use Friendica\Navigation\Notifications\Entity;
+use Friendica\Object\Api\Mastodon\Notification;
+use Minishlink\WebPush\VAPID;
 
 class Subscription
 {
@@ -39,8 +38,7 @@ class Subscription
         * @param int   $applicationid
         * @param int   $uid
         * @param array $fields
-        *
-        * @return bool Does it exist?
+        * @return array|bool Array on success, false on failure
         */
        public static function select(int $applicationid, int $uid, array $fields = [])
        {
@@ -55,7 +53,7 @@ class Subscription
         *
         * @return bool Does it exist?
         */
-       public static function exists(int $applicationid, int $uid)
+       public static function exists(int $applicationid, int $uid): bool
        {
                return DBA::exists('subscription', ['application-id' => $applicationid, 'uid' => $uid]);
        }
@@ -66,10 +64,9 @@ class Subscription
         * @param int   $applicationid
         * @param int   $uid
         * @param array $fields subscription fields
-        *
         * @return bool result of update
         */
-       public static function update(int $applicationid, int $uid, array $fields)
+       public static function update(int $applicationid, int $uid, array $fields): bool
        {
                return DBA::update('subscription', $fields, ['application-id' => $applicationid, 'uid' => $uid]);
        }
@@ -78,10 +75,9 @@ class Subscription
         * Insert or replace a subscription record
         *
         * @param array $fields subscription fields
-        *
         * @return bool result of replace
         */
-       public static function replace(array $fields)
+       public static function replace(array $fields): bool
        {
                return DBA::replace('subscription', $fields);
        }
@@ -93,44 +89,70 @@ class Subscription
         * @param int $uid
         * @return bool
         */
-       public static function delete(int $applicationid, int $uid)
+       public static function delete(int $applicationid, int $uid): bool
        {
                return DBA::delete('subscription', ['application-id' => $applicationid, 'uid' => $uid]);
        }
 
        /**
-        * Fetch a VAPID key
+        * Fetch a VAPID keypair
         *
-        * @return string
+        * @return array
         */
-       public static function getVapidKey(): string
+       private static function getKeyPair(): array
        {
                $keypair = DI::config()->get('system', 'ec_keypair');
-               if (empty($keypair)) {
-                       $keypair = Crypto::newECKeypair();
+               if (empty($keypair['publicKey']) || empty($keypair['privateKey'])) {
+                       $keypair = VAPID::createVapidKeys();
                        DI::config()->set('system', 'ec_keypair', $keypair);
                }
-               return $keypair['vapid-public'];
+               return $keypair;
+       }
+
+       /**
+        * Fetch the public VAPID key
+        *
+        * @return string
+        */
+       public static function getPublicVapidKey(): string
+       {
+               $keypair = self::getKeyPair();
+               return $keypair['publicKey'];
+       }
+
+       /**
+        * Fetch the public VAPID key
+        *
+        * @return string
+        */
+       public static function getPrivateVapidKey(): string
+       {
+               $keypair = self::getKeyPair();
+               return $keypair['privateKey'];
        }
 
        /**
         * Prepare push notification
         *
-        * @param int $nid
+        * @param Notification $Notification
         * @return void
         */
-       public static function pushByNotificationId(int $nid)
+       public static function pushByNotification(Entity\Notification $notification)
        {
-               $notification = DBA::selectFirst('notification', [], ['id' => $nid]);
+               $type = NotificationFactory::getType($notification);
+
+               if (DI::notify()->shouldShowOnDesktop($notification, $type)) {
+                       DI::notify()->createFromNotification($notification);
+               }
 
-               $type = Notification::getType($notification);
                if (empty($type)) {
                        return;
                }
 
-               $subscriptions = DBA::select('subscription', [], ['uid' => $notification['uid'], $type => true]);
+               $subscriptions = DBA::select('subscription', [], ['uid' => $notification->uid, $type => true]);
                while ($subscription = DBA::fetch($subscriptions)) {
                        Logger::info('Push notification', ['id' => $subscription['id'], 'uid' => $subscription['uid'], 'type' => $type]);
+                       Worker::add(Worker::PRIORITY_HIGH, 'PushSubscription', $subscription['id'], $notification->id);
                }
                DBA::close($subscriptions);
        }