bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

We now use the regular probing function

Browse source
This commit is contained in:
Michael 2018-09-13 21:57:41 +00:00
commit c2f6b166c7
2 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Network/Probe.php
View file

@ -19,6 +19,7 @@ use Friendica\Model\Contact;
use Friendica\Model\Profile;
use Friendica\Protocol\Email;
use Friendica\Protocol\Feed;
use Friendica\Protocol\ActivityPub;
use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
@ -328,7 +329,16 @@ class Probe
$uid = local_user();
}
$data = self::detect($uri, $network, $uid);
if ($network != Protocol::ACTIVITYPUB) {
$data = self::detect($uri, $network, $uid);
}
if (empty($data) || ($data['network'] == Protocol::PHANTOM)) {
$ap_profile = ActivityPub::fetchProfile($uri);
if (!empty($ap_profile) && ($ap_profile['network'] == Protocol::ACTIVITYPUB)) {
$data = $ap_profile;
}
}
if (!isset($data["url"])) {
$data["url"] = $uri;