Merge pull request #12707 from MrPetovan/bug/contact-page

[friendica.git] / src / Module / Contact / Follow.php

diff --git a/src/Module/Contact/Follow.php b/src/Module/Contact/Follow.php
index 08585d26f9380775cdd440128d367aca99605f24..57e9ff634ab148efe12de562283a934230d43c0b 100644 (file)
--- a/src/Module/Contact/Follow.php
+++ b/src/Module/Contact/Follow.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -48,37 +48,34 @@ class Follow extends BaseModule
        protected $session;
        /** @var SystemMessages */
        protected $sysMessages;
-       /** @var App */
-       protected $app;
        /** @var IManageConfigValues */
        protected $config;
        /** @var App\Page */
        protected $page;
 
-       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, SystemMessages $sysMessages, App $app, IManageConfigValues $config, App\Page $page, array $server, array $parameters = [])
+       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, SystemMessages $sysMessages, IManageConfigValues $config, App\Page $page, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->session     = $session;
                $this->sysMessages = $sysMessages;
-               $this->app         = $app;
                $this->config      = $config;
                $this->page        = $page;
        }
 
        protected function post(array $request = [])
        {
-               parent::post($request);
-
                if (!$this->session->getLocalUserId()) {
                        throw new ForbiddenException($this->t('Access denied.'));
                }
 
-               if (!empty($request['url'])) {
-                       $this->baseUrl->redirect($request['url']);
+               if (isset($request['cancel']) || empty($request['url'])) {
+                       $this->baseUrl->redirect('contact');
                }
 
-               $url = Probe::cleanURI($this->session->get('url'));
+               $url = Probe::cleanURI($request['url']);
+
+               $this->process($url);
        }
 
        protected function content(array $request = []): string
@@ -91,7 +88,9 @@ class Follow extends BaseModule
                }
 
                $uid = $this->session->getLocalUserId();
-               $url = Probe::cleanURI(trim($request['url'] ?? ''));
+
+               // uri is used by the /authorize_interaction Mastodon route
+               $url = Probe::cleanURI(trim($request['uri'] ?? $request['url'] ?? ''));
 
                // Issue 6874: Allow remote following from Peertube
                if (strpos($url, 'acct:') === 0) {
@@ -106,11 +105,10 @@ class Follow extends BaseModule
 
                // Don't try to add a pending contact
                $userContact = Contact::selectFirst(['pending'], [
-                       "`uid` = ? AND ((`rel` != ?) OR (`network` = ?)) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
+                       "`uid` = ? AND ((`rel` != ?) OR (`network` = ?)) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)",
                        $uid, Contact::FOLLOWER, Protocol::DFRN,
                        Strings::normaliseLink($url),
-                       Strings::normaliseLink($url), $url,
-                       Protocol::STATUSNET]);
+                       Strings::normaliseLink($url), $url]);
 
                if (!empty($userContact['pending'])) {
                        $this->sysMessages->addNotice($this->t('You already added this contact.'));
@@ -153,8 +151,8 @@ class Follow extends BaseModule
                        $this->process($contact['url']);
                }
 
-               $request = $this->baseUrl . '/follow';
-               $tpl     = Renderer::getMarkupTemplate('auto_request.tpl');
+               $requestUrl = $this->baseUrl . '/contact/follow';
+               $tpl        = Renderer::getMarkupTemplate('auto_request.tpl');
 
                $owner = User::getOwnerDataById($uid);
                if (empty($owner)) {
@@ -173,7 +171,7 @@ class Follow extends BaseModule
                        '$submit'         => $submit,
                        '$cancel'         => $this->t('Cancel'),
 
-                       '$request'  => $request,
+                       '$action'   => $requestUrl,
                        '$name'     => $contact['name'],
                        '$url'      => $contact['url'],
                        '$zrl'      => Profile::zrl($contact['url']),
@@ -184,13 +182,13 @@ class Follow extends BaseModule
                        '$addnote_field' => ['dfrn-request-message', $this->t('Add a personal note:')],
                ]);
 
-               $this['aside'] = '';
+               $this->page['aside'] = '';
 
                if (!in_array($protocol, [Protocol::PHANTOM, Protocol::MAIL])) {
-                       $this['aside'] = VCard::getHTML($contact);
+                       $this->page['aside'] = VCard::getHTML($contact);
 
                        $output .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'),
-                               ['$title' => $this->t('Status Messages and Posts')]
+                               ['$title' => $this->t('Posts and Replies')]
                        );
 
                        // Show last public posts
@@ -202,9 +200,9 @@ class Follow extends BaseModule
 
        protected function process(string $url)
        {
-               $returnPath = 'follow?rul=' . urlencode($url);
+               $returnPath = 'contact/follow?url=' . urlencode($url);
 
-               $result = Contact::createFromProbeForUser($this->app->getLoggedInUserId(), $url);
+               $result = Contact::createFromProbeForUser($this->session->getLocalUserId(), $url);
 
                if (!$result['success']) {
                        // Possibly it is a remote item and not an account