Merge pull request #11411 from annando/creation-date

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

diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index c47a7a4d504dffce50bf9e1acd7647692c8accf3..e4ed1e93bf08138a4346d6262eccbe6d08f2e05f 100644 (file)
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -29,8 +29,10 @@ use Friendica\Database\Database;
 use Friendica\Model\Contact;
 use Friendica\Model\User;
 use Friendica\Network\HTTPClient\Capability\ICanSendHttpRequests;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Util\HTTPSignature;
+use Friendica\Util\Profiler;
 use Friendica\Util\Strings;
 use Psr\Log\LoggerInterface;
 
@@ -43,26 +45,21 @@ class Magic extends BaseModule
 {
        /** @var App */
        protected $app;
-       /** @var LoggerInterface */
-       protected $logger;
        /** @var Database */
        protected $dba;
        /** @var ICanSendHttpRequests */
        protected $httpClient;
-       protected $baseUrl;
 
-       public function __construct(App $app, App\BaseURL $baseUrl, LoggerInterface $logger, Database $dba, ICanSendHttpRequests $httpClient, L10n $l10n, array $parameters = [])
+       public function __construct(App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, Database $dba, ICanSendHttpRequests $httpClient, array $server, array $parameters = [])
        {
-               parent::__construct($l10n, $parameters);
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->app        = $app;
-               $this->logger     = $logger;
                $this->dba        = $dba;
                $this->httpClient = $httpClient;
-               $this->baseUrl    = $baseUrl;
        }
 
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                $this->logger->info('magic module: invoked');
 
@@ -116,7 +113,7 @@ class Magic extends BaseModule
                        );
 
                        // Try to get an authentication token from the other instance.
-                       $curlResult = $this->httpClient->get($basepath . '/owa', [HttpClientOptions::HEADERS => $header]);
+                       $curlResult = $this->httpClient->get($basepath . '/owa', HttpClientAccept::DEFAULT, [HttpClientOptions::HEADERS => $header]);
 
                        if ($curlResult->isSuccess()) {
                                $j = json_decode($curlResult->getBody(), true);