Some more API functions moved

[friendica.git] / src / Module / BaseNotifications.php

diff --git a/src/Module/BaseNotifications.php b/src/Module/BaseNotifications.php
index 9e7b1cd9797ee828480272235408e9bfa1730138..e7f9bdabe374508328eec7d0a446f33677b025c0 100644 (file)
--- a/src/Module/BaseNotifications.php
+++ b/src/Module/BaseNotifications.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -27,8 +27,8 @@ use Friendica\Content\Pager;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\DI;
+use Friendica\Navigation\Notifications\ValueObject\FormattedNotification;
 use Friendica\Network\HTTPException\ForbiddenException;
-use Friendica\Object\Notification\Notification;
 
 /**
  * Base Module for each tab of the notification display
@@ -39,29 +39,29 @@ abstract class BaseNotifications extends BaseModule
 {
        /** @var array Array of URL parameters */
        const URL_TYPES = [
-               Notification::NETWORK  => 'network',
-               Notification::SYSTEM   => 'system',
-               Notification::HOME     => 'home',
-               Notification::PERSONAL => 'personal',
-               Notification::INTRO    => 'intros',
+               FormattedNotification::NETWORK  => 'network',
+               FormattedNotification::SYSTEM   => 'system',
+               FormattedNotification::HOME     => 'home',
+               FormattedNotification::PERSONAL => 'personal',
+               FormattedNotification::INTRO    => 'intros',
        ];
 
        /** @var array Array of the allowed notifications and their printable name */
        const PRINT_TYPES = [
-               Notification::NETWORK  => 'Network',
-               Notification::SYSTEM   => 'System',
-               Notification::HOME     => 'Home',
-               Notification::PERSONAL => 'Personal',
-               Notification::INTRO    => 'Introductions',
+               FormattedNotification::NETWORK  => 'Network',
+               FormattedNotification::SYSTEM   => 'System',
+               FormattedNotification::HOME     => 'Home',
+               FormattedNotification::PERSONAL => 'Personal',
+               FormattedNotification::INTRO    => 'Introductions',
        ];
 
        /** @var array The array of access keys for notification pages */
        const ACCESS_KEYS = [
-               Notification::NETWORK  => 'w',
-               Notification::SYSTEM   => 'y',
-               Notification::HOME     => 'h',
-               Notification::PERSONAL => 'r',
-               Notification::INTRO    => 'i',
+               FormattedNotification::NETWORK  => 'w',
+               FormattedNotification::SYSTEM   => 'y',
+               FormattedNotification::HOME     => 'h',
+               FormattedNotification::PERSONAL => 'r',
+               FormattedNotification::INTRO    => 'i',
        ];
 
        /** @var int The default count of items per page */
@@ -102,7 +102,7 @@ abstract class BaseNotifications extends BaseModule
                }
 
                // Set the pager
-               $pager = new Pager(DI::args()->getQueryString(), self::ITEMS_PER_PAGE);
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), self::ITEMS_PER_PAGE);
 
                // Add additional informations (needed for json output)
                $notifications = [
@@ -132,7 +132,7 @@ abstract class BaseNotifications extends BaseModule
                $tabs = self::getTabs();
 
                // Set the pager
-               $pager = new Pager(DI::args()->getQueryString(), self::ITEMS_PER_PAGE);
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), self::ITEMS_PER_PAGE);
 
                $notif_tpl = Renderer::getMarkupTemplate('notifications/notifications.tpl');
                return Renderer::replaceMacros($notif_tpl, [