X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FHoverCard.php;h=c2b1d6b46d74d19043705549aa8c0b2547dbc531;hb=38e5733b6ee10f5a6dd7f017b6b6e7acfde80565;hp=4c035d521a692bd3457131f5ab8fb03e818de56f;hpb=12e223b2ef6eb624a9c05fa1e5eb3e4c4e4d038f;p=friendica.git

diff --git a/src/Module/HoverCard.php b/src/Module/HoverCard.php
index 4c035d521a..c2b1d6b46d 100644
--- 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,31 +16,21 @@ class HoverCard extends BaseModule
 {
 	public static function rawContent(array $parameters = [])
 	{
-		/** @var Arguments $args */
-		$args = self::getClass(Arguments::class);
+		$a = DI::app();
 
-		$a = self::getApp();
-
-		// A logged in user views a profile of a user
-		if ((local_user()) && $args->get(2) === 'view') {
+		if ((local_user()) && ($parameters['action'] ?? '') === 'view') {
+			// A logged in user views a profile of a user
 			$nickname = $a->user['nickname'];
-			$profile  = $parameters['profile'];
-
+		} elseif (empty($parameters['action'])) {
 			// Show the profile hovercard
-		} elseif ($args->getArgc() == 2) {
 			$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);
+		Profile::load($a, $nickname);
 
-		/** @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" />';
@@ -57,10 +43,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)) {
@@ -68,8 +52,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() : ''));