Merge pull request #12050 from nupplaphil/bug/notf_session_fix

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

diff --git a/src/Module/Notifications/Ping.php b/src/Module/Notifications/Ping.php
index 6dfb2db5af21856a5a7958d237c924e20e553290..a0fe8e9aee13a33c210ff8fe96420ef35211fcbe 100644 (file)
--- a/src/Module/Notifications/Ping.php
+++ b/src/Module/Notifications/Ping.php
@@ -42,6 +42,7 @@ use Friendica\Navigation\Notifications\Exception\NoMessageException;
 use Friendica\Navigation\Notifications\Factory;
 use Friendica\Navigation\Notifications\Repository;
 use Friendica\Navigation\Notifications\ValueObject;
+use Friendica\Navigation\SystemMessages;
 use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Profiler;
@@ -50,6 +51,8 @@ use Psr\Log\LoggerInterface;
 
 class Ping extends BaseModule
 {
+       /** @var SystemMessages */
+       private $systemMessages;
        /** @var Repository\Notification */
        private $notificationRepo;
        /** @var Introduction */
@@ -57,10 +60,11 @@ class Ping extends BaseModule
        /** @var Factory\FormattedNavNotification */
        private $formattedNavNotification;
 
-       public function __construct(Repository\Notification $notificationRepo, Introduction $introductionRepo, Factory\FormattedNavNotification $formattedNavNotification, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(SystemMessages $systemMessages, Repository\Notification $notificationRepo, Introduction $introductionRepo, Factory\FormattedNavNotification $formattedNavNotification, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
+               $this->systemMessages           = $systemMessages;
                $this->notificationRepo         = $notificationRepo;
                $this->introductionRepo         = $introductionRepo;
                $this->formattedNavNotification = $formattedNavNotification;
@@ -86,18 +90,18 @@ class Ping extends BaseModule
                $today_birthday_count = 0;
 
 
-               if (local_user()) {
-                       if (DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) {
-                               $notifications = $this->notificationRepo->selectDetailedForUser(local_user());
+               if (DI::userSession()->getLocalUserId()) {
+                       if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'detailed_notif')) {
+                               $notifications = $this->notificationRepo->selectDetailedForUser(DI::userSession()->getLocalUserId());
                        } else {
-                               $notifications = $this->notificationRepo->selectDigestForUser(local_user());
+                               $notifications = $this->notificationRepo->selectDigestForUser(DI::userSession()->getLocalUserId());
                        }
-                       $this->logger->info('Blubb-1', ['uid' => local_user(), 'count' => count($notifications)]);
+
                        $condition = [
                                "`unseen` AND `uid` = ? AND NOT `origin` AND (`vid` != ? OR `vid` IS NULL)",
-                               local_user(), Verb::getID(Activity::FOLLOW)
+                               DI::userSession()->getLocalUserId(), Verb::getID(Activity::FOLLOW)
                        ];
-                       $items = Post::selectForUser(local_user(), ['wall', 'uid', 'uri-id'], $condition, ['limit' => 1000]);
+                       $items = Post::selectForUser(DI::userSession()->getLocalUserId(), ['wall', 'uid', 'uri-id'], $condition, ['limit' => 1000]);
                        if (DBA::isResult($items)) {
                                $items_unseen = Post::toArray($items, false);
                                $arr          = ['items' => $items_unseen];
@@ -113,7 +117,8 @@ class Ping extends BaseModule
                        }
                        DBA::close($items);
 
-                       if ($network_count) {
+                       $compute_group_counts = DI::config()->get('system','compute_group_counts');
+                       if ($network_count && $compute_group_counts) {
                                // Find out how unseen network posts are spread across groups
                                $group_counts = Group::countUnseen();
                                if (DBA::isResult($group_counts)) {
@@ -134,12 +139,12 @@ class Ping extends BaseModule
                                }
                        }
 
-                       $intros = $this->introductionRepo->selectForUser(local_user());
+                       $intros = $this->introductionRepo->selectForUser(DI::userSession()->getLocalUserId());
 
                        $intro_count = $intros->count();
 
                        $myurl      = DI::baseUrl() . '/profile/' . DI::app()->getLoggedInUserNickname();
-                       $mail_count = DBA::count('mail', ["`uid` = ? AND NOT `seen` AND `from-url` != ?", local_user(), $myurl]);
+                       $mail_count = DBA::count('mail', ["`uid` = ? AND NOT `seen` AND `from-url` != ?", DI::userSession()->getLocalUserId(), $myurl]);
 
                        if (intval(DI::config()->get('config', 'register_policy')) === Register::APPROVE && DI::app()->isSiteAdmin()) {
                                $regs = \Friendica\Model\Register::getPending();
@@ -149,15 +154,13 @@ class Ping extends BaseModule
                                }
                        }
 
-                       $cachekey = 'ping:events:' . local_user();
+                       $cachekey = 'ping:events:' . DI::userSession()->getLocalUserId();
                        $ev       = DI::cache()->get($cachekey);
                        if (is_null($ev)) {
                                $ev = DBA::selectToArray('event', ['type', 'start'],
                                        ["`uid` = ? AND `start` < ? AND `finish` > ? AND NOT `ignore`",
-                                               local_user(), DateTimeFormat::utc('now + 7 days'), DateTimeFormat::utcNow()]);
-                               if (DBA::isResult($ev)) {
-                                       DI::cache()->set($cachekey, $ev, Duration::HOUR);
-                               }
+                                               DI::userSession()->getLocalUserId(), DateTimeFormat::utc('now + 7 days'), DateTimeFormat::utcNow()]);
+                               DI::cache()->set($cachekey, $ev, Duration::HOUR);
                        }
 
                        if (DBA::isResult($ev)) {
@@ -184,7 +187,7 @@ class Ping extends BaseModule
                                }
                        }
 
-                       $owner = User::getOwnerDataById(local_user());
+                       $owner = User::getOwnerDataById(DI::userSession()->getLocalUserId());
 
                        $navNotifications = array_map(function (Entity\Notification $notification) use ($owner) {
                                if (!DI::notify()->NotifyOnDesktop($notification)) {
@@ -200,7 +203,7 @@ class Ping extends BaseModule
                                }
                        }, $notifications->getArrayCopy());
                        $navNotifications = array_filter($navNotifications);
-                       $this->logger->info('Blubb-2', ['uid' => local_user(), 'count' => count($navNotifications)]);
+
                        $sysnotify_count = array_reduce($navNotifications, function (int $carry, ValueObject\FormattedNavNotification $navNotification) {
                                return $carry + ($navNotification->seen ? 0 : 1);
                        }, 0);
@@ -211,7 +214,7 @@ class Ping extends BaseModule
                        }
 
                        if (DBA::isResult($regs)) {
-                               if (count($regs) <= 1 || DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) {
+                               if (count($regs) <= 1 || DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'detailed_notif')) {
                                        foreach ($regs as $reg) {
                                                $navNotifications[] = $this->formattedNavNotification->createFromParams(
                                                        [
@@ -255,19 +258,6 @@ class Ping extends BaseModule
                        usort($navNotifications, $sort_function);
                }
 
-               $sysmsgs      = [];
-               $sysmsgs_info = [];
-
-               if (!empty($_SESSION['sysmsg'])) {
-                       $sysmsgs = $_SESSION['sysmsg'];
-                       unset($_SESSION['sysmsg']);
-               }
-
-               if (!empty($_SESSION['sysmsg_info'])) {
-                       $sysmsgs_info = $_SESSION['sysmsg_info'];
-                       unset($_SESSION['sysmsg_info']);
-               }
-
                $notification_count = $sysnotify_count + $intro_count + $register_count;
 
                $data             = [];
@@ -288,8 +278,8 @@ class Ping extends BaseModule
                $data['notifications'] = $navNotifications;
 
                $data['sysmsgs'] = [
-                       'notice' => $sysmsgs,
-                       'info'   => $sysmsgs_info
+                       'notice' => $this->systemMessages->flushNotices(),
+                       'info'   => $this->systemMessages->flushInfos(),
                ];
 
                if (isset($_GET['callback'])) {