clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move remote follow module to profile folder

This commit is contained in:
Hypolite Petovan 2022-10-30 15:50:39 -04:00
parent 5de8fe3a48
commit a1e6e13a9f
3 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Model/Profile.php
View File

@ -335,7 +335,7 @@ class Profile
if (!$visitor_is_authenticated) { if (!$visitor_is_authenticated) {
// Remote follow is only available for local profiles // Remote follow is only available for local profiles
if (!empty($profile['nickname']) && strpos($profile_url, DI::baseUrl()->get()) === 0) { if (!empty($profile['nickname']) && strpos($profile_url, DI::baseUrl()->get()) === 0) {
$follow_link = 'remote_follow/' . $profile['nickname']; $follow_link = 'profile/' . $profile['nickname'] . '/remote_follow';
} }
} else { } else {
if ($visitor_is_following) { if ($visitor_is_following) {

53
src/Module/RemoteFollow.php → src/Module/Profile/RemoteFollow.php
View File

@ -19,7 +19,7 @@
* *
*/ */
namespace Friendica\Module; namespace Friendica\Module\Profile;
use Friendica\App; use Friendica\App;
use Friendica\App\Page; use Friendica\App\Page;
@ -30,11 +30,14 @@ use Friendica\Core\Logger;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Core\Search; use Friendica\Core\Search;
use Friendica\Core\Session\Capability\IHandleUserSessions;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Profile; use Friendica\Model\Profile;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Module\Response;
use Friendica\Navigation\SystemMessages;
use Friendica\Network\HTTPException; use Friendica\Network\HTTPException;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Util\Profiler; use Friendica\Util\Profiler;
@ -45,53 +48,60 @@ use Psr\Log\LoggerInterface;
*/ */
class RemoteFollow extends BaseModule class RemoteFollow extends BaseModule
{ {
/** @var array */ /** @var SystemMessages */
protected $owner; private $systemMessages;
/** @var Page */ /** @var Page */
protected $page; protected $page;
/** @var IHandleUserSessions */
private $userSession;
public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, App\Page $page, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) /** @var array */
protected $owner;
public function __construct(IHandleUserSessions $userSession, SystemMessages $systemMessages, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, App\Page $page, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
{ {
parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
$this->owner = User::getOwnerDataByNick($this->parameters['profile']); $this->systemMessages = $systemMessages;
$this->page = $page;
$this->userSession = $userSession;
$this->owner = User::getOwnerDataByNick($this->parameters['nickname']);
if (!$this->owner) { if (!$this->owner) {
throw new HTTPException\NotFoundException($this->t('User not found.')); throw new HTTPException\NotFoundException($this->t('User not found.'));
} }
$this->page = $page;
} }
protected function post(array $request = []) protected function post(array $request = [])
{ {
if (!empty($_POST['cancel']) || empty($_POST['dfrn_url'])) { if (!empty($request['cancel']) || empty($request['dfrn_url'])) {
$this->baseUrl->redirect(); $this->baseUrl->redirect('profile/' . $this->parameters['nickname']);
} }
if (empty($this->owner)) { if (empty($this->owner)) {
DI::sysmsg()->addNotice($this->t('Profile unavailable.')); $this->systemMessages->addNotice($this->t('Profile unavailable.'));
return; return;
} }
$url = Probe::cleanURI($_POST['dfrn_url']); $url = Probe::cleanURI($request['dfrn_url']);
if (!strlen($url)) { if (!strlen($url)) {
DI::sysmsg()->addNotice($this->t("Invalid locator")); $this->systemMessages->addNotice($this->t('Invalid locator'));
return; return;
} }
// Detect the network, make sure the provided URL is valid // Detect the network, make sure the provided URL is valid
$data = Contact::getByURL($url); $data = Contact::getByURL($url);
if (!$data) { if (!$data) {
DI::sysmsg()->addNotice($this->t("The provided profile link doesn't seem to be valid")); $this->systemMessages->addNotice($this->t("The provided profile link doesn't seem to be valid"));
return; return;
} }
if (empty($data['subscribe'])) { if (empty($data['subscribe'])) {
DI::sysmsg()->addNotice($this->t("Remote subscription can't be done for your network. Please subscribe directly on your system.")); $this->systemMessages->addNotice($this->t("Remote subscription can't be done for your network. Please subscribe directly on your system."));
return; return;
} }
Logger::notice('Remote request', ['url' => $url, 'follow' => $this->owner['url'], 'remote' => $data['subscribe']]); $this->logger->notice('Remote request', ['url' => $url, 'follow' => $this->owner['url'], 'remote' => $data['subscribe']]);
// Substitute our user's feed URL into $data['subscribe'] // Substitute our user's feed URL into $data['subscribe']
// Send the subscriber home to subscribe // Send the subscriber home to subscribe
@ -108,17 +118,13 @@ class RemoteFollow extends BaseModule
protected function content(array $request = []): string protected function content(array $request = []): string
{ {
if (empty($this->owner)) {
return '';
}
$this->page['aside'] = Widget\VCard::getHTML($this->owner); $this->page['aside'] = Widget\VCard::getHTML($this->owner);
$target_addr = $this->owner['addr']; $target_addr = $this->owner['addr'];
$target_url = $this->owner['url']; $target_url = $this->owner['url'];
$tpl = Renderer::getMarkupTemplate('auto_request.tpl'); $tpl = Renderer::getMarkupTemplate('auto_request.tpl');
$o = Renderer::replaceMacros($tpl, [ return Renderer::replaceMacros($tpl, [
'$header' => $this->t('Friend/Connection Request'), '$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), '$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'), '$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'),
@ -127,10 +133,9 @@ class RemoteFollow extends BaseModule
'$submit' => $this->t('Submit Request'), '$submit' => $this->t('Submit Request'),
'$cancel' => $this->t('Cancel'), '$cancel' => $this->t('Cancel'),
'$action' => 'remote_follow/' . $this->parameters['profile'], '$action' => 'profile/' . $this->parameters['nickname'] . '/remote_follow',
'$name' => $this->owner['name'], '$name' => $this->owner['name'],
'$myaddr' => Profile::getMyURL(), '$myaddr' => $this->userSession->getMyUrl(),
]); ]);
return $o;
} }
} }

10
static/routes.config.php
View File

@ -33,14 +33,15 @@ use Friendica\Module;
$profileRoutes = [ $profileRoutes = [
'' => [Module\Profile\Index::class, [R::GET]], '' => [Module\Profile\Index::class, [R::GET]],
'/attachment/upload' => [Module\Profile\Attachment\Upload::class, [ R::POST]], '/attachment/upload' => [Module\Profile\Attachment\Upload::class, [ R::POST]],
'/profile' => [Module\Profile\Profile::class, [R::GET]],
'/schedule' => [Module\Profile\Schedule::class, [R::GET, R::POST]],
'/contacts/common' => [Module\Profile\Common::class, [R::GET]], '/contacts/common' => [Module\Profile\Common::class, [R::GET]],
'/contacts[/{type}]' => [Module\Profile\Contacts::class, [R::GET]], '/contacts[/{type}]' => [Module\Profile\Contacts::class, [R::GET]],
'/status[/{category}[/{date1}[/{date2}]]]' => [Module\Profile\Status::class, [R::GET]],
'/media' => [Module\Profile\Media::class, [R::GET]], '/media' => [Module\Profile\Media::class, [R::GET]],
'/unkmail' => [Module\Profile\UnkMail::class, [R::GET, R::POST]],
'/photos/upload' => [Module\Profile\Photos\Upload::class, [ R::POST]], '/photos/upload' => [Module\Profile\Photos\Upload::class, [ R::POST]],
'/profile' => [Module\Profile\Profile::class, [R::GET]],
'/remote_follow' => [Module\Profile\RemoteFollow::class, [R::GET, R::POST]],
'/schedule' => [Module\Profile\Schedule::class, [R::GET, R::POST]],
'/status[/{category}[/{date1}[/{date2}]]]' => [Module\Profile\Status::class, [R::GET]],
'/unkmail' => [Module\Profile\UnkMail::class, [R::GET, R::POST]],
]; ];
$apiRoutes = [ $apiRoutes = [
@ -589,7 +590,6 @@ return [
'/randprof' => [Module\RandomProfile::class, [R::GET]], '/randprof' => [Module\RandomProfile::class, [R::GET]],
'/register' => [Module\Register::class, [R::GET, R::POST]], '/register' => [Module\Register::class, [R::GET, R::POST]],
'/remote_follow/{profile}' => [Module\RemoteFollow::class, [R::GET, R::POST]],
'/robots.txt' => [Module\RobotsTxt::class, [R::GET]], '/robots.txt' => [Module\RobotsTxt::class, [R::GET]],
'/rsd.xml' => [Module\ReallySimpleDiscovery::class, [R::GET]], '/rsd.xml' => [Module\ReallySimpleDiscovery::class, [R::GET]],
'/smilies[/json]' => [Module\Smilies::class, [R::GET]], '/smilies[/json]' => [Module\Smilies::class, [R::GET]],