Introduce `Response` for Modules to create a testable way for module responses

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

diff --git a/src/Module/RemoteFollow.php b/src/Module/RemoteFollow.php
index 6fedc139317377b5427a554bfa752137b7eb8265..ee2dcfe4dcf7b816b9f181844d4939bff14ac172 100644 (file)
--- a/src/Module/RemoteFollow.php
+++ b/src/Module/RemoteFollow.php
@@ -21,9 +21,11 @@
 
 namespace Friendica\Module;
 
+use Friendica\App;
+use Friendica\App\Page;
 use Friendica\BaseModule;
 use Friendica\Content\Widget;
-use Friendica\DI;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
@@ -34,89 +36,98 @@ use Friendica\Model\Profile;
 use Friendica\Model\User;
 use Friendica\Network\HTTPException;
 use Friendica\Network\Probe;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
 
 /**
  * Remotely follow the account on this system by the provided account
  */
 class RemoteFollow extends BaseModule
 {
-       static $owner;
+       /** @var array */
+       protected $owner;
+       /** @var Page */
+       protected $page;
 
-       public function init()
+       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, App\Page $page, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
-               self::$owner = User::getOwnerDataByNick($this->parameters['profile']);
-               if (!self::$owner) {
-                       throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+               $this->owner = User::getOwnerDataByNick($this->parameters['profile']);
+               if (!$this->owner) {
+                       throw new HTTPException\NotFoundException($this->t('User not found.'));
                }
 
-               DI::page()['aside'] = Widget\VCard::getHTML(self::$owner);
+               $this->page    = $page;
        }
 
-       public function post()
+       protected function post(array $request = [], array $post = [])
        {
                if (!empty($_POST['cancel']) || empty($_POST['dfrn_url'])) {
-                       DI::baseUrl()->redirect();
+                       $this->baseUrl->redirect();
                }
        
-               if (empty(self::$owner)) {
-                       notice(DI::l10n()->t('Profile unavailable.'));
+               if (empty($this->owner)) {
+                       notice($this->t('Profile unavailable.'));
                        return;
                }
                
                $url = Probe::cleanURI($_POST['dfrn_url']);
                if (!strlen($url)) {
-                       notice(DI::l10n()->t("Invalid locator"));
+                       notice($this->t("Invalid locator"));
                        return;
                }
 
                // Detect the network, make sure the provided URL is valid
                $data = Contact::getByURL($url);
                if (!$data) {
-                       notice(DI::l10n()->t("The provided profile link doesn't seem to be valid"));
+                       notice($this->t("The provided profile link doesn't seem to be valid"));
                        return;
                }
 
                if (empty($data['subscribe'])) {
-                       notice(DI::l10n()->t("Remote subscription can't be done for your network. Please subscribe directly on your system."));
+                       notice($this->t("Remote subscription can't be done for your network. Please subscribe directly on your system."));
                        return;
                }
 
-               Logger::notice('Remote request', ['url' => $url, 'follow' => self::$owner['url'], 'remote' => $data['subscribe']]);
+               Logger::notice('Remote request', ['url' => $url, 'follow' => $this->owner['url'], 'remote' => $data['subscribe']]);
                
                // Substitute our user's feed URL into $data['subscribe']
                // Send the subscriber home to subscribe
                // Diaspora needs the uri in the format user@domain.tld
                if ($data['network'] == Protocol::DIASPORA) {
-                       $uri = urlencode(self::$owner['addr']);
+                       $uri = urlencode($this->owner['addr']);
                } else {
-                       $uri = urlencode(self::$owner['url']);
+                       $uri = urlencode($this->owner['url']);
                }
        
                $follow_link = str_replace('{uri}', $uri, $data['subscribe']);
                System::externalRedirect($follow_link);
        }
 
-       public function content(): string
+       protected function content(array $request = []): string
        {
-               if (empty(self::$owner)) {
+               if (empty($this->owner)) {
                        return '';
                }
-       
-               $target_addr = self::$owner['addr'];
-               $target_url = self::$owner['url'];
+
+               $this->page['aside'] = Widget\VCard::getHTML($this->owner);
+
+               $target_addr = $this->owner['addr'];
+               $target_url = $this->owner['url'];
 
                $tpl = Renderer::getMarkupTemplate('auto_request.tpl');
                $o = Renderer::replaceMacros($tpl, [
-                       '$header'        => DI::l10n()->t('Friend/Connection Request'),
-                       '$page_desc'     => DI::l10n()->t('Enter your Webfinger address (user@domain.tld) or profile URL here. If this isn\'t supported by your system, you have to subscribe to <strong>%s</strong> or <strong>%s</strong> directly on your system.', $target_addr, $target_url),
-                       '$invite_desc'   => DI::l10n()->t('If you are not yet a member of the free social web, <a href="%s">follow this link to find a public Friendica node and join us today</a>.', Search::getGlobalDirectory() . '/servers'),
-                       '$your_address'  => DI::l10n()->t('Your Webfinger address or profile URL:'),
-                       '$pls_answer'    => DI::l10n()->t('Please answer the following:'),
-                       '$submit'        => DI::l10n()->t('Submit Request'),
-                       '$cancel'        => DI::l10n()->t('Cancel'),
+                       '$header'        => $this->t('Friend/Connection Request'),
+                       '$page_desc'     => $this->t('Enter your Webfinger address (user@domain.tld) or profile URL here. If this isn\'t supported by your system, you have to subscribe to <strong>%s</strong> or <strong>%s</strong> directly on your system.', $target_addr, $target_url),
+                       '$invite_desc'   => $this->t('If you are not yet a member of the free social web, <a href="%s">follow this link to find a public Friendica node and join us today</a>.', Search::getGlobalDirectory() . '/servers'),
+                       '$your_address'  => $this->t('Your Webfinger address or profile URL:'),
+                       '$pls_answer'    => $this->t('Please answer the following:'),
+                       '$submit'        => $this->t('Submit Request'),
+                       '$cancel'        => $this->t('Cancel'),
 
                        '$request'       => 'remote_follow/' . $this->parameters['profile'],
-                       '$name'          => self::$owner['name'],
+                       '$name'          => $this->owner['name'],
                        '$myaddr'        => Profile::getMyURL(),
                ]);
                return $o;