Remove superfluous includes in profile modules

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

diff --git a/src/Module/HoverCard.php b/src/Module/HoverCard.php
index 2106809220e90ffac46ca737f0d283829fac7604..8f4186b03b1c3593aee0f877bbc6b583cab19834 100644 (file)
--- a/src/Module/HoverCard.php
+++ b/src/Module/HoverCard.php
@@ -2,13 +2,9 @@
 
 namespace Friendica\Module;
 
-use Friendica\App\Arguments;
-use Friendica\App\BaseURL;
-use Friendica\App\Page;
 use Friendica\BaseModule;
-use Friendica\Core\Config\Configuration;
-use Friendica\Core\L10n\L10n;
 use Friendica\Core\Session;
+use Friendica\DI;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
 use Friendica\Network\HTTPException\NotFoundException;
@@ -20,7 +16,7 @@ class HoverCard extends BaseModule
 {
        public static function rawContent(array $parameters = [])
        {
-               $a = self::getApp();
+               $a = DI::app();
 
                if ((local_user()) && ($parameters['action'] ?? '') === 'view') {
                        // A logged in user views a profile of a user
@@ -31,15 +27,12 @@ class HoverCard extends BaseModule
                        $nickname = $parameters['profile'];
                        $profile  = 0;
                } else {
-                       /** @var L10n $l10n */
-                       $l10n = self::getClass(L10n::class);
-                       throw new NotFoundException($l10n->t('No profile'));
+                       throw new NotFoundException(DI::l10n()->t('No profile'));
                }
 
                Profile::load($a, $nickname, $profile);
 
-               /** @var Page $page */
-               $page = self::getClass(Page::class);
+               $page = DI::page();
 
                if (!empty($a->profile['page-flags']) && ($a->profile['page-flags'] == User::PAGE_FLAGS_COMMUNITY)) {
                        $page['htmlhead'] .= '<meta name="friendica.community" content="true" />';
@@ -52,10 +45,8 @@ class HoverCard extends BaseModule
                        $page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
                }
 
-               /** @var Configuration $config */
-               $config = self::getClass(Configuration::class);
                // check if blocked
-               if ($config->get('system', 'block_public') && !Session::isAuthenticated()) {
+               if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
                        $keywords = $a->profile['pub_keywords'] ?? '';
                        $keywords = str_replace([',', ' ', ',,'], [' ', ',', ','], $keywords);
                        if (strlen($keywords)) {
@@ -63,8 +54,7 @@ class HoverCard extends BaseModule
                        }
                }
 
-               /** @var BaseURL $baseUrl */
-               $baseUrl = self::getClass(BaseURL::class);
+               $baseUrl = DI::baseUrl();
 
                $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $baseUrl->getHostname() . ($baseUrl->getUrlPath() ? '/' . $baseUrl->getUrlPath() : ''));