Merge pull request #11503 from annando/bulk-delivery

[friendica.git] / src / Worker / PushSubscription.php

diff --git a/src/Worker/PushSubscription.php b/src/Worker/PushSubscription.php
index 60f559bc97a297c2e3ca333fdc9be255f4c09432..45ecb62291a08a2e7fcc6e39a2045967d40a5fe3 100644 (file)
--- a/src/Worker/PushSubscription.php
+++ b/src/Worker/PushSubscription.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -27,10 +27,11 @@ use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Model\Notification;
 use Friendica\Model\Post;
 use Friendica\Model\Subscription as ModelSubscription;
 use Friendica\Model\User;
+use Friendica\Navigation\Notifications;
+use Friendica\Network\HTTPException\NotFoundException;
 use Minishlink\WebPush\WebPush;
 use Minishlink\WebPush\Subscription;
 
@@ -46,8 +47,9 @@ class PushSubscription
                        return;
                }
 
-               $notification = DBA::selectFirst('notification', [], ['id' => $nid]);
-               if (empty($notification)) {
+               try {
+                       $Notification = DI::notification()->selectOneById($nid);
+               } catch (NotFoundException $e) {
                        Logger::info('Notification not found', ['notification' => $nid]);
                        return;
                }
@@ -58,7 +60,7 @@ class PushSubscription
                        return;
                }
 
-               $user = User::getById($notification['uid']);
+               $user = User::getById($Notification->uid);
                if (empty($user)) {
                        Logger::info('User not found', ['application' => $subscription['uid']]);
                        return;
@@ -66,22 +68,23 @@ class PushSubscription
 
                $l10n = DI::l10n()->withLang($user['language']);
 
-               $type = Notification::getType($notification);
-
-               if (!empty($notification['actor-id'])) {
-                       $actor = Contact::getById($notification['actor-id']);
+               if ($Notification->actorId) {
+                       $actor = Contact::getById($Notification->actorId);
                }
 
                $body = '';
 
-               if (!empty($notification['target-uri-id'])) {
-                       $post = Post::selectFirst([], ['uri-id' => $notification['target-uri-id'], 'uid' => [0, $notification['uid']]]);
+               if ($Notification->targetUriId) {
+                       $post = Post::selectFirst([], ['uri-id' => $Notification->targetUriId, 'uid' => [0, $Notification->uid]]);
                        if (!empty($post['body'])) {
                                $body = BBCode::toPlaintext($post['body'], false);
-                               $body = Plaintext::shorten($body, 160, $notification['uid']);
+                               $body = Plaintext::shorten($body, 160, $Notification->uid);
                        }
                }
 
+               $message = DI::notificationFactory()->getMessageFromNotification($Notification);
+               $title = $message['plain'] ?: '';
+
                $push = Subscription::create([
                        'contentEncoding' => 'aesgcm',
                        'endpoint'        => $subscription['endpoint'],
@@ -95,9 +98,9 @@ class PushSubscription
                        'access_token'      => $application_token['access_token'],
                        'preferred_locale'  => $user['language'],
                        'notification_id'   => $nid,
-                       'notification_type' => $type,
+                       'notification_type' => \Friendica\Factory\Api\Mastodon\Notification::getType($Notification),
                        'icon'              => $actor['thumb'] ?? '',
-                       'title'             => $l10n->t('Notification from Friendica'), // @todo Replace it with a speaking title
+                       'title'             => $title ?: $l10n->t('Notification from Friendica'),
                        'body'              => $body ?: $l10n->t('Empty Post'),
                ];