Merge remote-tracking branch 'upstream/develop' into api4

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

diff --git a/src/Module/RemoteFollow.php b/src/Module/RemoteFollow.php
index bf71b077fd01888deae74dface5203b012ded31f..6fedc139317377b5427a554bfa752137b7eb8265 100644 (file)
--- a/src/Module/RemoteFollow.php
+++ b/src/Module/RemoteFollow.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,13 +22,17 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
+use Friendica\Content\Widget;
 use Friendica\DI;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Search;
 use Friendica\Core\System;
+use Friendica\Model\Contact;
 use Friendica\Model\Profile;
+use Friendica\Model\User;
+use Friendica\Network\HTTPException;
 use Friendica\Network\Probe;
 
 /**
@@ -36,20 +40,25 @@ use Friendica\Network\Probe;
  */
 class RemoteFollow extends BaseModule
 {
-       public static function init(array $parameters = [])
+       static $owner;
+
+       public function init()
        {
-               Profile::load(DI::app(), $parameters['profile']);
+               self::$owner = User::getOwnerDataByNick($this->parameters['profile']);
+               if (!self::$owner) {
+                       throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
+               }
+
+               DI::page()['aside'] = Widget\VCard::getHTML(self::$owner);
        }
 
-       public static function post(array $parameters = [])
+       public function post()
        {
-               $a = DI::app();
-
                if (!empty($_POST['cancel']) || empty($_POST['dfrn_url'])) {
                        DI::baseUrl()->redirect();
                }
        
-               if (empty($a->profile['uid'])) {
+               if (empty(self::$owner)) {
                        notice(DI::l10n()->t('Profile unavailable.'));
                        return;
                }
@@ -61,8 +70,8 @@ class RemoteFollow extends BaseModule
                }
 
                // Detect the network, make sure the provided URL is valid
-               $data = Probe::uri($url);
-               if ($data['network'] == Protocol::PHANTOM) {
+               $data = Contact::getByURL($url);
+               if (!$data) {
                        notice(DI::l10n()->t("The provided profile link doesn't seem to be valid"));
                        return;
                }
@@ -72,31 +81,29 @@ class RemoteFollow extends BaseModule
                        return;
                }
 
-               Logger::notice('Remote request', ['url' => $url, 'follow' => $a->profile['url'], 'remote' => $data['subscribe']]);
+               Logger::notice('Remote request', ['url' => $url, 'follow' => self::$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($a->profile['addr']);
+                       $uri = urlencode(self::$owner['addr']);
                } else {
-                       $uri = urlencode($a->profile['url']);
+                       $uri = urlencode(self::$owner['url']);
                }
        
                $follow_link = str_replace('{uri}', $uri, $data['subscribe']);
                System::externalRedirect($follow_link);
        }
 
-       public static function content(array $parameters = [])
+       public function content(): string
        {
-               $a = DI::app();
-
-               if (empty($a->profile)) {
+               if (empty(self::$owner)) {
                        return '';
                }
        
-               $target_addr = $a->profile['addr'];
-               $target_url = $a->profile['url'];
+               $target_addr = self::$owner['addr'];
+               $target_url = self::$owner['url'];
 
                $tpl = Renderer::getMarkupTemplate('auto_request.tpl');
                $o = Renderer::replaceMacros($tpl, [
@@ -108,8 +115,8 @@ class RemoteFollow extends BaseModule
                        '$submit'        => DI::l10n()->t('Submit Request'),
                        '$cancel'        => DI::l10n()->t('Cancel'),
 
-                       '$request'       => 'remote_follow/' . $parameters['profile'],
-                       '$name'          => $a->profile['name'],
+                       '$request'       => 'remote_follow/' . $this->parameters['profile'],
+                       '$name'          => self::$owner['name'],
                        '$myaddr'        => Profile::getMyURL(),
                ]);
                return $o;