Merge branch 'develop' into blocks-and-mutes-fixes

[friendica.git] / src / Module / Debug / Feed.php

diff --git a/src/Module/Debug/Feed.php b/src/Module/Debug/Feed.php
index 9368dd0268c05a0d870cbecadf85ace46b8833ab..2bb84250a4901e8ca2fc59c12d3f4e9f2dfbfa41 100644 (file)
--- a/src/Module/Debug/Feed.php
+++ b/src/Module/Debug/Feed.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,13 +21,18 @@
 
 namespace Friendica\Module\Debug;
 
-use Friendica\App\BaseURL;
+use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 use Friendica\Model;
+use Friendica\Module\Response;
 use Friendica\Network\HTTPClient\Capability\ICanSendHttpRequests;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Protocol;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
 
 /**
  * Tests a given feed of a contact
@@ -37,27 +42,27 @@ class Feed extends BaseModule
        /** @var ICanSendHttpRequests */
        protected $httpClient;
 
-       public function __construct(BaseURL $baseUrl, ICanSendHttpRequests $httpClient, L10n $l10n, array $parameters = [])
+       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, ICanSendHttpRequests $httpClient, array $server, array $parameters = [])
        {
-               parent::__construct($l10n, $parameters);
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->httpClient = $httpClient;
 
-               if (!local_user()) {
-                       notice($this->t('You must be logged in to use this module'));
+               if (!DI::userSession()->getLocalUserId()) {
+                       DI::sysmsg()->addNotice($this->t('You must be logged in to use this module'));
                        $baseUrl->redirect();
                }
        }
 
-       public function content(): string
+       protected function content(array $request = []): string
        {
                $result = [];
                if (!empty($_REQUEST['url'])) {
                        $url = $_REQUEST['url'];
 
-                       $contact = Model\Contact::getByURLForUser($url, local_user(), null);
+                       $contact = Model\Contact::getByURLForUser($url, DI::userSession()->getLocalUserId(), null);
 
-                       $xml = $this->httpClient->fetch($contact['poll']);
+                       $xml = $this->httpClient->fetch($contact['poll'], HttpClientAccept::FEED_XML);
 
                        $import_result = Protocol\Feed::import($xml);