Revert "Revert "Replace Module::init() with Constructors""

This reverts commit 89d6c89b67.
This commit is contained in:
Philipp 2021-11-19 20:18:48 +01:00
parent 942001b04d
commit 645e4edc63
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
43 changed files with 1226 additions and 922 deletions

View file

@ -22,11 +22,12 @@
namespace Friendica\Module;
use Exception;
use Friendica\App\Arguments;
use Friendica\BaseModule;
use Friendica\Content\Pager;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\DI;
use Friendica\Navigation\Notifications\ValueObject\FormattedNotification;
use Friendica\Network\HTTPException\ForbiddenException;
@ -70,9 +71,12 @@ abstract class BaseNotifications extends BaseModule
const DEFAULT_PAGE_LIMIT = 80;
/** @var boolean True, if ALL entries should get shown */
protected static $showAll;
protected $showAll;
/** @var int The determined start item of the current page */
protected static $firstItemNum;
protected $firstItemNum;
/** @var Arguments */
protected $args;
/**
* Collects all notifications from the backend
@ -80,33 +84,37 @@ abstract class BaseNotifications extends BaseModule
* @return array The determined notification array
* ['header', 'notifications']
*/
abstract public static function getNotifications();
abstract public function getNotifications();
public function init()
public function __construct(Arguments $args, L10n $l10n, array $parameters = [])
{
parent::__construct($l10n, $parameters);
if (!local_user()) {
throw new ForbiddenException(DI::l10n()->t('Permission denied.'));
throw new ForbiddenException($this->t('Permission denied.'));
}
$page = ($_REQUEST['page'] ?? 0) ?: 1;
self::$firstItemNum = ($page * self::ITEMS_PER_PAGE) - self::ITEMS_PER_PAGE;
self::$showAll = ($_REQUEST['show'] ?? '') === 'all';
$this->firstItemNum = ($page * self::ITEMS_PER_PAGE) - self::ITEMS_PER_PAGE;
$this->showAll = ($_REQUEST['show'] ?? '') === 'all';
$this->args = $args;
}
public function rawContent()
{
// If the last argument of the query is NOT json, return
if (DI::args()->get(DI::args()->getArgc() - 1) !== 'json') {
if ($this->args->get($this->args->getArgc() - 1) !== 'json') {
return;
}
// Set the pager
$pager = new Pager(DI::l10n(), DI::args()->getQueryString(), self::ITEMS_PER_PAGE);
$pager = new Pager($this->l10n, $this->args->getQueryString(), self::ITEMS_PER_PAGE);
// Add additional informations (needed for json output)
$notifications = [
'notifications' => static::getNotifications(),
'notifications' => $this->getNotifications(),
'items_page' => $pager->getItemsPerPage(),
'page' => $pager->getPage(),
];
@ -126,17 +134,17 @@ abstract class BaseNotifications extends BaseModule
*
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
protected static function printContent(string $header, array $notifications, string $noContent, array $showLink)
protected function printContent(string $header, array $notifications, string $noContent, array $showLink)
{
// Get the nav tabs for the notification pages
$tabs = self::getTabs();
$tabs = $this->getTabs();
// Set the pager
$pager = new Pager(DI::l10n(), DI::args()->getQueryString(), self::ITEMS_PER_PAGE);
$pager = new Pager($this->l10n, $this->args->getQueryString(), self::ITEMS_PER_PAGE);
$notif_tpl = Renderer::getMarkupTemplate('notifications/notifications.tpl');
return Renderer::replaceMacros($notif_tpl, [
'$header' => $header ?? DI::l10n()->t('Notifications'),
'$header' => $header ?? $this->t('Notifications'),
'$tabs' => $tabs,
'$notifications' => $notifications,
'$noContent' => $noContent,
@ -151,15 +159,15 @@ abstract class BaseNotifications extends BaseModule
* @return array with with notifications TabBar data
* @throws Exception
*/
private static function getTabs()
private function getTabs()
{
$selected = DI::args()->get(1, '');
$selected = $this->args->get(1, '');
$tabs = [];
foreach (self::URL_TYPES as $type => $url) {
$tabs[] = [
'label' => DI::l10n()->t(self::PRINT_TYPES[$type]),
'label' => $this->t(self::PRINT_TYPES[$type]),
'url' => 'notifications/' . $url,
'sel' => (($selected == $url) ? 'active' : ''),
'id' => $type . '-tab',