X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FSubscription.php;h=31048d963f3350977bfb5a7018adc4f942e4c053;hb=41062eb7e4036946711afefd529de5c9a89b7b9d;hp=43bf2ae551822b26330df17a8dc36f94df80520f;hpb=69f11c4a8461bd148b9d5e6223046e57994bb4cc;p=friendica.git

diff --git a/src/Model/Subscription.php b/src/Model/Subscription.php
index 43bf2ae551..31048d963f 100644
--- a/src/Model/Subscription.php
+++ b/src/Model/Subscription.php
@@ -19,18 +19,15 @@
  *
  */
 
- /**
-  * @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\Navigation\Notifications\Entity;
+use Friendica\Object\Api\Mastodon\Notification;
+use Minishlink\WebPush\VAPID;
 
 class Subscription
 {
@@ -107,8 +104,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 +119,7 @@ class Subscription
 	public static function getPublicVapidKey(): string
 	{
 		$keypair = self::getKeyPair();
-		return $keypair['vapid-public'];
+		return $keypair['publicKey'];
 	}
 
 	/**
@@ -133,7 +130,7 @@ class Subscription
 	public static function getPrivateVapidKey(): string
 	{
 		$keypair = self::getKeyPair();
-		return $keypair['vapid-private'];
+		return $keypair['privateKey'];
 	}
 
 	/**
@@ -142,19 +139,32 @@ class Subscription
 	 * @param int $nid
 	 * @return void
 	 */
-	public static function pushByNotificationId(int $nid)
+	public static function pushByNotification(Entity\Notification $Notification)
 	{
-		$notification = DBA::selectFirst('notification', [], ['id' => $nid]);
+		$type = \Friendica\Factory\Api\Mastodon\Notification::getType($Notification);
+
+		$desktop_notification = !in_array($type, [Notification::TYPE_RESHARE, Notification::TYPE_LIKE]);
+
+		if (DI::pConfig()->get($Notification->uid, 'system', 'notify_like') && ($type == Notification::TYPE_LIKE)) {
+			$desktop_notification = true;
+		}
+
+		if (DI::pConfig()->get($Notification->uid, 'system', 'notify_announce') && ($type == Notification::TYPE_RESHARE)) {
+			$desktop_notification = true;
+		}
+
+		if ($desktop_notification) {
+			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(PRIORITY_HIGH, 'PushSubscription', $subscription['id']);
+			Worker::add(PRIORITY_HIGH, 'PushSubscription', $subscription['id'], $Notification->id);
 		}
 		DBA::close($subscriptions);
 	}