Merge pull request #10807 from annando/emoji-media

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

diff --git a/src/Model/Subscription.php b/src/Model/Subscription.php
index 43bf2ae551822b26330df17a8dc36f94df80520f..59e71307f5ffb4092bf67fbe132ec823e65f63bc 100644 (file)
--- a/src/Model/Subscription.php
+++ b/src/Model/Subscription.php
@@ -19,18 +19,13 @@
  *
  */
 
- /**
-  * @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 Minishlink\WebPush\VAPID;
 
 class Subscription
 {
@@ -107,8 +102,8 @@ class Subscription
        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;
@@ -122,7 +117,7 @@ class Subscription
        public static function getPublicVapidKey(): string
        {
                $keypair = self::getKeyPair();
-               return $keypair['vapid-public'];
+               return $keypair['publicKey'];
        }
 
        /**
@@ -133,7 +128,7 @@ class Subscription
        public static function getPrivateVapidKey(): string
        {
                $keypair = self::getKeyPair();
-               return $keypair['vapid-private'];
+               return $keypair['privateKey'];
        }
 
        /**
@@ -147,6 +142,21 @@ class Subscription
                $notification = DBA::selectFirst('notification', [], ['id' => $nid]);
 
                $type = Notification::getType($notification);
+
+               $desktop_notification = !in_array($type, ['reblog', 'favourite']);
+
+               if (DI::pConfig()->get($notification['uid'], 'system', 'notify_like') && ($type == 'favourite')) {
+                       $desktop_notification = true;
+               }
+
+               if (DI::pConfig()->get($notification['uid'], 'system', 'notify_announce') && ($type == 'reblog')) {
+                       $desktop_notification = true;
+               }
+
+               if ($desktop_notification) {
+                       notification_from_array($notification);
+               }
+
                if (empty($type)) {
                        return;
                }
@@ -154,7 +164,7 @@ class Subscription
                $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(PRIORITY_HIGH, 'PushSubscription', $subscription['id']);
+                       Worker::add(PRIORITY_HIGH, 'PushSubscription', $subscription['id'], $nid);
                }
                DBA::close($subscriptions);
        }