Merge pull request #11532 from tobiasd/2022.05-CHANGELOG

[friendica.git] / src / Module / Notifications / Ping.php

diff --git a/src/Module/Notifications/Ping.php b/src/Module/Notifications/Ping.php
index 7deb42fcaa75931030f73d975a2a911167582b4a..7dc215826024dd0ccfa6a5b17c631542fec5c9db 100644 (file)
--- a/src/Module/Notifications/Ping.php
+++ b/src/Module/Notifications/Ping.php
@@ -33,6 +33,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Group;
 use Friendica\Model\Post;
+use Friendica\Model\User;
 use Friendica\Model\Verb;
 use Friendica\Module\Register;
 use Friendica\Module\Response;
@@ -183,9 +184,15 @@ class Ping extends BaseModule
                                }
                        }
 
-                       // Temporary workaround for notifications without messages like with the following verb:
-                       // - \Friendica\Protocol\Activity::ANNOUNCE
-                       $navNotifications = array_map(function (Entity\Notification $notification) {
+                       $owner = User::getOwnerDataById(local_user());
+
+                       $navNotifications = array_map(function (Entity\Notification $notification) use ($owner) {
+                               if (!DI::notify()->NotifyOnDesktop($notification)) {
+                                       return null;
+                               }
+                               if (($notification->type == Post\UserNotification::TYPE_NONE) && in_array($owner['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP])) {
+                                       return null;
+                               }
                                try {
                                        return $this->formattedNavNotification->createFromNotification($notification);
                                } catch (NoMessageException $e) {
@@ -287,9 +294,7 @@ class Ping extends BaseModule
 
                if (isset($_GET['callback'])) {
                        // JSONP support
-                       header("Content-type: application/javascript");
-                       echo $_GET['callback'] . '(' . json_encode(['result' => $data]) . ')';
-                       exit;
+                       System::httpExit($_GET['callback'] . '(' . json_encode(['result' => $data]) . ')', Response::TYPE_BLANK, 'application/javascript');
                } else {
                        System::jsonExit(['result' => $data]);
                }