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

diff --git a/src/Model/Subscription.php b/src/Model/Subscription.php
index 59e71307f5..31048d963f 100644
--- a/src/Model/Subscription.php
+++ b/src/Model/Subscription.php
@@ -25,6 +25,8 @@ use Friendica\Core\Logger;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Navigation\Notifications\Entity;
+use Friendica\Object\Api\Mastodon\Notification;
 use Minishlink\WebPush\VAPID;
 
 class Subscription
@@ -137,34 +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);
 
-		$type = Notification::getType($notification);
+		$desktop_notification = !in_array($type, [Notification::TYPE_RESHARE, Notification::TYPE_LIKE]);
 
-		$desktop_notification = !in_array($type, ['reblog', 'favourite']);
-
-		if (DI::pConfig()->get($notification['uid'], 'system', 'notify_like') && ($type == 'favourite')) {
+		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 == 'reblog')) {
+		if (DI::pConfig()->get($Notification->uid, 'system', 'notify_announce') && ($type == Notification::TYPE_RESHARE)) {
 			$desktop_notification = true;
 		}
 
 		if ($desktop_notification) {
-			notification_from_array($notification);
+			DI::notify()->createFromNotification($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'], $nid);
+			Worker::add(PRIORITY_HIGH, 'PushSubscription', $subscription['id'], $Notification->id);
 		}
 		DBA::close($subscriptions);
 	}