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

Replace "Probe::uri" with "Contact::getByURL"

Browse Source
This commit is contained in:
Michael
2020-07-16 10:22:14 +00:00
parent c352af8eda
commit d6bf7f2cda
7 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Module/Acctlink.php
View File

@@ -22,8 +22,8 @@
namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Network\Probe;
use Friendica\Core\System;
use Friendica\Model\Contact;
/**
* Redirects to another URL based on the parameter 'addr'
@@ -35,9 +35,9 @@ class Acctlink extends BaseModule
$addr = trim($_GET['addr'] ?? '');
if ($addr) {
$url = Probe::uri($addr)['url'] ?? '';
$url = Contact::getByURL($addr)['url'] ?? '';
if ($url) {
System::externalRedirect($url);
System::externalRedirect($url['url']);
exit();
}
}

5
src/Module/RemoteFollow.php
View File

@@ -28,6 +28,7 @@ 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\Network\Probe;
@@ -61,8 +62,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;
}