Merge pull request #12921 from HankG/add-visibility-data-to-mastodon-status

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

diff --git a/src/Module/Apps.php b/src/Module/Apps.php
index 1d6144f16d9e3c5307b9e78d75223fe15abbf0f7..07863e44c5aeb9f9c8ef715f9039bbf4e6670e52 100644 (file)
--- a/src/Module/Apps.php
+++ b/src/Module/Apps.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,35 +21,50 @@
 
 namespace Friendica\Module;
 
+use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Content\Nav;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\DI;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
+use Friendica\Navigation\SystemMessages;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
 
 /**
  * Shows the App menu
  */
 class Apps extends BaseModule
 {
-       public function init()
+       /** @var Nav */
+       protected $nav;
+       /** @var SystemMessages */
+       protected $systemMessages;
+
+       public function __construct(SystemMessages $systemMessages, Nav $nav, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManageConfigValues $config, array $server, array $parameters = [])
        {
-               $privateaddons = DI::config()->get('config', 'private_addons');
-               if ($privateaddons === "1" && !local_user()) {
-                       DI::baseUrl()->redirect();
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+               $this->nav = $nav;
+               $this->systemMessages = $systemMessages;
+
+               $privateaddons = $config->get('config', 'private_addons');
+               if ($privateaddons === "1" && !$session->getLocalUserId()) {
+                       $baseUrl->redirect();
                }
        }
 
-       public function content(): string
+       protected function content(array $request = []): string
        {
-               $apps = Nav::getAppMenu();
-
+               $apps = $this->nav->getAppMenu();
                if (count($apps) == 0) {
-                       notice(DI::l10n()->t('No installed applications.'));
+                       $this->systemMessages->addNotice($this->t('No installed applications.'));
                }
 
                $tpl = Renderer::getMarkupTemplate('apps.tpl');
                return Renderer::replaceMacros($tpl, [
-                       '$title' => DI::l10n()->t('Applications'),
+                       '$title' => $this->t('Applications'),
                        '$apps'  => $apps,
                ]);
        }