From 36a89623331f4d62959f742202afa0bd4ff85994 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 17 Dec 2022 01:10:50 -0500
Subject: [PATCH] Remove DI dependency in Contact\Hovercard module
---
src/Module/Contact/Hovercard.php | 38 +++++++++++++++++++++++---------
1 file changed, 28 insertions(+), 10 deletions(-)
diff --git a/src/Module/Contact/Hovercard.php b/src/Module/Contact/Hovercard.php
index 5c82fd2c42..19762e092e 100644
--- a/src/Module/Contact/Hovercard.php
+++ b/src/Module/Contact/Hovercard.php
@@ -21,26 +21,45 @@
namespace Friendica\Module\Contact;
+use Friendica\App;
use Friendica\BaseModule;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
use Friendica\Core\System;
use Friendica\Database\DBA;
-use Friendica\DI;
use Friendica\Model\Contact;
+use Friendica\Module\Response;
use Friendica\Network\HTTPException;
+use Friendica\Util\Profiler;
use Friendica\Util\Strings;
+use Psr\Log\LoggerInterface;
/**
* Asynchronous HTML fragment provider for frio contact hovercards
*/
class Hovercard extends BaseModule
{
+ /** @var IManageConfigValues */
+ private $config;
+ /** @var IHandleUserSessions */
+ private $userSession;
+
+ public function __construct(IHandleUserSessions $userSession, IManageConfigValues $config, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+ {
+ parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+ $this->config = $config;
+ $this->userSession = $userSession;
+ }
+
protected function rawContent(array $request = [])
{
- $contact_url = $_REQUEST['url'] ?? '';
+ $contact_url = $request['url'] ?? '';
// Get out if the system doesn't have public access allowed
- if (DI::config()->get('system', 'block_public') && !DI::userSession()->isAuthenticated()) {
+ if ($this->config->get('system', 'block_public') && !$this->userSession->isAuthenticated()) {
throw new HTTPException\ForbiddenException();
}
@@ -50,7 +69,7 @@ class Hovercard extends BaseModule
*/
if (strpos($contact_url, 'contact/') === 0 && preg_match('/(\d+)/', $contact_url, $matches)) {
$remote_contact = Contact::selectFirst(['nurl'], ['id' => $matches[1]]);
- $contact_url = $remote_contact['nurl'] ?? '';
+ $contact_url = $remote_contact['nurl'] ?? '';
}
if (!$contact_url) {
@@ -59,8 +78,8 @@ class Hovercard extends BaseModule
// Search for contact data
// Look if the local user has got the contact
- if (DI::userSession()->isAuthenticated()) {
- $contact = Contact::getByURLForUser($contact_url, DI::userSession()->getLocalUserId());
+ if ($this->userSession->isAuthenticated()) {
+ $contact = Contact::getByURLForUser($contact_url, $this->userSession->getLocalUserId());
} else {
$contact = Contact::getByURL($contact_url, false);
}
@@ -70,7 +89,7 @@ class Hovercard extends BaseModule
}
// Get the photo_menu - the menu if possible contact actions
- if (DI::userSession()->isAuthenticated()) {
+ if ($this->userSession->isAuthenticated()) {
$actions = Contact::photoMenu($contact);
} else {
$actions = [];
@@ -78,7 +97,7 @@ class Hovercard extends BaseModule
// Move the contact data to the profile array so we can deliver it to
$tpl = Renderer::getMarkupTemplate('hovercard.tpl');
- $o = Renderer::replaceMacros($tpl, [
+ $o = Renderer::replaceMacros($tpl, [
'$profile' => [
'name' => $contact['name'],
'nick' => $contact['nick'],
@@ -96,7 +115,6 @@ class Hovercard extends BaseModule
],
]);
- echo $o;
- System::exit();
+ System::httpExit($o);
}
}
--
2.39.5