Merge pull request #9397 from vinzv/9238-red-color-unread-messages-faded

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

diff --git a/src/Module/HoverCard.php b/src/Module/HoverCard.php
index 0ca74c514e1f0b4ad5c52447eca8e9389b22bf77..ae107ca17229e3bfdef7fea1263f96a53d60be47 100644 (file)
--- a/src/Module/HoverCard.php
+++ b/src/Module/HoverCard.php
@@ -1,17 +1,32 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 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;
+use Friendica\Network\HTTPException;
 
 /**
  * Loads a profile for the HoverCard view
@@ -20,31 +35,25 @@ 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 HTTPException\NotFoundException(DI::l10n()->t('No profile'));
                }
 
-               Profile::load($a, $nickname, $profile);
+               Profile::load($a, $nickname);
+
+               if (empty($a->profile)) {
+                       throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
+               }
 
-               /** @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 +66,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,12 +75,11 @@ 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() : ''));
 
-               $page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n";
+               $page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . ($a->profile['net-publish'] ? 'true' : 'false') . '" />' . "\r\n";
                $page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $baseUrl->get() . '/dfrn_poll/' . $nickname . '" />' . "\r\n";
                $page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . $baseUrl->get() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
                header('Link: <' . $baseUrl->get() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);