Update src/Module/Api/Friendica/Photoalbum/Index.php

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

diff --git a/src/Module/Contact/Follow.php b/src/Module/Contact/Follow.php
index e240a72204cbf8b3d9746d0cffe9da1a10184d07..f8b88c05fc7ab35686ede286500d988a34748736 100644 (file)
--- a/src/Module/Contact/Follow.php
+++ b/src/Module/Contact/Follow.php
@@ -88,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) {
@@ -151,7 +153,7 @@ class Follow extends BaseModule
                }
 
                $requestUrl = $this->baseUrl . '/contact/follow';
-               $tpl     = Renderer::getMarkupTemplate('auto_request.tpl');
+               $tpl        = Renderer::getMarkupTemplate('auto_request.tpl');
 
                $owner = User::getOwnerDataById($uid);
                if (empty($owner)) {